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

267 Commits (e59205c2f375fcacbda0f3478aeda909981d2cb3)

Author SHA1 Message Date
Maikel de Vries 7b4ba0245b fix script error on basement attachment to scaffold (#1917) 2017-06-03 15:41:03 +02:00
Maikel de Vries cc480be3eb relaunch rule: add option to prevent round start relaunch 2017-05-01 11:46:34 +02:00
Maikel de Vries f3291bb84f clean up and document relaunch rule 
Also fix script errors in melting castle.
 2017-05-01 11:00:51 +02:00
Maikel de Vries 0fead04978 fix relaunching problems in missions 2017-04-30 16:13:57 +02:00
Maikel de Vries cb68f9b26b fix parkour in combination with new relaunch rule 2017-04-25 10:26:27 +02:00
Maikel de Vries 7ffbeac9a9 Merge branch 'master' into Rule_Relaunch 2017-04-24 21:46:05 +02:00
Mark 2b56f55da5 DarkCastle: Fix #1907 
The name entries should be "Hörx" in German and "Harx" in English
 2017-04-24 15:10:06 +02:00
Fulgen301 750d52e06d Fix Missions.ocf scenarios in order to work with Rule_Relaunch 2017-04-22 21:08:40 +02:00
Fulgen301 44ca079bf6 Modify Missions.ocf in order to work with Rule_Relaunch 
- Crash
- DarkCastle
- DeepSeaMining
- Raid
- TreasureHunt
 2017-03-30 20:55:05 +02:00
Julius Michaelis 80c07d34e4 Add [Landscape] Secret to Scenario.txt to default-disable black NO_OWNER viewports 
Related to: c569036d1d
 2017-01-24 18:50:30 +01:00
Clonkonaut 3fe83986ce Crash: made airplane invincible (#1754). 2017-01-03 23:03:51 +01:00
Clonkonaut c423ec5de2 Made airplane touchable (#1663). 
Made it untouchable in all missions.
 2017-01-03 22:04:48 +01:00
Clonkonaut e6af3d216a Treasure Hunt: fixed superfluous declaration of global vars. 2017-01-03 16:50:13 +01:00
Clonkonaut b984704812 Raid: fixed superfluous declaration of global vars. 2017-01-03 16:38:47 +01:00
Clonkonaut 1fb8e4f757 Deep Sea Mining: Fixed crystal communicator graphics position. 2017-01-03 16:29:22 +01:00
Clonkonaut e2b238c381 Deap Sea Mining: fixed superfluous declaration of global vars. 2017-01-03 15:56:20 +01:00
Clonkonaut 7ec3f90127 Dark Castle: fixed airplane health hack to correct property name. 2017-01-03 15:49:52 +01:00
Clonkonaut 99d4fcb5ba Dark Castle: fixed superfluous declaration of global vars. 2017-01-03 15:48:39 +01:00
Clonkonaut 4fce224238 Crash: adjusted merchant dialogue to new flag behaviour. 2017-01-03 03:56:52 +01:00
Clonkonaut 145be7d097 Mt Brame: fixed goal icon. 2017-01-03 03:41:05 +01:00
Sven Eberhardt 8cd2432c58 Allow non-editor collection of objects by dialogue helper object 
Also revert Clonkonaut's crash landing into hotfix
 2017-01-01 17:00:57 -05:00
Clonkonaut 71d5e611a4 Airplane: carry up to 20 items and 3 clonks (#1663). Also refactoring of the script. 2016-12-30 03:54:01 +01:00
Clonkonaut 7968372dfa Crash: minor fixes: 
g_has_bought_plans was defined multiple times, the wooden cabin will be created 2 pixels lower to stop it from jittering.
 2016-12-28 14:29:21 +01:00
Clonkonaut b2d112b332 Crash: weird fix for the intro (see forum for details). 2016-12-28 14:29:21 +01:00
Lukas Werling 68ddeb3bed Convert all text files in planet to UTF-8 2016-12-11 21:19:13 +01:00
Mark d356d9db3d Fix inherited() calls 
The ... operator should be added so that the parameters are passed down. In some cases even the named parameters were not passed down.
 2016-11-26 18:57:31 +01:00
Maikel de Vries fa977149e9 make firefly use insect swarm library 2016-09-30 18:58:42 +02:00
Sven Eberhardt 0cdad64934 Fix goal and rule displays (#1811) 2016-09-14 21:46:16 -04:00
Maikel de Vries e18cee3a46 turn musket into blunderbuss 
The musket was not a very popular and useful weapon, being inferior to the bow. It now shoots 5 weaker bullets in one shot with less damage per bullet, this might require some further testing and fine-tuning. Also the weaker bullets mean that they can be used in a gatling-gun (WIP) and in the airplane as well.
 2016-08-22 16:32:48 +02:00
Maikel de Vries 45bb9ab550 rename lead shot to lead bullet and clean up script 2016-08-22 16:32:47 +02:00
Sven Eberhardt a86576b763 Add TreasureHunt title image 2016-08-14 18:41:37 -04:00
Sven Eberhardt 1fe086a106 Add MtBrame title image 2016-08-14 18:39:48 -04:00
Sven Eberhardt 9be5379f73 Add MineRescue title image 2016-08-14 18:39:47 -04:00
Sven Eberhardt 343a4be8cc Add GoldenMountain title image 2016-08-14 18:39:47 -04:00
Sven Eberhardt 225b0a9444 Add FrostySummit title image 2016-08-14 18:39:46 -04:00
Sven Eberhardt 2415e0d7d3 Add DeadlyGrotto title image 2016-08-14 18:39:45 -04:00
Sven Eberhardt 42e6c3de3c Add DarkCastle title image 2016-08-14 18:39:45 -04:00
Sven Eberhardt 18437305ca Add AcidDrilling title image 2016-08-14 18:39:44 -04:00
Clonkonaut 1b76c31452 5 title picture by ala and K-Pone. 
https://clonkspot.org/forum/topic_show.pl?pid=14524#pid14524
 2016-08-15 00:32:01 +02:00
Sven Eberhardt 5db45c0f47 Merge branch 'master' into qteditor 2016-08-06 21:45:19 -04:00
Sven Eberhardt 693c0124b9 Update more goal icons for better editor size 2016-08-04 21:15:25 -04:00
Clonkonaut 56f8372a68 Skylands: fix GetComponent when called in definition context on 'small 
trees' (#1781).

At some point someone might test if this breaks anything but I think it does not.
 2016-07-25 17:55:53 +02:00
Sven Eberhardt 36685a3119 Add HideInCreator=true to internal/helper/library definitions 2016-07-10 22:06:48 -04:00
Clonkonaut ecc386e6e7 Fix Dark Castle goal description (#1667). 2016-06-19 00:18:58 +02:00
Clonkonaut b6ca10d11a Constructor library: Changed to search through all available knowledge and filter using an overloadable function. 
The hammer will now only construct definitions that have the callback "IsHammerBuidable". This will exclude all C4D_Structure objects that are not buildings and can't be build in a meaningful way.
Also, with the carry heavy branch I want to test adhoc built lorries (lorries as construction sites). Sven suggested this.
 2016-06-18 19:45:45 +02:00
Maikel de Vries 2a731b2545 implement Components as a property lookup table 2016-05-21 13:34:34 +02:00
Maikel de Vries 1df322b7ff adapt objects and scenarios to new component implementation 2016-05-21 13:34:34 +02:00
Nicolas Hake 8e18a3fc96 Change (int)0 to nil where deprecated 2016-05-13 17:13:34 +02:00
Maikel de Vries 9d026da0a2 acid drilling: use new max length for pipes 2016-03-22 22:15:31 +01:00
Sven Eberhardt 1b6d3ca770 Raid: Map tweaks to account for ShapeMap changes 2016-01-28 23:52:02 -05:00