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

5868 Commits (fe04a0fe793b5f6e0db76381b5a1d624517322b5)
 

Author SHA1 Message Date
Günther Brammer 52dbf8e585 Revert "Use pkg-config to get linker flags for SDL_mixer" 
This reverts commit 9941388526.

The breakage was just due to me using an outdated library list.
 2014-05-12 02:24:19 +02:00
Clonkonaut a5040fe0ad Fixed potential crash in certain doomsday scenarios. 2014-05-11 22:04:51 +02:00
Sven Eberhardt 68c297c210 Sorted decoration from scenarios into main decoration folder. 2014-05-11 16:27:13 +02:00
Nicolas Hake 69ba06b8d0 Move C4Aul code into separate subdirectory 2014-05-11 16:17:48 +02:00
Sven Eberhardt 148e27ebce Minor changes to HeartOfTheMountain 
* starting platform area increased
* recreate tools instead of just moving them into clonk's inventory on respawn (to help with burned grapple bows)
* spawn clubs instead of swords [Maikel]
* do not kill clonk on Ctrl+F9
 2014-05-11 15:49:18 +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
Sven Eberhardt cd8ab67c14 Copy static variables assigned in Objects.c to the scensario script to avoid problems in savegames. 
Static variables in Objects.c are problematic because Objects.c is deleted in savegames.
 2014-05-11 10:09:11 +02:00
Sven Eberhardt 93ea6cb6c2 DarkCastle: Fixed object duplication and solidmasks in some decoration objects 2014-05-11 10:02:04 +02:00
Sven Eberhardt c267ae39e0 Added IceHit sounds, which is slightly less plingy than the gem hit sound. 
I didn't like using the GlassHit sounds because having the same sound for ice and gems makes the latter feel less unique and valuable.
 2014-05-10 18:41:09 +02:00
Sven Eberhardt ba23c6e022 TreasureHunt moved from experimental to missions 2014-05-04 19:19:45 +02:00
Nicolas Hake 0f48e0c4b9 Aul: ExtraWarn when turning a fn varargs in body 
Par() calls and '...' in function calls make functions take varargs
without this being obvious from the header. ExtraWarn about this so people
who care about it can add an ellipsis to the parameter list.
 2014-05-04 17:15:43 +02:00
Nicolas Hake 8ab7a83e3b Aul: Allow '...' as final parameter in func decls 
Accepting an ellipsis as the final parameter in a function declaration
makes it immediately obvious that the function can take a variable number
of parameters
 2014-05-04 17:15:42 +02:00
Sven Eberhardt 6040dde80a Cleaned up airship: Extra graphics object and unnecessary timers removed. 2014-05-04 14:16:46 +02:00
Sven Eberhardt 91db5d33c2 Added SolidMaskPlane property. 
If an object moves and other objects are attached to its SolidMask, only objects in front of this plane are moved along with it. Defaults to Plane if zero.
 2014-05-04 14:16:46 +02:00
Sven Eberhardt 4f43da9999 Fix SolidMasks defined in DefCore.txt for objects with mesh graphics. 
There were a few leftover checks from when SolidMasks could only be defined for definitions with bitmap graphics.
 2014-05-04 14:16:46 +02:00
Julius Michaelis 1b1fa1643b Fix grenade launcher ammo check 2014-05-03 21:03:19 +02:00
Nicolas Hake 48c1f387f0 Require semicolon after 'do' loop 
This makes C4Script consistent with C-based languages, and current usage
on master shows that in the majority of cases, the author expected to have
to place a semicolon after the loop anyway.
 2014-05-03 10:07:41 +02:00
Clonkonaut e3bf5110ed Fixed restart rule (#1072). 2014-05-02 02:04:04 +02:00
Clonkonaut d70f8e1de2 Removed 4 lines of useless code. 2014-05-02 00:53:56 +02:00
Clonkonaut c35c352c46 Fixed clonk freezing in mid-run when building loam bridges (#943). 2014-05-02 00:52:20 +02:00
Clonkonaut 5f2c9ca8cb Merge branch 'master' of ssh://git.openclonk.org/openclonk 2014-05-02 00:03:05 +02:00
Clonkonaut 964e1a138a Deathmatch goal ends game when all but one player (or team) leave (#893). 2014-05-02 00:01:21 +02:00
Sven Eberhardt 79edc9917a Fix crash on DugOut callback if an unloaded definition is referenced in material Dig2Object. 2014-05-01 17:15:14 +02:00
Clonkonaut bf0d6b7176 Reactivated EditCursorModeToggle key (formerly Space) now set to no key. 
Can be set in KeyConfig.txt as requested by Sven2.
 2014-05-01 01:17:58 +02:00
Clonkonaut 3d224c1207 Added new callback: DugOut(object object_by). 
Called in a new object that is created from digging out material.
 2014-05-01 01:04:41 +02:00
Clonkonaut 4d05a01920 Documentation added for DigOutObject callback. 2014-05-01 00:58:11 +02:00
Clonkonaut e9cd8693bd Repaired ice hit sound. 
"CrystalHit?" -> "GlassHit?"
 2014-04-29 00:26:30 +02:00
Clonkonaut 0de885a0f7 New feat: Use snow or ice to create loam in the foundry. 
Two callbacks added:
IsLiquid - return a string with the material that this object consists of.
GetLiquidAmount - return how many material pixels this object is worth.
 2014-04-29 00:25:06 +02:00
Clonkonaut 7d85fa410d Made the elevator sound audible again (#1052). 2014-04-27 16:44:35 +02:00
Sven Eberhardt 45f69abb6e Revert engine-side league localization 
The engine cannot know about all future league strings. Instead, localize server-side using language id from http request.
 2014-04-27 15:42:47 +02:00
Apfelclonk d1170374d0 Document PathFree2 and CoordinateSpace 2014-04-26 19:22:02 +02:00
Apfelclonk 4ecca08a20 Fix scaffold's solid mask 2014-04-26 19:22:02 +02:00
Martin Plicht 9bcb313f3e C4GameScript: Do not use TRUE literal 2014-04-24 12:40:30 +02:00
Maikel de Vries 653b135919 Move contents ejection on death after Death Call 
This allows the scripter to access the contents in OnClonkDeath and similar callbacks preventing solutions using effects or static variables.
 2014-04-22 20:15:26 +02:00
Maikel de Vries dfc4976e8c Fixed lightning damage for living objects 2014-04-21 19:39:29 +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 bfd16c77e4 Treasure Hunt: Description and better goal explanation. Some map fixes. 2014-04-21 18:44:07 +02:00
Maikel de Vries fcf560bad3 Fixed IronPeak player view range 
... and some small clean ups
 2014-04-21 13:15:06 +02:00
Sven Eberhardt fd3934fd77 TreasureHunt: Goal fix and TopOpen=2. 2014-04-21 02:01:36 +02:00
Sven Eberhardt 1d0ebcd3a3 Added mode TopOpen=2: Pixels above landscape are partly free and partly solid depending on corresponding top row map IFT. Analogous to BottomOpen=2. 2014-04-21 02:01:17 +02:00
Sven Eberhardt bddd6d0a01 Fix assertion in SetLeagueProgressData without player ID set 2014-04-20 20:10:53 +02:00
Sven Eberhardt f960567f42 TreasureHunt: Add missing script file 2014-04-20 20:10:13 +02:00
Sven Eberhardt ea11778388 Treasure Hunt: Messages, league adjustments. 2014-04-20 19:37:36 +02:00
Sven Eberhardt 662cb599c2 fix script errors in docs example 2014-04-20 19:32:35 +02:00
Sven Eberhardt 07ee3ee4e1 Objects levitated by TeleGlove do not hit Clonks while they're being held and 5 frames after release. 
Previously, the TeleGlove was just stupidly strong for fighting. You can still fling the object and have it hit the enemy after release, but you cannot just follow the enemy to cause permanent tumbling.
 2014-04-20 19:04:17 +02:00
Sven Eberhardt b8cd437fc9 Fix C4ID parameters to engine functions. 2014-04-20 18:43:29 +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