edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-20 06:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity
3451 commits 1 branch 429 tags 411 MiB
Commit graph

3451 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jordy Ruiz cfaa0ea638 Implemented support for Shift, Ctrl, Alt modifiers for binds (console-only for now) 2018-10-30 17:41:26 +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
oy 22d70fac5c
Merge pull request #1577 from Dune-jr/feature-fixcompil 
Replace nullptr by NULL, fixing compilation errors; also, correct the warning fix
 2018-10-28 12:49:40 +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
oy 05d84c90de
Merge pull request #1579 from Dune-jr/feature-filterchat 
Add a new option to toggle between all chat, friend-only, no chat, with a toggle button. Fixes #1471
 2018-10-28 11:43:03 +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 8b42b7f331
Merge pull request #1570 from nheir/fix_net_FailedOn 
Fix unset network error message m_pMsgFailedOn/m_pObjFailedOn
 2018-10-27 16:01:34 +02:00
nheir 1c3607d9bd Fix unset network error message 
A malicious server can make crash a client on debug (and it seems the reverse is possible but I couldn't reproduce)
 2018-10-27 15:54:06 +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
oy 76e83cb66e
Merge pull request #1560 from Dune-jr/feature-fixping 
Highlighting is now also triggered by empty messages, and is disabled for the user's own messages. Fix #1559.
 2018-10-27 09:21:32 +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
oy fa83830e48
Merge pull request #1555 from LordSk/feature/1509 
New resolution menu
 2018-10-24 21:14:23 +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
oy 5626715a53
Merge pull request #1545 from nheir/fix_motd 
Show motd unless we actively wanna look the scoreboard
 2018-10-23 18:25:19 +02:00
oy 73bd52ac26
Merge pull request #1546 from nheir/debug_crash 
debug=1 makes the game crash
 2018-10-23 18:24:45 +02:00
LordSk 72d96e9e2e fixed the tab situation 2018-10-23 17:55:05 +02:00
LordSk d9fd61261e Scale hand properly and draw it 2018-10-23 16:54:39 +02:00
LordSk ecea6edcf7 Relocated RenderHand to CRenderTools 2018-10-23 15:53:46 +02:00
nheir f9792eff63 fix debug crash on startup 2018-10-22 23:55:05 +02:00
nheir 9d58a7e1e6 Show motd unless we actively wanna look the scoreboard 2018-10-22 23:38:48 +02:00
oy 914ad8e2f7 fixed some arch checks on windows 2018-10-21 11:33:29 +02:00