edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-08 09:08:21 +00:00
Code Issues Packages Projects Releases Wiki Activity
20733 commits 1 branch 428 tags 411 MiB
Commit graph

20733 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
fokkonaut b8730b3653 block worlds zoom + eye wheel 2018-07-26 21:34:24 +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
bors[bot] e64375e129 Merge #1232 
1232: Fix storage.cfg reading broken by the `str_startswith` change r=def- a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2018-07-26 14:04:21 +00:00
heinrich5991 e8c7dca035 Fix storage.cfg reading broken by the str_startswith change 2018-07-26 15:46:54 +02:00
bors[bot] 6f01872ea6 Merge #1060 
1060: Add a dockerfile r=heinrich5991 a=Learath2

`docker build -t ddnet --build-arg OSX_SDK_FILE=MacOSX10.11.sdk.tar.bz2 .`
`mkdir build`
`docker run -it --mount type=bind,source="$(pwd)"/build,target=/build ddnet ./build-all.sh`

Close #997 

Co-authored-by: Learath <learath2@gmail.com>
 2018-07-26 13:17:33 +00:00
Aerll 3c07a2b35b fixes #1213 2018-07-26 14:49:43 +02:00
bors[bot] 484e0d1703 Merge #1223 
1223: Add `str_startswith` and `str_endswith` r=Learath2 a=heinrich5991

Add tests, use these functions in the code base.

Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
 2018-07-26 12:19:37 +00:00
heinrich5991 9fcf5480f8 Return a pointer from str_endswith as well 2018-07-26 14:18:23 +02:00
heinrich5991 5c4e819e44 Use str_startswith, str_endswith instead of ad-hoc implementations 2018-07-26 14:18:23 +02:00
heinrich5991 746d3d6b1a Add str_startswith and str_endswith 
Also add a couple of tests for both.
 2018-07-26 14:06:56 +02:00
heinrich5991 57d3a61c3f "termineted" -> "terminated" 2018-07-26 14:06:56 +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
Dennis Felsing 3277caaac1
Merge pull request #1228 from timakro/pr_fix_automapper_crash_no_section 
Fix automapper crash without [section] line
 2018-07-26 08:30:17 +02:00
Dennis Felsing 876ecc7909 fix 2018-07-26 08:30:00 +02: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