Commit Graph

7457 Commits (766cd3e7d6876f684984f6a5a4aeb655aabfa5e0)
 

Author SHA1 Message Date
Maikel de Vries 24e18bf7e2 fix clock countdown sound playing for all players 2015-09-09 23:09:26 +02:00
WinExploder bea2ff5731 Updated torch particle effect
squashed:
improved some technical details about the new torch fire
Updated torch particle effect
2015-09-09 19:52:38 +02:00
Maikel de Vries 1f87faded7 add clock as gui element which can be used as a countdown
Thanks to Sven2 for graphics and parts of the script.
2015-09-09 18:27:57 +02:00
Armin d5d7c07712 Add flower
squashed:
flower: fixed darker lighting on flower and made other textures work
-The other textures did not work out of the other .material files. And I have no idea why, because they seem to have been loaded. Maybe the graphic files are not loaded for materials that are not referenced from a mesh-material?
Random flower size
More flower textures
Add flower
2015-09-09 14:52:08 +02:00
Sven Eberhardt c536afefd3 Fix HUD after section change in Deep Sea Mining.
Also fixed a typo, which is a related bugfix and therefore in the same commit.
2015-09-08 23:18:53 -04:00
Sven Eberhardt 1224954e99 Ensure there's always trees in the starting area in Crash Landing.
Newbies like to burn them and then they're screwed.
2015-09-08 22:11:54 -04:00
Sven Eberhardt 5a7e110e1e Fix clonks and objects falling off airships on vertical movement (#1391).
The sub-pixel position adjustment on SolidMask movement caused much smoother visuals on objects on an airship, but at the cost of things falling down because object vertices wouldn't cross the sub-pixel barrier to the next pixel value at the same time as the SolidMask.

The smooth movement is kept for horizontal.

Also fix a bug that caused objects to be added to the SolidMask movement list twice.
2015-09-08 20:20:29 -04:00
Sven Eberhardt b126eb6c48 Add upwards nudge when stuck while trying to dig horizontally.
Falling pixels could sometimes get the clonk stuck in a 1px pit and not moving for no apparent reason.

This change also simplifies digging through earth on top of non-diggable materials such as rock by redirecting the clonk upwards when horizontal movement fails.
2015-09-08 18:23:35 -04:00
Sven Eberhardt dbe132e808 Fix clonk dig speed locking to animation.
Note this slows down dig speed. But you can optimize by using  animation canceling.
2015-09-08 18:23:34 -04:00
David Dormagen bfbca4065d inventory: fixed stacking containers displaying no stack count 2015-09-08 19:41:51 +02:00
Maikel de Vries 28fd18f2c5 do not allow carry-heavy objects to enter the crate (#1367) 2015-09-08 18:11:22 +02:00
Sven Eberhardt e444ec534c Fix script error when bucket is transferred into non-producer container.
IsCollectionAllowed is only defined for producers.
2015-09-07 23:39:35 -04:00
Sven Eberhardt a1981ddb0b Enable clicking on bucket in foundry menu to transfer all its earth without opening the bucket contents menu.
This makes building loam 502% less frustrating.
2015-09-07 21:53:17 -04:00
Sven Eberhardt 9981d6cbcc Update bucket usage and description and display a help message when using it wrong.
The description did not fit the new functionality any more.

The help message might be replaced by a smart tooltip once we have better tooltips.
2015-09-07 21:22:40 -04:00
Sven Eberhardt 9e0ef8b7b6 Fix invalid (Vehicle) map pixels in Crash Landing. 2015-09-07 20:43:57 -04:00
Sven Eberhardt 8a04eba2fb Fix Crash Landing scenario description to fit the storyline. 2015-09-07 20:40:17 -04:00
Maikel de Vries 45feecb555 clonk drops balloon if it tumbles due to external events 2015-09-07 23:18:09 +02:00
Maikel de Vries 733a864b63 adjust value of some tools and weapons 2015-09-07 22:34:53 +02:00
Maikel de Vries c115f25d8d correctly adjust balloon speed 2015-09-07 22:33:45 +02:00
Maikel de Vries 01fb44fd49 fix script error when shifting cursor with zero crew members 2015-09-07 16:55:08 +02:00
Sven Eberhardt e3213812a9 Implement GetStartupTeamCount() script function (#1246).
Returns number of teams containing active players at game start.
2015-09-06 23:29:22 -04:00
Sven Eberhardt 5f0b96d11b Fix empty controlled statement on undefined BREAKPOINT_HERE. 2015-09-06 22:56:14 -04:00
Sven Eberhardt c22157c04b Simplified implementation of StartupPlayerCount.
Setting it by player filenames in the beginning is not necessery (and wrong for invalid files). Also copying it through C4S.Head didn't serve any purpose because PlayerInfo is synchronized in network and replays and startup player count can be deduced from that.

Tested in standalone, network, savegames, runtime join and replays from standalone, savegames and runtime join (Some replays of network games were bugged but that's an unrelated error).
2015-09-06 22:31:04 -04:00
Sven Eberhardt 6b1bf6c4c7 Fix script error in crate.
Although the evidence is overwhelming, this was actually not intentional :(
2015-09-06 21:28:28 -04:00
Sven Eberhardt c77205c06c Add description to crate. (github#4) 2015-09-06 17:21:33 -04:00
Sven Eberhardt 31a3f5979f Add missing image in script gui docs. 2015-09-06 17:06:14 -04:00
David Dormagen cc3452bd0d custom guis: properly scale with font size now
Previously, the em <-> pixels conversion was a hardcoded value. Now the GUI scales with the font size that can be selected in the options.
Sadly, all scales were off since the hardcoded value was too low.
2015-09-06 19:02:31 +02:00
David Dormagen f856aa4968 interaction menu: added minimize button 2015-09-06 16:35:35 +02:00
Maikel de Vries f3f837f9a8 add trajectory preview to catapult 2015-09-06 13:47:12 +02:00
Maikel de Vries f5b7fe7498 fixed gravity calculation for trajectories 2015-09-06 13:46:45 +02:00
Maikel de Vries b20ec03832 prevent script error for Loc_Area(nil) call 2015-09-06 11:24:43 +02:00
Maikel de Vries 88eaba77e9 ensure large mushrooms are placed on soil materials 2015-09-06 11:17:30 +02:00
Maikel de Vries ef0e4ea7b7 elevator digging out objects is forwarded to clonk
This ensures earth ends up in the bucket and is not dug out.
2015-09-06 10:09:46 +02:00
Maikel de Vries 33be9d719f fix wealth display in HUD 2015-09-06 09:23:06 +02:00
Sven Eberhardt 283277ac82 Do not pre-load file contents from unpacked music folders ($1378).
Removes several seconds from startup time and ~150MB memory usage. Note that tags are still loaded so all file headers do have to be accessed.
2015-09-06 00:02:17 -04:00
Sven Eberhardt a355532b14 Crash Landing: Split dialogue message that could get cut off due to length.
I wonder why there's a length restriction anyway?
2015-09-05 22:44:38 -04:00
Sven Eberhardt cc6985dd78 Reduce starting material in HotIce to fit in default inventory slots (5). 2015-09-05 20:37:13 -04:00
Sven Eberhardt 1a9b7fa98f Fix HUD deletion of all players when one player is removed. 2015-09-05 20:37:13 -04:00
Sven Eberhardt ec0b9a0dd1 Fix deleted object usage when script gui close call is issued in response to deleted parent object. 2015-09-05 20:37:12 -04:00
Maikel de Vries d58d41e960 clean up balloon script
Was trying to solve bugs, but they are located in other scripts
2015-09-05 23:21:35 +02:00
Sven Eberhardt c73603adfb Crash Landing: Minor map and object rework.
Added some sky islands on the right to make final goal more accessible and visible.

Added some loam.

Changed some trees from Coniferous to Coniferous2.
2015-09-05 17:07:53 -04:00
Sven Eberhardt dd690e62b9 Added anti-clogging mechanism to pump.
Now pipes cycle through several offsets before giving up on the pumping.
2015-09-05 13:10:55 -04:00
Maikel de Vries 0e6c7ada15 make mushroom just collectible instead of pickable 2015-09-05 18:39:48 +02:00
Sven Eberhardt 149473a3bc Crash Landing: Add a helpful message to the merchant telling you how to sell gold. 2015-09-05 12:02:44 -04:00
Sven Eberhardt 08446bd3d5 Readded wind generator plans to The Raid.
They serve no purpose in this mission because energy requirement is turned off. However, I have seen two newbies who insisted on building them before using any buildings now, so let's just enable the plans. Building a wind generator is always a good experience because it's animated, makes sound and such.
2015-09-05 11:40:45 -04:00
Maikel de Vries 881f2f817e fixed using two grapple bows 2015-09-05 16:16:38 +02:00
David Dormagen fa40cfd64d put zooming on Ctrl+MouseWheel (from Shift+MouseWheel)
Shift is now the inventory key. Shift+MouseWheel sounds like it does have some potential, too. (F.e. scrolling through the ammunition in a bow?)
2015-09-05 11:36:27 +02:00
David Dormagen 5dcc9e387c collection: do not also pickup stuff when dropping items 2015-09-05 11:28:26 +02:00
David Dormagen 87a824b49d inventory & interaction: added Find_Layer where appropriate 2015-09-05 11:22:23 +02:00
David Dormagen 4682b6c668 script GUIs: fixed a fistful of memory leaks
There are some ownership rules (PropList::GetProperties, Ui::Element..) which are not very clear imo. But there also was at least one clear oversight (name retaining, that is).
The only issue would be an assertion firing at game exit.
2015-09-05 11:01:58 +02:00