Commit graph

65 commits

Author SHA1 Message Date
GreYFoX 0e5ef2e4f4 Fixed show ids
Fixed missing letter
2011-02-23 18:12:34 +02:00
GreYFoXGTi d9bb3d652c fixed cl_ddrace_scoreboard 2011-02-16 19:11:24 +02:00
GreYFoXGTi 793ea4a499 Don't holdup spawning if tees are there
fixed cl_ddrace_scoreboard
2011-02-16 19:04:41 +02:00
GreYFoXGTi 6904956a14 Added some DDRace Menu Items
Enforced cl_ddrace_cheats on zoom
2011-02-16 11:20:27 +02:00
GreYFoXGTi 2fd0ff1b85 Added Show IDs
and altered last commit
2011-02-15 03:14:32 +02:00
XXLTomate f0201597c6 DDRace Settings-tab
Checkbox for DDRace Scoreboard
2011-02-15 02:36:22 +02:00
GreYFoXGTi f83132448d Merged Oy, Isolated Freeze from Deep Freeze 2011-02-13 19:32:06 +02:00
GreYFoXGTi 1b2703aaba Refactoring & fixed WEAPONSPEC_GUN in content.py 2011-02-12 21:18:41 +01:00
GreYFoXGTi e16bd4d000 Mac Compilation
This may appear un-important, but it's important for mac compilation!
2011-01-29 02:53:33 +02:00
heinrich5991 dc8ec160e5 removed the usage of std::string in scoreboard 2011-01-26 20:54:19 +01:00
SushiTee c0b905f852 -fixed compiler warnings
-fixed mac compiling
2011-01-26 14:45:44 +02:00
GreYFoXGTi 109cbd4e28 The DDRace scoreboard is now for all Race types 2011-01-21 10:07:32 +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 da84771345 removed some old checks 2011-01-18 18:53:19 +01:00
oy 3b3ca9cd67 rearranged the goals within the scoreboard a bit 2011-01-17 16:31:24 +01:00
oy 02db5bfe66 decreased the height of the scoreboard a bit. Closes #417 2011-01-17 13:55:14 +01:00
oy 813f0797d8 fixed scoreboard active check. Closes #423 2011-01-17 13:42:40 +01:00
GreYFoXGTi 2ec0e0eec4 Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	src/engine/shared/console.cpp
	src/game/client/components/hud.cpp
	src/game/client/components/scoreboard.cpp
	src/game/server/entities/character.cpp
	src/game/server/entities/projectile.cpp
2011-01-12 11:08:17 +02:00
oy 1f55237919 made the end game message in team games a bit smaller so it doesn't overlap the scoreboard. Closes #406 2011-01-12 01:10:40 +01:00
oy b60d6deb51 made m_paInfoByScore within gameclient's snap state work and cleaned up render scoreboard 2011-01-11 23:03:01 +01:00
GreYFoXGTi 82eac5cf3b ScoreBoard now is different for DDRace only 2011-01-06 06:45:53 +02:00
GreYFoXGTi c5648311ed Merge branch 'master' of http://github.com/oy/teeworlds
Conflicts:
	data/languages/german.txt
	src/game/client/components/scoreboard.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/server/entities/character.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/variables.h
2011-01-04 22:37:09 +02:00
oy a72848e780 added constants for teams by Choupom 2011-01-03 12:50:38 +01:00
GreYFoXGTi cebbecf632 Some Code Improvements and Compiler warnings 2010-12-07 19:44:23 +02:00
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