Commit graph

8330 commits

Author SHA1 Message Date
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
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
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
bors[bot] b8b4f6338d Merge #1219
1219: Changing vanila skins option no longer requires restart r=heinrich5991 a=bojidar-bg

Fixes #1216

Didn't work on making the panel underneath show only vanilla skins, but it might be doable as well.

Co-authored-by: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
2018-07-24 18:55:45 +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
Dennis Felsing 29f2f5e0e6 Add python to requiremens in README (fixes #1184) 2018-07-19 11:27:16 +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
bors[bot] fe16e02fdf Merge #1206
1206: Fixed hidpi resolution issue on macOS r=def- a=weez15

fixed https://github.com/ddnet/ddnet/issues/1018

Co-authored-by: Isaac Zhao <isaac.zhao.17@gmail.com>
2018-07-17 07:53:11 +00: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
Edgar b1ad69633f
Merge pull request #4 from timakro/pr_teleport_gun
Fix teleport rifle "backtracking" logic, now pretty sure about this
2018-07-15 23:36:23 +02:00
Tim Schumacher a3a4d4f519
Fix teleport rifle "backtracking" logic, now pretty sure about this 2018-07-15 23:33:49 +02:00
Edgar 602442c695
Merge pull request #3 from timakro/pr_teleport_gun
Initialize m_TeleGunTeleport to false
2018-07-15 23:05:59 +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
bors[bot] 498f2fe7ac Merge #1201
1201: Require DNSBL check on /modhelp r=heinrich5991 a=Learath2

Might also just remove `/modhelp`. So far it has proven to be pretty useless without accounts.

Co-authored-by: Learath2 <learath2@gmail.com>
2018-07-12 11:58:43 +00: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
bors[bot] fed898b1cd Merge #1198
1198: Update modhelp.py r=Learath2 a=heinrich5991

Make a couple of things customizable using environment variables.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2018-07-10 17:08:18 +00:00
heinrich5991 fe1c54c11e Update modhelp.py
Make a couple of things customizable using environment variables.
2018-07-10 18:59:40 +02:00
bors[bot] 94a8fe79bc Merge #1197
1197: Fix typo r=heinrich5991 a=yangfl



Co-authored-by: yangfl <yangfl@users.noreply.github.com>
2018-07-10 09:35:21 +00: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