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 |
|
GreYFoX
|
cc63cf2553
|
Merge branch 'master' of git://github.com/oy/teeworlds
Conflicts:
src/engine/external/pnglite/pnglite.c
src/engine/external/pnglite/pnglite.h
src/engine/shared/config_variables.h
src/game/client/components/menus_browser.cpp
src/game/server/entities/character.cpp
src/game/server/entities/laser.cpp
src/game/server/gamecontext.cpp
src/game/server/player.cpp
src/game/version.h
|
2011-05-09 18:36:13 +02:00 |
|
Choupom
|
694be7dfb5
|
fixed the pnglite fix
|
2011-05-03 18:44:55 +02:00 |
|
Choupom
|
f1df704d78
|
fixed pnglite requiring a std header include
|
2011-05-03 18:44:46 +02:00 |
|
Choupom
|
bbd7a75849
|
fixed a pnglite crash on save if the image is too small
|
2011-05-03 18:43:26 +02: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
|
a41d930a85
|
fixed some compiler warnings. Closes #76
|
2010-06-06 17:16:52 +02:00 |
|
Magnus Auvinen
|
6eb17ec50c
|
corrected the zlib include
|
2008-11-08 08:28:24 +00:00 |
|
Joel de Vahl
|
4bf60da04b
|
random win32 fixes
|
2007-10-02 14:14:58 +00:00 |
|
Joel de Vahl
|
aca6dd808b
|
new mixer and ppc fixes
|
2007-09-25 19:48:52 +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 |
|