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
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 97f316a35a fix debug build 2016-04-10 09:48:42 +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 1d288575ee Stackable: Unit test for extra-slot items containing stacks. 2016-04-08 22:04:24 +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
Mark 8ece91193f ObjectInteractionMenu: UnitTest for QueryRejectDeparture, part2 2016-04-08 21:13:42 +02:00
Mark 16d0f263df ObjectInteractionMenu: Unit test for QueryRejectDeparture 2016-04-08 21:04:46 +02:00
Maikel de Vries 0d1b68dc39 balance item components and values 2016-04-08 19:17:53 +02:00
Mark 2f472fce09 ObjectInteractionMenu: Prototype for transfer of liquid items. 2016-04-08 17:32:54 +02:00
Mark 8582dcf4c2 ObjectInteractionMenu: Test for transferring inventory to the same object. 
This is a case that will usually not occur, but it may be useful for sorting stackable items in an object.
 2016-04-08 17:15:31 +02:00
Nicolas Hake aa06b3b6f6 C4AulParse: Drop unused ATT_STAR 
ATT_STAR has been rolled into ATT_OPERATOR and is no longer used
anywhere.
 2016-04-07 20:52:31 +02:00
Nicolas Hake f7c29c93e8 Tests: Add index of current test to script name for better errors 2016-04-07 20:52:30 +02:00
Nicolas Hake 3c12dafd5f MSVC: Update .natvis visualizer information 2016-04-07 20:52:29 +02:00
Nicolas Hake f963a398aa Define NORETURN annotation for MSVC 2016-04-07 20:52:28 +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
Mark 7be17fba71 ObjectInteractionMenu: Test for construction site 2016-04-07 17:29:14 +02:00
Mark 43f42dcf7f ObjectInteractionMenu: Unit test for transferring objects with extra slots 2016-04-07 06:40:48 +02:00
Lukas Werling 83f3efb5da Hot Ice: Change default configuration to small/explosive/7 2016-04-06 23:10:56 +02:00
Lukas Werling dbe913aeab Hot Ice: Leading team has to win last round to win 2016-04-06 21:45:02 +02:00
Lukas Werling be9bdc6c14 Hot Ice: Fix victory timeout 2016-04-06 21:45:02 +02:00
Lukas Werling 0d21b0b12d Hot Ice: Fix movement/fire carrying over from previous round 2016-04-06 21:45:02 +02:00
Mark 020b3fa9af Expanded test to other sources 2016-04-06 21:25:37 +02:00
Mark b62acf2c8d ObjectInteractionMenu: Unit test for single arrows getting stacked 
This revealed a bug: Transferring single arrows to the surrounding with the "transfer all button" leaves single arrows in the environment, instead of actual stacks.
Transferring them with single clicks stacks the arrows though.
 2016-04-06 21:05:17 +02:00
Mark 49be2c63fd ObjectInteractionMenu: Fixed unit tests. 
The trick was that the Clonk does not exit the object right away, but gets a drop command instead. Furthermore, it was confusing that the Collection2-callback never actually happens in this situation.
 2016-04-06 20:43:09 +02:00
Mark 9a24838e78 ObjectInteractionMenu: Repeat first test for different sources 2016-04-06 17:07:45 +02:00
Mark 7293c23cf5 ObjectInteractionMenu: Added unit test 2016-04-06 06:55:06 +02:00
Mark dfbeec20f8 ObjectInteractionMenu: More sensible use of the variables/if-clause 
The original implementation is ok, but why check the value if it would not change anyway? In the new implementation the variable lives only where it can actually change, and so does the if-clause.
 2016-04-05 21:09:04 +02:00
Mark fbfdcaf932 ObjectInteractionMenu: Extracted sounds 2016-04-05 20:59:00 +02:00
Mark 2fc89201ce ObjectInteractionMenu: Renamed variables 
Variables have the same names in both functions.
 2016-04-05 20:55:04 +02:00
Mark dc0c8b7361 ObjectInteractionMenu: Extract functions for transferring items 
Transfer of items from one container to another is handled differently between the following actions: a) select items for transfer in the inventory box; b) transfer all items with the transfer-all-arrows.

This should be made consistent, especially since action a) seems to have an unnecessary special case (marked with TODO).

As a first step the methods were simply extracted.
 2016-04-05 20:49:40 +02:00
Nicolas Hake d0c800d27a Scripted landscape: Always release surfaces back to C4Landscape 
Even when scripted landscape generation fails, C4Landscape wants its
surfaces back to work with whatever landscape may have been created from
Map.bmp.
 2016-04-05 13:50:49 +02:00