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

9195 Commits (liquid_container)
 

Author SHA1 Message Date
Mark dd99b2c4c3 Fixed line break 2016-03-25 18:28:10 +01:00
Mark c0245be627 Merge: Changes from merge conflict 2016-03-25 17:20:54 +01:00
Mark dd7bf3e89e Merge remote-tracking branch 'origin/master' into liquid_container 
Conflicts will be merged in the next commit:
	planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/PipeLine.ocd/Script.c
	planet/Objects.ocd/Items.ocd/Tools.ocd/Pipe.ocd/Script.c
 2016-03-25 17:15:39 +01:00
Mark db061b5cad Refactoring: Simplified script. 
Unit tests still pass.
 2016-03-25 16:31:17 +01:00
Mark a34eea41dc Power: Fixed unit test 21 2016-03-25 16:24:43 +01:00
Mark c0b783c976 Power: Fix unit test 20 2016-03-25 16:13:11 +01:00
Mark 6b7dc6015d Liquids: Fix liquids entering Clonks 2016-03-25 16:12:02 +01:00
Mark 74ce1ea8ac Stackable: Unit test for barrel entering Clonks via interaction menu 2016-03-25 15:16:03 +01:00
Mark b491260fac Refactoring: Producers: Removed another special case from IsCollectionAllowed() 
This special case was handled by the fact that liquid items are components anyway, and the ice object is handled differently.
 2016-03-24 22:26:09 +01:00
Mark 0ef237988e Refactoring: Producers: Removed special case in IsCollectionAllowed() 
The special case can be handled in RejectCollect(). Unit tests passed.
 2016-03-24 22:20:55 +01:00
Mark ff89f337de Refactoring: Producers: Readability 
Renamed some parameters and variables
 2016-03-24 22:16:08 +01:00
Mark 9298d27719 Producers: New test for collection 2016-03-24 22:04:53 +01:00
Mark 29870b5e6d Producers: Code formatting 2016-03-24 21:28:09 +01:00
Mark 1f25fa2679 Producers: Additional unit tests 2016-03-24 21:20:49 +01:00
Mark e3a991bb86 Producers: Additional unit tests 2016-03-24 20:45:48 +01:00
Mark 898530ed37 Producers: Additional unit tests 2016-03-24 19:40:34 +01:00
Mark 9645b4afe9 Producers: Additional unit tests 2016-03-24 19:17:21 +01:00
Mark fc3d6a69f0 Producers: More unit tests for basic operation 
Added tests for adding to the queue and clearing the queue. The other tests are dummies for now. Found out that the parameter 'abort' in ClearQueue() was never used.
 2016-03-24 18:27:23 +01:00
Mark 18ad5894e2 Producers: Producers can convert ice to water 
This special case is a relic, because I do not know whether this is actually a use case that is required in a scenario. All unit tests in the producers test pass now.
 2016-03-24 16:19:15 +01:00
Mark 332b899c54 Barrel: Fixed barrel liquid ejection 
The barrel did not eject liquids with the correct angle when using the barrel, because the parameters were not used by the liquids.
 2016-03-23 20:18:08 +01:00
Mark 02b8cf8422 Barrel: Fixed barrel getting filled with liquids 
Barrels was not updating, and caused an error when getting filled with liquid.
 2016-03-23 20:11:23 +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 7d1109cef7 Merge branch 'weather' (close GH-12) 2016-03-23 13:35:07 +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 d6b963d321 remove unused LineMaxDistance property 2016-03-22 22:26:46 +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 dc1e828cfb add callback OnLineChange when line changes its vertices or vertex positions 2016-03-22 21:53:32 +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
Lukas Werling 21fd0805d0 Merge branch 'gtk-mousegrab' (pull request #18) 2016-03-21 16:27:24 +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
Mark 8298bc789f Producers: Unit test for continued production 
Made test 7 more specific: Production must be halted, material must stay.
 2016-03-19 11:49:50 +01:00
Mark 3ad6cb2177 Producers: Unit test for halted production 2016-03-19 11:41:49 +01:00
Lukas Werling b50a059350 Hot Ice: Add a countdown before the round begins 2016-03-18 18:11:17 +01:00
Mark 274379ddc3 Producers: Fixed unit test 5 
Added unit test 6 for fuel objects that do not behave correctly. Fuel should always return the current fuel amount if not parameter is passed.
 2016-03-18 17:44:51 +01:00
Mark d06f62398c Object Interaction Menu: Implementation should be discussed 
There is one special case in the object interaction menu that should be handled by stackable already. Marked it with "TODO".
 2016-03-18 17:20:00 +01:00
Mark 1d8163e3f2 Producers: Unit tests for fuel objects 2016-03-18 17:18:33 +01:00