GreYFoX
|
35d16bd58c
|
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611
Conflicts:
src/engine/console.h
src/engine/server.h
src/engine/server/server.cpp
src/engine/shared/config_variables.h
src/engine/shared/console.cpp
src/engine/shared/console.h
src/engine/shared/network_server.cpp
src/game/client/components/console.cpp
src/game/client/components/console.h
src/game/client/components/menus_browser.cpp
src/game/client/gameclient.cpp
src/game/editor/editor.cpp
src/game/editor/editor.h
src/game/editor/io.cpp
src/game/editor/layer_tiles.cpp
src/game/editor/popups.cpp
src/game/gamecore.cpp
src/game/mapitems.h
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontroller.cpp
src/game/server/gamecontroller.h
src/game/server/gamemodes/ctf.cpp
src/game/server/player.cpp
src/game/variables.h
|
2011-08-13 02:01:40 +02:00 |
|
oy
|
34132ce244
|
fixed client crash in debug
|
2011-07-31 01:38:45 +02:00 |
|
|
oy
|
fb309436b4
|
improved friends feature
|
2011-06-26 17:10:13 +02:00 |
|
|
GreYFoX
|
f7f6058a92
|
Merged Oy, Cleaned up, removed some useless features and code parts
Added Icon by landil
alot more...
|
2011-04-09 22:32:17 +02:00 |
|
|
oy
|
ab810cab25
|
fixed that player options just show players as friends not clans
|
2011-04-02 19:51:05 +02:00 |
|
|
oy
|
85e9fb1e63
|
made it possible to add just a clan as friend
|
2011-03-31 21:30:28 +02:00 |
|
|
oy
|
ae325c873f
|
added friends feature. Closes #24
|
2011-03-23 13:06:35 +01:00 |
|