Skip to content

ZAPD Update#2851

Merged
leggettc18 merged 25 commits intoHarbourMasters:develop-spockfrom
louist103:ZAPDUPDATE
May 7, 2023
Merged

ZAPD Update#2851
leggettc18 merged 25 commits intoHarbourMasters:develop-spockfrom
louist103:ZAPDUPDATE

Conversation

@louist103
Copy link
Contributor

@louist103 louist103 commented May 7, 2023 •
edited by github-actions bot
Loading

Same PR as #2292 but targeting develop-spock. Not sure which one it needs to go into.

Build Artifacts

louist103 and others added 24 commits April 29, 2023 00:12
@louist103
git subrepo clone --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/
ce2df38 
subrepo:
  subdir:   "ZAPDTR"
  merged:   "6aa54a551"
upstream:
  origin:   "C:/ZeldaStuff/ZAPDTR"
  branch:   "rebase2"
  commit:   "6aa54a551"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
@louist103
git subrepo clone --force --branch=rebase2 C:/ZeldaStuff/ZAPDTR ZAPDTR/
f731c8f 
subrepo:
  subdir:   "ZAPDTR"
  merged:   "88b012240"
upstream:
  origin:   "C:/ZeldaStuff/ZAPDTR"
  branch:   "rebase2"
  commit:   "88b012240"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
@louist103
Update (its broken)
9996712
@louist103
fix the enum
35beaff
@louist103
git subrepo push --remote=C:/ZeldaStuff/ZAPDTR/ ZAPDTR
196caf8 
subrepo:
  subdir:   "ZAPDTR"
  merged:   "b7b6e1c82"
upstream:
  origin:   "C:/ZeldaStuff/ZAPDTR/"
  branch:   "rebase2"
  commit:   "b7b6e1c82"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
@louist103
New names for LUS actions
b1c0174
@louist103
git subrepo push --remote=C:/ZeldaStuff/ZAPDTR/ ZAPDTR
13d9fd0 
subrepo:
  subdir:   "ZAPDTR"
  merged:   "c5cfebeee"
upstream:
  origin:   "C:/ZeldaStuff/ZAPDTR/"
  branch:   "rebase2"
  commit:   "c5cfebeee"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
@louist103
git subrepo clone (merge) --force --branch=rebase2 C:/ZeldaStuff/ZAPD…
dd6efa2 
…TR ZAPDTR/

subrepo:
  subdir:   "ZAPDTR"
  merged:   "d5f4769b8"
upstream:
  origin:   "C:/ZeldaStuff/ZAPDTR"
  branch:   "rebase2"
  commit:   "d5f4769b8"
git-subrepo:
  version:  "0.4.3"
  origin:   "???"
  commit:   "???"
@louist103
Fix missing commands in the exporter.
befb66f
@louist103
Cleanups.
f0ff31f
@louist103
git subrepo pull --force --remote=https://github.com/harbourmasters/Z…
0fd2660 
…APDTR --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:   "???"
@louist103
Add unordered_map include to fix MacOS
c17ccdf
@louist103
fix string_view
22e0f99
@louist103
Update Main.cpp
0c03cd3
@louist103
fix string view
c71ec8d
@louist103
So close I can almost taste it
c800fa1
@louist103
So close
5d6150a
@louist103
Fix missed git marker.
442c707
@louist103
Fix surface types and
2d73ff7
@leggettc18
Merge pull request HarbourMasters#2826 from HarbourMasters/develop-spock
071a2d0 
Spock -> Develop
@leggettc18
Merge pull request HarbourMasters#2829 from HarbourMasters/develop-spock
1fbec4c 
Spock -> Develop
@briaguya0
Spock -> develop
dd43719
@louist103
Merge branch 'HarbourMasters:develop' into ZAPDUPDATE
3bfc7be
@louist103
Update ZFile.cpp
64c3314
@mergify
Copy link
Contributor

mergify bot commented May 7, 2023

⚠️ The sha of the head commit of this PR conflicts with #2292. Mergify cannot evaluate rules on this PR. ⚠️

@leggettc18 leggettc18 merged commit f31a841 into HarbourMasters:develop-spock May 7, 2023
leggettc18 added a commit to leggettc18/Shipwright that referenced this pull request May 8, 2023
@leggettc18
Reverts part of PR HarbourMasters#2851 that required OTR regen.
89ad082
@leggettc18 leggettc18 mentioned this pull request May 8, 2023
Merged
leggettc18 added a commit that referenced this pull request May 8, 2023
@leggettc18
Reverts part of PR #2851 that required OTR regen. (#2856)
b166bdd
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@leggettc18 leggettc18 leggettc18 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.

3 participants

@louist103 @leggettc18 @briaguya0