Commit graph

23 commits

Author SHA1 Message Date
GreYFoXGTi 78ee6148f8 SortHash
Loading String
2011-02-16 12:22:55 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
heinrich5991 88c0d6cfa8 filter all "no-ddrace-flags server" when a flag is required or forbidden, strictly use the flag version, fixed flag version handling 2011-02-09 23:06:14 +01:00
GreYFoXGTi 4ca79188dc DDRace Flags Finalized 2011-02-05 06:13:32 +02:00
GreYFoXGTi 9db333dfee Re-enabled flag sending 2011-02-05 03:14:17 +02:00
GreYFoXGTi 0aa3e8f546 Forgot to do this with the other DDRace Flags 2011-01-30 21:11:32 +02:00
GreYFoXGTi f1b002e7fa DDRace flags for the server browser (client-sided).
Some fixes in the server sided part.
One task left, Adding the flags to SortHash(), added Todo in the code.
2011-01-30 18:21:41 +02:00
GreYFoXGTi 2151883b43 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/game/gamecore.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/pickup.cpp
	src/game/server/entities/projectile.cpp
	src/game/server/entity.h
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
	src/game/variables.h
2011-01-20 16:10:32 +02:00
oy 7ca7c95bc0 limit the latency within server browser entries to a maximum of 999 2011-01-19 15:54:50 +01:00
GreYFoXGTi ddc5dd7ab3 Cleaned up & Re-arranged stuff 2011-01-06 05:46:10 +02:00
GreYFoXGTi 1d9190fd5b Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/russian.txt
	readme.txt
	src/game/variables.h
2011-01-06 01:49:58 +02:00
m!nus 7b46d386dd requesting serverinfo now uses gie2 instead of the legacy gief. 2011-01-05 12:22:45 +01: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 a109e1150d Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/shared/config_variables.h
	src/game/client/components/console.cpp
	src/game/client/gameclient.cpp
	src/game/editor/ed_editor.h
	src/game/server/gamecontext.cpp
2010-11-18 01:10:59 +02:00
oy f1ce0d1949 improved loading progression in the server browser 2010-11-17 12:43:24 +01:00
Choupom a7f37446b6 added loading progression in server browser 2010-11-17 12:31:44 +01:00
heinrich5991 684e1788ed added strict gametype filtering 2010-10-19 17:18:32 +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 41afca6db2 added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8 2010-08-25 01:17:02 +02:00
oy cabecb7fa9 added output level for console print function, categorised the debug messages and merged them into the new functionality. Closes #8 2010-08-18 00:06:00 +02:00
oy 5a237c6f78 fixed utf8 problem with empty entries in the server browser 2010-08-12 19:29:59 +02:00
Magnus Auvinen 72c06a2589 copied refactor to trunk 2010-05-29 07:25:38 +00:00