Skip to content

Merge Fast64 2.5.3#46

Merged
Jameriquiah merged 139 commits intoHarbourMasters:mainfrom
Jameriquiah:hm64
May 5, 2026
Merged

Merge Fast64 2.5.3#46
Jameriquiah merged 139 commits intoHarbourMasters:mainfrom
Jameriquiah:hm64

Conversation

@Jameriquiah
Copy link
Copy Markdown

No description provided.

Lilaa3 and others added 30 commits October 14, 2024 16:32
* [Repo Settings] Only set if different

Fixes lag at start up from draw layers being set unnecessarily.
Some clean up that I already did in Fast-64#461

* Request Changes

Co-Authored-By: Dragorn421 <Dragorn421@users.noreply.github.com>

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
…t-64#466)

* [F3D] Fix sameTextures condition, make assert more user friendly

* world peace
…-64#464)

* [SM64] Add back custom include directory + add automatic option

Fixes Fast-64#463

* bump sm64 settings version

* Requested Change + extra checks for ui and code clarity

Co-Authored-By: Dragorn421 <Dragorn421@users.noreply.github.com>

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
* T3D UI

* black

* some fixes for main and small changes

* personal nitpick

* one more nitpick

* removal of unnecessary checks

* black format

* small typo

* black

* Add rdpq
* update CS_HEADER and CS_END_OF_SCRIPT

* deleted a word

* format
* [SM64] Area fog improvements

Area fog is now a toggle in the area root
Renamed the text for global fog to area fog
Materials now by default show color and position if set fog is on, then in sm64 mode, if they are parented to an area that sets fog the option for area fog shows up with the area name in the text, if it's on a disabled column with the area's fog properties will also show

* Fixed description

* Shorten description, black

* black
…nt warp objects (Fast-64#390)

* [SM64] Add exception handling for area init and throw error for instant warp object

* Add back exception handeling
)

* [SM64] Fix/Improve multi-actor UI (not export all selected)

* abs_decomp_path

a little extra addition for code quality

* dragon's review suggestions

* forgot to change this to a comma, oops
* [SM64] Only throw empty gfx exception in actor exports

* type hint

* removed comment

* Remove other unused camera args

* don't pass in arg for camera

* remove last unused camera
…s) (Fast-64#242)

* parsed parameters for actor data

* removed paramsByType

* main logic

* fixed issues and export

* operators

* black

* fixes, transition actor list

* upgrade logic

* fixes

* black

* review

* review

* fixed export issues

* format

* kure's review part 1

* fixed upgrade issues (custom not handled yet)

* snake case-ify functions, tiny xml docs/fixes, completed upgrade stuff

* add custom values for enums

* added custom values for string props

* small fix and default to custom in upgrade

* fixed custom values not working

* fixed issues related to custom value for Chest/Navi Msg

* fixed issue where 'get_param_value' can return None in some cases

* latest review from kure
* First pass

There seems to be something wrong with reverts still, will investigate

* currently hasn´t caused a bug but update this to be sure

* another similar issue
* [SM64] Add in actor preset information for future use

Used in animation rework for import presets and export presets for binary

* Added animation names

* black

* Mario animation names

* black

* undo weird change

* name all animations

* fix piranha animation names

* Small mistake in mario

* add docstring

* clean up validation

* add groups, fix mistakes

* figure out level from group

* fix toad

* hack for bowser

* Use hex

* Fixes from animations rework final testing
…64#491)

* [OOT + F3D] More informative error messages for deleted lights

I thought of wrapping saveOrGetF3DMaterial to avoid these kind of empty errors in the future, im fine with reverting that tho I think it is for the better (in ac I wanted to throw errors where the material wasn't in the args already and it's very annoying, this way everything is consistent)

* fix from watching somone's stream
…#493)

fix issue where lightsetting is using the wrong name
fixed optimize_syncs function for bleeds

Co-authored-by: scut <scut>
* [SM64] Bring binary dl exporter up-to-date

Add bleed and inline support.
Assert for fmeshes len
No longer use getDrawLayerV3, yes it doesn´t matter here but it was the last bit of code to use it, with permission I'd like to remove the function

* DLFormat.Static
* Update f3d_material_presets.py

* Update f3d_material_presets.py

* Create mk64_constants.py

* Update __init__.py

* Update f3d_material_presets.py

* Update mk64_constants.py

* Update __init__.py

* Update f3d_gbi.py

* Update f3d_gbi.py
* [SM64/F3D] Fix and update Ui Image Exporter

Fixes Fast-64#451
Missing: Load and set commands and pallets (currently relying on multitex manager, will have to be changed somehow)
Updated: Tex prop is now drawn using ui_image, ui_image has been updated to optionally hide low and high props (are handled by size cmd, does not exist for texrect)
materialless_setup func for TexInfo, equivelant to moreSetupFromModel for bpy material-less contexts, obviously cannot handle flipbooks
ignore_tex_set bool for fromProp
Use only fromProp and updated writeAll
Some basic ui reordering to match other panels

* Fix noted issues, clean up code to be consistent, add tlut mode

* use world defaults and saveModeSetting to remove revert code, remove extra syncs

* close to being finished

* refresh 13 memes

* automatically pick 1 cycle instead of copy mode

* Rasky confirmed ia16 tlut works for copy mode, cool

* Revert "Rasky confirmed ia16 tlut works for copy mode, cool"

This reverts commit 7fe981c.

* [SM64/F3D] Fix and update Ui Image Exporter

Updated: Tex prop is now drawn using ui_image, ui_image has been updated to optionally hide low and high props (are handled by size cmd, does not exist for texture rectangles)
materialless_setup func for TexInfo, equivelant to moreSetupFromModel for bpy material-less contexts, obviously cannot handle flipbooks
setup_single_tex func for TexInfo, sets up a single texture without the context of the multi texture manager
ignore_tex_set bool for fromProp
Use only fromProp and updated writeAll
Use saveModeSetting (and world defaults) instead of manullay appending each DP command (except for blend color)
Removed syncs except for the sync after the texrect cmd to do the reverts
Removed deprecated arg for png exporting in save_textures (assumed from fimage)
Removed the ) part of the delimiter checked when exporting "Menu", refresh 13 made it (void) instead of ()
Some basic ui reordering to match other panels
Added 1 cycle variant for non rgba16 exports
Fix dynamic dls

* fix dsdx and dsdy

* fix overwrite data issues

could not deal with aligner and palletes, now can!

* sauren nitpicks

* fix first test

* Update f3d_texture_writer.py

* make the regex allow even more whitespace

* fix extra new lines
fixed actor enums overriding actor types
* fixed UI bug when actor has no type

* fixed missing collectible item none
* make actor scale default to 10

* add a print for clarity

* Show actor scale outside custom and check custom in skeletons

Not an oot expert but this seems like a very obvious issue with this.

---------

Co-authored-by: Lila <lilaa3public@gmail.com>
)

* added warnings for when exporting all has exceptions for some objects

* changed code to instead generate exceptions except for specific ones which will give a warning in the console. Possibility to add warning for user for other exceptions though probably not

---------

Co-authored-by: scut <scut>
* Make update UI more understandable

Don't box the ui as the preferences are already part of a box (looks disgusting in 4.2)
Update to stable now on the same column as update to main to make them seem both equally useful
Change text for main/old to be more obviously important, from "Install main / old version" to "Install specific version (Latest or Older)"
Move the restore operator into another row

Updated readme with new instructions and screenshots

* Remove mat screenshot and link to updater instructions early into the readme

* Update redundant text

* merge request button

* Update README.md

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

* change to gross github name only used by github and no one else

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

* use to be added updater in fast64docs

* mention ability to test prs

---------

Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Anoliah and others added 29 commits January 24, 2026 18:18
* fix final revert deduplication

* use base name
* [SM64] Improve type hints for switch override code and fix

* some more fixes

make sure no dl ref is using the main draw when removing, make a find draw by name function (was gonna use it in the else but ended up just removing the ref since its not needed, i dont think the ref for already instanced nodes is needed but ill trust whoever wrote that).

* remove graph argument
* [Codebase] Implement early blender 5.0 support

This fixes mesh exports, material warnings and implements action slots into sm64

* casually fix oot, oops

* safe get_attr
Should've probably added this before release but I totally missed it..
After this can we please do oot. pleaseeeeeeeee
* Fix Link import by reading link_textures.[ch]

* Fix link animation import by reading player_anim_headers.c
Add lighting option now that t3d supports it
* skip and warn on degen wall tris

* error instead of warn

* review

* add missing import
* Fix link anim export

* hide "custom filename" option for link anim exports
* Fix DL importer for importing committed assets

* Fix skeleton importer for importing committed assets
* Workaround decomp extracting params macroified

The workaround is to try set the params value, and if it fails then
fallback to using the actor as "custom", setting the custom actor id
and custom params.

* fix my code

* black
…64#694)

fixes Fast-64#690. game specific settings still only export in their respective operator.
@Jameriquiah Jameriquiah merged commit 1fbda45 into HarbourMasters:main May 5, 2026
1 check failed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.