diff --git a/assets/fonts/Montserrat/Montserrat Black 900.ttf b/assets/fonts/Montserrat/MontserratBlack900.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat Black 900.ttf rename to assets/fonts/Montserrat/MontserratBlack900.ttf diff --git a/assets/fonts/Montserrat/Montserrat Black Italic 900.ttf b/assets/fonts/Montserrat/MontserratBlackItalic900.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat Black Italic 900.ttf rename to assets/fonts/Montserrat/MontserratBlackItalic900.ttf diff --git a/assets/fonts/Montserrat/Montserrat Bold 700.ttf b/assets/fonts/Montserrat/MontserratBold700.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat Bold 700.ttf rename to assets/fonts/Montserrat/MontserratBold700.ttf diff --git a/assets/fonts/Montserrat/Montserrat Bold Italic 700.ttf b/assets/fonts/Montserrat/MontserratBoldItalic700.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat Bold Italic 700.ttf rename to assets/fonts/Montserrat/MontserratBoldItalic700.ttf diff --git a/assets/fonts/Montserrat/Montserrat ExtraBold 800.ttf b/assets/fonts/Montserrat/MontserratExtraBold800.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat ExtraBold 800.ttf rename to assets/fonts/Montserrat/MontserratExtraBold800.ttf diff --git a/assets/fonts/Montserrat/Montserrat ExtraBold Italic 800.ttf b/assets/fonts/Montserrat/MontserratExtraBoldItalic800.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat ExtraBold Italic 800.ttf rename to assets/fonts/Montserrat/MontserratExtraBoldItalic800.ttf diff --git a/assets/fonts/Montserrat/Montserrat ExtraLight 275.ttf b/assets/fonts/Montserrat/MontserratExtraLight275.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat ExtraLight 275.ttf rename to assets/fonts/Montserrat/MontserratExtraLight275.ttf diff --git a/assets/fonts/Montserrat/Montserrat ExtraLight Italic 275.ttf b/assets/fonts/Montserrat/MontserratExtraLightItalic 275.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat ExtraLight Italic 275.ttf rename to assets/fonts/Montserrat/MontserratExtraLightItalic 275.ttf diff --git a/assets/fonts/Montserrat/Montserrat Italic 400.ttf b/assets/fonts/Montserrat/MontserratItalic400.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat Italic 400.ttf rename to assets/fonts/Montserrat/MontserratItalic400.ttf diff --git a/assets/fonts/Montserrat/Montserrat Light 300.ttf b/assets/fonts/Montserrat/MontserratLight300.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat Light 300.ttf rename to assets/fonts/Montserrat/MontserratLight300.ttf diff --git a/assets/fonts/Montserrat/Montserrat Light Italic 300.ttf b/assets/fonts/Montserrat/MontserratLightItalic300.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat Light Italic 300.ttf rename to assets/fonts/Montserrat/MontserratLightItalic300.ttf diff --git a/assets/fonts/Montserrat/Montserrat Medium 500.ttf b/assets/fonts/Montserrat/MontserratMedium500.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat Medium 500.ttf rename to assets/fonts/Montserrat/MontserratMedium500.ttf diff --git a/assets/fonts/Montserrat/Montserrat Medium Italic 500.ttf b/assets/fonts/Montserrat/MontserratMediumItalic500.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat Medium Italic 500.ttf rename to assets/fonts/Montserrat/MontserratMediumItalic500.ttf diff --git a/assets/fonts/Montserrat/Montserrat Regular 400.ttf b/assets/fonts/Montserrat/MontserratRegular400.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat Regular 400.ttf rename to assets/fonts/Montserrat/MontserratRegular400.ttf diff --git a/assets/fonts/Montserrat/Montserrat_SemiBold_600.ttf b/assets/fonts/Montserrat/MontserratSemiBold600.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat_SemiBold_600.ttf rename to assets/fonts/Montserrat/MontserratSemiBold600.ttf diff --git a/assets/fonts/Montserrat/Montserrat SemiBold Italic 600.ttf b/assets/fonts/Montserrat/MontserratSemiBoldItalic600.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat SemiBold Italic 600.ttf rename to assets/fonts/Montserrat/MontserratSemiBoldItalic600.ttf diff --git a/assets/fonts/Montserrat/Montserrat Thin 250.ttf b/assets/fonts/Montserrat/MontserratThin250.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat Thin 250.ttf rename to assets/fonts/Montserrat/MontserratThin250.ttf diff --git a/assets/fonts/Montserrat/Montserrat Thin Italic 250.ttf b/assets/fonts/Montserrat/MontserratThinItalic250.ttf similarity index 100% rename from assets/fonts/Montserrat/Montserrat Thin Italic 250.ttf rename to assets/fonts/Montserrat/MontserratThinItalic250.ttf diff --git a/bin/flash/.files b/bin/flash/.files index b91d406..765bf98 100644 --- a/bin/flash/.files +++ b/bin/flash/.files @@ -1,2 +1,2 @@ -bin/flash/bin/assets/fonts/Montserrat/Montserrat_SemiBold_600.ttf +bin/flash/bin/assets/fonts/Montserrat/MontserratSemiBold600.ttf bin/flash/bin/manifest/default.json \ No newline at end of file diff --git a/bin/flash/bin/LPTCManager2026.swf b/bin/flash/bin/LPTCManager2026.swf index 0f83ba7..9585c98 100644 Binary files a/bin/flash/bin/LPTCManager2026.swf and b/bin/flash/bin/LPTCManager2026.swf differ diff --git a/bin/flash/haxe/ApplicationMain.hx b/bin/flash/haxe/ApplicationMain.hx index 89a937f..2d025d8 100644 --- a/bin/flash/haxe/ApplicationMain.hx +++ b/bin/flash/haxe/ApplicationMain.hx @@ -35,7 +35,7 @@ class ApplicationMain ManifestResources.init(config); #end - app.meta["build"] = "4"; + app.meta["build"] = "5"; app.meta["company"] = "Nekotoro"; app.meta["file"] = "LPTCManager2026"; app.meta["name"] = "LPTCManager2026"; diff --git a/bin/flash/haxe/ManifestResources.hx b/bin/flash/haxe/ManifestResources.hx index d9075ad..10f9901 100644 --- a/bin/flash/haxe/ManifestResources.hx +++ b/bin/flash/haxe/ManifestResources.hx @@ -68,13 +68,13 @@ import sys.FileSystem; } #if (openfl && !flash && !display) - openfl.text.Font.registerFont (__ASSET__OPENFL__assets_fonts_montserrat_montserrat_semibold_600_ttf); + openfl.text.Font.registerFont (__ASSET__OPENFL__assets_fonts_montserrat_montserratsemibold600_ttf); #end var data, manifest, library, bundle; - data = '{"name":null,"assets":"aoy4:sizei260936y4:typey4:FONTy9:classNamey60:__ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttfy2:idy27:Montserrat_SemiBold_600.ttfgh","rootPath":null,"version":2,"libraryArgs":[],"libraryType":null}'; + data = '{"name":null,"assets":"aoy4:sizei260936y4:typey4:FONTy9:classNamey58:__ASSET__assets_fonts_montserrat_montserratsemibold600_ttfy2:idy21:MontserratSemiBold600gh","rootPath":null,"version":2,"libraryArgs":[],"libraryType":null}'; manifest = AssetManifest.parse (data, rootPath); library = AssetLibrary.fromManifest (manifest); Assets.registerLibrary ("default", library); @@ -93,20 +93,20 @@ import sys.FileSystem; #if !display #if flash -@:keep @:bind @:noCompletion #if display private #end class __ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttf extends flash.text.Font { } +@:keep @:bind @:noCompletion #if display private #end class __ASSET__assets_fonts_montserrat_montserratsemibold600_ttf extends flash.text.Font { } @:keep @:bind @:noCompletion #if display private #end class __ASSET__manifest_default_json extends flash.utils.ByteArray { } #elseif (desktop || cpp) -@:keep @:font("assets/fonts/Montserrat/Montserrat_SemiBold_600.ttf") @:noCompletion #if display private #end class __ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttf extends lime.text.Font {} +@:keep @:font("assets/fonts/Montserrat/MontserratSemiBold600.ttf") @:noCompletion #if display private #end class __ASSET__assets_fonts_montserrat_montserratsemibold600_ttf extends lime.text.Font {} @:keep @:file("") @:noCompletion #if display private #end class __ASSET__manifest_default_json extends haxe.io.Bytes {} #else -@:keep @:expose('__ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttf') @:noCompletion #if display private #end class __ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttf extends lime.text.Font { public function new () { #if !html5 __fontPath = "assets/fonts/Montserrat/Montserrat_SemiBold_600.ttf"; #else ascender = null; descender = null; height = null; numGlyphs = null; underlinePosition = null; underlineThickness = null; unitsPerEM = null; #end name = "Montserrat SemiBold"; super (); }} +@:keep @:expose('__ASSET__assets_fonts_montserrat_montserratsemibold600_ttf') @:noCompletion #if display private #end class __ASSET__assets_fonts_montserrat_montserratsemibold600_ttf extends lime.text.Font { public function new () { #if !html5 __fontPath = "assets/fonts/Montserrat/MontserratSemiBold600.ttf"; #else ascender = null; descender = null; height = null; numGlyphs = null; underlinePosition = null; underlineThickness = null; unitsPerEM = null; #end name = "Montserrat SemiBold"; super (); }} #end @@ -114,10 +114,10 @@ import sys.FileSystem; #if (openfl && !flash) #if html5 -@:keep @:expose('__ASSET__OPENFL__assets_fonts_montserrat_montserrat_semibold_600_ttf') @:noCompletion #if display private #end class __ASSET__OPENFL__assets_fonts_montserrat_montserrat_semibold_600_ttf extends openfl.text.Font { public function new () { __fromLimeFont (new __ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttf ()); super (); }} +@:keep @:expose('__ASSET__OPENFL__assets_fonts_montserrat_montserratsemibold600_ttf') @:noCompletion #if display private #end class __ASSET__OPENFL__assets_fonts_montserrat_montserratsemibold600_ttf extends openfl.text.Font { public function new () { __fromLimeFont (new __ASSET__assets_fonts_montserrat_montserratsemibold600_ttf ()); super (); }} #else -@:keep @:expose('__ASSET__OPENFL__assets_fonts_montserrat_montserrat_semibold_600_ttf') @:noCompletion #if display private #end class __ASSET__OPENFL__assets_fonts_montserrat_montserrat_semibold_600_ttf extends openfl.text.Font { public function new () { __fromLimeFont (new __ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttf ()); super (); }} +@:keep @:expose('__ASSET__OPENFL__assets_fonts_montserrat_montserratsemibold600_ttf') @:noCompletion #if display private #end class __ASSET__OPENFL__assets_fonts_montserrat_montserratsemibold600_ttf extends openfl.text.Font { public function new () { __fromLimeFont (new __ASSET__assets_fonts_montserrat_montserratsemibold600_ttf ()); super (); }} #end diff --git a/bin/flash/obj/assets.swf b/bin/flash/obj/assets.swf index 4c9b007..aed8e10 100644 Binary files a/bin/flash/obj/assets.swf and b/bin/flash/obj/assets.swf differ diff --git a/bin/html5/.files b/bin/html5/.files index 31b2d45..34cbb9a 100644 --- a/bin/html5/.files +++ b/bin/html5/.files @@ -1,2 +1,2 @@ -bin/html5/bin/assets/fonts/Montserrat/Montserrat_SemiBold_600 +bin/html5/bin/assets/fonts/Montserrat/MontserratSemiBold600 bin/html5/bin/manifest/default.json \ No newline at end of file diff --git a/bin/html5/bin/assets/fonts/Montserrat/MontserratSemiBold600.ttf b/bin/html5/bin/assets/fonts/Montserrat/MontserratSemiBold600.ttf new file mode 100644 index 0000000..0ecc667 Binary files /dev/null and b/bin/html5/bin/assets/fonts/Montserrat/MontserratSemiBold600.ttf differ diff --git a/bin/html5/bin/fonts/MontserratBlack900.ttf b/bin/html5/bin/fonts/MontserratBlack900.ttf new file mode 100644 index 0000000..f0d24ad Binary files /dev/null and b/bin/html5/bin/fonts/MontserratBlack900.ttf differ diff --git a/bin/html5/bin/fonts/MontserratBlackItalic900.ttf b/bin/html5/bin/fonts/MontserratBlackItalic900.ttf new file mode 100644 index 0000000..5ce4afc Binary files /dev/null and b/bin/html5/bin/fonts/MontserratBlackItalic900.ttf differ diff --git a/bin/html5/bin/fonts/MontserratBold700.ttf b/bin/html5/bin/fonts/MontserratBold700.ttf new file mode 100644 index 0000000..9a425b9 Binary files /dev/null and b/bin/html5/bin/fonts/MontserratBold700.ttf differ diff --git a/bin/html5/bin/fonts/MontserratBoldItalic700.ttf b/bin/html5/bin/fonts/MontserratBoldItalic700.ttf new file mode 100644 index 0000000..ed61ca7 Binary files /dev/null and b/bin/html5/bin/fonts/MontserratBoldItalic700.ttf differ diff --git a/bin/html5/bin/fonts/MontserratExtraBold800.ttf b/bin/html5/bin/fonts/MontserratExtraBold800.ttf new file mode 100644 index 0000000..6725d53 Binary files /dev/null and b/bin/html5/bin/fonts/MontserratExtraBold800.ttf differ diff --git a/bin/html5/bin/fonts/MontserratExtraBoldItalic800.ttf b/bin/html5/bin/fonts/MontserratExtraBoldItalic800.ttf new file mode 100644 index 0000000..107f98d Binary files /dev/null and b/bin/html5/bin/fonts/MontserratExtraBoldItalic800.ttf differ diff --git a/bin/html5/bin/fonts/MontserratExtraLight275.ttf b/bin/html5/bin/fonts/MontserratExtraLight275.ttf new file mode 100644 index 0000000..2967eb6 Binary files /dev/null and b/bin/html5/bin/fonts/MontserratExtraLight275.ttf differ diff --git a/bin/html5/bin/fonts/MontserratExtraLightItalic 275.ttf b/bin/html5/bin/fonts/MontserratExtraLightItalic 275.ttf new file mode 100644 index 0000000..5d62085 Binary files /dev/null and b/bin/html5/bin/fonts/MontserratExtraLightItalic 275.ttf differ diff --git a/bin/html5/bin/fonts/MontserratItalic400.ttf b/bin/html5/bin/fonts/MontserratItalic400.ttf new file mode 100644 index 0000000..00fadbe Binary files /dev/null and b/bin/html5/bin/fonts/MontserratItalic400.ttf differ diff --git a/bin/html5/bin/fonts/MontserratLight300.ttf b/bin/html5/bin/fonts/MontserratLight300.ttf new file mode 100644 index 0000000..a3cf5f5 Binary files /dev/null and b/bin/html5/bin/fonts/MontserratLight300.ttf differ diff --git a/bin/html5/bin/fonts/MontserratLightItalic300.ttf b/bin/html5/bin/fonts/MontserratLightItalic300.ttf new file mode 100644 index 0000000..6dba219 Binary files /dev/null and b/bin/html5/bin/fonts/MontserratLightItalic300.ttf differ diff --git a/bin/html5/bin/fonts/MontserratMedium500.ttf b/bin/html5/bin/fonts/MontserratMedium500.ttf new file mode 100644 index 0000000..db5b1af Binary files /dev/null and b/bin/html5/bin/fonts/MontserratMedium500.ttf differ diff --git a/bin/html5/bin/fonts/MontserratMediumItalic500.ttf b/bin/html5/bin/fonts/MontserratMediumItalic500.ttf new file mode 100644 index 0000000..16dbf4c Binary files /dev/null and b/bin/html5/bin/fonts/MontserratMediumItalic500.ttf differ diff --git a/bin/html5/bin/fonts/MontserratRegular400.ttf b/bin/html5/bin/fonts/MontserratRegular400.ttf new file mode 100644 index 0000000..2a2b2aa Binary files /dev/null and b/bin/html5/bin/fonts/MontserratRegular400.ttf differ diff --git a/bin/html5/bin/fonts/MontserratSemiBold600.ttf b/bin/html5/bin/fonts/MontserratSemiBold600.ttf new file mode 100644 index 0000000..0ecc667 Binary files /dev/null and b/bin/html5/bin/fonts/MontserratSemiBold600.ttf differ diff --git a/bin/html5/bin/fonts/MontserratSemiBoldItalic600.ttf b/bin/html5/bin/fonts/MontserratSemiBoldItalic600.ttf new file mode 100644 index 0000000..39f2393 Binary files /dev/null and b/bin/html5/bin/fonts/MontserratSemiBoldItalic600.ttf differ diff --git a/bin/html5/bin/fonts/MontserratThin250.ttf b/bin/html5/bin/fonts/MontserratThin250.ttf new file mode 100644 index 0000000..6a394e7 Binary files /dev/null and b/bin/html5/bin/fonts/MontserratThin250.ttf differ diff --git a/bin/html5/bin/fonts/MontserratThinItalic250.ttf b/bin/html5/bin/fonts/MontserratThinItalic250.ttf new file mode 100644 index 0000000..8eeeaa4 Binary files /dev/null and b/bin/html5/bin/fonts/MontserratThinItalic250.ttf differ diff --git a/bin/html5/bin/index.html b/bin/html5/bin/index.html index 16dd63e..2ee07ec 100644 --- a/bin/html5/bin/index.html +++ b/bin/html5/bin/index.html @@ -28,7 +28,7 @@ #openfl-content { background: #000000; width: 100%; height: 100%; } @font-face { font-family: 'Montserrat SemiBold'; - src: url('assets/fonts/Montserrat/Montserrat_SemiBold_600.ttf') format('truetype'); + src: url('assets/fonts/Montserrat/MontserratSemiBold600.ttf') format('truetype'); font-weight: normal; font-style: normal; } diff --git a/bin/html5/bin/manifest/default.json b/bin/html5/bin/manifest/default.json index 2bc2676..3c5af4c 100644 --- a/bin/html5/bin/manifest/default.json +++ b/bin/html5/bin/manifest/default.json @@ -1 +1 @@ -{"name":null,"assets":"aoy4:sizei260936y4:typey4:FONTy9:classNamey60:__ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttfy2:idy27:Montserrat_SemiBold_600.ttfy7:preloadtgh","rootPath":null,"version":2,"libraryArgs":[],"libraryType":null} \ No newline at end of file +{"name":null,"assets":"aoy4:sizei260936y4:typey4:FONTy9:classNamey58:__ASSET__assets_fonts_montserrat_montserratsemibold600_ttfy2:idy21:MontserratSemiBold600y7:preloadtgh","rootPath":null,"version":2,"libraryArgs":[],"libraryType":null} \ No newline at end of file diff --git a/bin/html5/haxe/ApplicationMain.hx b/bin/html5/haxe/ApplicationMain.hx index 64145a1..bf31d54 100644 --- a/bin/html5/haxe/ApplicationMain.hx +++ b/bin/html5/haxe/ApplicationMain.hx @@ -35,7 +35,7 @@ class ApplicationMain ManifestResources.init(config); #end - app.meta["build"] = "4"; + app.meta["build"] = "5"; app.meta["company"] = "Nekotoro"; app.meta["file"] = "LPTCManager2026"; app.meta["name"] = "lepetittrot.com - manager"; diff --git a/bin/html5/haxe/ManifestResources.hx b/bin/html5/haxe/ManifestResources.hx index 2f82fc6..797a3d8 100644 --- a/bin/html5/haxe/ManifestResources.hx +++ b/bin/html5/haxe/ManifestResources.hx @@ -68,13 +68,13 @@ import sys.FileSystem; } #if (openfl && !flash && !display) - openfl.text.Font.registerFont (__ASSET__OPENFL__assets_fonts_montserrat_montserrat_semibold_600_ttf); + openfl.text.Font.registerFont (__ASSET__OPENFL__assets_fonts_montserrat_montserratsemibold600_ttf); #end var data, manifest, library, bundle; - data = '{"name":null,"assets":"aoy4:sizei260936y4:typey4:FONTy9:classNamey60:__ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttfy2:idy27:Montserrat_SemiBold_600.ttfy7:preloadtgh","rootPath":null,"version":2,"libraryArgs":[],"libraryType":null}'; + data = '{"name":null,"assets":"aoy4:sizei260936y4:typey4:FONTy9:classNamey58:__ASSET__assets_fonts_montserrat_montserratsemibold600_ttfy2:idy21:MontserratSemiBold600y7:preloadtgh","rootPath":null,"version":2,"libraryArgs":[],"libraryType":null}'; manifest = AssetManifest.parse (data, rootPath); library = AssetLibrary.fromManifest (manifest); Assets.registerLibrary ("default", library); @@ -93,20 +93,20 @@ import sys.FileSystem; #if !display #if flash -@:keep @:bind @:noCompletion #if display private #end class __ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttf extends null { } +@:keep @:bind @:noCompletion #if display private #end class __ASSET__assets_fonts_montserrat_montserratsemibold600_ttf extends null { } @:keep @:bind @:noCompletion #if display private #end class __ASSET__manifest_default_json extends null { } #elseif (desktop || cpp) -@:keep @:font("bin/html5/obj/webfont/Montserrat_SemiBold_600.ttf") @:noCompletion #if display private #end class __ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttf extends lime.text.Font {} +@:keep @:font("bin/html5/obj/webfont/MontserratSemiBold600.ttf") @:noCompletion #if display private #end class __ASSET__assets_fonts_montserrat_montserratsemibold600_ttf extends lime.text.Font {} @:keep @:file("") @:noCompletion #if display private #end class __ASSET__manifest_default_json extends haxe.io.Bytes {} #else -@:keep @:expose('__ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttf') @:noCompletion #if display private #end class __ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttf extends lime.text.Font { public function new () { #if !html5 __fontPath = "assets/fonts/Montserrat/Montserrat_SemiBold_600"; #else ascender = 968; descender = -251; height = 1219; numGlyphs = 1943; underlinePosition = -100; underlineThickness = 50; unitsPerEM = 1000; #end name = "Montserrat SemiBold"; super (); }} +@:keep @:expose('__ASSET__assets_fonts_montserrat_montserratsemibold600_ttf') @:noCompletion #if display private #end class __ASSET__assets_fonts_montserrat_montserratsemibold600_ttf extends lime.text.Font { public function new () { #if !html5 __fontPath = "assets/fonts/Montserrat/MontserratSemiBold600"; #else ascender = 968; descender = -251; height = 1219; numGlyphs = 1943; underlinePosition = -100; underlineThickness = 50; unitsPerEM = 1000; #end name = "Montserrat SemiBold"; super (); }} #end @@ -114,10 +114,10 @@ import sys.FileSystem; #if (openfl && !flash) #if html5 -@:keep @:expose('__ASSET__OPENFL__assets_fonts_montserrat_montserrat_semibold_600_ttf') @:noCompletion #if display private #end class __ASSET__OPENFL__assets_fonts_montserrat_montserrat_semibold_600_ttf extends openfl.text.Font { public function new () { __fromLimeFont (new __ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttf ()); super (); }} +@:keep @:expose('__ASSET__OPENFL__assets_fonts_montserrat_montserratsemibold600_ttf') @:noCompletion #if display private #end class __ASSET__OPENFL__assets_fonts_montserrat_montserratsemibold600_ttf extends openfl.text.Font { public function new () { __fromLimeFont (new __ASSET__assets_fonts_montserrat_montserratsemibold600_ttf ()); super (); }} #else -@:keep @:expose('__ASSET__OPENFL__assets_fonts_montserrat_montserrat_semibold_600_ttf') @:noCompletion #if display private #end class __ASSET__OPENFL__assets_fonts_montserrat_montserrat_semibold_600_ttf extends openfl.text.Font { public function new () { __fromLimeFont (new __ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttf ()); super (); }} +@:keep @:expose('__ASSET__OPENFL__assets_fonts_montserrat_montserratsemibold600_ttf') @:noCompletion #if display private #end class __ASSET__OPENFL__assets_fonts_montserrat_montserratsemibold600_ttf extends openfl.text.Font { public function new () { __fromLimeFont (new __ASSET__assets_fonts_montserrat_montserratsemibold600_ttf ()); super (); }} #end diff --git a/bin/html5/obj/webfont/MontserratBlack900.ttf b/bin/html5/obj/webfont/MontserratBlack900.ttf new file mode 100644 index 0000000..f0d24ad Binary files /dev/null and b/bin/html5/obj/webfont/MontserratBlack900.ttf differ diff --git a/bin/html5/obj/webfont/MontserratBlackItalic900.ttf b/bin/html5/obj/webfont/MontserratBlackItalic900.ttf new file mode 100644 index 0000000..5ce4afc Binary files /dev/null and b/bin/html5/obj/webfont/MontserratBlackItalic900.ttf differ diff --git a/bin/html5/obj/webfont/MontserratBold700.ttf b/bin/html5/obj/webfont/MontserratBold700.ttf new file mode 100644 index 0000000..9a425b9 Binary files /dev/null and b/bin/html5/obj/webfont/MontserratBold700.ttf differ diff --git a/bin/html5/obj/webfont/MontserratBoldItalic700.ttf b/bin/html5/obj/webfont/MontserratBoldItalic700.ttf new file mode 100644 index 0000000..ed61ca7 Binary files /dev/null and b/bin/html5/obj/webfont/MontserratBoldItalic700.ttf differ diff --git a/bin/html5/obj/webfont/MontserratExtraBold800.ttf b/bin/html5/obj/webfont/MontserratExtraBold800.ttf new file mode 100644 index 0000000..6725d53 Binary files /dev/null and b/bin/html5/obj/webfont/MontserratExtraBold800.ttf differ diff --git a/bin/html5/obj/webfont/MontserratExtraBoldItalic800.ttf b/bin/html5/obj/webfont/MontserratExtraBoldItalic800.ttf new file mode 100644 index 0000000..107f98d Binary files /dev/null and b/bin/html5/obj/webfont/MontserratExtraBoldItalic800.ttf differ diff --git a/bin/html5/obj/webfont/MontserratExtraLight275.ttf b/bin/html5/obj/webfont/MontserratExtraLight275.ttf new file mode 100644 index 0000000..2967eb6 Binary files /dev/null and b/bin/html5/obj/webfont/MontserratExtraLight275.ttf differ diff --git a/bin/html5/obj/webfont/MontserratExtraLightItalic 275.ttf b/bin/html5/obj/webfont/MontserratExtraLightItalic 275.ttf new file mode 100644 index 0000000..5d62085 Binary files /dev/null and b/bin/html5/obj/webfont/MontserratExtraLightItalic 275.ttf differ diff --git a/bin/html5/obj/webfont/MontserratItalic400.ttf b/bin/html5/obj/webfont/MontserratItalic400.ttf new file mode 100644 index 0000000..00fadbe Binary files /dev/null and b/bin/html5/obj/webfont/MontserratItalic400.ttf differ diff --git a/bin/html5/obj/webfont/MontserratLight300.ttf b/bin/html5/obj/webfont/MontserratLight300.ttf new file mode 100644 index 0000000..a3cf5f5 Binary files /dev/null and b/bin/html5/obj/webfont/MontserratLight300.ttf differ diff --git a/bin/html5/obj/webfont/MontserratLightItalic300.ttf b/bin/html5/obj/webfont/MontserratLightItalic300.ttf new file mode 100644 index 0000000..6dba219 Binary files /dev/null and b/bin/html5/obj/webfont/MontserratLightItalic300.ttf differ diff --git a/bin/html5/obj/webfont/MontserratMedium500.ttf b/bin/html5/obj/webfont/MontserratMedium500.ttf new file mode 100644 index 0000000..db5b1af Binary files /dev/null and b/bin/html5/obj/webfont/MontserratMedium500.ttf differ diff --git a/bin/html5/obj/webfont/MontserratMediumItalic500.ttf b/bin/html5/obj/webfont/MontserratMediumItalic500.ttf new file mode 100644 index 0000000..16dbf4c Binary files /dev/null and b/bin/html5/obj/webfont/MontserratMediumItalic500.ttf differ diff --git a/bin/html5/obj/webfont/MontserratRegular400.ttf b/bin/html5/obj/webfont/MontserratRegular400.ttf new file mode 100644 index 0000000..2a2b2aa Binary files /dev/null and b/bin/html5/obj/webfont/MontserratRegular400.ttf differ diff --git a/bin/html5/obj/webfont/MontserratSemiBold600.ttf b/bin/html5/obj/webfont/MontserratSemiBold600.ttf new file mode 100644 index 0000000..0ecc667 Binary files /dev/null and b/bin/html5/obj/webfont/MontserratSemiBold600.ttf differ diff --git a/bin/html5/obj/webfont/MontserratSemiBoldItalic600.ttf b/bin/html5/obj/webfont/MontserratSemiBoldItalic600.ttf new file mode 100644 index 0000000..39f2393 Binary files /dev/null and b/bin/html5/obj/webfont/MontserratSemiBoldItalic600.ttf differ diff --git a/bin/html5/obj/webfont/MontserratThin250.ttf b/bin/html5/obj/webfont/MontserratThin250.ttf new file mode 100644 index 0000000..6a394e7 Binary files /dev/null and b/bin/html5/obj/webfont/MontserratThin250.ttf differ diff --git a/bin/html5/obj/webfont/MontserratThinItalic250.ttf b/bin/html5/obj/webfont/MontserratThinItalic250.ttf new file mode 100644 index 0000000..8eeeaa4 Binary files /dev/null and b/bin/html5/obj/webfont/MontserratThinItalic250.ttf differ diff --git a/bin/neko/.files b/bin/neko/.files index e69de29..7d029f1 100644 --- a/bin/neko/.files +++ b/bin/neko/.files @@ -0,0 +1,2 @@ +bin/neko/bin/assets/fonts/Montserrat/Montserrat_SemiBold_600.ttf +bin/neko/bin/manifest/default.json \ No newline at end of file diff --git a/bin/neko/bin/assets/fonts/Montserrat/Montserrat_SemiBold_600.ttf b/bin/neko/bin/assets/fonts/Montserrat/Montserrat_SemiBold_600.ttf new file mode 100644 index 0000000..0ecc667 Binary files /dev/null and b/bin/neko/bin/assets/fonts/Montserrat/Montserrat_SemiBold_600.ttf differ diff --git a/bin/neko/bin/lime.ndll b/bin/neko/bin/lime.ndll new file mode 100644 index 0000000..ba99723 Binary files /dev/null and b/bin/neko/bin/lime.ndll differ diff --git a/bin/neko/haxe/ApplicationMain.hx b/bin/neko/haxe/ApplicationMain.hx index 647c931..2d025d8 100644 --- a/bin/neko/haxe/ApplicationMain.hx +++ b/bin/neko/haxe/ApplicationMain.hx @@ -20,7 +20,7 @@ class ApplicationMain #if (js && html5) #if (munit || (utest && openfl_enable_utest_legacy_mode)) - lime.system.System.embed("LPTCManager2026", null, 800, 600); + lime.system.System.embed("LPTCManager2026", null, 500, 800); #end #else create(null); @@ -35,7 +35,7 @@ class ApplicationMain ManifestResources.init(config); #end - app.meta["build"] = "2"; + app.meta["build"] = "5"; app.meta["company"] = "Nekotoro"; app.meta["file"] = "LPTCManager2026"; app.meta["name"] = "LPTCManager2026"; @@ -54,21 +54,21 @@ class ApplicationMain element: null, frameRate: 60, #if !web fullscreen: false, #end - height: 600, + height: 800, hidden: #if munit true #else false #end, maximized: false, minimized: false, parameters: {}, resizable: true, title: "LPTCManager2026", - width: 800, + width: 500, x: null, y: null, }; attributes.context = { antialiasing: 0, - background: 16777215, + background: 13156797, colorDepth: 32, depth: true, hardware: true, @@ -104,7 +104,7 @@ class ApplicationMain #elseif air app.window.title = "LPTCManager2026"; #else - app.window.context.attributes.background = 16777215; + app.window.context.attributes.background = 13156797; app.window.frameRate = 60; #end diff --git a/bin/neko/haxe/ManifestResources.hx b/bin/neko/haxe/ManifestResources.hx index c04ad68..e230cfe 100644 --- a/bin/neko/haxe/ManifestResources.hx +++ b/bin/neko/haxe/ManifestResources.hx @@ -68,13 +68,21 @@ import sys.FileSystem; } #if (openfl && !flash && !display) + openfl.text.Font.registerFont (__ASSET__OPENFL__assets_fonts_montserrat_montserrat_semibold_600_ttf); #end var data, manifest, library, bundle; + data = '{"name":null,"assets":"aoy4:sizei260936y4:typey4:FONTy9:classNamey60:__ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttfy2:idy27:Montserrat_SemiBold_600.ttfgh","rootPath":null,"version":2,"libraryArgs":[],"libraryType":null}'; + manifest = AssetManifest.parse (data, rootPath); + library = AssetLibrary.fromManifest (manifest); + Assets.registerLibrary ("default", library); + library = Assets.getLibrary ("default"); + if (library != null) preloadLibraries.push (library); + else preloadLibraryNames.push ("default"); } @@ -85,15 +93,20 @@ import sys.FileSystem; #if !display #if flash +@:keep @:bind @:noCompletion #if display private #end class __ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttf extends null { } +@:keep @:bind @:noCompletion #if display private #end class __ASSET__manifest_default_json extends null { } #elseif (desktop || cpp) +@:keep @:file("bin/neko/obj/tmp/manifest/default.json") @:noCompletion #if display private #end class __ASSET__manifest_default_json extends haxe.io.Bytes {} +@:keep @:noCompletion #if display private #end class __ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttf extends lime.text.Font { public function new () { __fontPath = ManifestResources.rootPath + "assets/fonts/Montserrat/Montserrat_SemiBold_600.ttf"; name = "Montserrat SemiBold"; super (); }} #else +@:keep @:expose('__ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttf') @:noCompletion #if display private #end class __ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttf extends lime.text.Font { public function new () { #if !html5 __fontPath = "assets/fonts/Montserrat/Montserrat_SemiBold_600.ttf"; #else ascender = null; descender = null; height = null; numGlyphs = null; underlinePosition = null; underlineThickness = null; unitsPerEM = null; #end name = "Montserrat SemiBold"; super (); }} #end @@ -101,8 +114,10 @@ import sys.FileSystem; #if (openfl && !flash) #if html5 +@:keep @:expose('__ASSET__OPENFL__assets_fonts_montserrat_montserrat_semibold_600_ttf') @:noCompletion #if display private #end class __ASSET__OPENFL__assets_fonts_montserrat_montserrat_semibold_600_ttf extends openfl.text.Font { public function new () { name = "Montserrat SemiBold"; super (); }} #else +@:keep @:expose('__ASSET__OPENFL__assets_fonts_montserrat_montserrat_semibold_600_ttf') @:noCompletion #if display private #end class __ASSET__OPENFL__assets_fonts_montserrat_montserrat_semibold_600_ttf extends openfl.text.Font { public function new () { __fontPath = ManifestResources.rootPath + "assets/fonts/Montserrat/Montserrat_SemiBold_600.ttf"; name = "Montserrat SemiBold"; super (); }} #end diff --git a/bin/neko/haxe/debug.hxml b/bin/neko/haxe/debug.hxml index 2c3edde..f275055 100644 --- a/bin/neko/haxe/debug.hxml +++ b/bin/neko/haxe/debug.hxml @@ -1,40 +1,37 @@ -main ApplicationMain --macro lime._internal.macros.DefineMacro.run() --cp /Users/chatmurai/Documents/code/Haxe/lib/lime/8,2,3/src +-cp /home/chatmurai/haxelib/lime/8,2,3/src -D lime=8.2.3 --cp /Users/chatmurai/Documents/code/Haxe/lib/feathersui-cairngorm/1,0,0/src +-cp /home/chatmurai/haxelib/feathersui-cairngorm/1,0,0/src -D feathersui-cairngorm=1.0.0 --cp /Users/chatmurai/Documents/code/Haxe/lib/feathersui/1,3,0/src +-cp /home/chatmurai/haxelib/feathersui/1,3,0/src -D feathersui=1.3.0 --cp /Users/chatmurai/Documents/code/Haxe/lib/actuate/1,9,0/src +-cp /home/chatmurai/haxelib/actuate/1,9,0/src -D actuate=1.9.0 --cp /Users/chatmurai/Documents/code/Haxe/lib/hxargs/4,0,0 +-cp /home/chatmurai/haxelib/hxargs/4,0,0 -D hxargs=4.0.0 --macro openfl.utils._internal.ExtraParamsMacro.include() --cp /Users/chatmurai/Documents/code/Haxe/lib/openfl/9,4,2/src +-cp /home/chatmurai/haxelib/openfl/9,4,2/src -D openfl=9.4.2 --cp /Users/chatmurai/Documents/code/Haxe/lib/feathersui-rpc-services/1,0,3/src +-cp /home/chatmurai/haxelib/feathersui-rpc-services/1,0,3/src -D feathersui-rpc-services=1.0.3 --cp /Users/chatmurai/Documents/code/Haxe/lib/amfio/1,0,2/src +-cp /home/chatmurai/haxelib/amfio/1,0,2/src -D amfio=1.0.2 -cp src --D AIR_SDK=/Users/chatmurai/Documents/code/AS3/SDKs/AIR_SDK_32.0 --D lime-openal --D native --D lime-curl --D openfl-native -D lime-harfbuzz +-D lime-openal -D lime-threads -D tools=8.2.3 -D lime-cairo -D lime-opengl -D no-compilation --D disable_preloader_assets=1 +-D native +-D lime-curl -D lime-native -D lime-vorbis --D MACOSX_DEPLOYMENT_TARGET=10.9 +-D openfl-native -D lime-cffi --D mac +-D linux -D desktop --remap flash:openfl -cp bin/neko/haxe diff --git a/bin/neko/haxe/final.hxml b/bin/neko/haxe/final.hxml index bf2b012..1432038 100644 --- a/bin/neko/haxe/final.hxml +++ b/bin/neko/haxe/final.hxml @@ -1,40 +1,37 @@ -main ApplicationMain --macro lime._internal.macros.DefineMacro.run() --cp /Users/chatmurai/Documents/code/Haxe/lib/lime/8,2,3/src +-cp /home/chatmurai/haxelib/lime/8,2,3/src -D lime=8.2.3 --cp /Users/chatmurai/Documents/code/Haxe/lib/feathersui-cairngorm/1,0,0/src +-cp /home/chatmurai/haxelib/feathersui-cairngorm/1,0,0/src -D feathersui-cairngorm=1.0.0 --cp /Users/chatmurai/Documents/code/Haxe/lib/feathersui/1,3,0/src +-cp /home/chatmurai/haxelib/feathersui/1,3,0/src -D feathersui=1.3.0 --cp /Users/chatmurai/Documents/code/Haxe/lib/actuate/1,9,0/src +-cp /home/chatmurai/haxelib/actuate/1,9,0/src -D actuate=1.9.0 --cp /Users/chatmurai/Documents/code/Haxe/lib/hxargs/4,0,0 +-cp /home/chatmurai/haxelib/hxargs/4,0,0 -D hxargs=4.0.0 --macro openfl.utils._internal.ExtraParamsMacro.include() --cp /Users/chatmurai/Documents/code/Haxe/lib/openfl/9,4,2/src +-cp /home/chatmurai/haxelib/openfl/9,4,2/src -D openfl=9.4.2 --cp /Users/chatmurai/Documents/code/Haxe/lib/feathersui-rpc-services/1,0,3/src +-cp /home/chatmurai/haxelib/feathersui-rpc-services/1,0,3/src -D feathersui-rpc-services=1.0.3 --cp /Users/chatmurai/Documents/code/Haxe/lib/amfio/1,0,2/src +-cp /home/chatmurai/haxelib/amfio/1,0,2/src -D amfio=1.0.2 -cp src --D AIR_SDK=/Users/chatmurai/Documents/code/AS3/SDKs/AIR_SDK_32.0 --D lime-openal --D native --D lime-curl --D openfl-native -D lime-harfbuzz +-D lime-openal -D lime-threads -D tools=8.2.3 -D lime-cairo -D lime-opengl -D no-compilation --D disable_preloader_assets=1 +-D native +-D lime-curl -D lime-native -D lime-vorbis --D MACOSX_DEPLOYMENT_TARGET=10.9 +-D openfl-native -D lime-cffi --D mac +-D linux -D desktop --remap flash:openfl -cp bin/neko/haxe diff --git a/bin/neko/haxe/release.hxml b/bin/neko/haxe/release.hxml index 78b30ef..34baa43 100644 --- a/bin/neko/haxe/release.hxml +++ b/bin/neko/haxe/release.hxml @@ -1,40 +1,37 @@ -main ApplicationMain --macro lime._internal.macros.DefineMacro.run() --cp /Users/chatmurai/Documents/code/Haxe/lib/lime/8,2,3/src +-cp /home/chatmurai/haxelib/lime/8,2,3/src -D lime=8.2.3 --cp /Users/chatmurai/Documents/code/Haxe/lib/feathersui-cairngorm/1,0,0/src +-cp /home/chatmurai/haxelib/feathersui-cairngorm/1,0,0/src -D feathersui-cairngorm=1.0.0 --cp /Users/chatmurai/Documents/code/Haxe/lib/feathersui/1,3,0/src +-cp /home/chatmurai/haxelib/feathersui/1,3,0/src -D feathersui=1.3.0 --cp /Users/chatmurai/Documents/code/Haxe/lib/actuate/1,9,0/src +-cp /home/chatmurai/haxelib/actuate/1,9,0/src -D actuate=1.9.0 --cp /Users/chatmurai/Documents/code/Haxe/lib/hxargs/4,0,0 +-cp /home/chatmurai/haxelib/hxargs/4,0,0 -D hxargs=4.0.0 --macro openfl.utils._internal.ExtraParamsMacro.include() --cp /Users/chatmurai/Documents/code/Haxe/lib/openfl/9,4,2/src +-cp /home/chatmurai/haxelib/openfl/9,4,2/src -D openfl=9.4.2 --cp /Users/chatmurai/Documents/code/Haxe/lib/feathersui-rpc-services/1,0,3/src +-cp /home/chatmurai/haxelib/feathersui-rpc-services/1,0,3/src -D feathersui-rpc-services=1.0.3 --cp /Users/chatmurai/Documents/code/Haxe/lib/amfio/1,0,2/src +-cp /home/chatmurai/haxelib/amfio/1,0,2/src -D amfio=1.0.2 -cp src --D AIR_SDK=/Users/chatmurai/Documents/code/AS3/SDKs/AIR_SDK_32.0 --D lime-openal --D native --D lime-curl --D openfl-native -D lime-harfbuzz +-D lime-openal -D lime-threads -D tools=8.2.3 -D lime-cairo -D lime-opengl -D no-compilation --D disable_preloader_assets=1 +-D native +-D lime-curl -D lime-native -D lime-vorbis --D MACOSX_DEPLOYMENT_TARGET=10.9 +-D openfl-native -D lime-cffi --D mac +-D linux -D desktop --remap flash:openfl -cp bin/neko/haxe diff --git a/bin/neko/obj/tmp/manifest/default.json b/bin/neko/obj/tmp/manifest/default.json new file mode 100644 index 0000000..e2883ae --- /dev/null +++ b/bin/neko/obj/tmp/manifest/default.json @@ -0,0 +1 @@ +{"name":null,"assets":"aoy4:sizei260936y4:typey4:FONTy9:classNamey60:__ASSET__assets_fonts_montserrat_montserrat_semibold_600_ttfy2:idy27:Montserrat_SemiBold_600.ttfgh","rootPath":null,"version":2,"libraryArgs":[],"libraryType":null} \ No newline at end of file diff --git a/project.xml b/project.xml index 1901d07..d073469 100644 --- a/project.xml +++ b/project.xml @@ -20,5 +20,12 @@ - + + + + + + + + \ No newline at end of file diff --git a/src/LPTCManager2026.hx b/src/LPTCManager2026.hx index bce4882..f659972 100644 --- a/src/LPTCManager2026.hx +++ b/src/LPTCManager2026.hx @@ -1,4 +1,4 @@ -import lime.tools.Asset; +import openfl.Assets; import openfl.text.Font; import feathers.text.TextFormat; import model.Constants; @@ -43,6 +43,7 @@ class LPTCManager2026 extends Application { var title = new Label(); title.text = "Header"; var fnt:Font = Assets.getFont(Constants.MONTSERRAT_SEMIBOLD_600); + title.textFormat = new TextFormat(fnt.fontName, 20, Constants.MAIN_COLOR3); title.variant = Label.VARIANT_HEADING; title.layoutData = AnchorLayoutData.center(); diff --git a/src/model/Constants.hx b/src/model/Constants.hx index 739b5e7..bef5415 100644 --- a/src/model/Constants.hx +++ b/src/model/Constants.hx @@ -11,7 +11,7 @@ class Constants { public static final MAIN_COLOR3:Int = 0xECEFF0; // Fonts - public static final MONTSERRAT_SEMIBOLD_600:String = "Montserrat_SemiBold_600.ttf"; + public static final MONTSERRAT_SEMIBOLD_600:String = "Montserrat_SemiBold_600"; private function new() {