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

6800 Commits (stable-6.1)
 

Author SHA1 Message Date
Nicolas Hake 652c7e43e2 Fix headless build 
Several rendering changes have resulted in a non-rendering build that
failed to build from source. Dummy out all of these functions to make it
work again.

Cherry-picked.
Author:    Nicolas Hake <isilkor@openclonk.org>
Date:      Wed Jun 17 21:30:56 2015 +0200
Conflicts:
	src/lib/StdMesh.h
 2015-09-23 21:12:56 +02:00
Nicolas Hake 07f02800ef Bump version to 6.1. 2015-06-06 12:46:30 +02:00
Nicolas Hake 8786b7ab82 Bump version to 6.1-rc2. 2015-05-27 22:16:37 +02:00
Sven Eberhardt 6b27635bf3 Windows: Fix saving of custom keys (#1313) 
The registry compiler couldn't handle strings beginning with a separator, which was used for marking keys defined by scan code.
 2015-05-27 22:07:14 +02:00
Nicolas Hake cc46f0a388 Fix C4ENGINECAPTION generation 
Not only was it interpolating the wrong variable, it was also adding a
space that shouldn't be there.
 2015-05-22 20:59:17 +02:00
Nicolas Hake bc624176e7 Bump version to 6.1-rc1. 2015-05-21 23:09:48 +02:00
Nicolas Hake b3b30e1631 Split calculated values out of Version.txt 
Version.txt should only contain values that you set manually. Anything
that's derived from that or calculated separately should be in a
separate file.
 2015-05-21 23:09:47 +02:00
Nicolas Hake 88ee2f7db8 Set C4VERSION macros from CMake assembled vars 
There's no reason to have CMake assemble a version string, then have a
similar (but slightly different) string built by the C preprocessor.
Since CMake already has the values we want, just dump those into the
macros.
 2015-05-21 23:09:46 +02:00
Nicolas Hake 0c5e0c131a Fix incorrect version string interpolation 2015-05-21 23:09:45 +02:00
Nicolas Hake 0f2f936de3 Use C4VERSIONEXTRA for pre-release versions 
Instead of using some arbitrary minor version set to mark pre-release
versions, use C4VERSIONEXTRA, which is already a dedicated marker.
This also complies with semantic versioning.
 2015-05-21 23:09:45 +02:00
Nicolas Hake a44bb14c1c Drop reference to non-existent C4XVER4 
Version.txt was still adding C4XVER4 to the version string, which was
removed a while ago. This was mostly unproblematic though because
nothing besides the Windows game browser used this string.
 2015-05-21 23:09:44 +02:00
Nicolas Hake b583f708db Add generated C4Version.h to build 
OpenClonk and C4Group have a dependency on the generated C4Version.h, so
the source lists should reflect this.
 2015-05-21 23:09:44 +02:00
Maikel de Vries 9cf08594cf fixed description of the chest interaction 2015-05-21 22:26:59 +02:00
Maikel de Vries 2dd4b50313 parkour: players respawn at best team checkpoint 2015-05-18 20:15:37 +02:00
Maikel de Vries 939888e9d2 fix grenade launcher blocking hands after shooting 2015-05-17 18:43:49 +02:00
Maikel de Vries a73b432cac remove logging message in Explode() 2015-05-17 14:16:14 +02:00
Maikel de Vries 95fe966cd1 kill tracing for incinerated dynamite (box) and iron bomb 2015-05-17 14:04:52 +02:00
Maikel de Vries f86495da89 lorry: pass controller to objects which are casted on destruction 2015-05-17 14:04:44 +02:00
Maikel de Vries bfa6e7fbac correct kill tracing for ammo launched by grenade launcher 2015-05-17 14:04:34 +02:00
Maikel de Vries 097ddd9ae1 add cause_plr to OnShockWaveHit callback 
This can be used to damage and kill tracing for objects which die, receive damage or are destroyed on shockwaves.
 2015-05-17 14:04:21 +02:00
Maikel de Vries b17d0bccb6 fix pump power consumption (#1309) 2015-05-14 12:35:17 +02:00
Maikel de Vries 71db4010da make cabin invincible in Crash.ocs for goal checking 2015-05-14 12:35:07 +02:00
Maikel de Vries de185e7937 remove obsolete BuildTurnTo defcore entry 2015-05-14 12:34:53 +02:00
Maikel de Vries 02252b31bd option to choose goal in scorched gardens 2015-05-14 12:34:40 +02:00
Nicolas Hake d141f1a39f Fix mismatched mape function stub 
21500a8 changed a function prototype inside C4Landscape but neglected to
change the mape stub to match. Fix this so the build stops failing.
 2015-05-14 12:34:20 +02:00
Sven Eberhardt d6697a1f74 Remove duplicate crashed plane skin from Treasure Hunt mission. 
Already defined in decoration folder.
 2015-05-14 12:33:19 +02:00
Sven Eberhardt 4da413b6ae Light up target door on remote control by switch (#1296). 2015-05-14 12:32:43 +02:00
Sven Eberhardt afd1dcba7f Remove dialogue when target NPC dies (#1295). 2015-05-14 12:32:22 +02:00
Sven Eberhardt 9349498f3f Fix pump to clear the last row of pixels (#1057) and allow pumping from pump without source pipe. 
ExtractMaterial has been changed to be able to slurp in from the most distant horizontal position rather than the closest to the extraction top center.

Also speed up ExtractMaterial for the common case of no required horizontal shifts.
 2015-05-14 12:32:11 +02:00
Sven Eberhardt 05dba4cadc Add Find_InArray to docs for FindObject(s) and ObjectCount. 2015-05-14 12:31:57 +02:00
Sven Eberhardt b424838158 Add Find_InArray (#1073). 2015-05-14 12:31:46 +02:00
Sven Eberhardt 1d66dd426e Change C4FO and C4SO constants to be increasing regularly. 
Regular values allows compilers to use jump table optimizations for switch statements and I don't see any upsides of the previous values.
 2015-05-14 12:31:36 +02:00
Sven Eberhardt 6699cd3712 Allow CNAT_* constants in VertexCNAT definition of DefCore (#1307) 
Also fix decompiling of none-values in bitfields.
 2015-05-14 12:31:15 +02:00
Sven Eberhardt b1b8fedb25 HotIce alternate map added. 
Also converted old map to Map.c and fixed some spawning issues.
 2015-05-14 12:30:43 +02:00
Maikel de Vries e9b076f6d3 remove celestial environment object in favor of scenario callback 2015-05-14 12:30:21 +02:00
Maikel de Vries 1cf1e309ea clean up moon and star objects 2015-05-14 12:30:08 +02:00
Maikel de Vries 871873b9bc use ambient brightness for time of day 2015-05-14 12:29:53 +02:00
Maikel de Vries e9e6fd9dba improve moving objects out of basement on completion 2015-05-14 12:29:26 +02:00
Maikel de Vries cc9e0ea9f2 construction site: sign in front and transparency for non-mesh structures 2015-05-14 12:29:16 +02:00
Maikel de Vries ea2799fa28 fix attachment of basement to tall structures 2015-05-14 12:29:02 +02:00
Maikel de Vries 807ba20922 fix scenario saving of basements 2015-05-14 12:28:51 +02:00
Maikel de Vries 6772f2da86 no overpowered weapons on dark mine respawn 2015-05-14 12:27:32 +02:00
Maikel de Vries 24b164cd37 add missing descriptions for chest and gold idol 2015-05-14 12:27:20 +02:00
Maikel de Vries c25d463a91 fix Dark Mine relaunch description 2015-05-14 12:27:05 +02:00
Maikel de Vries f67f8d0d11 fine-tune windbag force on clonk and objects 2015-05-14 12:26:45 +02:00
Maikel de Vries 7ff5478142 make windbag burst more gradual and slightly depend on mass (#1297) 2015-05-14 12:26:32 +02:00
Nicolas Hake e2a42de2f2 StdCompilerINIRead: Maintain line break cache for error msgs (#1310) 
Deserializing proplists tries to read a boolean variable from the
representation in order to be backwards compatible to old (<6.0)
savegames. Newer savegames do not write this boolean, so StdCompiler
(correctly) throws an exception. This exception uses line numbers, which
StdCompiler used to obtain by scanning through the entire buffer. Having
to scan through the entire buffer for every serialized proplist is
ridiculously slow (and the data isn't used anyway in this instance).
Since line information is still valuable outside of proplist
deserialization, replace the repeated SGetLine calls with an on-demand
cache.
This reduces load times of a 14 MB Game.txt from slightly over 3 minutes
to 7 seconds on my computer.
 2015-05-10 20:50:23 +02:00
Martin Plicht 5deb01fff9 C4DrawGLMac: Put OSX 10.9 API usage into #ifdef block 2015-05-10 20:50:10 +02:00
Misty De Meo 2f08800709 StdSchedulerMac: don't call setTolerance: 
respondsToSelector isn't properly guarding against calling this method
on unsupported platforms, possibly because it existed as a private
method in OS X before 10.9. For example, attempting to build this on
OS X 10.8 fails with the error:
no visible @interface for 'NSTimer' declares the selector 'setTolerance:'

Since the default tolerance is 0 anyway, this can be removed without
adverse effect.
 2015-05-10 20:49:46 +02:00
Maikel de Vries 6e129f0535 remove big conifers from skylands to prevent large forests 2015-04-03 14:49:41 +02:00