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

2304 Commits (4833f839d2922863569a8b6c8522b5f675fd042f)

Author SHA1 Message Date
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
David Dormagen c820dac7c3 classic menu style: only show count if applicable 
Otherwise, it would show "0x" for stuff where the count did not matter.
 2016-05-21 13:19:49 +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 08668ef988 do not reset last item for quick switch when selecting same slot twice 2016-04-27 21:15:37 +02:00
Lukas Werling 11904c0217 Fix Q doing nothing initially 
Both the initial “selected” and “last” inventory slots were initialized
to 0, making Q useless. Many melees give more than one item to the
player, filling up from the first slot. Having Q switch to the second
slot initially is better than doing nothing, which will never happen
later on.
 2016-04-27 19:02:54 +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
Maikel de Vries 3c267bb7dc making buying in flagpole work when flag is in non-nil object layer 2016-04-24 13:21:16 +02:00
Maikel de Vries cea685f7ea fix flickering wealth entries for non-first players 2016-04-23 22:20:01 +02:00
Mark 72c7e4dd87 Merge remote-tracking branch 'origin/master' into liquid_container 2016-04-23 11:10:26 +02:00
Maikel de Vries 06e8df86ca fix FacetBase typos 2016-04-22 23:27:33 +02:00
Maikel de Vries f46f38511a add function to determine if ironbomb and dynamite are fusing 2016-04-22 23:27:33 +02:00
David Dormagen cdcb9a5a53 power display: made text GUI_FitChildren 
.. so that small resolutions do not lead to even smaller scrollbars next to the power information. It's still not very aesthethic when it's multiline (because it's just so much text) but now it doesn't look horribly broken at least.
 2016-04-17 22:28:34 +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 b7a8b3067f correctly stop use control when clonk is attached (#1590) 2016-04-17 15:13:10 +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
Maikel de Vries 0686fdb2fc fix shift of buy menu entries when clicking an entry 2016-04-16 15:38: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 100b87af1a add leaf particle 2016-04-12 23:53:46 +02:00
Mark cf81014785 Fix: Corrected commit "Vendor: allow rebuy" 
The parameter is an object, but should be an id. This was not detected at runtime.

Fix for commit 89718f35a4
 2016-04-12 06:46:06 +02:00
Mark 8fea6827f5 Fix: Corrected commit "Vendor: allow rebuy" 
The parameter is an object, but should be an id. This was not detected at runtime.

Fix for commit 89718f35a4
 2016-04-12 06:25:22 +02:00
Mark e12dce093a Fix trees growing underground 2016-04-11 22:22:21 +02:00
Mark 8d4f6399aa Bugfix: Trees seed wrongly. 
The trees actually seeded at a very wrong place in case the property "Confinement" was not set: The area.x, area.y, area.w, area.h coordinates were specified as global coordinates, but were used as offset coordinates in PlaceVegetation.

This leads to the trees seeding underground, too, unfortunately.
 2016-04-11 22:14:20 +02:00
Mark 9cb261aac8 Bugfix: Trees seed wrongly. 
The trees actually seeded at a very wrong place in case the property "Confinement" was not set: The area.x, area.y, area.w, area.h coordinates were specified as global coordinates, but were used as offset coordinates in PlaceVegetation.

This leads to the trees seeding underground, too, unfortunately.
 2016-04-11 22:12:51 +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
Mark 43d6fcd231 Plant: Extracted a function for plant reproduction. 
The existing Seed() places plants with a random chance. This makes testing the placement tiresome, so the actual placing part was moved to the new function DoSeed().
 2016-04-11 21:21:38 +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 9bb2de333a fix and improve grabbing onto ropeladders 2016-04-11 21:04:51 +02:00
Maikel de Vries fe0440f881 reduce size of shipyard to better fit in the landscape 2016-04-10 18:00:24 +02:00
Maikel de Vries 797ce5f589 fix basement solidmask for large widths 2016-04-10 17:03:30 +02:00
Maikel de Vries 1ae5e601e4 add blast sound variations by K-Pone 2016-04-10 13:09:25 +02:00
Maikel de Vries be96d62868 move ejection pop sound to structures subfolder 2016-04-10 12:26:34 +02:00
Maikel de Vries 6bcd8fd596 implement uncash sound for buying at the vendor library 2016-04-10 12:21:41 +02:00
Maikel de Vries 79beb8de47 compactify buy menu entries a little 
This prevents unnecessary scrolling and there was a unused little whitespace.
 2016-04-08 22:09:22 +02:00
Mark 14d695f0cb Lorry: Fix dumping of liquid objects 
Dumping liquids with the lorry was one of the funnier new ideas, but it looked bad. Now the effect is awesome.
 2016-04-08 21:31:52 +02:00
Maikel de Vries 43c7e92fd8 show no power need rule in flagpole interaction menu overview 2016-04-08 21:30:29 +02:00
Maikel de Vries 0d1b68dc39 balance item components and values 2016-04-08 19:17:53 +02:00
Maikel de Vries fbb365fd65 fix playing sounds in vendor library 2016-04-07 19:27:27 +02:00
Maikel de Vries 13f0f584e8 fix not scaling with holding loaded musket (#1711) 2016-04-07 19:10:38 +02:00
Mark 733d5ccca8 Surrounding: ContentsCount() works with ID now 2016-04-07 17:32:34 +02:00
Mark 69467d3c70 Found unused function 2016-04-07 17:29:40 +02:00