Commit graph

10866 commits

Author SHA1 Message Date
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
jupeyy c666417fa0 less code 2018-10-29 08:44:55 +01:00
jupeyy 536bb4ad3d check minimum for width and height seperatelly 2018-10-29 04:21:35 +01:00
12pm 5a5dc45368 Update GL and LY flags 2018-10-22 18:31:13 +02:00
Ryozuki 183f335606 Improve teleblocker tile, thanks to Ravie 2018-10-22 18:25:08 +02:00
bors[bot] d7072da916 Merge #1353
1353: Revert "CMakeLists.txt: Replace PythonInterp with Python" r=Learath2 a=heinrich5991

This reverts commit c1523d9fc3.

Fixes #1352.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2018-10-20 14:32:20 +00:00
heinrich5991 9ef200cd4a Revert "CMakeLists.txt: Replace PythonInterp with Python"
This reverts commit c1523d9fc3.

Fixes #1352.
2018-10-20 14:37:12 +02:00
Learath 657e869901 Handle Tile and Sound layers 2018-10-14 16:57:30 +03:00
heinrich5991 c7750f3616 Don't ignore CONNECT packets with data that we don't know
This specifically affects 0.6.5. Just treat them the same way as those
without any data.
2018-10-14 08:18:32 +02:00
bors[bot] 963cec6976 Merge #1348
1348: increase max score that can be displayed in scoreboard r=Learath2 a=fokkonaut

![base profile screenshot 2018 10 11 - 22 15 10 80](https://user-images.githubusercontent.com/35420825/46831469-d31c2300-cda3-11e8-9a13-2814fd7621f3.png)


its only for the positive numbers because negative should stay at max -999.
level server for examples can often reach the players level over 1000, and then the scoreboard is just a mess. also its not looking bad and the numbers arent over the edge, so i personally think this is a good addition.

as you can also see, scores over 99.999 (basically 100k) arent shown.

another reason: times for ddrace scoreboard can be as long as they want. there is no display limit, so it doesnt make sense have such a small limit for non-ddrace-scoreboard

Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
2018-10-13 12:38:12 +00:00
Dennis Felsing e02a9956a5 Remove unused cl_eventthread 2018-10-12 14:42:40 +02:00
fokkonaut 1082ba77b0 increase max score that can be displayed in scoreboard 2018-10-11 22:19:26 +02:00
bors[bot] 865678afef Merge #1344
1344: CMakeLists.txt: Replace PythonInterp with Python r=Learath2 a=yangfl

FindPythonInterp is deprecated since CMake version 3.12. Use Python to
automatically detect Python 3 or 2.

Co-authored-by: yangfl <yangfl@users.noreply.github.com>
2018-10-11 11:46:17 +00:00
yangfl c1523d9fc3 CMakeLists.txt: Replace PythonInterp with Python
FindPythonInterp is deprecated since CMake version 3.12. Use Python to
automatically detect Python 3 or 2.
2018-10-11 08:57:56 +08:00
Learath cdce9d84ac Mark unused envelopes. Fix #1139 2018-10-09 13:42:04 +03:00
Bojidar Marinov 823e4ee0f3
Save automapper config as external-typed mapitem 2018-10-09 13:17:05 +03:00
Bojidar Marinov 351fee2666 Optimize automatic automap to automap only around changes.
Should work, no flaws found when testing with grass_main
2018-10-09 12:56:48 +03:00
Bojidar Marinov c52a3c970e Add option to automatically run the automapper
Also, put automapping config selection seperatelly from the automapper button.
Also, add seed parameter to the automapper.
2018-10-09 12:56:48 +03:00
bors[bot] 61559f2ff0 Merge #1329
1329: Add support for extra map items in datafiles r=Learath2 a=heinrich5991

This works by utilizing the good old UUIDs – this way we can make sure
that we don't clash with other people extending the map format.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2018-10-09 09:30:23 +00:00
heinrich5991 879c6ce5dc Add *.tmp to .gitignore (it is output by tests) 2018-10-08 23:05:56 +02:00