marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
openclonk/planet/Objects.ocd/Clonk.ocd
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
..
Animations.ocd Change == and != to do pointer comparison on arrays and proplists (formerly === and !==). Remove === and !=== and introduce function DeepEqual for contents comparison. 2014-04-19 22:33:31 +02:00
Backpack.ocd clean up files, make non-transparent textures high-quality JPEGs 2013-05-26 16:48:12 +02:00
Grave.ocd don't display the death message on graves if the message is empty (#896) 2013-11-30 14:42:52 +07:00
Clonk.jpg clean up files, make non-transparent textures high-quality JPEGs 2013-05-26 16:48:12 +02:00
Clonk.skeleton Fixed rotation offset of secondary tool when using shield in primary hand 2012-11-11 10:56:37 -08:00
DefCore.txt Tweak the "corner scale" behaviour 2012-06-08 16:17:42 +02:00
Graphics.mesh Clonk: All skins share Clonk.ocd directory and Clonk.skeleton. Nicer looking pickaxe animation. 2012-11-01 01:20:26 -07:00
GraphicsAlchemist.mesh Clonk: All skins share Clonk.ocd directory and Clonk.skeleton. Nicer looking pickaxe animation. 2012-11-01 01:20:26 -07:00
GraphicsFarmer.mesh Clonk: All skins share Clonk.ocd directory and Clonk.skeleton. Nicer looking pickaxe animation. 2012-11-01 01:20:26 -07:00
GraphicsSteampunk.mesh Clonk: All skins share Clonk.ocd directory and Clonk.skeleton. Nicer looking pickaxe animation. 2012-11-01 01:20:26 -07:00
Overlay.png Normalize all clonk textures to 512x 2011-10-12 12:08:30 -07:00
RankDE.txt Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00
RankUS.txt Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00
Roll.ogg update authors and license information 2011-08-31 17:20:25 +02:00
Rustle1.ogg update authors and license information 2011-08-31 17:20:25 +02:00
Rustle2.ogg update authors and license information 2011-08-31 17:20:25 +02:00
Rustle3.ogg update authors and license information 2011-08-31 17:20:25 +02:00
Rustle4.ogg update authors and license information 2011-08-31 17:20:25 +02:00
RustleLand.ogg update authors and license information 2011-08-31 17:20:25 +02:00
Scene.material clean up files, make non-transparent textures high-quality JPEGs 2013-05-26 16:48:12 +02:00
SceneAlchemist.material Make Clonk loadable again 2013-05-26 18:29:26 +02:00
SceneFarmer.material clean up files, make non-transparent textures high-quality JPEGs 2013-05-26 16:48:12 +02:00
SceneSteampunk.material clean up files, make non-transparent textures high-quality JPEGs 2013-05-26 16:48:12 +02:00
Script.c Merge remote-tracking branch 'remotes/origin/master' into heavy-resources 2014-05-09 19:45:52 +02:00
StepHard1.ogg Replaced sounds, license now CC BY 3.0 2012-01-19 17:30:01 +00:00
StepHard2.ogg Replaced sounds, license now CC BY 3.0 2012-01-19 17:30:01 +00:00
StepHard3.ogg Replaced sounds, license now CC BY 3.0 2012-01-19 17:30:01 +00:00
StepHard4.ogg Replaced sounds, license now CC BY 3.0 2012-01-19 17:30:01 +00:00
StepHard5.ogg Replaced sounds, license now CC BY 3.0 2012-01-19 17:30:01 +00:00
StepSoft1.ogg Replaced sounds, license now CC BY 3.0 2012-01-19 17:30:01 +00:00
StepSoft2.ogg Replaced sounds, license now CC BY 3.0 2012-01-19 17:30:01 +00:00
StepSoft3.ogg Replaced sounds, license now CC BY 3.0 2012-01-19 17:30:01 +00:00
StepSoft4.ogg Replaced sounds, license now CC BY 3.0 2012-01-19 17:30:01 +00:00
StepSoft5.ogg Replaced sounds, license now CC BY 3.0 2012-01-19 17:30:01 +00:00
StepSoft6.ogg Replaced sounds, license now CC BY 3.0 2012-01-19 17:30:01 +00:00
StringTblDE.txt Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00
StringTblUS.txt Change .c4d extension to .ocd 2011-03-13 16:55:00 +01:00
authors.txt Replaced sounds, license now CC BY 3.0 2012-01-19 17:30:01 +00:00
clonkAlchemist.jpg clean up files, make non-transparent textures high-quality JPEGs 2013-05-26 16:48:12 +02:00
clonkAlchemistOverlay.png Clonk: All skins share Clonk.ocd directory and Clonk.skeleton. Nicer looking pickaxe animation. 2012-11-01 01:20:26 -07:00
clonkFarmer.jpg clean up files, make non-transparent textures high-quality JPEGs 2013-05-26 16:48:12 +02:00
clonkFarmerOverlay.png Clonk: All skins share Clonk.ocd directory and Clonk.skeleton. Nicer looking pickaxe animation. 2012-11-01 01:20:26 -07:00
clonkSteampunk.jpg clean up files, make non-transparent textures high-quality JPEGs 2013-05-26 16:48:12 +02:00
clonkSteampunkOverlay.png Clonk: All skins share Clonk.ocd directory and Clonk.skeleton. Nicer looking pickaxe animation. 2012-11-01 01:20:26 -07:00