GreYFoXGTi
|
f1a8b6b7ad
|
Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
src/engine/shared/config.h
src/engine/shared/config_variables.h
src/game/client/gameclient.cpp
src/game/server/entities/character.cpp
src/game/server/gamecontext.cpp
src/game/server/gamecontext.h
|
2011-01-24 14:06:55 +02:00 |
|
m!nus
|
05d274444a
|
Add banning to mastersrv: any packet from a banned IP (and optionally a fixed port) will be dropped (also affects clients. Put your bans into master.cfg: "ban 127.0.0.1" or "ban 127.0.0.1:8303". It's reloaded every 5 minutes. This change also adds IStorage, IConsole and IKernel to mastersrv.
|
2011-01-23 17:54:27 +01:00 |
|
|
GreYFoXGTi
|
ddc5dd7ab3
|
Cleaned up & Re-arranged stuff
|
2011-01-06 05:46:10 +02:00 |
|
|
GreYFoXGTi
|
cebbecf632
|
Some Code Improvements and Compiler warnings
|
2010-12-07 19:44:23 +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 |
|
heinrich5991
|
50b8d93d6d
|
finished system to generalize rcon commands, sorry for last commit's description
|
2010-11-07 17:35:11 +01:00 |
|
btd
|
eae1d1e54b
|
My special func ^_^
|
2010-10-31 23:29:41 +03: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 |
|
oy
|
ad9b32b741
|
added the possibility to store commands within the console and execute them later on when everything is initialised correctly - fixes several possible startup crashes and the "Support bans in server configuration"-ticket
|
2010-08-07 20:22:25 +02:00 |
|
Magnus Auvinen
|
72c06a2589
|
copied refactor to trunk
|
2010-05-29 07:25:38 +00:00 |
|