Skip to content

No forced navi (Prevent forced Navi conversations)#453

Merged
Kenix3 merged 6 commits intoHarbourMasters:developfrom
briaguya0:no-forced-navi
Jun 17, 2022
Merged

No forced navi (Prevent forced Navi conversations)#453
Kenix3 merged 6 commits intoHarbourMasters:developfrom
briaguya0:no-forced-navi

Conversation

@briaguya0
Copy link
Contributor

@briaguya0 briaguya0 commented Jun 8, 2022

Prevent forced Navi conversations

@briaguya0 briaguya0 changed the title No forced navi No forced navi (Prevent forced Navi conversations) Jun 8, 2022
@Kenix3 Kenix3 requested review from NEstelami and louist103 June 8, 2022 22:11
@Kenix3
Copy link
Collaborator

Kenix3 commented Jun 11, 2022

Merge pending conflict resolution

@briaguya0
Copy link
Contributor Author

Merge pending conflict resolution

didn't notice this 4 days ago, conflict resolved.

@Kenix3 Kenix3 merged commit 3e6307b into HarbourMasters:develop Jun 17, 2022
th-2021 pushed a commit to th-2021/Shipwright-cmake that referenced this pull request Jun 19, 2022
* no forced navi

* imgui option for it

* remove double owl from sloppy merge

Co-authored-by: briaguya <briaguya@alice>
stratomaster64 pushed a commit to stratomaster64/Shipwright that referenced this pull request Jun 20, 2022
* no forced navi

* imgui option for it

* remove double owl from sloppy merge

Co-authored-by: briaguya <briaguya@alice>
@briaguya0 briaguya0 deleted the no-forced-navi branch June 22, 2022 06:51
@briaguya0 briaguya0 mentioned this pull request Aug 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants