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
|
071fb6a5a3
|
new Switch System //TODO Rendering Rotation
|
2010-11-14 02:39:04 +02:00 |
|
GreYFoXGTi
|
e43bcd80db
|
Rotation
FTW
|
2010-11-01 03:51:17 +02:00 |
|
GreYFoXGTi
|
33c8265110
|
Properly Fixed the Stopper + Hook bug
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-29 17:45:54 +03:00 |
|
GreYFoXGTi
|
42d3829304
|
If you are Super You can Fly!!
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-17 14:26:06 +03:00 |
|
btd
|
fec294caee
|
Fix linux compilation. Revert last changes. Add /show_other option (in menu now working)
|
2010-09-08 20:22:11 +04:00 |
|
btd
|
86cd59b907
|
Separate teams data, now i hope collision only in teams. Need to test, i cannot do this at work :'(
|
2010-08-30 16:13:43 +04:00 |
|
btd
|
e611357dd5
|
I need to think how make it better
|
2010-08-29 16:28:21 +04:00 |
|
GreYFoXGTi
|
e7721811dd
|
Added Fluxid's HookThrough
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-08-21 04:20:01 +02:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|