edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 22:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
4259 commits 1 branch 429 tags 412 MiB
Commit graph

3330 commits

Author SHA1 Message Date
oy 814c76248a Merge branch 'master' of https://github.com/teeworlds/teeworlds 2018-12-02 17:33:12 +01:00
oy 9b50815c6e fixed problem with initializing sv_player_slots 2018-12-02 17:33:02 +01:00
oy 4f71242925
Merge pull request #1760 from ChillerDragon/UnusedGraphicsInclude 
remove unused graphics include
 2018-12-02 17:13:59 +01:00
oy 359042fb42 fixed that set_team commands respect the available player slots 2018-12-02 17:11:14 +01:00
ChillerDragon fa7f7d6b7d remove unused graphics include 2018-12-02 17:06:59 +01:00
oy 548baa7b70
Merge pull request #1759 from LordSk/fix/chat_truncated 
Adapt chat size depending on scoreboard
 2018-12-02 16:11:48 +01:00
LordSk 05b6440739 Adapt chat size depending on scoreboard 2018-12-02 16:04:58 +01:00
nheir 8184bc1119 sanitize sv_player_slots 2018-12-02 15:59:37 +01:00
oy afb5029c61 added id's to the scoreboard. closes #1747 2018-12-02 15:09:44 +01:00
oy 2ac756c5f0 fixed team change unbalance indication in the ui. #1752 2018-12-02 13:43:42 +01:00
Henri D 1653d47350
ignore 0 damage 2018-12-02 12:55:10 +01:00
oy 2c76f33f93 fixed events for 64 players 2018-12-02 12:43:55 +01:00
oy c87fcb293e check for valid placeholders within translation files 2018-12-02 00:12:23 +01:00
oy 3e9eeff1c5 fixed offset of the ctf flag in the scoreboard 2018-12-01 21:00:11 +01:00
oy bce1eda7bb reduced alpha of the game menu and adjusted the record button 2018-12-01 19:14:36 +01:00
oy 5768a35018 moved game buttons to the top. #1698 2018-12-01 18:02:17 +01:00
oy 3bb6f9d959 fixed a typo 2018-12-01 15:24:42 +01:00
oy 23c9682e2c increased the flags in the scoreboard 2018-12-01 14:31:47 +01:00
oy 6c3e2713de fixed server crash 2018-12-01 14:24:00 +01:00
oy 9637215859 fixed player stat reset 2018-12-01 14:07:57 +01:00
oy 3209791976
Merge pull request #1580 from nheir/more_spec 
Increase the number of clients (max 64) for more spectators
 2018-12-01 13:45:01 +01:00
nheir 8a3fc7aa60 drop server with MaxPlayers > MAX_PLAYERS only if standard gametype 2018-12-01 13:25:55 +01:00
nheir 6dc5385d3d improve ingame menu players scrollbar 2018-12-01 13:20:55 +01:00
nheir 375e040c7a Add scrollbar to ingame Players menu 2018-12-01 13:20:55 +01:00
nheir 2b471f31f2 use 2 columns for 17 to 32 players, 3 for 33-48, 4 otherwise 2018-12-01 13:20:55 +01:00
nheir 62e0ee998c fix: ... other players is cropped 2018-12-01 13:20:55 +01:00
nheir 9c86850d70 scale down spec view highlight 2018-12-01 13:20:55 +01:00
nheir b86d96fc95 Scale down tee in spec view 2018-12-01 13:20:55 +01:00
nheir 6aa81c2b20 move up player list to feel more centered 2018-12-01 13:20:55 +01:00
nheir 820cd16c34 wrong first colomn 2018-12-01 13:20:55 +01:00
nheir b2352bb4b0 workaround to show more than 16 players in spectator ui 2018-12-01 13:20:55 +01:00
nheir 84ccee1d86 Limit the max size of the scoreboard to 16 lines 2018-12-01 13:20:00 +01:00
nheir 7887e492e4 Crop spectator list on scoreboard to 4 lines 2018-12-01 13:20:00 +01:00
nheir b2b72d4006 Reset scoreboard size on OnReset() 2018-12-01 13:20:00 +01:00
Henri Derycke 9cd1cf2459 fix wrong indice 2018-12-01 13:20:00 +01:00
Henri Derycke c221a6b3dd debug: up to MAX_CLIENTS-1 dummies 2018-12-01 13:20:00 +01:00
Henri Derycke 760ed1163d Fix item height when there is a scrollbar 2018-12-01 13:20:00 +01:00
Henri Derycke 46faf532dd Add horizontal scrollbar for scoreboard in server browser 2018-12-01 13:20:00 +01:00
oy c6f0d19df5 try to fix missing data dir for the mac app 2018-12-01 13:17:19 +01:00
oy 6884cb617a Merge branch 'master' of https://github.com/teeworlds/teeworlds 2018-12-01 13:11:57 +01:00
oy b8fcdf9c8b fixed kill messages when a player leaves. closes #1744 2018-12-01 13:11:44 +01:00
Henri Derycke a867847712 fix wrong limit and calculation 2018-12-01 13:10:41 +01:00
Henri Derycke 38fc5ff50a add support for ingame scoreboard (untested) 2018-12-01 13:10:41 +01:00
Henri Derycke 9450a9e72d misplace silent mode 2018-12-01 13:10:41 +01:00
Henri Derycke 412db81508 Add silent mode for join/leave message of spectators 2018-12-01 13:10:41 +01:00
Henri Derycke 584ac1aba4 Add cropped list for serverbrowser embeded scoreboard 
Add scrollbar for server browser scoreboard
 2018-12-01 13:10:41 +01:00
Henri Derycke 8b02113744 forgot Console->Chain sv_player_slots 2018-12-01 13:10:41 +01:00
nheir 4efa8b90c9 Drop servers with MaxPlayers > MAX_PLAYERS 2018-12-01 13:10:41 +01:00
nheir 98bee55a41 Allow more spectators 
Replace sv_spectator_slots by sv_player_slots
Introduce MAX_PLAYERS to 16 (original MAX_CLIENTS)
 2018-12-01 13:10:41 +01:00
oy bb544ca3ae
Merge pull request #1589 from Dune-jr/feature-complexbinds 
Implement composed binds (Ctrl, Shift, Alt); adapt controls menus.
 2018-12-01 12:54:34 +01:00
oy 0e655437c9 use linear mapping for the gametype icons and fixed c&p error 2018-12-01 12:47:14 +01:00
oy 9b6db9b26c Merge branch 'master' of https://github.com/teeworlds/teeworlds 2018-11-30 19:15:54 +01:00
oy 7a7785e9f3 properly align selected header in the server browser. closes #1738 2018-11-30 19:15:42 +01:00
oy ec9cf90e1e use gametype icons. #1637 2018-11-30 19:06:25 +01:00
oy 148f149af3
Update broadcast.cpp 2018-11-30 17:08:20 +01:00
oy 0d30c48080
Merge branch 'master' into master 2018-11-30 17:04:34 +01:00
oy 7fa0dc05d9
Merge pull request #1743 from LordSk/fix/editor_mouse_delta 
Fixed editor world mouse delta (used when moving quad points)
 2018-11-30 17:01:42 +01:00
oy 2f1646f5b1
Merge pull request #1741 from LordSk/fix/broadcast_scoreboard 
Fixed broadcast not being shown when scoreboard/motd is active
 2018-11-30 17:01:19 +01:00
oy c0da735639
Merge pull request #1740 from Dune-jr/fix-warnings 
Fix some warnings
 2018-11-30 17:00:48 +01:00
oy c58510c345
Merge pull request #1716 from Dune-jr/feature-damage-netevent 
Add Damage net event
 2018-11-30 17:00:30 +01:00
Chiller Dragon 13f0d259a5
Fix too much indentation 2018-11-30 13:27:04 +01:00
LordSk 3536803519 Fixed editor world mouse delta (used when moving quad points) 2018-11-29 21:42:03 +01:00
LordSk 2cbdda7c62 Don't show if offline, reset on join 2018-11-29 17:24:33 +01:00
LordSk ba5083f8ff Fixed broadcast not being shown when scoreboard/motd is active 2018-11-28 17:41:59 +01:00
Jordy Ruiz a4c4607a59 Fix some warnings 2018-11-28 11:40:09 +01:00
oy 499653cd2c consider max clients configuration for dbg_dummies. closes #1735 2018-11-27 19:24:14 +01:00
Jordy Ruiz ff1ba08a0c Fix typo 2018-11-27 19:23:00 +01:00
Jordy Ruiz 029b0accbd Removed DamageInd net event. Moved the server code to the client, using the new Damage net event. 2018-11-27 18:57:17 +01:00
oy d86165b63c changed ready character to a checkmark. #1736 2018-11-27 18:09:34 +01:00
oy a103c0bf3c
Merge pull request #1736 from Dune-jr/feature-smallreadystate 
Make the ready state indicator a small green star instead of the whole line green
 2018-11-27 18:03:01 +01:00
LordSk 44ec214c31 Reverted alpha changes 2018-11-27 17:29:40 +01:00
LordSk cf4364418d Round corners 2018-11-27 17:23:36 +01:00
Jordy Ruiz 8ef08b4641 Make the ready state indicator a small green star 2018-11-27 16:44:30 +01:00
LordSk 87e36241d0 Use TextShadowed to render text instead, dynamically scale FontSize depending on line count 2018-11-26 22:16:55 +01:00
oy d158ab0ff0
Merge pull request #1731 from heinrich5991/pr_various 
Various fixes
 2018-11-26 21:09:23 +01:00
oy 40424ddae8 quick and dirty map reordering routine 2018-11-26 21:08:39 +01:00
heinrich5991 a5a5fe1cc8 Fix thread safety of mem_alloc and mem_free 
This works by removing everything from these functions except for the
`malloc` and `free`.
 2018-11-26 20:35:37 +01:00
heinrich5991 eb32a492c4 Fix warning about incompatible function pointers 
This comes at the cost of one allocation per started thread. This should
be okay because we're about to invoke a syscall anyway.

(cherry picked from commit 1b4a16233d)
 2018-11-26 20:35:37 +01:00
heinrich5991 a4bcd6383a Fix compilation with gcc in debug mode 
It needs explicit template instantiations for
src/engine/server/server.cpp, for the Ban function.

(cherry picked from commit b8b6808cd5)
 2018-11-26 20:35:37 +01:00
def 0f4b7a6aac Try to fix secure RNG on Windows 
(cherry picked from commit 9b27da8e4a)
 2018-11-26 20:35:37 +01:00
heinrich5991 b739536e67 Fix indentation in src/engine/shared/network.h 2018-11-26 20:35:37 +01:00
oy a8e77ef535
Merge pull request #1718 from LordSk/feature/broadcast 
Server broadcast
 2018-11-26 19:25:41 +01:00
oy 7536c8823d removed unused variable 2018-11-26 19:21:29 +01:00
oy aa4476a845
Merge pull request #1695 from Dune-jr/feature-scoreboard2 
Implement SushiTee's scoreboard
 2018-11-26 19:15:34 +01:00
LordSk a50b99bf4f ready state green color, increase chat width 2018-11-26 19:01:29 +01:00
LordSk 1756047ff4 Country flags 2018-11-26 19:01:29 +01:00
Jordy Ruiz 89ad2ad3c6 Red team wins and Blue team wins now using %s team wins for localization 2018-11-26 19:01:29 +01:00
Jordy Ruiz 8f41717d43 Fix NumPlayers not counting the right team, add an assert 2018-11-26 19:01:29 +01:00
Jordy Ruiz 71963f7b04 Some code fixes 2018-11-26 19:01:29 +01:00
Jordy Ruiz 98c99ad631 Scoreboard fixes & improvements, moved the scoreboard up, just below the HUD. Improve display of spectators 2018-11-26 19:01:16 +01:00
Jordy Ruiz 8ec70a1bde Merged scoreboard from #1171 2018-11-26 18:54:49 +01:00
oy 5125cf7dd6 changed default background map to heavens. closes #1566 2018-11-26 18:54:49 +01:00
oy 2f588a158b blocked non-country flags. closes #1721 2018-11-26 18:54:49 +01:00
oy bdaf3796f8 fixed camera position 2018-11-26 18:50:36 +01:00
oy 6dc93ee76d changed default background map to heavens. closes #1566 2018-11-26 18:13:43 +01:00
oy 46b0f264cc blocked non-country flags. closes #1721 2018-11-26 18:12:33 +01:00
LordSk 1895d1a3fa Removed magic value, reverted hud.h 2018-11-26 17:56:07 +01:00
Jordy Ruiz 9e67d32fa5 Merge branch 'master' of https://github.com/teeworlds/teeworlds into feature-complexbinds 2018-11-26 11:50:07 +01:00
Jordy Ruiz 577ce2ba25 Fix e.g. key press lshift being treated as shift+lshift 2018-11-26 11:39:55 +01:00
oy 6b5f2d8a31 fixed arrow keys effect theme and language listbox. closes #1722 2018-11-25 21:11:01 +01:00
Jordy Ruiz ce38aec2ec Remove DamageInd armor flag, add a type field in Damage to distinguish self damage 2018-11-25 20:59:41 +01:00
LordSk 8c905013b5 Soft bottom bar corners, option do disable colors 2018-11-25 20:33:41 +01:00
LordSk bd1ef7cb54 User defined lines support 2018-11-25 20:33:41 +01:00
LordSk 23d1cc3953 Save lines state instead of calculating every frame 2018-11-25 20:33:40 +01:00
LordSk 8d19f5f8a8 Moved the code over to broadcast.cpp 2018-11-25 20:33:39 +01:00
LordSk dc449f84e5 Adjusted spectator bottom-right box, broadcast network back-end, options to disable/mute it 2018-11-25 20:33:39 +01:00
LordSk af49073f55 A few more fixes, better luminance calculation 2018-11-25 20:33:36 +01:00
LordSk 549470980a Fixed some utf8 issues (m_CharCount/m_GlyphCount), added color parsing 2018-11-25 20:33:36 +01:00
LordSk 3b0c088575 Setting up the display part 2018-11-25 20:33:35 +01:00
oy 35a1e26f97 fixed using the new level icons. closes #1669 2018-11-25 20:30:32 +01:00
oy 75350af11d added support for ai-controlled players #1390 2018-11-25 17:50:57 +01:00
oy 454af88ee5
Merge pull request #1717 from Dune-jr/feature-whisper-target 
Whisper: properly blend icon, implement shift+tab, memorize last whisper target
 2018-11-25 15:29:46 +01:00
Jordy Ruiz 0231027047 Add missing Localize 2018-11-25 14:56:44 +01:00
Jordy Ruiz 07dc2e0818 Remove unused variables 2018-11-25 14:55:53 +01:00
Jordy Ruiz 781e832117 Ctrl+Tab to go to previous whisper, instead of Shift+Tab 2018-11-25 14:26:38 +01:00
Alex Belke 234753b197
Fix server info tab 2018-11-25 12:36:46 +01:00
oy de85ec70bd fixed an initialization 2018-11-25 12:24:40 +01:00
oy dbbca2cc54 reworked ingame menus, updated to the style of the new design 2018-11-25 11:34:19 +01:00
Jordy Ruiz 2daca8d3cf Fix whisper icon not blending 2018-11-25 01:17:28 +01:00
Jordy Ruiz a985edce41 Improve whisper navigation: enable shift+tab, save last whisper target ID 2018-11-25 01:10:20 +01:00
Jordy Ruiz 79fda7979a Added Damage net event, informs of angle from which damage is taken and its amount; preparing future work 2018-11-24 23:59:17 +01:00
oy e865d1c15a increased the overall cuteness factor of the ingame menus. closes #1551 2018-11-24 17:52:51 +01:00
oy 0ea6c8adf0
Merge pull request #1711 from LordSk/feature/display_user_id 
Display user IDs
 2018-11-24 17:11:20 +01:00
oy 07f009b5a2 fixed faulty shift. closes #1714 2018-11-24 16:41:49 +01:00
oy 42707f9e79 Merge branch 'master' of https://github.com/teeworlds/teeworlds 2018-11-24 15:17:16 +01:00
oy e2684bc925 improved the ingame menus. closes #1611 2018-11-24 15:17:00 +01:00
Jordy Ruiz 91458b18f6 Scan for none.png for the checkerboard theme 2018-11-24 13:30:27 +01:00
LordSk 85c17b4626 Show correct whisper id 2018-11-23 19:40:24 +01:00
oy 43b8bac9ac Merge branch 'master' of https://github.com/teeworlds/teeworlds 2018-11-23 19:33:00 +01:00
oy 001921242b added a slight background to the menus 2018-11-23 19:32:04 +01:00
LordSk 19c2636a4e A few chat fixes, display id on chat log 2018-11-23 19:31:34 +01:00
LordSk 8f14070996 Added an option to turn it on/off 2018-11-23 19:31:33 +01:00
LordSk c19c60012c Append rect width 2018-11-23 19:31:33 +01:00
LordSk b285a3d96d Stylize it a bit 2018-11-23 19:31:32 +01:00
LordSk 72a6417400 Replace hard coded id display most everywhere 2018-11-23 19:31:32 +01:00
oy 8bc55e5e27
Merge pull request #1707 from Dune-jr/feature-themeselector 
Theme selection
 2018-11-23 19:12:59 +01:00
oy b2a93432e5 fixed flickering setting sound menu 2018-11-23 19:07:03 +01:00
oy c12ec2611f increased the alpha for not related tabs in the ingame menu 2018-11-23 17:25:53 +01:00
Jordy Ruiz 46df793b45 Merge branch 'master' of https://github.com/teeworlds/teeworlds into feature-themeselector 2018-11-22 20:35:35 +01:00
oy a6e8bb7a06 use linear mapping just for icons 2018-11-22 20:06:28 +01:00
oy 16f0823d28
Merge pull request #1709 from LordSk/feature/chat_whisper 
Whisper UX/UI
 2018-11-22 19:35:05 +01:00
oy 006a1cd1c0 improved the ingame menus. #1611 2018-11-22 19:17:21 +01:00
oy f1953c18a2 use linear texture mapping so textures don't get blurry when scaling done. closes #1708 2018-11-22 19:15:33 +01:00
oy 79c44862bd fixed switching to next/previous player in dead spec mode 2018-11-22 19:13:41 +01:00
oy b28e5285c6 don't let the client change spectator info when not in the spectator team 2018-11-22 18:39:32 +01:00
oy 556481078c fixed free-view 2018-11-22 18:37:49 +01:00
oy 12307ae6b0 decreased the cooldown for spectator mode changes 2018-11-22 17:40:51 +01:00
LordSk d6add414c7 Align icon properly 2018-11-22 14:20:45 +01:00
LordSk 83a8c77d36 Display whisper icon when typing and a few tweaks 2018-11-22 14:20:44 +01:00
LordSk 05c2af908a Display a whisper icon 2018-11-22 14:20:43 +01:00
LordSk acef8e178e Save the correct name 2018-11-22 14:20:42 +01:00
LordSk 0bf36fbbe5 Added TargetID in Sv_Chat for whispers 2018-11-22 14:20:42 +01:00
Jordy Ruiz 8fb0bf115b Allow loading of generic background maps, change the rules a bit; fix some code issues 2018-11-22 11:38:55 +01:00
Jordy Ruiz f37bf350d7 Changed default map from 'menu' to 'jungle' 2018-11-22 01:33:32 +01:00
Jordy Ruiz 2909152183 Removed now unnecessary menu option to disable map backgrounds 2018-11-22 01:27:32 +01:00
Jordy Ruiz e0d292be63 Implemnt theme selection, recognize automatically maps and icons in ui/themes 2018-11-22 01:25:19 +01:00
oy 208000d157 moved around the header bits to resemble the 0.6.5 header 2018-11-22 00:04:16 +01:00
oy b9610614a4 fixed warnings 2018-11-21 21:40:23 +01:00
oy 9d3ec8355c properly align the refresh and connect button in the server browser. closes #1701 2018-11-21 21:01:29 +01:00
oy 64e5165eef respect the maximum chunk number when constructing a packet. 2018-11-21 20:52:07 +01:00
oy 0bed238238 fixed the quit button character 2018-11-21 20:48:00 +01:00
oy 27c6f8ae46 increased the token size to 32bit and set a minimum datasize of 512bytes for token request to counter reflection attacks. #1681 2018-11-21 19:56:46 +01:00
oy 646d055a59 Merge branch 'master' of https://github.com/teeworlds/teeworlds 2018-11-21 19:48:35 +01:00
oy faee8cf6fe
Merge pull request #1702 from Dune-jr/feature-quitbutton 
Change quit button to use unicode character \u2715, and resize it.
 2018-11-21 19:19:24 +01:00
Jordy Ruiz 8f2adb2030 Change quit button to use unicode character \u2715, and resize it. 2018-11-21 17:10:04 +01:00
oy 27012ac42d only add tokens to the catch on request. increased seedtime and expire time for tokens in the cache to sync it better with the master heartbeats 2018-11-21 12:17:27 +01:00
oy 1c05f9ad6a fixed server registration again 2018-11-21 08:25:28 +01:00
oy a99addcb22 show current resolution in graphics settings 2018-11-20 20:18:50 +01:00
oy 7b51a1f03e some token polishing 2018-11-20 19:58:01 +01:00
oy 3010a3ad54 made the version server work again. closes #1407 2018-11-20 19:18:30 +01:00
oy 8011e3e8be tie the global tokens to broadcast token request response 2018-11-20 17:09:38 +01:00
oy abdde05df7 fixed death camera in survival modes. closes #1641 2018-11-20 16:59:25 +01:00
oy 5bc1d7cec0 use the lms naming convention for survival maps #1562 2018-11-19 19:16:25 +01:00
oy d9b1758d2d renamed 'sur' gametype to 'lts'. closes #1562 2018-11-19 18:50:15 +01:00
oy dda8b89ae9 try to fetch the token for stored packets again, as the initial request might got lost 2018-11-19 18:31:53 +01:00
oy bf7abb7def
Merge pull request #1673 from LordSk/feature/chat_part2 
Chat look and feel part 2
 2018-11-19 18:13:15 +01:00
oy 6fbe52ff3c increased the token cache size to speed up the server list refresh 2018-11-19 18:04:27 +01:00
oy a47f9faaf0 cache the master server list in a file and load it in case the masters are unavailable. #1154 2018-11-19 17:58:56 +01:00
oy edeb34153a
Merge pull request #1629 from nheir/feature/1610 
Disable scoreboard when on menu and hide motd when on menu
 2018-11-19 17:02:14 +01:00
oy 4584c16935 added the possibility to have silent enter/leave messages. closes #1539 2018-11-19 16:12:54 +01:00
oy b9ea02d13f
Merge pull request #1687 from Dune-jr/feature-refoldonclick 
Hide server details when the server is clicked on again
 2018-11-19 15:25:31 +01:00
Jordy Ruiz 3ef99d614a Only fold server browser entries when the line is clicked, not the details. Avoids doubleclick issues 2018-11-19 01:07:17 +01:00
Jordy 2fd60a331c Autswitch to info tab when a server is selected in the server browser (and add a console option) 2018-11-18 23:55:05 +01:00
Jordy 2c852c7f0f Now only gray out servers that cannot be joined. Closes #1605 2018-11-18 23:32:49 +01:00
oy 1c7e320441 added camera movement by sushitee and improved camera positions. closes #1618 2018-11-18 19:14:53 +01:00
LordSk d5d39c7879 A few tweaks 2018-11-18 15:49:57 +01:00
oy f549fbab0c show the heart icon to indicate a friend in the server browser and fixed alt+tab issue. #1670 2018-11-18 15:14:50 +01:00
oy ea5389d2f1 removed old friends browser code and fixed pop dialog when removing a friend 2018-11-18 12:33:36 +01:00
oy c65da92640 sort friends list 2018-11-18 12:12:01 +01:00
oy 695a538f78 some more removed dead code 2018-11-18 11:47:11 +01:00
oy e683bc3b5f moved the renderfiltertab code and removed some dead code 2018-11-18 11:46:30 +01:00
oy 7b963e5c15 adjusted the expand icons in the server browser. #1670 2018-11-18 11:37:18 +01:00
oy 5954c11739
Merge pull request #1688 from Dune-jr/feature-browserupdates 
Server browser: update (i) icon; remove inline server filter editing
 2018-11-18 10:17:15 +01:00
oy f344450f4c
Merge pull request #1686 from Dune-jr/feature-addlocalecontext 
Add context to the locale for the Yes/No password field
 2018-11-18 10:14:33 +01:00
oy edd1b13374
Merge pull request #1677 from LordSk/fix/button_fade 
Fixed button fade getting stuck in some situations
 2018-11-18 10:13:38 +01:00
LordSk 151a2f4f77 tune down highlight 2018-11-18 00:32:33 +01:00
Jordy Ruiz fdfe775979 Removed inline filter editing feature (#1670 9/10) 2018-11-18 00:18:58 +01:00
Jordy Ruiz 03a90a4dd1 Added arrows.png; updated the browser sidebar button (#1670 10/10) 2018-11-18 00:17:38 +01:00
LordSk 805206e3ac Fixed non-synchronized envelope time not being reset 2018-11-17 18:02:04 +01:00
LordSk d9dff698c6 Fixed editor mouse world position 2018-11-17 18:00:46 +01:00
Jordy Ruiz 1c9c78d382 Hide server details when the server is clicked on again 2018-11-17 15:54:45 +01:00
Jordy Ruiz 16ed5be406 Add context to the locale for the Yes/No password field 2018-11-17 15:10:05 +01:00
oy 92e9ee83d5 fixed not expanding the filter by using the tool icons. closes #1682 2018-11-17 12:59:12 +01:00
oy d0f286babe Added friends tab 2018-11-17 12:45:57 +01:00
oy 625ea7d891 improved the new filter and add gametype buttons 2018-11-16 20:05:48 +01:00
LordSk 902b6611fd Reverted time_get use, fixed m_LocalStartTime being reset 2018-11-16 18:52:15 +01:00
oy 617eccb74c fixed selected server when opening a different filter or switching between global and lan 2018-11-16 18:30:19 +01:00
oy 35f7b6a8b9 fixed scrollbar and prevent key-navigation when all filters are closed, selecting a server entry on filter close and still show the filter add feature in case all filters are closed 2018-11-16 18:06:28 +01:00
LordSk 4b4315d9e9 Display "spectators" when pressing the team chat button while spectating, fade and reduce the size of the black box. 2018-11-16 17:44:55 +01:00
oy 4af6b33058 just expand it when a server is selected 2018-11-16 17:24:21 +01:00
oy f9524e78a4 fixed server browser scrollbar when sidebar is closed 2018-11-16 17:19:48 +01:00
oy efecf3371d
Merge pull request #1598 from Dune-jr/fix-browserscroll 
Fix server&friend browser spacing and scrolling
 2018-11-16 16:20:37 +01:00
oy cf79fcc868
Merge pull request #1680 from Dune-jr/feature-browserfixes 
Fix&improve the server browser (issue #1670)
 2018-11-16 15:55:29 +01:00
oy 803f88b81a
Merge pull request #1679 from Dune-jr/feature-exitbutton 
Enhanced the 'X' quit button with the proper icon and a fading red color
 2018-11-16 15:47:18 +01:00
oy 37d63f56e7
Merge pull request #1676 from LordSk/fix/pma 
Pre-multiplied alpha fix
 2018-11-16 15:33:06 +01:00
oy 8adaad3d15
Merge pull request #1675 from Dune-jr/reorganize-settingsmenus 
Add option to disable background maps; reorganize menus a bit
 2018-11-16 15:13:21 +01:00
Jordy Ruiz 138a90b001 Make server filter tabs toggle-able with the Tab and Shift+Tab keys (#1670 8/10) 2018-11-16 14:05:55 +01:00
Jordy Ruiz cfc4485f4b Reorder filter tabs to put friends last, adjust sizes to 30-30-40, from 25-25-50 (#1670 7/10) 2018-11-16 13:57:46 +01:00
Jordy Ruiz 4596b922be Add some space between the + and Clear in the gametype filter (#1670 6/10) 2018-11-16 13:31:21 +01:00
Jordy Ruiz 8cfc49d593 Remove top left icons (#1670 5/10) 2018-11-16 13:25:22 +01:00
Jordy Ruiz 1a50a027c0 Do not show the game types scrollbar when it's not necessary (#1670 4/10) 2018-11-16 13:20:16 +01:00
Jordy Ruiz ec4e6ead87 Make dropdown filters expandable by clicking on the line (#1670 1/10) 2018-11-16 13:08:17 +01:00
Jordy Ruiz 75a4597306 Enhanced the 'X' quit button with the proper icon and a fading red color 2018-11-15 21:10:23 +01:00
Jordy Ruiz 085fbd85b5 Added Ctrl+up/down functionality to switch filters 2018-11-15 18:40:50 +01:00
Jordy Ruiz 7f725f11cf Fix up&down key behavior for the server browser scrollbars, make UI code more readable, clean up useless parts and convoluted computations. 2018-11-15 17:54:00 +01:00
Jordy Ruiz 250a4c99e5 Merge with master 2018-11-15 17:53:38 +01:00
LordSk 04bf6c40cb Fixed button fade getting stuck in some situations 2018-11-15 16:54:59 +01:00
LordSk 76ec843f35 Fixed pre-multiplied alpha for flags, damage indicators, emotes and tile layers 2018-11-15 13:48:57 +01:00
Jordy Ruiz 12a9d2a842 Fix text overlap in server info screen. Addresses #1671 2018-11-14 16:38:01 +01:00
Jordy Ruiz a9c3e3c4d2 Add menu option to disable background maps. Addresses #1566 2018-11-14 16:37:09 +01:00
Jordy Ruiz ab8b363a56 Reorganize menus a bit, adjust sizes for translations 2018-11-14 16:30:00 +01:00
LordSk e6bc7077ed fixed c++11 initialization 2018-11-14 15:49:44 +01:00
LordSk a30eff82a3 Take ClipEnable/Disable into account when checking mouse pos 2018-11-14 15:18:32 +01:00
LordSk c6467295f3 Completely fade out background rect, added back outline, restored beep on whisper. 2018-11-14 14:22:08 +01:00
LordSk 5b28eac915 Icon + box behind category when typing 2018-11-14 14:22:08 +01:00
LordSk 4b8641ec41 Show chat when typing, dark background to enhance readability when showing chat. 2018-11-14 14:22:08 +01:00
LordSk 6338ae947d Highlighted line fading background 2018-11-14 14:22:07 +01:00
oy d2365df927
Merge pull request #1664 from Dune-jr/feature-sndinitopt 
Add a separate option to turn off audio and to disable the initialization of sound systems
 2018-11-12 22:30:08 +01:00
Jordy Ruiz e9a7bb7088 Fix must-restart bottom text not being triggered in a specific scenario in the sound menus 2018-11-12 22:26:28 +01:00
oy 27a7691263 fixed some texture issues #1667 2018-11-12 22:17:32 +01:00
Jordy Ruiz 5194cf66fe Do not let SpecialBinds capture anything that doesn't have an Fn key 2018-11-12 22:14:49 +01:00
oy 3519270de8
Merge pull request #1662 from Dune-jr/fix-menusarrowcapture 
Menus now properly capture up&down arrow inputs
 2018-11-12 20:56:18 +01:00
oy e52a7452bc
Merge pull request #1661 from Dune-jr/fix-consolechain 
Remove outdated console chain code for browser filters
 2018-11-12 20:55:28 +01:00
oy 28f92559df
Merge pull request #1655 from LordSk/feature/ninja_bar 
Ninja bar
 2018-11-12 20:55:06 +01:00
oy 0ef6447e73
Merge pull request #1657 from axblk/json_parser_update 
Update json-parser
 2018-11-12 20:48:41 +01:00
oy 666cb3a32f
Merge pull request #1653 from axblk/zlib_update 
Update zlib to 1.2.11
 2018-11-12 20:42:28 +01:00
oy df66574d18
Merge pull request #1650 from axblk/ping_correction 
More accurate ping estimation in the scoreboard
 2018-11-12 20:40:25 +01:00
Jordy Ruiz bd0b5f846a Update m_NeedRestartSound to be triggered by changed to snd_init 2018-11-12 15:39:10 +01:00
nheir eb8f1f109a Remove useless code 2018-11-12 15:26:45 +01:00
Jordy Ruiz b5571f0434 Add a separate option to turn off the audio and to disable the initialization of sound systems. Adapt the menus a bit. 2018-11-12 14:33:11 +01:00
Jordy Ruiz 74e1c59717 Menus now properly capture Up&Down arrow inputs. Closes #1660 2018-11-12 14:06:55 +01:00
Jordy Ruiz cf586f0a1e Remove outdated console chain code for browser filters 2018-11-12 10:41:25 +01:00
Redix 733d077bf5 Update json-parser 2018-11-11 21:23:56 +01:00
LordSk 7d3e320d18 Draw ninja bar 2018-11-11 19:54:49 +01:00
Redix 81a2df7e28 Update zlib to 1.2.11 2018-11-11 19:41:44 +01:00
Redix 3ef912f4ec Remove unused CClient::DirectInput method 2018-11-11 19:07:55 +01:00
Redix 77924b4254 More accurate ping estimation in the scoreboard 2018-11-11 19:04:19 +01:00
oy e2c6ce81eb fixed dead tee offset. closes #1648 2018-11-11 18:26:21 +01:00
oy 26ebd7817d fixed ingame cursor graphic glitch. closes #1649 2018-11-11 18:12:57 +01:00
oy 925d2c6783
Merge pull request #1646 from axblk/sur_crash_fix 
Fix for a client crash when reloading a survival game with sv_warmup -1
 2018-11-11 17:30:03 +01:00
Redix a3500d1c02 Check the ClientIDs when receiving a snapshot 2018-11-11 16:47:53 +01:00
Redix 4fda4e335d Make sure to always enter a warmup state after reloading 2018-11-11 16:21:06 +01:00
oy 2a46b17453 fixed chat message in the console 2018-11-11 16:20:59 +01:00
Redix 1d2889a3ac Skip end-round state when the match is over 
Fixes the match-end time in survival
 2018-11-11 16:20:02 +01:00
Redix 3ed64edfb8 Verify that the GameData snap-item exists before using it 2018-11-11 16:19:20 +01:00
Redix 62885e8228 Fix end-round time 
In some cases m_GameStateEndTick had a negative value, so the client ignored the GameData snap item
 2018-11-11 16:19:08 +01:00
oy 6fd0de865c changed back camera position for internet tab and fixed some line endings 2018-11-11 15:53:30 +01:00
oy d1b8b18b3a fixed flag position, closes #1640 2018-11-11 15:47:48 +01:00
oy d466c43c91 improved the camera movement for the menu map #1618 2018-11-11 15:21:59 +01:00
oy 686ecac38a fixed mouse sens in the editor 2018-11-11 14:51:29 +01:00
oy db08239506 adjusted the grenade ammo in the hud 2018-11-11 14:23:15 +01:00
oy 83fe7b5952 made gametype text in the server list align on the left and adjusted the corresponding icon rendering 2018-11-11 14:08:08 +01:00
oy fcfa0c6d42 adjusted the rendering of the server level icons 2018-11-11 13:56:52 +01:00
oy f639b8a673 removed graphical glitch when opening the sidebar 2018-11-11 13:46:17 +01:00
oy 3859f4ae97 removed no longer used info icons 2018-11-11 13:43:13 +01:00
oy 1274decdc5 show server info in the list when sidebar is closed 2018-11-11 13:35:36 +01:00
LordSk 1bf18f6c81 fixed white outline 2018-11-10 14:07:55 +01:00
Tom_Adams@web.de 693c409b96 fixed graphic issue with the mouse pointer. closes #1609 2018-11-10 09:19:13 +01:00
Tom_Adams@web.de 31c6d2684d removed the hud scaling. closes #1624 2018-11-10 09:19:03 +01:00
oy a9a013ca87
Merge pull request #1590 from LordSk/feature/chat_part1 
Improve chat look and feel part 1
 2018-11-10 08:53:00 +01:00
nheir 40912b8ef6 Fix: scoreboard on menu when game over 2018-11-10 01:33:16 +01:00
nheir 58439819c8 Disable scoreboard when on menu and hide motd when on menu 
NB: the scoreboard was stuck if pressing TAB and going to menu because controls are disabled on menu
MotD is preserved if entering and leaving menu in the ClMotdTime
 2018-11-10 01:20:34 +01:00
LordSk 6f90349433 Only show Team and Whisper categories, outline highlighted text, adjust colors 2018-11-09 20:44:36 +01:00
Tom_Adams@web.de ffba1d05c2 added reset filter feature 2018-11-08 19:01:02 +01:00
Tom_Adams@web.de a063f8d428 load/store sidebar settings 2018-11-08 19:00:51 +01:00
oy 74a29c1786
Merge pull request #1616 from Dune-jr/feature-redesigncontrolsmenus 
Redesigned the controls menus, with a scrollbar, and independent dropdowns. Fixes #1597
 2018-11-08 16:49:56 +01:00
Jordy Ruiz 447cef9595 Implemented independent dropdowns. Redesigned the controls menus, with a scrollbar. 2018-11-07 19:41:10 +01:00
oy d3553d5f2f started on reworking the server browser 2018-11-07 19:36:35 +01:00
oy 0b25463b75 adjusted the spam protection on the server a bit (fixes #1602) 2018-11-03 10:39:02 +01:00
oy 3e81eb7dac fixed hide console window (fixes #1599) 2018-11-03 08:58:31 +01:00
oy b699d2bf47 disabled dynamic camera by default and updated its description (fixes #1565) 2018-11-03 08:49:15 +01:00
oy b2243b7e88
Merge pull request #1604 from Dune-jr/feature-dyncamoption 
Introduce cl_dynamic_camera option to toggle between camera modes
 2018-11-03 08:41:59 +01:00
LordSk f24ed0887d Tuned down saturation/luminosity influence on team colors. 2018-11-02 21:11:57 +01:00
Jordy Ruiz 4d1160971f Introduced cl_dynamic_camera option to easily toggle between camera modes. Separated cl_mouse_max_distance in two settings, one for each mode 2018-11-02 15:33:41 +01:00
Jordy Ruiz 61f46541c8 Reintroduce code to move from a filter to the next, currently dead code. 2018-11-02 14:46:00 +01:00
oy 8221dac5de
Merge pull request #1596 from nheir/show_favorites 
Use favorite list as a local master server
 2018-11-01 20:29:25 +01:00
oy be6afd0481
Merge pull request #1593 from Dune-jr/feature-noconsole 
In release builds, disable Windows console by default. Closes #1583
 2018-11-01 20:10:41 +01:00
Jordy Ruiz 06c0c1a087 Fix server&friend browser spacing and scrolling 2018-11-01 17:27:18 +01:00
Jordy Ruiz 19e113cde3 Fix -c argument being ignored if not in first position 2018-11-01 12:09:36 +01:00
oy c8d300841b added missing localizations 2018-10-31 21:57:26 +01:00
oy 31f2594ee9 fixed internet server entries showing up in the lan section 2018-10-31 21:46:04 +01:00
Jordy Ruiz 54760abc9d Pass size of buffer to getKey 2018-10-31 20:59:07 +01:00
Jordy Ruiz c27ce66b3a Fix names to abide by naming conventions 2018-10-31 19:07:54 +01:00
oy eaab561b5b skip communication with the version server in case the client can't resolve the address 2018-10-31 18:21:39 +01:00
oy 9800dd4172 purge stored server info requests in case of a refresh 2018-10-31 18:19:27 +01:00
Jordy Ruiz 1b1cf5d312 Bugfix: inverted release and debug 2018-10-31 18:02:01 +01:00
Jordy Ruiz 055cdc87d4 In release builds, disable Windows console by default. Can be enabled again with -c/--console 2018-10-31 17:05:37 +01:00
Jordy Ruiz 2e5831ad34 Now can setup composed binds using the Controls menus. Binds are only set on key release, now. 2018-10-31 15:48:32 +01:00
Jordy Ruiz 9188a357b9 Fixed bug where composed binds would trigger simple binds ingame. Composed binds now work in menus even without including an Fn button 2018-10-31 14:27:52 +01:00
oy 9324e2e42b update time when server info requests are actually sent #1585 2018-10-30 19:08:08 +01:00
LordSk a9a003d981 Increased shadow intensity 2018-10-30 18:40:44 +01:00
Jordy Ruiz 404d8d709a Controls menus now support display of composed binds, and support changing them for simple binds. The only way to create composed binds remains the console. 2018-10-30 18:20:24 +01:00
LordSk 2983d1c318 Added [Category] at the start of each line, 
Tweaked colours and used TexShadowed().
 2018-10-30 18:18:22 +01:00
LordSk 5c5820a139 Decoupled text rendering and calculation (TextDeferredRenderEx), 
Added TextShadowed() based on it.
 2018-10-30 18:03:23 +01:00
Jordy Ruiz cfaa0ea638 Implemented support for Shift, Ctrl, Alt modifiers for binds (console-only for now) 2018-10-30 17:41:26 +01:00
nheir cb54ef66d9 Add fetching favorites info 2018-10-29 19:56:57 +01:00
oy 9eeb7dffa5
Merge pull request #1553 from LordSk/feature/1537 
Fps limit option
 2018-10-29 18:25:46 +01:00
LordSk 7b43aeb5ed Hide limit fps option when vsync is on 2018-10-28 21:48:14 +01:00
LordSk fed245011b Skip rendering frames 2018-10-28 21:31:23 +01:00
oy a50c7aeb90 fixed broken team change buttons 2018-10-28 14:11:24 +01:00
oy 576ae46e56 don't show player and tee setting tab ingame #1573 2018-10-28 14:05:55 +01:00
oy 8ae5eb2dcc made it possible to move the favorite filter on top 2018-10-28 13:52:01 +01:00
oy af31eed357 readded the client command 'team' #1561 2018-10-28 13:32:46 +01:00
Jordy Ruiz 5951545bc1 small code improvements, fixing wrong parenthesis again 2018-10-28 12:22:45 +01:00
Jordy Ruiz 12984794db Merge remote-tracking branch 'upstream/master' into feature-fixcompil 2018-10-28 12:13:55 +01:00
Jordy Ruiz a570efb756 Implemented a cl_filterchat option to choose between all chat, friends-only chat, or no chat; added a toggle button on the general menus. This replaces cl_show_chat_friends. 2018-10-28 11:09:28 +01:00
Jordy Ruiz b783340a51 Resolved merge conflict 2018-10-28 10:39:50 +01:00
Jordy Ruiz ee40b7eb37 Add missing parenthesis 2018-10-28 10:20:38 +01:00
Jordy Ruiz e4d3df5268 Replaced nullptr by NULL 2018-10-28 09:47:02 +01:00
oy fd99a6f7c9 fixed the delete friend button in the friends browser #1571 2018-10-27 17:51:19 +02:00
oy 6bea95dbfa fixed some warnings 2018-10-27 17:48:47 +02:00
oy 6410f26c70 check for valid game message id (#1572) 2018-10-27 16:24:42 +02:00
oy fdcb2f26fb switch to game start timer for the last 3 seconds of warmup to prevent 2 timers. #1567 2018-10-27 11:51:23 +02:00
oy bbdaf1ea3a reduced pause between round in survival gametypes by half. #1558 2018-10-27 11:49:57 +02:00
oy 21f97a9fa2
Merge pull request #1554 from Dune-jr/feature-fixkeybinds 
Write unbindall to settings.cfg to avoid unbound keys being restored by defaults. Fixes #1540
 2018-10-27 09:23:31 +02:00
Jordy Ruiz a637c72a40 Do not trigger highlighting for our own messages 2018-10-26 14:19:12 +02:00
Jordy Ruiz fd142e054b Fixed highlighting not being triggered when message is empty, after a colon 2018-10-26 14:17:51 +02:00
Jordy Ruiz 6d694396fc When saving config, now unbinds every unbound key that was bound by default 2018-10-25 19:25:22 +02:00
LordSk 1126fa8926 Cosmetic fixes, include intrinsics file for mingw 2018-10-24 21:34:08 +02:00
LordSk 8353185c5a Added gfx_limitfps option (allows gfx_maxfps to have a minimum other than 0) 2018-10-24 21:34:07 +02:00
LordSk dc43fdb7b5 Corresponding menu setting 2018-10-24 21:34:07 +02:00
LordSk 7ac512345a Fps limit 2018-10-24 21:34:07 +02:00
LordSk 2e6be01830 Removed commented out code 2018-10-24 17:52:40 +02:00
LordSk 5ef5a2655c Populate lists depending on desktop format 2018-10-24 17:41:47 +02:00
LordSk 43ad8787a4 Moved static ListBox variables to a CListBoxState struct 2018-10-24 17:04:56 +02:00
Jordy Ruiz 3915f09795 Write unbindall when saving to settings.cfg to avoid unbound keys being restored by defaults on the next session 2018-10-24 15:16:47 +02:00
oy 4d78d67d97 prevent disabling the pure filter in the standard browserfilter 2018-10-23 21:49:23 +02:00
oy a5f5853570 removed no longer used code 2018-10-23 21:44:03 +02:00
oy 656ed30d6d load/store server filters in a settings file 2018-10-23 19:07:44 +02:00
oy e05187eb0c
Merge pull request #1547 from LordSk/feature/1533 
Display a hand in the settings menu
 2018-10-23 18:26:44 +02:00