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
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
Sven Eberhardt f87f115ef4 Added German translation for GoldRush. 2014-10-02 22:15:27 +02:00
Sven Eberhardt 23c39216dd Added German translation for GemGrabbers. 2014-10-02 22:15:27 +02:00
Sven Eberhardt c991f156b6 Added German translation for FloodedVeins. 2014-10-02 22:15:27 +02:00
Sven Eberhardt 03cb37eb12 Added German translation for Chine. 2014-10-02 22:15:26 +02:00
Maikel de Vries d24ae4eb46 allow for infinite gunpowder in the powder keg 2014-09-29 20:10:58 +02:00
Maikel de Vries 72a26d029a better difficulty levels for FloodedVeins 2014-09-28 17:06:13 +02:00
Maikel de Vries aa0528c95f improved Chine map 2014-09-28 10:56:32 +02:00
Maikel de Vries ef6930414f removed a few unused variables in Worlds.ocf 2014-09-27 15:29:34 +02:00
Sven Eberhardt 701e28b7fa Chine icon changed to cannon. 2014-09-27 01:08:35 +02:00
Maikel de Vries 3ed341c342 added intro sequence for Chine 2014-09-26 22:08:19 +02:00
Maikel de Vries 6f7b8027f0 implemented lobby options for GemGrabbers 2014-09-26 21:50:03 +02:00
Maikel de Vries 7d5f2effb4 implemented lobby options for Chine 2014-09-26 19:33:19 +02:00
Maikel de Vries dfef8992be implemented lobby options for FloodedVeins 2014-09-26 19:33:19 +02:00
Maikel de Vries e93e6b8eab implemented lobby options for IronPeak 2014-09-26 19:33:19 +02:00
Maikel de Vries 908ebb3a63 implemented lobby options for GoldRush 2014-09-26 19:05:42 +02:00
Maikel de Vries ee7caaac2c Chine.ocs: improved map and added description 2014-09-23 19:48:30 +02:00
Maikel de Vries 7f6bf8c359 Chine.ocs: golden cannon with infinite ammo 2014-09-23 19:44:51 +02:00
Maikel de Vries 35c9aa9a78 new goal for Chine.ocs 2014-09-22 19:20:32 +02:00
Maikel de Vries 059a704f55 added new World: Chine.ocs 2014-09-21 18:37:48 +02:00
Maikel de Vries 77be7b01c2 fixed intro sequences for GoldRush and FloodedVeins 2014-09-21 16:53:39 +02:00
Sven Eberhardt dfa6050cd0 Put missions above worlds in scenario selection 2014-09-21 16:39:07 +02:00
Maikel de Vries de52ad2d4c fixed IronPeak intro 2014-09-21 16:29:57 +02:00
Maikel de Vries 2d186b6cf0 improved Flooded Veins map 2014-08-28 11:53:21 +02:00
Maikel de Vries 5274bf9d3e new world: Flooded Veins as replacement for Ruby Cave 2014-08-27 16:18:10 +02:00
Maikel de Vries f9f41b6e79 added intro sequence for Gold Rush 2014-08-23 22:47:47 +02:00
Maikel de Vries 46d3cd2a54 improve Iron Peak intro sequence 2014-08-23 21:20:37 +02:00
Maikel de Vries 47fec3c2e2 created intro sequence for Iron Peak 2014-08-23 18:44:28 +02:00
Maikel de Vries ae1b0ca383 make cave mushrooms look frozen 2014-08-23 18:43:05 +02:00
Maikel de Vries e98b1bd696 fix GoldRush difficulty 2014-07-27 20:04:16 +02:00
Maikel de Vries 7ab6b33d6a unify base materials in Worlds.ocf scenario folder 2014-07-14 21:31:22 +02:00
Maikel de Vries 30435782d4 unify knowledge in Worlds.ocf scenario folder 2014-07-14 21:01:14 +02:00
Sven Eberhardt 0d17310a7a Ruby and Amethyst material moved to main Material.ocg 2014-07-12 12:33:01 +02:00
Maikel de Vries 69fb0e52e6 fixed GoldRush descriptions 2014-07-06 18:28:20 +02:00
Maikel de Vries 4967b07a39 Iron Peak game goal is now metal production and expansion 2014-07-06 18:13:09 +02:00
Maikel de Vries a08b5bcdb8 added construct gold idol goal to GoldRush.ocs 2014-07-06 17:27:03 +02:00
Maikel de Vries acecebfdd6 improved knowledge for Krakatoa scenario 2014-05-30 10:17:04 +02:00
Maikel de Vries e73de734d1 added basement to worlds' player knowledge 2014-05-27 20:21:43 +02:00
Maikel de Vries fcf560bad3 Fixed IronPeak player view range 
... and some small clean ups
 2014-04-21 13:15:06 +02:00
Maikel de Vries 47fa8ef4a1 Implemented SetBase* for BaseMaterial library 2014-04-17 18:01:18 +02:00
Maikel de Vries 9b96ab2305 Cleaned up base material in library and engine 
* rename to cleaner *Base* instead of *HomeBase*
* fixed library implementation
* engine code is now obsolete
 2014-04-16 14:07:01 +02:00
Maikel de Vries adbe3c629b GemGrabbers: gems stalactites reappear to allow for more risky game play 2014-02-23 17:22:57 +01:00
Pyrit c33ef06909 Fix sky scrolling for several scenarios. 
SkyScrollMode=1 in Scenario.txt is broken, so I used  SetSkyParallax() in the script.
 2014-01-26 17:39:11 +01:00
Tobias Zwick 44f0cc7205 move RubyCave to Worlds for now 2014-01-26 22:56:31 +07:00
Tobias Zwick acba8cad36 update the descriptions for missions and world to hopefully make the distinction between the two more apparent 2014-01-26 20:01:50 +07:00
Sven Eberhardt a9f4e7d0d7 AcidGoldMine: Reduced amount of fire stone material and made sure it only occurs further down in the cave. 
The transition from sulphur to fire stone made this scenario hellishly hard. Meteors would hit the fire stone material and cause a chain reaction that would flood the cave.

This can still happen, but at least you get some more time now.
 2014-01-25 23:06:03 +01:00
Tobias Zwick a423a62bb2 Proofreading and adding missing (German) descriptions of scenarios 2014-01-25 22:05:11 +07:00
Tobias Zwick f6e98d61e2 replace sulphur material with firestone material 2014-01-11 22:29:19 +07:00
Maikel de Vries 746051b6e9 Balloon now producible in inventors lab 
Also added to Gem Grabbers, note that the balloon needs cloth and is still impossible to produce therefore.
 2013-11-02 12:18:08 +01:00
Maikel de Vries 7789f9586a Replaced IronPeak Landscape.txt with Map.c 2013-10-13 11:34:45 +02:00
Maikel de Vries a92331951e Introduced Map Script for Gold Rush 
Also did a few minor changes to the scenario script
 2013-10-13 09:52:11 +02:00
Maikel de Vries 1118a31752 Fixed a OCScript runtime error for the lightning strike 2013-10-07 19:10:25 +02:00
Maikel de Vries f94a306f55 Move scenarios Gold Rush, Iron Peak, Krakatoa and AcidGoldMine to Worlds.ocf 2013-10-05 11:07:49 +02:00
Maikel de Vries c27d6c3b79 Fix home base material for Gem Grabbers 2013-10-04 16:52:20 +02:00
Maikel de Vries 7de2d7f617 Add new scenario Gem Grabbers to Worlds.ocf 2013-10-04 15:39:37 +02:00
Maikel de Vries ae6bafe292 Added scenario folder Worlds.ocf 
We are starting to have too many settlement scenarios for one folder. This folder will contain all settlement scenarios with simple goals like mining, production or expansion. And these scenarios should all have dynamic maps and should be playable even after goal completion.

I will add the scenarios Gold Rush, Iron Peak and Conquest of Krakatoa and maybe other later, once I am done adjusting them.
 2013-10-04 15:38:33 +02:00