openclonk/planet/Tests.ocf
David Dormagen 196f528201 Merge branch 'master' into Controls
Conflicts:
	planet/Objects.ocd/HUD.ocd/FancyGridMenu.ocd/DefCore.txt
	planet/Objects.ocd/HUD.ocd/GridMenu.ocd/DefCore.txt
	planet/Objects.ocd/Helpers.ocd/Dummy.ocd/Graphics.png
	planet/Objects.ocd/Items.ocd/Tools.ocd/WindBag.ocd/Script.c
	planet/Objects.ocd/Items.ocd/Weapons.ocd/Javelin.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/ClonkControl.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Constructor.ocd/ConstructionMenu.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Constructor.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Flag.ocd/Marker.ocd/Script.c
	planet/Objects.ocd/Libraries.ocd/Producer.ocd/Script.c
	planet/Objects.ocd/Structures.ocd/Flagpole.ocd/Script.c
	planet/Objects.ocd/Structures.ocd/Pump.ocd/Script.c
	src/game/C4Game.cpp
	src/gamescript/C4GameScript.cpp
	src/gui/C4GameMessage.cpp
	src/landscape/C4Landscape.cpp
2015-06-03 22:32:36 +02:00
..
AI.ocs AI can use grenade launcher. 2015-01-18 19:13:10 +01:00
ExplodeContainer.ocs fix title for explode container test 2015-02-04 10:35:16 +01:00
GrappleBow.ocs GrappleBow test: Sandbox scenario for using the grapple bow on various landscape shapes. 2013-09-08 13:00:37 +02:00
IncludeTest.ocs increase game content version entries to 6.0 2014-12-12 22:58:16 +01:00
LocalDefsOnly.ocs increase game content version entries to 6.0 2014-12-12 22:58:16 +01:00
MenuTest.ocs custom guis: correctly respect margins in grid layout and vertical layout 2015-01-20 20:44:13 +01:00
Minimal.ocs correctly implement handling of steady power producers 2015-02-04 10:35:14 +01:00
OneMillionParticles.ocs renamed DynamicParticles* to Particles* and CreateParticleEx to CreateParticle 2013-12-17 22:32:01 +01:00
PXSAndSmoke.ocs increase game content version entries to 6.0 2014-12-12 22:58:16 +01:00
Parameters.ocs CreateObject/CreateObjectAbove (#1214) 2015-01-11 19:02:03 +01:00
PowerSystem.ocs deactivate power producers correctly on over production 2015-03-09 21:50:19 +01:00
Pumps.ocs CreateObject/CreateObjectAbove (#1214) 2015-01-11 19:02:03 +01:00
ScriptError1.ocs Set titles for a few scenarios in Tests.ocf. 2014-10-03 21:58:33 +02:00
SkeletonAppend.ocs CreateObject/CreateObjectAbove (#1214) 2015-01-11 19:02:03 +01:00
SkeletonInclude.ocs CreateObject/CreateObjectAbove (#1214) 2015-01-11 19:02:03 +01:00
Underwater.ocs Set titles for a few scenarios in Tests.ocf. 2014-10-03 21:58:33 +02:00