bug fix
This commit is contained in:
parent
05d4cda780
commit
f9dd4c24c7
|
@ -50,6 +50,7 @@ jobs:
|
||||||
haxelib install hxcpp-debug-server
|
haxelib install hxcpp-debug-server
|
||||||
haxelib git polymod https://github.com/larsiusprime/polymod.git
|
haxelib git polymod https://github.com/larsiusprime/polymod.git
|
||||||
haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
|
haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
|
||||||
|
haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
|
||||||
haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
|
haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
|
||||||
- name: Create Version Tag
|
- name: Create Version Tag
|
||||||
run: echo "${{github.run_id}}" > VERSION
|
run: echo "${{github.run_id}}" > VERSION
|
||||||
|
@ -90,6 +91,7 @@ jobs:
|
||||||
haxelib install hxcpp-debug-server
|
haxelib install hxcpp-debug-server
|
||||||
haxelib git polymod https://github.com/larsiusprime/polymod.git
|
haxelib git polymod https://github.com/larsiusprime/polymod.git
|
||||||
haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
|
haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
|
||||||
|
haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
|
||||||
haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
|
haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
|
||||||
shell: cmd
|
shell: cmd
|
||||||
- name: Create Version Tag
|
- name: Create Version Tag
|
||||||
|
@ -131,6 +133,7 @@ jobs:
|
||||||
haxelib install hxcpp-debug-server
|
haxelib install hxcpp-debug-server
|
||||||
haxelib git polymod https://github.com/larsiusprime/polymod.git
|
haxelib git polymod https://github.com/larsiusprime/polymod.git
|
||||||
haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
|
haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
|
||||||
|
haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
|
||||||
haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
|
haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
|
||||||
- name: Create Version Tag
|
- name: Create Version Tag
|
||||||
run: echo "${{github.run_id}}" > VERSION
|
run: echo "${{github.run_id}}" > VERSION
|
||||||
|
|
|
@ -64,6 +64,7 @@
|
||||||
<library name="scripts" preload="true" />
|
<library name="scripts" preload="true" />
|
||||||
<library name="shaders" preload="true" />
|
<library name="shaders" preload="true" />
|
||||||
<library name="characters" preload="true" />
|
<library name="characters" preload="true" />
|
||||||
|
<library name="stages" preload="true" />
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<section if="NO_PRELOAD_ALL">
|
<section if="NO_PRELOAD_ALL">
|
||||||
|
@ -81,6 +82,7 @@
|
||||||
<library name="scripts" preload="false" />
|
<library name="scripts" preload="false" />
|
||||||
<library name="shaders" preload="false" />
|
<library name="shaders" preload="false" />
|
||||||
<library name="characters" preload="false" />
|
<library name="characters" preload="false" />
|
||||||
|
<library name="stages" preload="false" />
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
<assets path="assets/songs" library="songs" exclude="*.fla|*.ogg" if="web"/>
|
<assets path="assets/songs" library="songs" exclude="*.fla|*.ogg" if="web"/>
|
||||||
|
@ -111,6 +113,8 @@
|
||||||
<assets path="assets/shaders" library="shaders" exclude="*.fla|*.mp3" unless="web"/>
|
<assets path="assets/shaders" library="shaders" exclude="*.fla|*.mp3" unless="web"/>
|
||||||
<assets path="assets/characters" library="characters" exclude="*.fla|*.ogg" if="web"/>
|
<assets path="assets/characters" library="characters" exclude="*.fla|*.ogg" if="web"/>
|
||||||
<assets path="assets/characters" library="characters" exclude="*.fla|*.mp3" unless="web"/>
|
<assets path="assets/characters" library="characters" exclude="*.fla|*.mp3" unless="web"/>
|
||||||
|
<assets path="assets/stages" library="stages" exclude="*.fla|*.ogg" if="web"/>
|
||||||
|
<assets path="assets/stages" library="stages" exclude="*.fla|*.mp3" unless="web"/>
|
||||||
|
|
||||||
<template path="example_mods" rename="mods" />
|
<template path="example_mods" rename="mods" />
|
||||||
|
|
||||||
|
|
|
@ -33,6 +33,7 @@ Then, execute this command.
|
||||||
```
|
```
|
||||||
haxelib git polymod https://github.com/larsiusprime/polymod.git
|
haxelib git polymod https://github.com/larsiusprime/polymod.git
|
||||||
haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
|
haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
|
||||||
|
haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
|
||||||
```
|
```
|
||||||
At the moment, you can optionally fix the transition bug in songs with zoomed-out cameras.
|
At the moment, you can optionally fix the transition bug in songs with zoomed-out cameras.
|
||||||
```
|
```
|
||||||
|
|
|
@ -19,6 +19,7 @@ haxelib install hxCodec
|
||||||
haxelib install hxcpp-debug-server
|
haxelib install hxcpp-debug-server
|
||||||
haxelib git polymod https://github.com/larsiusprime/polymod.git
|
haxelib git polymod https://github.com/larsiusprime/polymod.git
|
||||||
haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
|
haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
|
||||||
|
haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
|
||||||
haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
|
haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
|
||||||
@echo off
|
@echo off
|
||||||
echo Setup Successful!
|
echo Setup Successful!
|
||||||
|
|
|
@ -18,6 +18,7 @@ haxelib update hxCodec
|
||||||
haxelib update hxcpp-debug-server
|
haxelib update hxcpp-debug-server
|
||||||
haxelib git polymod https://github.com/larsiusprime/polymod.git
|
haxelib git polymod https://github.com/larsiusprime/polymod.git
|
||||||
haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
|
haxelib git discord_rpc https://github.com/Aidan63/linc_discord-rpc
|
||||||
|
haxelib git linc_luajit https://github.com/nebulazorua/linc_luajit
|
||||||
haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
|
haxelib git flixel-addons https://github.com/HaxeFlixel/flixel-addons
|
||||||
@echo off
|
@echo off
|
||||||
echo Update Successful!
|
echo Update Successful!
|
||||||
|
|
|
@ -17,6 +17,7 @@ import haxe.format.JsonParser;
|
||||||
|
|
||||||
using StringTools;
|
using StringTools;
|
||||||
|
|
||||||
|
#if desktop
|
||||||
typedef CharacterFile = {
|
typedef CharacterFile = {
|
||||||
var texture:String;
|
var texture:String;
|
||||||
var onInit:String;
|
var onInit:String;
|
||||||
|
@ -34,6 +35,7 @@ typedef AnimArray = {
|
||||||
var type:String;
|
var type:String;
|
||||||
var indices:Array<Int>;
|
var indices:Array<Int>;
|
||||||
}
|
}
|
||||||
|
#end
|
||||||
|
|
||||||
class Character extends FlxSprite
|
class Character extends FlxSprite
|
||||||
{
|
{
|
||||||
|
@ -46,7 +48,6 @@ class Character extends FlxSprite
|
||||||
public var holdTimer:Float = 0;
|
public var holdTimer:Float = 0;
|
||||||
|
|
||||||
public var animationNotes:Array<Dynamic> = [];
|
public var animationNotes:Array<Dynamic> = [];
|
||||||
|
|
||||||
public var healthColorArray:Array<Int> = [255, 0, 0];
|
public var healthColorArray:Array<Int> = [255, 0, 0];
|
||||||
|
|
||||||
public function new(x:Float, y:Float, ?character:String = "bf", ?isPlayer:Bool = false)
|
public function new(x:Float, y:Float, ?character:String = "bf", ?isPlayer:Bool = false)
|
||||||
|
@ -58,13 +59,14 @@ class Character extends FlxSprite
|
||||||
this.isPlayer = isPlayer;
|
this.isPlayer = isPlayer;
|
||||||
|
|
||||||
var tex:FlxAtlasFrames;
|
var tex:FlxAtlasFrames;
|
||||||
antialiasing = PreferencesMenu.getPref('antialiasing');
|
antialiasing = true;
|
||||||
|
|
||||||
switch (curCharacter)
|
switch (curCharacter)
|
||||||
{
|
{
|
||||||
case 'gf':
|
case 'gf':
|
||||||
// Color Set
|
// Color Set
|
||||||
healthColorArray = [165,0,77];
|
healthColorArray = [165,0,77];
|
||||||
|
|
||||||
// GIRLFRIEND CODE
|
// GIRLFRIEND CODE
|
||||||
tex = Paths.getSparrowAtlas('characters/GF_assets');
|
tex = Paths.getSparrowAtlas('characters/GF_assets');
|
||||||
frames = tex;
|
frames = tex;
|
||||||
|
|
|
@ -52,10 +52,11 @@ class StrumNote extends FlxSprite
|
||||||
|
|
||||||
if (PlayState.curStage.startsWith('school'))
|
if (PlayState.curStage.startsWith('school'))
|
||||||
{
|
{
|
||||||
loadGraphic(Paths.image('pixelUI/' + texture));
|
texture = "arrows-pixels";
|
||||||
|
loadGraphic(Paths.image('weeb/pixelUI/' + texture));
|
||||||
width = width / 4;
|
width = width / 4;
|
||||||
height = height / 5;
|
height = height / 5;
|
||||||
loadGraphic(Paths.image('pixelUI/' + texture), true, Math.floor(width), Math.floor(height));
|
loadGraphic(Paths.image('weeb/pixelUI/' + texture), true, Math.floor(width), Math.floor(height));
|
||||||
|
|
||||||
antialiasing = false;
|
antialiasing = false;
|
||||||
setGraphicSize(Std.int(width * PlayState.daPixelZoom));
|
setGraphicSize(Std.int(width * PlayState.daPixelZoom));
|
||||||
|
@ -141,7 +142,7 @@ class StrumNote extends FlxSprite
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//if(animation.curAnim != null){ //my bad i was upset
|
//if(animation.curAnim != null){ //my bad i was upset
|
||||||
if(animation.curAnim.name == 'confirm' && !PlayState.curStage.startsWith('school')) {
|
if(getAnimName(animation) == 'confirm' && !PlayState.curStage.startsWith('school')) {
|
||||||
centerOffsets();
|
centerOffsets();
|
||||||
offset.x -= 13;
|
offset.x -= 13;
|
||||||
offset.y -= 13;
|
offset.y -= 13;
|
||||||
|
@ -179,7 +180,7 @@ class StrumNote extends FlxSprite
|
||||||
colorSwap.brightness = ClientPrefs.arrowHSV[noteData][2] / 100;
|
colorSwap.brightness = ClientPrefs.arrowHSV[noteData][2] / 100;
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
if(animation.curAnim.name == 'confirm' && !PlayState.curStage.startsWith('school')) {
|
if(getAnimName(animation) == 'confirm' && !PlayState.curStage.startsWith('school')) {
|
||||||
centerOrigin();
|
centerOrigin();
|
||||||
centerOffsets();
|
centerOffsets();
|
||||||
offset.x -= 13;
|
offset.x -= 13;
|
||||||
|
|
Loading…
Reference in New Issue