Commit Graph

6976 Commits (lights3)
 

Author SHA1 Message Date
Maikel de Vries a61a91798b move DrawMaterial to map library functions 2015-08-18 12:36:59 +02:00
Armin Burgmeier dfebd7996c Make sure mape loads texture map indices as specified in TexMap.txt
What happens is that mape first loads the TexMap.txt, however adding all the
texmap entries internally fails, because the materials and textures are not
yet loaded. However, mape must first load the TexMap to see if
OverloadMaterials or OverloadTextures are present in it, to know what
materials/textures to actually load.
2015-08-17 21:52:59 -04:00
David Dormagen b3f81ef3ed increased lava damage
The lava now does not only do the damage via the fire system but also does some direct damage. Further increasing it might be good. Test it now.
2015-08-16 23:14:16 +02:00
Nicolas Hake 5ef76d63a9 Log the same shader code as is actually compiled
For whatever reason, the shader code that was passed to the compiler was
different from the code that got written to the shader log. This is a
huge pain in the ass when trying to debug shader errors because the line
information is completely wrong. I assume this decision was a premature
optimization, so I've removed it and we'll now log the exact same code
as the shader compiler sees.
2015-08-16 14:20:50 +02:00
Sven Eberhardt 0d16e67066 Order mat-tex combinations by appearance in texture map instead of by palette index when zooming map to landscape.
This should simplify insertion of new textures at arbitrary drawing orders without reassigning palette indices (the latter would invalidate all old maps).
2015-08-10 00:34:43 -04:00
Sven Eberhardt 5e03c9a8db The Raid: Minor fixes, decoration, dialogue and map adjustments. 2015-08-09 23:26:56 -04:00
Sven Eberhardt 53d1ac8eac Fix angle adjustment for instant-flight command of airplane.
It was wrong for planes flying to the left, which caused planes to fly too low in the Raid.ocs intro.
2015-08-09 23:13:32 -04:00
Sven Eberhardt 134fc2799b Do not remove looping sounds on inaudibility in OpenAL.
This caused some sounds to not play at all when the object was inaudible at the position the sound was initially launched, but then moved into view (e.g. elevator cases or the planes in The Raid).
2015-08-09 21:28:29 -04:00
Sven Eberhardt a45c5afe60 Fix mape build. 2015-08-09 19:41:16 -04:00
Sven Eberhardt f873e81bf0 Fade airplane sound pitch when motor is turned on and off. 2015-08-09 19:28:07 -04:00
Sven Eberhardt 042d00c1d2 Fade airship sound pitch when motor is turned on and off. 2015-08-09 19:04:29 -04:00
Sven Eberhardt d92df758a8 Added pitch parameter to Sound() script function and allow pitch and sound level to be modified for sounds that have already been started.
Sound() called when the instance is already running used to fail. Now, it always succeeds (also for script sync safety) but updates the sound level and pitch parameters. SoundAt has not been modified since it allows creation of multiple concurrent sound instance of the same effect without object context.
2015-08-09 18:40:42 -04:00
Sven Eberhardt 8ca07b7bc4 Fix left/right audio pan in OpenAL build. 2015-08-09 17:36:54 -04:00
Sven Eberhardt 638ed81608 Implement background material controls in Windows editor.
Also removed auto-sort from the material combo boxes (so sky is on top in both) and put true background materials (i.e. sky and tunnel) on top.
2015-08-09 13:36:44 -04:00
Nicolas Hake 8e5aed4bea Update TRADEMARK and add trademark reference to credits (#1370)
I don't like that the FMOD and Clonk trademarks are separated, but we
don't have enough space in the credits screen to do it differently.
2015-08-09 19:20:53 +02:00
Sven Eberhardt 8ec159d755 Remove some unnecessary restrictions from /script message board command (#1369). 2015-08-08 21:52:13 -04:00
Tobias Zwick 20f95bf018 buildfix for MSVC compiler 2015-08-06 20:06:13 +02:00
Armin Burgmeier cd2d525b5b Rename C4Landscape::TRANSPARENT to C4Landscape::Transparent
Some stupid windows header seems to have a #define for TRANSPARENT.
2015-08-04 23:15:52 -04:00
Armin Burgmeier ad57b5a9c9 Fix fill tool in developer mode 2015-08-04 23:15:16 -04:00
Armin Burgmeier 94ce958e4c editor: sort background textures differently than foreground textures
The sort order in the combo boxes depends on the selected material.
2015-08-04 21:39:23 -04:00
Armin Burgmeier bc177e8f8b Documentation updates 2015-08-04 21:21:24 -04:00
Armin Burgmeier 3ec53c2c40 Update GTK+ editor so that one can draw background materials 2015-08-04 21:21:24 -04:00
Armin Burgmeier 08ae643c2c Add a draw mode which shows the background 8-bit surface 2015-08-04 21:21:24 -04:00
Armin Burgmeier 0d806fbcbf Add syntax for drawing background materials with Map.c 2015-08-04 21:21:24 -04:00
Armin Burgmeier 51986b68ef Allow script functions to access background landscape
Add GetBackMaterial() and GetBackTexture(), and allow DrawMaterialQuad to
specify a background mat-tex combination.
2015-08-04 21:21:24 -04:00
Armin Burgmeier 1f6825fb4b Make solidmask not overwrite background material
Also, remove Landscape.SetPix in favor of Landscape.SetPix2
2015-08-04 21:21:24 -04:00
Armin Burgmeier c43ca4ce9a Increase maximum number of material-texture combinations to 255
This is the maximum we can do. One value is reserved for diff / transparency,
and we have 8bpp surfaces.
2015-08-04 21:21:24 -04:00
Armin Burgmeier 56d48f5300 Fix mape 2015-08-04 21:21:24 -04:00
Armin Burgmeier b8343786b6 Make MapScript create a background map
This removes the last occurence of the IFT flag
2015-08-04 21:21:23 -04:00
Armin Burgmeier 006cf68874 Some refactoring, and restore support for Map.bmp
The new behaviour that allows 255 mat-tex combinations (once we increased
C4M_MaxTexCount...) is enabled with MapFg.bmp, and then MapBg.bmp can be
used to draw IFT or other fancy things.
2015-08-04 21:21:23 -04:00
Armin Burgmeier fe74cac663 Make the C4MapCreatorS2 create background maps 2015-08-04 21:21:23 -04:00
Armin Burgmeier eb98e73b76 Introduce background map
The background landscape is generated from the background map.
2015-08-04 21:21:23 -04:00
Armin Burgmeier b1e9c3924d Make the Map field private in C4Landscape 2015-08-04 21:21:23 -04:00
Armin Burgmeier 92f3a3e749 Remove GBackIFT in favor of a lookup in the background surface 2015-08-04 21:21:23 -04:00
Armin Burgmeier bb241f49ae Duplicate getters to query landscape pixels for background surface 2015-08-04 21:20:06 -04:00
Armin Burgmeier 73e1b33e65 Make massmover and PXS not overwrite the background material 2015-08-04 21:20:06 -04:00
Armin Burgmeier 54666aeb2d Introduce background landscape
The background landscape is a 8-bit landscape which stores the material
that a particular pixel will be replaced with when it is cleared, e.g.
by digging or blasting.

This is just the groundwork for this and does not offer much advantage
over the IFT flag that was used previously for that purpose. However,
additional features such as keeping the background material/texture
fixed when loam bridges are built, PXS are incorporated into the landscape
or the massmover is moving things around can be added.

See http://bugs.openclonk.org/view.php?id=1338 for more details.
2015-08-04 21:20:06 -04:00
Armin Burgmeier edc611f3b1 Add double-sided lighting also for ambient lights 2015-08-03 22:44:04 -04:00
Maikel de Vries 5126e86315 fix wallkit in Krakatoa (#1363) 2015-08-03 20:18:54 +02:00
Sven Eberhardt 2845af7735 Fix plant placement without shape restriction. 2015-08-01 23:20:54 -04:00
Armin Burgmeier 08aaf662a9 Add support for alpha_rejection in OGRE material scripts 2015-07-31 22:50:21 -04:00
Sven Eberhardt 25e76ed60f Trunk2: Move main trunk along with front in editor mode.
Otherwise, it's impossible to move the trunk because selection is always blocked by the front.
2015-07-31 00:50:24 -04:00
Sven Eberhardt 324e89a069 Avoid trunk2 front duplication in saved scenarios. 2015-07-31 00:46:05 -04:00
Sven Eberhardt ed2e56c3fa Fix Loc_Space and allow direction parameter instead of just horizontal/vertical.
The old implementation was buggy as it would disallow the location if it had too much space (and PathFree2 returns nil). It also doesn't make sense to ask for a location that has space in either direction of a dimension because the location is not automatically adjusted to lie at the center of that space. For example, it would effectively cause fish to spawn directly at walls sometimes.
2015-07-31 00:42:01 -04:00
Sven Eberhardt 0d48105b46 Added shape library.
Also fixed some coconut tree reproduction issues.
2015-07-31 00:42:01 -04:00
Armin 0c288d3b3a Fix error when throwing spear out of the map (#1334)
Signed-off-by: Maikel de Vries <mdt.maikel@gmail.com>
2015-07-26 21:24:15 +02:00
Clonkonaut 6c57a940ec Fixed the lantern's texture. 2015-07-26 14:33:57 +02:00
Sven Eberhardt 56a21d549a Fix scenario saving of mosquito swarms. 2015-07-26 00:14:32 -04:00
Sven Eberhardt 2c77bc3ec5 Fix null pointer exceptions for lonely mosquitoes that aren't part of a swarm. 2015-07-25 22:03:06 -04:00
Sven Eberhardt d2bfdb9d4b Remove some unnecessary properties when saving free basements in saved scenarios.
Width and category were saved even on default values.
2015-07-25 20:38:45 -04:00