Commit graph

8574 commits

Author SHA1 Message Date
bors[bot] 861746a641 Merge #1185
1185: Port lang scripts to Python3 r=heinrich5991 a=rffontenelle

Scripts for managing translations are currently available for Python 2. DDNet already uses Python 3, so it make sense IMO to have these scripts using this version as well.

Co-authored-by: Rafael Fontenelle <rafaelff@gnome.org>
2018-07-06 12:14:46 +00:00
Rafael Fontenelle 85a15fe442 Port lang scripts to Python3 2018-07-06 08:39:08 -03:00
Dennis Felsing 394457c219
Merge pull request #1190 from ChillerDragon/DummyButton
Better button id for dummy settings (thanks to deen)
2018-07-06 11:43:08 +02: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
Dennis Felsing 138abc4430
Merge pull request #1189 from rffontenelle/patch-1
Update Brazilian Portuguese translation
2018-07-04 12:44:58 +02:00
Rafael Fontenelle 7697f3072b
Update Brazilian Portuguese translation 2018-07-04 07:38:51 -03:00
Dennis Felsing c980c55dec
Merge pull request #1188 from Ryozuki/patch-2
Update catalan translation due to #1186
2018-07-04 09:25:28 +02:00
Edgar 1a83968df2
remove warning 2018-07-04 09:22:21 +02:00
Edgar 3ca0bd4f69
Update catalan translation 2018-07-04 09:20:19 +02:00
Dennis Felsing c3147d53ff
Merge pull request #1186 from rffontenelle/fix-translations
Fix translations
2018-07-04 08:15:23 +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
Rafael Fontenelle 099e9faafe Remove duplicated "please translate this" comment lines 2018-07-03 20:12:23 -03:00
Rafael Fontenelle 27a15d491a Update translations 2018-07-03 20:00:31 -03:00
Rafael Fontenelle b67d2247b9 Fix Simplified Chinese
The multiple occurrences of a key string was resulting in failure
when running analyze.py.
2018-07-03 19:53:21 -03:00
def af2d86765c Version 11.2.1 2018-06-30 09:49:42 +02:00
Dennis Felsing 5dfa606174
Merge pull request #1176 from ChillerDragon/FreezeAutomapper
Add new freeze automap rule
2018-06-30 09:49:09 +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
ChillerDragon ba842a9672 Add new freeze automap rule 2018-06-29 15:48:52 +02:00
Dennis Felsing 7c4a7e4c67
Merge pull request #1175 from heinrich5991/pr_ddnet_fixmaclinking
Fix Mac linking for cross-compilation
2018-06-27 13:35:04 +02:00
heinrich5991 67a3042051 Fix Mac linking for cross-compilation
The `Security` framework is now needed on all targets because we link
libcurl everywhere.
2018-06-27 12:35:01 +02:00
Dennis Felsing 35a26290db Mac OSX: Don't use desktop resolution (fixes #1174) 2018-06-27 11:01:59 +02:00
Dennis Felsing 6c1e50bba5 Revert "No Crypto on Mac OSX"
This reverts commit fd1cdbfa74.
2018-06-27 10:02:29 +02:00
Dennis Felsing fd1cdbfa74 No Crypto on Mac OSX 2018-06-27 09:47:53 +02:00
Dennis Felsing abb959eef4 Fix C89 compilation "for loop initial declarations"
/ddnet-master/src/base/hash_libtomcrypt.c:45:5: error: ‘for’ loop initial declarations are only allowed in C99 or C11 mode
     for(int i = 0; i != 8; ++i)
2018-06-27 09:43:22 +02:00
Dennis Felsing 9e9a344197 Version 11.2 2018-06-27 08:32:21 +02:00
Dennis Felsing 2adff3eca8
Merge pull request #1136 from heinrich5991/pr_ddnet_sha256
Use more secure hash function for map downloads
2018-06-27 08:15:19 +02:00
Dennis Felsing 079322899f
Merge pull request #1173 from ZombieToad/patch-3
fix Pain weapons bug
2018-06-27 08:08:13 +02:00
def 89ca2cfe8b Allow some key binds in editor when GUI is hidden 2018-06-26 22:51:43 +02:00
def daf83470cc Add cl_nameplates_own for demo recording 2018-06-26 22:30:28 +02:00
def 38767df2a4 Update credits 2018-06-26 21:19:17 +02:00
ZombieToad 4d2ee25bfb
fix Pain weapons bug
https://cdn.discordapp.com/attachments/293493549758939136/461236206131478538/PainWeaponBug.gif

because I'm new to coding it took me 2 hours to find this bug. I spent a while looking at the POWERUP_ARMOR and RemoveNinja() code wondering why it didn't work.

this bug is funny to some players so maybe you don't want to fix it. i wont mind because it was a challange for me to find it
2018-06-26 19:45:40 +01:00
bors[bot] 6ba56963ec Merge #1171
1171: Fix pain emote immunity with jetpack r=heinrich5991 a=Piepow

When using jetpack, tees don't do pain emotes when they're supposed to (e.g. when they get hit by exploding bullets).

Notice how in the image below the tee doesn't have the pain emote.
![jetpack-pain-emote-immunity](https://user-images.githubusercontent.com/20409621/41883435-9b13aa1e-78bc-11e8-8fef-fd75165b4d79.png)


Co-authored-by: Piepow <piepow@users.noreply.github.com>
2018-06-26 10:43:13 +00:00
Piepow 9f61424860 Fix pain emote immunity with jetpack 2018-06-25 21:11:22 -04:00
bors[bot] e8d283e4f5 Merge #1169
1169: Fixed dyncam r=heinrich5991 a=qawsqs



Co-authored-by: Pavel Titov <xtdragon@usa.com>
2018-06-25 12:47:33 +00:00
Pavel Titov e0ee4ffe8a Fixed dyncam 2018-06-25 15:34:31 +03:00
heinrich5991 ab55bcd9c8 Also search for maps with sha256 in downloadedmaps
Additionally, forget the extra map details after disconnecting, they
shouldn't be used for the next server.
2018-06-24 17:04:50 +02:00
heinrich5991 ca8fcc823c Use more secure hash function for map downloads
SHA256 was chosen because it is reasonably standard, the file names
don't explode in length (this rules out SHA512) and it is supported by
basically all versions of OpenSSL (this rules out SHA512/256 and SHA3).

The protocol is changed in a backward compatible way: The supporting
server sends the SHA256 corresponding to the map in the `MAP_DETAILS`
message prior to sending the `MAP_CHANGE` message. The client saves the
SHA256 obtained from the `MAP_DETAILS` message until the next
`MAP_CHANGE` message.

For servers not supporting this protocol, the client falls back to
simply opening maps like in the previous scheme.

Remove the `map_version` tool, it is not being used and would have been
a little bit effort to update.

Use the OpenSSL implementation of SHA256 if it is supported, otherwise
fall back to a public domain one.

Fix #1127.
2018-06-24 17:04:50 +02:00
heinrich5991 125377bf2d Use <stdint.h> instead of <cstdint> 2018-06-24 17:00:21 +02:00
bors[bot] ebb9481857 Merge #1157 #1160
1157: Add a way to call for external moderator help r=Learath2 a=heinrich5991

This is done by HTTP POSTing to a location specified by
`sv_modhelp_url`. We also provide a `src/modhelp/server.py` which can
use theses POSTs to forward them to Discord servers.

The POST contains a JSON object payload, with the keys `"port"` which
contains the server port, `"player_id"` which contains the calling
player's client ID, `"player_name"` which contains the calling player's
nick and `"message"` which is the user-specified message.

Make JSON-escaping function public, add tests and fix bugs uncovered by
these tests.

Supersedes #1129.

1160: Fix warning about incompatible function pointers r=Learath2 a=heinrich5991

This comes at the cost of one allocation per started thread. This should
be okay because we're about to invoke a syscall anyway.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2018-06-24 14:12:48 +00:00
bors[bot] a4833dd7f4 Merge #1168
1168: More style fixes r=Learath2 a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2018-06-24 14:02:59 +00:00
heinrich5991 7b76208431 Use m_ModhelpTick to store the last modhelp action
This addresses @Learath2's comment.
2018-06-24 11:15:16 +02:00
heinrich5991 57e26450b2 Unify spelling of Modhelp
Since the command name is `/modhelp` it should be written `Modhelp` in
camel case.
2018-06-24 11:03:18 +02:00
heinrich5991 cdffd7616f More style fixes 2018-06-24 09:57:30 +02:00
heinrich5991 e5e05081a7 Make port and client ID integers on /modhelp POST 2018-06-23 19:39:38 +02:00
heinrich5991 56876c7516 Add information about whether a moderator is present to the /modhelp POST 2018-06-23 19:38:27 +02:00