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
8585 commits 1 branch 429 tags 411 MiB
Commit graph

5077 commits

Author SHA1 Message Date
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
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
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
def 542e027de4 Version 11.4.4 2018-09-30 15:25:42 +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
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
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
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 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
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
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
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 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
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
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
Aerll 3c07a2b35b fixes #1213 2018-07-26 14:49:43 +02:00
heinrich5991 5c4e819e44 Use str_startswith, str_endswith instead of ad-hoc implementations 2018-07-26 14:18:23 +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
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
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
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
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