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

Spock Bravo -> Develop #2877

Merged
merged 18 commits into from
May 11, 2023
Merged

Spock Bravo -> Develop #2877

merged 18 commits into from
May 11, 2023

Conversation

leggettc18
Copy link
Contributor

@leggettc18 leggettc18 commented May 11, 2023 •
edited by github-actions bot
Loading

louist103 and others added 18 commits May 7, 2023 19:58
@louist103 @leggettc18 @briaguya-ai
ZAPD Update (#2851)
f31a841 
* git subrepo clone --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/

subrepo:
  subdir:   "ZAPDTR"
  merged:   "6aa54a551"
upstream:
  origin:   "C:/ZeldaStuff/ZAPDTR"
  branch:   "rebase2"
  commit:   "6aa54a551"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* git subrepo clone --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/

subrepo:
  subdir:   "ZAPDTR"
  merged:   "88b012240"
upstream:
  origin:   "C:/ZeldaStuff/ZAPDTR"
  branch:   "rebase2"
  commit:   "88b012240"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Update (its broken)

* fix the enum

* git subrepo push --remote=C:/ZeldaStuff/ZAPDTR/ ZAPDTR

subrepo:
  subdir:   "ZAPDTR"
  merged:   "b7b6e1c82"
upstream:
  origin:   "C:/ZeldaStuff/ZAPDTR/"
  branch:   "rebase2"
  commit:   "b7b6e1c82"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* New names for LUS actions

* git subrepo push --remote=C:/ZeldaStuff/ZAPDTR/ ZAPDTR

subrepo:
  subdir:   "ZAPDTR"
  merged:   "c5cfebeee"
upstream:
  origin:   "C:/ZeldaStuff/ZAPDTR/"
  branch:   "rebase2"
  commit:   "c5cfebeee"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* git subrepo clone (merge) --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/

subrepo:
  subdir:   "ZAPDTR"
  merged:   "d5f4769b8"
upstream:
  origin:   "C:/ZeldaStuff/ZAPDTR"
  branch:   "rebase2"
  commit:   "d5f4769b8"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Fix missing commands in the exporter.

* Cleanups.

* git subrepo pull --force --remote=https://github.com/harbourmasters/ZAPDTR --branch=master ZAPDTR

subrepo:
  subdir:   "ZAPDTR"
  merged:   "d4c35b90a"
upstream:
  origin:   "https://github.com/harbourmasters/ZAPDTR"
  branch:   "master"
  commit:   "d4c35b90a"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"

* Add unordered_map include to fix MacOS

* fix string_view

* Update Main.cpp

* fix string view

* So close I can almost taste it

* So close

* Fix missed git marker.

* Fix surface types and

* Update ZFile.cpp

* Delete Jenkinsfile

---------

Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
@Kenix3 @briaguya-ai
Bump LUS version (#2849)
91bd693 
* Bump LUS version

* Removes the "now" boolean from the LUS resource bridge functions.

* Bump LUS

* More LUS bump

* Update soh/soh/resource/importer/AudioSampleFactory.cpp

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
@Lutzx @leggettc18
Add stdint headers (#1) (#2832)
fac898d 
* Add stdint header

* Add stdint header

Co-authored-by: Christopher Leggett <chris@leggett.dev>
@briaguya-ai
fix build (#2852)
f5aacaf 
Co-authored-by: briaguya <briaguya@alice>
@leggettc18
Reverts part of PR #2851 that required OTR regen. (#2856)
b166bdd
@Kenix3
Bump LUS (#2855)
77987a4 
* Bump LUS

* Ship -> LUS namespace change

* z_scene_otr Ship -> LUS namespace
@Archez
fix own dungeon items not using rando GI item when boss rooms are shu…
caf8f1b 
…ffled (#2859)
@aMannus
Fixed small error in CC .cs file (#2858)
23d40c1
@briaguya-ai
bump LUS for thread stuff (#2866)
b887d38 
* bump for threads

* use latest lus main

---------

Co-authored-by: briaguya <briaguya@alice>
@briaguya-ai
fix for day/night textures (#2853)
72358eb 
* hacky fix for deku tree entrance

* lonlon windows

* only hack in one place instead of everywhere

* dehack deku

* goron city entrance

* gerudo cell, zd entrance

* kak windows

* fix pot house

* back to the hacks

* back back

* space

* globals

* just hack it together to fix em all

---------

Co-authored-by: briaguya <briaguya@alice>
@Archez
improve built in extraction detection (#2865)
c70bdb7
@leggettc18
RANDO: Fix logic with OGC and mixed entrance pools (#2830)
a72997f 
* RANDO: Fix logic with OGC and mixed entrance pools

Adds a `GANONS_CASTLE_LEDGE` area and a `BuiltRainbowBridge` logic var. Added an event to `GANONS_CASTLE_GROUNDS` that sets `BuiltRainbowBridge` to true. Adds Entrances for `GANONS_CASTLE_LEDGE` to `GANONS_CASTLE_GROUNDS` when `IsAdult` and `BuiltRainbowBridge` (or the glitched logic that lets you skip the rainbow bridge) are true, `HYRULE_CASTLE_GROUNDS` when `IsChild` is true, and `GANONS_CASTLE_ENTRYWAY` When IsAdult is true (if child enters `GANONS_CASTLE_LEDGE` in game they are in `HYRULE_CASTLE_GROUNDS` and thus cannot go back into GANONS_CASTLE_ENTRYWAY). Adds Entrance for `GANONS_CASTLE_GROUNDS` to `GANONS_CASTLE_LEDGE` when `BuiltRainbowBridge` is true, or when the glitched logic that lets you skip the Rainbow Bridge is true.

* Adds intermediate area for age-gating

* Fixes the logic for actually killing the skulltula

* Adds hammer crouch stab as a way to kill OGC_GS
@garrettjoecox
Cleanup cvars that are set on boot (#2863)
2ea72f8
@aMannus
CC: No longer rely on received parameter to be 0 (#2870)
23d8912
@aMannus
Fix several enemy ID's for Hyper Rush (#2871)
6d4761f
@briaguya-ai
reserved thread count (#2868)
d1c930b 
* reserved thread count

* add comment, use latest main

---------

Co-authored-by: briaguya <briaguya@alice>
@garrettjoecox
Use OnGameFrameUpdate for rainbow tick instead of relying on ImGui hi…
85385db 
…dden window (#2872)
@leggettc18
Version Bump (#2867)
d8891f1
@briaguya-ai briaguya-ai merged commit 7dff8b6 into develop May 11, 2023
19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@leggettc18 @briaguya-ai @louist103 @Kenix3 @Lutzx @Archez @aMannus @garrettjoecox