marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
10,593 Commits
27 Branches
0 Tags
318 MiB
Commit Graph

10593 Commits (alut-include-path)
 

Author SHA1 Message Date
Maikel de Vries a435a6db1a lava and acid bubbles do not explode at animals which resist corrosion 2017-03-27 09:44:28 +02:00
Sven Eberhardt bcecff2811 Fix BOOL->bool conversion 2017-03-26 21:20:39 -04:00
Sven Eberhardt c300c79cc7 Fix Windows saving of keyboard config if custom assignments are deleted (hack) 2017-03-26 21:19:58 -04:00
Sven Eberhardt 66117de82f Fix Windows config writing of custom key overloads 2017-03-26 20:55:27 -04:00
Sven Eberhardt 83af5ad794 Fix a script reload bug 
Thawing needs to catch some of the deeper nested proplists because they are modified in the EditorProp initialization Definition()-callbacks.
 2017-03-26 13:31:55 -04:00
Fulgen301 731bf926c3 CaptureTheFlag: Use tabs for indentation 2017-03-25 14:34:43 +01:00
Fulgen301 f74ee93b5c DeathMatch: Use tabs for indentation 2017-03-25 14:34:32 +01:00
Fulgen301 294b393f7e RelaunchContainer: Use tabs for indentation 2017-03-25 14:34:23 +01:00
Fulgen301 13303c98af Add Rule_BaseRespawn which sets Rule_Relaunch to base respawn mode in order to prevent breaking scenarios 2017-03-25 14:34:11 +01:00
Fulgen301 a4eacd7937 Modify Rule_Killogs in order to work with Rule_Relaunch 2017-03-25 14:01:13 +01:00
Fulgen301 b0219b4614 Modify Scoreboard_Relaunch in order to work with Rule_Relaunch 2017-03-25 14:01:06 +01:00
Fulgen301 3de5261e8a LastManStanding: Remove relaunch functionality which is handled by Rule_Relaunch 2017-03-25 14:00:59 +01:00
Fulgen301 82f3883486 Modify RelaunchContainer in order to work with Rule_Relaunch 2017-03-25 14:00:05 +01:00
Fulgen301 b31355391b DeathMatch: Enable unlimited relaunches 2017-03-25 13:55:42 +01:00
Fulgen301 3a39ec9f94 CaptureTheFlag: Enable unlimited relaunches 2017-03-25 13:55:34 +01:00
Fulgen301 15cf813c1c Rename Rule_BaseRespawn to Rule_Relaunch and implement relaunch functionality 2017-03-25 13:55:21 +01:00
Nicolas Hake 48513291e7 C4ConsoleQtNewScenarioDlg: Avoid std::string conversion ambiguity 2017-03-24 09:08:47 +01:00
Nicolas Hake 9f7128a60e StdCompiler: Add override specifiers 2017-03-24 08:52:32 +01:00
Nicolas Hake b312ec96b4 StdCompiler: Add CompileFunc for std::string 
Somehow, MSVC seems to synthesize a CompileFunc for std::string??
 2017-03-23 22:31:40 +01:00
Nicolas Hake c56bc4193e Replace InterlockedFoo by std::atomic 
Atomic increments/decrements are part of C++11, so we don't need to use
or implement InterlockedWhatever anymore.
 2017-03-23 17:03:16 +01:00
Nicolas Hake 007a05468e C4Scenario: Remove fixed char buffers 2017-03-23 16:35:25 +01:00
Nicolas Hake 78b43e2182 StdCompiler: Add support for std::string 2017-03-23 16:35:25 +01:00
Lukas Werling b9a4345071 Backward: Also print stack trace to OpenClonk.log 
People usually send the log file when something is wrong, so it's a good
thing to actually have relevant information about the crash there.
 2017-03-21 20:18:00 +01:00
Lukas Werling 19b00b7862 Use backward-cpp on Linux for nicer stack traces 2017-03-21 20:17:55 +01:00
Lukas Werling 22161ae561 Client: Send netpuncher request as soon as possible 
Previously, the SReq packet would only be sent after receiving an
ID from the netpuncher. Instead, we can send the request as soon as the
C4NetIOUDP connection setup finishes.
 2017-03-21 17:14:33 +01:00
Lukas Werling d4bb760b17 Move OnPuncherConnect to C4Network2 
All the other puncher handling functions are there as well.
 2017-03-21 17:14:33 +01:00
Julius Michaelis 70ad55ddf1 Add Windmill to farming knowledge in the Worlds folder. 
Semantically, that makes sense, but I haven't taken a look at all the maps.
 2017-03-19 14:03:11 +01:00
Nicolas Hake 379c5a5746 Tests: Add missing C4Include reference to UnicodeHandlingTest 
All of our headers are designed to be included *after* C4Include.h,
which UnicodeHandlingTest.cpp didn't do, resulting in an ill-formed
program on some implementations.
 2017-03-19 11:28:51 +01:00
Lukas Werling 9b61ba468d Fix JSON serialization of proplists within arrays 2017-03-18 00:26:58 +01:00
Lukas Werling 8ca3801741 Do the initial client->host connection in stages 
With the IPv6 support, hosts now often list around 20 addresses.
However, most of these are local only and thus rarely result in a
successful connection. With the introduction of address sorting in
7d5596220 ("Sort addresses used for initial host connection",
2017-02-26), the connection succeeds with the first few addresses most
of the time.

This commit changes the initial connection process to start with only
the first four addresses. After 100 ms, it proceeds with the next four
addresses and so on. This should reduce the packet volume significantly
as the connection should be established after only one or two steps.

We may want to tweak the parameters if this turns out to make joining
slower in practise. In a "normal" setup, the first four addresses should
be the IPv6 privacy and stable addresses, and the next four addresses
should include the IPv4 addresses from masterserver and netpuncher.
100 ms are long enough to get an answer from the host and short enough
to not bother the player too much.
 2017-03-17 23:02:45 +01:00
Nicolas Hake 7f2cce6f79 Fix WITH_AUTOMATIC_UPDATE, non-Windows platforms 2017-03-16 23:18:38 +01:00
Nicolas Hake a151ac12de C4Application: Remove StdStrBuf 2017-03-16 19:13:06 +01:00
Nicolas Hake d6c9a11678 StdRegistry: Remove unused support for separated config values 
The config read/write code never uses StdCompiler::Separator. Removing
support for it from StdRegistry makes the code simpler.
 2017-03-16 18:51:16 +01:00
Nicolas Hake 22f42123e8 C4AbstractApp: Remove StdStrBuf 2017-03-16 18:51:16 +01:00
Nicolas Hake c5ed6e7dc8 Move strprintf to Standard 
strprintf works like asprintf, except it returns a std::string.
 2017-03-16 18:51:16 +01:00
Nicolas Hake f9d78b8629 Win32: Add LPCWSTR->std::string conversion helper 2017-03-16 18:51:16 +01:00
Nicolas Hake ca62ee82bf Test invalid_escape_sequence, invalid_hex_escape, arg_count_mismatch 2017-03-16 18:51:16 +01:00
Julius Michaelis 183c6e076f silence 'could not connect to' spam in lobby 2017-03-14 22:49:35 +01:00
Nicolas Hake ed193a0715 Aul: use %u instead of %zu for parameter indexes 
MinGW uses an ancient version of the CRT, which doesn't support the z
modifier for integer types in printf. Use %u instead and cast to
unsigned.
 2017-03-14 00:45:27 +01:00
Nicolas Hake dc6804c12d Aul: Fix invalid_escape_sequence warning message 
The message used a %s where a %c was correct, and therefore tried to
access invalid memory.
 2017-03-14 00:28:41 +01:00
David Dormagen a561e15288 object interaction menu: made some comments clearer 
They were introduced in c37bc586e9
 2017-03-13 14:56:45 +01:00
Maikel de Vries 4211751f2f reset shaders when ambience object is deleted 2017-03-12 14:31:07 +01:00
David Dormagen 599509295d fixed some typos in German string tables 2017-03-12 11:18:35 +01:00
Maikel de Vries a49c283d67 prevent division by zero in catapult AI by setting a minimum power 2017-03-11 22:45:49 +01:00
Sven Eberhardt be66da2c7b Fix editor network join on Windows 2017-03-11 15:10:25 -05:00
Sven Eberhardt 5dfd723708 New scenario dialogue: Redraw definition list after template changed 2017-03-11 14:30:46 -05:00
Nicolas Hake 41f4779d74 StdCompiler: Use terms "Serializer" and "Deserializer" 
Instead of "Compiler" and "Decompiler", which make me look up what's
even going on each time I see them, use the standard terms "serializer"
and "deserializer".
 2017-03-11 15:05:41 +01:00
Nicolas Hake e3d6486f2a Move GetRelativePath to C4Language 
C4Language is the only consumer of GetRelativePath. It cannot handle
arbitrarily sized paths, so discourage new code from using it by moving
it to C4Language.cpp.

Also remove the buffer size parameter which was always defaulted anyway
and use template parameter deduction to always get the correct size.
 2017-03-11 13:47:18 +01:00
Nicolas Hake 333cf9c4b6 Merge pull request GH #35 from Fulgen301:pullrequest 2017-03-11 12:31:39 +01:00
Nicolas Hake d9f9d9ba38 C4MapCreator: Remove unused optional parameter 
No code called C4MapCreator::Create with the fLayers parameter omitted
or set to false, so we can just remove it.
 2017-03-11 11:35:33 +01:00