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

5027 Commits (07e8c75bac387df28983d5d47196b7c5fd3c571c)

Author SHA1 Message Date
David Dormagen 2df2946016 OnInIncendiaryMaterial: check for object removal after energy loss 2016-05-27 22:19:41 +02:00
Maikel de Vries fb60bf41b8 remove spurious comment in flagpole script 2016-05-21 13:34:35 +02:00
Maikel de Vries 3455fa24f9 add some variation to the maximum size of trees 2016-05-21 13:34:34 +02:00
Maikel de Vries 18f2b4831a add max size option to StartGrowth 2016-05-21 13:34:34 +02:00
Maikel de Vries e92e7a2e2c fix producer components call after liquid_container branch merge 2016-05-21 13:34:34 +02:00
Maikel de Vries 6c8c4c9c19 allow more components than def for Oversize objects 2016-05-21 13:34:34 +02:00
Maikel de Vries 2a731b2545 implement Components as a property lookup table 2016-05-21 13:34:34 +02:00
Maikel de Vries 62ad9eb53b reimplement components scaling with object completion 2016-05-21 13:34:34 +02:00
Maikel de Vries a81ccaab22 add function to make properties writable 
Thanks to Guenther for the implementation details, documentation will follow when it is considered a stable solution.
 2016-05-21 13:34:34 +02:00
Maikel de Vries 1df322b7ff adapt objects and scenarios to new component implementation 2016-05-21 13:34:34 +02:00
Maikel de Vries 4833f839d2 script implementation of GetComponent and SetComponent 
This allows to remove the engine functionality and is based on the property Components = [[def1, amount1], [def2, amount2], ...]. Follow up commits will remove the engine functionality.
 2016-05-21 13:34:33 +02:00
Maikel de Vries c40edd3fbd remove duplicate moss object in Experimental.ocd 2016-05-21 13:34:33 +02:00
Maikel de Vries accd897b91 rename NoComponentMass to NoMassFromContents 
This had nothing to with components, and risk of backwards compatibility is minor.
 2016-05-21 13:34:33 +02:00
Maikel de Vries 183ab4c4a0 remove unused function ComposeContents 2016-05-21 13:34:33 +02:00
Maikel de Vries 5841b55f7e remove unused function GetNeededMatStr 2016-05-21 13:34:33 +02:00
David Dormagen c820dac7c3 classic menu style: only show count if applicable 
Otherwise, it would show "0x" for stuff where the count did not matter.
 2016-05-21 13:19:49 +02:00
Günther Brammer d23ffde361 Merge script branch 2016-05-15 19:21:26 +02:00
Günther Brammer ef515cc3c7 Script: Prototypes for CreateEffect should inherit from Effect 
This makes the special effect properties useable without the "this." prefix,
makes the various useful global functions available as well as
effect-specific functions.
 2016-05-15 15:22:42 +02:00
Nicolas Hake 8e18a3fc96 Change (int)0 to nil where deprecated 2016-05-13 17:13:34 +02:00
David Dormagen a20b7834c0 OneMillionParticles.ocs: removed some randomness in the amount of particles in the final test 
It's easier to compare runs this way.
 2016-05-10 22:29:30 +02:00
Lukas Werling 9fa16c5e14 SDL: Enable multisampling 
Unfortunately, there doesn't seem to be an easy way to apply
multisampling changes in SDL. As a workaround, a message requesting the
player to restart the game is shown.
 2016-05-07 12:25:11 +02:00
kpone33 77e5fb7acf Added Offshore to Music.ocg 2016-05-01 20:06:07 +02:00
Lukas Werling c9aa07ee60 Add more documentation for Mod() (#1735) 2016-05-01 19:52:22 +02:00
Mark 7d5d97b0d6 Merge remote-tracking branch 'origin/master' into liquid_container 2016-05-01 19:43:10 +02:00
Lukas Werling dd48a759d7 Add mathematical modulo helper function Mod(a, b) 2016-05-01 19:25:12 +02:00
Mark b96b183007 Merge 'master' into liquid_container 2016-05-01 18:54:38 +02:00
Maikel de Vries 3907281933 fix script error when striking sword (#1731) 2016-05-01 16:54:05 +02:00
Mark 853af2c155 Merge 'master' into liquid_container 2016-05-01 08:43:05 +02:00
Maikel de Vries f4ae76454b rename player control callback for specified id's to silence warning 
It is better to have different names for different callbacks.
 2016-04-29 21:51:58 +02:00
Günther Brammer b00b8554ab Merge branch script 2016-04-28 03:25:44 +02:00
Maikel de Vries 08668ef988 do not reset last item for quick switch when selecting same slot twice 2016-04-27 21:15:37 +02:00
Lukas Werling 11904c0217 Fix Q doing nothing initially 
Both the initial “selected” and “last” inventory slots were initialized
to 0, making Q useless. Many melees give more than one item to the
player, filling up from the first slot. Having Q switch to the second
slot initially is better than doing nothing, which will never happen
later on.
 2016-04-27 19:02:54 +02:00
Maikel de Vries 3f085a0532 balance grenade launcher projectiles 
Decrease their mass to prevent too much damage when having a direct hit plus explosion. Also decrease the impact of the iron bomb explosion a bit to make it less overpowered.
 2016-04-25 21:27:22 +02:00
Maikel de Vries f5a9412a35 clean up iron bomb and shrapnel scripts 2016-04-25 21:27:22 +02:00
Maikel de Vries 92334f5f4c take into account container velocity in shockwaves 
This ensures reliable flint jumping when using dynamite, ironbomb, powderkeg, etc.
 2016-04-24 20:33:44 +02:00
Günther Brammer c167e990a5 Add GetName function to Actions 2016-04-24 19:40:29 +02:00
Maikel de Vries 3c267bb7dc making buying in flagpole work when flag is in non-nil object layer 2016-04-24 13:21:16 +02:00
Maikel de Vries cea685f7ea fix flickering wealth entries for non-first players 2016-04-23 22:20:01 +02:00
Mark 72c7e4dd87 Merge remote-tracking branch 'origin/master' into liquid_container 2016-04-23 11:10:26 +02:00
Maikel de Vries 06e8df86ca fix FacetBase typos 2016-04-22 23:27:33 +02:00
Maikel de Vries f46f38511a add function to determine if ironbomb and dynamite are fusing 2016-04-22 23:27:33 +02:00
Lukas Werling 1f5dc0aec6 Add test scenario for Random() performance 2016-04-20 22:42:00 +02:00
Lukas Werling 250bbf9aa2 Hot Ice: Make use of LoadScenarioSection improvements 2016-04-18 23:05:13 +02:00
David Dormagen cdcb9a5a53 power display: made text GUI_FitChildren 
.. so that small resolutions do not lead to even smaller scrollbars next to the power information. It's still not very aesthethic when it's multiline (because it's just so much text) but now it doesn't look horribly broken at least.
 2016-04-17 22:28:34 +02:00
Maikel de Vries 85a6cdbef7 do not apply line transform to grapple hook 2016-04-17 18:11:26 +02:00
Maikel de Vries b7a8b3067f correctly stop use control when clonk is attached (#1590) 2016-04-17 15:13:10 +02:00
Maikel de Vries 21b7d86535 allow windbag usage while hanging on balloon 2016-04-17 14:51:30 +02:00
Maikel de Vries 1210cb7c67 invert balloon deflate controls to be more natural 2016-04-17 14:51:02 +02:00
Maikel de Vries d6e19026be fix balloon pushing by windbag (#1709) 2016-04-17 14:49:41 +02:00
Maikel de Vries 21a861fabb unstuck living object from placed wallkits (#1716) 2016-04-17 11:38:52 +02:00