Commit Graph
68 Commits
Author SHA1 Message Date
ArchezandGarrett Cox ab19d6417d Fix save corruption from non null-terminated cstrings (variation) (#230)
* verify save slots better; allow global.sav to work again

* fix save corruption and restore global.sav

* add comments
2024-05-22 09:05:01 -05:00
90cb488263 fd anywhere using hooks (plus splitting enhancements out into files) (#226)
* fd anywhere using hooks (plus splitting enhancements out into files)

Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: Archez <Archez@users.noreply.github.com>

* add guards to headers

* Update mm/src/code/z_parameter.c

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

* clean

* macro magic

* Apply suggestions from code review

---------

Co-authored-by: aMannus <mannusmenting@gmail.com>
Co-authored-by: Archez <Archez@users.noreply.github.com>
Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-05-22 09:05:01 -05:00
Garrett Cox dfe0e1d6c2 Actor hooks (#135) 2024-05-22 09:05:01 -05:00
ArchezandGarrett Cox 1415a71378 Add more time options to save editor (#198)
* Add more time options to save editor

* todo the todo
2024-05-22 09:05:01 -05:00
e0a1a430ae Collision viewer UI Pass (#212)
* Initial Collision Viewer

Issues:
- UIWidget stuff was copied in to colViewer.cpp
- Pause screen still renders collision.
- Colour CVars are not working correctly.

* Move collision viewer files and small adjustments

* Redo collision viewer UI

* use identity mtx

* prevent draw collision on pause

---------

Co-authored-by: Kenix <kenixwhisperwind@gmail.com>
Co-authored-by: Adam Bird <archez39@me.com>
2024-05-22 09:05:01 -05:00
ArchezandGarrett Cox 0a66c94d48 Correctly set final object entries count based on last slot index (#206) 2024-05-22 09:05:01 -05:00
ArchezandGarrett Cox 25864d1a92 Add volume slider support (#201)
* Add volume slider support

* extern fix?
2024-05-22 09:05:01 -05:00
912d46761b Audio Works (#180)
* initial audio work

* Implements caching and fixes a ton of issues with audio

* Uses correct memory sizes in mixer.c

* Resets mixer values

* Actually correct dmem buff values in mixer.c

* Remove breakpoints

* Fix sequences not playing

* The forbidden type.

* Forbidden TYPES?!

* Thanks Louis

* Thanks Louis Part 2

* Fix garbled audio

* Fixed ADSR bugs

* Fixes ASAN crash in loading samples.

This code is causing the game to attempt to read sample data beyond the actual sample data.

* Comments out the sample clamping since we aren't affecting the rest of the calculations in the function.

* Fixes crashing while loading audio samples.

Additionally, lowers the log level for audio commands.

* Textbox SFX UB Fix

* Decreases priority of more debug messages

* Fixed a couple uintptr_t issues

* Adds context to Jack's hack of shortcutting later loading sequences.

* Audio corruption fix

* Few uintptr_t fixes

* Fix build on linux

* Fix build on mac

* call audio exit

* fix sfx in dialog

* unstub more audio funcs

---------

Co-authored-by: Random06457 <28494085+Random06457@users.noreply.github.com>
Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com>
Co-authored-by: louis <35883445+louist103@users.noreply.github.com>
Co-authored-by: Adam Bird <archez39@me.com>
2024-05-22 09:05:01 -05:00
ArchezandGarrett Cox 1c4bd942d1 execute deinit flow (#191) 2024-05-22 09:05:01 -05:00
ArchezandGarrett Cox b4c7a8bd22 Implement picto box frame buffer and reading logic (#189) 2024-05-22 09:05:01 -05:00
ArchezandGarrett Cox 19c3c3f5c1 Implement HIRES support and fix Bombers notebook (#181)
* Implement HIRES support and fix Bombers notebook

* bump lus
2024-05-22 09:05:01 -05:00
PurpleHatoandGarrett Cox 36861dfbf7 ADD: More HUD Editor Widescreen Support (#179)
* ADD: Key Counter, Skultula Counter

TODO: Check why SKulltula counter texture doesn't move, TextureBlock???

* ADD: Skulltula icon position

* Tweak: Whitespace

* TWEAK: Skulltula Y value

* FIX: Tatl
2024-05-22 09:05:01 -05:00
ArchezandGarrett Cox c93ccc387f bump submodules and remove unused types (#175) 2024-05-22 09:05:01 -05:00
louist103andGarrett Cox dbdbfc738d Add rupees to the save editor (#173)
* Add rupee editor to save editor

* Remove static
2024-05-22 09:05:01 -05:00
ArchezandGarrett Cox eb78c76255 add 2ship icon to menu bar (#172) 2024-05-22 09:05:00 -05:00
ArchezandGarrett Cox 9509c4b555 Add DebugConsole command handlers (#169)
* add debug console command handlers

* soh to 2s2h
2024-05-22 09:05:00 -05:00
louist103andGarrett Cox 27b70f03c1 Track LUS changes for LUS refactor. (#163)
* Track LUS changes. So far implemented:
- Moving the big switch into unordered maps.
- Dynamically switching between different ucodes. So far tested switching between f3dex2 and s2dex.

* track LUS changes

* LUS Bump
2024-05-22 09:05:00 -05:00
ArchezandGarrett Cox 5a258fecd4 add 2ship/lus logo and build info printing (#164) 2024-05-22 09:05:00 -05:00
ArchezandGarrett Cox cc9c14fc59 Fix: Handle nullptr for texture anim color change params (#162)
* handle nullptr for texture anim color change params

* bump otrexporter

* oops
2024-05-22 09:05:00 -05:00
904bf60b36 Changes for new LUS resources (#151)
* Changes for new LUS resources

* fix factory issues and bump modules

* add build version, custom assets folder, and fix extraction

* add missing custom assets

* fix build .h

* libzip in the workflows

* apt-deps

* Fixes to importers to work with upstream Resource Manager.
Also remove duplicated structs.

* Bump LUS

* bump LUS

* Bump LUS

* bump lus

* point back to louist103/mm

---------

Co-authored-by: Adam Bird <archez39@me.com>
2024-05-22 09:05:00 -05:00
Garrett Coxandlouist103 9da273a8ea Add fast text enhancement (#150)
Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
2024-05-22 09:05:00 -05:00
ArchezandGarrett Cox 57a5ac8894 exclude debug file from json save (#156) 2024-05-22 09:05:00 -05:00
ArchezandGarrett Cox 82cf1a4885 Add cvar methods to global functions header and cleanup includes (#152)
* add cvar methods to global functions header and cleanup includes

* fix z_lib.c

* tweak includes
2024-05-22 09:05:00 -05:00
ArchezandGarrett Cox c49c132b1a fix environment lighting (#145) 2024-05-22 09:04:59 -05:00
Garrett Cox cacf0d000a Sort better map select entries (#138) 2024-05-22 09:04:59 -05:00