Hookshot Anywhere#699
Hookshot Anywhere#699Archez merged 14 commits intoHarbourMasters:developfrom cplaster:hookshot-anywhere
Conversation
|
Hi! It looks as though you may have committed some merge conflict files in case you hadn't noticed! |
|
Oops! I hadn't noticed. I think this should be good now! |
|
Just a FYI cause it could just be me and my environment, but this doesn't appear to work. |
garrettjoecox
left a comment
garrettjoecox
left a comment
There was a problem hiding this comment.
Left a few suggestions, also needs updating to use the new menu & header pattern
| GI_VB_FLIP_HOP_VARIABLE, | ||
| GI_VB_DISABLE_LETTERBOX, | ||
| GI_VB_CLOCK_TOWER_OPENING_CONSIDER_THIS_FIRST_CYCLE, | ||
| GI_VB_ENABLE_HOOKSHOT_ANYWHERE, |
There was a problem hiding this comment.
| GI_VB_ENABLE_HOOKSHOT_ANYWHERE, | |
| GI_VB_BE_HOOKSHOT_SURFACE, |
|
Did you have trouble resolving the conflicts here? I can help out if not to lose this contribution! |
|
My branch of develop was ~3 months behind, tried to rebase. Fixed the merge conflicts, but it won't compile because it complains about the libultraship submodule now, and I gave up trying to fix it. I have another look after the weekend. |
|
Reopened PR, I think I've got this up to snuff now. |
Archez
left a comment
Archez
left a comment
There was a problem hiding this comment.
Hope you don't mind, but I pushed a small commit to help get this across the finish line.
Namely, ran the code formatter and aligned to use the new menu/headers.
5 participants
Allows most surfaces to be hookshot-able.
Build Artifacts