edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-11 10:38:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
10565 commits 1 branch 429 tags 411 MiB
Commit graph

301 commits

Author SHA1 Message Date
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
heinrich5991 5c4e819e44 Use str_startswith, str_endswith instead of ad-hoc implementations 2018-07-26 14:18:23 +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
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
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
heinrich5991 22be1be389 Fix and rename the CEditor::ExtractName function 
Fixes #846.
 2017-08-30 13:59:42 +02:00
def 7428dd0637 Editor: Don't show server settings when picker is active 2017-07-22 12:18:53 +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 f3e3d57a90 Always close files, cleaner demo recording, fix some other stuff 2017-07-08 13:39:20 +02:00
necropotame b8e4e5beea Fix style in several places 2017-03-22 19:45:14 +01:00
Learath2 09552a6d9f Get rid of trailing whitespaces 2017-02-21 19:11:43 +03: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 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
Tim Schumacher 78f8c9978d fix editor gametiles automapper overlap 2016-05-05 18:40:38 +02:00
Tim Schumacher 01024252b5 fix editor buttons for 5:4 resolutions 2016-05-01 02:34:06 +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
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 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 eac3d900e7 Remove unused variable 2015-08-22 17:50:34 +02:00
BeaR ff3c4f22b4 Add hex value edit field for quad point color 2015-08-20 12:51:30 +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
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 aeda4bc6f1 At least reduce the chance of mouse lockups and make them recoverable 2015-05-31 17:34:38 +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 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
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 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
BeaR 186de4e08e Add option to enable/disable panning per voice 2014-11-30 12:23:05 +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
def 0b2bf15c35 Clean up compiler warnings 2014-10-19 13:19:36 +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 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 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 6cecffe67c Fix editor input on Android 2014-09-29 13:13:56 +02:00
def 31b049533c 3 more keys to be disabled on text input 2014-09-27 11:06:55 +02:00
def 01f2b6ea02 Fix buggy envelope editor while tile picker is active 2014-09-27 11:04:09 +02:00
def b94981019b Disable key inputs in editor when typing in a field 2014-09-27 11:01:58 +02:00
def 2c610053c1 Fix: Selecting quads works after having rotated one 2014-09-22 22:25:05 +02:00
def 6ab4c566e9 Add a small close button in editor for people who happen to accidentally click on the Editor symbol in menu, but are unable to find File -> Exit 2014-09-12 23:07:47 +02:00
def 3edd1bb53f Fix client crash when holding space and adding a group in editor 2014-08-24 13:38:46 +02:00
def b4b1f4d1a8 fix tileset selection 2014-08-22 15:40:23 +02:00
def a5ec9e3240 Show current quad when pressing space in editor 2014-08-21 00:56:35 +02:00
def 6e7594c22a Keys still work in editor with TAB pressed 2014-08-21 00:21:18 +02:00
def 9d8357b5ca Don't show proof lines in editor when space is pressed 2014-08-21 00:05:44 +02:00
def 5e45e50d74 Add color for used images in editor (for Saavik) 2014-07-10 05:20:40 +02:00
def 11f6ac6f38 Fix: Always allow adding more images 2014-06-12 00:36:26 +02:00
def 0701f67810 Fix: Proper menu size in editor 2014-06-03 23:56:00 +02:00
def 6adb99608e Editor feature: Add possibility to set how far to shift layer 2014-06-01 01:32:54 +02:00
def 0a49301eea New editor feature: Show if tele and switch numbers are used already 2014-05-17 17:19:48 +02:00
def da9e9d4069 Fix: Info with Grid and animations works (Thanks Obst) 2014-05-13 22:33:37 +02:00
def f2dccafd4e Preview when loading PNGs in editor 2014-03-28 22:47:57 +01:00
HMH c7e52211d7 merged tunelayer: added Buttons, put an Image for the tunelayer took over most code from other layers and adapted for tunelayer 2014-03-23 17:10:48 +01:00
def 5e2381f746 Remove duplicated Delete button in editor 2014-02-14 20:54:42 +01:00
def 24c5dc3c6a Make editor undo optional because of too many bug reports 2014-02-13 22:27:11 +01:00
def 9ae59a1923 Fix: Don't delete all files in editor directory but only files starting with undo_ 2014-02-11 19:51:38 +01:00
def e074c52d4b Crude way of preventing crashes with editor undo 2014-01-26 21:50:30 +01:00
def a031ec343a Editor Undo: Fix some issues 2014-01-19 18:06:56 +01:00
def d092b8007d Add editor undo function (by MAP94) 2014-01-19 04:02:01 +01:00
def 3eaad43b6b Merge remote-tracking branch 'upstream-teeworlds/0.6' into DDRace 
Conflicts:
	bam.lua
	data/languages/index.txt
	src/engine/server/server.cpp
	src/engine/shared/network_server.cpp
	src/game/client/components/chat.cpp
	src/game/client/components/menus_settings.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/version.h
 2013-12-26 18:02:22 +01:00
m!nus ee9a8ce4b7 prevent map editor from crashing if loaded map is invalid 2013-05-26 10:58:03 +02:00
oy f0e09f50d9 improved chat msg spam protection 2013-04-01 20:30:58 +02:00
oy 0e92dd5603 fixed some merge problems 2013-02-24 18:55:55 +01:00
oy 8b4026cbbf fixed last commit 
Conflicts:

	src/game/editor/editor.cpp
	src/game/editor/editor.h
 2013-02-24 18:26:49 +01:00
BeaR d58afefaae Some graphic batching: 
Speed up for displaying debugtext and envelopepreview
(This reduces the performance hit especially for the 'Show Info' mode in the editor)

Conflicts:

	src/engine/client/client.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
 2013-02-24 18:23:06 +01:00
Magnus Auvinen 1711be955b fixed all the errors that the clang static analayzer found 2013-02-24 17:58:34 +01:00
oy 4fb57dea91 fixed editor crash on replacing images. Closes #981 2013-02-24 17:44:45 +01:00
oy ff75c3ba2d fixed some memory leaks in the map editor 2013-02-24 17:41:15 +01:00
GreYFoX cd4ba53bae Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace 
Conflicts:
	bam.lua
	scripts/build.py
	scripts/make_release.py
	src/engine/server.h
	src/game/client/gameclient.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/player.cpp
	src/game/version.h
 2012-04-12 02:09:31 +02:00