Update of dependencies + some fixes

MattTuttle · Mar 5, 2014 · 4b3ac6a · 4b3ac6a
1 parent 60fb60c
commit 4b3ac6a
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 11 deletions.
diff --git a/com/haxepunk/graphics/Text.hx b/com/haxepunk/graphics/Text.hx
@@ -39,7 +39,9 @@ abstract StyleType(TextFormat)
 	@:to public function toTextformat():TextFormat return this;
 
 	@:from public static inline function fromTextFormat(format:TextFormat) return new StyleType(format);
-	@:from public static inline function fromDynamic(object:Dynamic) {
+	@:from public static inline function fromTextOptions(object:TextOptions) return fromDynamic(object);
+	@:from public static inline function fromDynamic(object:Dynamic)
+	{
 		var format = new TextFormat();
 		for (key in Reflect.fields(object))
 		{

diff --git a/com/haxepunk/graphics/atlas/AtlasData.hx b/com/haxepunk/graphics/atlas/AtlasData.hx
@@ -154,8 +154,12 @@ class AtlasData
 	{
 		if (_dataIndex != 0)
 		{
+			#if !html5
 			_tilesheet.drawTiles(_scene.sprite.graphics, _data, Atlas.smooth, _renderFlags, _dataIndex);
 			_dataIndex = 0;
+			#else
+			_tilesheet.drawTiles(_scene.sprite.graphics, _data, Atlas.smooth, _renderFlags);
+			#end
 		}
 	}
 

diff --git a/examples/src/layers/LayerScene.hx b/examples/src/layers/LayerScene.hx
@@ -50,4 +50,4 @@ class LayerScene extends DemoScene
 		addGraphic(text, -5, HXP.halfWidth, HXP.halfHeight);
 	}
 
-}
+}
diff --git a/haxelib.json b/haxelib.json
@@ -4,17 +4,17 @@
 	"license": "MIT",
 	"tags": ["flash", "game", "cpp", "openfl"],
 	"description": "A Haxe port of the FlashPunk AS3 engine.",
-	"version": "2.5.1",
+	"version": "2.5.2",
 	"releasenote": "See CHANGELOG",
 	"contributors": ["heardtheword", "ibilon"],
 	"dependencies": { },
 	"install": {
-		"lime": "0.9.3",
-		"lime-tools": "1.2.7",
-		"openfl": "1.2.2",
-		"openfl-native": "1.2.2",
+		"lime": "0.9.5",
+		"lime-tools": "1.3.0",
+		"openfl": "1.2.3",
+		"openfl-native": "1.2.3",
 		"openfl-bitfive": "1.0.5",
-		"openfl-html5-dom": "1.2.0",
+		"openfl-html5-dom": "1.2.1",
 		"openfl-ouya": "1.0.2"
 	}
 }
diff --git a/include.xml b/include.xml
@@ -5,10 +5,10 @@
 	<assets path="assets/graphics" rename="gfx" include="*.png" />
 	<assets path="assets/font" rename="font" include="*.ttf" />
 
-	<haxelib name="openfl-ouya" if="ouya" />
+	<haxelib name="openfl-ouya" if="ouya" version="1.0.2" />
 	<section if="js">
-		<haxelib name="openfl-html5-dom" version="1.2.0" />
+		<haxelib name="openfl-html5-dom" version="1.2.1" />
 		<haxelib name="openfl-bitfive" version="1.0.5" />
 	</section>
-	<haxelib name="openfl" version="1.2.2" />
+	<haxelib name="openfl" version="1.2.3" />
 </project>