edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-22 02:24:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
2883 commits 1 branch 424 tags 417 MiB
Commit graph

205 commits

Author SHA1 Message Date
GreYFoXGTi 55794249c8 No Front Layer by Default 
Makes it possible to map other game types too
 2011-02-16 12:01:51 +02:00
GreYFoXGTi 2bbd28bb6d Bigger default Quad for Convenient Zoom 2011-02-16 11:57:54 +02:00
GreYFoXGTi 718d697707 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/collision.cpp
	src/game/collision.h
	src/game/gamecore.cpp
	src/game/server/gamecontext.cpp
 2011-02-13 19:36:53 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
GreYFoXGTi 68a1a29db8 Reverted 1 Letter Refactoring or Edited it to a full name. 2011-02-13 12:57:10 +01:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
oy d12db45c48 added editor function to construct different game tiles from a layer. Closes #460 2011-02-12 19:10:45 +01:00
GreYFoXGTi cf881cb74c Fixed Switch layer tiles loading 2011-02-10 09:00:56 +02:00
GreYFoXGTi 3da1860654 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/dutch.txt
 2011-02-04 18:54:54 +02:00
oy be68a4f516 added fix by CarmineZ about missing tool tips in the editor 2011-01-29 18:48:55 +01:00
SushiTee c0b905f852 -fixed compiler warnings 
-fixed mac compiling
 2011-01-26 14:45:44 +02:00
GreYFoXGTi 5b51295185 Added Deep freeze/unfreeze to switch layer so that it can be controlled with switches 
fixed the freeze command

Added Freeze Tile to switch layer to set freeze tile custom delay

Added sv_freeze_delay to control default freeze time delay
 2011-01-25 12:05:53 +02:00
GreYFoXGTi 6889adc0bb Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	.gitignore
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h & Cleaned it up
 2011-01-06 23:32:19 +02:00
oy 7487a22956 added better texture moving in the editor by nsinreal. Closes #372 2011-01-06 21:58:42 +01:00
oy 73010e7d2e removed a debug message. Closes #373 2011-01-06 13:21:13 +01:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
GreYFoXGTi c5648311ed Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/german.txt
	src/game/client/components/scoreboard.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/variables.h
 2011-01-04 22:37:09 +02:00
oy 336f00ae89 added colours for tile layers by Choupom 2011-01-04 11:38:14 +01:00
Choupom b565d4ab18 fixed so Make/Clear Collision buttons are hidden on game layer 2011-01-03 12:54:29 +01:00
GreYFoXGTi a8efcfcb5a Fixed CrossMap Tiles Copy 2010-12-19 16:10:42 +02:00
GreYFoXGTi ccbd057255 Revert merge branch 14.11 converter merged by noother 2010-12-19 04:02:59 +02:00
GreYFoXGTi e803f30f52 Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/game/server/entities/character.cpp
	src/game/server/entities/flag.cpp
	src/game/server/player.cpp
	src/game/variables.h
 2010-12-16 06:06:23 +02:00
oy a3797482da removed 360 degree rotation in the editor. Closes #352 2010-12-16 04:27:00 +01:00
GreYFoXGTi 73dbc159bc Merge branch 'master' of github.com:GreYFoXGTi/DDRace 2010-12-16 04:11:02 +02:00
GreYFoXGTi 2f5f332cbb Merge branch 'master' into DDRace 
Conflicts:
	src/engine/client/client.cpp
	src/engine/shared/config_variables.h
 2010-12-13 03:43:22 +02:00
oy c75a75b64f made it possible to automatically take game over screenshots. Closes #339 2010-12-12 16:48:13 +01:00
GreYFoXGTi ade61b33b1 removed useless dbg_msg 2010-12-12 04:06:01 +02:00
GreYFoXGTi 4510ced422 Merge branch 'DDRace' of github.com:GreYFoXGTi/teeworlds into DDRace 2010-12-10 21:20:34 +02:00
GreYFoXGTi 2c51511260 Merge branch 'master' of http://github.com/oy/teeworlds into DDRace 
Conflicts:
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/game/client/gameclient.cpp
 2010-12-10 20:58:53 +02:00
oy 7414271309 check the return values of RemoveFile and CreateFolder 2010-12-07 23:47:41 +01:00
GreYFoXGTi aa30c29b35 Fixed Some Editor Mistakes 2010-12-07 17:51:59 +02:00
GreYFoXGTi 987881c02a Further More Editor Improvements 2010-12-04 14:05:14 +02:00
GreYFoXGTi a0a16e0f48 Few Editor Improvements 2010-12-04 13:54:53 +02:00
GreYFoXGTi a1f500766e lalalalalalalalalaaaaaaa 2010-11-23 20:04:36 +02:00
GreYFoXGTi c4b047a6bb i do have an excuse, i am ill.... 2010-11-23 19:59:36 +02:00
GreYFoXGTi 4e8a4340b8 Made Old Switches Convert to new Switches 2010-11-23 11:43:52 +02:00
GreYFoXGTi 32c8a349f5 Made An Older Switch Layer Converter 2010-11-23 11:36:57 +02:00
GreYFoXGTi 4737588827 New Delayed Switches 2010-11-22 23:10:12 +02:00
GreYFoXGTi 5d9ee1736e made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	data/languages/dutch.txt
	data/languages/french.txt
	data/languages/german.txt
	data/languages/russian.txt
	src/game/server/entities/flag.cpp
	src/game/server/entities/flag.h
	src/game/server/gamecontext.cpp
	src/game/server/gamemodes/ctf.cpp
	src/game/server/gamemodes/ctf.h
	src/game/server/gamemodes/dm.cpp
	src/game/server/gamemodes/dm.h
	src/game/server/gamemodes/mod.cpp
	src/game/server/gamemodes/tdm.cpp
	src/game/server/gamemodes/tdm.h
 2010-11-22 00:26:00 +02:00
oy 97a7dea152 added localisation updates by Sworddragon 2010-11-21 14:25:00 +01:00
oy e4f1e18c4e fixed entry names in the demo browser and the editor's file dialog. Closes #301 2010-11-21 12:33:13 +01:00
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01:00
GreYFoXGTi a109e1150d Merge branch 'master' of http://github.com/oy/teeworlds 
Conflicts:
	src/engine/shared/config_variables.h
	src/game/client/components/console.cpp
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
 2010-11-18 01:10:59 +02:00
oy d94355729d added icons in the demo browser and the editor's file dialog. Closes #209 2010-11-17 19:46:50 +01:00
oy 3d3572f845 fixed some compiler warnings 2010-11-17 18:36:19 +01:00
oy ca80d2a347 reload the map on save just when the map name is equal 2010-11-17 13:08:29 +01:00
Choupom 57a9235997 reload the map on save if you are authed 2010-11-17 12:30:42 +01:00
GreYFoXGTi 2d7eae757e Fixed Switch layer Saving 
Next Ticks and Rotations Fix
 2010-11-14 11:18:29 +02:00
GreYFoXGTi 209078c85e Different Entities Picture 2010-11-14 03:03:24 +02:00
GreYFoXGTi 071fb6a5a3 new Switch System //TODO Rendering Rotation 2010-11-14 02:39:04 +02:00