Commit Graph

7735 Commits (8fc57b69c39d02f951ff36d0758766a74aecd836)
 

Author SHA1 Message Date
Armin Burgmeier 12ae83cfe4 Re-initialize shaders after changing anti-alias setting (#1286) 2015-10-31 21:12:45 -06: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
Armin 9a9ab3059d Docs: Add related function "DoEnergy" to "GetEnergy".
squashed:
Correct mistake. Copied too many lines in my last commit.
Docs: Add releated function.
2015-10-29 11:24:21 +01:00
Armin 0b223be474 Docs: Correct two examples in Script GUIs. 2015-10-29 11:16:53 +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 4d85c8ffc9 fixed deleting objects at the bottom of the map (#1435)
Instead of Y - Hgt > LandscapeHeight (or, equivalently, Y > LandscapeHeight + Hgt), it was checked for Y + Hgt > LandscapeHeight, which would remove objects too early.
2015-10-26 19:05:59 +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
Julius Michaelis 5b9f4bf4d0 Fix cmake/FindGTK3.cmake (fix by Isilkor) 2015-10-21 21:56:02 +02:00
Tupone Alfredo 67558a8511 Build with jpeg-9
Gentoo bug #520884 by flameeyes@gentoo.org
2015-10-21 11:55:20 +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
Nicolas Hake 4af4c629a1 Disable Travis CI
When JCaesar dropped all Boost fallbacks, this also meant that we
wouldn't be able to build on Ubuntu 12.04 LTS anymore (because that
comes with an ancient libstdc++ which has a broken <regex>). Until we
update the Travis config to use their newer container-based build
infrastructure, there's no point having them build everything when we
already know it'll fail.
2015-10-19 16:26:42 +02:00
Nicolas Hake 5abc112a81 CMake: Split GTK3 tests into a separate module
Nobody uses pkg-config on Windows, and we already have a perfectly
viable solution for finding libraries - it's called CMake. We're still
defering to pkg-config when it exists because who knows what arcane
cflags might be required on some systems.
2015-10-19 16:11:12 +02:00
Nicolas Hake b32a539474 mape: Add the PCH object to the MSVC build
mape uses several headers from OpenClonk that are marked for
pre-compilation. MSVC does not support using headers flagged as such
without also linking to the object file that gets generated from the
compilation step.
2015-10-19 15:43:28 +02:00
Nicolas Hake 4fcd475e79 CMake: Test for existence of the mape target before manipulating it
Instead of checking whether mape's special GTK could be found, just test
whether mape is being built or not.
2015-10-19 15:41:38 +02:00
Nicolas Hake 0cfe72337b Allow CMake to find gdk-pixbuf-csource instead of using the plain name
By leaving figuring out of the location to cmake, we don't rely on it
being in the PATH when the binaries get build.
2015-10-19 15:38:31 +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
Armin Burgmeier bbdec40075 Fix a free/delete/g_free mismatch 2015-10-18 14:45:52 -04:00
Armin Burgmeier ef4ea2d931 Drop support for GTK+ 2
The minimum GTK version is now GTK+ 3.4, which is available since 2012.
It's part of Ubuntu LTS 12.04, and so should be available on any halfway
modern linux distribution.

This should allow getting rid of using deprecated GTK+ API much easier.
2015-10-18 14:45:52 -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
Sven Eberhardt 2a54409384 Fix PXS movement on moving SolidMasks (#862). 2015-10-17 22:26:34 -04:00
Armin Burgmeier 4addc62467 Open Graphics.ocg before reloading a definition (#1428)
We might need to load shader slices when reloading mesh materials.
2015-10-17 19:05:23 -04:00
Armin Burgmeier 70fd6d20bf Keep parallax objects fixed on full map screenshots (#1042) 2015-10-17 17:38:50 -04: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
Armin Burgmeier 10249d9a87 mape: fix another free/g_free mismatch 2015-10-17 13:20:19 -04:00
Armin Burgmeier ac2be1866f mape: fix an uninitialized variable in mape_disk_view_load_materials 2015-10-17 13:14:36 -04:00
Armin Burgmeier 84015e5eef mape: fix a free/g_free mismatch 2015-10-17 13:12:23 -04:00