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

294 Commits (3b0891ba89f7a75f832032036a6aefa2573e325d)

Author SHA1 Message Date
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
Sven Eberhardt 1bb78ecd4f Remove some unnecessery animation weights. 
These overwrite the animations in their slots while there are no other references to existing animations in the slot.
 2016-01-28 23:47:53 -05:00
Maikel de Vries 84218d1cbc merge UsageHelp into Description 
This is better for the new interaction menu, since only the description is shown for items, but it can be longer now.
 2016-01-23 16:28:02 +01:00
Sven Eberhardt d9f1c90b47 TreasureHunt: Some map simplification and adjustments for ShapeMaps. More torches, food and weapons. Pyrit skin fix #1296 2016-01-18 23:45:21 -05:00
Sven Eberhardt e6a153f5d5 DeepSeaMining: Fix construction plans for players joining during intro 2016-01-17 23:36:19 -05:00
Sven Eberhardt 2c834e6993 DeepSeaMining: Clonks tumble in intro when falling from sky after section change 2016-01-17 22:38:50 -05:00
Maikel de Vries 79e0402683 fix script error for wrong paremeter type in Crash.ocs waterfall effect 2016-01-17 12:35:47 +01:00
Sven Eberhardt 915ae02178 Crash landing: Fix post-intro plane placement so it cannot slide into the lava #1615 2016-01-16 12:21:17 -05:00
Sven Eberhardt 01503cdfdd DarkCastle: Minor objects+text fixes 2016-01-16 00:32:46 -05:00
Sven Eberhardt 8d805a49a7 Raid: Fix goal descroptions and buckets in Mave's foundry. 2016-01-16 01:33:06 +01:00
Sven Eberhardt e8b0b9c16f WoodenBridge construction plan for some missions. 2016-01-10 21:39:56 -05:00
Sven Eberhardt 3735b135ac DarkCastle: Pre-damage last stone doors. 2016-01-10 14:20:46 -05:00
Sven Eberhardt 95ac155f6b GoldenMountain: Reduce required gem count. 2016-01-10 12:21:14 -05:00
Sven Eberhardt b00daed283 GoldenMountain: Add wooden bridge plans #1570 2016-01-10 08:55:04 -05:00
Sven Eberhardt 7f8551bb42 Add wealth display to Crash Landing #1548 2016-01-09 14:26:18 -04:00
Sven Eberhardt 3b74ac2929 DarkCastle: Fix nil access in intro. 2016-01-09 11:09:11 -04:00
Sven Eberhardt 11e73373a6 Use alt skins in storyline missions. 2016-01-09 11:09:11 -04:00
Clonkonaut 0348efa03e Fix propeller not moving in Deep Sea Mining Intro (#1531). 2016-01-02 13:44:23 +01:00
Nicolas Hake c0befc6ba0 Remove C4RTF 
The only use of C4RTF in its final moments was parsing out plain text
from RTF files anyway, so why even go to all the trouble instead of just
storing plain text in the beginning?
 2015-12-29 17:51:43 +01:00
Maikel de Vries 69cf94127a removed unused Sulphur object 
Material is gone, object has no use, therefore removed. Can be added again if there is a need for it.
 2015-12-28 10:21:49 +01:00
Maikel de Vries 509bdac5bc remove unused Rebuy property from objects 2015-12-28 10:21:49 +01:00
David Dormagen d038452ff6 deep sea mining: capitalized some "i" and replaced missing sounds in the intro 2015-12-20 19:17:34 +01:00
David Dormagen 7f4f5fee58 added new vocals for three skins (by ala) 
They are played e.g. when being hit by stuff, catching fire, killing teammates, idling, trying to put a shovel into the pump, and much more!
 2015-12-16 23:01:29 +01:00
Maikel de Vries ba39500803 removed PlaneCrash.ogg from TreasureHunt scenario 
Duplicate of the same sound in Sound.ocg
 2015-12-16 17:45:26 +01:00
Clonkonaut 0efe905c6a Removed obsolete Scenario.txt entries. 2015-12-16 01:35:41 +01:00
David Dormagen dcfb986e34 moved sounds into subfolders 
This completes http://forum.openclonk.org/topic_show.pl?tid=3215
 2015-12-13 22:14:55 +01:00
Clonkonaut 0b83fc2e26 Removed granite from starting cave in Deadly Grotto. 
Sometimes clonks got stuck in that right at the beginning.
 2015-12-13 13:38:42 +01:00
Sven Eberhardt 4de7a42ac1 DeadlyGrotto: Starting platform fix and Chest to knowledge. 2015-12-13 01:36:55 -05:00
Sven Eberhardt bf63f2ef17 Gidl+Windmill moved to new "Defense.ocf" (title picture missing) 
They aren't quite fitting at the moment and Clonko wants to share the buy menu.
 2015-12-12 12:06:25 -05:00
Sven Eberhardt 82e15926eb FightForGidl: Boomattack enemy waves. Also map rework to be open for flying attackers. 2015-12-12 01:34:49 -05:00
Sven Eberhardt 1dca9cf1b5 FightForGidl: No friendly fire and some AI fixes. 2015-12-12 00:02:31 -05:00
Sven Eberhardt fcba917a04 FightForGidl: Buy menu improvements and fixes. 2015-12-10 23:59:06 -05:00
Sven Eberhardt a69ca73ec9 FightForGidl: 3-tiered shoot speed upgrade. 
Last upgrade + musket is practically a machine gun! You have to click each shot though.
 2015-12-10 23:41:15 -05:00
Sven Eberhardt ee832ffe0b FightForGidl: Add description box to buy menu. 2015-12-10 22:45:57 -05:00
Clonkonaut 5a351e7bb5 Added restart rule to all story missions (#1224). 2015-12-10 23:38:20 +01:00
Sven Eberhardt 05e79bd71b FightForGidl: Always show wealth 2015-12-09 01:00:21 -05:00
Sven Eberhardt 87c49451e4 FightForGidl: New technology: Ranged weapon load speed increase. 2015-12-09 01:00:03 -05:00
Sven Eberhardt 8927096286 Sound namespace changes: Add missing documentation and a lost sound. 2015-12-07 00:17:41 -05:00
Sven Eberhardt 7f6c13084a Register definition-local sounds into definition namespace (id::Soundname) #1185. 
Also move all object sounds to global Sound.ocg so they are still played.

This is to prevent naming collisions. All sounds are moved because otherwise all scripts would have to be adjusted. Also, the distinction between sounds in definitions and sounds in Sound.ocg was rather arbitrary.

It will also ensure most sounds are reloaded when sound is turned off temporarily, although that should better be fixed properly.
 2015-12-07 00:08:24 -05:00
Sven Eberhardt 132da18dc6 GoldenMountain: Add cotton plants and loom and cloth plans to allow building of wind bag. 
Wind bag was in the construction plans but you could not build it because there was no way to get cloth.
 2015-12-06 01:19:06 -05:00
Sven Eberhardt b4e0b7d7d1 FightForGidl: Eliminate enemy player after round end. 
For the evaluation dialogue.
 2015-12-05 21:14:09 -05:00
Sven Eberhardt 85bbd55eeb Move Guardians of Windmills mission out of storyline section 2015-12-05 14:41:55 -05:00
Sven Eberhardt 46a7d653d8 Fix two typos in comments. 2015-12-02 20:27:39 -05:00
David Dormagen fdeccdf83d make GIDL targets damagable by AI (#1464) 
The no-friendly-fire effect also protected the targets from being damaged by AI.
 2015-12-02 13:03:51 +01:00
David Dormagen f627bc13d3 treasure hunt: fixed some dialogues 2015-12-01 20:57:08 +01:00
Sven Eberhardt 08b3584c5d FightForGidl: Minor fixes and buy menu rework. 
* New menu to be expanded with cool stuff (like damage upgrades, towers, etc.) later
* Automatic rebuy of consumables such as iron bombs and firestones
 2015-11-22 01:03:15 -05:00
Maikel de Vries 338f3bca9d change airplane id (Plane -> Airplane) 
This is for a better distinguising between the Plane property and the airplane
 2015-11-21 20:53:19 +01:00
David Dormagen 866111c3a9 deep sea mining: fixed typos in German description 2015-11-21 16:04:41 +01:00
Sven Eberhardt a5f385768f TreasureHunt: Custom description for gold bars. 2015-11-20 21:11:26 -05:00
David Dormagen 8db90a341b moved Windmills.ocs from Arena.ocf into Missions.ocf 
Being in "Arena" was a relic we had from 2009 where we only had arenas.
 2015-11-13 18:54:11 +01:00
David Dormagen c93a8d5ec5 Crash.ocs: make starting the plane easier 
This change increases newbie-friendlyness. I wonder if anyone will notice that the plane landed in another spot in the intro?
 2015-11-11 23:34:03 +01:00
David Dormagen f88ccac0d4 Crash.ocs: added missing translation for goal message 2015-11-09 22:12:49 +01:00
Sven Eberhardt 81c74da576 Fix automatic stone door opening in FightForGidl. 2015-11-08 17:15:06 -05:00
David Dormagen be35518881 Crash.ocs: fixed typo in German dialogue 2015-11-07 22:33:16 +01:00
David Dormagen b9ba80aa28 Crash.ocs: added chest to construction plans 2015-11-07 21:56:16 +01:00
David Dormagen fcc5c32be1 Crash.ocs: fixed typo in German dialogue 2015-11-07 21:27:50 +01:00
David Dormagen d42d0edd33 Raid: oil barrel can not be filled with water or be used as a normal barrel at all 
This might confuse players A LOT.
 2015-11-05 20:41:30 +01:00
David Dormagen d9e83d2c1e Raid: fixed typos in German dialogue 2015-11-04 21:15:54 +01:00
David Dormagen 17c355d2e3 Raid: fixed wording in German description 
see https://youtu.be/dGn99IuzDPw?t=1722
 2015-11-02 21:40:58 +01:00
David Dormagen 73a817d1ae scaffold: use interaction menu instead of ControlLeft/Right/.. and allow extensions to both sides (#949) 2015-11-01 18:22:23 +01:00
Clonkonaut 64d1b89f43 Added tree variations to Golden Mountain, Gold Rush and Iron Peak. 2015-10-25 14:33:58 +01:00
Clonkonaut f26a14f5ff Make sure crew isn't stuck. 2015-10-25 14:22:56 +01:00
Sven Eberhardt 3bf4ee2b39 TreasureHunt: Add glow to golden shovel. 
Also to mark pipe area.
 2015-10-14 22:29:11 -04:00
Maikel de Vries e2c5158275 rename S2AI to AI 
This in preparation for a more general AI (in the far future).
 2015-10-14 20:44:38 +02:00
Clonkonaut 86866d1d13 Skylands: Fixed various issues (#1267): 
- Chest added to knowledge
- GetWind returns -100
- Removed sky pixels from starting island
- Higher spawn position
- Real description
- Goal help will point out next missing part
 2015-10-13 16:04:54 +02:00
Clonkonaut ecc2d5d291 Slight adjustments prevent shape map from trapping npcs. 2015-10-13 15:20:37 +02: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
Clonkonaut f6d0ccff2e Skylands: Player starting material moved into chest to not overfill clonks. 2015-10-12 21:19:55 +02:00
Clonkonaut ecdb0ed57f Mine rescue fixes (#1266): 
- Three wind generators instead of one
- All players get tools
 2015-10-11 16:22:25 +02:00
Clonkonaut 1178d8f0ce Prevent dead clonks from sitting upright (#1358). 
Also added convenient constants defining the animation slots to use for clonk animation.
 2015-10-11 14:08:14 +02:00
Sven Eberhardt e39dab3d68 Revert accidental extra changes done in 675db52e38. 2015-10-09 14:52:47 -04:00
Sven Eberhardt 675db52e38 Texture shape coverage fix and mape build fix. 2015-10-09 14:49:31 -04:00
Armin Burgmeier 651dadccb2 Convert hat and windmill rocket meshes to new coordinate space 
Also, convert them from XML to binary meshes.
 2015-10-05 18:55:12 -04:00
Clonkonaut 0aab3cf4e6 Added new material textures by Nachtfalter and Matthi. 2015-10-05 02:02:36 +02:00