edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-16 13:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
11654 commits 1 branch 429 tags 413 MiB
Commit graph

11654 commits

This branch
This branch
All branches
Author SHA1 Message Date
Learath af267ffea2 Forgot to remove ASan 2018-08-19 20:09:10 +03: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
bors[bot] 00d86444b5 Merge #1255 
1255: Remove the unused import of the deprecated imp module r=Learath2 a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2018-08-15 17:34:57 +00:00
bors[bot] 3f6031cab0 Merge #1256 
1256: Update bors.toml for CircleCI2 r=Learath2 a=heinrich5991

Status report names have changed.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2018-08-15 17:17:24 +00: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
heinrich5991 55648a3157 Update bors.toml for CircleCI2 
Status report names have changed.
 2018-08-15 17:41:09 +02:00
Learath 9ce45ddc6e Ignore bors temp branches 2018-08-15 16:17:47 +03:00
Learath 3e493bf18e Merge branch 'dd_pr_circle2'. Migrate to CircleCI 2.0 2018-08-15 15:55:52 +03:00
Learath 607b71860b Install deps on the fly 
This reverts commit 36704d5dad.
 2018-08-15 15:47:55 +03:00
heinrich5991 6fd9bc3d3e Remove the unused import of the deprecated imp module 2018-08-15 14:43:56 +02:00
bors[bot] db4aa52eac Merge #1253 
1253: Fix a typo r=def- a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2018-08-13 19:39:58 +00:00
heinrich5991 2ad4c86632 Fix a typo 2018-08-13 21:35:49 +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
bors[bot] 6e0e127ff6 Merge #1247 
1247: Optimize automapper a bit r=def- a=Aerll

Pretty simple yet super effective: 
If index rule has any `Pos 0 0` for non-empty tile, then it is flagged to skip all the empty tiles. And vice versa.

In many cases it will significantly speed up the process, especially when using big automappers on huge maps.

Co-authored-by: Aerll <31746984+aerll@users.noreply.github.com>
 2018-08-11 09:26:27 +00:00
Aerll 9951b2a187 optimize automapper a bit 2018-08-11 03:01:25 +02:00
Learath 36704d5dad Try a prebuilt container 2018-08-10 19:10:15 +03:00
Learath d19b73db77 Try migrate to CircleCI2. Fix #1229 2018-08-10 18:59:56 +03: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
Dennis Felsing 0b539df741 bw 2018-08-09 13:05:36 +02:00
Dennis Felsing dda2b06672
Merge pull request #1235 from fokkonaut/master 
block worlds zoom + eye wheel
 2018-08-09 13:04:07 +02:00
Dennis Felsing 285b6f1ca7
Merge pull request #1222 from heinrich5991/pr_ddnet_langscripts 
Move language scripts and make them callable from everywhere
 2018-08-09 13:03:54 +02:00
Dennis Felsing ba64e02811
Merge pull request #1244 from bojidar-bg/x-make-brush-colored-fixup 
Don't copy alpha when coloring the brush
 2018-08-09 13:02:10 +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
Dennis Felsing eb1b4a8b74 Add back Vanilla maps for compatibility 2018-08-07 08:39:08 +02:00
def 0518769500 fix cl_show_nameplates_own with antiping off ingame 2018-08-03 23:40:03 +02:00
bors[bot] 006aac81bc Merge #1243 
1243: Fix crash when deleting layer r=def- a=Aerll



Co-authored-by: Aerll <31746984+aerll@users.noreply.github.com>
 2018-08-03 12:47:58 +00:00
Aerll a7a8db4dcb fix crash when deleting layer 2018-08-03 14:14:25 +02:00
bors[bot] 459002c5e5 Merge #1242 
1242:  Properly reset context attributes, if OpenGL3 context failed to create r=def- a=Jupeyy

Automatically creates the older context, if OGL3 isn't supported

Co-authored-by: Jupeyy <jupjopjap@gmail.com>
 2018-08-02 19:16:08 +00:00
Jupeyy 29ecaa2c2a brace 2018-08-02 20:58:43 +02:00
Jupeyy bc013513bc don't restore the config variable in this case 2018-08-02 20:56:29 +02:00
Jupeyy 7ce29e7a1a Properly reset context attributes, if OpenGL3 context failed to create 2018-08-02 20:52:51 +02:00
bors[bot] e6040bfa0e Merge #1241 
1241: Don't render all border tiles all the time r=def- a=Jupeyy

(is an opengl3 only fix)

Co-authored-by: Jupeyy <jupjopjap@gmail.com>
 2018-08-02 18:06:29 +00: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
def 18529fa082 Revert "Implement recvmmsg" 
This reverts commit de5fe64be5.
 2018-07-29 23:07:59 +02:00
def 5d8d900643 Revert recvmmsg 2018-07-29 22:49:34 +02:00
fokkonaut 2dafafd75b oops, tab instead of spaces 2018-07-27 23:32:10 +02:00
fokkonaut cd5d69bfc5 added bw to isddnet 2018-07-27 23:28:02 +02: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