Commit graph

10439 commits

Author SHA1 Message Date
Michał 07db85d806 Removed string.h, replaced some C functions with system.h ones, renamed variables 2017-10-28 09:08:17 +02:00
Michał bb419c43b7 Linux build fix + cleanup 2017-10-28 09:08:17 +02:00
Michał e85898a4b6 Fix includes + small clean 2017-10-28 09:08:17 +02:00
Michał 085203abe2 Add emoji spritesheet and python list 2017-10-28 09:08:17 +02:00
Michał 35fb1ddb41 Add emoji support 2017-10-28 09:08:17 +02:00
Dennis Felsing 2e41a1d45b
Merge pull request #933 from savander/master
Small localize update
2017-10-28 07:32:02 +02:00
Jupeyy f15f41e654 remove extension limit for tile layers 2017-10-28 02:04:53 +02:00
Savander fa544dc0e6
Localize Date, Demo 2017-10-28 01:22:11 +02:00
Savander b2b82eb3dd
Localize friend message 2017-10-28 01:21:32 +02:00
Jupeyy 493d2dc9d8 add speedups correctly to the border tiles, to allow them beeing
displayed on extended range
2017-10-28 00:52:54 +02:00
Learath2 a6eb1b94f2 Add lock around m_Destroy and m_PastCB 2017-10-27 15:26:39 +02:00
Dennis Felsing 77ca35567d Merge pull request #930 from heinrich5991/pr_ddnet_crosscompile_mac
Allow cross-compilation from Linux to macOS
2017-10-26 08:42:34 +02:00
heinrich5991 ab2738ca1b Allow cross-compilation from Linux to macOS 2017-10-25 16:57:25 +02:00
bors[bot] d5b6b30f95 Merge #929
929: Don't draw invalid tiles r=heinrich5991 a=Jupeyy

I just forgot to fix that, when i was changing the buffer creation.
It just prevents invalid tiles, e.g. speedup without force, to be drawn
2017-10-25 14:21:45 +00:00
Jupeyy 863385e208 fix the code layout 2017-10-25 15:42:06 +02:00
Dennis Felsing 233ec0a5f2 cmake fixes 2017-10-25 10:35:33 +02:00
Jupeyy 3c8f937b79 Don't draw invalid tiles 2017-10-24 20:41:11 +02:00
Dennis Felsing a38f0f7dac Merge pull request #928 from heinrich5991/pr_ddnet_cmake_bundled_curl
Add `crypto` and `ssl` if using bundled curl
2017-10-24 15:46:10 +02:00
heinrich5991 f3abdd43cb Add crypto and ssl if using bundled curl
Fixes #926.
2017-10-24 15:29:53 +02:00
bors[bot] d4bb119044 Merge #927
927: fixed boardcast r=heinrich5991 a=ChillerDragon

classical typo hehe... it is an typo word.
2017-10-24 11:44:46 +00:00
ChillerDragon 86f4deef8c fixed boardcast 2017-10-24 13:40:35 +02:00
Dennis Felsing 19a8054df6 Merge pull request #925 from heinrich5991/pr_ddnet_cmake_fix_bundle_libs
Only use bundled includes only if also using bundled libs
2017-10-24 12:24:50 +02:00
Dennis Felsing bf2edba73f Merge pull request #918 from heinrich5991/pr_ddnet_test_info
Add `CTestInfo` class, add test for create-close-remove process
2017-10-24 12:20:46 +02:00
heinrich5991 5ef723c7f6 Only use bundled includes only if also using bundled libs
Fixes #867. Fixes #922.
2017-10-24 12:10:46 +02:00
Dennis Felsing 2d889a0584 Merge pull request #920 from Jupeyy/master
VBO deletion after VAO deletion & viewport adjustment for dpi scaled displays at fullscreen
2017-10-24 07:58:37 +02:00
Dennis Felsing d9ababfce7 Merge pull request #921 from heinrich5991/pr_ddnet_crosscompile
Add toolchain files for MinGW 32- and 64-bit cross-compilation
2017-10-24 07:56:34 +02:00
Jupeyy 442a1767d4 reset lastindexbuffer at object deletion 2017-10-24 03:12:48 +02:00
heinrich5991 4c5115d742 Add toolchain files for MinGW 32- and 64-bit cross-compilation
Tested on Arch Linux. Fixes #807.
2017-10-24 01:22:17 +02:00
Jupeyy 5c9fc3d19b remove unused variable 2017-10-23 18:31:44 +02:00
Jupeyy 37c5102928 only delete VBOs when the VAO, which uses the VBO, is deleted(AMD driver
bug under windows). And only allow true fullscreen under supported
display resolutions, to enable prevention of DPI scaled opengl viewport
2017-10-23 18:02:18 +02:00
Jupeyy ada954ea4e add shader directory to the install directory 2017-10-23 17:58:55 +02:00
Dennis Felsing 4e20349cc4 Merge pull request #919 from heinrich5991/pr_ddnet_no_old_windows_cmake
Drop CMake 3.4 support for MSVS
2017-10-23 14:51:55 +02:00
heinrich5991 b1db90dbaa Don't build GTest in the default target 2017-10-23 14:43:33 +02:00
heinrich5991 8b1559ae14 Drop CMake 3.4 support for MSVS
Windows users don't have old versions of CMake from their repositories,
Visual Studio installs CMake 3.9.
2017-10-23 13:58:44 +02:00
Dennis Felsing acb052e97d Newline 2017-10-23 09:43:20 +02:00
Dennis Felsing fdc475f20e Merge pull request #917 from Jupeyy/master
Add DPI awareness support for MSVC compiling for Win8.1 and Win10
2017-10-23 09:42:47 +02:00
heinrich5991 b463197348 Add CTestInfo class, add test for create-close-remove process 2017-10-23 00:13:53 +02:00
Learath2 d6bcc4fe01 Run the server on CI (#910) 2017-10-22 21:43:53 +02:00
Jupeyy daee0a13a8 use spaces 2017-10-22 18:32:04 +02:00
Jupeyy 205b054026 move manifest to other directory and add MinGW support 2017-10-22 18:06:20 +02:00
Jupeyy 9a4efe758c use proper CMake 3.4 support for manifest files 2017-10-22 16:44:55 +02:00
Jupeyy 162b24c2b3 respect the CFG dir 2017-10-22 04:52:33 +02:00
Jupeyy 907622e108 don't read the manifest of the target 2017-10-22 04:10:21 +02:00
Jupeyy 152a71546f Add DPI awareness support for MSVC compiling for Win8.1 and Win10 2017-10-22 03:34:15 +02:00
def cb00a294b8 Enable gfx_opengl3 by default 2017-10-20 22:52:38 +02:00
def 342c6048bf Use new opengl by default 2017-10-20 22:47:59 +02:00
def 02aeae416b Infinity = no limit 2017-10-20 22:47:59 +02:00
Dennis Felsing 2dec3d771a Merge pull request #916 from heinrich5991/pr_ddnet_fix_aio_test_leak
Fix file descriptor leak in aio tests
2017-10-20 22:32:31 +02:00
def 2b7809befd Switch cl_showfps 1/2 2017-10-20 22:27:53 +02:00
heinrich5991 5d783895e4 Fix file descriptor leak in aio tests 2017-10-20 18:46:31 +02:00