Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

another one #7

Merged
merged 7 commits into from
May 31, 2021
Merged

another one #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e456c34
ok but like why
isakube May 29, 2021
711d88a
Fix "catagory" misspell
ACrazyTown May 30, 2021
e02911e
more changes teehee
ACrazyTown May 30, 2021
81050a8
Merge pull request #624 from prokube/patch-1
puyoxyz May 30, 2021
b23b9a6
Merge pull request #628 from ACrazyTown/patch-1
puyoxyz May 30, 2021
6c70fd9
GF DANCE IN TUTORIAL FIX
imperialwool May 30, 2021
b2af14e
Merge pull request #638 from toxichead/patch-1
Kade-github May 30, 2021
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
4 changes: 2 additions & 2 deletions source/Options.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import flixel.FlxG;
import openfl.display.FPS;
import openfl.Lib;

class OptionCatagory
class OptionCategory
{
private var _options:Array<Option> = new Array<Option>();
public final function getOptions():Array<Option>
Expand All @@ -27,7 +27,7 @@ class OptionCatagory
_options.remove(opt);
}

private var _name:String = "New Catagory";
private var _name:String = "New Category";
public final function getName() {
return _name;
}
Expand Down
10 changes: 5 additions & 5 deletions source/OptionsMenu.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ class OptionsMenu extends MusicBeatState
var selector:FlxText;
var curSelected:Int = 0;

var options:Array<OptionCatagory> = [
new OptionCatagory("Gameplay", [
var options:Array<OptionCategory> = [
new OptionCategory("Gameplay", [
new DFJKOption(controls),
new DownscrollOption("Change the layout of the strumline."),
new GhostTapOption("Ghost Tapping is when you tap a direction and it doesn't give you a miss."),
Expand All @@ -36,7 +36,7 @@ class OptionsMenu extends MusicBeatState
// new OffsetMenu("Get a note offset based off of your inputs!"),
new CustomizeGameplay("Drag'n'Drop Gameplay Modules around to your preference")
]),
new OptionCatagory("Appearance", [
new OptionCategory("Appearance", [
#if desktop
new DistractionsAndEffectsOption("Toggle stage distractions that can hinder your gameplay."),
new RainbowFPSOption("Make the FPS Counter Rainbow"),
Expand All @@ -49,7 +49,7 @@ class OptionsMenu extends MusicBeatState
#end
]),

new OptionCatagory("Misc", [
new OptionCategory("Misc", [
#if desktop
new FPSOption("Toggle the FPS Counter"),
new ReplayOption("View replays"),
Expand All @@ -65,7 +65,7 @@ class OptionsMenu extends MusicBeatState
private var grpControls:FlxTypedGroup<Alphabet>;
public static var versionShit:FlxText;

var currentSelectedCat:OptionCatagory;
var currentSelectedCat:OptionCategory;
var blackBorder:FlxSprite;
override function create()
{
Expand Down
9 changes: 8 additions & 1 deletion source/PlayState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3371,6 +3371,13 @@ class PlayState extends MusicBeatState
}
#end

if (curSong == 'Tutorial' && dad.curCharacter == 'gf') {
if (curBeat % 2 == 1 && dad.animOffsets.exists('danceLeft'))
dad.playAnim('danceLeft');
if (curBeat % 2 == 0 && dad.animOffsets.exists('danceRight'))
dad.playAnim('danceRight');
}

if (SONG.notes[Math.floor(curStep / 16)] != null)
{
if (SONG.notes[Math.floor(curStep / 16)].changeBPM)
Expand All @@ -3382,7 +3389,7 @@ class PlayState extends MusicBeatState
// Conductor.changeBPM(SONG.bpm);

// Dad doesnt interupt his own notes
if (SONG.notes[Math.floor(curStep / 16)].mustHitSection)
if (SONG.notes[Math.floor(curStep / 16)].mustHitSection && dad.curCharacter != 'gf')
dad.dance();
}
// FlxG.log.add('change bpm' + SONG.notes[Std.int(curStep / 16)].changeBPM);
Expand Down
5 changes: 2 additions & 3 deletions source/TitleState.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,9 +309,8 @@ class TitleState extends MusicBeatState
new FlxTimer().start(2, function(tmr:FlxTimer)
{
// Get current version of Kade Engine

//var http = new haxe.Http("https://raw.githubusercontent.com/KadeDev/Kade-Engine/master/version.downloadMe");
var http = new haxe.Http("https://raw.githubusercontent.com/KadeDev/Kade-Engine/patchnotes/version.downloadMe");

var http = new haxe.Http("https://raw.githubusercontent.com/KadeDev/Kade-Engine/master/version.downloadMe");
var returnedData:Array<String> = [];

http.onData = function (data:String)
Expand Down