Nancok/Cave_Story_RepaintedNancokFork
1
0
Fork 0
forked from Team_F.R.E.D/Cave_Story_Repainted
Code Pull Requests 1 Activity

master #1

Open
Nancok wants to merge 3 commits from master into 29-11-13
pull from: master
merge into: Nancok:29-11-13
Conversation 0 Commits 3 Files Changed 2 +82 -115
Nancok commented 2024-08-03 19:56:59 +00:00
Owner
Copy Link
No description provided.
Nancok added 36 commits 2024-08-03 19:57:01 +00:00 
This reverts commit f09625e2b2.
Reviewed-on: Team_F.R.E.D/Cave_Story_Repainted#7
OC + Bees Ver 1. No Family Guy Death Pose or Protogen(?) yet
Making a mashup based on Plantation might be tricky, so this is a rough mashup based on The Answer from Megaman X6 (the .org soundtrack will have a lot of Megaman rep, why not add some to the .ogg variant?)
WOW YOU GOT THE TETRIS! WOW YOU'RE THE BEEEEESTT! WOOOOOOOOOO! WOOOOO! TETRIS!
Merged Nancok's item edits and finished fursuit "Toxic the G-Shep"
Tradwife was given a new portrait at the expense of that one dead robot with one line of dialogue. Maybe the Grey Gutsman and Human Sue sprites will be replaced with a Jhon and Unnamed Trendy Net Navi later on.
This pull request has changes conflicting with the target branch.
  • data/ItemImage.png
  • data/MyChar.png
  • data/Stage/PrtMimi.png
  • data/bkGard.png
  • data/stage.tbl
View command line instructions.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin master:master
git checkout master
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
No items
No Label
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
1 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: Nancok/Cave_Story_RepaintedNancokFork#1
No description provided.
Delete Branch "master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?