Commit Graph

7651 Commits (5abc112a819ac2b0564d8dd67139b15c5b2fa4f4)
 

Author SHA1 Message Date
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
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
Peter Wortmann f0561cc150 Generate sensible normals for textures with them
Using (0,0,0) violates normalisation assumptions, which shifts the weight
between landscape and texture normals quite massively. The new normal
code should represent a "flat" texture properly.
2015-10-17 09:30:36 +01: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
Sven Eberhardt b060874732 C4MapScriptMatTexMask: Rename fg_mask and bg_mask to sky_mask and tunnel_mask.
This gets closer to what they are representing.

More precise would be fg_mask_if_bg_is_sky and fg_mask_of_bg_is_not_sky. But fg_mask and bg_mask were terribly misleading, because sky background didn't mean the material was "in front".
2015-10-16 00:24:15 -04:00
Sven Eberhardt fe05fb5b1a Fix loading of shape textures from packed groups (#1421). 2015-10-15 20:29:56 -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
David Dormagen 4556fbe011 documented GetPlayerControlState 2015-10-15 18:05:21 +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
David Dormagen 88d7e1209e producer: added hint to infinite production below menu 2015-10-13 07:35:04 +02:00
David Dormagen a6d11d67f5 custom GUI: grid layout now checks remaining row length before adding another element
Previously it was checked after adding an element. Long elements would thus be in the same row as the other elements even if they wouldn't fit. Not long elements get their own row.
2015-10-13 07:35:04 +02:00
Clonkonaut 5e93e60695 Krakatoa: Fixed description to new goal. 2015-10-12 22:58:04 +02:00
Clonkonaut b9da09de4e Krakatoa: Show goal icon depending on difficulty setting. 2015-10-12 22:53:42 +02:00
Clonkonaut 4443298b6d Goal icons added to Krakatoa and Chine (#1142). 2015-10-12 22:30:11 +02:00
Clonkonaut f6d0ccff2e Skylands: Player starting material moved into chest to not overfill clonks. 2015-10-12 21:19:55 +02:00
Nicolas Hake a5f7332c02 Remove unused feature support test macros
We know we have static_assert (and a working <regex>) because we're
erroring out of cmake if we don't, and these macros weren't hooked up to
anything anymore anyway.
2015-10-12 17:34:29 +02:00
Nicolas Hake 9f03209ed7 Stop checking for nullptr
We're already requiring the compiler to implement C++11, so checking for
nullptr support again is useless.
2015-10-12 17:34:28 +02:00
Nicolas Hake a9bf9bfc36 Remove a bunch of vestigial autotools defines from config.h
autotools by default checks for a bunch of stuff absolutely nobody cares
about. The macros removed here were stuff left over from porting the old
autotools build to cmake.
2015-10-12 17:34:28 +02:00
Nicolas Hake 7f5abcd547 CMake: Stop removing obsolete variables from cache
For one, people are unlikely to still have these variables in their
cache, and for another, if building fails, the proper solution is to
start from a clean slate anyway.
2015-10-12 17:34:27 +02:00
Nicolas Hake 85f07b1365 CMake: Always prefer system TinyXML
I don't remember why we're even shipping our own copy of TinyXML when we
aren't doing it for any other library. Maybe we should just stop that.
2015-10-12 17:34:26 +02:00
Nicolas Hake 0c1abe69f9 Get rid of FMOD
Not only is FMOD neither free (libre) nor free (gratis), the version we
support(ed) is also impossible to legally obtain anymore. So there's no
reason we should keep code around that (pretends to) support a library
nobody can use or test.
2015-10-12 17:34:26 +02:00
Clonkonaut 9580c2f58c Reset clonk's action to Walk when exiting / destroyed (#1411). 2015-10-12 17:26:09 +02:00