Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

rachael -> zhora #1226

Merged
merged 11 commits into from
Aug 17, 2022
Merged

rachael -> zhora #1226

merged 11 commits into from
Aug 17, 2022

Conversation

briaguya-ai
Copy link
Contributor

No description provided.

aMannus and others added 11 commits August 14, 2022 23:01
@aMannus
Rando: Fix bomb/bombchu shops (#1134)
37dd045 
* Fix bomb shops in rando

* Addressed review comments
@aMannus
Fixed rotation of freestanding key checks in rando (#1135)
d575a3d
@DrFrankinStein
Fix Save Editor Event Check Inf "A" Row flags (#1138)
8945b2e 
Fix Save Editor Event Check Inf Flags "A" Row flags not working. It was set to "eci1" instead of "eci10".
@aMannus
Fix lost woods leading music in rando (#1155)
fabe051
@briaguya-ai
don't abuse epochs (#1179)
42bce9d 
* don't abuse epochs

* update bongo hand trails

Co-authored-by: briaguya <briaguya@alice>
@briaguya-ai
add 3drando license (#1206)
ee9ea3f 
Co-authored-by: briaguya <briaguya@alice>
@leggettc18
Fix Ice Traps on Windows and Mac (#1216)
0f2e7db
@aMannus
Rando: Fix being able to get Sun's Song check multiple times (#1185)
cd37a56
@briaguya-ai
volvagia interpolation fix (#1203)
71b1db1 
Co-authored-by: briaguya <briaguya@alice>
@briaguya-ai
clean up a few epochs that were missed (#1204)
01b7fed 
Co-authored-by: briaguya <briaguya@alice>
@briaguya-ai
add ActorResetFunc for courtyard guards (#1213)
6206cd7 
Co-authored-by: briaguya <briaguya@alice>
jbodner09 pushed a commit to jbodner09/Shipwright that referenced this pull request Aug 17, 2022
@dcvz
[zret] Port some documentation changes (HarbourMasters#1164)
6b0338a 
* zret: Documentation pass on scene/room commands HarbourMasters#1226

* Update OTR scene

* zret: Document the lens system HarbourMasters#1079

* zret: Misc. doc/cleanup 4 HarbourMasters#1093

* zret: Fix misc 8 HarbourMasters#1150

* zret: Document Distortions from z_camera and z_view HarbourMasters#1102
@Kenix3 Kenix3 merged commit 7298122 into develop-zhora Aug 17, 2022
louist103 pushed a commit to louist103/Shipwright-1 that referenced this pull request Aug 19, 2022
@dcvz @louist103
[zret] Port some documentation changes (HarbourMasters#1164)
a28d439 
* zret: Documentation pass on scene/room commands HarbourMasters#1226

* Update OTR scene

* zret: Document the lens system HarbourMasters#1079

* zret: Misc. doc/cleanup 4 HarbourMasters#1093

* zret: Fix misc 8 HarbourMasters#1150

* zret: Document Distortions from z_camera and z_view HarbourMasters#1102
Kenix3 pushed a commit to Kenix3/Shipwright that referenced this pull request Oct 19, 2022
@dcvz @Kenix3
[zret] Port some documentation changes (HarbourMasters#1164)
34bfab6 
* zret: Documentation pass on scene/room commands HarbourMasters#1226

* Update OTR scene

* zret: Document the lens system HarbourMasters#1079

* zret: Misc. doc/cleanup 4 HarbourMasters#1093

* zret: Fix misc 8 HarbourMasters#1150

* zret: Document Distortions from z_camera and z_view HarbourMasters#1102
Kenix3 added a commit to Kenix3/Shipwright that referenced this pull request Oct 19, 2022
@Kenix3
Merge pull request HarbourMasters#1226 from HarbourMasters/develop-ra…
6fa7539 
…chael

rachael -> zhora
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kenix3 Kenix3 Kenix3 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@briaguya-ai @Kenix3 @aMannus @DrFrankinStein @leggettc18