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

112 Commits (c00a8cf3c3a33a88c5a8aba152d06d9f483921a5)

Author SHA1 Message Date
Sven Eberhardt 8ac9a1e2bf Add Rule_BaseRespawn editor props 2016-11-20 13:14:58 -05:00
Sven Eberhardt c05ee7e644 Add gravestone inscription editor props 2016-10-08 23:29:50 -04:00
Maikel de Vries 18424aaaa7 add rule to control pump speed 2016-09-23 09:26:06 +02:00
Sven Eberhardt 0cdad64934 Fix goal and rule displays (#1811) 2016-09-14 21:46:16 -04:00
Sven Eberhardt c487c530e4 Fix respawn at flagpole position 2016-08-30 14:45:41 -04:00
Sven Eberhardt bce903ee04 Merge branch 'master' into qteditor 
Conflicts:
	planet/Objects.ocd/Items.ocd/Tools.ocd/Dynamite.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Animal.ocd/CreatureControl.ocd/DefCore.txt
 2016-08-13 23:42:59 -04:00
David Dormagen 51bab0b0b2 renamed "Gaya" to "Gaia" 
This is necessary to not draw the attention of Zeus and find an end through a dramatic lightning strike.
 2016-08-07 17:26:36 +02:00
Sven Eberhardt db1e9abbe3 Unify rule picture size display in the editor to 32x32 2016-08-06 10:32:21 -04:00
Sven Eberhardt 7825931c95 Limit rule placement in editor to one per rule type 2016-08-06 10:27:56 -04:00
Sven Eberhardt a06363b70b Fix restart rule graphics 2016-08-05 00:29:52 -04:00
Sven Eberhardt c14721523c Make standard goals and rules visible as icons in editor 2016-08-04 19:32:57 -04:00
Maikel de Vries 1df322b7ff adapt objects and scenarios to new component implementation 2016-05-21 13:34:34 +02:00
Maikel de Vries e5a9dd934f add option to respawn rule to keep contents 2016-01-24 18:05:06 +01:00
Sven Eberhardt 62dd3aafd6 Activate wealth display in scenarios with Rule_BuyAtFlagpole. 
Most missions with home base were missing the display.
 2016-01-17 22:28:57 -05:00
Sven Eberhardt 0b3c29a95c Extinguish transferred contents on respawn 2016-01-16 14:07:20 -05:00
Sven Eberhardt 77180efbdd Move dead clonks from interaction tabs to simple boxes in surrounding #1581 2016-01-11 18:19:01 -05:00
Clonkonaut fe4fb2cad7 Restart rule: Don't do anything when crew is enabled, don't remove inventory when base respawn rule is activated. 2015-12-10 23:37:51 +01:00
David Dormagen aec1988722 removed category "vehicle" of several helper objects 
Otherwise you can spawn them in the "Playground" scenario.
 2015-11-29 18:28:40 +01:00
Clonkonaut 03ce403002 Added gravestones to Dark Castle (#1235), minor fixes (enemy clonks' skin adjusted to gender of name). 2015-10-13 14:38:41 +02:00
Armin Burgmeier b8ed577c0f Rotate the OGRE coordinate frame by 90 degrees in X 
Also rotate all meshes backwards so that everything keeps working. This should
make it more convenient for modellers to create new meshes.
See http://forum.openclonk.org/topic_show.pl?pid=29410#pid29410.
 2015-10-03 11:39:08 -04:00
Sven Eberhardt 7211ee171f Follow view of dead clonk for two seconds before respawning with base respawner (#1390). 2015-10-03 02:23:35 -04:00
Sven Eberhardt 8073fb3c07 Drop some fused and connected items on death when respawning with inventory. 2015-09-26 17:56:36 -04:00
Maikel de Vries f1a6653c94 remove energy bar rule 
This rule is obsolete as the HP of structures is shown in the interaction menu now.
 2015-09-19 07:59:05 +02:00
Sven Eberhardt 6535d1a5ad Fix gravestone inscriptions for clonks with empty death messages (#896). 2015-07-08 21:14:56 -04:00
Maikel de Vries 5e685be1cd make GetBases a single function in base respawn rule 
This allows for more easy overloading.
 2015-03-01 14:02:16 +01:00
Maikel de Vries a5155f6d88 fixed no power need rule 2015-02-04 12:40:29 +01:00
Maikel de Vries 2d00588dff new power system (work in progress) 2015-02-04 10:35:14 +01:00
Sven Eberhardt 4c4d4233bf Fix non-free BaseRespawn on neutral flagpoles. 
It would try to buy clonks from player -1, which never worked.
 2015-01-18 15:19:46 +01:00
Mark 850bf1b9d4 CreateObject/CreateObjectAbove (#1214) 
Renamed CreateObject() to CreateObjectAbove() and replaced all occurrences in script files.
Added CreateObject(), the function may need a rewrite though, see comment in code.
Updated documentation
 2015-01-11 19:02:03 +01:00
Maikel de Vries 22dfab63aa clean up scripts of power library 2014-12-19 14:56:01 +01:00
Maikel de Vries c6802b8776 increase game content version entries to 6.0 2014-12-12 22:58:16 +01:00
Sven Eberhardt e7ac00de4b Added BaseRespawn rule and neutral flagpoles to be used for consistent respawn handling in all missions. 
Also changed clonk destruction process to always kill player clonks before removal. This simplifies handling of death e.g. when clonks are contained in an object that falls out of the map.

BaseRespawn adapted from Maikel's base melee repository.
 2014-09-22 19:21:28 +02:00
Maikel de Vries d071ee3f7f fixed gravestone interaction 2014-08-27 15:33:39 +02:00
Sven Eberhardt 30ccb5ef84 Update object fade rule to use !GBackSolid() instead of !Stuck() as removal condition for garbage objects. 
The condition was meant to avoid removal of earth materials. However, it also left around lots of other objects (like arrows sticking in walls).
 2014-06-22 16:41:51 +02:00
Sven Eberhardt 43df518d75 Improved Rule_ObjectFade to re-check condition a few times before fading out objects. This ensures that e.g. fused iron bombs aren't just removed. 
Also relaxed the movement condition to allow very small movements because bugged engine physics sometimes cause objects to wiggle forever.
 2014-06-01 15:00:45 +02:00
Maikel de Vries 160e45cb77 make gravestone non-lethal 
and move to the corresponding rule, it does not belong to the clonk somehow.
 2014-05-30 22:43:09 +02:00
Maikel de Vries 7182acbd48 fixed structure energy bars 2014-05-30 10:17:03 +02:00
Clonkonaut e3bf5110ed Fixed restart rule (#1072). 2014-05-02 02:04:04 +02:00
David Dormagen a10c9316ef renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle 2013-12-17 22:32:01 +01:00
David Dormagen 54fdb2cec1 updated some remainers of the old particle system to use the new one 2013-11-28 23:38:26 +01:00
David Dormagen 6395e77e6a added remaining files for Rule_EnergyBarsAboveStructures 2013-01-27 18:24:45 +01:00
Sven Eberhardt c87a40f28d Placeholder graphics for EnergyBarsAboveStructures 
Zapper: Please commit yours! At the moment, the engine spits out tons of errors for every structure.
 2013-01-27 17:22:46 +01:00
David Dormagen 50fd0ebc39 added Rule_EnergyBarsAboveStructures and adjusted Krakatoa to use that 2013-01-22 18:44:29 +01:00
David Dormagen 0b0058da0f removing and adding Rule_NoPowerNeed while consumers are active has now the expected behavior (#828) 2012-11-10 14:19:59 +01:00
Tobias Zwick 16212d8fca rule fade out idle objects: only remove unstuck objects (#773/#841) 2012-10-27 20:21:54 +02:00
Russell 5782557a34 Clonk. Now with 65% better grammar. 2012-10-22 18:35:06 +01:00
Maikel de Vries df42d05dee Fixed gravestone c&p failure 2012-10-22 20:51:46 +02:00
Maikel de Vries db5ce4ffd9 Fixed gravestone rule and added it to the arenas 2012-10-22 20:05:23 +02:00
Charles Spurrill 6f74d0430f #796: Added missing gravestone rule 2012-08-02 12:00:11 -07:00
Charles Spurrill ea445138b1 Fancy icons for Rules.ocd 2012-07-26 11:38:50 -07:00
David Dormagen 8877dda619 kill logs: allow global callback for appending to log too ("%s is now king") 2012-06-17 21:38:10 +02:00
Maikel de Vries 6fcc0f6d2e Removed TimerCall in favour of AddTimer script implementation 2012-05-05 12:09:44 +02:00
David Dormagen 6517b230e6 added NoPowerNeed rule, made requesting 0 power possible 2012-04-15 17:02:47 +02:00
Maikel de Vries 6a2d0aa901 Removed log from team account rule... 2012-03-31 18:34:00 +02:00
Maikel de Vries be02f5bdc1 Fixed multiple team account rules giving too much money 
Also removed three copies in Skylands.ocs
 2012-03-31 18:27:14 +02:00
Sven Eberhardt 151fed2348 New rule: Rule_BuyAtFlagpole 
Allows you to buy objects directly at flagpole
 2012-03-11 00:55:45 +01:00
Felix Wagner eb6b7be7ee Fixed various unused vars 2012-02-20 11:58:58 +00:00
Maikel de Vries feafa4da2f Fixed team account 2012-01-10 21:01:53 +01:00
Maikel de Vries e6546bf776 Objects: Added team account rule 
This still needs some improvements
 2012-01-10 18:33:24 +01:00
Maikel de Vries 59c1aefad9 Objects: All Versions to 5,2,0,1 2011-10-01 10:54:15 +02:00
Tobias Zwick 480ff384f8 refactored most effects to use meaningful names for their variables 2011-07-31 17:59:51 +02:00
Armin Burgmeier 675c077ed2 Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00