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

10565 Commits (cb68f9b26bfdbabbec93889c8dc872ed83369c4f)
 

Author SHA1 Message Date
Maikel de Vries cb68f9b26b fix parkour in combination with new relaunch rule 2017-04-25 10:26:27 +02:00
Maikel de Vries a863845ed4 add missing variable to relaunch rule 2017-04-25 09:45:12 +02:00
Maikel de Vries 7ffbeac9a9 Merge branch 'master' into Rule_Relaunch 2017-04-24 21:46:05 +02:00
Mark 2b56f55da5 DarkCastle: Fix #1907 
The name entries should be "Hörx" in German and "Harx" in English
 2017-04-24 15:10:06 +02:00
Maikel de Vries 4c8b236ea4 fix relaunch finding no spawn 
Use built-in FindLocation which works better and default to landscape center when really no place to spawn could be found.
 2017-04-23 18:30:15 +02:00
Fulgen301 750d52e06d Fix Missions.ocf scenarios in order to work with Rule_Relaunch 2017-04-22 21:08:40 +02:00
Fulgen301 7fed3ea1c0 Rule_Relaunch: Fix positioning and inventory transfer; add option to prevent initial "relaunch" 
# Conflicts:
#	planet/Objects.ocd/Rules.ocd/Relaunch.ocd/Script.c
 2017-04-22 21:08:26 +02:00
Fulgen301 7064d4f6fb Rule_Relaunch: Fix return value in SetFreeCrew and SetInventoryTransfer 2017-04-22 21:06:08 +02:00
Fulgen301 38daafc99b Overcast: Fix script errors 2017-04-22 21:06:07 +02:00
Maikel de Vries 200780fba4 fix definition call to relaunch rule 2017-04-22 20:42:56 +02:00
Maikel de Vries c75ffe3978 improve lavacore solidmask 
This allows to stand on it more easily and should lead to less frustration for the player.
 2017-04-22 16:11:00 +02:00
Nicolas Hake 95c31df9e9 Fix assertion-enabled build 2017-04-19 10:32:34 +02:00
Nicolas Hake c41bd063bd Stop disabling debugrec code by preprocessor 
The optimizer is going to remove dead code anyway, and has the
additional advantage of doing syntax checking, so the code won't
silently break when someone changes something.
 2017-04-19 09:47:21 +02:00
Nicolas Hake 81e49fe0f5 Fix several broken conversions from C4Fixed->bool->int (#1904) 
This is why non-explicit operator bool is bad.
 2017-04-19 09:24:27 +02:00
Nicolas Hake fc1a7a59c8 Use C4Real instead of C4Fixed where representation is irrelevant 
While C4Real is just a typedef for C4Fixed, it signifies more clearly
that we don't care about the memory representation at the point of use.
 2017-04-19 09:14:39 +02:00
Fulgen301 b77e9a7755 RelaunchContainer: Fix using wrong locals due to 52bf2e65bbe497e7d897988765e031f56ce4a980 2017-04-17 17:18:17 +02:00
Fulgen301 85cfbc4065 DarkMine: Fix relaunch handling 2017-04-17 17:18:10 +02:00
Maikel de Vries 7c444e7f96 add lava core animal (made by Win) 
Original by win, overhaul of script and behavior by Maikel.
 2017-04-17 16:05:20 +02:00
Fulgen301 6030299201 ThunderousSkies: Fix wrong relaunch position and wrong default relaunches 2017-04-17 15:08:47 +02:00
Nicolas Hake 0df79f5ba3 Rule_Relaunch: use correct casing for translations 2017-04-13 19:06:36 +02:00
Nicolas Hake fee85b8ddb Merge pull request GH#38 from Fulgen301/Rule_Relaunch 2017-04-13 19:05:02 +02:00
Fulgen301 f1efb134aa Remove hungarian notation and fix some errors 2017-04-13 18:58:10 +02:00
Fulgen301 9154ebf79f CaptureTheFlag: Fix script errors 2017-04-13 18:35:50 +02:00
Fulgen301 8042861f0b Rule_Relaunch: Fix several script errors 2017-04-13 18:35:43 +02:00
Fulgen301 bf43302da2 Rule_Restart: Fix handling return values of OnPlayerRestart 2017-04-13 09:54:52 +02:00
Nicolas Hake 23f6c74c4b Merge pull request GH#37 from Fulgen301/Rule_Relaunch 2017-04-12 17:45:51 +02:00
Nicolas Hake bc5df7f35b CMake: Add date of commit to logfile 
But only if the build is from a clean index. Otherwise, the logfile will
contain the date of build.
 2017-04-12 12:34:36 +02:00
Nicolas Hake 94608179f3 CMake: Regenerate build when Git index changes 2017-04-12 11:56:18 +02:00
Nicolas Hake be2f079e2c Docs: Move ParseInt into Script/Strings category 
It's not really Arithmetics.

Also change the parameter description to something that isn't a
copy/paste error.
 2017-04-11 14:27:50 +02:00
Nicolas Hake b87f8e3f47 C4Script: Add ParseInt function 
ParseInt() will take a string parameter and try to convert it into an
integer. If the conversion fails, it returns nil.
 2017-04-11 14:21:25 +02:00
Nicolas Hake 1ee3081de2 Add tests for StdMeshQuaternion 2017-04-10 19:13:04 +02:00
Nicolas Hake 4d33df9dfe Add tests for StdMeshVector 2017-04-10 19:13:04 +02:00
Clonkonaut 06a1ebe255 Fix RemoveReproductionEffect() in Animal Library. 2017-04-10 17:24:20 +02:00
Lukas Werling 5719524241 Move C4AchievementGraphics to its own file 
Scenario parameters are useful in a script-only context (such as the one
mape uses). C4AchievementGraphics introduces a dependency on C4Surface
which isn't available in that context.
 2017-04-03 11:55:22 +02:00
Julius Michaelis 97bdddba24 Fix strict aliasing violation, make C4Real pass is_pod 2017-04-03 11:14:27 +02:00
Lukas Werling f03a1d618d Use average texture color for BMP palette 
Previously, it would just use first pixel of the texture image. With our
current textures, this is a pretty bad approximation. For example,
firestone ends up yellow rather than red.

Additionally, this helps tools like mape/ocmapgen which do not load any
texture graphics but just set the texture's average color.

This also fixes the sky color which was previously overwritten.
 2017-04-01 20:20:10 +02:00
Julius Michaelis b0a45e01ac Install c4groups even with HEADLESS_ONLY 2017-04-01 12:14:11 +02:00
Fulgen301 5cc3cf002a Fix Test.ocf/ColorfulLights.ocs 2017-03-30 20:55:08 +02:00
Fulgen301 25f77fd12c Remove Rule_Restart from Parkour.ocf 2017-03-30 20:55:08 +02:00
Fulgen301 22bf8ad1f7 Remove Rule_Restart from Goal_Parkour 2017-03-30 20:55:07 +02:00
Fulgen301 6405e50c80 Remove Rule_Restart from Defense.ocf 2017-03-30 20:55:07 +02:00
Fulgen301 d429e88dd2 Remove Rule_Restart from Arena.ocf (is replaced by Rule_Relaunch) 2017-03-30 20:55:07 +02:00
Fulgen301 00cc450331 Goal_Parkour: Fix searching Rule_Restart 2017-03-30 20:55:07 +02:00
Fulgen301 065655076e Modify Tutorials.ocf in order to work with Rule_Relaunch 2017-03-30 20:55:06 +02:00
Fulgen301 07005618aa Modify IAmRich in order to work with Rule_Relaunch 2017-03-30 20:55:06 +02:00
Fulgen301 69e4826a6f Rule_Relaunch: Modify DefaultRelaunchCount setting 2017-03-30 20:55:06 +02:00
Fulgen301 44ca079bf6 Modify Missions.ocf in order to work with Rule_Relaunch 
- Crash
- DarkCastle
- DeepSeaMining
- Raid
- TreasureHunt
 2017-03-30 20:55:05 +02:00
Fulgen301 b7108ff836 Modify Blunderbuss in order to work with Rule_Relaunch 2017-03-30 20:55:05 +02:00
Fulgen301 b76cedbe7e Modify Bow in order to work with Rule_Relaunch 2017-03-30 20:55:05 +02:00
Fulgen301 51d61d1b26 Modify GrenadeLauncher in order to work with Rule_Relaunch 2017-03-30 20:55:04 +02:00