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

11022 Commits (clonk_re-export)
 

Author SHA1 Message Date
Maikel de Vries 29aedb36f2 fix scenario saving of hand items for golden statue 2018-01-22 21:00:13 +01:00
Sven Eberhardt bb7afe5850 Missions/Raid+TreasureHunt: Oil barrels are actually filled with oil and don't empty. 2018-01-21 21:53:01 -08:00
Sven Eberhardt ceab026780 Missions/Raid: Fix Pyrit hat and activity 2018-01-21 21:40:25 -08:00
Sven Eberhardt 88d1136215 Missions/Raids: Add signpost texts 2018-01-21 21:36:44 -08:00
Maikel de Vries d411f07fda carry heavy: add option for scripters to skip pick up animation 
This is probably not the cleanest solution but I needed one and could not think of a better option.
 2018-01-21 09:44:48 +01:00
Maikel de Vries 2b4e40e589 improve AI for defense rounds (boom attack path finding) 2018-01-21 09:44:48 +01:00
David Dormagen 3acd4a22f2 take 'left' and 'player' (and more) out of global namespace 
The values from the enums are converted to numbers a lot, so using an enum class would be counter-productive.
Having 'left' in the global namespace appeared to be an actual problem with some Qt headers, according to Fulgen.
 2018-01-20 18:20:51 +01:00
Julius Michaelis 735a29103f Suggestion for #1765/Acid Drilling: Add a statue that requests an acid bath. 2018-01-20 00:09:06 +01:00
David Dormagen fda3eecd84 made structures either flippable or prevent it completely (#1980) 
Foundry is now flippable. SteamEngine is not yet flippable due to collection zone (could use similar solution as foundry).
Pump is not yet flippable, because I don't want to test the bazillion combinations of states of the pump now - maybe after a release.
 2018-01-19 17:16:10 +01:00
Maikel de Vries e7354ac4b1 defense enemy: add bomber plane 
This is a first attempt at an AI flying an airplane and is still very basic.
 2018-01-19 14:37:21 +01:00
Maikel de Vries 0bac4579ef fix other script usages of SimFlight 2018-01-19 14:37:21 +01:00
Maikel de Vries 92aba45914 fix diving animation prediction for clonk 
And no! randomly multiplying by 2 is not a solution...
 2018-01-19 14:37:21 +01:00
Maikel de Vries dc7734e223 FnSimFlight: fix precision of velocity if not provided 2018-01-19 14:37:21 +01:00
Maikel de Vries 0086f236c1 defense goal: improve scoreboard, description and enemies 2018-01-19 14:37:21 +01:00
Maikel de Vries f3626469b2 ensure proper saving of pipe lines to prevent line breaks 2018-01-19 14:37:20 +01:00
Maikel de Vries f815892b19 fix and unify message showing for goals and rules in F menu 2018-01-19 14:37:20 +01:00
Julius Michaelis 9d61cc9bc9 Fix Mac build broken in b11564168, attempt 2 2018-01-19 13:01:26 +01:00
Julius Michaelis 914d3798a4 Addedum to the control fixes in b11564168 (#1693, #1982): 
- Allow configuring keyboard keys with modifier keys
 - Allow using Alt as a key in game on linux
   (I'm still puzzled why only Ctrl and Shift where implemented in so many places)
 - Adjust the deserializer and PlayerControls.txt to match the serializer for mouse keys
 - Refactor C4PlayerControl::DoMouseInput a little bit
 - Try to fix the Mac build (attempt 1)
 - Fix a bug in C4KeyCodeEx::CompileFunc where it set an incorrect KeyComboItem::sKeyName
 - Fix(?) StdCompilerConfigRead not doing anything on NoSeparator
 2018-01-19 11:23:51 +01:00
Clonkonaut 9eef4e2a9f Make various vertices more symmetrically laid out and more fitting to the shape (#1979). 2018-01-18 02:32:54 +01:00
Lukas Werling ad66ba3145 Krakatoa: Fix spawn position of rejoining players 2018-01-17 00:09:27 +01:00
Lukas Werling 04ee087e7d Krakatoa: Don't reduce flag radius (#1981) 
The scenario doesn't have an expansion goal anymore, so I don't see why
we'd want to restrict the radius - especially when that doesn't work
properly.
 2018-01-17 00:09:27 +01:00
Mark 4db6300789 Test #1974: Improved test 
The test can now actually reproduce the bug before it was fixed, and proves that it does not appear anymore now that it is fixed.
 2018-01-15 22:19:05 +01:00
Maikel de Vries 601ca111c9 AI: pass effect to ExecuteJump() to prevent script error 2018-01-15 18:42:31 +01:00
Maikel de Vries 4aa0801762 speed up ladder search by clonks using Find_Property 2018-01-15 17:32:48 +01:00
Julius Michaelis b115641685 Allow using mouse keys and key combinations from the control assignment configuration dialogue (#1693, #1692) 2018-01-15 00:28:13 +01:00
Lukas Werling 417d10ed97 HotIce: Fix EciToh lava with Sky background 2018-01-14 21:27:28 +01:00
Maikel de Vries 42dfc79359 ranged AI: aim at bottom of structures to trigger explosions on basements or solid ground 2018-01-14 15:27:11 +01:00
Maikel de Vries 3c9dc104b3 defense boom attack: fix destruction tracking 2018-01-14 15:26:27 +01:00
Clonkonaut 16adcfff73 Detach any visible objects upon Death (#1974). 2018-01-14 14:48:03 +01:00
Maikel de Vries 07ea7f2791 (#1969): improve situation for structures that want to accept vehicles to be entered 2018-01-14 14:45:48 +01:00
Maikel de Vries 705ab86078 defense: improve goal info and script, king of the hill scenario 2018-01-14 14:42:16 +01:00
Maikel de Vries b5152e1215 do not show trajectory for script players to prevent lag 2018-01-14 14:42:16 +01:00
Mark 7b13b3455c Fix #1969: Prevent pushing vehicles into buildings where they are irretrievable 2018-01-14 14:34:27 +01:00
Mark 88aac09064 Test for #1974 
The test cannot reproduce the bug at the moment, so consider it a prototype.
 2018-01-14 13:34:27 +01:00
Lukas Werling 5944146f2b Fix more broken entries in Scenario.txt (#1910) 2018-01-13 18:57:32 +01:00
Maikel de Vries d2a8f2503c GILD: replace dynamite box with lantern (#1808) 2018-01-13 18:35:15 +01:00
Maikel de Vries 05268d140b GIDL: do not make stone doors static back 2018-01-13 18:26:20 +01:00
Maikel de Vries 187b887cdf ensure license abidance for liquid tank placeholder image 2018-01-13 18:11:14 +01:00
David Dormagen 825ad64afd AimManager: fixed incorrect use of PauseUse leading to aiming without holding CON_Use (#1691) 
PauseUse can be called between ControlUseStart and ControlUseStop/Cancel. In this case ControlUseStop set aim_stop=1 but didn't actually stop reloading (which is somewhat fine). However, this led to PauseUse being called when e.g. tumbling or climbing.
And this again would lead to CON_Use being reissued even though the mouse button was not held down, leading to the Clonk being in aim mode.

The functional change here is that you will not continue reloading after tumbling/climbing when you are not holding down CON_Use anymore, which is consistent with other stuff.
 2018-01-13 16:05:46 +01:00
Maikel de Vries c3dfdc5894 fix connecting multiple pipes to the refinery drain 2018-01-13 15:28:41 +01:00
David Dormagen 6b797e300e inventory bar: stack count always falls back to contained object count 
Related to #1970 and 5fc07df757
This replaces the very hacky implementation just for the dynamite with a more general solution (and e.g. also works with the grenade launcher).
 2018-01-13 15:24:08 +01:00
David Dormagen 12da14d603 structures: made very low damage repairable 
When the damage times the total component value was much lower compared to the total HitPoints (e.g. with basements), the damage could sometimes not be repaired.
This is fixed now.
 2018-01-13 15:04:15 +01:00
David Dormagen 38d937fa58 GetProperties: fixed returning of duplicated property names & too high repair costs 
var a = {B=1}; var b = new a {B=1}; would include "B" twice in the list of properties.
This lead to an actual issue when calculating component value for repairing buildings
 2018-01-13 15:02:19 +01:00
Julius Michaelis f286682e3b Revert assert from 0027666c4 2018-01-13 13:54:38 +01:00
Julius Michaelis 0027666c4e Fix for #1813 / #1956 2018-01-13 12:29:27 +01:00
Maikel de Vries 4a3173da36 move liquid tank to Experimental.ocd 
This should not appear anywhere in the release (also not editor), unless explicitly included.
 2018-01-13 12:14:41 +01:00
Maikel de Vries eb24079b2f pump: add interaction menu entries for air pipes 2018-01-13 12:09:59 +01:00
Maikel de Vries dc541620b5 add new liquid tank structure (graphics needed) 2018-01-13 11:06:35 +01:00
Maikel de Vries 3255b02728 pipes: fix attaching, cutting, swapping, messaging, and interface 2018-01-13 11:06:35 +01:00
Maikel de Vries 84ad52251f liquid library: fixes and typos 2018-01-13 11:06:35 +01:00