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

2935 Commits (69ba06b8d06123543e2f7cad8be7d2e4d8eb10bc)

Author SHA1 Message Date
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 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
Sven Eberhardt 6040dde80a Cleaned up airship: Extra graphics object and unnecessary timers removed. 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 964e1a138a Deathmatch goal ends game when all but one player (or team) leave (#893). 2014-05-02 00:01:21 +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 4ecca08a20 Fix scaffold's solid mask 2014-04-26 19:22:02 +02:00
Maikel de Vries dfc4976e8c Fixed lightning damage for living objects 2014-04-21 19:39:29 +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 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 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 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
Günther Brammer f8226e3675 Use === to check whether proplists were already replaced 2014-04-19 19:02:22 +02:00
Sven Eberhardt e30e1a1028 Minor map and object fixes to TreasureHunt. Adjust GemOfPower picture rect. 2014-04-19 00:06:08 +02:00
Sven Eberhardt 639650ef73 SpinWheel sets view to controlled door on open/close command. 2014-04-18 23:34:55 +02:00
Sven Eberhardt 81dada0c0d New experimental scenario: Treasure Hunt 2014-04-18 21:16:31 +02:00
Sven Eberhardt 50a5862b7a Store modified mesh material assignments in saved scenarios. 2014-04-18 14:20:10 +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
Maikel de Vries 78509e0757 Fixed typo in LargeCaveMushroom terraform settings 2014-04-16 11:28:58 +02:00
Maikel de Vries 2d8767bde3 Added straw man to decoration 2014-04-06 17:18:00 +02:00
Maikel de Vries c70c44387f Fix some DoDamage issues 
Fire.c use correct number of parameters
Axe.c implemented FX_Call_DmgChop according to documentation
 2014-04-06 17:15:13 +02:00
Maikel de Vries fa6795370f Decoration.ocd added and includes ruins from DarkCastle 
Please start using this folder for decorative objects other developers might want to use as well.
 2014-04-06 15:50:06 +02:00
Julius Michaelis e5b7ef5b80 AutoFrameSkip: Graphics option to reduce lag by slow 
Skips drawing every second frame if drawing the previous frame was too slow
Setting is controlled by game host
Default: on

Imported from Clonk Rage

From e6e680f49ac50a352e9a051ee21622e7f00648b6 Mon Sep 17 00:00:00 2001
From: sven2 <sven2@786b8e90-9c09-0410-89a9-bccc6ef1e79b>
Date: Sat, 21 Sep 2013 21:34:44 +0000
Subject: [PATCH] + AutoFrameSkip: Graphics option to reduce lag by slow
 clients in network games

git-svn-id: https://www.clonk.de:83/svn/clonk/stable@14501 786b8e90-9c09-0410-89a9-bccc6ef1e79b
 2014-04-03 14:53:12 +02:00
Maikel de Vries 1c6f62466b Fixed Ametyst to Amethyst typos 2014-04-02 19:46:52 +02:00
David Dormagen 7d7308290f added missing SolidMask.png to Hideout/ShieldGem (fixes being able to pass through shield) 2014-03-29 18:58:10 +01:00
K-Pone d4707e2da3 Added Motorway to Music.ocg 2014-03-26 08:56:09 +01:00
Nicolas Hake 057743605d Add test case for #1060 2014-03-25 18:28:03 +01:00
Clonkonaut b16bb3a917 Coconut Tree stops dropping coconuts when chopped (#1046). 2014-03-24 23:57:49 +01:00
Julius Michaelis c1a430c561 Replace sizzle sound for foundry, use foundry's sizzle for lava/water reactions 2014-03-23 15:59:13 +01:00
David Dormagen 7ab65f8618 the compensator's charge-indicator-helper is no vehicle anymore 2014-03-22 19:52:27 +01:00
Maikel de Vries d1485df38a Fixed grapple bow for shot while wall jumping 2014-03-22 19:41:37 +01:00
K-Pone 5d2750a7e4 Added IslandDreams to Music.ocg 
!! We have finally got our first music in OpenClonk !!
!! Thanks to  K-Pone !!
 2014-03-21 22:38:29 +01:00
Lorenz Schwittmann 7678ad8f17 fixed compensator charged indicator (#1056) 
- correct y offset
- show indicator in front of compensator
 2014-03-21 22:22:06 +01:00
Maikel de Vries 6a9063ff7e Fixed loam description (#1040) 2014-03-20 21:17:46 +01:00