GreYFoXGTi
|
2ec0e0eec4
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/shared/console.cpp
src/game/client/components/hud.cpp
src/game/client/components/scoreboard.cpp
src/game/server/entities/character.cpp
src/game/server/entities/projectile.cpp
|
2011-01-12 11:08:17 +02:00 |
|
oy
|
41b8022aa1
|
record a new demo when a game ends. Closes #358
|
2011-01-06 23:21:51 +01:00 |
|
|
GreYFoXGTi
|
ddc5dd7ab3
|
Cleaned up & Re-arranged stuff
|
2011-01-06 05:46:10 +02:00 |
|
|
GreYFoXGTi
|
c5648311ed
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/german.txt
src/game/client/components/scoreboard.cpp
src/game/editor/ed_layer_tiles.cpp
src/game/server/entities/character.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/variables.h
|
2011-01-04 22:37:09 +02:00 |
|
|
oy
|
bcba9e5c89
|
moved HslToRgb stuff
|
2011-01-04 11:58:25 +01:00 |
|
|
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
|
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 |
|
btd
|
418875b5e5
|
Add score board time, need to add in server send time for players if someone enter
|
2010-11-04 19:39:04 +03:00 |
|
|
GreYFoXGTi
|
505a5b4172
|
Refactoring
|
2010-10-29 23:29:07 +02:00 |
|
|
btd
|
61092f7baa
|
Begin show_others
Signed-off-by: btd <bardadymchik@gmail.com>
|
2010-10-23 23:26:10 +04:00 |
|
|
GreYFoXGTi
|
e900e7f4db
|
Changes Required by Teams for Client
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-30 23:31:11 +03:00 |
|
|
GreYFoXGTi
|
896634a061
|
Total Cleanup
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-30 23:28:06 +03:00 |
|
|
GreYFoXGTi
|
8e066517ad
|
Merge branch 'master' of http://github.com/btd/DDRace
Conflicts:
src/game/server/gamecontext.cpp
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
|
2010-09-15 05:57:34 +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
|
e226b47212
|
close the emote selector, chat history and the scoreboard when closing the chat, console or ingame menu. Closes #111
|
2010-09-12 12:43:03 +02:00 |
|
|
btd
|
4544b91d2f
|
Teams collision a works fine... But i broke collision with tiles
|
2010-08-30 23:25:04 +04: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
|
1cfa122521
|
fixed that scoreboard overlaps the chat. Closes #14
|
2010-08-24 23:48:27 +02:00 |
|
|
oy
|
538d968349
|
fixed that scoreboard overlaps the chat. Closes #14
|
2010-08-18 03:57:35 +02:00 |
|
|
oy
|
d01fb2eb78
|
added missing information in debug mode. Closes #77
|
2010-08-13 03:07:51 +02:00 |
|
|
oy
|
3797eba179
|
added demo recording button by fujnky
|
2010-08-09 14:14:15 +02:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|