Commit graph

42 commits

Author SHA1 Message Date
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 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 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 071fb6a5a3 new Switch System //TODO Rendering Rotation 2010-11-14 02:39:04 +02:00
GreYFoXGTi 1620e071d9 Removed a Tile and ensured stopper server side 2010-11-01 16:21:05 +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
GreYFoXGTi 6ca75f086e Merge branch 'master' of http://github.com/oy/teeworlds 2010-10-08 13:37:38 +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 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 72e05efc53 Added Evil Teleporter,
Added Speed Setters to speedup layer
Added Unfreeze Plasma
Supposedly Fixed Crazy Shotgun (needs Testing)

Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-11 02:01:15 +02:00
GreYFoXGTi ca7e8de0e5 Shame on me ( takes 1 else to fuck me up )
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 02:07:01 +02:00
GreYFoXGTi 2208aad385 Just Making Sure
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-28 01:45:48 +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 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 2967c57ddc added possibility to delete envelopes and to save their names within a map by sushitee 2010-08-06 20:18:53 +02:00
Tom Adams 54692ceaf1 added fix for editor->append by xalduin 2010-05-31 21:55:45 +00: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
Dominik Geyer 397b9a764b data-dir autodetection; data-dir override; compiled-in data-dir; messagebox if detection fails; does chdir into data-dir 2008-10-01 17:16:22 +00:00
Magnus Auvinen f6c67c29cd large commit with loads of clean up. more is comming 2008-06-12 10:51:48 +00:00
Magnus Auvinen 1f246d9dcb fixed protection so that the fonts doesn't get resampled 2008-03-29 11:55:42 +00:00
Magnus Auvinen 7a3874745c fixed loads of graphical optimizations 2008-03-29 11:44:03 +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 65e074db91 fixed some more editor stuff 2008-03-21 00:13:55 +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 23ffe1ff65 updated to svn version of portaudio. fixed a couple of issues with linux and multiple sound devices. 2008-03-05 19:38:47 +00:00
Magnus Auvinen 5f32f5b36f added laser weapon 2008-02-02 18:05:16 +00:00
Magnus Auvinen f9782f628f support for external images in the map editor 2008-01-19 14:23: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