Skip to content

Larger events V3#3631

Closed
LizardKing777 wants to merge 0 commit into
EasyRPG:masterfrom
LizardKing777:Larger-Events
Closed

Larger events V3#3631
LizardKing777 wants to merge 0 commit into
EasyRPG:masterfrom
LizardKing777:Larger-Events

Conversation

@LizardKing777

Copy link
Copy Markdown

Resolved whitespace issues, made the new code a branch so the original code is maintained and made sure to keep CheckOrMakeWayEx in it's original state and put the new code as a separate branch so nothing should be at risk of breaking.

@Ghabry Ghabry left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The commit list is a mess. Imo the only way to save it is to squash your 8 commits into a single commit.

Also you reverted code by us. Make sure you are always using the latest upstream code:

git fetch upstream
git rebase upstream/master

Comment thread src/game_map.cpp
}

/* OLD VERSION PRE-LARGER EVENTS

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just overwrite the old version with the new version. Do not comment it out.

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make more sense to just create a new branch and pull request that one?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants