GreYFoXGTi
526e36f8a0
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/client/components/menus.h
src/game/client/gameclient.cpp
src/game/editor/ed_editor.cpp
src/game/variables.h
2010-09-27 06:32:14 +03:00
oy
27425facff
fixed last commit
2010-09-24 13:21:03 +02:00
Choupom
aa46c22e10
now put skins in an array to save memory
2010-09-24 13:13:46 +02:00
GreYFoXGTi
0c0c231f13
Merge branch 'master' of http://github.com/GreYFoXGTi/teeworlds into master3
...
Conflicts:
src/game/client/components/maplayers.cpp
src/game/variables.h
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 07:59:51 +02:00
GreYFoXGTi
9499e04fd7
Removed gfx clear from settings file. Closes #15 .
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-07 06:45:36 +02:00
GreYFoXGTi
f9f780ff28
Fixed lags and crashes on kp0 in-game. Closes #149
...
Closes #86
Added dbg_layers which is 0 by default to prevent Debug files output when when ingame and pressing kp0
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-05 05:29:27 +02:00
GreYFoXGTi
8901057944
Modified the config variables to have level
...
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-08-31 01:47:55 +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
GreYFoXGTi
eb9793d89a
Moved all used server variables to config_variables.h
...
tried to fix /pause and failed cause i can't get the hooked player's character to check if he is paused or not
changed welcome message default.
on join player sees the server's /info
Signed-off-by: GreYFoXGTi <GreYFoXGTi@Gmail.com>
2010-07-29 22:51:58 +03:00
GreYFoXGTi
434b4aad86
The Porting of DDRace-Beta to trunk by [BlackTee] den Maps with one and two layer works properly. Laser works. Fix second game layer Re-added logs Readded the rcon commands addvote and scoring system and time Fixed Weapons
...
Signed-off-by: btd <bardadymchik@gmail.com>
2010-07-29 08:59:32 +03:00
Magnus Auvinen
72c06a2589
copied refactor to trunk
2010-05-29 07:25:38 +00:00
