Commit Graph

3119 Commits

Author SHA1 Message Date
Archez
72f6fd158c
Fix Dawn Of screen crashing with 4th glitch (#718) 2024-06-25 23:40:51 -04:00
Garrett Cox
2e4710c6c2
Tweaks to warp point (#666)
* Tweaks to warp point

* wait for console logo exit

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
2024-06-25 00:16:10 -04:00
Malkierian
1f3ca038a8
PowerShell clang fix (#714)
* Fixes script running in commandline mode by adding System.Net inclusion at the top.
Also adds clang-format.exe to gitignore.

* Change System.Net namespace to System.
2024-06-24 23:42:12 -04:00
inspectredc
791064e870
Add Basic README (#664)
* Add basic readme

* Update README.md

---------

Co-authored-by: Archez <Archez@users.noreply.github.com>
2024-06-24 23:17:36 -04:00
balloondude2
3ef3e7a239
[Enhancement] Fix Fierce Deity interactions with Bombers (#674)
* Allow FD to talk to Bomber Jim. Adds comments to unknown data.

* fd works with blue bombers and guard bomber

* clang format
2024-06-24 20:46:58 -04:00
louist103
0d4e554ac6
Save editor temple clear fix (#709) 2024-06-24 09:34:40 -04:00
louist103
a933d73589
Fix the check for preventing a HESS crash. (#710)
* Fix the check

* Change style

* Another fix in SKelanime.

* Format
2024-06-23 17:11:21 -04:00
Archez
a38b9daa6d
Add HUD Editor support for horse carrots (#704) 2024-06-23 15:19:33 -04:00
Archez
120562952c
bump lus with color combiner fixes (#711) 2024-06-23 14:51:57 -04:00
Archez
fc309f5eaa
bump lus with ucode change (#708) 2024-06-22 15:05:32 -04:00
inspectredc
e87d7c6954
Delete z_message_tables.inc (#685) 2024-06-18 20:01:17 -04:00
Archez
8b2b12dbe8
Bump latest lus and bring over Array resource (#689)
* bump latest lus and bring over array resource

* use upstream otrexporter
2024-06-18 20:00:16 -04:00
Archez
c2199dddcf
Fix: Add reset func for moon crash giants cutscene (#694) 2024-06-15 15:52:42 -04:00
justawayofthesamurai
cc3e015f12
Added a fix for the moonjump so it doesn't crash the game when changing the day. (#693) 2024-06-15 15:02:30 -04:00
inspectredc
a383b4b330
Fix Fast Text Not Working on Instant Textboxes (#662)
* Fix Fast Text Not Working on Instant Textboxes

* format
2024-06-14 20:55:24 -04:00
inspectredc
df81f97e43
Add Free Look Camera Reset (#663) 2024-06-14 20:55:05 -04:00
inspectredc
e60ca15ae6
Merge pull request #683 from HarbourMasters/develop-rika
`develop-rika` -> `develop`
2024-06-10 11:51:48 +01:00
briaguya
84b9b4218a
ci: wget sdl from gh release (#677)
fix that worked from https://github.com/HarbourMasters/2ship2harkinian/pull/676 but pointing to the right branch
2024-06-08 21:53:14 +01:00
Garrett Cox
6fd7fc3a9d
Merge pull request #659 from HarbourMasters/develop-rika
`develop-rika` -> `develop`
2024-06-04 07:42:49 -05:00
Patrick12115
51a6d9d926
[Enhancement] Fast Deku Flower Launch (#549)
* Add fast deku flower launch enhancement

Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com>

* Migrate to a hook

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-06-04 01:58:32 -05:00
Archez
4b36181ee2
Fix dungeon map palette loading (#653) 2024-06-04 01:57:47 -05:00
Patrick12115
5e17828cc4
[Cheat] Longer Deku Flower Gliding (#548)
* Add Longer Flower Glide enhancement

Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com>

* Tweak to just modify an array

* Update mm/2s2h/Enhancements/Cheats/LongerFlowerGlide.cpp

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-06-04 00:02:48 -05:00
Patrick12115
d2a11f1476
[Enhancement] Instant Putaway (#547)
* Instant Putaway Enhancement

Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com>

* Tweak some things and merge with Player Movement

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-06-03 22:38:29 -05:00
Garrett Cox
f8f00e6d9b
Add draw distance enhancements for actors and scene geometry (#539) 2024-06-02 23:15:33 -05:00
Caladius
2d8bc175fe
[Enhancement] Blast Mask with Powder Keg (#642)
* Blast Mask adds Powder Keg explosive property.

* Alphabetical Menu Listing + clang

* Apply suggestions from code review

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-06-02 22:27:33 -05:00
Malkierian
5de6a9ac8f
Add 2ship-specific BUILDING.md and supportedHashes.json. (#551)
* Add 2ship-specific BUILDING.md and supportedHashes.json.

* Somehow missed N64 hash.
Shipwright -> 2ship2harkinian
Ship.sln -> 2s2h.sln

* Mac dependencies

Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>

---------

Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
2024-06-02 21:54:36 -05:00
Caladius
03a597d44c
[Enhancement] Banker - Adds Min Max Functionality (#591)
* Adds min and max functionality by pressing the R and Z buttons while the Deposit Rupees dialogue box is opened.

* Place functionality behind a cvar.

* clangified

* I slished when i shoulda slashed!

* removal of src/

* Typo in tooltip

* Updated to dynamic hook registration and fix sfx spam.

* clang

* Remove double assignment.

* Update to HOOK_ID and adds Withdrawal functionaility.

* Updated currentTextId's to actual format.

* Clangs

* Move to dialogue menu

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-06-02 21:52:30 -05:00
Patrick12115
139a240ed3
[Graphics] Disable Black Bar Letterboxes (#590)
* Black Bars be gone

* Move it to draw/apply functions

Updates in real time now

* Added return instead

* added space

* Update mm/2s2h/Enhancements/Enhancements.cpp

* Update mm/2s2h/Enhancements/Enhancements.cpp

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-06-02 21:32:19 -05:00
Caladius
26321c9a17
Adds Dungeon Items to the Save Editor (#585)
* Adds Dungeon Items to the Save Editor

* clang'd up

* Update mm/include/z64save.h

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>

* Move a few static arrays

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-06-02 21:18:17 -05:00
Caladius
888b8fe24a
Skip Magic Arrow Equip Animation (#546)
* Recreate Magic Equip Animation Skip PR for new Fork.

* After Running Clang Powershell Script

* Delete clang-format.exe

* Apply suggestions from code review

---------

Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-06-02 20:18:16 -05:00
Garrett Cox
53e76c5aeb
Add time-moves-when-you-move mode (#536) 2024-06-02 20:10:08 -05:00
Garrett Cox
b54542494e
Add various tweaks and a warning to debug mode toggle (#643) 2024-06-02 12:50:32 -05:00
Archez
eae50e33e3
Fix the PRNG not being seeded when opening intro is skipped (#640) 2024-06-02 12:23:06 -05:00
Garrett Cox
04e5ac449d
Merge pull request #631 from HarbourMasters/develop-rika
`develop-rika` -> `develop`
2024-05-31 23:36:54 -05:00
inspectredc
50b06bff0b
lus fix metal crash (#628) 2024-05-31 23:36:17 -05:00
Garrett Cox
3a86bdf2dc
Version bump Rika Bravo (#626) 2024-05-31 19:51:23 -05:00
Garrett Cox
78f0525ec0
Bump LUS (#625) 2024-05-31 19:50:36 -05:00
inspectredc
a3add6092b
Fix Dpad Ocarina L Btn & GI Dpad Stuff (#578) 2024-05-31 19:21:57 -05:00
Jacob Erly
a39a9a58e9
Adds sanity checks for bottle duping over items and prevents the issue causing Big Goron to not give the player the Keg License. (#605)
* Update Infinite.cpp

Adds sanity checks for bottle duping and prevents the issue causing Big Goron to not give the player the Keg License.

* Update Infinite.cpp

Formatting.

* Update Infinite.cpp

* Update Infinite.cpp

More formatting trying to work around this Clang stuff while working from Github.
2024-05-31 18:13:42 -04:00
Archez
7bf60f6771
fix hud editor position bugs (#622) 2024-05-31 17:39:26 -04:00
Malkierian
63c293f78a
Implement Alt Assets Variable LUS (#619)
* Bump LUS to `94b755b77c0c0f566686c9d23fa4c15e23473a0c`.
Remove `CVAR_ALT_ASSETS` from LUS cvars cmake.
Change all pertinent `CVarGetInteger` calls for `CVAR_ALT_ASSETS` to `ResourceManager::IsAltAssetsEnabled`.
Implement frame-end toggle of `mAltAssetsEnabled`.

* Remove `ShouldClearTextureCacheAtEndOfFrame`.
Move prevAltAssets check to end of `Gfx_ProcessGfxCommands`.

* Missed initial `mAltAssetsEnabled` set.
2024-05-31 17:26:04 -04:00
Garrett Cox
57d4e62ed0
Fix issue where skipping clock tower cutscene would not return you correctly (#618) 2024-05-30 23:21:18 -05:00
Reinhardt R. Gaming
877d7f732b
Display a MSAA value of 1x as "Off" (#597)
* Change terminology for MSAA setting + tooltip

* Update BenMenuBar.cpp
2024-05-30 22:46:41 -05:00
inspectredc
47e98e8ee9
Fix GC Warning Labels (#529) 2024-05-30 22:46:07 -05:00
briaguya
65870f3c07
update to latest lus main (#614)
* update to latest lus main

* upstream otrexporter and zapdtr submodules

* upstream LUS submodule
2024-05-30 23:30:05 -04:00
Garrett Cox
464c55fcbb
Tweaks to autosaves and pause saves to always persist them, along with preventing saves when it's too early or late in the game (#616) 2024-05-30 23:20:29 -04:00
Garrett Cox
8ac7dc6b7d
Fix play as kafei by swapping out resources later (#617) 2024-05-30 23:10:45 -04:00
Qlonever
e484e0ba82
fix control code logic (#586) 2024-05-30 22:36:14 -04:00
briaguya
f32bccc5b9
ci(linux): install libzip without crypto, bump sdl from 2.28.5 -> 2.30.3 (#588)
* ci(linux): install libzip without crypto, bump sdl from 2.28.5 -> 2.30.3

* just install libzip with apt for otr gen

* copy the .so to a place linuxdeploy looks for it

* but do it in the right place
2024-05-30 22:21:24 -04:00
Archez
c7aafb65fd
Fix o2r file copy (#592)
* fix o2r file copy script

* move script to cmake folder
2024-05-30 22:12:14 -04:00