GreYFoXGTi
|
ddc5dd7ab3
|
Cleaned up & Re-arranged stuff
|
2011-01-06 05:46:10 +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
|
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
|
f41d4851d2
|
Cleanup a bit and modified the binary name
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
|
2010-07-29 10:40:27 +03:00 |
|
Fujnky
|
5849aeb86c
|
Merge branch 'master' of git://github.com/matricks/teeworlds
Conflicts:
src/game/server/gamemodes/ctf.cpp
|
2010-06-03 17:47:32 +02:00 |
|
Magnus Auvinen
|
a6ab379e67
|
fixed so that the same distance is used when leaving off the flag and taking it
|
2010-06-03 17:40:01 +02:00 |
|
|
Magnus Auvinen
|
4c0886f087
|
renamned m_pCarryingCCharacter correctly
|
2010-05-29 11:26:17 +00:00 |
|
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|