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

19963 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Dennis Felsing 0336b662c5 fix 2018-07-25 16:33:26 +02:00
Dennis Felsing d5dc951747 fix 2018-07-25 16:24:12 +02:00
Dennis Felsing 9f8b962e5d fix 2018-07-25 16:10:33 +02:00
Dennis Felsing de5fe64be5 Implement recvmmsg 2018-07-25 16:06:00 +02:00
fokkonaut 63f2a091b6 vanilla skins only list now only shows vanilla skins 2018-07-25 14:13:07 +02:00
heinrich5991 41d0f86b12 Use __file__ instead of sys.argv[0] 
Thanks to @bojidar-bg for the hint.
 2018-07-25 09:17:10 +02:00
heinrich5991 945ea1cf28 Make language scripts callable from anywhere 2018-07-25 09:17:09 +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
heinrich5991 3a8cc43e13 Move language scripts to scripts/ 2018-07-25 00:34:02 +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
bors[bot] b8b4f6338d Merge #1219 
1219: Changing vanila skins option no longer requires restart r=heinrich5991 a=bojidar-bg

Fixes #1216

Didn't work on making the panel underneath show only vanilla skins, but it might be doable as well.

Co-authored-by: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
 2018-07-24 18:55:45 +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