Commit Graph

4023 Commits (73a817d1ae006414d94dd032e9719a23c499b626)

Author SHA1 Message Date
David Dormagen 73a817d1ae scaffold: use interaction menu instead of ControlLeft/Right/.. and allow extensions to both sides (#949) 2015-11-01 18:22:23 +01:00
David Dormagen 57b8b0a70b buffed javelin damage
The javelin was one of the hardest weapons to use and didn't even deal a lot of damage (only slightly higher than the arrow, if not less?).
It does a lot more damage now and three javelins should kill a Clonk. Test!
2015-11-01 16:42:06 +01:00
Armin 7993e16bea Change nutritional value of sprout berry and mushroom
squashed:
mushroom: simplified calculation of nutritional value
Fix mushroom nutritional value.
Change nutritional value of sprout berry and mushroom
2015-10-30 19:19:29 +01:00
David Dormagen f3f1eb10eb wheat: made only harvestable with sickle & cast particles when harvested
According to Clonkonaut (and the Library_Crop script) it has always been intended to only be able to harvest wheat with a sickle.
2015-10-30 08:28:51 +01:00
David Dormagen 4b3db94e0b sickle: search with AtRect instead of InRect to not miss wide plants
Even when standing directly over a plant, you would sometimes not harvest it because its midpoint would be out of the Clonk's rectangle. Now the Clonk only has to touch plants.
2015-10-30 08:27:44 +01:00
Armin cb4dbc3609 Foodstuff heals the Clonk over time. 2015-10-29 11:33:31 +01:00
David Dormagen 6e00a2bd91 chine: make clear that the golden cannon only has infinite gunpowder (not ammunition) (#1432) 2015-10-28 18:53:32 +01:00
Armin 41e2bd8d6f Fix time controller ignoring custom SkyAdjust (#1311). 2015-10-27 22:52:49 +01:00
David Dormagen 58b633bea4 fixed some HUD items disappearing on GUI_Controller->Reset() (#1415)
This is a definition call. There is no valid "this". The call should go to the fresh object.
2015-10-27 18:44:37 +01:00
David Dormagen b48bb31623 inventory menu: fixed shift+click
RemoveHoles returns the amount of items removed and works in-place. Meh.
It's not required here anyway..
2015-10-26 18:44:33 +01:00
David Dormagen 0f1b48d2c6 structures: update interaction menus when taking damage 2015-10-25 15:57:20 +01:00
Clonkonaut 64d1b89f43 Added tree variations to Golden Mountain, Gold Rush and Iron Peak. 2015-10-25 14:33:58 +01:00
Clonkonaut f26a14f5ff Make sure crew isn't stuck. 2015-10-25 14:22:56 +01:00
Clonkonaut 0e191f2ed6 Fixed mesh rotation. 2015-10-25 14:21:30 +01:00
Clonkonaut 8b65e9f1e2 Fixed mesh material. 2015-10-25 14:21:19 +01:00
Clonkonaut b8e6b224ef Make sure starting lorry and the crew aren't stuck and do not fall off the cliff. 2015-10-25 14:21:04 +01:00
Clonkonaut 8cbdf137c7 Make sure the starting lorry isn't stuck. 2015-10-25 14:20:16 +01:00
Clonkonaut a01d7572c1 Merged the three new trees and the correct normals for Coniferous2 and 3 from the milestone repository.
Tree_Deciduous into Objects
Deco_Tree_Deciduous2 into Decoration
Deco_Tree_Deciduous2 into Decoration
2015-10-25 13:43:54 +01:00
Clonkonaut b17535de4b Break rope when being shot (#1339). 2015-10-24 13:12:41 +02:00
David Dormagen 7baf2bcc1c added wealth display to the buy menu (#1425) 2015-10-24 10:44:01 +02:00
David Dormagen ffe25efdfe construction site: add missing materials to interaction menu (related to #1365 and #1364) 2015-10-23 18:49:12 +02:00
David Dormagen 5266962285 interaction menu: fix script error for sub-menus without extra_data 2015-10-23 18:49:12 +02:00
Sven Eberhardt 789f910213 Clonk 'use' control: Fix nil pointer access when target object of shelved action removes itself. 2015-10-22 23:58:15 -04:00
David Dormagen 08c51288ad added smaller variation of the piranha (new Piranha texture by Matthi) 2015-10-22 10:57:14 +02:00
Sven Eberhardt c7a0f2b580 Fix post-open grid and list menu updates when opened as standalone menus. 2015-10-21 23:56:31 -04:00
Julius Michaelis f356c9053a Invert the functionality of CNAT_CollideHalfVehicle 2015-10-21 22:15:33 +02:00
David Dormagen 0a9b3ebd70 do not force ComDir when rolling (#1395)
Rolling works via SetXDir anyway, so the ComDir change is not necessary. It would just lead to issues because the ComDir would never be reset and the Clonk would keep on walking until the next key press.
2015-10-21 09:39:10 +02:00
David Dormagen f68861b80e goal menu: update only certain properties of menu to not reset tags
The background would always be reset when the menu was updated.
2015-10-20 17:14:50 +02:00
David Dormagen 2f7a0b960c goal menu: do not have pointers to objects in the menu layout anymore (#1420)
This actually led to an infinite recursion in Mine Rescue when clicking on the goal. The goal menu would link to the goal itself which would link to the elevator -> case -> elevator -> case...
Now only layout stuff is in the layout proplists.

I noticed that with multiple goals one always gets a background. But I guess that had already been the case beforehand? Anyway, that's another issue.
2015-10-19 19:07:39 +02:00
Armin Burgmeier 6dbbb0b90c Enable basic shading in non-FoW viewports 2015-10-18 17:15:18 -04:00
Armin Burgmeier 35006ee170 fix normal map lookup for meshes
This got accidentally reverted with Peter's shader reorganization.
2015-10-18 17:07:55 -04:00
David Dormagen 79b9a793f5 fixed not being able to transfer a carry-heavy object into "surrounding"
More a work-around than a fix. I didn't really dive into WHY the problem happened, but you'd always throw away a different item and not the CH one. Probably because either DropInventoryItem or GetItemPos does something weird, but meh..
2015-10-18 08:07:43 +02:00
Armin Burgmeier 676b9f895e Increase influence of dynamic light on material edges
It's somewhat experimental by now. The old behaviour can be obtained by
setting normalMapStrengthMax to the same value as normalMapStrengthMin.

I hope this helps a bit with #1418.
2015-10-17 13:36:35 -04:00
David Dormagen 1bd3354086 contents menu: changed stacking logic (#1424)
Objects now stack iff CanBeStackedWith returns true. The displayed symbol is now the first object of the stack (instead of the definition).
Also fixed barrel to not overwrite the custom name just after setting it.
2015-10-17 12:09:35 +02:00
David Dormagen a5d7f08e16 close interaction menu when clicking outside
According to Pyrit, this is standard behavior of menus in other games. And as I have no strong feelings regarding that issue, here you go.
2015-10-16 17:07:33 +02:00
Sven Eberhardt b274067746 Fix AcidRift map (#1422).
It used "^*" to match free space, including transparent pixels. However, transparent pixels aren't matched by "^*".

I think transparent pixels getting matched by "^*" was actually a bug in previous versions, which got fixed by ck's background materials implementation.
2015-10-16 00:26:43 -04:00
Maikel de Vries 0094cbe819 remove empty tutorial spawn menu graphic 2015-10-15 19:24:59 +02:00
Maikel de Vries a4ed4a9373 add option to tutorial guide to close on last message 2015-10-15 19:24:59 +02:00
Sven Eberhardt 3bf4ee2b39 TreasureHunt: Add glow to golden shovel.
Also to mark pipe area.
2015-10-14 22:29:11 -04:00
Maikel de Vries c2271f743a AI do not use shield on explosives 2015-10-14 20:58:52 +02:00
Maikel de Vries 70875e3465 let the AI attack hostile clonks only 2015-10-14 20:44:38 +02:00
Maikel de Vries e2c5158275 rename S2AI to AI
This in preparation for a more general AI (in the far future).
2015-10-14 20:44:38 +02:00
David Dormagen ba681c8ee4 fixed auto-pickup after using an item that destroys itself or exits the clonk
Steps to reproduce: put shovel on ground. take dynamite. stand on shovel. aim below you. leftclick. leftlick. => dynamite is planted AND shovel is collected.
2015-10-14 20:17:25 +02:00
David Dormagen e93630e083 interaction menu: added "close" button and unified layout of "minimize" and "close" buttons 2015-10-14 11:22:58 +02:00
David Dormagen fcf1d0d843 script guis: added tooltip for default "close" button 2015-10-14 11:22:06 +02:00
Clonkonaut f5076cedf3 Do not change picture transformation, not necessary anymore because contents are shown in extra slot (#1147). 2015-10-13 17:32:36 +02:00
Clonkonaut 86866d1d13 Skylands: Fixed various issues (#1267):
- Chest added to knowledge
- GetWind returns -100
- Removed sky pixels from starting island
- Higher spawn position
- Real description
- Goal help will point out next missing part
2015-10-13 16:04:54 +02:00
Clonkonaut ecc2d5d291 Slight adjustments prevent shape map from trapping npcs. 2015-10-13 15:20:37 +02:00
Clonkonaut b083c6454e Adjusted footstep sound to running speed (#1124). 2015-10-13 15:11:11 +02:00
Clonkonaut 03ce403002 Added gravestones to Dark Castle (#1235), minor fixes (enemy clonks' skin adjusted to gender of name). 2015-10-13 14:38:41 +02:00