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

120 commits

Author SHA1 Message Date
GreYFoXGTi bfc20da61d Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-18 01:15:24 +02:00
SushiTee 1127c7b830 fixed compiling error 2010-10-17 17:10:55 +02:00
GreYFoXGTi ddf2883cb2 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/engine/shared/console.cpp
	src/game/server/gamecontext.cpp
 2010-10-16 21:59:59 +02:00
oy 0edad8e640 made it possible to specify which layers/groups should be saved within the map 2010-10-16 18:50:05 +02:00
oy 85fd272846 added the possibility to create a new folder within the editor's save file dialog 2010-10-16 18:33:54 +02:00
oy 9c256f69d8 fixed issues with adding and replacing images in the editor. Closes #216 2010-10-16 11:05:42 +02:00
oy be315edfc0 fixed clamping mousepos in the editor 2010-10-13 20:21:13 +02:00
GreYFoXGTi 47714c9468 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/variables.h
 2010-10-13 14:08:35 +02:00
oy e4fe7457c8 fixed problems with the mouse movement. Closes #214 2010-10-13 12:47:42 +02:00
GreYFoXGTi d8e6cfcbdd Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/french.txt
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/game/server/gamecontext.cpp
 2010-10-11 03:56:58 +02:00
Choupom bed7b64457 fixed map selection in map editor 2010-10-11 00:17:46 +02:00
GreYFoXGTi 40d2068c70 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_editor.h
	src/game/editor/ed_layer_tiles.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2010-10-10 14:36:02 +02:00
oy b3c81e7258 added the possibility to shift the tiles of a layer into any direction 2010-10-09 18:38:23 +02:00
oy ab2df14641 made INT_STEP properties in the editor just change by 1 2010-10-09 13:33:33 +02:00
oy 7ad4d3224c use file dialog when saving a map which was not loaded from the maps save path 2010-10-08 22:06:12 +02:00
GreYFoXGTi 6ca75f086e Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-08 13:37:38 +02:00
oy 04234c109e show filename of the map in the editor. Closes #122 2010-10-08 00:04:46 +02:00
oy 6a26cd6621 fixed various problems with the file dialog in the editor 2010-10-07 23:51:07 +02:00
GreYFoXGTi faaa8c241e Merge branch 'master' of http://github.com/oy/teeworlds into Cleanup 2010-10-07 15:33:48 +02:00
oy 3a98f7a048 added mod system. Closes #34 2010-10-06 23:07:35 +02:00
GreYFoXGTi dff5a70b91 Merge branch 'master' of github.com:GreYFoXGTi/DDRace into Cleanup 
Conflicts:
	src/game/editor/ed_editor.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
 2010-10-02 03:32:44 +02:00
GreYFoXGTi 16bb3621c3 Not only the main game layer is always on top, all game layers are on top of other layers, but in a specified order to each other. Closes #38. again 2010-10-01 21:28:56 +02:00
GreYFoXGTi c24964ebcd Added tele, speedup, front and switch layer to the client 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-30 23:36:08 +02:00
GreYFoXGTi 896634a061 Total Cleanup 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-30 23:28:06 +03:00
GreYFoXGTi 526e36f8a0 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/client/components/menus.h
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.cpp
	src/game/variables.h
 2010-09-27 06:32:14 +03:00
oy feb7e60bb2 fixed map listing 2010-09-24 13:48:23 +02:00
oy 7e0b37e06c fixed that it checks the current dir for demos too 2010-09-24 13:38:03 +02:00
GreYFoXGTi a02bceafed Added Max Speed 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-22 20:43:23 +03:00
GreYFoXGTi 67a5765c9f Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/game/client/components/camera.cpp
	src/game/client/components/camera.h
	src/game/editor/ed_editor.cpp
	src/game/editor/ed_layer_tiles.cpp

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-19 21:27:40 +03:00
GreYFoXGTi 2ac229f228 Partially Revert "Changed the way Layers are rendered."Closes #38. 
This reverts commit bfd7d11a99.
 2010-09-16 23:08:55 +03:00
oy a2083b31e3 fixed last commit 2010-09-16 12:48:32 +02:00
Choupom 582763bc21 made folders in editor (#80) 2010-09-16 12:28:10 +02:00
GreYFoXGTi 37d9bbf7c5 Brush is never cleared on layer change. 
there are enough checks if it has tiles that doesn't belong.
Closes #33.

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-15 12:11:32 +03:00
GreYFoXGTi bfd7d11a99 Changed the way Layers are rendered. Closes #31. 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-09-15 11:47:45 +03:00
oy 995d63d7f4 added the possibility to rotate tiles in the editor by SushiTee 2010-09-05 19:01:01 +02:00
GreYFoXGTi 3a444a3b22 I did this fine in the morning (in the lost commit) but now it just doesn't work :s 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-28 01:30:50 +02:00
GreYFoXGTi fd7c0c39ac Reworked the Front Layer after reworking the front layer a similar bug was found, but this time fixed on double save, so i added a work around that double saves ( I'm not proud of this T.T ) 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-27 08:14:47 +02:00
GreYFoXGTi b3736dded4 Bye Bye Client-Side Front Layer T.T ( getting ready for a full rework of the front layer ) 
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-27 06:23:34 +02:00
GreYFoXGTi 7f8fb7a5a7 Merging the client manually into the server 
but i can't get the client to accept the console class of the server -.-" yet..

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
 2010-08-25 17:31:49 +02:00
oy 41afca6db2 added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8 2010-08-25 01:17:02 +02:00
oy 8cd7093c63 added localisation fixes and map editor tool tips by sworddragon 2010-08-24 23:44:25 +02:00
oy cabecb7fa9 added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8 2010-08-18 00:06:00 +02:00
oy 4c2dcc4f2b added localisation fixes and map editor tool tips by sworddragon 2010-08-16 01:29:11 +02:00
oy 9753f62d46 added tool tip for value selector button in the editor 2010-08-10 13:47:33 +02:00
oy d471663913 added localisation fixes by fujnky 2010-08-09 00:35:37 +02:00
oy 2967c57ddc added possibility to delete envelopes and to save their names within a map by sushitee 2010-08-06 20:18:53 +02:00
oy bc8274f48b fixed last commit 2010-07-18 13:44:30 +02:00
SushiTee 97204482e2 fixed issue #150 
holding CTRL while moving a point allows to be a lot more precise
 2010-07-18 13:33:34 +02:00
SushiTee b6d07edda8 fixed issue #57 2010-07-17 20:05:17 +02:00
xalduin 052820dc88 Issue #92, fixed scrollbars in editor 2010-07-04 16:59:02 +02:00