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

180 commits

Author SHA1 Message Date
Dennis Felsing a09fa562be
Merge pull request #1314 from timakro/pr_editor_entities_gametypes 
Allow choosing game layer entities for different gametypes, closes #1283
 2018-10-07 23:02:20 +02:00
Tim Schumacher ab6f344daa
Fix current selection highlighting 2018-10-02 23:39:22 +02:00
Tim Schumacher fd52bc7a26
List all game layer entities images in directory 2018-10-02 23:08:17 +02:00
Learath fef22f34f2 Implement brush saving. Fix #1111 2018-10-02 03:52:01 +02:00
Tim Schumacher 2e36ad67bb
Allow choosing game layer entities for different gametypes, closes #1283 2018-10-01 23:05:36 +02:00
Bojidar Marinov 50d53603e1
Add a toggle button for brush coloring 
In some cases (very dark color, etc.) it is impossible to see the tiles.
 2018-09-11 11:35:02 +03:00
bors[bot] 36a243e395 Merge #1251 
1251: Selecting multiple quads r=def- a=Aerll

- shift+drag to select quads. Selection is additive
- left click on any empty space deselects all quads
- moving, resizing, rotating etc. works for every selected quad
- fixed resizing quads on grid and in properties. Vertices don't land on the same spot

Co-authored-by: Aerll <31746984+aerll@users.noreply.github.com>
 2018-08-21 06:31:06 +00:00
Learath c5d69f9f63 Fix crash with FillSelection 2018-08-19 20:05:42 +03:00
Aerll f79bf5d03b selecting multiple quads 2018-08-13 11:11:56 +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
def 6793acafc4 Allow longer server settings in editor 2018-04-27 21:36:29 +02:00
def bd1653a91b Editor: Fix debug client crash 2018-04-04 21:41:14 +02:00
yangfl 1620fc9b0f Fix typo 2018-02-07 16:10:40 +08:00
heinrich5991 22be1be389 Fix and rename the CEditor::ExtractName function 
Fixes #846.
 2017-08-30 13:59:42 +02:00
HMH 476d57c5c5 Also cleanup CEditorMap on destruction 2017-07-21 20:02:46 +02:00
def 2bd6316ce7 Add code for fixing old maps by removing unused tiles 2017-06-11 19:53:55 +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 c658411f15 Load Current Map button added 2016-08-23 14:29:53 +03:00
BannZay 52d8efdfde editor searchBar added 2016-08-21 03:06:01 +03:00
def af250dd74e Fix colors in tele number selection 2016-07-26 20:28:30 +02:00
Andrew a624db90b4 editeable proptype_int_step 2016-06-02 14:50:06 +03:00
def d2f5714042 Sort file names case-insensitively 2016-05-15 00:06:32 +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 aeea3777a3 show button to mapper when placing unused tiles 2016-05-01 18:12:20 +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
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
timgame ba60cf509a use index 5 for a shortcut hookthrough tile 2015-11-15 00:00:43 +01:00
SushiTee 7bd0f276d4 saving server settings within the map and loading them on init 2015-08-27 12:51:24 +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 ce1d615041 Add "Save copy" button so that filename is not changed 2015-07-26 12:05:14 +02:00
timgame 6264bb73f3 fixed envelope button color 2015-07-25 00:04:12 +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
BeaR c3689658b4 Fix editor sound replacing 2014-11-09 14:58:28 +01: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 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
def 6cecffe67c Fix editor input on Android 2014-09-29 13:13:56 +02:00
def a5ec9e3240 Show current quad when pressing space in editor 2014-08-21 00:56:35 +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 f2dccafd4e Preview when loading PNGs in editor 2014-03-28 22:47:57 +01:00
HMH c84eaea33d declared functions needed for new tunelayer in CLayerTune for editor, kinda just copied from the other layers 2014-03-23 17:10:48 +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
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
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
SushiTee 65f4416164 added map info 2012-01-10 23:14:24 +01:00
oy a9db705c14 fixed that refocus is done when using Home-key in a editor edit box. Closes #821 2012-01-08 13:36:47 +01:00
GreYFoX 1446d0980b Merge branch 'master' of git://github.com/oy/teeworlds into DDRace 
* Version 1.098a
Conflicts:
	bam.lua
	src/game/client/gameclient.h
	src/game/mapitems.h
 2011-12-05 11:32:01 +02:00
oy 9a03989e84 added "Make an option for each envelope: (a) synchronized (b) starting at join" by Choupom 2011-12-04 14:39:47 +01:00
GreYFoX de4a95c5d2 Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 2011-08-20 06:50:06 +02:00
oy f36cc57bdd fixed last commit 2011-08-15 20:12:31 +02:00
Alexandre 367bb4b837 Map Editor: Envelope Preview 2011-08-15 18:07:05 +02:00
oy c38c632d06 fixed multiple popup creation in the editor. Closes #836 2011-08-13 19:22:01 +02:00
GreYFoX 5b27758650 Removed level stuff 
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
 2011-08-13 02:11:06 +02:00
GreYFoX 35d16bd58c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611 
Conflicts:
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/menus_browser.cpp
	src/game/client/gameclient.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
	src/game/editor/io.cpp
	src/game/editor/layer_tiles.cpp
	src/game/editor/popups.cpp
	src/game/gamecore.cpp
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2011-08-13 02:01:40 +02:00
Shereef Marzouk c6fd4a2cc5 General whitespace and tab cleanup 2011-08-11 10:59:14 +02:00
Choupom 84e5c53432 added color envelope feature for tilemaps 2011-07-20 22:04:13 +02:00
SushiTee f7a9e80163 added possibility to collapse groups by double clicking them 2011-07-15 01:03:22 +02:00
SushiTee d78c0d66e5 ability to name groups and layers 2011-07-15 00:47:52 +02:00
SushiTee 6cd2ab3887 added grid to editor 2011-07-11 12:03:16 +02:00
oy 7bc07b613f added auto mapping feature by LordSkelethom 2011-07-09 01:09:06 +02:00
GreYFoX cc63cf2553 Merge branch 'master' of git://github.com/oy/teeworlds 
Conflicts:
	src/engine/external/pnglite/pnglite.c
	src/engine/external/pnglite/pnglite.h
	src/engine/shared/config_variables.h
	src/game/client/components/menus_browser.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/version.h
 2011-05-09 18:36:13 +02:00
oy ca6e129da6 fixed size of characters in editor's tileselection screen on zoom. Closes #665 2011-05-05 01:50:23 +02:00
Choupom 0c6f187e3b renamed editor files 2011-05-03 18:45:42 +02:00
Renamed from src/game/editor/ed_editor.h (Browse further)