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
|
0121f27311
|
fixed server crash on too many snap items. Closes #317
|
2010-12-16 03:29:08 +01: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
|
071fb6a5a3
|
new Switch System //TODO Rendering Rotation
|
2010-11-14 02:39:04 +02:00 |
|
|
GreYFoXGTi
|
0b1b949a3c
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamemodes/ctf.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-09 05:37:08 +02:00 |
|
Choupom
|
532ea85aeb
|
separated CFlag from ctf
|
2010-09-07 20:02:46 +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 |
|