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

205 Commits (master)

Author SHA1 Message Date
Mark 00b1b37787 Renamed Library_Tank to Library_PipeControl 
The library did not depend on the Library_LiquidContainer script at all,
removed that include and added it to the previous includers.
Removed the IsLiquidTank() identifier, because it was unused.
 2018-12-27 21:21:53 +01:00
Nicolas Hake 5ef52f2450 Fix variable_out_of_scope warnings in Worlds 2018-07-23 12:30:23 +02:00
Nicolas Hake a73c1998e4 Fix suspicious_assignment warnings in World 2018-07-23 10:45:52 +02:00
Nicolas Hake 30aa6abb55 Move PlaceBatches into System.ocg 2018-07-23 10:45:52 +02:00
Maikel de Vries ddc68d7ad3 column: proper rotation and allow smaller sizes 2018-07-04 08:30:53 +02:00
Maikel de Vries d01aaa20bd waterfall: implement editor interface 2018-03-13 20:37:46 +01:00
Maikel de Vries 8889a68127 horrid highway: fade out trains if they are taking too long 2018-01-29 10:16:14 +01:00
Maikel de Vries aa892171fb update version to 8.0 in DefCore.txt, Scenario.txt and Version.txt 2018-01-28 13:18:46 +01:00
Lukas Werling ad66ba3145 Krakatoa: Fix spawn position of rejoining players 2018-01-17 00:09:27 +01:00
Lukas Werling 04ee087e7d Krakatoa: Don't reduce flag radius (#1981) 
The scenario doesn't have an expansion goal anymore, so I don't see why
we'd want to restrict the radius - especially when that doesn't work
properly.
 2018-01-17 00:09:27 +01:00
Maikel de Vries c3dfdc5894 fix connecting multiple pipes to the refinery drain 2018-01-13 15:28:41 +01:00
Maikel de Vries dc541620b5 add new liquid tank structure (graphics needed) 2018-01-13 11:06:35 +01:00
Maikel de Vries 3255b02728 pipes: fix attaching, cutting, swapping, messaging, and interface 2018-01-13 11:06:35 +01:00
Mark 0d38a3fb33 Fix #1973: Gems do not grow on wooden bridges anymore 
Gems should not be near material vehicle now. This does still not prevent them from growing on things that the player built with concrete.
 2018-01-07 16:14:54 +01:00
Lukas Werling 8e2327326b FloodedVeins: Use AutoScanSideOpen 
It does exactly what's needed here now!
 2017-12-22 20:53:11 +01:00
Lukas Werling 8838d8c6ce AcidGoldMine: Draw acid lake with tunnel background (#1652) 
The new AutoScanSideOpen won't close the border otherwise.
Additionally, this makes clear where to pump acid.
 2017-12-22 20:50:28 +01:00
Maikel de Vries 72093ffa7f fix switch target in horrid highway goal (#1960) 2017-11-30 18:54:46 +01:00
Maikel de Vries 5c11b703a9 Horrid Highway: add diamonds and remove debug log 2017-11-22 17:18:41 +01:00
Maikel de Vries 3a47802702 airplane: add afterburner mode 
This reqruired some movement code clean up, replaced old effects with new effects.
 2017-11-15 18:49:47 +01:00
Clonkonaut b1902355f9 Cannon, Catapult, Lorry: use Library_Destructible (cannons and catapults are now destructible!). 2017-11-01 01:27:48 +01:00
Maikel de Vries b1542a3338 horrid highway: resolve meteor spawn problem and adjust difficulty settings 2017-07-08 18:17:16 +02:00
Maikel de Vries d34f0a689b add new world: horrid highway 2017-07-06 10:18:27 +02:00
Maikel de Vries 50221615b8 adapt clonkomotive scenario to new locomotive 2017-07-04 09:00:16 +02:00
Maikel de Vries 7d98d29b33 moved locomotive to main object folder 
Now it can be used by other scenarios as well.
 2017-07-03 16:05:58 +02:00
Maikel de Vries 30dd9c1d8f silence argument mismatch warning in rapid refining scenario 2017-06-20 18:24:41 +02:00
Julius Michaelis 70ad55ddf1 Add Windmill to farming knowledge in the Worlds folder. 
Semantically, that makes sense, but I haven't taken a look at all the maps.
 2017-03-19 14:03:11 +01:00
Sven Eberhardt 3f06882a4c Krakatoa: Add German translation of intro messages 2017-01-21 21:27:45 -05:00
Mark 6b0d0e1c60 IronPeak: Fix function access during intro 2017-01-13 05:50:06 +01:00
Clonkonaut b7771d6906 Krakatoa: fix goal icon. 2017-01-03 22:35:24 +01:00
Clonkonaut 92f5eda3e9 Locomotive: fixed goal icon. 2017-01-03 22:33:45 +01:00
Clonkonaut a8d0f8f75e Chine: fix goal icon. 2017-01-03 22:30:33 +01:00
Clonkonaut d901a8952a Acid Rift: fixed superfluous declaration of global vars. 2017-01-03 22:25:50 +01:00
Clonkonaut 0eed215bbd Clonkomotive: fixed (deprecated) implicit declaration of for loop var. 2017-01-03 22:11:00 +01:00
Clonkonaut 06151bc5e5 Clonkomotive: fixed superfluous declaration of global vars. 2017-01-03 22:09:52 +01: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
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
Fulgen301 863213fe76 Rapid Refining: German translation added. 2016-11-11 18:34:35 +01:00
Maikel de Vries fa977149e9 make firefly use insect swarm library 2016-09-30 18:58:42 +02:00
Maikel de Vries 0e76c85531 make line overlap check a global function 
This avoids code duplication and really is a Math.c function.
 2016-09-24 17:30:19 +02:00
Sven Eberhardt 22af9f0e8c Fix landscape placement functions (#1820, #1821) 2016-09-14 21:30:57 -04:00
Sven Eberhardt d3d7256fec Fix missing achievement in Krakatoa's Krach (#1819) 2016-09-10 01:17:39 -04:00
Maikel de Vries f76e056cea add new items to knowledge in worlds 2016-09-06 17:06:05 +02:00
Armin Schäfer 77790c7313 Add Shark: Squashed commit of the following: 
commit 1abfae50c6454c8f5bab10bff753fb472f0596d0
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Wed Aug 3 00:56:40 2016 +0200

    Make shark slower (only twice as fast as the Clonk) and reactivate FastSwim animation.

commit b35db07894be864978a6b03609eb3d754b622705
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Thu Jul 21 22:24:48 2016 +0200

    Shark: Fix shark not swimming for a while when Clonk was too near.

commit f1495371394796e4a2d984049c026eaa66a0d30e
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Sun Jul 3 19:48:22 2016 +0200

    Shark: Revert wrong location of the shark.

commit 437f911629c8ec9ee1c587e653790378b0d8fd17
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Sun Jul 3 19:44:49 2016 +0200

    Shark: Fix one turning bug, it can not be big enough to cause a mesh bug when turning around; shark is a bit slower when attacking (hopefully it can not jump out of the water now)

commit 28d0a9dfbad4e2b4c42295e73d8d42e5495b0e37
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Sat Mar 26 01:28:19 2016 +0100

    Move shark to Objects.ocd and add sharks to Clonkomotive on hard settings.

commit 000d162fb5c36225fdd215d1d30336a1c926ec27
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Sat Mar 26 01:09:55 2016 +0100

    Shark: Fix bugs.

commit be201ffd6424203bf2b9b3a2a8496b3d41ec3122
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Sat Feb 20 14:48:12 2016 +0100

    Shark update. Fix animation when attacking.

commit 7dc24e93fa19f26cc2f3344ac8267b81b4fd3eee
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Sat Jan 23 22:36:24 2016 +0100

    Delete the patch.txt from my last commit.

commit 36e828fb7545fb6c2538c728844f0b4dc97bfcc5
Author: Armin Schäfer <arminnessie@gmail.com>
Date:   Sat Jan 23 17:38:29 2016 +0100

    Add experimental Shark scenario.
 2016-08-23 19:16:54 +02: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 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
Maikel de Vries 700d5c199f rapid refining: fix pumping into refinery drain 2016-08-08 16:54:28 +02:00
Maikel de Vries a9a2ffd95c rapid refining: add waterfall as additional power source 2016-08-07 17:27:31 +02:00
Maikel de Vries 809172e74c new world: rapid refining 2016-08-07 14:24:28 +02:00