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
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
David Dormagen 6e00a2bd91 chine: make clear that the golden cannon only has infinite gunpowder (not ammunition) (#1432) 2015-10-28 18:53:32 +01:00
Clonkonaut 64d1b89f43 Added tree variations to Golden Mountain, Gold Rush and Iron Peak. 2015-10-25 14:33:58 +01:00
Clonkonaut b8e6b224ef Make sure starting lorry and the crew aren't stuck and do not fall off the cliff. 2015-10-25 14:21:04 +01:00
Clonkonaut 8cbdf137c7 Make sure the starting lorry isn't stuck. 2015-10-25 14:20:16 +01:00
Sven Eberhardt b274067746 Fix AcidRift map (#1422). 
It used "^*" to match free space, including transparent pixels. However, transparent pixels aren't matched by "^*".

I think transparent pixels getting matched by "^*" was actually a bug in previous versions, which got fixed by ck's background materials implementation.
 2015-10-16 00:26:43 -04:00
Clonkonaut 5e93e60695 Krakatoa: Fixed description to new goal. 2015-10-12 22:58:04 +02:00
Clonkonaut b9da09de4e Krakatoa: Show goal icon depending on difficulty setting. 2015-10-12 22:53:42 +02:00
Clonkonaut 4443298b6d Goal icons added to Krakatoa and Chine (#1142). 2015-10-12 22:30:11 +02:00
Maikel de Vries f65da54ce8 use everrock in Krakatoa.ocs 2015-10-08 19:19:07 +02:00
Clonkonaut 9a197cbfc6 Added Knowledge and Base Material funcs for farming tools / products. 2015-10-05 13:18:27 +02:00
Clonkonaut ba82d75a31 Added Cloth to home base material in AcidRift (#1356). 2015-10-05 13:17:58 +02:00
Clonkonaut 0aab3cf4e6 Added new material textures by Nachtfalter and Matthi. 2015-10-05 02:02:36 +02:00
Armin 895d5f1b0e Add german Flooden Veins description and correct some mistakes. 2015-10-01 18:46:35 +02:00
Julius Michaelis 0d1a0241f9 Fix umlauts and typo in GoldRush dialogue 2015-09-29 21:30:57 +02:00
Maikel de Vries 4c66cc4ad7 change time interface to remove connection between System.ocg and Objects.ocd 2015-09-22 23:31:17 +02:00
Maikel de Vries 8d18b61403 remove energy bars from Krakatoa (#1366) 2015-09-19 07:57:56 +02:00
David Dormagen ac738735b2 Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Vehicles.ocd/Airplane.ocd/Script.c
	src/game/C4Game.cpp
	src/game/C4GraphicsSystem.cpp
	src/gamescript/C4GameScript.cpp
 2015-09-02 08:19:34 +02:00
Peter Wortmann 30857e835e Shader gamma implementation 
In comparison to the old system, this is a downgrade - instead of being
able to set a full color mapping by gamma ramp, we now get just a value
per colour channel.

Upside is that we do not need to play around with the global gamma ramps
any more, which was arguably the wrong way to do it.

This commit will likely break everything that has been using gamma so far.
 2015-08-31 17:35:08 +01:00
Maikel de Vries 2aa753c6a5 acid gold mine: map script and scenario parameters 
The landscape and difficulty settings still require some fine tuning.
 2015-08-18 18:41:26 +02:00
Maikel de Vries a61a91798b move DrawMaterial to map library functions 2015-08-18 12:36:59 +02:00
Maikel de Vries 5126e86315 fix wallkit in Krakatoa (#1363) 2015-08-03 20:18:54 +02:00
David Dormagen 36544bd56c Merge branch 'master' into Controls 
Conflicts:
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/Objects.ocd/Structures.ocd/Foundry.ocd/Script.c
	planet/Objects.ocd/Vegetation.ocd/Branch.ocd/Script.c
	planet/Objects.ocd/Vegetation.ocd/Trunk.ocd/Script.c
	planet/System.ocg/FindLocation.c
 2015-08-02 19:24:04 +02:00
Sven Eberhardt ed2e56c3fa Fix Loc_Space and allow direction parameter instead of just horizontal/vertical. 
The old implementation was buggy as it would disallow the location if it had too much space (and PathFree2 returns nil). It also doesn't make sense to ask for a location that has space in either direction of a dimension because the location is not automatically adjusted to lie at the center of that space. For example, it would effectively cause fish to spawn directly at walls sometimes.
 2015-07-31 00:42:01 -04:00
Sven Eberhardt 0d48105b46 Added shape library. 
Also fixed some coconut tree reproduction issues.
 2015-07-31 00:42:01 -04:00
Maikel de Vries 3a6bcaafb6 use new script gui for goal and wealth HUD 2015-06-03 22:36:36 +02:00
Maikel de Vries 73ebce9f9a remove celestial environment object in favor of scenario callback 2015-04-08 20:18:24 +02:00
Maikel de Vries 67cf7cd4fe fix mushroom bugs (#1051) and (#1291) 2015-03-25 20:04:52 +01:00
Maikel de Vries 302c3db0b3 correct league parameter values for Acid Rift 2015-03-23 18:12:35 +01:00
Maikel de Vries 2226575dce new icon for Acid Rift (#1284) 2015-03-17 19:54:49 +01:00
Maikel de Vries 1bf222ab7e don't place branch and trunk in liquids 2015-03-15 18:08:14 +01:00
Maikel de Vries d1577dce61 fix failure sequence for Chine.ocs 2015-02-16 20:29:45 +01:00
Maikel de Vries ce37dc181e clean up of the flag library 
This might have fixed the appearance of flag markers at the flag's center.
 2015-02-08 13:07:56 +01:00
Maikel de Vries 314680ae04 more materials for Chine scenario 
This is needed for a succesful completion of this round through various strategies
 2015-01-26 20:48:53 +01:00
Mark d7a88eea62 Use CreateObject() in scripts (#1214) 
Objects with id Rule_*, Goal_*, and Environment_* are created with CreateObject() now.
 2015-01-11 19:04:42 +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 9c0263faef add title image to Acid Rift 2015-01-09 20:00:41 +01:00
Maikel de Vries 36b29fd32e adapt scenarios to rank->branch change 2015-01-07 00:04:44 +01:00
Maikel de Vries a3bb831b33 add torch to basic knowledge for all worlds 2015-01-07 00:04:44 +01:00
Tobias Zwick 659a697cf2 fix ShakeViewport effect, especially for explosions 
* The shake effect used to have a target object, which made it vanish as soon as it is removed (and on Explode, it is immediately). So, the shake was never visible. The shake effect is now global and manages all shakes currently on the landscape
* Additionally, if there are several explosions that cause a shake, they were not added up correctly
 2015-01-03 22:53:01 +01:00
Maikel de Vries 588b75955f correct bottom open for Chine.ocs 2014-12-30 14:13:34 +01:00
Maikel de Vries c6802b8776 increase game content version entries to 6.0 2014-12-12 22:58:16 +01:00
Maikel de Vries 868b17b6d7 improved difficulties for Krakatoa 2014-10-26 15:58:48 +01:00
Maikel de Vries 399524330d new title image for Krakatoa 2014-10-26 11:27:25 +01:00
Maikel de Vries e715fd4e70 Krakatoa: new goal and intro sequence 2014-10-24 21:57:05 +02:00
Maikel de Vries 6c1e45519d fixed player spawning in Krakatoa 2014-10-22 16:32:22 +02:00
Maikel de Vries 717ea1a031 reworked Krakatoa landscape, is now map script 2014-10-22 16:23:32 +02:00
Sven Eberhardt aadd8176cb AcidRift: Fix scale precipitation, meteorites and rockfall by map size. 2014-10-21 21:18:10 +02:00
Sven Eberhardt 516cd46c37 AcidRift: Scale precipitation, meteorites and rockfall by map size. 
(in addition to scaling on difficulty)
 2014-10-21 20:48:09 +02:00
Sven Eberhardt 257cbf1a9f Insane difficulty of Acid Rift tweaked. 2014-10-19 20:01:55 +02:00
Sven Eberhardt 8a7a96a453 More rain in Acid Rift. 2014-10-19 17:12:17 +02:00
Maikel de Vries b5a84eba87 move TransposeArray to System.ocg functions 2014-10-19 10:49:12 +02:00
Maikel de Vries 406821f92a correct difficulty for acid rift 2014-10-18 18:42:30 +02:00
Maikel de Vries 85646c7a8e removed cloud vertices 2014-10-18 18:41:56 +02:00
Maikel de Vries 83930ee27f fixed cloud movement in ironpeak(#1149) 2014-10-18 12:52:06 +02:00
Sven Eberhardt 1f3c53cec1 New world: Acid Rift. 2014-10-18 01:19:21 +02:00
Maikel de Vries 9142faff36 more loam for Chine on normal difficulty 2014-10-12 16:56:34 +02:00
Maikel de Vries d5cb53b952 title images for the worlds 2014-10-04 13:12:29 +02:00
Maikel de Vries 7153b17812 achievements for worlds inside .ocf 2014-10-03 18:48:25 +02:00
Maikel de Vries 411c34fb5c league param settings for worlds 2014-10-03 14:58:48 +02:00
Maikel de Vries 9e0304cd5a rockfall as disaster 2014-10-03 14:37:44 +02:00
Sven Eberhardt 8b322a23b5 Added German translation for IronPeak. 2014-10-02 22:15:27 +02:00