edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-05 15:48:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
14135 commits 1 branch 428 tags 411 MiB
Commit graph

14135 commits

This branch
This branch
All branches
Author SHA1 Message Date
jupeyy 58e583e642 fix laser/rifle bonce delay, when server time(server ticks) are high, caused by unprecise floating point arithmetic 2018-12-07 11:06:44 +01:00
Dennis Felsing 19840bc31b
Merge pull request #1392 from ddnet/strict-weak-ordering 
Make cort comparator conform to strict weak ordering
 2018-12-06 13:26:20 +01:00
Dennis Felsing 0ad472df41 Make cort comparator conform to strict weak ordering 
comp(p1, p2) == false was violated when both are nullptr
https://en.cppreference.com/w/cpp/named_req/Compare
 2018-12-06 07:57:01 +01:00
Dennis Felsing 809afa265f Fix typo 2018-12-05 07:28:29 +01:00
bors[bot] fced67af08 Merge #1390 
1390: Fix crash when auto update is off r=def- a=SilverRainZ

Since 2696ac134c, whether to include auto update related code should only control by macro CONF_AUTOUPDATE.

This commit should fix #1374

Co-authored-by: Shengyu Zhang <i@silverrainz.me>
 2018-12-04 17:27:26 +00:00
Shengyu Zhang 464ef9e74b Fix crash when auto update is off 
Since 2696ac134c, whether to include auto
update related code should only control by macro CONF_AUTOUPDATE.

This commit should fix #1374
 2018-12-05 01:06:52 +08:00
def 6ad686eee2 Fix HUD (thanks to fokkonaut for reporting) 2018-11-24 22:57:15 +01:00
bors[bot] 35776ee627 Merge #1385 
1385: Fix the beep. Fixes #985 r=def- a=Learath2

Apparently this isn't a perfect solution as consoles are devices on windows for some reason. Hopefully it'll work for most if not all users :)

Co-authored-by: Learath2 <learath2@gmail.com>
 2018-11-22 21:10:18 +00:00
Learath2 21609d43fb Fix the beep. Fixes #985 2018-11-22 17:37:52 +01:00
bors[bot] e632cbbf14 Merge #1384 
1384: Serverside special handling for 9999 second time r=heinrich5991 a=def-

As requested by heinrich5991

Co-authored-by: def <dennis@felsin9.de>
 2018-11-21 22:25:48 +00:00
def 1a66fb9c17 Serverside special handling for 9999 second time 2018-11-21 23:21:35 +01:00
Dennis Felsing b1c39d3667
Merge pull request #1383 from ddnet/sort 
Fix Race scoreboard ordering for times > 166 minutes (9999 seconds)
 2018-11-21 23:13:17 +01:00
def 27865fdd89 Fix Race scoreboard ordering for times > 166 minutes (9999 seconds) 2018-11-21 21:26:05 +01:00
Dennis Felsing f386b9d2c5
Merge pull request #1381 from yangfl/upstream 
Remove extra semicolons
 2018-11-18 09:14:13 +01:00
yangfl a1db76cdef Remove extra semicolons 2018-11-18 14:27:48 +08:00
Dennis Felsing 0b6fee0be5
Merge pull request #1380 from Learath2/dd_pr_envelunused 
Switch around the colors for used/unused envelopes
 2018-11-16 16:57:30 +01:00
Learath2 c601df8b28 Switch around the colors for used/unused envelopes 2018-11-16 14:51:36 +01:00
Dennis Felsing 5348533858
Merge pull request #1379 from 12pm/pr_auth_username_quote_semicolon 
Fix output for usernames with double quotes and semicolons
 2018-11-15 19:53:15 +01:00
12pm d46a5c7994 Fix output for usernames with double quotes and semicolons 2018-11-15 18:30:44 +01:00
Dennis Felsing fed6f02c87 Version 11.5 2018-11-15 14:45:10 +01:00
Dennis Felsing 045533cef7
Merge pull request #1321 from bojidar-bg/x-add-auto-automapper 
Add option to automatically run the automapper
 2018-11-15 09:30:22 +01:00
Dennis Felsing 4b43fa5ffe
Merge pull request #1375 from 12pm/pr_auth_username_spaces 
Fix output for usernames with spaces
 2018-11-15 09:26:37 +01:00
Dennis Felsing 9bf9ed4838
Merge pull request #1363 from Ryozuki/pr_improve_telegun 
Improve telegun
 2018-11-15 09:24:17 +01:00
Ryozuki 90118b5a07
make it one line 2018-11-13 13:05:15 +01:00
Ryozuki 41fc33406a fix laser telegun through TELEINWEAPON tile 2018-11-10 20:47:11 +01:00
12pm 59334a7068 Fix output for usernames with spaces 2018-11-10 13:52:13 +01:00
Ryozuki 62dbda204e fix entities clear and remove tele-activator from gametile as it doesn't make sense. 2018-11-04 15:50:56 +01:00
Ryozuki 674d3f00e0 add support for blue teleport gun 2018-11-03 10:26:20 +01:00
Ryozuki 007eb71d2a new tele-activator tiles (edited by Ravie, based on Sonix work) 2018-11-03 10:26:20 +01:00
Ryozuki 3d202883c9 tele-activator: make delay be able to specify a weapon 2018-11-03 10:26:19 +01:00
Ryozuki ddf2e6af36 add tele-activator to the switch layer 2018-11-03 10:26:19 +01:00
Ryozuki c831b5e0c1 change tele-blocker to tele-activator 2018-11-03 10:26:18 +01:00
Dennis Felsing 69b25b8f4c Version 11.4.6 2018-11-02 14:24:14 +01:00
Dennis Felsing c1423747a4 Library updates 
SDL 2.0.8 -> 2.0.9
curl 7.61.1 -> 7.62.0
opus 1.2.1 -> 1.3
 2018-11-02 14:21:09 +01:00
Dennis Felsing 5ad48da41d
Merge pull request #1372 from Ryozuki/pr_fix_windows_sound 
Fix windows sound. Fixes #1371
 2018-11-02 13:19:08 +01:00
Ryozuki d9d3ed783e fix windows sound 2018-11-02 12:47:20 +01:00
Dennis Felsing d072817e25
Merge pull request #1366 from ddnet/upd1145 
Version 11.4.5
 2018-10-31 18:30:50 +01:00
Dennis Felsing bccf6320b7
Merge pull request #1368 from Learath2/dd_pr_shiftcrash 
Fix editor crash
 2018-10-31 18:30:34 +01:00
Dennis Felsing 6c061eb2ec Remove unused cl_flow variable 
As noticed by xse in https://github.com/ddnet/ddnet-web/pull/64
 2018-10-31 08:26:56 +01:00
Learath abd49ddbf7 Restore old behaviour to be safe :( 2018-10-30 18:56:46 +01:00
Learath 0ecda0ced4 Fix crash introduced by 1e2dce0. Close #1362 2018-10-30 18:13:32 +01:00
def 62d3c97ad1 Version 11.4.5 2018-10-29 22:19:34 +01:00
def aab6fa152a Fix #1357 2018-10-29 22:16:32 +01:00
def c0b60979ec style 2018-10-29 22:09:11 +01:00
Dennis Felsing 80f4b7934c
Merge pull request #1365 from Jupeyy/pr_bordercorner_fix 
Border corner minimum fix
 2018-10-29 22:08:43 +01:00
def faf388b853 Fix #1350 2018-10-29 22:03:57 +01:00
def 5b436adff8 blockZ & infectionZ are 64player but not DDNet 
even though their name contains DDNet
fixes #1364
 2018-10-29 21:33:35 +01:00
bors[bot] 1b0b36c6eb Merge #1316 #1341 #1349 
1316: code improvement on gameclient.cpp r=def- a=Ryozuki



1341: Mark unused envelopes r=def- a=Learath2

Thought I'd do this one as well while looking at the editor code.

1349: Don't ignore CONNECT packets with data that we don't know r=def- a=heinrich5991

This specifically affects 0.6.5. Just treat them the same way as those
without any data.

Co-authored-by: Ryozuki <edgar@ryobyte.com>
Co-authored-by: Learath <learath2@gmail.com>
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2018-10-29 14:31:27 +00:00
bors[bot] 25bd83225f Merge #1340 
1340: Editor fixes r=def- a=Learath2

Address #1331 and also fix the scrollbar enabling when there isn't enough elements.

Co-authored-by: Learath <learath2@gmail.com>
 2018-10-29 14:16:38 +00:00
jupeyy 95e8a031c7 style 2018-10-29 09:00:47 +01:00