Commit graph

10693 commits

Author SHA1 Message Date
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
heinrich5991 187b9ab5ec Revert accidental .travis.yml change 2018-06-23 19:21:01 +02:00
heinrich5991 1b4a16233d Fix warning about incompatible function pointers
This comes at the cost of one allocation per started thread. This should
be okay because we're about to invoke a syscall anyway.
2018-06-20 22:26:43 +02:00
heinrich5991 33acd36b81 Add shebang line to the modhelp script (thanks @ChillerDragon) 2018-06-20 22:18:07 +02:00
bors[bot] af1f9d198a Merge #1152
1152: send password to first connected server r=heinrich5991 a=ZombieToad

https://github.com/ddnet/ddnet/pull/1149#issuecomment-397538132

fixes issues with connecting to servers with reserved slots

Co-authored-by: ZombieToad <25847476+zombietoad@users.noreply.github.com>
2018-06-20 09:05:56 +00:00
ZombieToad f6d107b264
Update client.cpp 2018-06-20 07:44:44 +01:00
ZombieToad dfaa8d1f46
Update client.cpp 2018-06-20 07:43:55 +01:00
ZombieToad 1c88ffd663
Update client.h 2018-06-20 07:36:10 +01:00
heinrich5991 36694d3852 Add a way to call for external moderator help
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.
2018-06-19 23:27:35 +02:00
bors[bot] b368b7de81 Merge #1158
1158: Some style fixes r=def- a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2018-06-19 12:36:03 +00:00
heinrich5991 c739aef60e Some style fixes 2018-06-19 14:28:53 +02:00
Dennis Felsing 45cf274fa9
Merge pull request #1153 from ZombieToad/patch-1
fix server browser bug
2018-06-18 09:03:44 +02:00
bors[bot] 048176d043 Merge #1155
1155: fix sv_skinstealaction r=Learath2 a=ZombieToad



Co-authored-by: ZombieToad <25847476+zombietoad@users.noreply.github.com>
2018-06-17 13:03:09 +00:00
bors[bot] 6850fa98bf Merge #1154
1154: Rename 'credit' -> 'credits' r=Learath2 a=ChillerDragon

It's named ConCredits and there are many people credited so i guess the plural is fitting better c;

Co-authored-by: ChillerDragon <chillerdragon@gmail.com>
2018-06-17 12:53:18 +00:00
ZombieToad 79c3327199
fix sv_skinstealaction 2018-06-17 07:28:32 +01:00
ChillerDragon bc89e1644d Rename 'credit' -> 'credits' 2018-06-17 05:42:41 +02:00
ZombieToad 7da716e3f0
fix server browser bug
ddnet client has the server browser while online
2018-06-17 03:26:23 +01:00
ZombieToad 13722d849d
fix server browser bug
it loaded favourite servers into ddnet serverlist if you used add_favorite or remove_favorite
2018-06-17 02:47:18 +01:00
ZombieToad 57d1c37fb4
send password to first connected server 2018-06-16 00:44:24 +01:00
ZombieToad 45a9d96a76
send password to first connected server 2018-06-16 00:41:55 +01:00
bors[bot] d52143ffd5 Merge #1151
1151: fix veto r=heinrich5991 a=ZombieToad

before if a player entered the game and stayed before start on a server with a clock over 20 mins he would get veto

Co-authored-by: ZombieToad <25847476+zombietoad@users.noreply.github.com>
2018-06-15 07:44:28 +00:00
bors[bot] ffb77f5962 Merge #1150
1150: fix pause messages r=heinrich5991 a=ZombieToad

they were reversed

Co-authored-by: ZombieToad <25847476+zombietoad@users.noreply.github.com>
2018-06-15 07:25:06 +00:00
bors[bot] d2250f67bc Merge #1148
1148: remove unused thingy r=heinrich5991 a=ZombieToad



Co-authored-by: ZombieToad <25847476+zombietoad@users.noreply.github.com>
2018-06-15 07:15:11 +00:00
ZombieToad 4544d02639
fix veto
before if a player entered the game and stayed before start on a server with a clock over 20 mins he would get veto
2018-06-15 00:49:09 +01:00
ZombieToad 99d0360947
fix pause messages
they were reversed
2018-06-14 22:41:28 +01:00
ZombieToad e05bd9c6c8
remove unused thingy 2018-06-14 20:44:14 +01:00
bors[bot] 51ebc68f71 Merge #1145
1145: fix /settings stuff r=heinrich5991 a=ZombieToad



Co-authored-by: ZombieToad <25847476+zombietoad@users.noreply.github.com>
2018-06-14 08:23:23 +00:00
ZombieToad a858b7ddcd
fix /settings stuff 2018-06-14 00:33:07 +01:00
Dennis Felsing 078ca7950f
Merge pull request #1142 from ChillerDragon/CommandHelp
Fix help for showall command
2018-06-12 10:34:40 +02:00
ChillerDragon 4b6133003b Fix help for showall command
current ddnet doesn't support the '/help showall' command.
This commit should fix that.
2018-06-12 00:30:21 +02:00
Dennis Felsing e72413c43b
Merge pull request #1137 from ChillerDragon/UpdateCredits
Update credits
2018-06-06 09:49:31 +02:00
Dennis Felsing 08c45ced0f
Merge pull request #1133 from ChillerDragon/ConsolePages
Add commands for switching pages in console
2018-06-06 09:48:00 +02:00