diff --git a/gulpfile.js b/gulpfile.js index 28ad1fd..7df7ee5 100755 --- a/gulpfile.js +++ b/gulpfile.js @@ -70,9 +70,8 @@ const client = new Project( sources: ['src/client/haxe'], main: 'ru.m.tankz.Client', assets: ['src/client/resources'], - //flags: ['bitmap_text'], flags: [ - 'dom', + //'dom', //'dev_layout', //'bitmap_text', ], diff --git a/package.json b/package.json index 4d725ec..d9637d7 100755 --- a/package.json +++ b/package.json @@ -1,18 +1,19 @@ { "name": "tankz", - "version": "0.7.5", + "version": "0.8.0", "private": true, "devDependencies": { "dateformat": "^3.0.3", "gulp": "^4.0.0", + "gulp-add": "0.0.2", "gulp-clean": "^0.4.0", "gulp-haxetool": "^0.0.14" }, "haxeDependencies": { - "haxework": "git@bitbucket.org:shmyga/haxework.git", + "haxework": "0.9.0", "lime": "7.2.1", "openfl": "8.8.0", - "hxcpp": "4.0.4", + "hxcpp": "4.0.8", "promhx": "1.1.0", "protohx": "0.4.6", "yaml": "1.3.0", @@ -20,8 +21,5 @@ "yield": "2.0.0", "haxe-crypto": "0.0.7", "svg": "1.1.2" - }, - "dependencies": { - "gulp-add": "0.0.2" } } diff --git a/src/editor/haxe/ru/m/tankz/editor/frame/TankFrame.hx b/src/editor/haxe/ru/m/tankz/editor/frame/TankFrame.hx index fb56c35..7c62030 100644 --- a/src/editor/haxe/ru/m/tankz/editor/frame/TankFrame.hx +++ b/src/editor/haxe/ru/m/tankz/editor/frame/TankFrame.hx @@ -1,6 +1,5 @@ package ru.m.tankz.editor.frame; -import ru.m.draw.Color; import ru.m.tankz.editor.tank.TankView; import haxework.gui.InputView; import haxework.gui.HGroupView; @@ -18,6 +17,6 @@ import haxework.gui.HGroupView; } public function onChange(?_):Void { - tank.color = Color.fromString('#${colorR.text}${colorG.text}${colorB.text}'); + tank.color = '#${colorR.text}${colorG.text}${colorB.text}'; } } diff --git a/src/editor/haxe/ru/m/tankz/editor/tank/TankView.hx b/src/editor/haxe/ru/m/tankz/editor/tank/TankView.hx index c73b714..00cc4c5 100644 --- a/src/editor/haxe/ru/m/tankz/editor/tank/TankView.hx +++ b/src/editor/haxe/ru/m/tankz/editor/tank/TankView.hx @@ -1,10 +1,10 @@ package ru.m.tankz.editor.tank; -import ru.m.draw.BitmapUtil; -import ru.m.draw.Color; -import flash.display.BitmapData; import flash.display.Bitmap; +import flash.display.BitmapData; +import haxework.color.Color; import haxework.gui.View; +import ru.m.draw.BitmapUtil; class TankView extends View {