Commit graph

700 commits

Author SHA1 Message Date
Aerll abc55396d0 fix flag test bug 2018-08-09 23:45:04 +02:00
Bojidar Marinov 80c829681e
Don't copy alpha when coloring the brush 2018-08-09 13:07:49 +03:00
Aerll a7a8db4dcb fix crash when deleting layer 2018-08-03 14:14:25 +02:00
bors[bot] 8194274352 Merge #1236
1236: Copy tile layer color to brush and picker r=heinrich5991 a=bojidar-bg

![Comparision](https://user-images.githubusercontent.com/5276727/43340641-aaebcfc4-91e5-11e8-9d43-c18aff8cd6fc.png)
Before is on the left, after is on the right.


Co-authored-by: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
2018-07-30 14:25:11 +00:00
bors[bot] b82930b56a Merge #1227
1227: Allow multiple layers to be selected and edited at the same time. r=heinrich5991 a=bojidar-bg

Resolves #486.

Please test, I'm still not completely sure it won't crash or mess up a map from time to time.

Co-authored-by: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
2018-07-30 14:12:49 +00:00
Bojidar Marinov 0f6bd99d12
Copy tile layer color to brush and picker 2018-07-27 21:38:36 +03:00
Bojidar Marinov 333572acd4
Polish; disable picker and quad/sounds popup menus in multi-select 2018-07-27 16:54:52 +03:00
Dennis Felsing 409abf1b90 Simplify code a bit 2018-07-27 07:51:16 +02:00
Dennis Felsing 4f18d7f9b8
Merge pull request #1213 from Aerll/automapper
Add 2 new commands for automapper
2018-07-27 07:49:04 +02:00
Aerll 292f0a2b09 no need for all pos rule tests 2018-07-27 00:23:53 +02:00
Aerll 52fbade30c remove unnecessary tiles overwriting 2018-07-26 22:58:05 +02:00
Aerll 56a5ee6d1b formatting.. 2018-07-26 18:59:29 +02:00
Aerll 2e7a0be516 wrong naming for pointer 2018-07-26 18:26:12 +02:00
Aerll 3c07a2b35b fixes #1213 2018-07-26 14:49:43 +02:00
heinrich5991 5c4e819e44 Use str_startswith, str_endswith instead of ad-hoc implementations 2018-07-26 14:18:23 +02:00
Tim Schumacher 1e3b8c7db5
Fix automapper crash without [section] line 2018-07-26 01:21:20 +02:00
Bojidar Marinov aa091bb8f7
Allow multiple layers to be selected and edited at the same time. 2018-07-25 23:57:58 +03:00
Aerll d235036f7d
Merge branch 'master' into automapper 2018-07-25 00:25:30 +02:00
Bojidar Marinov a635d4a121
Allow entering automapper rule probability as percentage
Fixes #837
2018-07-24 21:44:33 +03:00
Aerll d5572dcb23 add 2 new commands to automapper 2018-07-19 17:09:29 +02:00
yangfl 81a39c229b Fix typo 2018-07-10 17:29:02 +08:00
heinrich5991 c07412b6c8 By default, don't embed vanilla images
Previously, when you added an image to the map in the editor, it would
start off as embedded, i.e. included in the map file. This does not make
sense for vanilla images as every client has those.

That's why we now only mark non-vanilla images as external by default.
2018-06-29 23:28:49 +02:00
def 89ca2cfe8b Allow some key binds in editor when GUI is hidden 2018-06-26 22:51:43 +02:00
def 6793acafc4 Allow longer server settings in editor 2018-04-27 21:36:29 +02:00
heinrich5991 f8277267a0 Remove mem_alloc and mem_free, use standard C functions instead
Replace `mem_free` by `free`, and `mem_alloc` by `malloc` or `calloc`
(the latter one being used to allocate a zeroed array of elements,
sometimes, this makes a call to `mem_zero` superfluous).

This results in having to remove `mem_stats` which previously recorded
the number of allocations and their size that the Teeworlds code did
directly.

Remove OOM handling in `src/game/client/components/binds.cpp`.

Remove needless copying in the CSV code in
`src/game/client/components/statboard.cpp`.
2018-04-09 11:56:39 +02:00
def bd1653a91b Editor: Fix debug client crash 2018-04-04 21:41:14 +02:00
Jupeyy c1a962b870 add ui fixes to work with new text renderer 2018-03-13 21:59:07 +01:00
yangfl 1620fc9b0f Fix typo 2018-02-07 16:10:40 +08:00
def 7b6317a5d6 buffer sizes 2017-09-03 08:53:54 +02:00
def 862e26dd08 Clean up time handling a bit 2017-09-03 08:48:21 +02:00
Dennis Felsing eb2634ab0a Merge pull request #852 from heinrich5991/pr_ddnet_fix_extractname
Add testing; fix, rename and test the `CEditor::ExtractName` function
2017-08-30 22:09:17 +02:00
heinrich5991 22be1be389 Fix and rename the CEditor::ExtractName function
Fixes #846.
2017-08-30 13:59:42 +02:00
heinrich5991 2682480f8a Rename GetUncompressedDataSize to GetDataSize
Also rename the old `GetDataSize` to `GetFileDataSize`. `GetDataSize`
now returns the actual data size, not the data size before
decompression.
2017-08-30 08:36:17 +02:00
sctt 0849fa6024 fixing map_resave and adding map_replace_image
Update datafile.h

Update datafile.cpp

Update datafile.cpp

Update map_resave.cpp

Update datafile.h

Update map_resave.cpp

Update datafile.h

Update datafile.cpp

Update config_store.cpp

Update config_retrieve.cpp

Update io.cpp

Update gamecontext.cpp

Update config_store.cpp

Update CMakeLists.txt

Create map_replace_image.cpp

Update map_replace_image.cpp

fixing bug with height and witdth
2017-08-29 16:21:16 +02:00
heinrich5991 33315452c3 Merge branch 'master' into leak_fix 2017-07-31 20:42:32 +02:00
def 7428dd0637 Editor: Don't show server settings when picker is active 2017-07-22 12:18:53 +02:00
HMH 476d57c5c5 Also cleanup CEditorMap on destruction 2017-07-21 20:02:46 +02:00
def 4b4f9992d4 Fix disappearing switches in editor 2017-07-15 18:11:01 +02:00
def 9a0706f8b1 Support ctrl-l to load map in editor 2017-07-15 18:08:34 +02:00
def a5bd671e55 Show X and Y coordinates in map editor 2017-07-12 20:25:48 +02:00
def 46cedf3a8c Compiler warnings 2017-07-09 10:27:58 +02:00
def f3e3d57a90 Always close files, cleaner demo recording, fix some other stuff 2017-07-08 13:39:20 +02:00
def 73c61e4169 Let's not save maps that are ok already 2017-06-11 20:18:28 +02:00
def 2bd6316ce7 Add code for fixing old maps by removing unused tiles 2017-06-11 19:53:55 +02:00
HMH 4a0abf6747 Access the correct Flags variable for saving maplayers 2017-04-01 18:16:02 +02:00
necropotame b8e4e5beea Fix style in several places 2017-03-22 19:45:14 +01:00
heinrich5991 54c5faa64c Complete the refactor 2017-03-12 19:52:29 +01:00
Alexandre Díaz 3589ed0b0f Start refactor... 2017-03-12 19:30:55 +01:00
Learath2 09552a6d9f Get rid of trailing whitespaces 2017-02-21 19:11:43 +03:00
BannZay c6e7ad5e45 map details button name fix 2016-11-27 20:55:05 +02:00
BannZay 6f99d05ef6 Merge remote-tracking branch 'upstream/master' into openCurrentMap 2016-08-23 14:40:13 +03:00
BannZay c658411f15 Load Current Map button added 2016-08-23 14:29:53 +03:00
Dennis Felsing d3f04a9470 Remove accidental code 2016-08-23 12:42:01 +02:00
def c91ef1ea81 str_append instead of strcat 2016-08-21 21:14:41 +02:00
BannZay 52d8efdfde editor searchBar added 2016-08-21 03:06:01 +03:00
def c308c348cb Merge branch 'Display tee position in editor proof' 2016-08-03 00:11:10 +02:00
def af250dd74e Fix colors in tele number selection 2016-07-26 20:28:30 +02:00
Tim Schumacher a99a9fecfc Display tee position in editor proof 2016-07-18 08:55:35 +02:00
Andrew e6eb607cc8 PROPTYPE_ANGLE_SCROLL mixed 2016-06-02 17:53:52 +03:00
Andrew a624db90b4 editeable proptype_int_step 2016-06-02 14:50:06 +03:00
def 3d3827a57d Don't render brush when picker is shown 2016-05-22 02:01:22 +02:00
def 668b0b887d Clean up modifier button 2016-05-22 01:43:33 +02:00
Andrew adab934c99 Switcher,speeduper,tuner,teleporter mixed to one button 2016-05-15 18:17:57 +03:00
def d2f5714042 Sort file names case-insensitively 2016-05-15 00:06:32 +02:00
def 475df14134 Fix editor popups a bit 2016-05-14 15:16:52 +02:00
def ff747953b4 Make envelopes unsynchronized by default and explain the setting better (fixes #479) 2016-05-14 00:42:40 +02:00
def 03a48dd09f Add code to remove unused tiles on game and front layers (commented out) 2016-05-11 12:13:54 +02:00
Dennis Felsing bc907f319d Merge pull request #467 from timakro/master
rename some auto game tile placers
2016-05-05 18:59:53 +02:00
Tim Schumacher 78f8c9978d fix editor gametiles automapper overlap 2016-05-05 18:40:38 +02:00
Tim Schumacher afd0e5a3eb rename some auto game tile placers 2016-05-05 18:23:04 +02:00
gamertyp b479dd412c Removed a tab 2016-05-04 23:37:02 +02:00
gamertyp e9378973de Re-ordered the Gametiles-menu 2016-05-04 22:33:10 +02:00
gamertyp 7a3f96431a Re-ordered the Gametiles-menu 2016-05-04 22:30:16 +02:00
Tim Schumacher aeea3777a3 show button to mapper when placing unused tiles 2016-05-01 18:12:20 +02:00
Tim Schumacher e61456f381 added auto game tile placer for hookthrough 2016-05-01 17:44:02 +02:00
Dennis Felsing bd40eec54f Merge pull request #446 from timakro/pr_improve_hookthrough_shortcut
hookthrough shortcut now works for game and front
2016-05-01 10:13:33 +02:00
Tim Schumacher 01024252b5 fix editor buttons for 5:4 resolutions 2016-05-01 02:34:06 +02:00
Tim Schumacher 04887e44f8 remove useless function 2016-05-01 01:54:37 +02:00
Tim Schumacher 70ffbbbbf9 hookthrough shortcut now works for game and front 2016-05-01 01:47:29 +02:00
def 4761608329 Input fixes from TW master for mouse wheel 2016-04-30 20:11:26 +02:00
def 644fec7e55 Resize window without restarting client 2016-04-30 17:59:58 +02:00
Dennis Felsing 09284c3ba9 Merge pull request #434 from timakro/pr_prevent_unused_tiles
Prevent placing unused tiles in the editor
2016-04-29 22:36:35 +02:00
def db8a126315 Merge swick's SDL2 branch 2016-04-29 21:55:48 +02:00
Tim Schumacher d69133c877 prevent placing unused tiles in the editor 2016-04-29 19:23:34 +02:00
def 67bff95a72 Merge remote-tracking branch 'timakro/new_hookthrough' 2016-04-27 18:59:51 +02:00
def 618dc9a6b0 Alert if layer size too big in editor (thanks to Lady Saavik, fixes #404) 2016-04-27 17:49:14 +02:00
Tim Schumacher ef94797c02 forbid placing hookthrough shortcut in front layer 2016-02-09 17:02:14 +01:00
timgame ba60cf509a use index 5 for a shortcut hookthrough tile 2015-11-15 00:00:43 +01:00
H-M-H 930dd8f2ad set colors to 1.000 instead of 0.001 for new colorenvelopes 2015-09-18 23:47:07 +02:00
H-M-H e6cf2241b2 fixed Envelopes-Bug see here: http://forum.ddnet.tw/viewtopic.php?
f=5&t=2277
2015-09-18 21:05:44 +02:00
def aa4bbed178 Hopefully fix editor crash with RGB (no transparency) images 2015-09-18 17:15:30 +02:00
def 7487923774 Fix Windows thread handle leak 2015-09-05 04:49:22 +02:00
def 2b1aa40d77 Fix editor color value to be shown with # instead of 0x 2015-08-28 20:28:53 +02:00
def e39fb6b535 Very ugly fix for color picker in editor 2015-08-28 01:28:09 +02:00
heinrich5991 7d9228f3d5 Fix a severe bug with config saving
Thought I had fixed that long ago...
2015-08-27 12:55:35 +02:00
heinrich5991 db696c0e78 Fix the 54e61bfe39 cherry-pick, re-add missing line 2015-08-27 12:55:34 +02:00
SushiTee c025dc2235 saving server settings within the map and loading them on init 2015-08-27 12:51:24 +02:00
SushiTee 7bd0f276d4 saving server settings within the map and loading them on init 2015-08-27 12:51:24 +02:00
def fabe25dd45 Switches can be set with number 0 (even if they don't make much sense, fixes #265) 2015-08-22 20:41:46 +02:00
def b5aca60662 Fix mouse hang with editor popup, value selector and escape (fixes #290) 2015-08-22 20:22:23 +02:00
def eac3d900e7 Remove unused variable 2015-08-22 17:50:34 +02:00
def db2256e827 Fix a few whitespace-at-end-of-file issues 2015-08-22 15:27:41 +02:00
BeaR ff3c4f22b4 Add hex value edit field for quad point color 2015-08-20 12:51:30 +02:00
BeaR 6b0d2b9b9a Fix hue picker scaling 2015-08-17 20:19:27 +02:00
BeaR a4cfc10898 Implement an HSV picker for color of quad points 2015-08-17 20:14:23 +02:00
def d5100cdee5 Add ctrl+shift+s for "save as" and ctrl+shift+alt+s for "save copy" 2015-07-26 12:05:45 +02:00
def ce1d615041 Add "Save copy" button so that filename is not changed 2015-07-26 12:05:14 +02:00
def f349818f9d Only save once (hope this doesn't cause any problems) 2015-07-26 12:04:43 +02:00
Dennis Felsing 50a6c30e46 Merge pull request #241 from timgame/DDRace64
fixed envelope button color
2015-07-25 00:07:33 +02:00
timgame 6264bb73f3 fixed envelope button color 2015-07-25 00:04:12 +02:00
def 5527870d0a Revert bruch clearing 2015-07-23 00:43:09 +02:00
Chairn ea52c68d2c Zooming will work as in game for editor using numpad. 2015-07-23 00:10:55 +02:00
def f5ff75a19a Fix Speedup angle selector 2015-07-15 02:34:50 +02:00
timgame 929919d44b improved grass_main/0.7 automapper by hi_leute_gll 2015-07-09 19:17:46 +02:00
def 6e8ada1ac8 Fix whitespaces a bit 2015-07-09 02:12:35 +02:00
def f5d31b595c Editor: Scroll Speedup angles by 45° (finer with shift) 2015-07-08 13:55:02 +02:00
def 5f6752d238 Show degrees sign in value selector 2015-07-08 13:38:21 +02:00
def 2d5df86443 Add time.h include for editor to fix windows compilation 2015-07-01 17:17:48 +02:00
def d11f1b0b38 Display local time in editor so that mappers don't lose track of it 2015-07-01 16:38:17 +02:00
def d846583ba7 Make a few value selectors in editor wrap around 2015-06-28 16:17:23 +02:00
def 8e8283e9cf Highlight game layers in editor 2015-06-28 15:02:48 +02:00
def cc5ac820fd Editor: Ctrl-s doesn't ask about overwriting anymore 2015-06-21 13:02:07 +02:00
def d96ff538d3 Allow setting freeze number on switch layer in editor 2015-05-31 18:25:00 +02:00
def aeda4bc6f1 At least reduce the chance of mouse lockups and make them recoverable 2015-05-31 17:34:38 +02:00
def aaaf0cdaeb Don't create too many popups 2015-05-31 17:34:01 +02:00
def f02143e00b Go back in layer/images/sound selection in editor with right mouse click 2015-04-27 13:43:02 +02:00
def b5d722672a On switch layer fix delay number with FillSelection when creating new tiles instead of copying 2015-04-21 04:57:20 +02:00
def cb64bc6859 Move "Add Sound" button down for 5:4 resolutions 2015-04-21 04:34:14 +02:00
def c85865c492 Go back in envelopes with right mouse click 2015-04-21 04:25:49 +02:00
def 6d54de89b6 Get rid of clang static analyzer warnings 2015-04-19 00:31:45 +02:00
def 554c865eeb Fix segfault in editor 2015-04-17 20:14:14 +02:00
def ef994b87a1 Fix: rendering of images in editor when scrolling 2015-04-08 01:15:52 +02:00
def 3992b1346b Hopefully fix compilation on new OS X systems
Names collided with some new OS X defined names, fixes #189
2015-04-07 19:07:38 +02:00
H-M-H b97954f635 allow to exit editor valueselectors with mouseclicks 2015-04-07 17:08:01 +02:00
H-M-H 76481a139a fixed issue with wrongly displayed text in editor 2015-04-07 16:43:51 +02:00
def 0945e24ce4 Actual fix for crash with RGB images, convert them to RGBA instead 2015-04-04 18:07:57 +02:00
def c11044318e Hopefully fix map saving with RGB images 2015-04-04 17:16:20 +02:00
H-M-H 5e4d504c80 improved envelopeswitching and deleting 2015-03-30 13:06:05 +02:00
def 34f69f0bfd Cleanup 2015-03-30 11:44:32 +02:00
H-M-H 32606f3822 added labels and improved/fixed few things 2015-03-30 05:27:33 +02:00
H-M-H c98d8e3a63 added textinput for envelopes 2015-03-30 05:06:08 +02:00
H-M-H 68db1c1113 added option to type text into valueselector 2015-03-30 03:20:35 +02:00
def c7617b06d2 Resize font in editor to show full image and sound name 2015-03-29 01:32:07 +01:00
def 91756cc529 Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2015-03-10 22:57:52 +01:00
def 05970cc2e2 Add BONUS tile, opposite of PENALTY (for Saavik's new map) 2015-03-10 22:57:40 +01:00
timgame 6188b16e5e added tile -1 and updated grass automappers 2015-03-04 16:03:52 +01:00
timgame d2e1137254 automapper: added 'NewRun' 2015-02-20 00:15:09 +01:00
timgame 758c4b1c4d added 'NOINDEX' and 'OR' to automapper 2015-02-19 22:54:47 +01:00
def 4c2f83714d Fix typo 2014-12-24 01:40:21 +01:00
def 7f0b1dd35f Another color change 2014-12-23 16:00:59 +01:00
def cc7abaef1f Another color change in editor selections 2014-12-23 15:38:59 +01:00
def 3e410bbd34 Add detection whether an image and sound has to be embedded and redesign colors 2014-12-15 18:59:21 +01:00
def 2e7e4cfd46 Code piece to convert race stoppers to ddrace stoppers 2014-12-06 00:56:08 +01:00
BeaR 5d364410de Add editor compatibility with sound layers from older maps 2014-12-05 14:38:16 +01:00
def 158ba846fa Merge branch 'DDRace64' of github.com:def-/ddnet into DDRace64 2014-12-01 20:35:52 +01:00
def 49f6f2dff2 Fix some editor popup 2014-12-01 20:35:30 +01:00
Dennis Felsing 598c6c9968 Merge pull request #111 from cinaera/pr_pan
Add option to enable/disable panning per voice
2014-11-30 13:26:01 +01:00
BeaR 186de4e08e Add option to enable/disable panning per voice 2014-11-30 12:23:05 +01:00
BeaR 5f4067c483 Check array boundary for shape type 2014-11-30 11:33:44 +01:00
BeaR 98d42adf9d Implement sound logic for shaped sounds, fix rectangle height property in editor and submit voice shape information to audio interface 2014-11-29 14:29:40 +01:00
BeaR 485aa4ce54 Add editor properties for rectangle shaped sources and visualize falloff distance 2014-11-29 13:20:04 +01:00
BeaR fbcd560eb0 Working on adding editor UI support for sound shapes 2014-11-28 20:25:43 +01:00
BeaR a045a20fba Render sound shapes 2014-11-28 20:01:25 +01:00
BeaR 9996751161 Remove deprecated falloff distance 2014-11-28 19:21:59 +01:00
BeaR d1327742e7 Start adding support for custom shaped audio fields
Add version check for sound layers
2014-11-27 16:18:15 +01:00
def 913d5ac226 Fix editor in Images & Sounds views when GUI is deactivated (Reported by Welf) 2014-11-19 21:58:25 +01:00
BeaR c3689658b4 Fix editor sound replacing 2014-11-09 14:58:28 +01:00
def 0b1118938d Don't try to load preview images of directories 2014-10-28 22:54:24 +01:00
def 26260181bd Some work on Opus map sounds (not working yet) 2014-10-27 16:23:53 +01:00
def 699fb60532 Fix: Mapping sounds in editor works even when the sound system is disabled 2014-10-25 01:23:39 +02:00
def 3d9b232157 Minor Sound cleanup 2014-10-25 01:07:24 +02:00
def 12102a14a6 Fix sound and image loading 2014-10-24 23:03:16 +02:00
def 61b704dac3 Cleanup 2014-10-24 22:15:55 +02:00
def 73567c898e Cleanup 2014-10-24 22:13:46 +02:00
def a0bfc5a083 Add shift + right click to delete a quad (Suggestion by Welf) 2014-10-23 15:55:50 +02:00
BeaR 1e42136f5d Fix wrong memory allocation and sound selection 2014-10-23 12:19:26 +02:00
Dennis Felsing 792a891dfa Merge pull request #71 from cinaera/pr_speaker
Add editor icon for audio source
2014-10-21 12:15:18 +02:00
BeaR 09f8630b68 Add editor icon for audio source 2014-10-21 12:07:09 +02:00
timgame 62ca346122 Merge branch 'DDRace64' of https://github.com/def-/ddnet into DDRace64 2014-10-21 00:06:57 +02:00
timgame beb125da36 remove basetile 2014-10-20 23:55:55 +02:00
def d213a30bed Change new to mem_alloc (thanks BeaR) 2014-10-19 14:09:23 +02:00
def 0b2bf15c35 Clean up compiler warnings 2014-10-19 13:19:36 +02:00
BeaR b67fab8fdb Fix parallax scrolling for audio sources and remove global property 2014-10-18 18:41:58 +02:00
BeaR 920ac531aa Add support for position envelopes to sound sources 2014-10-18 18:41:55 +02:00
BeaR 0a70d49566 Remove distance from envelopes, add falloff distance to source properties and render it in the editor 2014-10-18 18:41:55 +02:00
BeaR 655c2466b9 Start adding a sound envelope 2014-10-18 18:41:54 +02:00
BeaR dfea1e9e71 Remove debug rendering for sound layers and unused item members 2014-10-18 18:41:53 +02:00
BeaR b5d0034674 Add embedded sound support 2014-10-18 18:41:53 +02:00
BeaR 66d02de673 Fix saving of sounds 2014-10-18 18:41:52 +02:00
BeaR dd35d2be84 Add editor support for editing sound source properties 2014-10-18 18:41:52 +02:00
BeaR 39f93716e0 Support replaying mapsounds 2014-10-18 18:41:52 +02:00
BeaR 2e36bd9906 Add missing file 2014-10-18 18:41:51 +02:00
BeaR 5df94f772f Add support for sound sources 2014-10-18 18:41:51 +02:00
BeaR 2bd9df2626 Adding support for saving/loading sound layers 2014-10-18 18:41:51 +02:00
BeaR d968b42f2f Add support for sound layers 2014-10-18 18:41:51 +02:00
BeaR 30989566bb Correctly load sound in the editor on add 2014-10-18 18:41:50 +02:00
BeaR 90975fbe9e Start adding UI for loading sounds in the editor 2014-10-18 18:41:50 +02:00
BeaR 1f4430f3d0 Editor: Add feature to zoom to mouse position 2014-10-07 20:07:46 +02:00
BeaR fa83e5b340 Editor: Scale quad point selection indicator with zoomlevel 2014-10-07 14:49:45 +02:00
def 85c953d25b Consistently allow rotations and flipping in editor 2014-10-01 18:55:53 +02:00