Skip to content
This repository was archived by the owner on Sep 16, 2024. It is now read-only.

MaynardYT #2776

Open
wants to merge 11 commits into
base: stable
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 80 additions & 0 deletions .github/workflows/Android Buildyml
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
# This is a basic workflow to help you get started with Actions

name: Android Build CI

# Controls when the workflow will run
on: [push, pull_request, 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:
# 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@v2
- uses: krdlab/setup-haxe@v1
with:
haxe-version: 4.2.3

- name: Cache haxelib path
uses: actions/cache@v2
with:
path: |
%HAXELIB_ROOT%
key: ${{ runner.os }}-android

- name: Setup Android SDK Tools
uses: android-actions/[email protected]

- name: Setup Java JDK
uses: actions/[email protected]
with:
distribution: 'zulu'
java-version: '11'

- uses: nttld/setup-ndk@v1
with:
ndk-version: r20b

# Runs a set of commands using the runners shell
- name: script run line haha
run: |
mkdir -p "%HAXELIB_ROOT%"
haxelib setup "%HAXELIB_ROOT%"
haxelib install lime 7.9.0 --quiet
haxelib install openfl --quiet
haxelib install flixel 4.9.0 --quiet
haxelib install hxcpp --quiet
haxelib run lime setup
haxelib run lime config ANDROID_SDK $ANDROID_SDK_ROOT
haxelib run lime config ANDROID_NDK_ROOT $ANDROID_NDK_ROOT
haxelib run lime config JAVA_HOME $JAVA_HOME
haxelib run lime config ANDROID_SETUP true
haxelib install flixel-tools --quiet
haxelib install flixel-ui --quiet
haxelib install flixel-addons 2.10.0 --quiet
haxelib install hscript --quiet
haxelib git faxe https://github.com/uhrobots/faxe --quiet
haxelib git polymod https://github.com/MasterEric/polymod.git --quiet
haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc --quiet
haxelib git extension-webm https://github.com/KlavierGayming/extension-webm --quiet
haxelib git linc_luajit https://github.com/Sirox228/linc_luajit
haxelib run lime config HXCPP_ARM64 true
haxelib run lime config HXCPP_x86 true
haxelib install actuate
haxelib run lime rebuild extension-webm android
haxelib list

- name: Build Log
run: |
haxelib run lime setup android
haxelib run lime build android -final

- uses: actions/upload-artifact@v2
with:
name: Android Build
path: export/release/android/bin/app/build/outputs/apk/debug
54 changes: 0 additions & 54 deletions .github/workflows/html5.yml

This file was deleted.

54 changes: 0 additions & 54 deletions .github/workflows/linux.yml

This file was deleted.

18 changes: 0 additions & 18 deletions .github/workflows/staleIssue.yml

This file was deleted.

54 changes: 0 additions & 54 deletions .github/workflows/windows.yml

This file was deleted.

11 changes: 7 additions & 4 deletions Project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@

<!--Mobile-specific-->
<window if="mobile" orientation="landscape" fullscreen="true" width="0" height="0" resizable="false"/>

<define name="mobileC"/>
<assets path="assets/shared/images/hitbox"/>

<!--Switch-specific-->
<window if="switch" orientation="landscape" fullscreen="true" width="0" height="0" resizable="true" />
Expand Down Expand Up @@ -126,7 +129,7 @@
<haxelib name="faxe" if='switch'/>
<haxelib name="polymod"/>
<haxelib name="discord_rpc" if="desktop"/>
<haxelib name="linc_luajit" if="desktop"/>
<haxelib name="linc_luajit"/>
<haxelib name="hxvm-luajit" if="desktop"/>
<!-- <haxelib name="hxcpp-debug-server" if="desktop"/> -->

Expand Down Expand Up @@ -194,11 +197,11 @@
<!-- Defines whether the file system can be read/written directly. Does not work in browser. -->
<haxedef name="FEATURE_FILESYSTEM" if="desktop" />
<!-- Defines whether Lua Modcharts should be enabled. Only works on Windows. -->
<haxedef name="FEATURE_LUAMODCHART" if="windows" />
<haxedef name="FEATURE_LUAMODCHART"/>
<!-- Defines whether WebM videos should be enabled. Currently only enabled on Windows. -->
<haxedef name="FEATURE_WEBM" if="windows" />
<haxedef name="FEATURE_WEBM"/>
<!-- Defines whether StepMania files can be loaded. -->
<haxedef name="FEATURE_STEPMANIA" if="desktop" />
<haxedef name="FEATURE_STEPMANIA"/>
<!-- Defines whether the Thread class can be used. -->
<haxedef name="FEATURE_MULTITHREADING" if="cpp" />

Expand Down
40 changes: 13 additions & 27 deletions assets/preload/data/songs/tutorial/modchart.lua
Original file line number Diff line number Diff line change
@@ -1,37 +1,23 @@
function start(song) -- do nothing
spinLength = 0
function start (song)
print("Song: " .. song .. " @ " .. bpm .. " donwscroll: " .. downscroll)
end

function update(elapsed)

if difficulty == 2 and curStep > 400 then
if spinLength < 32 then
spinLength = spinLength + 0.2
function update (elapsed)
local currentBeat = (songPos / 1000)*(bpm/60)
for i=0,7 do
setActorY(defaultStrum0Y + 10 * math.cos((currentBeat + i*0.25) * math.pi), i)
end


local currentBeat = (songPos / 1000)*(bpm/60)
for i=0,7,1 do
local receptor = _G['receptor_'..i]
receptor.angle = (spinLength / 7) * -math.sin((currentBeat + i*0.25) * math.pi)
receptor.x = receptor.defaultX + spinLength * math.sin((currentBeat + i*0.25) * math.pi)
receptor.y = receptor.defaultY + spinLength * math.cos((currentBeat + i*0.25) * math.pi)
end
end
end

function beatHit(beat) -- do nothing

end

function stepHit(step) -- do nothing

end
function beatHit (beat)

function playerTwoTurn()
camGame.tweenZoom(camGame,1.3,(crochet * 4) / 1000)
end

function playerOneTurn()
camGame.tweenZoom(camGame,1,(crochet * 4) / 1000)
function stepHit (step)
if curStep == 20 or curStep == 248 or curStep == 375 or curStep == 632 or curStep == 696 or curStep == 824 or curStep == 952 or curStep == 1208 then
for i = 0, 7 do
tweenPosXAngle(i, _G['defaultStrum'..i..'X'],getActorAngle(i) + 360, 0.6, 'setDefault')
end
end
end
Binary file added assets/preload/images/key_shift.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/preload/images/key_space.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/preload/images/virtual-input.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
21 changes: 21 additions & 0 deletions assets/preload/images/virtual-input.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
base = 798 138 252 252
thumb = 798 393 156 156
a = 0 0 396 135
b = 0 138 396 135
c = 0 276 396 135
down = 0 414 396 135
left = 399 0 396 135
right = 399 138 396 135
up = 399 276 396 135
x = 798 0 396 135
y = 399 414 396 135
6 = 0 548 396 135
1 = 0 685 396 135
7 = 0 821 396 135
in = 397 547 396 135
out = 395 682 396 135
save = 401 820 396 135
l = 800 682 396 135
r = 800 820 396 135
r2 = 0 956 396 135
stage = 1194 0 396 135
Binary file added assets/shared/images/hitbox/hitbox.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions assets/shared/images/hitbox/hitbox.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<TextureAtlas imagePath="hitbox.png">
<SubTexture name="left" x="0" y="0" width="320" height="720" frameX="0" frameY="0" frameWidth="320" frameHeight="720"/>
<SubTexture name="down" x="320" y="0" width="320" height="720" frameX="0" frameY="0" frameWidth="320" frameHeight="720"/>
<SubTexture name="up" x="640" y="0" width="320" height="720" frameX="0" frameY="0" frameWidth="320" frameHeight="720"/>
<SubTexture name="right" x="960" y="0" width="320" height="720" frameX="0" frameY="0" frameWidth="320" frameHeight="720"/>
</TextureAtlas>
Binary file added assets/shared/images/hitbox/hitbox_hint.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/shared/images/hitbox/hitbox_hint_old.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading