1
0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-21 23:58:51 -05:00
Commit Graph

46 Commits

Author SHA1 Message Date
Archez
6e025588a5
Fix how the gMtxClear is extracted and used by the Jabu scene DLs ()
* fix how the clear mtx is extracted and used by the jabu scene DLs

* bump OTRExporter
2024-10-10 16:59:44 -07:00
briaguya
736dccb00b
update to latest LUS main ()
Includes supporting changes from:
* https://github.com/HarbourMasters/Shipwright/pull/4197 (alt assets variable changes)
* https://github.com/HarbourMasters/Shipwright/pull/4199 (WindowBackend enum changes)
* https://github.com/HarbourMasters/Shipwright/pull/4200 (Extract gMtxClear)

---------

Co-authored-by: Malkierian <malkierian@gmail.com>
Co-authored-by: inspectredc <inspectredc@gmail.com>
2024-06-02 15:34:53 -04:00
rozlette
d523b104d8 Change declaration of Morpha tentacle verts to combine them all and avoid overlaps that result in dropped verts 2023-11-28 21:09:34 -08:00
Adam Bird
717074ff86
Fix: Missing TextIDs for MQ PAL and change lava size ()
* Fix text offset for MQ pal and add text ID asserts

* correct lava texture size
2023-11-28 20:11:03 +01:00
Adam Bird
5ddc418777
redicle -> reticle () 2023-10-13 23:14:18 +00:00
Adam Bird
b70837f5ea
N64 PAL 1.0 support ()
* initial n64 pal 1.0 support - hashes and rominfo

* initial xml copy pal 1.0

* initial offset fixes

* update title copyright to be platform based

* bump lus for clearMtx

* add scripted xml definitions

* offset fixes and xml fixups

* rename and sort pal mq definition

* more offset fixes
2023-10-04 10:05:02 -05:00
Adam Bird
bb643661f6
GC PAL MQ Retail support ()
* initial pal mq retail support

* more mq pal support

* pal mq support in the launch scripts

* more offset fixes

* match tluts with mq debug

* update support hashes doc

* target lus commit for playtesting

* more offset fixes

* add hashes for other formats

* decomp name sync

* add scripted texture definitions

* fix up from other xml changes

* update name
2023-09-19 09:30:48 -05:00
Adam Bird
90af84601a
add xml definitions for all textures () 2023-09-10 12:22:24 -05:00
Adam Bird
024c5e0b5f
Sync asset names with decomp documentation ()
* sync asset names with decomp

* whitespace and tweak
2023-09-10 12:21:56 -05:00
louist103
155f5e165a
Use a different color when aiming at hookshotable collision ()
* Colors

* Use VTX data in OTR file

* Move to equipment
2023-08-20 13:00:28 -05:00
Adam Bird
360a97ecfd
fix: various pal gc asset offset issues () 2023-07-03 10:29:21 -04:00
briaguya
4166dbf907
spockalicious ()
* Rough mockup of LUS XML loading

* Updated code for merge

* Loading from FS support and custom DList WIP implementation

* Added current directory support to F3D and impl most of the dlist cmds

* WIP Skeleton support

* Almost done

* Rebase fixes

* Submodule updates

* HD Texture Support

* Fixes

* bump lus

* fix exporter build, header update

* soh builds

* setMesh image path cleanup

* Update soh/src/overlays/actors/ovl_player_actor/z_player.c

* Update soh/src/overlays/actors/ovl_player_actor/z_player.c

* Update OTRExporter/OTRExporter/Main.cpp

* Update ZAPDTR/ZAPD/ZResource.h

* Update soh/src/code/z_skelanime.c

* Update OTRExporter/OTRExporter/Main.cpp

* Fixed jpeg backgrounds and decreased icon buffer size

* Bump lus

* Increased even more the buffer because it crashes on long texts

* Removed print because sometimes the if is not triggered when the image is already byteswapped

* fix non-windows build

* fix build

Co-authored-by: Kenix <kenixwhisperwind@gmail.com>

* add hd checkbox

* Various fixes for custom model support ()

* Some fixes

* Updated LUS Version

* Fixed issue with Link Skirt on pause menu

* Added CVar for custom link model changes

* Fixed headers

* Additional header fixes

* Tweaks

* Unload HD game assets on scene transition. ()

* Unload game assets on scene transition.

* Bump LUS

* Unloads all HD assets on scene transition.

* Only unload hd assets if hd assets are turned on.

* Fixes issues on toggling between HD and non HD assets.

---------

Co-authored-by: briaguya <briaguya@alice>

* fix: actually load hd debug font ()

* fix: actually load hd debug font

* toggle debug text correctly

---------

Co-authored-by: briaguya <briaguya>

* Yes. ()

* Merge branch 'develop' into dev-to-ghost

* HD Skeleton Swapping and Language Fixes ()

* Yes.

* HD Skeleton Swapping and Language Fixes

* Test

* Fixed issues with ganon cape ()

* Fixed Bongo Bongo Crash ()

* Added HD Assets Toggle ()

* Ivan the Fairy - Coop Mode ()

* wip

* hookshotable ivan

* added hookshot item

* new items & changes & fixes & restored navi

* farore, din and nayru's spells are done

* fixed slingshot & bow

* added more items supported

* done with all main items

* bug fixes & ready

* added imgui button

* wip

* hookshotable ivan

* added hookshot item

* new items & changes & fixes & restored navi

* farore, din and nayru's spells are done

* fixed slingshot & bow

* added more items supported

* fix own dungeon items on shuffled boss rooms ()

* bump lus ()

* fix: lowercase package names for vcpkg ()

vcpkg was throwing an error `error: invalid character in package name (must be lowercase, digits, '-')`
this updates our calls to `vcpkg_install_packages` to use lowercase package names instead of uppercase

* fix death mountain cloud in rando ()

* Fix: Switch Age No Longer Reloads Start Room ()

* [Reduced Clutter] Disable Hot/Underwater Warning Text ()

* Disable Warning Text

* Moved to Reduced Clutter

* done with all main items

* bug fixes & ready

* fix: process roms in consistent order ()

* chore: move rando savefile setup and document flags ()

* remove rando save init from sram

* move rando savefile init logic and set more flags

* document flags for rando save creation

* Fix: Use correct fps value for frame interpolation with match refresh rate ()

* Fix: Kak GS placement on construction site ()

* added imgui button

* addressed kenix's comments

* fixed useless null

* added rupee dash mode in extra modes

* changed menu position

---------

Co-authored-by: Adam Bird <Archez@users.noreply.github.com>
Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>
Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com>

* LUS Scancodes ()

* Added HD Assets Toggle

* Switched out SDL for LUS scancodes

* Ivan tweaks ()

* Magic consumption slowed down;
Bosses now affected by Ivan's Din spell

* Adjust magic timer

* clean up imgui

* model fixes/improvements ()

* replace `gUseCustomLinkModel` with custom resource check

* handle adult/child

* bump lus

* fix model switching with tab

* use lus main

* fix carpet man ()

Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>

* get ship model and lus texture into soh.otr, use `gAuthenticLogo` to toggle between ship and authentic ()

* Use libultra features for CPU-modified textures ()

* Use libultra features for CPU-modified textures

* Comment

* bump lus on ghost ()

* fix: properly use `Interface_LoadActionLabel` to display start button text ()

* Changes hd -> alt for texture replacement. ()

* Changes hd -> alt for texture replacement.

* Renames variables in gfxprint for hd -> alt change.

* Update soh/soh/resource/type/Skeleton.cpp

---------

Co-authored-by: briaguya <70942617+briaguya-ai@users.noreply.github.com>

* Fixes kaleido dungeon maps ()

* skeleton stuff ()

* comment out wii u build ()

* bump lus ()

* Rework readme ()

* Update README.md

* docs

* put custom music docs somewhere

* Update README.md

* Update README.md

* Update README.md

* Update README.md

* dark/light title image

* lus

* Update README.md

* Fixed vanilla minimap ()

* Fixed vanilla minimap

* Workaround for pulsing SD maps with non-broken HD maps.

---------

Co-authored-by: Christopher Leggett <chris@leggett.dev>

* Skeleton fix fixed ()

* WIP skelton patcher fix

* Fixes skeleton reference change.

* Adds const back to name in ResourceMgr_LoadSkeletonByName

---------

Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: Kenix <kenixwhisperwind@gmail.com>

* Fixes z_message_otr memory leak.

* Update soh/soh/z_message_OTR.cpp

* Update soh/src/code/game.c

* docs: add how to find otr files to switch instructions ()

* bump lus ()

* comment out RegisterBlendedTexture in king d ()

---------

Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com>
Co-authored-by: David Chavez <david@dcvz.io>
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: Kenix3 <kenixwhisperwind@gmail.com>
Co-authored-by: KiritoDv <kiritodev01@gmail.com>
Co-authored-by: briaguya <briaguya>
Co-authored-by: Ralphie Morell <stratomaster64@gmail.com>
Co-authored-by: MelonSpeedruns <melonspeedruns@outlook.com>
Co-authored-by: Adam Bird <Archez@users.noreply.github.com>
Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com>
Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com>
Co-authored-by: Rozelette <Rozelette@users.noreply.github.com>
Co-authored-by: Christopher Leggett <chris@leggett.dev>
Co-authored-by: Lywx <36680385+KiritoDv@users.noreply.github.com>
2023-04-27 19:20:41 -04:00
briaguya
44d3f1ccbb
fix: update xml resolution for FireTempleBigVerticalFlame to match dlist resolution () 2023-04-24 14:44:30 -04:00
Adam Bird
d0041d28ea
Implement patches for authentic texture overflows ()
* implement dlist patching for authentic texture overflows

* add overflow patch to deku stick; move toggle
2023-04-23 19:42:59 -04:00
Christopher Leggett
58ef377d87
Fixes some XML texture size and offeset errors. () 2023-03-14 10:46:52 +01:00
Garrett Cox
be38b41644
[] Fix ganon boss offset on retail rom () 2022-12-17 19:51:52 -05:00
Garrett Cox
d3f2da2a8f
[] Fix hookshot target offset on retail rom () 2022-12-17 19:21:00 -05:00
Amaro Martínez
1a9898b918
Fix Ganondorf title card () 2022-12-05 14:38:28 -05:00
louist103
e76890a796
Update XMLs from upstream ()
* litle less than half way

* done?

* revert ganon for now

* anime1

* anime 2-3

* object_ganon

* rest of gaBon

* missed some changes

* player
2022-09-18 23:29:24 -04:00
briaguya
dd42cca2cf Merge branch 'develop' into z64-devmerge 2022-06-17 00:39:07 -04:00
Kevin Alexis Contreras
bb90be6748 Merge branch 'zapd_audio_support' into zelda64 2022-06-16 23:09:50 -05:00
Nicholas Estelami
aeaaa54e0d GC PAL Audio XML 2022-06-16 20:35:52 -04:00
Nicholas Estelami
c49cee3521 Audio support nearly complete. 2022-06-16 20:35:52 -04:00
Nicholas Estelami
941c19f2c3 Audio decompiled and WIP custom sample support 2022-06-16 20:35:52 -04:00
Nicholas Estelami
7bca63a800 GC PAL Audio XML 2022-06-15 16:09:22 -04:00
Nicholas Estelami
114c6e01d9 Audio support nearly complete. 2022-06-15 15:57:52 -04:00
Nicholas Estelami
b8c9f7f1ce Audio decompiled and WIP custom sample support 2022-06-15 15:57:52 -04:00
Kevin Alexis Contreras
5b43e4652f Updated zapd_audio_support into zelda64 2022-06-15 09:42:37 -05:00
Nicholas Estelami
008af18951 GC PAL Audio XML 2022-06-14 12:32:11 -04:00
Nicholas Estelami
61760401bc Audio support nearly complete. 2022-06-14 01:13:18 -04:00
Nicholas Estelami
b889880cc7 Audio decompiled and WIP custom sample support 2022-06-14 01:13:18 -04:00
Kevin Alexis Contreras
8b63cf93d8 Updated zapd_audio_support on zelda64 2022-06-13 11:41:43 -05:00
KiritoDev
8a7aa5fa53
Merge branch 'develop' into zelda64 2022-06-13 10:18:38 -05:00
Nicholas Estelami
f1b81b7f82 Audio support nearly complete. 2022-06-10 13:37:50 -04:00
louist103
95cfce0ded cleanup 2022-06-05 16:35:49 -04:00
Kevin Alexis Contreras
0320107fc0 Merge branch 'zapd_audio_support' into zelda64 2022-06-01 15:11:11 -05:00
Nicholas Estelami
6f5ce7d715 Audio decompiled and WIP custom sample support 2022-06-01 13:06:32 -04:00
Martin Molina
83c07645f4
Fixed crash when showing Triforce during lore cutscene after defeating Ghoma () 2022-05-29 11:55:00 -04:00
louist103
0a8db6d8a6
add new files () 2022-05-12 20:45:24 -04:00
Nicholas Estelami
4c74acdd29 Combined message table xmls 2022-04-29 19:57:53 -04:00
Nicholas Estelami
bd5a563dae Implemented PAL language support. 2022-04-29 19:57:53 -04:00
MegaMech
407a9c5371 Update nes_message_data_static.xml 2022-04-03 13:26:58 -04:00
MegaMech
2b4b44f698 Update staff_message_data_static.xml 2022-04-03 13:26:58 -04:00
MegaMech
a029827944 Update staff_message_data_static.xml 2022-04-03 13:26:58 -04:00
MegaMech
1e938866ac Update nes_message_data_static.xml 2022-04-03 13:26:58 -04:00
Nicholas Estelami
c80f9fbd57
Added support for multiple game versions ()
* WIP Multiversion support

* GC PAL Non-MQ support complete

* Updated OtrGui to handle different game versions

* Added version file

* Added new extract mode to ZAPD and optimized OTR gen time

* Fixed bug causing crash

* Further optimized OTRExporter, saving around ~20 seconds.

* ZAPD is now multi-threaded.

* Fixed merge issue

* Fixed memory leak and fog issue on pause screen.

* Additional fog fixes.

Co-authored-by: Jack Walker <7463599+Jack-Walker@users.noreply.github.com>
2022-03-31 19:42:44 -04:00