Commit graph

207 commits

Author SHA1 Message Date
archimede67 0e62b4b9b9 fix code style 2019-06-05 19:49:00 +02:00
Corantin H ac4d7085c5 Switched to a proper new recorder instead of using the auto one 2019-05-21 12:49:19 +02:00
Learath2 c98978c9d6 Implement timescore using a netobj 2019-05-21 10:26:33 +02:00
Learath 0d25bb86c4 Style 2019-05-21 10:25:15 +02:00
Learath 23255a04b3 Remove time-score 2019-05-21 10:24:07 +02:00
bors[bot] a2f44299e0 Merge #1678
1678: Handle colors in console r=def- a=Learath2

DEPENDS: #1654 

A better way to fix #1581 possibly deprecates #1597 

Co-authored-by: Learath <learath2@gmail.com>
2019-04-30 19:39:56 +00:00
bors[bot] d8964ceedb Merge #1654 #1685
1654: Try working on colors a bit r=def- a=Learath2

There were color functions everywhere, I tried cleaning it up a little. I still couldn't get the roundtrip from Hsl to Rgb to be exactly the same, but I think this is the best possible.

1685: Work on compound binds r=def- a=Learath2

Closes #1417 

Co-authored-by: Learath <learath2@gmail.com>
2019-04-29 15:56:16 +00:00
12pm 8fa6dada95 Highlight same clan as dummy too
Fixes #1686
2019-04-29 00:48:40 +02:00
Learath 979d58f830 Use colors in CTextRender 2019-04-27 01:34:20 +03:00
Learath 6c371a9a57 Even more refactoring 2019-04-27 01:11:15 +03:00
Learath 15058330fa Don't inherit from vector, more cleanup 2019-04-27 00:47:34 +03:00
Learath 65a17599e1 Add ColorHSVA, phase out more vec3's 2019-04-26 15:06:32 +03:00
Learath cc36af73be Cleanup colors 2019-04-24 23:53:26 +03:00
Dennis Felsing cde07b420b Implement changes suggested by -Wuseless-cast
But don't enable it yet because I'm not sure what the best way is.
2019-04-11 19:54:43 +02:00
Ryozuki f0a4da58cb
Merge branch 'master' into add_clan_color 2019-04-05 16:46:14 +02:00
Ryozuki 4e3b2191a2
fix wrong variable 2019-04-05 13:47:38 +02:00
Ryozuki 735aab9609
fix braces 2019-04-05 13:25:17 +02:00
Ryozuki bb3cde4369
add color to ping in scoreboard 2019-04-05 13:12:08 +02:00
Ryozuki ef6d4b5de6
add clan color to people with same clan as you 2019-04-05 12:41:01 +02:00
def 82f9474eb4 Leave space for \0 byte (fixes #1526) 2019-03-20 18:27:08 +01:00
def 58d9bd4105 Make cl_authed_player_color modifiable
Old color was rgb = (0.78, 1.0, 0.8)
In hsl = (125°, 100%, 89%)
Converted to hex hsl:
H = 125° / 360° * 255 = 89 = 0x59
S = 100% = 0xFF
since the TW HSL color system fobids too dark colors it uses l = 0.5 + 0.5*L/255
so L = (0.89 - 0.5) * 2*255 = 199 = 0xC7
So in total we get 0x59FFC7 = 5898183
2019-03-19 15:37:17 +01:00
def 0f9b89fc74 Color authed players in spec (fixes #1497) 2019-03-19 08:16:46 +01:00
def 6701000931 Rename Score board to Scoreboard for consistency 2019-03-12 19:00:47 +01:00
fokkonaut 5c1dfe6b65 Scoreboard headline for score can now be Time when on DDRace 2019-03-11 23:10:21 +01:00
Learath 6fa5d3fcce One color for all auth levels 2019-03-05 11:48:06 +03:00
Learath 548e9969b2 Add colors for authed players. Deprecates #1299 2019-03-02 13:50:33 +03:00
fokkonaut fe4426b008 fixed ddrace score (time score) 2019-01-14 08:01:20 +01:00
fokkonaut 0e842359ad Add DDRace Score NETMSG 2019-01-14 08:01:20 +01:00
fokkonaut 1082ba77b0 increase max score that can be displayed in scoreboard 2018-10-11 22:19:26 +02:00
Jupeyy 8cc0de8d31 Some text positioning 2018-04-11 12:19:30 +02:00
Jupeyy c7114e734c more ui text positioning fixes 2018-04-04 02:40:30 +02:00
Jupeyy 1a74d8c039 ui fixes: text positining 2018-04-03 17:41:11 +02:00
Jupeyy 71a4a20812 team name position fix 2018-03-15 03:59:57 +01:00
Learath 7d1aaa735a A little more space for clan name. Fixes #724 2018-02-22 21:17:10 +01:00
yangfl 1620fc9b0f Fix typo 2018-02-07 16:10:40 +08:00
def 862e26dd08 Clean up time handling a bit 2017-09-03 08:48:21 +02:00
necropotame b8e4e5beea Fix style in several places 2017-03-22 19:45:14 +01:00
def 097b6cabf3 Fix cut off names in scoreboard (still overlap with clan though) 2016-06-03 11:30:20 +02:00
def 740868c938 Add cl_show_local_time_always (fixes #319) 2016-04-27 19:22:55 +02:00
def ac61c8fed5 Format cl_showid a bit nicer 2016-01-10 22:35:14 +01:00
Adam Jaworski ab6f522aa5 Whether to show scoreboard after death or not 2015-08-12 11:30:26 +02:00
def 6a2cc86d50 Sort spectators by name 2015-07-28 23:30:23 +02:00
def a9690bb484 Show all recorders in scoreboard (fixes #227) 2015-07-09 02:00:40 +02:00
def 1c7750151d Show full time in scoreboard even when minutes are > 100 2015-06-25 15:39:22 +02:00
Nikita Zyuzin 12652985c3 Hide scoreboard if statboard is present 2015-05-21 13:55:51 +04:00
def 6d54de89b6 Get rid of clang static analyzer warnings 2015-04-19 00:31:45 +02:00
def 8b108a2311 Clean up gametype determination 2014-12-10 03:39:15 +01:00
def 1144ba77c6 Split up demo recording into 3 separate recorders 2014-10-16 17:42:13 +02:00
def 1fc38356a5 Fix cl_show_ids 2014-10-11 22:47:13 +02:00
def bbc21005dc Use space AND colon 2014-09-13 23:50:35 +02:00
def f8fa71de63 Use space as delimiter for ID 2014-09-13 21:48:55 +02:00
def d08e58daa8 Show IDs in scoreboard on any server type 2014-08-23 11:32:54 +02:00
def 2cac8c7ab5 Scoreboard fix 2014-02-02 23:23:10 +01:00
def 5b07793c16 Better scoreboard colors 2014-02-02 20:12:53 +01:00
def 853f510fc9 Proper old team 2014-01-22 15:38:05 +01:00
def 3426bc5fcf Fix: Better teams in scoreboard 2014-01-22 14:04:15 +01:00
def 25f69ecdeb Display teams in scoreboard 2014-01-22 01:39:18 +01:00
def f0d79b8388 Trying to get better team support 2014-01-22 00:08:30 +01:00
def 214d32fadd Special scoreboard between 32 and 48 players 2014-01-19 22:08:33 +01:00
def 5164263f90 Don't display score of 00:00 2014-01-12 16:16:09 +01:00
def 1fbdea7d2f Proper 64 player scoreboard 2014-01-11 14:09:55 +01:00
def 93a3fecea8 Fix best time in scoreboard 2014-01-10 22:53:18 +01:00
def 4f0c61716c Better Scoreboard 2014-01-10 18:15:26 +01:00
def 9743b0cb58 Better time/score messages 2014-01-10 16:19:46 +01:00
def 19419617e5 Score board (1/2) and (2/2) 2014-01-10 15:45:32 +01:00
def 44964130c3 Fix: Proper scoreboard font size 2014-01-08 09:50:45 +01:00
def d696c19e18 Show all 64 players in scoreboard 2014-01-08 04:11:50 +01:00
def 3607218f12 Merge ddrace64 from eeeeee 2013-12-31 06:13:57 +01:00
def 58039066f4 Add local time screen at top 2013-08-23 00:45:48 +02:00
GreYFoX cd4ba53bae Merge branch 'master' of git://github.com/teeworlds/teeworlds into DDRace
Conflicts:
	bam.lua
	scripts/build.py
	scripts/make_release.py
	src/engine/server.h
	src/game/client/gameclient.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontext.h
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/player.cpp
	src/game/version.h
2012-04-12 02:09:31 +02:00
oy e960cbdff3 added a config to display the code string of a country flag instead of the image. Closes #897 2012-01-08 18:16:38 +01:00
GreYFoX 7d462b565d Fixed the bugs i know of with the last few commits 2011-12-30 16:51:08 +02:00
GreYFoX 41eed130cd removed TODO 2011-12-26 13:56:51 +02:00
GreYFoX 6bedea0c6a DDRace Score in Time Format 2011-12-26 13:45:41 +02:00
GreYFoX ff696bad6c Mac Loves Cyclic Includes 2011-08-31 13:56:04 +02:00
GreYFoX 5b27758650 Removed level stuff
Removed client ID stuff
Removed console stuff
Resolved merge conflicts
Upgraded Banmaster
Cleaned up
2011-08-13 02:11:06 +02:00
GreYFoX 35d16bd58c Merge branch 'master' of git://github.com/oy/teeworlds into DDRace0611
Conflicts:
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/engine/shared/network_server.cpp
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/menus_browser.cpp
	src/game/client/gameclient.cpp
	src/game/editor/editor.cpp
	src/game/editor/editor.h
	src/game/editor/io.cpp
	src/game/editor/layer_tiles.cpp
	src/game/editor/popups.cpp
	src/game/gamecore.cpp
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gamemodes/ctf.cpp
	src/game/server/player.cpp
	src/game/variables.h
2011-08-13 02:01:40 +02:00
oy 123eab41c8 made it possible to filter by player country in the server browser. Closes #654 2011-06-29 22:27:32 +02:00
GreYFoX 0df6d0541f Merge branch 'master' of git://github.com/oy/teeworlds into HEAD
Conflicts:
	bam.lua
	src/engine/console.h
	src/engine/server.h
	src/engine/server/server.cpp
	src/engine/shared/config.h
	src/engine/shared/config_variables.h
	src/engine/shared/console.cpp
	src/engine/shared/console.h
	src/game/client/components/binds.cpp
	src/game/client/components/chat.h
	src/game/client/components/console.cpp
	src/game/client/components/console.h
	src/game/client/components/controls.cpp
	src/game/client/components/emoticon.h
	src/game/client/components/maplayers.cpp
	src/game/client/components/menus.h
	src/game/client/components/scoreboard.h
	src/game/client/components/spectator.h
	src/game/client/components/voting.h
	src/game/client/gameclient.cpp
	src/game/client/gameclient.h
	src/game/client/render.h
	src/game/collision.cpp
	src/game/editor/ed_layer_tiles.cpp
	src/game/gamecore.cpp
	src/game/gamecore.h
	src/game/layers.cpp
	src/game/layers.h
	src/game/mapitems.h
	src/game/server/entities/character.cpp
	src/game/server/entities/laser.cpp
	src/game/server/entities/laser.h
	src/game/server/entities/pickup.cpp
	src/game/server/entities/pickup.h
	src/game/server/entities/projectile.cpp
	src/game/server/gamecontext.cpp
	src/game/server/gamecontroller.cpp
	src/game/server/gamecontroller.h
	src/game/server/gameworld.cpp
	src/game/server/gameworld.h
	src/game/server/player.cpp
	src/game/variables.h
2011-04-14 01:27:49 +02:00
oy 06115dd49d added "Whitespace and line Endings cleanup" by GreYFoX 2011-04-13 20:37:12 +02:00
GreYFoX f7f6058a92 Merged Oy, Cleaned up, removed some useless features and code parts
Added Icon by landil
alot more...
2011-04-09 22:32:17 +02:00
oy 2401cc2ec3 highlight the followed player in scoreboard and show their score on top 2011-04-05 19:00:00 +02:00
oy 5c6e274a88 added more and resized flags by Crises and made them show up smaller and less of an eye-catcher. Closes #566 2011-04-04 20:37:12 +02:00
Choupom b3cb33eec0 replace team name by clan name if possible 2011-04-02 18:11:43 +02:00
SushiTee 4adad07ad8 polished scoreboard a bit 2011-04-02 15:18:52 +02:00
SushiTee 0db6022c64 centering scoreboard (goals and spectators) correctly 2011-04-02 15:18:45 +02:00
oy da8c0c61b5 made scoreboard show clan name and country flag and fixed overlapping spectator names. Closes #203. Closes #335 2011-03-19 18:28:47 +01:00
GreYFoX 0cbcdd027a Removed Helper made Moderators able to moderate only
Enumerated levels
http://ddrace.info/forum/showthread.php?t=528
or modify the server and change the game type to something other than DDRace thank you
2011-03-16 16:27:30 +02:00
oy be8f669333 added extended demo infos in the demo browser 2011-03-13 10:41:10 +01:00
oy 5c723f5d2f added info about the actual recorded demo length in the notification box 2011-03-12 18:34:16 +01:00
oy b834426548 fixed several problems with spectator view in game and demo player. Closes #83 2011-03-12 18:07:57 +01:00
oy 9811c2396b made network clip flags. Closes #131 2011-03-04 17:08:10 +01:00
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