GreYFoX
|
1446d0980b
|
Merge branch 'master' of git://github.com/oy/teeworlds into DDRace
* Version 1.098a
Conflicts:
bam.lua
src/game/client/gameclient.h
src/game/mapitems.h
|
2011-12-05 11:32:01 +02:00 |
|
oy
|
7d109a2c58
|
forgot some files
|
2011-12-04 22:36:11 +01:00 |
|
|
oy
|
f12095fb51
|
fixed win64 building
|
2011-12-04 22:28:58 +01:00 |
|
|
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
|
f5fff81abb
|
linked the runtime library statically within sdl. Closes #797
|
2011-07-23 19:54:49 +02:00 |
|
|
oy
|
4869d0ed35
|
added a SDL dll built with the latest 1.2 source which can handle accented character input. Closes #745
|
2011-07-05 18:04:09 +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 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|
|
Magnus Auvinen
|
878ede3080
|
major update with stuff
|
2009-10-27 14:38:53 +00:00 |
|
|
Magnus Auvinen
|
4bb1df3189
|
moved 0.5 branch to trunk
|
2009-05-31 09:44:20 +00:00 |
|
|
Magnus Auvinen
|
c3b6b87b5a
|
upgraded to bam 0.2.0
|
2009-01-08 09:48:42 +00:00 |
|
|
Magnus Auvinen
|
7c3eb2d6db
|
made sdl like a little bampack
|
2008-11-29 10:19:00 +00:00 |
|