Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
bdca9f1
Merge pull request #1 from Tacoman369/main
PhlexPlexico Nov 27, 2023
741974d
Update zelda2_mag.gar.lzs
Tacoman369 Nov 27, 2023
e873386
Logic Fix
Tacoman369 Dec 11, 2023
f1690f6
Merge pull request #2 from Z3DR/OwnDungeonFix
PhlexPlexico Dec 12, 2023
44d8f43
Update item_location.cpp
Tacoman369 Dec 14, 2023
78e5293
Merge pull request #3 from Z3DR/OwnDungeonFix
Tacoman369 Dec 14, 2023
026f25b
Update Z3DR
Tacoman369 Dec 19, 2023
5cff253
Merge pull request #4 from Z3DR/OwnDungeonFix
Tacoman369 Dec 19, 2023
e39fc3f
Update Z3DR + Settings
Tacoman369 Dec 20, 2023
b51a286
Merge pull request #5 from Z3DR/OwnDungeonFix
Tacoman369 Dec 20, 2023
3c4fb45
Update Z3DR subrepo.
PhlexPlexico Dec 20, 2023
111fb16
Merge pull request #6 from Z3DR/repo-update
PhlexPlexico Dec 20, 2023
d0ce0c9
Update submodule
PhlexPlexico Dec 21, 2023
5369484
Merge pull request #7 from Z3DR/repo-update
PhlexPlexico Dec 21, 2023
242ceb5
Update repo once more for bug fixes.
PhlexPlexico Dec 21, 2023
b5909d4
Merge pull request #8 from Z3DR/repo-update
PhlexPlexico Dec 21, 2023
c0125f6
Update patch code.
PhlexPlexico Dec 22, 2023
8894e4a
Merge pull request #9 from Z3DR/repo-update
PhlexPlexico Dec 22, 2023
6d4be60
Greay -> Great
PhlexPlexico Dec 22, 2023
c4152c8
Merge pull request #10 from Z3DR/repo-update
PhlexPlexico Dec 22, 2023
75e9edd
Update repeatable bottles to use refills instead.
PhlexPlexico Dec 23, 2023
129e0bb
Various Fixes
Tacoman369 Dec 25, 2023
c63c3dc
Update submodule.
PhlexPlexico Dec 25, 2023
76fa9f3
Merge pull request #11 from Z3DR/repo-update
PhlexPlexico Dec 25, 2023
337530e
Merge pull request #12 from Z3DR/OwnDungeonFix
PhlexPlexico Dec 25, 2023
e477bfc
Various Fixes 2
Tacoman369 Dec 25, 2023
fce002d
Merge branch 'main' into OwnDungeonFix
PhlexPlexico Dec 25, 2023
b560b98
Merge pull request #13 from Z3DR/OwnDungeonFix
PhlexPlexico Dec 25, 2023
fc0bd53
Logic & Spoiler Log Updates
Tacoman369 Dec 28, 2023
1999ce0
Update Z3DR
Tacoman369 Dec 28, 2023
2377526
Logic-Update-3
Tacoman369 Dec 31, 2023
97e16a0
Merge branch 'main' into Logic-Update-3
Tacoman369 Dec 31, 2023
00383c9
Merge pull request #14 from Z3DR/Logic-Update-3
Tacoman369 Dec 31, 2023
d9d618b
Update Z3DR
Tacoman369 Dec 31, 2023
06fd3b8
Merge pull request #15 from Z3DR/Logic-Update-3
Tacoman369 Dec 31, 2023
737e550
Update item_location.cpp
Tacoman369 Dec 31, 2023
160d9c0
Merge pull request #16 from Z3DR/Logic-Update-3
Tacoman369 Dec 31, 2023
f62d6d2
Update spoiler_log.cpp
Tacoman369 Jan 4, 2024
4a9ea56
Merge pull request #17 from Z3DR/Logic-Update-3
Tacoman369 Jan 4, 2024
dc33cee
Update Z3DR
Tacoman369 Jan 4, 2024
7067373
Merge pull request #18 from Z3DR/Logic-Update-3
Tacoman369 Jan 4, 2024
2c19004
Fix ice trap custom message.
PhlexPlexico Jan 5, 2024
8a17678
Merge pull request #19 from Z3DR/ice-trap-message
PhlexPlexico Jan 5, 2024
4df687f
Bring in new build check and deploy from OoT3DR. (#20)
PhlexPlexico Jan 16, 2024
71eafc2
Hint Stone Implementation (#21)
PhlexPlexico Jan 18, 2024
c41fa8b
Update README.md
PhlexPlexico Jan 19, 2024
e6edd2b
Fix 1.1 code generation.
PhlexPlexico Jan 20, 2024
8cb2745
Fix 1.1 code generation. (#23)
PhlexPlexico Jan 20, 2024
8c5532e
Update create-build.yml (#24)
PhlexPlexico Jan 20, 2024
2e1b714
Fix Jim Softlocking the game. (#25)
PhlexPlexico Jan 21, 2024
7ec7a75
Create locale.txt when generating for console (#26)
Roberto-Nessy Jan 22, 2024
94c7e8f
Fix logic (#29)
Roberto-Nessy Jan 25, 2024
d5f44dd
Update subrepo to include all basepatch changes. (#27)
PhlexPlexico Jan 25, 2024
d2e113e
Logic Fixes (#30)
Tacoman369 Jan 26, 2024
a064cb1
Fix item issues with pictograph, powder keg, and Zora mask. (#31)
PhlexPlexico Jan 27, 2024
d18a3b8
Update patch code to fix various item check issues. (#32)
PhlexPlexico Jan 29, 2024
177bc4d
Include Giant Mask unshuffling for now as the check is not giving pro…
PhlexPlexico Jan 30, 2024
e5b9922
Fix Keaton Quiz in Milk Road. (#34)
PhlexPlexico Jan 30, 2024
0b9790f
Item Location Fixes (#35)
PhlexPlexico Feb 4, 2024
6edccc1
Update Version Number
PhlexPlexico Feb 4, 2024
d664f00
Change Pamela's Father override to be correct. (#36)
PhlexPlexico Feb 5, 2024
86b15a2
v1.2.1 Bug Fixes
Tacoman369 Feb 11, 2024
853a9b6
Update Z3DR
Tacoman369 Feb 11, 2024
8805f4a
Update version.hpp
Tacoman369 Feb 11, 2024
4b79816
Merge pull request #42 from Z3DR/1.2.1-bug-fixes
Tacoman369 Feb 11, 2024
c7a534e
Update build script to be more automatic in generating full releases.…
PhlexPlexico Feb 11, 2024
92407df
Update create-build.yml
PhlexPlexico Feb 11, 2024
7978e58
Spoiler Log Updates & Patch Fixes (#44)
PhlexPlexico Feb 13, 2024
72cb0be
Update version.hpp (#46)
PhlexPlexico Feb 13, 2024
f6b0147
Change field 4 flags to be that of southern swamp for tingle. (#47)
PhlexPlexico Feb 15, 2024
356514f
Adjust workflow to use proper variables. (#48)
PhlexPlexico Feb 16, 2024
db09533
Version 1.3.0 RC (#50)
PhlexPlexico Feb 19, 2024
944f4d5
Update version.hpp
PhlexPlexico Feb 19, 2024
3b1f71a
Fix minor text issues. (#51)
PhlexPlexico Feb 20, 2024
e60440f
Update MM3DR for new patches. (#52)
PhlexPlexico Feb 20, 2024
332f226
Nightly fixes from last reports (#55)
PhlexPlexico Feb 21, 2024
26a4184
Update chest logic to be less restrictive on repeat items. (#56)
PhlexPlexico Feb 22, 2024
82d9ec6
Implement blast mask cooldown changes. Includes new comfort menu. (#57)
PhlexPlexico Feb 22, 2024
0bf0b84
Logic fixes (#58)
PhlexPlexico Feb 24, 2024
5d9cf4d
Update patch code to bring in new changes. (#61)
PhlexPlexico Feb 26, 2024
4467748
Update base patch to fix lens of truth checks. (#63)
PhlexPlexico Feb 26, 2024
94fceca
Include patch code changes for twinmold patches and bottle patches. (…
PhlexPlexico Feb 28, 2024
06d2320
Add Restoration Twinmold Option (#66)
PhlexPlexico Feb 29, 2024
52be91a
Gilded Sword Check Prereq Fix and WFT, SHT, and GBT SF Logic Adjustments
RandoZLink Mar 6, 2024
93b7ad7
Merge pull request #1 from RandoZLink/RandoZLink-Branch
RandoZLink Mar 6, 2024
21f9088
Fixed Gilded Sword check and tuned SF Logic Checks for WFT, SHT, and GBT
RandoZLink Mar 6, 2024
d7aefc0
Update location_access.cpp
RandoZLink Mar 6, 2024
e275586
Update location_access.cpp
RandoZLink Mar 6, 2024
21b9648
Update location_access.cpp
RandoZLink Mar 7, 2024
ab5fecb
Update location_access.cpp
RandoZLink Mar 7, 2024
b65bdfe
Dampé doesn't have a bottle in MM3D
jcallen Mar 5, 2024
672d2ac
Mystery Milk bottle is not usable immediately
jcallen Mar 5, 2024
5294c0e
Adjust mystery milk bottle logic
jcallen Mar 5, 2024
856bf79
Merge pull request #69 from jcallen/main
Tacoman369 Mar 8, 2024
e2cea16
Merge pull request #71 from RandoZLink/main
Tacoman369 Mar 8, 2024
6d5b2e4
Update Patch Code to include bottle logic refactor and seahorse adjus…
PhlexPlexico Mar 8, 2024
b5e24af
Spoiler Log Updates
Tacoman369 Mar 9, 2024
310ced6
Exclude Updates
Tacoman369 Mar 9, 2024
c47094f
Merge pull request #73 from Z3DR/SpoilerFixes
Tacoman369 Mar 9, 2024
c94dc2f
Razor and Gilded Sword Need to Check for B Sword
RandoZLink Mar 11, 2024
0e867f7
Change Ranch Defense to be nonrepeatable
RandoZLink Mar 12, 2024
eeeb4f0
Update item_location.cpp
RandoZLink Mar 13, 2024
0cda502
Fixed Swordsman School and Old Lady Needing AnyBSword
RandoZLink Mar 13, 2024
4d4580b
Merge branch 'main' into main
RandoZLink Mar 13, 2024
c5b01a7
Added Blast Mask to Applicable locations where Bombs could also be used
RandoZLink Mar 13, 2024
bad4f6d
Updated Zora's Cape Grotto Reqs
RandoZLink Mar 13, 2024
6127f36
Bio Baba Grotto Needs Bombs, Business Scrub requires Observ. Access, …
RandoZLink Mar 13, 2024
b760c39
Fixed Road to SS Tree
RandoZLink Mar 13, 2024
b74dbbb
Hungry Goron Requirements Update
RandoZLink Mar 13, 2024
31da851
Scrub Biggest Bomb Bag and Cow Grottos Req Updates
RandoZLink Mar 13, 2024
8666a29
Razor and Gilded Sword Need to Check for B Sword (#74)
RandoZLink Mar 13, 2024
657004c
Update subrepo for patch code.
PhlexPlexico Mar 13, 2024
eda0b65
Merge branch 'Z3DR:main' into main
RandoZLink Mar 13, 2024
e0e8322
ISTT FIx (#76)
Tacoman369 Mar 15, 2024
0d1418e
EU and New Menu (#77)
Tacoman369 Mar 15, 2024
eb20a2d
Merge branch 'Z3DR:main' into main
RandoZLink Mar 17, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .github/workflows/build-check.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: MM3DR Build Check

on:
pull_request:

jobs:
format:
name: Verify Formatting
runs-on: ubuntu-latest

steps:
- name: Checkout Project
uses: actions/checkout@v3

# - name: Format Project
# uses: DoozyX/[email protected]
# with:
# source: "./code ./source"
# extensions: 'c,h,cpp,hpp'
# clangFormatVersion: 14

build:
name: Confirm Compilable
runs-on: ubuntu-latest
container:
image: ghcr.io/z3dr/randotools:latest

steps:
- name: Checkout Project
uses: actions/checkout@v3
with:
submodules: true

- name: Compile Project
run: |
make -j
Loading