WIP Merge upstream #30
Draft
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* [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 <[email protected]> --------- Co-authored-by: Dragorn421 <[email protected]>
…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 <[email protected]> --------- Co-authored-by: Dragorn421 <[email protected]>
* 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
recent regression caused by me, yay
* 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] 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 <[email protected]>
) * 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>
…t-64#484) fixed enum data
fixed standalone cutscene export
* fixed spec file * review
* 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 <[email protected]> * change to gross github name only used by github and no one else Co-authored-by: Dragorn421 <[email protected]> * use to be added updater in fast64docs * mention ability to test prs --------- Co-authored-by: Dragorn421 <[email protected]>
* [Codebase] Fix setOrigin AGAIN transform_apply was not neeeded, typehint was missing and offset was being affected by obj.location, we actually just zero it out now before applying the world matrix. also removed the temp_override cause transform already does that. * Update utility.py * Update utility.py * add doc string, use the original matrix as a base and apply the inverted original to the mesh (im stupid) add doc string instead of a comment mentioning the behavior * black * another tryy
address issues 586, 589 and 590
* fix misplaced objects * review
Someone updated the code for simplicity but didnt test it (sorry)
* [SM64] Bug fix for animation rework table logic Along the development cycle of animation rework, I made some relevant comment handling changes, admittedly i missed two small details, that we need to adjust from start (commentless) instead of table_start (comment adjusted pos). And that we need to rerun the comment map function after adding the enum include * Update sm64_objects.py
* fixed exportpath missing in fast64 tab * start fixing oot dl exporter * fixed oot dl exporter * review
fix scene export
* improve light impl * convert "extras" to lightgroupproperty to handle groups of 4 as a list * improve light import
* fixed Fast-64#418 * fixed issue where importing with an invalid path would create a folder * pack transition actor entry index in parameters * fixed quick import * fixed light import with recent decomp * fixed giant link * add `BLEND_RATE_AND_FOG_NEAR` macro to the backward compatibility list * revert door param change
* meta stuff * implement animated materials (import/export) * fixed endif in headers for hackeroot * add missing include for hackeroot * write a guide * add draw config stuff * add ifdef around segment call for hackeroot * create hackeroot settings and add an "export ifdefs" option * add operator * fix draw color, allow exporting empty lists and add initial scene embed * fixed export, removed texscroll lists as it's useless and export tweaks * add clear and copy, improve add and delete * fixed importer * add export panel for actors * docs update * self-review * force frame_num to be under keyframe_length (+ small export bugfix) * fixed tiny issue * fixed tiny issue * add comment about length - 1
* fixed commands parsed incorrectly * light import hotfix
skeleton export fix
…keleton (Fast-64#485) * feature to import all animations when importing an OoT skeleton * Update fast64_internal/oot/skeleton/utility.py Co-authored-by: Yanis <[email protected]> * Update fast64_internal/oot/skeleton/importer/functions.py Co-authored-by: Yanis <[email protected]> * few updates * paddings * selectSingleObject import * edit * fixed link animation import issue and improvements --------- Co-authored-by: Yanis <[email protected]>
* [SM64] Fix createBone (regression in custom commands) bone = armatureObj.data.bones[boneName] was incorrect cause of duplicates (if i remember correctly), so I removed it in place of using the edit bone, but I failed to remember edit bones don´t share properties with their bone counterparts. * change to object mode
* Replace hackerFeaturesEnabled with featureSet * Add property upgrading * Rename featureSet to feature_set * Update fast64_internal/oot/cutscene/exporter/functions.py Co-authored-by: Dragorn421 <[email protected]> * Update __init__.py * Fix format * Apply review suggestions * address review * swap header set visibility and feature set enum on UI --------- Co-authored-by: Pepe20129 <[email protected]> Co-authored-by: Dragorn421 <[email protected]>
last try try inverting try matrix instead
* [SM64] Fix rotation bug when mesh is invisible * lol * rewrite based of https://blender.stackexchange.com/a/159540 * ahem * something for yanis * bpy.context.view_layer.update() is a death sentece * someone forgot about armatures
* initial implementation for extended types * add note for multitexture type * implement trigger event manager * fixed legacy type issues (I think) * added camera params * details * format and use enum names/array_count * bugfixes * other fixes * updated docs and added item enums * small note about multitextures * improvements and add color switch type * be more descriptive on the action type stuff * add important note about texture references
some cs export fixes/improvements
Also make it easier to read under c exports
fixed local view issue
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
13 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.