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

10220 Commits (ipv6)
 

Author SHA1 Message Date
Clonkonaut c11ca2f3c6 Airplane: added a bunch of firing modes (switchable via the interaction menu): 
Of course, kept the old two modes: bullet and rocket (boompack) firing.
Bomb dropping for dropping fused iron bombs and dynamite sticks.
Liquid spray for spraying the landscape with whatever you like (of course, with water you get a firefighting plane!).
Balloon parachuting for midair action drops!
Object dropping - drop whatever you want!
 2017-01-02 01:52:08 +01:00
Sven Eberhardt 8cd2432c58 Allow non-editor collection of objects by dialogue helper object 
Also revert Clonkonaut's crash landing into hotfix
 2017-01-01 17:00:57 -05:00
Sven Eberhardt d46f98fd7b Add EditorCollection callback 
To be used to re-route contents created/moved in editor.
 2017-01-01 17:00:56 -05:00
Lukas Werling 088fc450d9 Distribute players based on team instead of PrefPosition 2017-01-01 22:52:48 +01:00
Sven Eberhardt e015cdef8d Add basement width editor property 2017-01-01 12:46:23 -05:00
Sven Eberhardt dc9b948590 Editor: Add blit mode editor prop 2017-01-01 12:26:02 -05:00
Sven Eberhardt 52d0525886 Editor: Show proper name for default (nil) visibility property 2017-01-01 11:32:23 -05:00
Sven Eberhardt a23e4f2707 Dynamite box fixes and improvements 
* Correctly save in scenario: Dynamite count and fuses
* Allow recollection and placement of dynamite sticks
* Allow recollection of dynamite sticks into the box, in which case fuses are automatically cut
* Implement with less duplicate state (removed count, wire, wires and dynamite_sticks variables)

This also allows placement of more than five dynamite sticks from a single box by collecting more sticks after some of them are already on the wire. I don't see why not; it's fun and cannot really be abused.
 2016-12-31 22:54:43 -05:00
Armin Burgmeier f68fa47266 Fix auto-detection of SDL2_Mixer audio provider 2016-12-29 23:12:45 -08:00
Clonkonaut 8f972fd4b7 Airplane: float, to make it land on water (#1097). 2016-12-30 03:55:31 +01:00
Clonkonaut 71d5e611a4 Airplane: carry up to 20 items and 3 clonks (#1663). Also refactoring of the script. 2016-12-30 03:54:01 +01:00
Maikel de Vries 6fe22afe1a fix script runtime error in pump 2016-12-29 18:57:33 +01:00
Maikel de Vries 9b133030dc destruct airplane when crashing with low hit points 
TODO: needs visual feedback when low on hitpoints.
 2016-12-28 22:18:52 +01:00
Martin Strohmeier a16de0be0f Merge branch 'master' of git://git.openclonk.org/openclonk 2016-12-28 18:29:21 +01:00
Maikel de Vries 7a0b931c83 fix docs after GetBase removal 2016-12-28 18:23:33 +01:00
Martin Strohmeier c4ed3b56f4 Merge branch 'master' of git://git.openclonk.org/openclonk 2016-12-28 18:20:55 +01:00
Maikel de Vries 59961f3a17 remove base library 
* remove library itself
* remove GetBase()
* change flagpole, etc.
* move basematerial library to vendor
 2016-12-28 18:19:10 +01:00
Martin Strohmeier ded408701b Add Cavern.ogg to Music.ocg (Underground Music) 2016-12-28 18:18:46 +01:00
Clonkonaut 7968372dfa Crash: minor fixes: 
g_has_bought_plans was defined multiple times, the wooden cabin will be created 2 pixels lower to stop it from jittering.
 2016-12-28 14:29:21 +01:00
Clonkonaut b2d112b332 Crash: weird fix for the intro (see forum for details). 2016-12-28 14:29:21 +01:00
Sven Eberhardt 8ae8dd9c44 Add user action: Set player view 2016-12-28 08:54:01 -04:00
Sven Eberhardt f2e8bc5814 Fix basement width scenario saving 2016-12-28 08:53:59 -04:00
Sven Eberhardt ad2a0a8955 Save scenario: Ignore objects contained in ignored objects 
E.g. do not save tools carried by crew.
 2016-12-28 08:53:58 -04:00
Sven Eberhardt b0429bdbcd Add earthquake user action 2016-12-28 08:53:57 -04:00
Sven Eberhardt bdb3118309 Add missing inherited calls to structure Definiton calls 2016-12-28 08:53:55 -04:00
Sven Eberhardt 16988e76f0 Add "flip" EditorAction to structures 2016-12-28 08:50:19 -04:00
Sven Eberhardt eee156b5ac Add sequence user action to trigger other sequences 2016-12-28 08:50:18 -04:00
Sven Eberhardt 93109e60f5 Fix solid check position for earthquakes launched from local calls 
The effect is created in global coordinates, but the SemiSolidCheck was done in local coordinates.
 2016-12-28 08:50:17 -04:00
Clonkonaut 308fc37e47 Remove extinguished flames. 2016-12-27 22:51:44 +01:00
Maikel de Vries ee2f82860c put pipe at structure bottom when cutting it 2016-12-26 20:30:29 +01:00
Maikel de Vries 2392f85358 fix another c4script error when updating power network 2016-12-26 17:55:45 +01:00
Maikel de Vries aeddfd1b03 prevent bullet pack from sliding due to zero friction 2016-12-26 17:55:45 +01:00
Maikel de Vries a422c6d6ec power storage: save stored power and make editor property 2016-12-26 17:55:45 +01:00
Maikel de Vries 84d621fc5a fix script runtime error when updating power networks 2016-12-26 17:55:45 +01:00
Mark 7c2a4ee574 #1710: Fix wrong animation on ladder after wall jump 
The problem was that the call to Actmap.*.StartCallLadderOverloaded happend parallely with the ladder search effect and finished after the search effect call was finished, starting a wall jump animation after the Clonk grabbed the ladder.
 2016-12-25 19:24:10 +01:00
Mark bace3b7d2b #1710: Remove logs for debugging 2016-12-25 19:21:16 +01:00
Mark 45f98ce03a #1710: Fix the bug 
The problem was that the call to Actmap.*.StartCallLadderOverloaded happend parallely with the ladder search effect and finished after the search effect call was finished, starting a wall jump animation after the Clonk grabbed the ladder.
 2016-12-25 19:21:08 +01:00
Mark 17d6bb0e1b #1710: Logs for debugging 2016-12-25 19:21:01 +01:00
Maikel de Vries 7f1b6ac19b pumping air: fixed power need and high consumer priority 2016-12-25 19:07:26 +01:00
Maikel de Vries 525caa069a properly implement air pumping: no source needed, only pump on air need 2016-12-25 18:53:43 +01:00
Maikel de Vries 42c8dbc2c8 make producer continue directly after production finishes 2016-12-25 17:48:07 +01:00
Maikel de Vries 135a7d8aff fix support for multiple liquids in liquid containers 2016-12-25 12:48:15 +01:00
Maikel de Vries 0d0a61d4b0 change concrete production time to enable continuous pumping 2016-12-24 15:30:20 +01:00
Maikel de Vries b9aaa2fda4 pump: implement gui interface for selecting materials to pump 2016-12-24 15:12:14 +01:00
Maikel de Vries ae40126dbb implement pumping specific liquids only 2016-12-24 14:09:47 +01:00
Maikel de Vries d03ac67807 snow is not a liquid 
We can make it a liquid if we want it to be used in the foundry, or adapt the foundry. But that should be done properly.
 2016-12-24 14:09:47 +01:00
Maikel de Vries 203e8b8d1d add a test scenario for liquid systems 2016-12-24 14:09:47 +01:00
Maikel de Vries aa7eb1210e fix an error when deleting a pipe when the end is contained 2016-12-24 14:09:47 +01:00
Maikel de Vries c7afed1aeb allow pumping liquids from container (foundry and steam engine) 2016-12-24 14:09:47 +01:00
Lukas Werling 52626fe021 Fix AulCompiler leaking C4Strings with variable names 2016-12-24 00:13:02 +01:00