Commit Graph

1543 Commits (722a5ad448a84bd0c70451074f233d226073fd79)

Author SHA1 Message Date
Sven Eberhardt de7db461fa Fix cave reverb in multiplayer (#1397). 2015-09-13 01:03:26 -04:00
Sven Eberhardt 4e56d94f6f Show interaction menu for crate. 2015-09-13 00:27:14 -04:00
Maikel de Vries 329eaac691 fix foundry collection zone 2015-09-12 22:37:21 +02:00
Maikel de Vries e94af5b87c remove moving flag markers on border crossing
This can for example lead to infinitely moving markers when a border crossing rule is active, and the flag markers move from left to right for ever.
2015-09-12 20:51:16 +02:00
Julius Michaelis 0df19491e7 Get rid of incorrect sRGB headers in png files.
libpng >1.6 keeps nagging because of that.

Quick bash script to do so:
find . -name *.png \
| while read f; do
	n=$(pngcrush -ow -rem allb-reduce "$f" 2>&1 | grep -c 'incorrect sRGB');
	if [[ $n -gt 0 ]]; then
		git add "$f"
	else
		git checkout "$f"
	fi
done
2015-09-12 21:27:53 +09:00
Maikel de Vries ad95a39a1c prevent bubble from growing infinitely large 2015-09-11 23:15:23 +02:00
Maikel de Vries 17d59de20d fix pilot check in airplane for NPCs 2015-09-11 21:25:45 +02:00
David Dormagen 673243c9dd properly handle QueryRejectDeparture everywhere (#1382) 2015-09-11 21:08:38 +02:00
David Dormagen eda0f80a46 added description to Clonk to prevent displaying (null) in buy menu 2015-09-11 20:51:03 +02:00
David Dormagen 30bb5c15a7 moved Bubble sounds to global Sound.ocg folder and also made their names match our naming convention 2015-09-11 20:21:26 +02:00
Maikel de Vries 9dda8d34dc fix splitting of lava bubbles 2015-09-11 20:02:09 +02:00
WinExploder 775820fd92 new alien meteor effect and adjusted meteor light
squashed:
alien meteor: removed commented out stuff in script
Added new particle effect for AlienMeteor
Added missing particle for Alien Meteor :x
Changed meteor light
2015-09-11 20:00:23 +02:00
Maikel de Vries 829837c881 fix loosing balloon on tumbling and reject dropping while hanging 2015-09-11 19:16:13 +02:00
WinExploder f35a46c61f added BoilingLava and BoilingAcid environmental rules
cleaned up boiling lava and boiling acid rule
-Made them adhere to the C4S guidelines, renamed some IDs and made some stuff in scripts more readable.
Prettied up the scripts for the boiling liquid environmental rule
Changed Bubble Behaviour slightly
Und nochmal weil's so schön war
Added BoilingAcid which causes bubbles to rise from Acid on the map
Dark bubbles are explosive
Added boiling Lava environmental rule
2015-09-11 19:08:10 +02:00
Maikel de Vries 358d282ec2 do not perform QueryRejectDeparture when pressing movement keys 2015-09-11 19:04:50 +02:00
Armin Burgmeier f3da8525d0 Prefix most shader defines with "OC_" 2015-09-10 19:45:43 -04:00
Clonkonaut d98134332c Carry heavy objs draw special pickup symbol when holding Shift. 2015-09-11 01:08:54 +02:00
Sven Eberhardt 5b6ba5d980 Fix nil pointer in inventory HUD when inventory slot count of active target is reduced. 2015-09-10 18:52:49 -04:00
Sven Eberhardt 3b522e86ac Fix script error and broken animations in catapult if left and right direction control is given in the same frame. 2015-09-10 18:35:04 -04:00
Sven Eberhardt fe0b85870c Fix division by zero in HUD on undefined health and breath values. 2015-09-10 18:35:04 -04:00
Sven Eberhardt a0deca27b6 Make HUD controller reinitialization after section change more failsafe. 2015-09-10 18:35:03 -04:00
David Dormagen f333df2c73 always show interaction menu for pump & structures in general
The HasInteractionMenu callback of the pump was eaten by the merge. I checked.
2015-09-10 18:23:44 +02:00
Sven Eberhardt e440df645b Fix initial object selection and cycle order when picking up objects.
The check for initial selection was broken because GetIndexOf does not return nil when the index is not found. It returns -1.

The previously intended logic (that never worked) of selecting in direction of the clonk view first may sound intuitive, but is weird in practice when you're standing just on top of an object that is 1px behind you and it selects an item very far away instead. It's particularly counter-intuitive when picking up objects out of the earth while scaling.
2015-09-09 22:51:58 -04:00
Sven Eberhardt 9db8adf44e Add flowers to The Raid.
Also made the rotatable.
2015-09-09 21:24:38 -04:00
Sven Eberhardt 0751a55218 Fix flower skin (the yellow flower skin was never set) and improve flower scenario saving.
Randomized flower colors are not saved in the scenario. Explicit skins (via SetSkin) and custom skins (via SetMeshMaterial) are saved.
2015-09-09 21:09:36 -04:00
Sven Eberhardt 261bef7120 Ignore invisible objects for interaction menu.
They were creating invisible tabs, which was a bit weird.
2015-09-09 19:46:55 -04:00
Clonkonaut b4905b2bcf Rework of Carry Heavy Objects: Pick up with Shift.
No more interaction necessary!
2015-09-10 01:17:44 +02:00
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 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
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
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
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 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