Commit Graph

166 Commits (4e7b396d319956dd3d4e19e04165275da94ba92d)

Author SHA1 Message Date
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
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 786b248cdf Chine: Unstuck starting clonks if necessary (#1786). 2016-07-25 17:50:38 +02:00
Sven Eberhardt 36685a3119 Add HideInCreator=true to internal/helper/library definitions 2016-07-10 22:06:48 -04:00
Mark 98dc6fa252 Fix Bug #1742
Fixed and tested other problems in tutorial 3 and 4, too
2016-06-01 20:40:26 +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
Mark 72c7e4dd87 Merge remote-tracking branch 'origin/master' into liquid_container 2016-04-23 11:10:26 +02:00
Maikel de Vries 34491fbd0d fix reset of wealth when a player rejoins after game start in worlds 2016-04-17 10:38:30 +02:00
Maikel de Vries fd36babdfd add vine to aerobatics and gem grabbers 2016-04-13 22:04:16 +02:00
Mark da87ac2d69 Bugfix: Called wrong function 2016-02-16 21:08:04 +01:00
Mark 9d17cff91e Refactoring: Removed old barrel functions
Replaced old barrel functions with the liquid container library calls
2016-02-16 21:01:59 +01:00
Maikel de Vries 159dbf071f make ContactCalls a property instead of DefCore entry
This allows for useful runtime changes, like disabling contact calls when an animal dies.
2016-02-08 21:25:43 +01:00
Maikel de Vries 0ac6093b1a improvements to gem grabbers
- bats as a challenge
- less gem mining on normal
- everrock on insane
- basements for shipyard and inventors lab
2016-02-04 17:53:59 +01:00
Maikel de Vries 456678afbd add new items to worlds knowledge 2016-02-04 17:52:21 +01: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 91e7da6fbd update license of Sky.jpg in Clonkomotive to cc-by 3.0 2016-01-19 19:11:13 +01:00
Clonkonaut ce7d8014ec Clonkomotive: German translation (#1632).
I also took the liberty of renaming "HeavyCrumb" to "Boulder". I have never heard the word 'crumb' used in this context.
2016-01-19 18:17:03 +01:00
Maikel de Vries aec5184cf2 locomotive in clonkomotive accepts metal barrels as well 2016-01-12 22:43:35 +01:00
Clonkonaut f0a03b303b Fixed ownership of buildings.
I must be mad. This script failed a lot of times. I had to add those brackets. Even then, the first run failed, the buildings were still ownerless. What is this sorcery.
2016-01-12 22:01:47 +01:00
Maikel de Vries f1a9db89bf increase gems in landscape to make sure goal can be completed 2016-01-10 20:54:03 +01:00
Sven Eberhardt 3dad1c6d81 Turn MaxContentsCount and HandObjects into properties instead of callbacks (Possibly fixes #1553) 2016-01-10 10:41:34 -05:00
Günther Brammer 00a4c6c428 Replace BorderBound DefCore value with BorderBound object property 2016-01-01 22:18:41 +01:00
Maikel de Vries 03ef09135e scenarios: some fine-tuning to clonkomotive 2015-12-31 10:33:27 +01:00
Maikel de Vries 64af1e2a8a stars: fix placement and allow scenarios to change placement 2015-12-30 11:36:30 +01:00
Maikel de Vries c8dff941dc worlds descriptions: fix whitespace and typos 2015-12-29 23:14:01 +01:00
Maikel de Vries 568c57900b add new world: Clonkomotive (thanks to Pyrit)
Based on a round made by Pyrit, changed to fit into the worlds folder.
2015-12-29 22:40:52 +01:00
Maikel de Vries 5b1d7d86a5 remove double initialization of wealth HUD in GoldRush 2015-12-29 22:40:52 +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 21ffb18c4d show wealth in HUD for all worlds 2015-12-27 00:18:17 +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
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
Maikel de Vries a3af12e8a5 fix Flooded Veins map (#1493) 2015-12-11 23:32:33 +01:00
Sven Eberhardt 1ac897127f Add farming objects and knowledge to Gem Grabbers to be able to build airship. 2015-12-06 15:44:49 -05:00
Clonkonaut 6cd2faf582 Disabled wealth display by default (#1425).
Can be shown by using GUI_Controller->ShowWealth(). Did that for GoldRush but see bug #1477.
2015-12-05 12:42:52 +01:00
Maikel de Vries 2be6988829 fix updating of time object when set by script 2015-11-21 21:25:16 +01: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
Sven Eberhardt 320b6ecad0 Fix script error on volcano if no lava insertion position could be found. 2015-11-20 18:54:23 -05:00
David Dormagen cb2b189ff9 removed Library_GoldSeller
Valuables are now solely sold by putting them into the flag. This is consistent with everything else now.
2015-11-07 22:56:57 +01:00