little big conflict #23
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
just this once plswe must focus on Week Toxic assets.
|
Story Menu Antialiasing
Song intro skip feature v2
Add note in the `lime rebuild extension-webm` section
new notes for compiling instructionYeas |
- Add GF's hair loop - Fix parents eye loop - Play regular singing animation if the alt version doesn't exist
Fix some animation issues
Use Voices track for Tutorial
should be the last one
Update 1.8 comes looks likeand also they knew, Appveyor is hacked! So they went to GitHub Action! HOOF too much work!we gotta do this. let's go! Why are those internal chart JSON files conflict? what did we change there?Beautify & install & so accordingly Newgrounds doesn't allow mods 81aa106So there it will delet Newgrounds stuff. make note which goned. |
JOELwindows7
added a commit
to Perkedel/After-Church
that referenced
this pull request
Oct 26, 2021
QWhoa! it's update time. the new 1.8 finally release. we must start merge man! Perkedel/Kaded-fnf-mods#23 whait this is After Church
JOELwindows7
added a commit
that referenced
this pull request
Oct 26, 2021
QWhoa! it's update time. the new 1.8 finally release. we must start merge man! #23 propose custom char using just character image instead
Repaired HTML5 build CI.
Okay, we gotta start now.here we go. c'mon! lore finished. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
what hapenned?
there are another small changes but conflict
oh peck here we go again