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

Jump to bottom

Why did it make a branch #51

Merged
merged 2 commits into from
May 27, 2024
Merged

Why did it make a branch #51

merged 2 commits into from
May 27, 2024

Conversation

gusborg88
Copy link
Collaborator

what

@gusborg88 gusborg88 merged commit 68aafbd into main May 27, 2024
3 checks passed
@gusborg88 gusborg88 deleted the gusborg88/issue35 branch May 27, 2024 20:33
VocalFan added a commit to VocalFan/fnf-porter that referenced this pull request May 31, 2024
@VocalFan
Squashed commit of the following:
f96b494 
commit 1cfbf3b
Author: VocalFan <[email protected]>
Date:   Fri May 31 14:38:08 2024 -0400

    Fix alt animations

commit 6b35e99
Merge: aaad316 0d17706
Author: VocalFan <[email protected]>
Date:   Fri May 31 14:03:31 2024 -0400

    Merge branch 'main' of https://github.com/BombasticTom/fnf-porter

commit aaad316
Author: VocalFan <[email protected]>
Date:   Fri May 31 14:03:21 2024 -0400

    Add conversion for when numbers are used

commit 0d17706
Author: BombasticTom <[email protected]>
Date:   Fri May 31 15:06:12 2024 +0200

    Update error.yml

commit d6562a8
Author: tposejank <[email protected]>
Date:   Fri May 31 00:53:37 2024 -0400

    fix a TON of stuff

    - Save a character change event automatically
    - Added event checkbox
    - Added scripts directory constant
    - Added the error box
    - Edited the checkbox positions slightly

commit 09a3754
Author: tposejank <[email protected]>
Date:   Thu May 30 23:45:55 2024 -0400

    stacked events

    (nobody uses the feature in psych but we done it anyway!)

commit 80b2350
Author: VocalFan <[email protected]>
Date:   Thu May 30 23:31:11 2024 -0400

    Lil better description of alt anims

commit 1071bb7
Author: tposejank <[email protected]>
Date:   Thu May 30 23:29:22 2024 -0400

    Incorrect uses of spaces and indentation

    this issue may only be mine but my vsc was screaming

commit 97e7c61
Author: tposejank <[email protected]>
Date:   Thu May 30 23:26:18 2024 -0400

    uncomment this code block

commit 8a754d6
Author: tposejank <[email protected]>
Date:   Thu May 30 23:26:08 2024 -0400

    fix for FNF-Porter#50

commit 7a785b1
Author: VocalFan <[email protected]>
Date:   Thu May 30 22:29:04 2024 -0400

    Woah, Change Character events!

commit 8fb618e
Author: VocalFan <[email protected]>
Date:   Wed May 29 01:07:52 2024 -0400

    Stage z axis fixingggg

commit a40a855
Author: VocalFan <[email protected]>
Date:   Wed May 29 00:26:24 2024 -0400

    A lot of animation stuffs

commit 6c8ca91
Author: VocalFan <[email protected]>
Date:   Tue May 28 13:02:32 2024 -0400

    Revert dis

commit e50fb76
Author: VocalFan <[email protected]>
Date:   Tue May 28 02:23:35 2024 -0400

    Me and the boys love hyphen endings.

commit e0f1cad
Author: VocalFan <[email protected]>
Date:   Tue May 28 01:04:04 2024 -0400

    Fix stuff up... A little.

commit 68aafbd
Merge: 4114aa5 2f105e6
Author: Gusborg <[email protected]>
Date:   Mon May 27 15:31:51 2024 -0500

    Merge pull request FNF-Porter#51 from gusborg88:gusborg88/issue35

    Why did it make a branch

commit 2f105e6
Merge: 88f85f5 4114aa5
Author: Gusborg <[email protected]>
Date:   Mon May 27 15:31:41 2024 -0500

    Merge remote-tracking branch 'origin/main' into gusborg88/issue35

commit 88f85f5
Author: Gusborg <[email protected]>
Date:   Mon May 27 15:31:00 2024 -0500

    fixed week images crash, moved base64 images to constants, mostly made an error dialog (it doesnt work yet)

commit 4114aa5
Author: VocalFan <[email protected]>
Date:   Mon May 27 14:08:48 2024 -0400

    Fix stage prop placement ffs

commit 5f48eb8
Author: VocalFan <[email protected]>
Date:   Mon May 27 11:54:48 2024 -0400

    Fix the naming for frameRate default

commit a7abbab
Author: VocalFan <[email protected]>
Date:   Mon May 27 11:35:11 2024 -0400

    FPS and indices!

commit feedce2
Author: BombasticTom <[email protected]>
Date:   Sun May 26 15:17:52 2024 +0200

    small fix (im a dumbass)

commit 5925634
Author: BombasticTom <[email protected]>
Date:   Sun May 26 15:11:49 2024 +0200

    Clean up ChartTools, temporary Legacy Events fix

    Yeah!

commit 5fdbe09
Merge: 0d077f3 4433034
Author: BombasticTom <[email protected]>
Date:   Sun May 26 12:51:22 2024 +0200

    Merge branch 'main' of https://github.com/gusborg88/fnf-porter

commit 0d077f3
Author: BombasticTom <[email protected]>
Date:   Sun May 26 12:51:18 2024 +0200

    added switch cases to StageLuaParse

    hope this helps Jank!!

commit 4433034
Author: VocalFan <[email protected]>
Date:   Sun May 26 01:33:37 2024 -0400

    Better but doesn't do EVERY icon still!

commit 530ef67
Author: tposejank <[email protected]>
Date:   Sat May 25 23:41:49 2024 -0400

    fix up freeplay icons

commit ac53ca7
Author: VocalFan <[email protected]>
Date:   Sat May 25 23:21:29 2024 -0400

    Stfu Pillow.

commit 9fa502a
Author: tposejank <[email protected]>
Date:   Sat May 25 23:04:17 2024 -0400

    biggest fix ever

commit 2023941
Author: tposejank <[email protected]>
Date:   Sat May 25 22:55:13 2024 -0400

    change name of workflow builds

commit 47c2c7b
Author: tposejank <[email protected]>
Date:   Sat May 25 22:55:02 2024 -0400

    add vocalfan to strings

commit 777d17e
Author: tposejank <[email protected]>
Date:   Sat May 25 22:54:47 2024 -0400

    new version things

commit 1896c76
Merge: 7100dbf 8248b33
Author: tposejank <[email protected]>
Date:   Sat May 25 22:33:58 2024 -0400

    Merge branch 'sounds-music-support'

commit 8248b33
Author: tposejank <[email protected]>
Date:   Sat May 25 22:30:37 2024 -0400

    error and issue templates

commit aa8e605
Author: tposejank <[email protected]>
Date:   Sat May 25 22:30:30 2024 -0400

    window stacking checkbox y values + sounds & music

commit a1d70b1
Author: tposejank <[email protected]>
Date:   Sat May 25 22:30:01 2024 -0400

    add music

commit 7100dbf
Author: VocalFan <[email protected]>
Date:   Sat May 25 21:48:04 2024 -0400

    Remove scale... For now!

commit 871c642
Author: VocalFan <[email protected]>
Date:   Sat May 25 21:17:14 2024 -0400

    Fix character jsons duplicating prev values

commit daba5ea
Author: VocalFan <[email protected]>
Date:   Sat May 25 20:12:47 2024 -0400

    Change stuff under Dependencies

commit 41afe95
Author: VocalFan <[email protected]>
Date:   Sat May 25 18:14:08 2024 -0400

    tooltipbewrong

commit f07388a
Author: tposejank <[email protected]>
Date:   Sat May 25 17:58:42 2024 -0400

    incomplete/not finished sound support

commit a724ed0
Author: tposejank <[email protected]>
Date:   Sat May 25 17:53:25 2024 -0400

    some updates to the window and templates

commit e4eb048
Author: VocalFan <[email protected]>
Date:   Sat May 25 04:17:04 2024 -0400

    e!

commit 2e7b61a
Author: VocalFan <[email protected]>
Date:   Sat May 25 04:16:04 2024 -0400

    smh

commit 67b3dea
Author: VocalFan <[email protected]>
Date:   Sat May 25 04:15:21 2024 -0400

    Fix error.yml maybe?

commit 91ac88a
Author: VocalFan <[email protected]>
Date:   Sat May 25 04:14:31 2024 -0400

    Add freeplay icons and fix stuff-

commit 380823e
Author: Gusborg <[email protected]>
Date:   Fri May 24 22:07:04 2024 -0500

    no more setup.py

commit d0bdd8b
Merge: 5a63359 6f27dd4
Author: Gusborg <[email protected]>
Date:   Fri May 24 22:04:48 2024 -0500

    Merge branch 'main' of https://github.com/gusborg88/fnf-porter

commit 6f27dd4
Merge: 462e580 0981d8d
Author: VocalFan <[email protected]>
Date:   Fri May 24 22:55:49 2024 -0400

    Merge branch 'main' of https://github.com/gusborg88/fnf-porter

commit 462e580
Author: VocalFan <[email protected]>
Date:   Fri May 24 22:55:46 2024 -0400

    Fix the stage anim!!!

commit 0981d8d
Author: tposejank <[email protected]>
Date:   Fri May 24 22:50:35 2024 -0400

    Correct time

commit 5a63359
Merge: 0ca3e75 d8414ee
Author: Gusborg <[email protected]>
Date:   Fri May 24 21:49:13 2024 -0500

    Merge branch 'main' of https://github.com/gusborg88/fnf-porter

commit d8414ee
Author: tposejank <[email protected]>
Date:   Fri May 24 22:28:15 2024 -0400

    Revert "Remove onefile"

    This reverts commit 628e172.

commit 628e172
Author: tposejank <[email protected]>
Date:   Fri May 24 22:23:07 2024 -0400

    Remove onefile

commit 0ca3e75
Author: Gusborg <[email protected]>
Date:   Fri May 24 21:06:32 2024 -0500

    removed setup.py and changed error template

commit 558df89
Author: VocalFan <[email protected]>
Date:   Fri May 24 17:19:35 2024 -0400

    Dupe note warnings

commit ecf524b
Merge: 2bc1bde f14f788
Author: VocalFan <[email protected]>
Date:   Fri May 24 16:41:22 2024 -0400

    Merge pull request FNF-Porter#42 from VocalFan/main

    Fix up some note stuff
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@gusborg88