edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
8487 commits 1 branch 428 tags 413 MiB
Commit graph

8487 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Dennis Felsing 7fefcb58b2
Merge pull request #1309 from heinrich5991/pr_ddnet_cmake_default_buildtype 
Debug mode should only be default if DEV is set, release otherwise
 2018-09-30 19:37:55 +02:00
heinrich5991 81408cac4e Debug mode should only be default if DEV is set, release otherwise 
Fixes #1308.
 2018-09-30 19:01:43 +02:00
def 542e027de4 Version 11.4.4 2018-09-30 15:25:42 +02:00
Dennis Felsing a68609320f
Merge pull request #1306 from fokkonaut/master 
fix bw support
 2018-09-29 00:09:00 +02:00
fokkonaut cf727576eb spaces again? 2018-09-28 18:29:14 +02:00
fokkonaut ea64d57be1 spaces 2018-09-28 18:28:45 +02:00
fokkonaut 3240f6fbc5 fix bw support 2018-09-28 18:27:51 +02:00
Dennis Felsing b160ad799f
Merge pull request #1304 from bojidar-bg/x-fill-selection-crash 
Fix crash when filling selection on tele/switch/speedup layers
 2018-09-27 11:10:27 +02:00
Bojidar Marinov 1e2dce06ae
Fix crash when filling selection on tele/switch/speedup layers 2018-09-26 15:53:25 +03:00
def 2198f6c997 Limit demo speed to 64 (thanks to fokkonaut for report) 2018-09-24 18:07:14 +02:00
Learath 2696ac134c Handle the platform differences in CMake. 2018-09-20 14:06:18 +02:00
Dennis Felsing a2e3496005
Merge pull request #1220 from heinrich5991/pr_ddnet_ui_skinprefix 
Add some UI for the skin prefix stuff
 2018-09-20 08:41:20 +02:00
heinrich5991 08b885dbbb Just render the skin prefix suggestions line by line 
For three items, it's not worthwhile to put two of them in the same
line.
 2018-09-20 07:50:17 +02:00
heinrich5991 13e3872dca Add clear button to skin prefix edit box 2018-09-20 07:48:14 +02:00
heinrich5991 9ff8b6e2df Factor out clear button from four different places 2018-09-20 07:43:05 +02:00
Learath 3852f0e720 CMake option to disable autoupdater. Closes #1292 2018-09-20 03:01:31 +02:00
Dennis Felsing c7941db9d4 Static linking only when PREFER_BUNDLED_LIBS (closes #1295) 2018-09-19 07:58:17 +02:00
Dennis Felsing 0605a4f662 Version 11.4.3 2018-09-11 14:56:28 +02:00
bors[bot] 46a34f044a Merge #1289 
1289: Add a toggle button for brush coloring r=def- a=bojidar-bg

In some cases (very dark color, etc.) it is impossible to see the tiles.
Closes #1285.

Co-authored-by: Bojidar Marinov <bojidar.marinov.bg@gmail.com>
 2018-09-11 11:22:50 +00:00
Bojidar Marinov 50d53603e1
Add a toggle button for brush coloring 
In some cases (very dark color, etc.) it is impossible to see the tiles.
 2018-09-11 11:35:02 +03:00
Dennis Felsing 714ed770e8
Merge pull request #1276 from heinrich5991/pr_ddnet_cmake_install3 
Add a proper `make install` command
 2018-09-07 17:59:02 +02:00
def ff8e97fbf8 Fix cl_nameplates_own with antiping on when spectating 2018-08-30 22:53:28 +02:00
Dennis Felsing c9f28ce094 Forbid copying classes in threading 2018-08-29 11:32:53 +02:00
Dennis Felsing 925f7b6325 Fix weird Windows compilation 2018-08-29 11:32:36 +02:00
Dennis Felsing a63f210a01 Fix segfault when deleting lock 2018-08-29 10:32:12 +02:00
Dennis Felsing c009a2184f
Merge pull request #1278 from ddnet/lock-style 
Lock style
 2018-08-27 17:18:25 +02:00
Dennis Felsing c29a72eb70 Lock style 2018-08-27 16:36:36 +02:00
Dennis Felsing c4fdbbe514
Merge pull request #1277 from ddnet/fix-lock 
Global lock for MySQL Connector's get_driver_instance (fixes #1131)
 2018-08-27 11:02:12 +02:00
Dennis Felsing 4d634bb7fd Global lock for MySQL Connector's get_driver_instance 
See note in https://dev.mysql.com/doc/connector-cpp/1.1/en/connector-cpp-examples-connecting.html

> get_mysql_driver_instance() calls get_driver_instance(), which is not
> thread-safe. Either avoid invoking these methods from within multiple
> threads at once, or surround the calls with a mutex to prevent
> simultaneous execution in multiple threads.
 2018-08-27 09:42:37 +02:00
heinrich5991 2a3ac81af9 Test make install on Travis 2018-08-26 22:07:32 +02:00
heinrich5991 cb09161dec Add a proper make install command 
It will install data into `share/ddnet`, client and server binaries into
`bin` and tools into `lib/ddnet`.

Fixes #1269.
 2018-08-26 21:44:31 +02:00
def 48d1757793 Fix bw support 2018-08-26 21:21:27 +02:00