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

7018 commits

Author SHA1 Message Date
Dennis Felsing 1221b1f11c Fix Windows compilation 2018-12-17 14:44:19 +01:00
Dennis Felsing e9ee74a941
Merge pull request #1402 from ddnet/remove-modhelp 
Remove /modhelp (fixes #1401)
 2018-12-17 14:42:07 +01:00
Dennis Felsing 9febf58f37 New try at recvmmsg with some improvements 2018-12-16 22:59:41 +01:00
def a3b07dbf9c New try at not decompressing unknown packets 2018-12-16 22:15:45 +01:00
def d884465710 Revert "Don't decompress packets from unknown IPs" 
This reverts commit 9089c2b35a.
 2018-12-14 17:12:49 +01:00
Dennis Felsing 0b256ff653 Allow connecting clients to compress 
TODO: Look for better solution
 2018-12-14 11:17:15 +01:00
def c4d437bc0f Make client launchable from browser 
By needs from https://github.com/teeworlds/teeworlds/pull/1478/files
 2018-12-13 19:57:34 +01:00
Dennis Felsing 9089c2b35a Don't decompress packets from unknown IPs 2018-12-13 16:24:37 +01:00
Dennis Felsing 42d7f58d08 sv_join_vote_delay: Don't affect participating in map votes 
Since they are already restricted by veto right
 2018-12-12 10:41:31 +01:00
Dennis Felsing 5c18d6c481 Remove /modhelp (fixes #1401) 2018-12-12 10:05:44 +01:00
Dennis Felsing b224a4dafe Improve sv_join_vote_delay against vote bots 
- Prolong to 5 minutes
- also affects participating in votes
 2018-12-11 10:29:36 +01:00
Dennis Felsing fabd559746 Clamp Spectator ID 2018-12-11 09:23:12 +01:00
Dennis Felsing 7944c9ca75 Version 11.5.1 2018-12-11 08:12:51 +01:00
ChillerDragon aef7d76158 Allow to use pausevoted as normal pause 2018-12-10 23:20:29 +01:00
Dennis Felsing 1f421ab00a
Merge pull request #1395 from Jupeyy/pr_laser_bounce_delay_fix 
Fix laser/rifle bounce delay, when server time(server ticks) are high/huge
 2018-12-10 17:41:44 +01:00
Learath 19a458d523 Fix a couple issues 2018-12-08 00:24:57 +01:00
Learath 40d7b03f10 uf, typo 2018-12-08 00:06:54 +01:00
Learath 0c13c8cebb Handle the windows console properly. Fixes #1394 2018-12-07 23:52:33 +01:00
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 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
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
def 1a66fb9c17 Serverside special handling for 9999 second time 2018-11-21 23:21:35 +01:00
def 27865fdd89 Fix Race scoreboard ordering for times > 166 minutes (9999 seconds) 2018-11-21 21:26:05 +01:00
yangfl a1db76cdef Remove extra semicolons 2018-11-18 14:27:48 +08:00
Learath2 c601df8b28 Switch around the colors for used/unused envelopes 2018-11-16 14:51:36 +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
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
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 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
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
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
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 4660e0a680 Add support for extra map items in datafiles 
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.
 2018-10-08 23:05:56 +02:00
Learath 571b069b91 Small cleanup of *Mute functions 2018-10-08 21:29:33 +03:00
Learath 5b95eddca1 DRY with net_addr_comp_noport 2018-10-08 21:04:04 +03:00
Learath 254ff3dc6b Oversight 2018-10-08 20:56:49 +03:00
Learath 2e137e6fc7 net_addr_comp_ip -> net_addr_comp_noport 2018-10-08 19:56:51 +03:00
Learath f1867e0403 Grammar fix "then->than" 2018-10-08 19:55:18 +03:00
Learath 4fedd91020 Arrow keys should account for visibility 2018-10-08 19:07:25 +03:00
Learath ad566aa158 Consider the search text when counting elements 2018-10-08 18:43:39 +03:00
Learath 5c4203b747 Reset scroll when search text changes. Fix #1331 2018-10-08 18:43:37 +03:00
Learath 1073b72965 Ignore DNSBL on "empty" servers. 2018-10-08 01:59:07 +03:00
Dennis Felsing a09fa562be
Merge pull request #1314 from timakro/pr_editor_entities_gametypes 
Allow choosing game layer entities for different gametypes, closes #1283
 2018-10-07 23:02:20 +02:00
Dennis Felsing dbaf779bda
Merge pull request #1335 from heinrich5991/pr_ddnet_serverjobs 
Use two threads for the server thread pool
 2018-10-07 17:29:22 +02:00
heinrich5991 a36250ba34 Use two threads for the server thread pool 
This might help with long DNS timeouts.
 2018-10-07 12:47:32 +02:00
bors[bot] 7f4c5b2183 Merge #1327 
1327: Try closing the file earlier. Fix #1250 r=heinrich5991 a=Learath2

Maybe closing the file earlier could work?

Co-authored-by: Learath <learath2@gmail.com>
 2018-10-04 14:27:11 +00:00
Learath 189a2939b0 Try closing the file earlier. Fix #1250 2018-10-04 16:10:27 +02:00
Dennis Felsing fc7b3732e6
Merge pull request #1315 from Learath2/dd_pr_brushsave 
Implement brush saving. Fix #1111
 2018-10-04 10:59:00 +02:00
Dennis Felsing a21f01eef8 str_copy: Avoid -Wstringop-truncation warning in GCC8 2018-10-04 10:48:49 +02:00
Dennis Felsing 20b31723c9
Merge pull request #1323 from heinrich5991/pr_ddnet_fix_editor_dontembedvanilla 
Duh. Fix editor embedding vanilla images and not others
 2018-10-03 20:40:48 +02:00
heinrich5991 479dc8ad8f Duh. Fix editor embedding vanilla images and not others 
I don't know how I managed to get this wrong.

Fixes #1178.
 2018-10-03 20:34:13 +02:00
Ryozuki 09c82fba7a indent 2018-10-03 07:40:50 +02:00
Tim Schumacher ab6f344daa
Fix current selection highlighting 2018-10-02 23:39:22 +02:00
Tim Schumacher fd52bc7a26
List all game layer entities images in directory 2018-10-02 23:08:17 +02:00
Ryozuki 5c51e3b80d change to c style casts 2018-10-02 20:52:21 +02:00
Ryozuki be3cfe88e6 fix 2018-10-02 20:45:44 +02:00
Ryozuki 0a91fef8c8 fix tabs 2018-10-02 14:36:55 +02:00
Ryozuki e21a08f700 another improvement 2018-10-02 14:35:50 +02:00
Ryozuki 7efe2b436e code improvement on gameclient.cpp 2018-10-02 14:32:59 +02:00
Dennis Felsing b0759830b7
Merge pull request #1300 from Learath2/dd_pr_autoupdateflag 
CMake option to disable autoupdater. Closes #1292
 2018-10-02 08:04:12 +02:00
Learath fef22f34f2 Implement brush saving. Fix #1111 2018-10-02 03:52:01 +02:00
Tim Schumacher bee694a8cb
Forgot to remove debug 2018-10-01 23:10:46 +02:00
Tim Schumacher 2e36ad67bb
Allow choosing game layer entities for different gametypes, closes #1283 2018-10-01 23:05:36 +02:00
Dennis Felsing 24bd8f2d56
Merge pull request #1312 from timakro/pr_fix_dragging_quads 
Fix #963 dragging quads
 2018-10-01 22:39:15 +02:00
Dennis Felsing 7e76f71686
Merge pull request #1313 from timakro/pr_left_align_editor_text 
Left align editor menu texts like server settings, closes #1215
 2018-10-01 22:39:03 +02:00
Tim Schumacher 3fd2f60034
Left align editor menu texts like server settings, closes #1215 2018-10-01 21:45:29 +02:00
Tim Schumacher 8da9a5f9f1
Fix #963 dragging quads 2018-10-01 21:12:14 +02:00
Ryozuki 8e8e46a26a fix windows compilation warning 2018-10-01 19:23:33 +02:00
def 542e027de4 Version 11.4.4 2018-09-30 15:25:42 +02:00
fokkonaut cf727576eb spaces again? 2018-09-28 18:29:14 +02:00
fokkonaut ea64d57be1 spaces 2018-09-28 18:28:45 +02:00
fokkonaut 3240f6fbc5 fix bw support 2018-09-28 18:27:51 +02:00
Bojidar Marinov 1e2dce06ae
Fix crash when filling selection on tele/switch/speedup layers 2018-09-26 15:53:25 +03:00
def 2198f6c997 Limit demo speed to 64 (thanks to fokkonaut for report) 2018-09-24 18:07:14 +02:00
Learath 2696ac134c Handle the platform differences in CMake. 2018-09-20 14:06:18 +02:00
Dennis Felsing a2e3496005
Merge pull request #1220 from heinrich5991/pr_ddnet_ui_skinprefix 
Add some UI for the skin prefix stuff
 2018-09-20 08:41:20 +02:00
heinrich5991 08b885dbbb Just render the skin prefix suggestions line by line 
For three items, it's not worthwhile to put two of them in the same
line.
 2018-09-20 07:50:17 +02:00
heinrich5991 13e3872dca Add clear button to skin prefix edit box 2018-09-20 07:48:14 +02:00
heinrich5991 9ff8b6e2df Factor out clear button from four different places 2018-09-20 07:43:05 +02:00
Learath 3852f0e720 CMake option to disable autoupdater. Closes #1292 2018-09-20 03:01:31 +02:00
Dennis Felsing 0605a4f662 Version 11.4.3 2018-09-11 14:56:28 +02:00
Bojidar Marinov 50d53603e1
Add a toggle button for brush coloring 
In some cases (very dark color, etc.) it is impossible to see the tiles.
 2018-09-11 11:35:02 +03:00
def ff8e97fbf8 Fix cl_nameplates_own with antiping on when spectating 2018-08-30 22:53:28 +02:00
Dennis Felsing c9f28ce094 Forbid copying classes in threading 2018-08-29 11:32:53 +02:00
Dennis Felsing 925f7b6325 Fix weird Windows compilation 2018-08-29 11:32:36 +02:00
Dennis Felsing a63f210a01 Fix segfault when deleting lock 2018-08-29 10:32:12 +02:00
Dennis Felsing c29a72eb70 Lock style 2018-08-27 16:36:36 +02:00
Dennis Felsing 4d634bb7fd Global lock for MySQL Connector's get_driver_instance 
See note in https://dev.mysql.com/doc/connector-cpp/1.1/en/connector-cpp-examples-connecting.html

> get_mysql_driver_instance() calls get_driver_instance(), which is not
> thread-safe. Either avoid invoking these methods from within multiple
> threads at once, or surround the calls with a mutex to prevent
> simultaneous execution in multiple threads.
 2018-08-27 09:42:37 +02:00
def 48d1757793 Fix bw support 2018-08-26 21:21:27 +02:00
Ryozuki dc4179b056 it's safe to delete a null pointer 2018-08-24 20:02:23 +02:00
ChillerDragon 273c545f4e Remove useless semicolon 2018-08-24 16:17:23 +02:00
Dennis Felsing 03098af933 Fix dnsbl initialization 
Don't set dnsbl state to pending when we someone connects over ipv6 and
the init will fail, leaving a null pointer in m_pDnsblLookup
 2018-08-24 14:24:34 +02:00
Dennis Felsing d2dcb4fe84
Merge pull request #1270 from Jupeyy/pr_nan 
Don't update particles, if no time passed
 2018-08-24 10:14:38 +02:00
Dennis Felsing dc08ac2d6d Version 11.4.2 2018-08-24 09:51:41 +02:00
Dennis Felsing 13aa154d47 Revert "Rewrite stopper code a bit" 
This reverts commit 4ee5c5a781.
 2018-08-24 09:34:54 +02:00
jupeyy 6c10eb13c0 Don't update, if no time passed 2018-08-24 05:56:33 +02:00
Dennis Felsing d5defd2853 Version 11.4.1 2018-08-23 10:00:28 +02:00
Dennis Felsing 39b36b2c3b Check file system operations and log them 2018-08-23 09:58:35 +02:00
Dennis Felsing 20ea1651cb Don't save non-client configs 2018-08-23 09:57:48 +02:00
Dennis Felsing e295a121e4 DDNET_INFO(_TMP) 2018-08-23 09:57:35 +02:00
Dennis Felsing 29dd3e29f7 Read ddnet-info.json from correct location 2018-08-23 09:36:20 +02:00
def 58927375fc Add message for failed database connection 2018-08-22 22:27:01 +02:00
Dennis Felsing 02e5fa20a0 Revert "Fix stoppers while retaining backward-compatibility" 
This reverts commit e2d3e353cf.
 2018-08-22 08:33:28 +02:00
Dennis Felsing d60b0db632 Revert "Add mapbug "stoppers-passthrough@ddnet.tw"" 
This reverts commit 25e86851d3.
 2018-08-22 08:33:21 +02:00
bors[bot] 46bdc7af3e Merge #1252 
1252: fix #1226 r=heinrich5991 a=fokkonaut



Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2018-08-21 17:29:31 +00:00
fokkonaut 7a4fa97ef0 fuck this no-space-convention 2018-08-21 18:29:25 +02:00
fokkonaut 533d4fe574 allow for non-vanilla aswell and fixed some stuff 2018-08-21 18:27:34 +02:00
Dennis Felsing c3efb38d1d HTTP options should be saved 2018-08-21 14:50:36 +02:00
Dennis Felsing 63c7105c86 Version 11.4 2018-08-21 09:10:56 +02:00
Dennis Felsing 6f75cff582
Merge pull request #1259 from heinrich5991/pr_ddnet_mapbugs_sha256 
Also use sha256 for the mapbugs stuff
 2018-08-21 09:07:57 +02:00
Dennis Felsing f8e1056ea4
Merge pull request #1258 from heinrich5991/pr_ddnet_stopper_fix 
Fix stoppers while retaining backward-compatibility
 2018-08-21 09:06:22 +02:00
Dennis Felsing e2eb4a66dc Add Filter for connecting players (fixes #1263) 2018-08-21 09:03:48 +02:00
bors[bot] 36a243e395 Merge #1251 
1251: Selecting multiple quads r=def- a=Aerll

- shift+drag to select quads. Selection is additive
- left click on any empty space deselects all quads
- moving, resizing, rotating etc. works for every selected quad
- fixed resizing quads on grid and in properties. Vertices don't land on the same spot

Co-authored-by: Aerll <31746984+aerll@users.noreply.github.com>
 2018-08-21 06:31:06 +00:00
Learath c5d69f9f63 Fix crash with FillSelection 2018-08-19 20:05:42 +03:00
heinrich5991 67d36b695d Also use sha256 for the mapbugs stuff 2018-08-19 12:12:11 +02:00
def 311e89c79d Fix votes 2018-08-16 21:42:10 +02:00
heinrich5991 25e86851d3 Add mapbug "stoppers-passthrough@ddnet.tw" 
This can be set for maps that rely on actually passing through stoppers.
 2018-08-16 17:54:55 +02:00
heinrich5991 e2d3e353cf Fix stoppers while retaining backward-compatibility 
Stopper behavior is only changed when the player would otherwise go
entirely through the stopper. Players can still enter a stopper as far
as the stopper can still affect them. One-way blockers have a bigger
range, and thus allow tees to enter furtherly.

A possible (manual) test map for this is test_stoppers.map, sha256sum
ed8be386e54a03d7bd7ed69fdd962c86f51f654427972d58d492c8905c8fbdb7, crc
48812a51.
 2018-08-16 17:54:55 +02:00
heinrich5991 4ee5c5a781 Rewrite stopper code a bit 
Remove the whole copy-and-paste mess.

A seemingly ineffective and apparently code block has been removed.
 2018-08-15 17:47:07 +02:00
heinrich5991 2ad4c86632 Fix a typo 2018-08-13 21:35:49 +02:00
fokkonaut 53e4bd44b7 fix #1226 2018-08-13 20:54:01 +02:00
Aerll 520aa7dd0d naming & eol 2018-08-13 16:46:53 +02:00
Aerll f79bf5d03b selecting multiple quads 2018-08-13 11:11:56 +02:00
Aerll 9951b2a187 optimize automapper a bit 2018-08-11 03:01:25 +02:00
bors[bot] 22ff46e204 Merge #1245 
1245: Fix automapper bug r=def- a=Aerll

There is some weird bug caused by my last changes, looks like automapper is working only fine for tiles without rotation.
![unknown](https://user-images.githubusercontent.com/31746984/43928232-73d9e8f4-9c30-11e8-802f-e4d239fdf8d4.png)
![unknown2](https://user-images.githubusercontent.com/31746984/43928244-793a25d4-9c30-11e8-9c37-e1fc5c3fd39b.png)
I'm not really sure why it doesn't work with -1, so I did some workaround.

Co-authored-by: Aerll <31746984+aerll@users.noreply.github.com>
 2018-08-10 08:17:37 +00:00
Aerll abc55396d0 fix flag test bug 2018-08-09 23:45:04 +02:00
Dennis Felsing 0b539df741 bw 2018-08-09 13:05:36 +02:00
Dennis Felsing dda2b06672
Merge pull request #1235 from fokkonaut/master 
block worlds zoom + eye wheel
 2018-08-09 13:04:07 +02:00
Bojidar Marinov 80c829681e
Don't copy alpha when coloring the brush 2018-08-09 13:07:49 +03:00
Dennis Felsing 461a83871b Version 11.3.1 2018-08-07 09:43:52 +02:00
def 0518769500 fix cl_show_nameplates_own with antiping off ingame 2018-08-03 23:40:03 +02:00
Aerll a7a8db4dcb fix crash when deleting layer 2018-08-03 14:14:25 +02:00
Jupeyy 29ecaa2c2a brace 2018-08-02 20:58:43 +02:00
Jupeyy bc013513bc don't restore the config variable in this case 2018-08-02 20:56:29 +02:00
Jupeyy 7ce29e7a1a Properly reset context attributes, if OpenGL3 context failed to create 2018-08-02 20:52:51 +02:00
Jupeyy d7bb03ee19 don't render all border all the time 2018-08-02 18:26:12 +02:00
bors[bot] 8194274352 Merge #1236 
1236: Copy tile layer color to brush and picker r=heinrich5991 a=bojidar-bg

![Comparision](https://user-images.githubusercontent.com/5276727/43340641-aaebcfc4-91e5-11e8-9d43-c18aff8cd6fc.png)
Before is on the left, after is on the right.


Co-authored-by: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
 2018-07-30 14:25:11 +00:00
bors[bot] b82930b56a Merge #1227 
1227: Allow multiple layers to be selected and edited at the same time. r=heinrich5991 a=bojidar-bg

Resolves #486.

Please test, I'm still not completely sure it won't crash or mess up a map from time to time.

Co-authored-by: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
 2018-07-30 14:12:49 +00:00
def 18529fa082 Revert "Implement recvmmsg" 
This reverts commit de5fe64be5.
 2018-07-29 23:07:59 +02:00
def 5d8d900643 Revert recvmmsg 2018-07-29 22:49:34 +02:00
fokkonaut 2dafafd75b oops, tab instead of spaces 2018-07-27 23:32:10 +02:00
fokkonaut cd5d69bfc5 added bw to isddnet 2018-07-27 23:28:02 +02:00
Bojidar Marinov 0f6bd99d12
Copy tile layer color to brush and picker 2018-07-27 21:38:36 +03:00
Bojidar Marinov 333572acd4
Polish; disable picker and quad/sounds popup menus in multi-select 2018-07-27 16:54:52 +03:00
Dennis Felsing 409abf1b90 Simplify code a bit 2018-07-27 07:51:16 +02:00
Dennis Felsing 4f18d7f9b8
Merge pull request #1213 from Aerll/automapper 
Add 2 new commands for automapper
 2018-07-27 07:49:04 +02:00
Aerll 292f0a2b09 no need for all pos rule tests 2018-07-27 00:23:53 +02:00
Aerll 52fbade30c remove unnecessary tiles overwriting 2018-07-26 22:58:05 +02:00
fokkonaut b8730b3653 block worlds zoom + eye wheel 2018-07-26 21:34:24 +02:00
Aerll 56a5ee6d1b formatting.. 2018-07-26 18:59:29 +02:00
Aerll 2e7a0be516 wrong naming for pointer 2018-07-26 18:26:12 +02:00
heinrich5991 e8c7dca035 Fix storage.cfg reading broken by the str_startswith change 2018-07-26 15:46:54 +02:00
Aerll 3c07a2b35b fixes #1213 2018-07-26 14:49:43 +02:00
heinrich5991 9fcf5480f8 Return a pointer from str_endswith as well 2018-07-26 14:18:23 +02:00
heinrich5991 5c4e819e44 Use str_startswith, str_endswith instead of ad-hoc implementations 2018-07-26 14:18:23 +02:00
heinrich5991 746d3d6b1a Add str_startswith and str_endswith 
Also add a couple of tests for both.
 2018-07-26 14:06:56 +02:00
heinrich5991 57d3a61c3f "termineted" -> "terminated" 2018-07-26 14:06:56 +02:00
bors[bot] bfbeba54f5 Merge #1224 
1224: vanilla skins only list now only shows vanilla skins r=Learath2 a=fokkonaut



Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
 2018-07-26 11:49:24 +00:00
Dennis Felsing 3277caaac1
Merge pull request #1228 from timakro/pr_fix_automapper_crash_no_section 
Fix automapper crash without [section] line
 2018-07-26 08:30:17 +02:00
Dennis Felsing 876ecc7909 fix 2018-07-26 08:30:00 +02:00
Tim Schumacher 1e3b8c7db5
Fix automapper crash without [section] line 2018-07-26 01:21:20 +02:00
fokkonaut 32b6bd44f6 heinrich styling 2018-07-25 23:36:52 +02:00
Bojidar Marinov aa091bb8f7
Allow multiple layers to be selected and edited at the same time. 2018-07-25 23:57:58 +03:00
fokkonaut e621a4a8a2 fixed, thanks heinrich 2018-07-25 22:41:24 +02:00
fokkonaut 59272476d6 fixed #1225 2018-07-25 21:14:10 +02:00
Dennis Felsing 0336b662c5 fix 2018-07-25 16:33:26 +02:00
Dennis Felsing d5dc951747 fix 2018-07-25 16:24:12 +02:00
Dennis Felsing 9f8b962e5d fix 2018-07-25 16:10:33 +02:00
Dennis Felsing de5fe64be5 Implement recvmmsg 2018-07-25 16:06:00 +02:00
fokkonaut 63f2a091b6 vanilla skins only list now only shows vanilla skins 2018-07-25 14:13:07 +02:00
Dennis Felsing 473048dac0 Update credits 2018-07-25 09:04:47 +02:00
heinrich5991 6b1a037415 Add some UI for the skin prefix stuff 
This displays four buttons below the edit box, one for resetting the
skin prefix, and the other three for activating the shipped variants
"kitty", "coala", "santa".

The "none" string is translatable, the variants names are not because
they correspond to file names.
 2018-07-25 08:16:57 +02:00
Aerll d235036f7d
Merge branch 'master' into automapper 2018-07-25 00:25:30 +02:00
bors[bot] 71c38d829a Merge #1221 
1221: Allow entering automapper rule probability as percentage r=heinrich5991 a=bojidar-bg

Fixes #837 

Took a while to guess the right `sscanf` usage (since it does not detect unmatched input past the last format specifier).

Co-authored-by: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
 2018-07-24 19:21:27 +00:00
Bojidar Marinov a635d4a121
Allow entering automapper rule probability as percentage 
Fixes #837
 2018-07-24 21:44:33 +03:00
Bojidar Marinov d08f03fecf
Changing vanila skins option no longer requires restart 
Fixes #1216
 2018-07-24 19:56:09 +03:00
fokkonaut b8b97eb740 added skin prefix (#1218) 2018-07-24 17:26:39 +02:00
Dennis Felsing 2b1df782d3 Version 11.3 2018-07-24 08:03:02 +02:00
Aerll d5572dcb23 add 2 new commands to automapper 2018-07-19 17:09:29 +02:00
bors[bot] e571dc8d93 Merge #1200 
1200: Share libcurl resources across requests r=def- a=heinrich5991

Use the libcurl-share interface to share DNS cache and connections
between different requests.

If compiled with OpenSSL, libcurl can only be safely used from multiple
threads for OpenSSL >= 1.1.0, but this problem is not newly introduced
by this commit: According to libcurl-thread(3):

>OpenSSL <= 1.0.2 the user must set callbacks.
>
>https://www.openssl.org/docs/man1.0.2/crypto/threads.html#DESCRIPTION
>
>https://curl.haxx.se/libcurl/c/opensslthreadlock.html

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2018-07-19 09:15:10 +00:00
bors[bot] f761330d0b Merge #1204 
1204: Add Teleportation gun/grenade/rifle (finished) r=def- a=Ryozuki

As i made some changes and force-pushed i can't reopen the old pr: https://github.com/ddnet/ddnet/pull/1075

Features:
- Teleport gun: Teleports you where it collided (tees included, in a special way). Doesn't teleport if the collided tile is an untele tile.
- Teleport grenade: Teleports you where it collided (tees included, in a special way). Doesn't teleport if the collided tile is an untele tile.
- Teleport rifle (laser): Teleports you where the laser runs out of energy or if it collides with a tee. Doesn't teleport if the laser bounced in an untele tile.

Co-authored-by: Ryozuki <edgar@ryobyte.com>
Co-authored-by: Tim Schumacher <tim@timakro.de>
Co-authored-by: Edgar <edgar@ryobyte.com>
 2018-07-17 17:32:02 +00:00
Edgar ee756f2b1a
apparently 0 is used and NULL not... 2018-07-17 19:25:38 +02:00
Edgar ef4505e96d
we don't use nullptr in tw code 2018-07-17 19:24:10 +02:00
Isaac Zhao 83ae953b21
Fixed hidpi resolution issue on macOS 2018-07-17 07:46:17 +00:00
Ryozuki 4d7e493391 another style fix 2018-07-16 18:57:33 +02:00
Ryozuki 9cf0a60e3a remove useles brackets 2018-07-16 00:53:36 +02:00
Ryozuki 97ecd62214 fix timakro review 2018-07-16 00:43:54 +02:00
Tim Schumacher a3a4d4f519
Fix teleport rifle "backtracking" logic, now pretty sure about this 2018-07-15 23:33:49 +02:00
Tim Schumacher ea68ef201f
Initialize m_TeleGunTeleport to false 2018-07-15 23:03:30 +02:00
Tim Schumacher bbcc9aca0c Fix stopper teleport gun bug 2018-07-15 12:02:48 +02:00
Ryozuki 890c3a511e remove unused telegun function 2018-07-15 10:22:04 +02:00
Ryozuki b811d18422 make laser telegun use the new function 2018-07-15 10:22:03 +02:00
Ryozuki 2bee4a9807 remove comments and stuff that shouldn't be there 2018-07-15 10:22:02 +02:00
Ryozuki c074fdd30f fix all known bugs 2018-07-15 10:22:01 +02:00
Ryozuki 747946b291 fix style a bit 2018-07-15 10:22:00 +02:00
Ryozuki 50c84a60f7 add teleport gun/grenade/laser 2018-07-15 10:21:59 +02:00
Learath2 e2314a33c8 Let the receiver decide instead 2018-07-12 12:58:33 +02:00
Learath2 5a5c563a20 Require DNSBL check on /modhelp 2018-07-12 12:50:27 +02:00
heinrich5991 8d04e7e5e1 Share libcurl resources across requests 
Use the libcurl-share interface to share DNS cache and connections
between different requests.

If compiled with OpenSSL, libcurl can only be safely used from multiple
threads for OpenSSL >= 1.1.0, but this problem is not newly introduced
by this commit: According to libcurl-thread(3):

>OpenSSL <= 1.0.2 the user must set callbacks.
>
>https://www.openssl.org/docs/man1.0.2/crypto/threads.html#DESCRIPTION
>
>https://curl.haxx.se/libcurl/c/opensslthreadlock.html
 2018-07-11 20:17:21 +02:00
heinrich5991 fe1c54c11e Update modhelp.py 
Make a couple of things customizable using environment variables.
 2018-07-10 18:59:40 +02:00
yangfl 81a39c229b Fix typo 2018-07-10 17:29:02 +08:00
bors[bot] 1cebe615dd Merge #1195 
1195: Fix votespec on /pause (Fixes #1193) r=heinrich5991 a=ChillerDragon

I also thought about using a `` if (str_find(m_aVoteCommand, "set_team"))`` in front of the pause reset.
But then i thought its ok to unpause the VoteVictim every time.

I didn't test but i could belive that this can cause some unwanted unpause for a player with the id of the last VoteVictim on a server type vote for example. Thats why i also reset the ``m_VoteVictim`` to -1 to avoid this.

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
 2018-07-10 07:26:08 +00:00
ChillerDragon 819ae338d8 Improved pause fix (thanks to heinrich5991) 2018-07-10 00:08:57 +02:00
ChillerDragon e9807fe47c Fix votespec on /pause (Fixes #1193) 2018-07-08 04:39:36 +02:00
heinrich5991 925aff21d4 Fix all the header guards and adjust the script a little 2018-07-06 16:11:38 +02:00
bors[bot] 7c3e4e7f09 Merge #1187 
1187: fix projectiles not rendering on mods based on ddnet r=heinrich5991 a=ZombieToad

for some reason the client doesnt render extrainfo projectiles if the gamemode wasnt ddnet

Co-authored-by: ZombieToad <25847476+zombietoad@users.noreply.github.com>
 2018-07-06 12:27:33 +00:00
ChillerDragon 0ebf7b614d Oop! forgot one 2018-07-06 11:37:33 +02:00
ChillerDragon 4e9eac432c Better button id for dummy settings (thanks to deen) 2018-07-06 11:24:57 +02:00
ZombieToad 93cb1d8479 oops missed 1 2018-07-04 04:44:35 +01:00
ZombieToad 712fca8adc fixes 
thnx to Hey, Fuck you!
 2018-07-04 04:35:06 +01:00
ZombieToad 5e723f6199 fix projectiles not rendering on mods based on ddnet 
for some reason the client doesnt render extrainfo projectiles if the gamemode wasnt ddnet
 2018-07-04 04:19:36 +01:00
def af2d86765c Version 11.2.1 2018-06-30 09:49:42 +02:00
Dennis Felsing 051a84ea2d
Merge pull request #1178 from heinrich5991/pr_ddnet_editor_dontembedvanilla 
By default, don't embed vanilla images
 2018-06-30 09:48:41 +02:00
def 5e1f62fe7c Fix http map download... 2018-06-30 09:47:45 +02:00
heinrich5991 c07412b6c8 By default, don't embed vanilla images 
Previously, when you added an image to the map in the editor, it would
start off as embedded, i.e. included in the map file. This does not make
sense for vanilla images as every client has those.

That's why we now only mark non-vanilla images as external by default.
 2018-06-29 23:28:49 +02:00
Dennis Felsing 35a26290db Mac OSX: Don't use desktop resolution (fixes #1174) 2018-06-27 11:01:59 +02:00