marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
openclonk/planet/Missions.ocf/DarkCastle.ocs
History
Clonkonaut d291623f24 Merge remote-tracking branch 'remotes/origin/master' into heavy-resources 
Conflicts:
	planet/Arena.ocf/Hideout.ocs/Material.ocg/Amethyst.ocm
	planet/Arena.ocf/Hideout.ocs/Material.ocg/Ruby.ocm
	planet/Missions.ocf/AcidDrilling.ocs/Scenario.txt
	planet/Missions.ocf/DeadlyGrotto.ocs/Scenario.txt
	planet/Missions.ocf/GoldenMountain.ocs/Scenario.txt
	planet/Missions.ocf/MineRescue.ocs/Scenario.txt
	planet/Missions.ocf/Skylands.ocs/Scenario.txt
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/Worlds.ocf/AcidGoldMine.ocs/Scenario.txt
	planet/Worlds.ocf/GoldRush.ocs/Scenario.txt
	planet/Worlds.ocf/IronPeak.ocs/Scenario.txt
	planet/Worlds.ocf/Krakatoa.ocs/Scenario.txt
	planet/Worlds.ocf/RubyCave.ocs/Scenario.txt
 		2014-05-09 19:45:52 +02:00
..
AssassinationGoal.ocd Added GetDescription to all goals 2014-02-17 20:41:02 +01:00
Dialogue.ocd Fix DarkCatle null pointers and intro (#1034) 2014-02-16 13:55:46 +01:00
EnvironmentObjs.ocd Reworked "Save as scenario" option in editor to write a script file instead of Game.txt. 2013-12-27 17:10:09 +01:00
LargeCaveMushroomPoison.ocd Renamed Settlement.ocf to Missions.ocf 2013-10-05 17:39:14 +02:00
Material.ocg replace sulphur material with firestone material 2014-01-11 22:29:19 +07:00
System.ocg renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle 2013-12-17 22:32:01 +01:00
DescDE.rtf Proofreading and adding missing (German) descriptions of scenarios 2014-01-25 22:05:11 +07:00
DescUS.rtf Proofreading and adding missing (German) descriptions of scenarios 2014-01-25 22:05:11 +07:00
Map.bmp Renamed Settlement.ocf to Missions.ocf 2013-10-05 17:39:14 +02:00
Objects.c Decoration.ocd added and includes ruins from DarkCastle 2014-04-06 15:50:06 +02:00
Scenario.txt Merge remote-tracking branch 'remotes/origin/master' into heavy-resources 2014-05-09 19:45:52 +02:00
Script.c Fix DarkCatle null pointers and intro (#1034) 2014-02-16 13:55:46 +01:00
StringTblDE.txt Renamed Settlement.ocf to Missions.ocf 2013-10-05 17:39:14 +02:00
StringTblUS.txt Renamed Settlement.ocf to Missions.ocf 2013-10-05 17:39:14 +02:00
Teams.txt Renamed Settlement.ocf to Missions.ocf 2013-10-05 17:39:14 +02:00
Title.txt Renamed Settlement.ocf to Missions.ocf 2013-10-05 17:39:14 +02:00