GreYFoX
|
ee670118a5
|
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
Conflicts:
src/engine/console.h
src/engine/server/server.cpp
src/engine/server/server.h
src/engine/shared/config.h
src/engine/shared/console.cpp
src/engine/shared/console.h
src/engine/shared/network_server.cpp
@heinrich5991 todo
|
2012-01-01 00:11:56 +02:00 |
|
oy
|
80835d2c11
|
added version files for pnglite and wavepack(both up-to-date). Closes #900
|
2011-12-29 14:00:28 +01: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 |
|
Magnus Auvinen
|
4004d13b48
|
applied patch from Richie Nyhus to convert CRLF to LF, as it should be
|
2008-11-29 06:39:22 +00:00 |
|
Magnus Auvinen
|
f9162202b0
|
fixed some C errors
|
2007-10-06 17:01:06 +00:00 |
|
Magnus Auvinen
|
8b3c16e615
|
major engine cleanup. dependency on baselib removed. engine is now C code (not ansi tho). some other cruft removed aswell
|
2007-08-22 07:52:33 +00:00 |
|