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

4714 Commits (0795d088d1f82e8d4158e4fa859bbe69e0c4c875)

Author SHA1 Message Date
Maikel de Vries 0795d088d1 stack objects with extra slots in menu iff slot contents can be stacked 2016-04-04 22:23:34 +02:00
Maikel de Vries 202f2c49df fix snowing for cloud 2016-04-03 19:11:00 +02:00
Clonkonaut fe4132309a Added a few more interaction menu buttons to the cable cars, animation to the station. 2016-03-30 00:55:49 +02:00
Mark 7e74baac55 Refactoring: Construction site takes materials, not the constructor 
The functionality of taking construction materials from a clonk and lorries was extracted to a separate function and moved from the constructor to the construction site. This is a little bit of an esthetic decision, but it is also useful for my project that has a spacebar-interaction which takes construction materials from the clonk without the need to open the inventory menu.
 2016-03-29 18:56:10 +02:00
Clonkonaut fb761fbd58 Removed parentheses after 'this'. 2016-03-29 18:17:05 +02:00
Mark 7110882813 Vendor: Extracted functions for ejection of contents 
In certain overloads of the object I want to be able to not eject contents, or eject only certain objects. The default behaviour of ejecting ALL contents whenever someone buys something is annoying in certain structures, such as a marketplace.
 2016-03-28 22:33:58 +02:00
Mark 44b643d1e3 Fix error when opening resource goal description 2016-03-28 22:33:48 +02:00
Clonkonaut e6093ee2fc Fixed possible access of a removed zap (#1665). 2016-03-28 19:21:29 +02:00
Clonkonaut 2db254b948 Updates cable cars / lorries with new graphics by pluto. Made everything work again. Integrated control into the interaction menu. 
Still needs a lot of work but I'm getting there.
 2016-03-26 00:14:20 +01:00
Lukas Werling 43177e8951 Fix rain failing to insert material 2016-03-23 16:02:36 +01:00
Maikel de Vries 26f030f18a remove airship solid mask in aerobatics after intro has finished 2016-03-23 15:24:38 +01:00
Lukas Werling 634ec69052 Fix invisible water splash particles 2016-03-23 13:32:44 +01:00
Lukas Werling c9c64a942e Improve rain drop performance 2016-03-23 13:32:43 +01:00
Lukas Werling a309f91af0 Cloud: Improve smoking condition (e.g. lava hits water) 2016-03-23 13:32:43 +01:00
Lukas Werling cb64c83bd5 Add Cloud::SetVisualRainStrength for adjusting particle rain strength 2016-03-23 13:32:43 +01:00
Lukas Werling c0275011b3 Add sound (by ala) for water and acid rain 2016-03-23 13:32:36 +01:00
Lukas Werling f5ce3dc12b Cloud: Performance optimizations around particles 2016-03-23 13:30:13 +01:00
Lukas Werling f88d0659da Add real snow to snowing cloud 2016-03-23 13:24:18 +01:00
Lukas Werling 7661b13ba6 Move particle proplist definitions to global Particles.c 2016-03-23 13:24:18 +01:00
Lukas Werling 292418a964 Add Randrian's rain hit effects 2016-03-23 13:24:18 +01:00
Lukas Werling 021ecb0b2e Integrate Randrian's rain particles into Cloud.ocd 2016-03-23 13:24:18 +01:00
Lukas Werling 4f72a276af Import Randrian's rain particles 2016-03-23 13:23:14 +01:00
Maikel de Vries 9d026da0a2 acid drilling: use new max length for pipes 2016-03-22 22:15:31 +01:00
Maikel de Vries bf1b65c8bd fix loam usage bar margins 2016-03-22 22:12:36 +01:00
Maikel de Vries 7693276a48 implement max length for pipe and show it in inventory HUD 2016-03-22 22:09:02 +01:00
Maikel de Vries fc008241cd rename LineBreak callback to OnLineBreak 2016-03-22 18:58:55 +01:00
Lukas Werling 19caa65b7b Merge branch 'sdl-gamecontroller' (pull request GH-17) 2016-03-21 16:39:28 +01:00
Maikel de Vries 8d2ab69d03 make GetDefinition work on string parameter 
This can be useful to check if a definition is loaded, ideally the implementation is moved to the engine.
 2016-03-20 09:15:35 +01:00
Lukas Werling b50a059350 Hot Ice: Add a countdown before the round begins 2016-03-18 18:11:17 +01:00
Clonkonaut dc74a2301f Mooq: Fixed mesh rotation. 2016-03-14 12:07:46 +01:00
Maikel de Vries d0ee605728 Merge branch 'hotice-rounds' 2016-03-09 21:47:44 +01:00
Lukas Werling 2236d4fa4a Hot Ice: Allow scrolling while waiting for the next round 2016-03-09 21:29:42 +01:00
Lukas Werling 3b039f8342 Hot Ice: Add scoreboard 2016-03-09 21:08:14 +01:00
Maikel de Vries 21c5f63d44 wipf: dig free is covered with earth (#1703) 2016-03-09 20:54:43 +01:00
Lukas Werling d2836bb70a Hot Ice: Add option for multiple rounds 2016-03-09 00:32:02 +01:00
Maikel de Vries 21cbf97562 fix contact calls and borderbound for mooq 2016-03-06 10:45:02 +01:00
Maikel de Vries d768e9e256 fix playing mooq sounds and move sounds to Sound.ocg 2016-03-06 10:37:29 +01:00
Clonkonaut 5801a2f133 Mooq: Applied Script Guidelines. 2016-03-05 19:02:27 +01:00
jok21 0f1b9c0891 Mooq Particle Change 2016-03-05 19:02:26 +01:00
jok21 a89ee8e51b MooqSounds 2016-03-05 19:02:25 +01:00
jok21 4c4a590ac8 Mooq 2016-03-05 19:02:23 +01:00
Maikel de Vries 9b39f2b18c fix ShuffleArray 
When taking a random element from the copy, also consider the last element.
 2016-03-05 17:27:20 +01:00
Maikel de Vries 1862161708 eject structure contents on destruction 2016-03-05 16:40:33 +01:00
David Dormagen 4465236d1b interaction menu: added contents count to "Inventory" (#1697) 
..I am open to discuss the exact design of this.
 2016-03-04 08:18:20 +01:00
David Dormagen c6dd261d05 Surrounding helper: added ContentsCount overload 
..which is a pre-requisite to showing the current / max. contents count in the interaction menu.
 2016-03-03 10:46:11 +01:00
Nicolas Hake fe91cec2b7 Merge remote-tracking branch 'github/pull/14' 2016-02-29 14:05:45 +01:00
Sven Eberhardt 65d6dd76a3 Meltign Castle: Fix item spawn after 4 minutes; add restart rule. 2016-02-21 17:36:29 -05:00
Sven Eberhardt 5963b9aed3 ItemSpawn: Add reset function to enable re-collection of item. 2016-02-21 16:56:19 -05:00
Sven Eberhardt e87ad1ecc1 MeltingCastle: Rebalance for slightly less rushing. 2016-02-21 16:31:20 -05:00
Lukas Werling 9f69c650d6 Use icons for all controller buttons 
The icons currently only show Xbox 360 controller labeling. The icon set
also includes icons for PlayStation controllers, so we could extend this
in the future.
 2016-02-21 18:27:02 +01:00