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
|
a109e1150d
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/shared/config_variables.h
src/game/client/components/console.cpp
src/game/client/gameclient.cpp
src/game/editor/ed_editor.h
src/game/server/gamecontext.cpp
|
2010-11-18 01:10:59 +02:00 |
|
oy
|
8351682edf
|
added constants for console types by Choupom
|
2010-11-17 13:01:46 +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
|
5f7efb465e
|
optimised console rendering a bit
|
2010-10-16 10:32:56 +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
|
5754812dea
|
clear history of the remote console on disconnect and cleaned up some old stuff in console.cpp
|
2010-10-11 00:30:56 +02:00 |
|
btd
|
909c583d96
|
End merge
|
2010-08-26 00:30:21 +04:00 |
|
|
oy
|
a5113c6740
|
added commands to dump the output of the consoles into a file
|
2010-06-20 14:12:59 +02:00 |
|
|
oy
|
e2c3f744b2
|
added commands to clear the consoles. Closes #104
|
2010-06-19 20:51:54 +02:00 |
|
|
oy
|
b790634a2d
|
scroll the possible commands in the console's tab completion if the wanted one is out of sight. Closes #105
|
2010-06-19 13:48:01 +02:00 |
|
|
oy
|
a41d930a85
|
fixed some compiler warnings. Closes #76
|
2010-06-06 17:16:52 +02:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|