jupeyy
536bb4ad3d
check minimum for width and height seperatelly
2018-10-29 04:21:35 +01:00
12pm
5a5dc45368
Update GL and LY flags
2018-10-22 18:31:13 +02:00
Ryozuki
183f335606
Improve teleblocker tile, thanks to Ravie
2018-10-22 18:25:08 +02:00
bors[bot]
d7072da916
Merge #1353
...
1353: Revert "CMakeLists.txt: Replace PythonInterp with Python" r=Learath2 a=heinrich5991
This reverts commit c1523d9fc3
.
Fixes #1352 .
Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
2018-10-20 14:32:20 +00:00
heinrich5991
9ef200cd4a
Revert "CMakeLists.txt: Replace PythonInterp with Python"
...
This reverts commit c1523d9fc3
.
Fixes #1352 .
2018-10-20 14:37:12 +02:00
bors[bot]
963cec6976
Merge #1348
...
1348: increase max score that can be displayed in scoreboard r=Learath2 a=fokkonaut
![base profile screenshot 2018 10 11 - 22 15 10 80](https://user-images.githubusercontent.com/35420825/46831469-d31c2300-cda3-11e8-9a13-2814fd7621f3.png )
its only for the positive numbers because negative should stay at max -999.
level server for examples can often reach the players level over 1000, and then the scoreboard is just a mess. also its not looking bad and the numbers arent over the edge, so i personally think this is a good addition.
as you can also see, scores over 99.999 (basically 100k) arent shown.
another reason: times for ddrace scoreboard can be as long as they want. there is no display limit, so it doesnt make sense have such a small limit for non-ddrace-scoreboard
Co-authored-by: fokkonaut <35420825+fokkonaut@users.noreply.github.com>
2018-10-13 12:38:12 +00:00
Dennis Felsing
e02a9956a5
Remove unused cl_eventthread
2018-10-12 14:42:40 +02:00
fokkonaut
1082ba77b0
increase max score that can be displayed in scoreboard
2018-10-11 22:19:26 +02:00
bors[bot]
865678afef
Merge #1344
...
1344: CMakeLists.txt: Replace PythonInterp with Python r=Learath2 a=yangfl
FindPythonInterp is deprecated since CMake version 3.12. Use Python to
automatically detect Python 3 or 2.
Co-authored-by: yangfl <yangfl@users.noreply.github.com>
2018-10-11 11:46:17 +00:00
yangfl
c1523d9fc3
CMakeLists.txt: Replace PythonInterp with Python
...
FindPythonInterp is deprecated since CMake version 3.12. Use Python to
automatically detect Python 3 or 2.
2018-10-11 08:57:56 +08: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
879c6ce5dc
Add *.tmp to .gitignore (it is output by tests)
2018-10-08 23:05:56 +02: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
bors[bot]
1f4585c335
Merge #1337
...
1337: Ignore DNSBL on "empty" servers. r=heinrich5991 a=Learath2
DNSBL is to prevent annoyances. There is no one to annoy on an empty server.
Co-authored-by: Learath <learath2@gmail.com>
2018-10-08 18:38:28 +00: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
254ff3dc6b
Oversight
2018-10-08 20:56:49 +03:00
Learath
2e137e6fc7
net_addr_comp_ip -> net_addr_comp_noport
2018-10-08 19:56:51 +03:00
Learath
f1867e0403
Grammar fix "then->than"
2018-10-08 19:55:18 +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
fe13ac6129
Merge pull request #1336 from yangfl/upstream
...
Update Chinese translations
2018-10-07 23:00:38 +02:00
Dennis Felsing
dbaf779bda
Merge pull request #1335 from heinrich5991/pr_ddnet_serverjobs
...
Use two threads for the server thread pool
2018-10-07 17:29:22 +02:00
yangfl
6ead5e6f9c
Update Chinese translations
2018-10-07 20:49:30 +08:00
heinrich5991
a36250ba34
Use two threads for the server thread pool
...
This might help with long DNS timeouts.
2018-10-07 12:47:32 +02:00
bors[bot]
7f4c5b2183
Merge #1327
...
1327: Try closing the file earlier. Fix #1250 r=heinrich5991 a=Learath2
Maybe closing the file earlier could work?
Co-authored-by: Learath <learath2@gmail.com>
2018-10-04 14:27:11 +00:00
Learath
189a2939b0
Try closing the file earlier. Fix #1250
2018-10-04 16:10:27 +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
a21f01eef8
str_copy: Avoid -Wstringop-truncation warning in GCC8
2018-10-04 10:48:49 +02:00
Dennis Felsing
41d1a4802f
Update ddnet-libs
2018-10-04 10:02:47 +02:00
Dennis Felsing
005feb2ca3
Update ddnet-libs
2018-10-04 09:30:59 +02:00
Dennis Felsing
e8bd8459a6
Fix #1325
2018-10-04 09:25:41 +02:00
Dennis Felsing
a95032b633
Apply heinrich5991's fix for #1324
2018-10-04 08:39:43 +02:00
def
82c72378fe
Upgrade ddnet-libs
2018-10-03 22:41:44 +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
Tim Schumacher
ab6f344daa
Fix current selection highlighting
2018-10-02 23:39:22 +02:00
Tim Schumacher
3d7ee89104
Add game layer entities images
2018-10-02 23:24:22 +02:00
Tim Schumacher
fd52bc7a26
List all game layer entities images in directory
2018-10-02 23:08:17 +02:00
Dennis Felsing
b0759830b7
Merge pull request #1300 from Learath2/dd_pr_autoupdateflag
...
CMake option to disable autoupdater. Closes #1292
2018-10-02 08:04:12 +02:00
Learath
fef22f34f2
Implement brush saving. Fix #1111
2018-10-02 03:52:01 +02:00
Learath
662d23d40b
Test flag on CI
2018-10-02 02:17:34 +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
Dennis Felsing
7e76f71686
Merge pull request #1313 from timakro/pr_left_align_editor_text
...
Left align editor menu texts like server settings, closes #1215
2018-10-01 22:39:03 +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
Dennis Felsing
b7e75e8d3b
Merge pull request #1311 from Ryozuki/master
...
Fix windows compilation warning
2018-10-01 20:24:00 +02:00
Ryozuki
8e8e46a26a
fix windows compilation warning
2018-10-01 19:23:33 +02:00