GreYFoXGTi
|
2f5f332cbb
|
Merge branch 'master' into DDRace
Conflicts:
src/engine/client/client.cpp
src/engine/shared/config_variables.h
|
2010-12-13 03:43:22 +02:00 |
|
oy
|
c75a75b64f
|
made it possible to automatically take game over screenshots. Closes #339
|
2010-12-12 16:48:13 +01:00 |
|
GreYFoXGTi
|
46c2225d60
|
Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/russian.txt
scripts/make_release.py
src/engine/shared/config_variables.h
|
2010-12-11 21:28:43 +02:00 |
|
oy
|
a0985314c9
|
made it possible to "recycle" auto recorded demos
|
2010-12-11 18:55:28 +01:00 |
|
GreYFoXGTi
|
2c51511260
|
Merge branch 'master' of http://github.com/oy/teeworlds into DDRace
Conflicts:
src/engine/client/client.cpp
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/game/client/gameclient.cpp
|
2010-12-10 20:58:53 +02:00 |
|
oy
|
4756c031c5
|
save auto recorded demos in a separate folder and added an option to enable/disable it in the settings menu
|
2010-12-08 01:55:13 +01:00 |
|
oy
|
0fe8cabe78
|
added auto recording support by Batchyx
|
2010-12-08 01:42:32 +01:00 |
|
oy
|
db9dd6b8c9
|
added an optional time stamp to a demo record by Batchyx
|
2010-12-08 00:42:32 +01:00 |
|
oy
|
bd9850cae2
|
added single function to stop recording by Batchyx
|
2010-12-08 00:02:24 +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
|
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
|
896634a061
|
Total Cleanup
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-30 23:28:06 +03:00 |
|
GreYFoXGTi
|
fa379a806a
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/server/server.cpp
src/game/client/components/scoreboard.cpp
src/game/server/gamecontext.cpp
src/game/server/player.cpp
|
2010-09-13 07:49:01 +03:00 |
|
oy
|
d913af1ab2
|
renamed demorec files to demo
|
2010-09-12 12:16:51 +02:00 |
|
btd
|
909c583d96
|
End merge
|
2010-08-26 00:30:21 +04: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
|
3797eba179
|
added demo recording button by fujnky
|
2010-08-09 14:14:15 +02:00 |
|
oy
|
3f0ff1fb14
|
removed ServerDummy function cause it isn't needed anymore(actual console separates client and server commands) and added two missing server commands to the tab completion
|
2010-08-07 00:01:43 +02:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|
Magnus Auvinen
|
e56feb597b
|
added missing headers
|
2009-10-29 12:14:31 +00:00 |
|
Magnus Auvinen
|
f826bc6cac
|
larger update. reduced the amount of video memory used from ~60 to ~36mb on a typical map
|
2007-07-30 19:46:31 +00:00 |
|
Magnus Auvinen
|
2231cd8c39
|
various small changes
|
2007-07-22 12:01:20 +00:00 |
|
Olle Rosenquist
|
26dd1c20ce
|
Updated stuff
|
2007-07-22 11:53:15 +00:00 |
|