GreYFoXGTi
|
3956c34b6d
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/russian.txt
|
2010-12-16 04:15:05 +02:00 |
|
oy
|
6063b4c14d
|
added auto completion of nicknames and highlighted nicknames in chat. Closes #218
|
2010-12-16 02:31:12 +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
|
ddf2883cb2
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/client/client.cpp
src/engine/server/server.cpp
src/engine/shared/console.cpp
src/game/server/gamecontext.cpp
|
2010-10-16 21:59:59 +02:00 |
|
|
oy
|
764ee3fd17
|
optimised chat rendering a bit
|
2010-10-15 19:26:20 +02:00 |
|
|
GreYFoXGTi
|
e46dd6b5e6
|
Merge branch 'master' of http://github.com/oy/teeworlds
|
2010-10-11 19:45:14 +02:00 |
|
|
oy
|
eb4a56edeb
|
tweaked auto scrolling in the chat window a bit
|
2010-10-11 12:31:45 +02:00 |
|
|
GreYFoXGTi
|
d8e6cfcbdd
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
data/languages/french.txt
src/engine/client/client.cpp
src/engine/server/server.cpp
src/game/server/gamecontext.cpp
|
2010-10-11 03:56:58 +02:00 |
|
|
oy
|
411db8b885
|
fixed that chat message gets out of the window. Closes #102
|
2010-10-11 02:29:30 +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
|
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
|
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 |
|
Thomas
|
361380d630
|
*some esthetic changes
*split "CHud::RenderGoals()"
*added "reload" command
*added the ability to show last chat lines (+show_chat)
*updated french.txt
|
2010-05-30 12:01:11 +00:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|