Commit graph

5060 commits

Author SHA1 Message Date
Ryozuki 3d202883c9 tele-activator: make delay be able to specify a weapon 2018-11-03 10:26:19 +01:00
Ryozuki ddf2e6af36 add tele-activator to the switch layer 2018-11-03 10:26:19 +01:00
Ryozuki c831b5e0c1 change tele-blocker to tele-activator 2018-11-03 10:26:18 +01:00
Dennis Felsing 69b25b8f4c Version 11.4.6 2018-11-02 14:24:14 +01:00
Dennis Felsing d072817e25
Merge pull request #1366 from ddnet/upd1145
Version 11.4.5
2018-10-31 18:30:50 +01:00
Dennis Felsing bccf6320b7
Merge pull request #1368 from Learath2/dd_pr_shiftcrash
Fix editor crash
2018-10-31 18:30:34 +01:00
Dennis Felsing 6c061eb2ec Remove unused cl_flow variable
As noticed by xse in https://github.com/ddnet/ddnet-web/pull/64
2018-10-31 08:26:56 +01:00
Learath abd49ddbf7 Restore old behaviour to be safe :( 2018-10-30 18:56:46 +01:00
Learath 0ecda0ced4 Fix crash introduced by 1e2dce0. Close #1362 2018-10-30 18:13:32 +01:00
def 62d3c97ad1 Version 11.4.5 2018-10-29 22:19:34 +01:00
def aab6fa152a Fix #1357 2018-10-29 22:16:32 +01:00
def c0b60979ec style 2018-10-29 22:09:11 +01:00
Dennis Felsing 80f4b7934c
Merge pull request #1365 from Jupeyy/pr_bordercorner_fix
Border corner minimum fix
2018-10-29 22:08:43 +01:00
def faf388b853 Fix #1350 2018-10-29 22:03:57 +01:00
bors[bot] 1b0b36c6eb Merge #1316 #1341 #1349
1316: code improvement on gameclient.cpp r=def- a=Ryozuki



1341: Mark unused envelopes r=def- a=Learath2

Thought I'd do this one as well while looking at the editor code.

1349: Don't ignore CONNECT packets with data that we don't know r=def- a=heinrich5991

This specifically affects 0.6.5. Just treat them the same way as those
without any data.

Co-authored-by: Ryozuki <edgar@ryobyte.com>
Co-authored-by: Learath <learath2@gmail.com>
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2018-10-29 14:31:27 +00:00
bors[bot] 25bd83225f Merge #1340
1340: Editor fixes r=def- a=Learath2

Address #1331 and also fix the scrollbar enabling when there isn't enough elements.

Co-authored-by: Learath <learath2@gmail.com>
2018-10-29 14:16:38 +00:00
jupeyy 95e8a031c7 style 2018-10-29 09:00:47 +01:00
jupeyy c666417fa0 less code 2018-10-29 08:44:55 +01:00
jupeyy 536bb4ad3d check minimum for width and height seperatelly 2018-10-29 04:21:35 +01:00
Learath 657e869901 Handle Tile and Sound layers 2018-10-14 16:57:30 +03:00
fokkonaut 1082ba77b0 increase max score that can be displayed in scoreboard 2018-10-11 22:19:26 +02:00
Learath cdce9d84ac Mark unused envelopes. Fix #1139 2018-10-09 13:42:04 +03:00
bors[bot] 61559f2ff0 Merge #1329
1329: Add support for extra map items in datafiles r=Learath2 a=heinrich5991

This works by utilizing the good old UUIDs – this way we can make sure
that we don't clash with other people extending the map format.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2018-10-09 09:30:23 +00:00
heinrich5991 4660e0a680 Add support for extra map items in datafiles
This works by utilizing the good old UUIDs – this way we can make sure
that we don't clash with other people extending the map format.
2018-10-08 23:05:56 +02:00
Learath 571b069b91 Small cleanup of *Mute functions 2018-10-08 21:29:33 +03:00
Learath 5b95eddca1 DRY with net_addr_comp_noport 2018-10-08 21:04:04 +03:00
Learath 4fedd91020 Arrow keys should account for visibility 2018-10-08 19:07:25 +03:00
Learath ad566aa158 Consider the search text when counting elements 2018-10-08 18:43:39 +03:00
Learath 5c4203b747 Reset scroll when search text changes. Fix #1331 2018-10-08 18:43:37 +03:00
Learath 1073b72965 Ignore DNSBL on "empty" servers. 2018-10-08 01:59:07 +03:00
Dennis Felsing a09fa562be
Merge pull request #1314 from timakro/pr_editor_entities_gametypes
Allow choosing game layer entities for different gametypes, closes #1283
2018-10-07 23:02:20 +02:00
Dennis Felsing fc7b3732e6
Merge pull request #1315 from Learath2/dd_pr_brushsave
Implement brush saving. Fix #1111
2018-10-04 10:59:00 +02:00
Dennis Felsing 20b31723c9
Merge pull request #1323 from heinrich5991/pr_ddnet_fix_editor_dontembedvanilla
Duh. Fix editor embedding vanilla images and not others
2018-10-03 20:40:48 +02:00
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