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

2078 Commits (0580132d81ec03e1391e6bf28868f3424dc36fc0)

Author SHA1 Message Date
Maikel de Vries 202f2c49df fix snowing for cloud 2016-04-03 19:11:00 +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
Lukas Werling 43177e8951 Fix rain failing to insert material 2016-03-23 16:02:36 +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 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
Clonkonaut dc74a2301f Mooq: Fixed mesh rotation. 2016-03-14 12:07:46 +01:00
Maikel de Vries 21c5f63d44 wipf: dig free is covered with earth (#1703) 2016-03-09 20:54:43 +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 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 5963b9aed3 ItemSpawn: Add reset function to enable re-collection of item. 2016-02-21 16:56:19 -05:00
David Dormagen 63655f2763 global func Decay: some cleanups & added 'delay' parameter for decay speed 2016-02-20 17:57:55 +01:00
Armin Schäfer 40016ae586 Replace old Decay methods in some animals. 
# Conflicts:
#	planet/Objects.ocd/Animals.ocd/Bat.ocd/Script.c
 2016-02-20 17:25:48 +01:00
Armin Schäfer 2893b22551 Add Decay function to Objects.ocg\System.ocg 2016-02-20 17:22:51 +01:00
Maikel de Vries 4be356f4d9 diamonds: add option to place them not in groups 2016-02-19 22:13:09 +01:00
Maikel de Vries a0a5d98700 teleglove: add callback to reject control 2016-02-19 22:13:09 +01:00
Maikel de Vries 9266157a1e clonk: don't play doubt sound when exit command fails 2016-02-19 22:13:09 +01:00
David Dormagen 3227a43b17 HUD progress bar: fixed type of GUI positioning "Top" property 
The method returns an int and we need a string. It's correct in all other places.
 2016-02-16 19:01:03 +01:00
Maikel de Vries 1b94d0fcc8 reduce javelin damage 
This way it really does what was promised in the last commit (ac8d5934), and not kill someone with 2 good throws.
 2016-02-14 18:31:39 +01:00
Mark 5224eb5b18 Goal Resource: Variable amounts of exploitation 
It is possible to set the amount of resources to be extracted with an additional parameter in SetResource() now. The default amount to be extracted is 95 percent, which is the same behaviour as before the changes.
 2016-02-11 22:16:19 +01:00
Mark 3993a41cea Goal Resource: Code comments 
Some more fine tuning, code comments.
 2016-02-11 22:04:22 +01:00
Mark 03d4662811 Goal Resource: Readability 
Made the lines more readable.
 2016-02-11 21:56:14 +01:00
Mark f122346241 Goal Resource: exploitable_units 
Renamed mat_cnt. Will make the lines more readable in the next commit.
 2016-02-11 21:50:50 +01:00
Mark 9fa4632a48 Goal Resource: ExploitableObjectCount() 
Extracted the division by blast_ratio to a function. This should help again when expanding to diggable materials.
 2016-02-11 21:42:19 +01:00
Mark a4d2edd0d2 Goal Resource: ObjectCount2MaterialCount() 
Deciphered what some of the functions are good for, since the original code is kind of cryptic. This should help again when expanding to diggable materials.
 2016-02-11 21:35:59 +01:00
Mark 50b4d6bae8 Goal Resource: AvailableObjectCount() 
Replaced the ObjectCount() calls with a function. This should make it easier to expand the script to diggable materials later.
 2016-02-11 21:20:13 +01:00
Mark d9e75aaaba Goal Resource: Improved variable names 
Renamed indices, removed unused variables.
 2016-02-11 21:06:38 +01:00