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 |
|