Commit Graph

476 Commits (a035239406d18ee9bb9114e3ed7681ba8cfb9229)

Author SHA1 Message Date
Armin 31371bcc82 Docs: Fix mistake in map scripts. 'Op=checkerboard' was missing. 2015-11-07 11:22:52 +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 4556fbe011 documented GetPlayerControlState 2015-10-15 18:05:21 +02:00
Sven Eberhardt 47e422f452 Rework and document texture shapes.
* Renamed from material shapes to textures shapes
* No per-texture, so the same material can use different shapes with different textures
* Load a shape image instead of text file with vector components
* Allow texture sizes that are not multiple of the map zoom
* Add minimum overlap parameter to draw shapes only when the given overlap is reached.
2015-10-09 00:16:24 -04:00
David Dormagen fa1e86f2ae docs: added fuzzy logic to "library" folder 2015-10-05 14:50:02 +02:00
David Dormagen cb58bed40e fuzzy logic library: changed interface & added documentation
The interface now follows the Shape library's interface.
2015-10-04 18:38:05 +02:00
Armin 5a2bfe40a6 Docs: Map.c examples: Replace DrawSulphur with DrawFirestone. 2015-10-01 18:46:35 +02:00
Sven Eberhardt 17e0e2f423 Add breaks between music. 2015-09-30 22:50:18 -04:00
Sven Eberhardt 62c3d13ece Document InitializeAmbience. 2015-09-28 20:20:57 -04:00
Sven Eberhardt 3f6cacade4 Add parameters to Music and SetPlayList to resume a piece from where it was last interrupted. 2015-09-27 20:58:37 -04:00
Sven Eberhardt 766cd3e7d6 Fix default map zoom in docs (#1409). 2015-09-27 16:12:17 -04:00
David Dormagen 052e0358d9 script guis: document and give example for names starting with underscores 2015-09-27 18:34:18 +02:00
David Dormagen cd9c0717c9 document new GUI_NoCrop effect on text 2015-09-26 08:33:20 +02:00
Sven Eberhardt 88167a03a8 Add support for hidden scenarios.
If C4S.Head.Secret is set and mission access to the scenario has not been gained, it is hidden in the scenario selection list.
2015-09-24 23:51:16 -04:00
Maikel de Vries 0cf664e5d9 fix dead link in Anim_Linear documentation 2015-09-20 20:29:34 +02:00
Sven Eberhardt 95da770892 Move GetDefWidth and GetDefHeight script functions to engine.
They started to appear in script profiler runs and the GetDefVal-implementation is very inefficient.
2015-09-19 21:22:55 -04:00
Armin Burgmeier 653680b296 Revert "Add Scale parameter in materials"
This reverts commit 8ef1f908cc. This seems to be
a performance bottleneck on some graphics cards and/or drivers. Clonkonaut
reports issues with a Radeon HD 7800.

This feature is not vital since textures can always be drawn such that they
tile properly at 512x512. While that particular problem with the Radeon card
could probably be worked around, it's just not worth it.
2015-09-19 17:26:46 -04:00
Armin Burgmeier 8ef1f908cc Add Scale parameter in materials
This allows to scale textures up or down from their initial size, allowing
them to tile at intervals other than 512x512.
2015-09-19 10:48:28 -04:00
Armin Burgmeier 8e2ad1fb33 Fix property name "LightOffset" in SetLightRange docs 2015-09-16 21:55:33 -04:00
Sven Eberhardt b683e47499 Add LightOffset property to allow light sources to origin from locations other than the object center. 2015-09-16 21:14:08 -04:00
Mark 722a5ad448 Explode: DoShockwave
Added the global function DoShockwave. Updated documentation. Changed the way explosions deal damage: Every object at the center of the explosion gets full damage. Every object inside the explosion radius gets half damage.

(cherry picked from commit 22298a6d1389b5344ebe7aea56f3c371b5ad845f)

Conflicts:
	planet/System.ocg/Explode.c
2015-09-13 13:01:28 +02:00
Mark 15056b823f Explode: Damage override
Added damage override parameter to the explosion functions. Updated the documentation as well.

(cherry picked from commit 59f802c2d3f269d54c12489ac9659ee3ca57a857)

Conflicts:
	planet/System.ocg/Explode.c
2015-09-13 13:01:24 +02:00
Armin Burgmeier a40792013f Add "AttachNumber" parameter to AttachMesh
This allows to create nested definition-based attached meshes.
2015-09-12 19:57:00 -04:00
Maikel de Vries e64534b201 document ignore_ocf parameter of Collect 2015-09-12 22:37:21 +02:00
Sven Eberhardt 75d0eba402 Document attach_number in several animation-related script functions. 2015-09-12 12:26:03 -04:00
Sven Eberhardt 6face464aa Document attach_mesh parameter of the PlayAnimation function. 2015-09-12 11:07:20 -04:00
David Dormagen cd82b41c06 particles: added CollisionDensity to specify with which kind of material a particle will collide 2015-09-12 10:53:23 +02:00
Maikel de Vries 0610cbda7d document object layer setter and getter 2015-09-10 22:31:51 +02:00
Sven Eberhardt 3723024e2f Added implicit layer check to local calls of FindObjects-family functions (#1383).
Also fixed some docs links. Note that GetObjectLayer and SetObjectLayer are still not documented.
2015-09-09 20:19:45 -04:00
Sven Eberhardt e3213812a9 Implement GetStartupTeamCount() script function (#1246).
Returns number of teams containing active players at game start.
2015-09-06 23:29:22 -04:00
Sven Eberhardt 31a3f5979f Add missing image in script gui docs. 2015-09-06 17:06:14 -04:00
Maikel de Vries a9ac4b0ea7 fix dead link in GetStartupPlayerCount docs 2015-09-04 23:20:02 +02:00
Sven Eberhardt 84fbff95a8 Add Find_Property. 2015-09-02 23:55:45 -04:00
David Dormagen ac738735b2 Merge branch 'master' into Controls
Conflicts:
	planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c
	src/game/C4Game.cpp
	src/game/C4GraphicsSystem.cpp
	src/gamescript/C4GameScript.cpp
2015-09-02 08:19:34 +02:00
Sven Eberhardt 6ab6a1ac3c Add script interface for some EFX sound modifiers. 2015-08-27 21:44:23 -04:00
Armin Burgmeier 1827ed53ca Enhance mapscript functions for use with background materials
Add GetBackPixel, GetDefaultBackgroundIndex, GetMaterialTextureIndex, and make
SetPixel accept a background color.
2015-08-18 19:20:36 -04: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 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
Armin Burgmeier bc177e8f8b Documentation updates 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 b8343786b6 Make MapScript create a background map
This removes the last occurence of the IFT flag
2015-08-04 21:21:23 -04: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
Sven Eberhardt 0d48105b46 Added shape library.
Also fixed some coconut tree reproduction issues.
2015-07-31 00:42:01 -04: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
Armin e135a74189 Docs: Remove some dead hyperlinks leading to deleted functions. And remove the Alpha entry in Material (ocm).
Signed-off-by: Maikel de Vries <mdt.maikel@gmail.com>
2015-07-08 22:29:55 +02:00
Sven Eberhardt df0c2b9921 Document precision parameter of GetX and GetY.
Also update wording on SetPosition precision parameter documentation.
2015-07-04 11:30:24 -04:00
Sven Eberhardt 723d3c6df9 Document precision parameter of SetPosition() (#1348) 2015-07-04 11:10:41 -04:00
Mark 02fd798631 Colored lights
The color of object lights can now be changed. This includes the following changes:
- added light test scenario, based on DarkCastle, with some lights,
- new functions SetLightColor() and GetLightColor() with C4Script documentation,
- third drawing pass for rendering the light color, the drawing passes are now referenced by enum,
- the blending of light from multiple colored light sources works correctly with alpha blending,
- light color value affects the intensity of the light,
- alpha blending of the light depends on color value and lightness. This means that brighter (= more value) and lighter (= more whiteish) light will be preferred in blending over other lights,
- the object light color is rendered to the lower half of the fow light texture now,
- the shader accesses the brightness/direction information and color information correctly,

The patch was created from the following commits:
dab898a SetLightColor()
f57286e Color texture experiment
d0702f5 Dynamic color
fa14cdf Light test scenario
f99203d Alternate lights
474bade Bugfixes
3113698 Brightness handled better
516fb21 GetLightColor
1d91ec9 Improvements
3cfbf6c Documentation
95ec185 Improvements: Light Shader
a63bffc Scope of alpha
20c7ca0 Improvement: C4FoWLight
17d9123 Undo code style
d79411b Cleaner code

(cherry picked from commit 36dec610e36860b88417e91ce727250673bc2ec2)

Conflicts:
	src/landscape/fow/C4FoWRegion.cpp, merged
2015-06-28 21:28:40 +02:00