Commit graph

40 commits

Author SHA1 Message Date
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02: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 ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
GreYFoXGTi aa30c29b35 Fixed Some Editor Mistakes 2010-12-07 17:51:59 +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
Sworddragon fc9211c777 Updated copyrights 2010-11-20 21:26:06 +01: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 9fde901705 Removed multipliers and changed initial layer size
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-27 14:44:57 +03: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
oy 08f6e7dd07 added button to resize a quad based on the aspect ratio of the image. Closes #169 2010-09-19 17:12:09 +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 c1611b7ce9 added localisation fixes by sworddragon 2010-08-24 23:44:16 +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 5922cbb56d added localisation fixes by sworddragon 2010-08-16 00:45:04 +02:00
oy 3824d885a2 fixed envelope index in the quad popup, so that it fits the envelope menu. Closes #118 2010-07-18 13:57:17 +02:00
oy bd02c2043e fixed editor popups shown outside the screen 2010-06-28 15:12:43 +02:00
oy 82f5a56d89 fixed crash in the map editor 2010-06-25 18:56:58 +02:00
Fujnky 34bd0a09b7 minor typo fix 2010-06-05 23:37:50 +02:00
Fujnky bf68f803e3 Internationalized editor and updated german localization 2010-06-05 23:36:52 +02:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00
Magnus Auvinen 878ede3080 major update with stuff 2009-10-27 14:38:53 +00:00
Magnus Auvinen bd5b2b9f85 removed glfw and portaudio. SDL is now a requirement 2008-10-23 16:18:33 +00:00
Magnus Auvinen 7a3874745c fixed loads of graphical optimizations 2008-03-29 11:44:03 +00:00
Magnus Auvinen 119bb8a5f8 fixed so that maps are downloaded to maps/. fixed so that you can't select non-existing envelopes in the editor 2008-03-23 12:51:14 +00:00
Magnus Auvinen 45a047ce47 fixed bug in text rendering. added option for detail layers 2008-03-21 17:39:09 +00:00
Magnus Auvinen 78155fa6d7 fixed so you can append maps in the editor. broken the loading of old maps however :D 2008-03-09 23:29:14 +00:00
Magnus Auvinen c20d99b81d added option to delete quads 2008-03-02 15:59:52 +00:00
Magnus Auvinen 323ea57485 removed the option to delete the game layer and group 2008-03-02 15:53:53 +00:00
Magnus Auvinen b5a6dacfa3 fixed naming of images 2008-01-19 13:02:22 +00:00
Magnus Auvinen 57c4765993 editor update and other stuff 2008-01-17 23:09:49 +00:00