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

617 Commits (bce903ee0434ffae24bf02c898ab456adee9ffdf)

Author SHA1 Message Date
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 1036bad7fb Added a helmet by pluto. Wear and get 20% off damage*! 
*: not all damage is reduced, does not help against explosions, fire, asphyxiation or corrosion. We assume no liability for any deaths or injuries occurred while wearing.
 2016-08-12 18:25:01 +02:00
Clonkonaut 07ea0fe438 Dynamite Box is now a container holding 5 sticks of dynamite. Can be taken out separately (and put back in). 2016-08-09 23:44:14 +02:00
Lukas Werling e6c483953a Dynamite: Make FuseTime a local to make changes possible 2016-08-08 01:43:19 +02:00
Maikel de Vries df098d2840 pump only activates when drain is free or accepts liquid 2016-08-07 21:26:23 +02:00
Lukas Werling f3b2ff1295 Merge branch 'gamepad-controls' 2016-08-07 18:10:24 +02:00
Sven Eberhardt 5db45c0f47 Merge branch 'master' into qteditor 2016-08-06 21:45:19 -04:00
Clonkonaut cb8086cff7 Try to space out two items on the back better. 
Mainly concerns scaling / hangling and it isn't perfect but better than before.
 2016-08-07 03:04:04 +02: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
Clonkonaut 8966df8310 Grapple bow: Show hook in extra slot (#1768). 
This will give you visible feedback if the hook is fired or not. Perfect for dual hook handling situations. Library_HasExtraSlot is used to show this but IsContainer returns false. This will prevent hook extraction using the interaction menu. Removing the hook from the grapple bow will cause errors (this should probably be taken care of sometime).
 2016-08-01 00:03:14 +02:00
Clonkonaut 042ee8b2e5 Changed the colours of the drain and source pipes to accommodate for people with red-green color blindness (#1757). 
The colours have been suggested by K-Pone.
 2016-07-25 18:03:44 +02:00
Sven Eberhardt 36685a3119 Add HideInCreator=true to internal/helper/library definitions 2016-07-10 22:06:48 -04:00
Clonkonaut b6ca10d11a Constructor library: Changed to search through all available knowledge and filter using an overloadable function. 
The hammer will now only construct definitions that have the callback "IsHammerBuidable". This will exclude all C4D_Structure objects that are not buildings and can't be build in a meaningful way.
Also, with the carry heavy branch I want to test adhoc built lorries (lorries as construction sites). Sven suggested this.
 2016-06-18 19:45:45 +02:00
Maikel de Vries 3620e22061 fix launching of javelins 
Bug was introduced when TakeObject changed.
 2016-06-12 11:39:11 +02:00
Maikel de Vries e004006fdc add descriptions to liquid objects 2016-06-02 13:02:25 +02:00
David Dormagen 58bb6af75a barrel: prevent entrance of arbitrary objects 
You could put e.g. tools into the barrel using the interaction menu. This would lead to a script error later, when the barrel did Contents()->GetLiquidType().
PS: And the RejectStack function is part of a private internal interface. I made that clear so the next one does not have to look it up again.
 2016-05-30 09:56:39 +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
Maikel de Vries accd897b91 rename NoComponentMass to NoMassFromContents 
This had nothing to with components, and risk of backwards compatibility is minor.
 2016-05-21 13:34:33 +02:00
Nicolas Hake 8e18a3fc96 Change (int)0 to nil where deprecated 2016-05-13 17:13:34 +02:00
Mark b96b183007 Merge 'master' into liquid_container 2016-05-01 18:54:38 +02:00
Maikel de Vries 3907281933 fix script error when striking sword (#1731) 2016-05-01 16:54:05 +02:00
Mark 853af2c155 Merge 'master' into liquid_container 2016-05-01 08:43:05 +02:00
Maikel de Vries 3f085a0532 balance grenade launcher projectiles 
Decrease their mass to prevent too much damage when having a direct hit plus explosion. Also decrease the impact of the iron bomb explosion a bit to make it less overpowered.
 2016-04-25 21:27:22 +02:00
Maikel de Vries f5a9412a35 clean up iron bomb and shrapnel scripts 2016-04-25 21:27:22 +02:00
Mark 72c7e4dd87 Merge remote-tracking branch 'origin/master' into liquid_container 2016-04-23 11:10:26 +02:00
Maikel de Vries f46f38511a add function to determine if ironbomb and dynamite are fusing 2016-04-22 23:27:33 +02:00
Maikel de Vries 85a6cdbef7 do not apply line transform to grapple hook 2016-04-17 18:11:26 +02:00
Maikel de Vries 21b7d86535 allow windbag usage while hanging on balloon 2016-04-17 14:51:30 +02:00
Maikel de Vries 1210cb7c67 invert balloon deflate controls to be more natural 2016-04-17 14:51:02 +02:00
Maikel de Vries d6e19026be fix balloon pushing by windbag (#1709) 2016-04-17 14:49:41 +02:00
Maikel de Vries 21a861fabb unstuck living object from placed wallkits (#1716) 2016-04-17 11:38:52 +02:00
Maikel de Vries fbc797aac9 fix double grapple hook 2016-04-16 16:59:40 +02:00
Mark b6b5f5a79f Merge branch 'master' into liquid_container 2016-04-11 21:23:28 +02:00
Mark 89718f35a4 Vendor: Allow rebuy 
Added a callback QueryRebuy(int for_player, object base) in the vendor library. If an object that will be sold returns true in that function then the object will not be added to the base material of the selling player.
Currently the only objects that are sellable are Diamond, GoldBar, Nugget, Ruby. They cannot be rebought, just as in the previous implementation.
 2016-04-11 21:21:41 +02:00
Maikel de Vries 9bb2de333a fix and improve grabbing onto ropeladders 2016-04-11 21:04:51 +02:00
Maikel de Vries 0d1b68dc39 balance item components and values 2016-04-08 19:17:53 +02:00
Maikel de Vries 13f0f584e8 fix not scaling with holding loaded musket (#1711) 2016-04-07 19:10:38 +02:00
Mark d474b0dd6e Merge remote-tracking branch 'origin/master' into liquid_container 2016-04-05 06:29:54 +02:00
Maikel de Vries 255429d3e0 make setting loaded public in musket and grenade launcher 2016-04-04 22:23:34 +02:00
Maikel de Vries ca265103bb do not stack loaded weapons with unloaded ones 2016-04-04 22:23:34 +02:00
Mark b00290f5f7 Vendor: Added parameter for the base that is selling the object. 
This way the barrel can sell its contents, leaving behind an empty barrel.
 2016-03-29 20:11:41 +02:00
Mark bc9538200c Merge branch 'master' into liquid_container 2016-03-29 20:06:14 +02:00
Clonkonaut fb761fbd58 Removed parentheses after 'this'. 2016-03-29 18:17:05 +02:00
Mark 1c1ea38efa Renamed the liquids IDs 
Omitted the prefix "Liquid_".
 2016-03-25 19:11:55 +01:00
Mark ed75112715 Move liquids to the folder Items\Resources 2016-03-25 19:11:34 +01:00
Mark af2e4de6a1 Improved display of the connection status of pipes 2016-03-25 18:55:22 +01:00
Mark 96468023cf Fix line not updating on disconnect 2016-03-25 18:51:18 +01:00
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