Commit graph

41 commits

Author SHA1 Message Date
GreYFoXGTi 461abbaa7e Fixed Scoreboard cl_show_ids 2010-11-29 04:46:45 +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 a764ebc1a8 Merge branch 'master' of http://github.com/oy/teeworlds 2010-11-20 11:00:41 +02:00
oy 32e52d51ce added a missing localisation 2010-11-19 20:20:51 +01:00
btd 081c5d8bc2 Fix score board and small perfomance improvments 2010-11-05 14:56:44 +03:00
btd 418875b5e5 Add score board time, need to add in server send time for players if someone enter 2010-11-04 19:39:04 +03:00
heinrich5991 9cf90fff77 added config for showing client ids in scoreboard 2010-10-13 22:47:28 +02:00
GreYFoXGTi 921dd65d3d Added id numbers to the scoreboard. Closes #71.
added shortcuts to the gitignore
2010-10-12 15:12:44 +02:00
GreYFoXGTi d8e6cfcbdd Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/french.txt
	src/engine/client/client.cpp
	src/engine/server/server.cpp
	src/game/server/gamecontext.cpp
2010-10-11 03:56:58 +02:00
oy 107545da0a localised "REC"-notification 2010-10-11 00:16:37 +02:00
GreYFoXGTi 896634a061 Total Cleanup
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-30 23:28:06 +03:00
GreYFoXGTi 3ffbd91fca revert the score board
Signed-off-by: GreYFoXGTi <GreYFoXGTi@GMaiL.CoM>
2010-09-13 07:50:00 +03:00
GreYFoXGTi fa379a806a Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/server/server.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/gamecontext.cpp
	src/game/server/player.cpp
2010-09-13 07:49:01 +03:00
oy a3337a68e7 fixed that player name and ping overlap in the scoreboard. Closes #106 2010-09-12 13:26:38 +02:00
oy daab7fdcd4 fixed that score overlaps in the scoreboard. Closes #161 2010-09-12 13:06:55 +02:00
oy e226b47212 close the emote selector, chat history and the scoreboard when closing the chat, console or ingame menu. Closes #111 2010-09-12 12:43:03 +02:00
GreYFoXGTi d1b3e01892 Merge branch 'master' of http://github.com/oy/teeworlds 2010-09-07 21:49:12 +02:00
oy ea25972e21 added rec notification by ghost91-. Closes #82 2010-09-07 19:03:59 +02:00
btd 909c583d96 End merge 2010-08-26 00:30:21 +04: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 1cfa122521 fixed that scoreboard overlaps the chat. Closes #14 2010-08-24 23:48:27 +02:00
oy 538d968349 fixed that scoreboard overlaps the chat. Closes #14 2010-08-18 03:57:35 +02:00
oy 02c7e3642a clear active motd message when the game is over 2010-08-15 15:48:56 +02:00
oy c42679a10e cut too long player names in the server browser. Closes #151
fixed overlapping of too long player names in the scoreboard
2010-07-02 14:14:41 +02:00
Tom Adams baa57830ad fixed bubble sort loop (#802), 2 entries in the language files and a possible overrun 2010-05-29 23:57:30 +00: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 ab171f8f30 updated localization 2009-06-15 07:34:25 +00:00
Magnus Auvinen 4bb1df3189 moved 0.5 branch to trunk 2009-05-31 09:44:20 +00:00
Alfred Eriksson 82f9be8ce0 added help messages for all commands. added syntax in the help msg 2009-01-24 14:10:26 +00:00
Magnus Auvinen 5f186c8906 fixed so the console show help for each command. not all commands have descriptions however 2009-01-24 13:12:04 +00:00
Magnus Auvinen 9d51d47cea added tab completion to the console. works for local and remote 2009-01-24 12:16:02 +00:00
Magnus Auvinen d15860e44f renamed gc_render* to render* 2008-10-20 23:46:39 +00:00
Alfred Eriksson 6a4e17ea85 added round number to the scoreboard 2008-09-07 15:07:08 +00:00
Magnus Auvinen fa266334fd fixed on_console_init and on_save 2008-09-04 21:36:44 +00:00
Magnus Auvinen 04eddacd65 setting of correct game type in game controller. fixed gametype filter in browser. various cleanups 2008-08-31 21:50:14 +00:00
Magnus Auvinen 2e2d31ccc3 fixed the motd correctly 2008-08-30 08:26:36 +00:00
Magnus Auvinen 72ec4f1a9d fixed weapon switching 2008-08-27 20:04:07 +00:00
Magnus Auvinen ae364d4d29 scoreboard fixed 2008-08-27 19:50:33 +00:00
Magnus Auvinen dfe499248f major commit. game client restructure. not complete, loads of stuff not working, but the structure is there 2008-08-27 15:48:50 +00:00