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

310 Commits (db46507ac6913a2531d89e60158b7ddc582e0924)

Author SHA1 Message Date
Tobias Zwick f5ecd4776d new function SetLightRange (replaces SetPlrViewRange) 2015-01-02 01:06:00 +01:00
David Dormagen f89b8c8319 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Environment.ocd/Cloud.ocd/DefCore.txt
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/DefCore.txt
	planet/Objects.ocd/Libraries.ocd/PowerConsumer.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/PowerProducer.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/System.ocg/ClonkControl.c
	src/gui/C4MouseControl.cpp
	src/landscape/C4PXS.cpp
 2014-12-25 15:24:19 +01:00
Tobias Zwick 4981182cf8 Merge remote-tracking branch '_origin/master' into lights 
Conflicts:
	src/c4group/C4Components.h
 2014-12-15 21:16:40 +01:00
Sven Eberhardt 4bdd470d13 Added GetPXSCount to docs. 2014-12-09 23:37:38 +01:00
Mark 3971d60614 Match partial skeletons (#1177) 
When using AttachMesh() with the flag AM_MatchSkeleton the behaviour was changed. The child mesh no longer uses the transformation of the bone in the parent skeleton by order, but by name.
 2014-12-07 01:11:04 +01:00
Sven Eberhardt baf05264d1 Implement music fading. 
Moved music system execution from game tick execution into main application execution so music fading works when the game is paused or lagging.
 2014-12-06 18:04:55 +01:00
Sven Eberhardt 62e6da2f23 Add categories for .ogg music files that can be referenced in SetPlayList. 2014-12-06 00:06:08 +01:00
Mark 0e9c0e9be4 AttachMesh with added functionality (#1177) 
Simple implementation of matching skeletons/animations. Short description added to the documentation. More functionality to follow.
 2014-12-03 20:05:36 +01:00
Armin Burgmeier db6df15377 Add SetAmbientBrightness and GetAmbientBrightness script functions 2014-11-20 17:07:31 -05:00
Maikel de Vries 237eb98ed9 docs: fix link to GetPlayerColor 2014-10-20 22:34:55 +02:00
David Dormagen c09e9880e2 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
 2014-10-13 18:54:05 +02:00
David Dormagen a8690f0b31 documented the GUI system 2014-10-13 18:35:51 +02:00
Armin Burgmeier cbdc6040e7 Add the Anim_Dist AVP 2014-10-09 17:00:26 -04:00
Maikel de Vries 8d5d4715fe remove physical documentation 2014-10-04 09:22:10 +02:00
Sven Eberhardt abab7be591 Added scenario achievements displayed as small symbols beside the scenario name in the startup selection screen. 
They can be used e.g. to show that you have finished a scenario on different difficulty levels.
 2014-09-24 23:08:40 +02:00
Sven Eberhardt 37bf5d3bb8 Fix parameter documentation of PV_Sin. 2014-09-12 01:02:10 +02:00
Sven Eberhardt 9dd600c26b Add player parameter to SetPlayList (#1084) 2014-08-07 17:33:36 +02:00
Sven Eberhardt 5cd9b915b0 Added some dialogue functions and speaker portraits. UpdatedAddMenuItem and CustomMessage to allow more customization for picture graphics. 
I would prefer to render the models for speaker portraits directly. However, it seems like it's not currently possible to clip or render models to offscreen surfaces.
 2014-07-05 15:25:30 +02:00
Sven Eberhardt 4556cb4890 Add particle value provider function PV_Sin 2014-06-30 01:00:15 +02:00
Sven Eberhardt 6744ed942a Fix PlaceObjects material parameter description and example. (#1083) 2014-06-14 11:01:01 +02:00
Sven Eberhardt 488044f266 Added script function GetPlayerZoomLimits (#1071). 2014-05-11 11:10:13 +02:00
Sven Eberhardt 893d5e87da Implement PLRZOOM_Set flag to allow setting current zoom and limits in the same call. 2014-05-11 10:30:41 +02:00
Apfelclonk d1170374d0 Document PathFree2 and CoordinateSpace 2014-04-26 19:22:02 +02:00
Sven Eberhardt cd4b3610da Add script function SetPlayerZoom to set zoom factors directly instead of by view range (#1065) 2014-04-21 19:38:05 +02:00
Sven Eberhardt 662cb599c2 fix script errors in docs example 2014-04-20 19:32:35 +02:00
Sven Eberhardt 4266b370d6 Added script functions SetLeagueProgressData, GetLeagueProgressData, GetLeagueScore and SetLeaguePerformance. 2014-04-20 15:33:36 +02:00
Sven Eberhardt 59c59dd072 Add missing documentation for LogCallStack(). 2014-04-19 22:34:24 +02:00
Sven Eberhardt 445d759a72 Change == and != to do pointer comparison on arrays and proplists (formerly === and !==). Remove === and !=== and introduce function DeepEqual for contents comparison. 
There have been some bugs and crashes related to unwanted deep comparison (e.g. in the maze scenario). Scripters very rarely need deep comparison, so it should not be the default for the most commonly used operator.

This also changes behaviour of GetIndexOf to do pointer comparison.

This change has Guenther's seal of approval.
 2014-04-19 22:33:31 +02:00
Günther Brammer 04e1c74c05 Merge Call fix commit 2014-04-19 19:02:27 +02:00
Günther Brammer 22016e075f Replace some usages of C4ID with C4Def* 
In particular those that made the c4script shell depend on C4Id.cpp.
 2014-04-19 19:02:22 +02:00
Sven Eberhardt e704cd2ecb GetMeshMaterial called from definition context now returns default mesh materials. 2014-04-18 14:10:12 +02:00
Maikel de Vries 47fa8ef4a1 Implemented SetBase* for BaseMaterial library 2014-04-17 18:01:18 +02:00
Maikel de Vries 9b96ab2305 Cleaned up base material in library and engine 
* rename to cleaner *Base* instead of *HomeBase*
* fixed library implementation
* engine code is now obsolete
 2014-04-16 14:07:01 +02:00
Clonkonaut 7895caacd1 Changed link from GetViewMode to GetPlrViewMode (#1050). 2014-03-24 23:53:46 +01:00
David Dormagen 6b25e54f0b PV_Step: added "maximumValue" parameter 2014-02-18 20:37:43 +01:00
David Dormagen b533d3b390 particles: minor documentation fixes 2014-02-18 20:37:16 +01:00
David Dormagen bc9b5c8bd7 added documentation for PV_Gravity 2014-02-18 19:13:51 +01:00
Tobias Zwick 6d98caaa5f fix some documentation bugs 2014-01-22 14:00:05 +07:00
Tobias Zwick 4472ce3243 add documentation for a few undocumented functions 
GetMatAdjust, GetTexture, GetAverageTextureColor
 2014-01-22 13:59:03 +07:00
Tobias Zwick 266540fc76 add documentation for BlastFree 2014-01-22 13:01:45 +07:00
Sven Eberhardt 57463b61c4 Rework SolidMasks to be defined in a separate SolidMask.png graphics file instead of the main definition graphics. 2014-01-08 01:55:33 +01:00
Sven Eberhardt dd0438b55d Added helper function LogCallStack. 
Useful when you need a stack trace but don't want to break execution flow.
 2014-01-04 14:22:41 +01:00
Sven Eberhardt e157b1b673 Docs: Renamed GetPlrColor to GetPlayerColor. 2013-12-29 22:34:11 +01:00
Sven Eberhardt 49b2c75475 Added helper function Particles_Colored - creates a colored version of a base particle. 2013-12-29 15:08:52 +01:00
Sven Eberhardt a385102c36 Changed GetDefBottom to use bottom vertex to determine object bottom. 
Since this is the method also used by CreateObject, GetDefBottom can be used to recreate objects at their proper position.
 2013-12-27 17:11:02 +01:00
Sven Eberhardt 5094cc5c1b Reworked "Save as scenario" option in editor to write a script file instead of Game.txt. 2013-12-27 17:10:09 +01:00
David Dormagen a10c9316ef renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle 2013-12-17 22:32:01 +01:00
David Dormagen 02f54ba1eb removed the legacy particle system from the engine and docs 2013-12-17 22:32:01 +01:00
Tobias Zwick 325053410f rename script callback UpdateTransferZone to OnSynchronized (#220) 2013-12-17 23:16:11 +07:00
Tobias Zwick 3587c34e39 fix documentation (#848) 2013-12-17 22:20:26 +07:00
Tobias Zwick 9ffad10d51 add note to documentation of FinishCommand (#390) 2013-12-05 10:39:26 +07:00
Tobias Zwick 932853d1d8 update documentation around ActMap 2013-11-30 11:45:31 +07:00
Nicolas Hake 52fd2679cd Fix line endings broken by ecf538c, 7b9c1d5, and ceca8b8 2013-11-29 14:18:48 +01:00
Tobias Zwick ceca8b8fc7 add SoundAt function in C4Script (part of #238), document 
also, extend the documentation for Sound with previously undocumented parameters; threw out undocumented and also unused "multiple" parameter.
 2013-11-29 18:20:36 +07:00
David Dormagen 63009705ed dynamic particles: added collision function PC_Stop; added value provider function PV_Gravity 2013-11-26 21:24:55 +01:00
David Dormagen 23a3abe01e CreateParticleEx: added "amount" parameter 
fixed some minor documentation errors (mainly links)
 2013-10-10 17:19:20 +02:00
David Dormagen 82f68db9a8 dynamic particles: removed the size-parameter of CreateParticleEx 2013-10-07 20:56:57 +02:00
David Dormagen 381b744229 dynamic particles: added documentation 2013-10-07 20:56:54 +02:00
Sven Eberhardt 96d2639688 Fix documentation for GetContact() script function behavior if no CNAT value is given. 
It stated all directions were checked, but that is not true.
 2013-09-05 22:52:46 +02:00
Sven Eberhardt 49c16723a9 Change Random() on negative values to always return zero. 
Before, it would return huge, positive values (e.g. Random(-20) could produce 47384782) which leads to all kinds of trouble in script (like #968)
 2013-07-02 21:16:59 +02:00
Tobias Zwick 67e00d8a98 reintroduce position parameter in (Can)InsertMaterial 2013-06-04 20:07:43 +02:00
Tobias Zwick c4c781631f Merge branch 'master' into pumpfix 2013-05-30 22:18:23 +02:00
Tobias Zwick 131ec86b98 refactor pump done. Remaining problem: power system (usage) 2013-05-30 22:11:39 +02:00
Armin Burgmeier 695a9a88c3 Add TransformBone and SetAnimationBoneTransform script functions 2013-05-27 21:33:29 +02:00
Sven Eberhardt 183c1527b6 Added query_only parameter to script function InsertMaterial. 2013-04-28 13:57:52 +02:00
Sven Eberhardt c17080a4a2 Added no_instability_check parameter to script functions DigFree and DigFreeRect (#932). 2013-03-31 15:39:29 +02:00
Sven Eberhardt 9e9e05f492 Added GetStartupPlayerCount script function 2013-03-19 00:36:05 +01:00
Günther Brammer 2d7b472ab3 Script: GetID returns the prototype of an object, not the internal C4Def 2013-03-10 17:37:29 +01:00
Günther Brammer f120fec8a0 docs: Fix some typos found by make check 2013-02-24 14:50:12 +01:00
Sven Eberhardt 30e07f87b8 Added parameter to InsertMaterial() to return actual insertion position. 
The insertion position might be pushed upwards if e.g. water is inserted to the bottom of a lake. However, we need the actual insertion position if we ever want to modify the pump to require/produce energy depending on the vertical distance of material pumped.
 2013-02-17 18:29:44 +01:00
Gabriel 8bce48f166 Fixed parameters and text in SetGamma.xml, Schedule.xml and Effects.xml 
I also managed to get rid off the extra " automatically inserted at the end of the Schedule examples, by adding a <funclink></funclink> after the last &quot;. The string is not highlighted green now, but it not even was before.

Signed-off-by: Tobias Zwick <newton@westnordost.de>
 2013-01-02 22:45:31 +01:00
Sven Eberhardt 4c44e4cc25 Fix some docs errors in GetColor and Sort_Random. 2013-01-01 15:40:48 +01:00
Armin Burgmeier c3c148d53a Add CreateParticleAtBone script function 2012-12-29 00:06:30 +01:00
Sven Eberhardt 803b1c5197 Add documentation for GetIndexOf 2012-12-18 01:19:49 +01:00
Sven Eberhardt 16d4258b09 Added some array sorting functions to C4Script 2012-12-17 16:41:39 +01:00
Maikel de Vries 18ac902766 Removed non existing InsertMaterialAmount link in docs (#849) 2012-11-01 22:08:03 +01:00
Günther Brammer 8cf2b6adf1 Script: Call can execute functions directly 
Call(this["foo"],...) is now the same as Call("foo",...).
 2012-08-19 17:34:53 +02:00
Günther Brammer 35a0d7b6cd Script: Get/SetGravity use 1/100 px/tick^2 instead of 1/500 
The old factor was chosen because the default gravity * 500 was exactly
100. But a lot of other engine interfaces use 1/100 px/tick or px/tick^2,
and that is a common scale for scripts to work in, too.
 2012-07-15 22:42:17 +02:00
Günther Brammer 4e71af5489 Script: Add GetProperties function to get the keys of a proplist 2012-05-26 01:32:43 +02:00
Günther Brammer 9b3c3e067a Script: Remove useless SetLandscapePixel 2012-05-14 23:08:36 +02:00
Günther Brammer 1a5653d468 Script: Remove DefinitionCall. Use Call instead. 
No scripts in the repository use DefinitionCall, but in the unlikely case
that it's needed again, one can now use def->Call() instead.
 2012-05-07 21:12:51 +02:00
Armin Burgmeier 90dc9abbcd Add Anim_R as a AVP for mesh animations 2012-04-22 00:22:05 +02:00
Bernhard Bonigl 293b3f80e8 Merged diverged Controls branches 2012-04-17 18:36:14 +02:00
Bernhard Bonigl e4de68cd07 Wireframe Blitmode Documentation 2012-04-17 17:29:41 +02:00
Sven Eberhardt 88da5ef5c6 GetPlayerControlAssignment: docs 2012-04-17 17:22:42 +02:00
Martin Plicht 6df62ae41b docs: AddMenuItem: 'parameter' is any 2012-04-12 20:08:55 +02:00
Felix Wagner cce5d109ef no_dig2objects parameter for DigFree / DigFreeRect 2012-04-05 16:49:47 +01:00
Felix Wagner c7f5e11ac8 DigFree & DigFreeRect return amount of pixels dug free 2012-04-05 02:59:45 +01:00
Felix Wagner 47fcf53868 docs for CheckConstructionSite 2012-03-27 19:10:07 +01:00
Günther Brammer dfea0914a9 Merge the functions pointer branch 2012-03-09 17:42:48 +01:00
David Dormagen 5341ec1c3d removed the ignore_sky parameter of Draw*Map - now always ignores sky 2012-02-19 17:57:33 +01:00
Günther Brammer 9f180dffee Script: Remove ScriptGo, ScriptCounter, goto and the ScriptN callbacks 
No scenario uses them, and ScheduleCall provides an alternative.
 2011-09-19 21:33:05 +02:00
David Dormagen 5749053687 docs updated for the DrawMap/DrawDefMap change 2012-02-11 23:25:37 +01:00
Armin Burgmeier 3caca03a61 Fix title of GetPlrClonkSkin documentation 2012-01-29 14:39:32 +01:00
Felix Wagner 5a28794482 +GetPlrClonkSkin(iPlr) 2012-01-29 02:17:00 +00:00
Günther Brammer b80315b182 Script: Remove unused PrivateCall and ProtectedCall 2011-09-30 01:47:06 +02:00
Günther Brammer 78b6f73efe docs: Update Sound() for recent changes 2011-10-21 20:19:26 +02:00
Günther Brammer 8af0bb03be docs: Updates for Physical and Category changes 2011-10-20 00:26:22 +02:00
Armin Burgmeier b416da900e docs: add table for on_ending possibilities in Anim_Linear documentation 2011-10-03 20:17:20 +02:00
Günther Brammer 5ca85f97c5 CrewMembers are only banned from resurrection during Death callbacks (#532) 
This avoids immediate resurrection, but allows Clonks to return later in
the same round, just like they can return later in the next round.
 2011-10-02 18:47:21 +02:00
Tobias Zwick 9d67bf366e docs: documented FatalError 2011-09-18 18:16:49 +02:00
David Dormagen 49722a6a06 typo fixed 2011-09-18 10:55:01 +02:00
Günther Brammer 8a60b070d8 docs: Update Typechecks.xml for latest engine changes 2011-09-07 16:05:05 +02:00
Julius Michaelis c1123cff55 Update the visibility docs. 
Very small fix to C4Object::IsVisible
 2011-09-05 17:13:44 +02:00
Tobias Zwick 49729a61ae renamed ominous "Smooth" texture to "none", removed reference in docs to Smooth and made it 512x512 
In OC, actually every material has its predefined set of textures, so the default texturing of >=CR is obsolete. The "Smooth" texture is a relic of that which is currently only used because of the "Vehicle" material.
 2011-08-29 23:41:41 +02:00
Tobias Zwick f025edb4a9 removed Portraits 
+ CustomMessage now uses a normal picture of a definition/object
+ BigIcon is now the small (and only) "Portrait" the player chan choose
+ In future, one could of course make the max size of the BigIcon bigger
 2011-08-05 14:58:16 +02:00
Tobias Zwick 8d464c90fb docs: added documentation of gamecalls 2011-07-31 21:04:17 +02:00
Tobias Zwick ecd6de1d65 refactor: schedulecalls without object can now be made from object context 
(parameter obj is not automatically filled with this if nil)
 2011-07-31 19:27:26 +02:00
Tobias Zwick 92069bb2f8 removed undocumented ~GetCustomComponents callback and the involved hackery 2011-07-31 02:22:29 +02:00
Tobias Zwick 481a59835c docs: talk about nil for defaults. enclose nil, false and true in <code> tags 2011-07-31 01:32:02 +02:00
Tobias Zwick f45255a00f docs: fixed effects documentation (examples and functions) 2011-07-30 19:30:53 +02:00
Peter Wortmann 9d2e9fdfa6 Documented Find_OnLine, Find_ActionTarget and Find_ActionTargets 2011-07-27 01:22:43 +01:00
Tobias Zwick ef0d3ad7ea docs: fixed typo in NO_OWNER 2011-07-21 02:51:27 +02:00
Tobias Zwick a25740eddc docs: fixed missing or "fuzzy" translations in de.po 2011-07-21 01:43:29 +02:00
Tobias Zwick 11d1a1e18c docs: use NO_OWNER instead of -1 in no-owner related docs 2011-07-21 01:42:30 +02:00
Tobias Zwick 7c4b78ce85 docs: removed references to ActMap (as text file) and GetActMapVal 2011-07-21 01:37:05 +02:00
Tobias Zwick 61707480de docs: removed references to old .bmp graphics 2011-07-21 01:35:33 +02:00
Tobias Zwick 2317bb1ec9 docs: fixed a few typos 2011-07-21 01:30:15 +02:00
Tobias Zwick b8d280920e docs: finished fixing all examples and the localization thereof for fn/ 2011-07-20 16:22:07 +02:00
Tobias Zwick 3705ca8b6b docs: Portraits are obsolete -> remove documentation 2011-07-19 23:54:07 +02:00
Tobias Zwick f55a480c6f docs: sly example for IsNetwork() 2011-07-19 13:27:43 +02:00
Tobias Zwick bd13760144 docs: fixed examples and localization thereof Hostile - Sell 2011-07-17 19:41:48 +02:00
Tobias Zwick c6c2ba264e docs: fixed syntax error in COMD_None.xml 2011-07-17 19:29:15 +02:00
Tobias Zwick ca12c12f59 merge 2011-07-07 12:40:54 +02:00
Tobias Zwick 1b9f0d7ec4 docs: fixed documentation examples GameOver - GrabObjectInfo 2011-07-07 12:34:10 +02:00
Maikel de Vries d550f7c7da Differentiate between COMD_None and COMD_Stop 
Was necessary after 267ebb600481 and current abuse of FLOAT procedure. None keeps the current motion, Stop halts the current motion of a procedure.
 2011-07-06 18:13:39 +02:00
Maikel de Vries eb530c6017 Removed Defcore:Prey and OCF_Prey 
Had no use in the engine, should therefore be defined in C4Script if deemed necessary.
 2011-07-05 13:40:40 +02:00
Maikel de Vries 248f85c2eb Removed Defcore:Edible and OCF_Edible 
Had no use in the engine, should therefore be defined in C4Script if deemed necessary.
 2011-07-05 13:10:56 +02:00
Tobias Zwick d8f7971026 docs: fixed documentation examples Call - FreeRect 2011-07-03 15:44:10 +02:00
Tobias Zwick 9f3824f484 docs: fixed documentation examples _inherited - C4V_String 2011-07-03 04:01:19 +02:00
Tobias Zwick c5d13af963 docs: LaunchLightning version OC 5.1 -> 5.1 OC 2011-07-02 23:45:54 +02:00
Tobias Zwick 1958e1f959 got rid of SkyPar_Keep (now: nil). See docs. 2011-07-02 23:44:53 +02:00
Tobias Zwick 75da7fdc18 removed references to function "Activate" 2011-07-02 22:58:06 +02:00
Tobias Zwick 21b722475e docs: constants are not displayed with brackets in the documentation anymore 2011-06-30 17:25:22 +02:00
Tobias Zwick 83e52fe2cf docs: fixed examples in fn/ SetShape - WildcardMatch 2011-06-30 14:23:24 +02:00
Tobias Zwick 3a96d7c7b9 docs: put all version numbers to OC 5.1/5.2 and removed references to older 
versions for single parameters (f.e. "From 4.9.5.1.")
 2011-06-30 12:52:55 +02:00
Tobias Zwick cdac6945b6 docs: replaced all c4s,c4d,c4g,c4m,c4p,c4i,... with their oc* counterpart in the documentation 2011-06-25 15:31:29 +02:00
Maikel de Vries a10d1ad5ac Script: Removed obsolete Completion callback 
Already marked obsolete in the docs for quite a time.
 2011-06-10 16:31:00 +02:00
Günther Brammer f97cde74c3 Split C4V_Any into C4V_Nil for the data type and C4V_Any for the typecheck 2011-05-09 14:37:28 +02:00
Günther Brammer 177b085271 Script: SetPlrExtraData and SetCrewExtraData can store strings 2011-05-02 23:01:19 +02:00
Günther Brammer 6df452c5e9 Merge c4script-standalone branch 2011-03-07 21:42:59 +01:00
Günther Brammer c009851ce2 Script: Remove unused category parameter from GetDefinition 
While at it, also remove it from the internal function and a bunch of dead
code from C4IDList.
 2011-03-07 21:26:56 +01:00
Julius Michaelis adcd954605 Remove GetSystemTime from the docs 2011-03-05 16:06:01 +01:00
Günther Brammer a63851592c docs: Plane and Parallaxity 2011-02-18 23:37:13 +01:00
Julius Michaelis 1988ec6e8d docs: Removed orphaned ObjectCall-Funclinks. 2011-02-17 12:08:57 +01:00
Günther Brammer 608040e7e5 docs: AddEffect return a proplist 2011-02-13 20:34:05 +01:00
Günther Brammer b2bf7ffda4 objects: Remove Build and Construct command 2011-01-04 00:47:31 +01:00
Günther Brammer 8843950662 objects: Remove a bunch of resorting functions that will be obsoleted by Planes 2010-10-12 22:32:25 +02:00
Günther Brammer 4588c797eb docs: Slight rewrite for the actmap-as-proplist change 2011-01-02 01:11:30 +01:00
Maikel de Vries 8a200ba706 Engine: Removed all specific line behaviour 
This can be implemented in C4Script very easily.
Removed OCF_LineConstruct, ObjectComLineConstruction, Defcore LineConnect, Line types, Line related IDs.
Changed LineAttach, is now a property of the object to which the line should be attached.
Updated documentation.
 2010-12-21 19:22:06 +01:00