diff --git a/.github/workflows/pages.yml b/.github/workflows/pages.yml new file mode 100644 index 0000000000..d0bac48458 --- /dev/null +++ b/.github/workflows/pages.yml @@ -0,0 +1,75 @@ +# This is a basic workflow to help you get started with Actions + +name: github-pages + +# Controls when the workflow will run +on: + # Triggers the workflow on push or pull request events but only for the "main" branch + push: + branches: [ "main" ] + pull_request: + branches: [ "main" ] + + # Allows you to run this workflow manually from the Actions tab + workflow_dispatch: + +# A workflow run is made up of one or more jobs that can run sequentially or in parallel +jobs: + # This workflow contains a single job called "build" + build: + concurrency: ci-${{ github.ref }} # Recommended if you intend to make multiple deployments in quick succession. + + # The type of runner that the job will run on + runs-on: ubuntu-latest + + # Steps represent a sequence of tasks that will be executed as part of the job + steps: + # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it + - uses: actions/checkout@v3 + + - uses: krdlab/setup-haxe@master + with: + haxe-version: 4.3.3 + + # Runs a set of commands using the runners shell + - name: Install Haxe Libraries + run: | + haxelib setup ~/haxelib + haxelib git hxcpp https://github.com/Vortex2Oblivion/hxcpp-compiled + haxelib install lime + haxelib install openfl + haxelib --never install flixel 5.5.0 + haxelib run lime setup flixel + haxelib run lime setup + haxelib install flixel-tools + haxelib install flixel-ui + haxelib install flixel-addons + haxelib git linc_luajit https://github.com/Leather128/linc_luajit.git + haxelib git hscript-improved https://github.com/FNF-CNE-Devs/hscript-improved + haxelib git scriptless-polymod https://github.com/swordcube/scriptless-polymod + haxelib install away3d + haxelib git hxNoise https://github.com/whuop/hxNoise + haxelib install hxvlc + haxelib git openfl https://github.com/openfl/openfl + haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc + haxelib git flixelTextureAtlas https://github.com/Smokey555/Flixel-TextureAtlas.git + haxelib git fnf-modcharting-tools https://github.com/EdwhakKB/FNF-Modcharting-Tools + haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate + haxelib install systools + haxelib install flixel-screenshot-plugin + haxelib git HxWebView https://github.com/Vortex2Oblivion/HxWebView + haxelib install hxcpp-debug-server + haxelib install dox + haxelib install format + haxelib install tjson + haxelib list + + - name: Create Documentation Site + run: | + chmod +x docs/docs.sh + docs/docs.sh + + - name: github-actions deploy + uses: JamesIves/github-pages-deploy-action@v4 + with: + folder: pages # The folder the action should deploy. \ No newline at end of file diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index 3815a2b6e6..0461239072 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -50,6 +50,7 @@ jobs: haxelib git fnf-modcharting-tools https://github.com/EdwhakKB/FNF-Modcharting-Tools haxelib git flxanimate https://github.com/Dot-Stuff/flxanimate haxelib git hxNoise https://github.com/whuop/hxNoise + haxelib git HxWebView https://github.com/Vortex2Oblivion/HxWebView haxelib install flixel-screenshot-plugin haxelib install hxcpp-debug-server haxelib list @@ -95,6 +96,7 @@ jobs: haxelib git scriptless-polymod https://github.com/swordcube/scriptless-polymod haxelib git hscript-improved https://github.com/FNF-CNE-Devs/hscript-improved haxelib git openfl https://github.com/openfl/openfl + haxelib git HxWebView https://github.com/Vortex2Oblivion/HxWebView haxelib git flixelTextureAtlas https://github.com/Smokey555/Flixel-TextureAtlas.git haxelib git fnf-modcharting-tools https://github.com/EdwhakKB/FNF-Modcharting-Tools haxelib install flixel-screenshot-plugin @@ -137,6 +139,7 @@ jobs: haxelib install flixel-addons haxelib git linc_luajit https://github.com/Leather128/linc_luajit.git haxelib git hscript-improved https://github.com/FNF-CNE-Devs/hscript-improved + haxelib git HxWebView https://github.com/Vortex2Oblivion/HxWebView haxelib git scriptless-polymod https://github.com/swordcube/scriptless-polymod haxelib install away3d haxelib git hxNoise https://github.com/whuop/hxNoise @@ -188,6 +191,7 @@ jobs: haxelib install systools haxelib git linc_luajit https://github.com/Leather128/linc_luajit.git haxelib git hscript-improved https://github.com/FNF-CNE-Devs/hscript-improved + haxelib git HxWebView https://github.com/Vortex2Oblivion/HxWebView haxelib git scriptless-polymod https://github.com/swordcube/scriptless-polymod haxelib install hxvlc haxelib git hxNoise https://github.com/whuop/hxNoise diff --git a/Project.xml b/Project.xml index 7e59bd4941..5b0c69b1f6 100644 --- a/Project.xml +++ b/Project.xml @@ -114,6 +114,7 @@ + diff --git a/source/docs/DocState.hx b/source/docs/DocState.hx index 256982534e..ba473afd5d 100644 --- a/source/docs/DocState.hx +++ b/source/docs/DocState.hx @@ -4,16 +4,20 @@ import states.LoadingState; import states.MainMenuState; import flixel.FlxG; import flixel.FlxSprite; -import cocktail.api.Cocktail; import states.MusicBeatState; import flixel.util.FlxColor; +import webview.WebView; class DocState extends MusicBeatState { + var w:WebView = new WebView(); override function create() { var bg:FlxSprite = new FlxSprite().makeGraphic(FlxG.width, FlxG.height, FlxColor.WHITE); bg.screenCenter(); add(bg); - Cocktail.boot("https://raw.githubusercontent.com/Vortex2Oblivion/LeatherEngine-Extended-Support/main/docs/test/index.html"); + w.setSize(FlxG.width, FlxG.height, NONE); + w.setTitle("Youtube"); + w.navigate("https://www.youtube.com/"); + w.run(); super.create(); } override function update(elapsed:Float){ diff --git a/source/states/TitleState.hx b/source/states/TitleState.hx index fba6b66827..7b98210285 100644 --- a/source/states/TitleState.hx +++ b/source/states/TitleState.hx @@ -328,11 +328,9 @@ class TitleState extends MusicBeatState { } #end - #if DOCS_ALLOWED if(FlxG.keys.justPressed.P){ FlxG.switchState(new docs.DocState()); } - #end if (FlxG.sound.music != null) Conductor.songPosition = FlxG.sound.music.time;