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

169 Commits (master)

Author SHA1 Message Date
Nicolas Hake 4c5dfac952 Remove or use unused variables in Objects, System 2018-07-24 14:19:26 +02:00
Nicolas Hake 1bb728b047 Fix variable_out_of_scope warnings in Objects 2018-07-23 12:12:23 +02:00
Maikel de Vries c00a8cf3c3 fix a bunch of suspicious assignment warnings 2018-04-09 11:53:55 +02:00
Maikel de Vries b534bbb5f9 hide some more objects in editor creation list 
The burned object may be creatable, but must then be moved such that the libraries parent folder remains invisble in the editor.
 2018-03-12 22:30:02 +01:00
Maikel de Vries aa892171fb update version to 8.0 in DefCore.txt, Scenario.txt and Version.txt 2018-01-28 13:18:46 +01:00
David Dormagen 9214257424 fixed non-moving, high-velocity coconuts (#1627) 
Coconuts were C4D_Object AND C4D_StaticBack. That meant that they would save speed (e.g. by explosions?) and could hit Clonks that passed by them.
 2017-12-29 09:55:11 +01:00
Lukas Werling a4f25ecd4c Don't accidentally reattach coconuts (#1858) 
I'm not sure how exactly that issue happens, but in the attached video
it looks like C4D_StaticBack was accidentally set again. As the XOR
operation can do that, I'm changing it to always set the C4D_StaticBack
bit to 0.
 2017-12-26 20:00:32 +01:00
Maikel de Vries 5bf83b7d3f IsProjectileTarget: make failsafe if projectile is nil and clean up 2017-11-22 17:18:41 +01:00
Maikel de Vries 963285eee5 NoBurnDecay is a boolean 2017-11-11 09:49:52 +01:00
Mark 366ba86abc Fix #1940 All coconuts must be eaten! 2017-09-02 21:16:04 +02:00
Mark e20d5e87ae Library: Edible items 
All the functionality for food is bundled in one library now
 2017-07-13 21:48:36 +02:00
David Dormagen c3fbdd538a coral: added comment 
The intention of the underscore was not clear at a first glance. To avoid people thinking it's a bug and accidentally renaming it, it's commented now.
 2017-07-09 17:56:12 +02:00
Sven Eberhardt a2d6b65668 Add Title.txt for group folders in Objects.ocd and Decoration.ocd 2017-05-27 16:31:46 +09:00
Maikel de Vries 3b1ebdcdb0 do not move seaweed by tele glove or windbag 2017-04-25 20:12:44 +02:00
Nicolas Hake 7284d65685 Remove unintentional semicolon after if() 
Also changed some other instances of the if(); pattern to use an empty
block in order to suppress the new warning.
 2017-02-05 14:22:09 +01:00
Maikel de Vries 1d211c9466 fix burning and destruction of vines 2017-01-05 21:06:17 +01:00
Clonkonaut e4cfd39fdc Let plants grow less crowded, especially different kinds of plants (#1607). 
This will need some testing whether all scenarios are still playable.
 2017-01-04 03:33:28 +01:00
Lukas Werling 68ddeb3bed Convert all text files in planet to UTF-8 2016-12-11 21:19:13 +01:00
Mark d356d9db3d Fix inherited() calls 
The ... operator should be added so that the parameters are passed down. In some cases even the named parameters were not passed down.
 2016-11-26 18:57:31 +01:00
Sven Eberhardt 2b6eb83e48 Fix some parameter count errors 2016-10-24 21:28:31 -04:00
Maikel de Vries 3df960851c _inherited() for trees to access library functionality 2016-09-20 15:11:32 +02:00
Sven Eberhardt 22af9f0e8c Fix landscape placement functions (#1820, #1821) 2016-09-14 21:30:57 -04:00
Maikel de Vries 8e75b8fed9 allow branch placement in alternative materials 2016-09-03 19:38:52 +02:00
Sven Eberhardt bdbce1c4c9 Fixes and EditorProps for plant reproduction 2016-09-01 23:54:27 -04:00
Sven Eberhardt f796716655 Fix cotton scenario saving 2016-08-28 00:20:39 -04:00
Sven Eberhardt bce903ee04 Merge branch 'master' into qteditor 
Conflicts:
	planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Animal.ocd/CreatureControl.ocd/DefCore.txt
 2016-08-13 23:42:59 -04:00
Clonkonaut 52fdcec172 Renamed coconut tree (#1752). 2016-08-10 00:08:01 +02:00
Sven Eberhardt 5db45c0f47 Merge branch 'master' into qteditor 2016-08-06 21:45:19 -04:00
Clonkonaut 34af29fd7b Show quick slot item on clonk. 
All GetCarry* callbacks receive a parameter whether they are held in this slot and can then return a different display mode!

I also took the opportunity to restructure many scripts in a similar way.
 2016-08-05 01:14:13 +02:00
Sven Eberhardt 534e4cc745 Merge branch 'master' into qteditor 
Conflicts:
	src/script/C4AulParse.cpp
 2016-07-24 10:23:57 -04:00
Clonkonaut 21ea0ff777 Shrunk down texture sizes to 512x512. 2016-07-21 18:23:10 +02:00
Sven Eberhardt 36685a3119 Add HideInCreator=true to internal/helper/library definitions 2016-07-10 22:06:48 -04:00
Clonkonaut c766078b50 Added a new variation of coniferous tree by Nachtfalter. 2016-06-21 19:16:40 +02:00
Clonkonaut fd98ed3246 Fixed dimensions of coniferous burned 3. 2016-06-21 19:14:54 +02:00
Clonkonaut 72c4a55d78 Added texture to Sproutberry Bush, by Pyrit. 2016-06-21 19:14:23 +02:00
Maikel de Vries 2a731b2545 implement Components as a property lookup table 2016-05-21 13:34:34 +02:00
Maikel de Vries 1df322b7ff adapt objects and scenarios to new component implementation 2016-05-21 13:34:34 +02:00
Nicolas Hake 8e18a3fc96 Change (int)0 to nil where deprecated 2016-05-13 17:13:34 +02:00
Maikel de Vries 4d5630ab06 fix branch mesh transformation 2016-04-13 22:03:35 +02:00
Maikel de Vries 790a2fbfcc vine: spread leaf particles when being grabbed 2016-04-12 23:53:46 +02:00
Maikel de Vries 66c71b4ab8 add vine as new vegetation object 
still missing: proper graphics, leave particles which fall off
 2016-04-11 21:10:04 +02:00
Maikel de Vries 159dbf071f make ContactCalls a property instead of DefCore entry 
This allows for useful runtime changes, like disabling contact calls when an animal dies.
 2016-02-08 21:25:43 +01:00
Sven Eberhardt 1bb78ecd4f Remove some unnecessery animation weights. 
These overwrite the animations in their slots while there are no other references to existing animations in the slot.
 2016-01-28 23:47:53 -05:00
Maikel de Vries 84218d1cbc merge UsageHelp into Description 
This is better for the new interaction menu, since only the description is shown for items, but it can be longer now.
 2016-01-23 16:28:02 +01:00
Günther Brammer 00a4c6c428 Replace BorderBound DefCore value with BorderBound object property 2016-01-01 22:18:41 +01:00
Maikel de Vries 509bdac5bc remove unused Rebuy property from objects 2015-12-28 10:21:49 +01:00
Clonkonaut f0a3213a82 Fix possible nullpointer in DetachObjects. 2015-12-16 01:27:33 +01:00
David Dormagen d81e82a7b4 large cave mushroom: fixed possible use-after-deletion 
The inherited Damage() can remove the object.
 2015-12-14 20:25:37 +01:00
David Dormagen 30524f3e98 large cave mushroom: fixed reproduction 2015-12-14 20:23:12 +01:00
David Dormagen dcfb986e34 moved sounds into subfolders 
This completes http://forum.openclonk.org/topic_show.pl?tid=3215
 2015-12-13 22:14:55 +01:00