GreYFoXGTi
e803f30f52
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/server/entities/character.cpp
src/game/server/entities/flag.cpp
src/game/server/player.cpp
src/game/variables.h
2010-12-16 06:06:23 +02:00
oy
8aeb3e7ada
enable "Always show nameplats disregarding of distance" on default. Closes #343
2010-12-16 04:22:14 +01:00
GreYFoXGTi
157aafd4dd
Merge branch 'master' into DDRace
...
Conflicts:
src/engine/server/server.cpp
src/game/variables.h
2010-12-11 23:57:41 +02:00
oy
3d54cf0585
nameplates on by default. Closes #322
2010-12-11 22:41:58 +01:00
GreYFoXGTi
83cea23373
Reworked some stuff
2010-12-03 14:58:38 +02:00
GreYFoXGTi
5d9ee1736e
made the code so it would have less conflicts in the future and Merged branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
data/languages/dutch.txt
data/languages/french.txt
data/languages/german.txt
data/languages/russian.txt
src/game/server/entities/flag.cpp
src/game/server/entities/flag.h
src/game/server/gamecontext.cpp
src/game/server/gamemodes/ctf.cpp
src/game/server/gamemodes/ctf.h
src/game/server/gamemodes/dm.cpp
src/game/server/gamemodes/dm.h
src/game/server/gamemodes/mod.cpp
src/game/server/gamemodes/tdm.cpp
src/game/server/gamemodes/tdm.h
2010-11-22 00:26:00 +02:00
Sworddragon
fc9211c777
Updated copyrights
2010-11-20 21:26:06 +01:00
GreYFoXGTi
505a5b4172
Refactoring
2010-10-29 23:29:07 +02:00
btd
1f0e49c080
Add my old zoom staff
2010-10-17 12:43:27 +04:00
GreYFoXGTi
47714c9468
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/variables.h
2010-10-13 14:08:35 +02:00
oy
c828f7d725
removed unused commands. Closes #60
2010-10-13 01:24:37 +02:00
GreYFoXGTi
040ba467bf
Changed The lowest level to -1 ( has chat but no rcon )
...
made rcon for level 0 open by default users can use logout or login/auth or in normal consol rcon_auth to raise their level
2010-10-11 02:39:08 +02:00
GreYFoXGTi
ef139eb73a
Cleanup (Putting stuff back vanilla like)
2010-10-10 16:11:11 +02:00
GreYFoXGTi
40d2068c70
Merge branch 'master' of http://github.com/oy/teeworlds
...
Conflicts:
src/game/editor/ed_editor.cpp
src/game/editor/ed_editor.h
src/game/editor/ed_layer_tiles.cpp
src/game/server/gamecontroller.cpp
src/game/server/player.cpp
src/game/variables.h
2010-10-10 14:36:02 +02:00
oy
cd95f1869e
added inactive player kicking. Closes #51
2010-10-09 19:14:42 +02:00
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
