marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,173 Commits
27 Branches
0 Tags
318 MiB
Commit Graph

7173 Commits (Controls)
 

Author SHA1 Message Date
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
David Dormagen f05345375c fixed wrong offset in scripted GUIs when upper-board is active 2015-08-02 23:19:28 +02:00
David Dormagen 36544bd56c Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c
	planet/Objects.ocd/Vegetation.ocd/Branch.ocd/Script.c
	planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/Script.c
	planet/System.ocg/FindLocation.c
 2015-08-02 19:24:04 +02:00
David Dormagen d5f4805f18 fixed desync 
The desync was caused by PropList->GetProperties returning the properties in an arbitrary order. They are now sorted first.
The debug logs are left in place, because I assume that I will need them again and they prove to be helpful.
 2015-08-02 19:12:09 +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
Clonkonaut 5d3fc9683f Another tree by Nachtfalter: Tree_Coniferous3 2015-07-25 12:59:22 +02:00
Clonkonaut d8dcb6e73b Reverted Tree_Coniferous to old tree because backwards compability. 
New tree is Tree_Coniferous2
 2015-07-25 12:53:11 +02:00
Clonkonaut c813743018 New swarming insect: Mosquito! 
Purely for decoration (no stinging). Mosquitos are nocturnal if you ever wonder.
 2015-07-25 12:43:16 +02:00
Clonkonaut 3ce3d3604d Added Insect Swarm Library. 
Have swarming insects, today!
 2015-07-25 12:41:17 +02:00
Clonkonaut 23bbf666c6 Added placement and dying to insects. 2015-07-23 18:39:51 +02:00
Clonkonaut 0e48f2baaa New model for the loom. Animation is missing. 2015-07-23 15:09:11 +02:00
Clonkonaut 5bb56010e2 Tree Library rework, new tree added. 
Tree Library: Moved a lot of superfluous duplications from trees to the library.
Added a new coniferous tree, moved the old to Coniferous2.ocd.
 2015-07-23 14:54:38 +02:00
Clonkonaut f8b5a9fca0 Complete rework of the butterfly. 2015-07-23 13:31:23 +02:00
Clonkonaut ffe1090da0 Added Insect Library. 
Basic behaviour for insects!
 2015-07-23 13:30:35 +02:00
Clonkonaut cdb4a1b153 Convenient wrapper for Environment_Time: HasDayNightCycle, SetTime, GetTime, IsDay, IsNight 2015-07-23 12:58:19 +02:00
Clonkonaut b8652fa5ba Fixed IsNight. It never worked. 2015-07-23 12:45:01 +02:00
Armin Burgmeier a172245c1e Illuminate materials with no backface culling from both sides 
This might need adaptions in some materials, but is probably the right thing
to do.
 2015-07-20 22:11:19 -04:00
Maikel de Vries 572c582265 remove some more empty graphics 2015-07-20 18:11:16 +02:00
Maikel de Vries 73fb8cf5e1 add RandomElement function to get a random element from an array 2015-07-20 18:11:16 +02:00
Sven Eberhardt 2804375235 Deep Sea Mining: Skip intro when SCEN_TEST is set. 2015-07-19 10:16:02 -04:00
Maikel de Vries 9632ff03d8 default value (white) for object's light color (#1355) 2015-07-19 09:06:46 +02:00
Sven Eberhardt 00e2e10e33 Fix GetSurfaceVector when called near a surface. 
Parts of the function still assumed the old proplist result format.
 2015-07-18 20:45:39 -04:00
Clonkonaut 609df7df88 Added 3 libraries: Lamp Post, Lamp and Lamp Dummy 
Reworked the lantern and buildings to use the libraries.

Lamp Post: Included by buildings if lamps should hang outside.
Lamp: Included by lamps!
Lamp Dummy: Included by the dummy object that resembles the (outisde) hanging lamp.
 2015-07-18 13:14:31 +02:00
Clonkonaut 88389eb727 Added another trunk purely for decoration. 
You can walk through and hide in it!
 2015-07-14 23:29:59 +02:00
Clonkonaut fa5b8bcf53 Added "Cover" Library 
Covers are foreground objects to hide behind. Covers become invisible once your (crew) cursor is behind it, effectively turning them into a good place to hide.
 2015-07-14 23:27:50 +02:00
Clonkonaut c7c970822d Added Rectangle_IsInside 
Checks whether a given position is inside a given rectangle.
 2015-07-14 23:26:26 +02:00
Maikel de Vries 213de4b40b fix updating clonk's vertices after swimming (#1354) 2015-07-14 19:14:27 +02:00
Maikel de Vries 202666440f trunk placement onto rocks and soil only 2015-07-13 18:55:57 +02:00
Maikel de Vries 1134f287a5 branch placement onto rocks and soil only 2015-07-12 22:19:39 +02:00
Maikel de Vries f492aa5e71 FindLocation: implement material val check and wall check conditions 2015-07-12 22:18:43 +02:00
Mark ecb24dc927 CastObjects: Array 
CastObjects returns an array now, so that further function calls can be issued on the created objects.

(cherry picked from commit 184943fe6f720ba26402764bb3b182d550370e74)
 2015-07-11 17:48:14 +02:00
Mark a6bab72499 Vector Library conformity 
GetSurfaceVector() and the Coral object now use the array format of the vector library for vectors, instead of proplists.

(cherry picked from commit 03f644e56cdc99a84df57451ed1bac361c0c896d)
 2015-07-11 17:47:56 +02:00
Mark 26ed2bb206 Vector Library 
A small library for vector manipulations of arbitrary dimension.

(cherry picked from commit a180b1dce7ae93050eaef078edbe66a72d4d57d4)
 2015-07-11 17:47:40 +02:00
Mark d45cc7c95b Colored lights improvements 
Color value is now uint32_t, removed superfluous conversion to unsigned value, simplification in the shader.

Open: C4DP_Last and number of drawing passes
 2015-07-11 17:46:00 +02:00
Sven Eberhardt 9042450399 Fix DoExplosion from global context. 
Avoid null pointer and do play sounds.
 2015-07-09 01:03:34 -04:00
Sven Eberhardt 6535d1a5ad Fix gravestone inscriptions for clonks with empty death messages (#896). 2015-07-08 21:14:56 -04:00