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
3541 commits 1 branch 429 tags 412 MiB
Commit graph

3541 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
oy 18e293ee62 update flag positions after updating the player ones 2018-10-21 10:37:50 +02:00
oy 9d5795fd18 don't play the hurt/hit sound when no damage was taken by an explosion 2018-10-21 10:36:13 +02:00
Chiller Dragon aedecad6db
Ignore _test.exe (generated by win build) 2018-10-20 19:51:58 +02:00
oy a5b437d301 fixed a problem with the scoreboard 2018-10-20 11:12:52 +02:00
oy fa3496c5a6 fixed a problem with the stored connless packet list 2018-10-20 10:45:23 +02:00
oy e244c2752d
Merge pull request #1527 from nheir/fix_ctf_count 
Fix CTF teamscore for initial grabing
 2018-10-17 17:04:48 +02:00
oy 635d98ad54
Merge pull request #1528 from fokkonaut/master 
remove unused broadcast definition
 2018-10-17 17:04:24 +02:00
fokkonaut fa5b444503 remove unused broadcast definition 2018-10-16 21:47:43 +02:00
nheir 156650e047 Fix teamscore for initial grabing 2018-10-16 21:33:11 +02:00
oy a073f066f4
Merge pull request #1513 from Lucki/add_xdg 
Add basic XDG support
 2018-10-16 19:08:48 +02:00
oy 42ea5b457d
Merge pull request #1525 from jxsl13/patch-1 
macOS stuff updated
 2018-10-16 18:50:56 +02:00