Commit graph

8297 commits

Author SHA1 Message Date
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
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
ChillerDragon 819ae338d8 Improved pause fix (thanks to heinrich5991) 2018-07-10 00:08:57 +02:00
bors[bot] abac0cf2f5 Merge #1191
1191: Fix a script, remove unused ones r=Learath2 a=heinrich5991

scripts/check_header_guards.py is now run on CI. :)

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2018-07-09 06:22:29 +00:00
heinrich5991 1abe6b0a0b Run header guards check at the start of the CI script 2018-07-08 19:41:22 +02:00
ChillerDragon e9807fe47c Fix votespec on /pause (Fixes #1193) 2018-07-08 04:39:36 +02:00
heinrich5991 6381a33344 Check for header guards on CI 2018-07-06 16:28:11 +02:00
heinrich5991 925aff21d4 Fix all the header guards and adjust the script a little 2018-07-06 16:11:38 +02:00
heinrich5991 d7f30c574f Update scripts/check_header_guards.py
Python 3 compatibility, return code, changing directory before script
starts.
2018-07-06 15:45:05 +02:00
heinrich5991 f46f811280 Remove a bunch of unused scripts
scripts/compiler.py: Looks like an older version of datasrc/datatypes.py
scripts/copyright.py: Checks copyright headers in files
scripts/count_source.sh: Counts source files, from SVN(!) times
scripts/dat2c: Writes a C constant with the contents of a file
scripts/font_converter.py: Conversion tool for an old font format
scripts/font_installer.sh: Calls the conversion tool on all fonts
scripts/linecount.sh: Counts source code lines (using `wc` and `find`)
scripts/make_docs.sh: Generates source code docs that haven't existed for a long time
scripts/mass_server.py: Starts a lot of `fake_server`
scripts/netobj.py: Looks like an older version of datasrc/datatypes.py
scripts/nicks.txt: Auxiliary file for scripts/mass_server.py
scripts/png.py: Conversion of image file formats
scripts/process_blame.py: SVN-era source count
2018-07-06 15:14:13 +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
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