Commit graph

11856 commits

Author SHA1 Message Date
Emir Marincic 4e0be68374
Merge pull request #959 from heinrich5991/pr_ddnet_cmake_fail_gracefully_gtest
Fail gracefully when trying to automatically download GTest
2017-12-06 20:05:15 +01:00
bors[bot] be30a14624 Merge #961
961: Initialize m_LastLoad in constructor and reset it when a new map is loaded r=heinrich5991 a=Jupeyy

Currently the LastLoad variable might block the map(especially when the %current% is used) to be loaded, when you join a server.
That led to try rendering a non initialized map.
Also now it's checked if a map for %current% even is loaded.
2017-12-03 11:11:14 +00:00
Jupeyy 9228e632e9 remove spaces 2017-12-03 11:50:43 +01:00
Jupeyy e314802c9c Initialize m_LastLoad in Constructor and reset it when a new map is
loaded(%current% can be loaded directly)
2017-12-03 08:01:17 +01:00
Jupeyy 060f6fd36e Load shaders through IStorage class
Fixes #939.
2017-12-02 22:19:57 +01:00
bors[bot] 1e8c70e3d4 Merge #960
960: removed unused comment r=heinrich5991 a=ChillerDragon
2017-12-02 17:46:14 +00:00
ChillerDragon 3acb650a6f
removed unused comment 2017-12-02 18:26:53 +01:00
heinrich5991 f50260b31d Fail gracefully when trying to automatically download GTest 2017-11-28 01:22:39 +01:00
bors[bot] bad105c5e4 Merge #953
953: Overhauled job system r=Learath2 a=heinrich5991

The engine now takes `std::shared_ptr<IJob>`, this will ensure the
appropriate lifetime of the given parameters, it also allows for proper
destruction. Remove the now obsolete `IFetcher` interface and `CFetcher`
class.

Also adds some locks to `CUpdater`, previously it didn't have any locks
at all.
2017-11-27 23:34:54 +00:00
bors[bot] 525f6715cf Merge #956
956: Remove unused header file `src/engine/shared/storage.h` r=Learath2 a=heinrich5991
2017-11-27 22:41:12 +00:00
heinrich5991 8d47638a29 Add manual locking to ASYNCIO for transacted writes
Previously, e. g. it was possible that newlines are separated from the
printed line in `logger_file`.
2017-11-27 01:04:55 +01:00
heinrich5991 fd36b8c8c8 Remove unused header file src/engine/shared/storage.h 2017-11-27 00:58:30 +01:00
bors[bot] 41f6140179 Merge #945
945: Don't use nonstandard `#pragma pack` r=Learath2 a=heinrich5991

It's not needed in that place anyway.
2017-11-26 16:27:50 +00:00
bors[bot] 5bfb25c9c8 Merge #954
954: Change some config variable defaults to official server values r=Learath2 a=heinrich5991
2017-11-26 16:13:23 +00:00
bors[bot] f9e0b6b3fe Merge #931
931: Add Speedup tiles correctly at the border creation & remove tile layer extension restriction & fix the LastIndex buffer initlialization & setup non mipmap textures up correctly(texture completness) r=heinrich5991 a=Jupeyy

Allows speedups to be drawn on extended range(out of map range) too.
2017-11-26 13:32:05 +00:00
Jupeyy b1d99de87a s_ 2017-11-26 14:10:47 +01:00
Jupeyy bff1186d3b is now s_ 2017-11-26 14:08:00 +01:00
Jupeyy 14297ae45c code pattern 2017-11-26 13:28:41 +01:00
heinrich5991 c10db436b4 Change some config variable defaults to official server values 2017-11-24 11:59:45 +01:00
heinrich5991 23734deb14 Call net_init in tests 2017-11-24 10:51:46 +01:00
heinrich5991 3f43624d21 Add a couple of tests for CJobPool 2017-11-24 10:33:42 +01:00
heinrich5991 01d81fc4cc Make m_Shutdown variable atomic instead of volatile 2017-11-24 09:23:23 +01:00
heinrich5991 a3cdfac84e Fix lookup job being zeroed in CMasterServer::Load 2017-11-24 02:13:34 +01:00
heinrich5991 94acac91a0 Overhauled job system
The engine now takes `std::shared_ptr<IJob>`, this will ensure the
appropriate lifetime of the given parameters, it also allows for proper
destruction. Remove the now obsolete `IFetcher` interface and `CFetcher`
class.

Also adds some locks to `CUpdater`, previously it didn't have any locks
at all.
2017-11-23 15:47:38 +01:00
bors[bot] add0b88976 Merge #951
951:  Activate C++11 in old CMake as well r=Learath2 a=heinrich5991

Old CMake doesn't understand `CMAKE_CXX_STANDARD` and similar, add the
parameter directly.
2017-11-23 02:48:11 +00:00
heinrich5991 a60320b87a Activate C++11 in old CMake as well
Old CMake doesn't understand `CMAKE_CXX_STANDARD` and similar, add the
parameter directly.
2017-11-23 03:10:25 +01:00
heinrich5991 f0c647dba5 Change os_compare_version to os_is_winxp_or_lower
This stops leaking OS details in non-`system.c` files.
2017-11-23 03:10:15 +01:00
heinrich5991 7fc4a21565 Remove deprecated multi commands
You now have to use `/mc;` instead of `/` if you want to bind multiple
commands to one key.
2017-11-18 16:36:34 +01:00
heinrich5991 be80ccb7d6 Don't use nonstandard #pragma pack
It's not needed in that place anyway.
2017-11-18 00:24:44 +01:00
heinrich5991 4c63e26bb7 package_all now actually produces all packages 2017-11-17 22:32:56 +01:00
heinrich5991 4b45f857c7 DMG: Put version into Info.plist 2017-11-17 22:32:44 +01:00
heinrich5991 373a96a11f Don't install the portable component for make install 2017-11-17 17:43:52 +01:00
heinrich5991 44c0f872fe Replace cmake by ${CMAKE_COMMAND} in custom commands
This allows execution even when `cmake` isn't in the current `$PATH` or
`%PATH%` variable.
2017-11-17 15:55:22 +01:00
heinrich5991 dcbd8197a4 Stop using deprecated APIs on macOS in server launcher 2017-11-17 14:57:42 +01:00
heinrich5991 dd5c26f81c Build the server launcher on macOS, package it 2017-11-17 14:37:29 +01:00
heinrich5991 194e4cffe7 Also package the server into DMGs 2017-11-16 10:28:55 +01:00
heinrich5991 3620e234db dmg.py: Add proper size calculation 2017-11-16 10:03:11 +01:00
bors[bot] 27722633a3 Merge #940
940: Put shaders into the data/ directory r=Learath2 a=heinrich5991

Simplifies a lot of things
2017-11-15 23:29:55 +00:00
heinrich5991 2f0b76f178 dmg.py: Compatibility with Python 3.2 and below 2017-11-16 00:11:30 +01:00
bors[bot] b77cd857e9 Merge #942
942: Don't use Brew on Travis anymore r=Learath2 a=heinrich5991

We now ship SDL2 via ddnet-libs, it's not needed anymore. Fixes #893.
2017-11-15 23:02:43 +00:00
heinrich5991 c6016b77c5 Add other/bundle/ directory with Info.plist and PkgInfo 2017-11-10 08:32:21 +01:00
heinrich5991 fe4910c255 Don't use Brew on Travis anymore
We now ship SDL2 via ddnet-libs, it's not needed anymore. Fixes #893.
2017-11-09 13:41:31 +01:00
heinrich5991 eb6c8ea101 Allow DMG creation on macOS via hdiutil 2017-11-09 13:35:59 +01:00
heinrich5991 a3f544a73e Add missing EOL at end of file to shaders 2017-11-09 11:31:13 +01:00
heinrich5991 2593091380 Preliminary version of cross-compiled DMG archives
Currently they only contain the client and the archives are a lot larger
than the current release artifacts.
2017-11-09 00:16:52 +01:00
heinrich5991 7efe6e3241 Fix submodule version 2017-11-08 23:16:06 +01:00
heinrich5991 17d3f4afa4 Put shaders into the data/ directory
Simplifies a lot of things
2017-11-08 22:19:47 +01:00
bors[bot] 71d77ae778 Merge #937
937: Fix `3 / 2` using integer division r=Learath2 a=heinrich5991
2017-11-08 20:08:59 +00:00
bors[bot] fdb2e330ce Merge #904
904: Fix use-after-free r=heinrich5991 a=Learath2

Not sure if this is the best way to go about this, but it works :/
2017-11-08 17:30:34 +00:00
Dennis Felsing 445b0de5ec Update German translation (by Stitch626) 2017-11-07 08:01:14 +01:00