TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
5446 commits 5 branches 33 tags 958 MiB
Commit graph

5446 commits

This branch
This branch
All branches
Author SHA1 Message Date
Areloch 04b0883a31 Assimp checks against lowercase extensions, so we force the extension of the file to lower before fetching the importer. 
Also adds sanity check that the importer was actually found before we try and use it.
 2021-11-19 23:14:06 -06:00
Robert MacGregor 88cfa4533b * Cleanup: Remove a comment referencing the now-removed DisplayPtrManager. 2021-11-17 22:08:08 -05:00
Robert MacGregor d1fde1f54b * Cleanup: Fully remove the DisplayPtrManager class as it was not actually being used by anything. 2021-11-17 21:58:17 -05:00
Robert MacGregor b986589804 Merge remote-tracking branch 'main/Preview4_0' into adjustment-unix-platform 2021-11-17 21:38:48 -05:00
Brian Roberts 75adcb9b7c
Merge pull request #676 from JeffProgrammer/ts-errors 
Optionally allow to treat script assert as warning
 2021-11-17 17:03:32 -06:00
Jeff Hutchinson 2e03108856 Optionally allow to treat script assert as warning 
This commit allows us to treat variable use before assign errors and local variables inside of the global scope as warnings instead of asserts. This will allow for easier porting of legacy scripts. It is highly recommended use this as an aid to port scripts, but can be used in production if needbe.
 2021-11-17 18:01:35 -05:00
Brian Roberts 50b94114e5
Merge pull request #675 from Azaezel/alpha40/postFxFix 
fix reported ASAN crash
 2021-11-16 20:49:13 -06:00
AzaezelX 6474413aaf fix reported ASAN crash 2021-11-16 12:40:22 -06:00
Brian Roberts b5bd242e23
Merge pull request #673 from Areloch/useImagePreviews 
Shifts utilization of gui elements in editors that point to 'normal' image assets to utilize generated previews instead.
 2021-11-15 12:39:33 -06:00
Areloch eb24b63be4 Shifts utilization of gui elements in editors that point to 'normal' image assets to utilize generated previews instead. 
This reduces console spam about mismatched texture profiles and improves stability.
 2021-11-14 21:39:51 -06:00
Brian Roberts 4f04213cd9
Merge pull request #671 from Azaezel/alpha40/brdfFixes 
brdf handling corrections
 2021-11-14 13:46:47 -06:00
Brian Roberts a05fe195e6
Merge pull request #672 from Areloch/MiscFixes2021114 
Misc fixes2021114
 2021-11-14 13:46:38 -06:00
Robert MacGregor 247b12e795 * BugFix: Correct many include paths and build platformX11 on non-Apple Unix. 2021-11-14 14:45:42 -05:00
Robert MacGregor a24149ba3b * Adjustment: Tweak the include paths for platformPOSIX.h. 2021-11-14 14:05:16 -05:00
Robert MacGregor 6583134ef2 * Adjustment: Initial work on moving x86Unix platform code into a more common POSIX platform. 2021-11-14 13:56:12 -05:00
Areloch 2af12c52e1 Shifted check for FBX importer in assimp shape loader code to utilize stringtable 2021-11-14 01:28:16 -06:00
Areloch f14375983b Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into MiscFixes2021114 2021-11-14 01:26:16 -06:00
Areloch 97484247ae Fixes Settings window not being able to be brought forward over AB 
Adds checkbox to mark as not showing Import Window each time
Added loaded import config to import log output
Fixed targeted material map slot field names
Added helper function for playing a sound asset via AssetId
Updated import config to have some more common suffixes
Updated editor settings to have Import Window show by default
Changed AB context menu from listing item as "Refresh Asset" to "Reload Asset" for improved clarity
Removed unneeded duplicate editor settings window script file
 2021-11-14 01:26:04 -06:00
AzaezelX 72ef719c18 kill redundant clamp in forward 2021-11-13 19:18:03 -06:00
AzaezelX b60d51969e brdf handling corrections 
1-handle the brdfTexture in linear space, not srgb.
2-clamp surface.NoV across the board for consistency. (solves several new and ongoing artifacts)
 2021-11-13 19:05:26 -06:00
Brian Roberts e9414a1660
Merge pull request #670 from JeffProgrammer/ts-inheritance-testing 
Add Object Inheritence Acceptance Test
 2021-11-11 22:00:54 -06:00
Jeff Hutchinson 949813956d Add Object Inheritence Acceptance Test 2021-11-11 22:57:09 -05:00
Brian Roberts 91469c25ab
Merge pull request #667 from Azaezel/alpha40/scaleShenanigans 
fix fbx importer lookup for setting formatScaleFactor
 2021-11-11 18:33:11 -06:00
Brian Roberts 744eca58b0
Merge pull request #669 from Ragora/bugfix-on-add-remove-doubletap 
BugFix: Correct the vehicle types double-tapping onAdd and onRemove
 2021-11-11 15:44:33 -06:00
Robert MacGregor 2b15c9e89d * BugFix: Correct the vehicle types double-tapping their onAdd and onRemove callbacks - rigidShape handles dispatching the script callbacks. 2021-11-11 16:41:28 -05:00
Robert MacGregor 227b1e3f51 * Feature: Implement a TurretObjectType bit for typemasks. 2021-11-10 19:34:32 -05:00
Areloch 8d310b8d5d Merge branch 'alpha40/scaleShenanigans' of https://github.com/Azaezel/Torque3D-1 into Preview4_0 2021-11-09 19:10:50 -06:00
Areloch d06bc790e3 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0 2021-11-09 19:06:57 -06:00
AzaezelX f9496559c9 fix fbx importer lookup for setting formatScaleFactor 2021-11-09 01:05:42 -06:00
Brian Roberts e0e3ebc69d
Merge pull request #637 from Azaezel/alpha40/guiRotation 
blatantly ganked from T2D; adds rotation as an option for drawbitmap
 2021-11-08 16:08:17 -06:00
AzaezelX 8fa652a327 by request, changed fspin and the new "rotation" for bitmap gui elements to a more generic "angle" to preserve thedistinction between rotating a gui and rotating a 3d object. 2021-11-08 16:07:44 -06:00
Brian Roberts d71948c1ac
Merge pull request #652 from Ragora/bugfix-crash-variableinspector 
BugFix: Correct a crash in the variable inspector
 2021-11-08 14:43:43 -06:00
Robert MacGregor 2c7dc4e783
Merge branch 'Preview4_0' into bugfix-crash-variableinspector 2021-11-08 15:42:44 -05:00
Brian Roberts 4e51ac17bd
Merge pull request #661 from Azaezel/alpha40/namedtexturetargs 
better handle old style references to named texture targets
 2021-11-08 14:38:11 -06:00
Brian Roberts e53012a938
Merge pull request #660 from Azaezel/alpha40/tsStaticNodeLookup 
new method tsstatic.getNodeTransform
 2021-11-08 14:37:50 -06:00
Brian Roberts 721f14a284
Merge pull request #665 from Azaezel/alpha40/TriggerSelfReferencing 
fill out a %this variable for trigger callbacks
 2021-11-08 14:37:39 -06:00
Brian Roberts e87ce245e9
Merge pull request #662 from Areloch/MiscImportFixes20211105 
Misc asset import QOL and bugfix changes
 2021-11-08 14:37:03 -06:00
Brian Roberts 529bfbddc2
Merge pull request #666 from Ragora/bugfix-asset-importer-oob 
BugFix: Correct ASAN reported out of bounds reads in AssetImporter
 2021-11-08 14:36:31 -06:00
Robert MacGregor a8116bbaf5 * [AssetImporter] BugFix: Correct ASAN reported out of bounds reads in the asset import programming. 2021-11-08 15:31:07 -05:00
Areloch 9f51cc7e4c Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0 2021-11-08 12:51:13 -06:00
Brian Roberts 0ebde558c1
Merge pull request #663 from Ragora/bugfix-persistence-manager-alloc-mismatch 
[Tokenizer] BugFix: Correct a malloc/delete mismatch
 2021-11-07 15:10:30 -06:00
AzaezelX 733b71ccad fill out a %this variable for trigger callbacks 2021-11-07 14:52:25 -06:00
Areloch a3351390c6 Expands handling of the collada enumerator so if the material is not named the same as the image file, it performs a lookup to find the associated material. 2021-11-06 22:36:59 -05:00
Jeff Hutchinson af6037da7d
Merge pull request #664 from JeffProgrammer/apple-silicon-detection 
Better Architecture detection strategy if compiling on Apple Silicon
 2021-11-06 23:04:53 -04:00
Jeff Hutchinson 3fdd7266e3 Better Architecture detection strategy if compiling on Apple Silicon 2021-11-06 22:56:05 -04:00
Robert MacGregor a6a7d6e1a1 * [Tokenizer] BugFix: Correct a malloc/delete mismatch in the tokenizer programming. 2021-11-06 20:34:12 -04:00
Areloch bd0a070d03 Merge branch 'MiscImportFixes20211105' of https://github.com/Areloch/Torque3D into Preview4_0 2021-11-06 19:09:55 -05:00
Brian Roberts 8293ac7b49
Merge pull request #656 from Ragora/bugfix-module-deinitialization-order 
BugFix: Correct Module deinitialization Ordering
 2021-11-06 18:15:21 -05:00
JeffR b3cd08520e Disables generation of the materials script files by the internal shape import processor. Material script files are now only generated by the AssetImporter as part of the shape injest process. 
Renames validateImportingAssets to hasImportIssues for AssetImporter console method for clarity
Updated console method documentation for AssetImporter methods
Fixed logical error for material asset generation if the import config was set to use existing materials but one was not found.
Fixed logical error when a shapeFile has a material with a texture mapped to it is not in the same directory as the shape, it would not correctly find the texture
Adjusts AssetImport window logic so it will display the window in the event of import issues being detected, or the asset is being re-imported.
Updates the AssetImport window activity log to use the new AssetImporter's log for consistency.
 2021-11-05 17:49:48 -05:00
AzaezelX e211f502e8 better handle old style references to named texture targets 2021-11-04 15:44:43 -05:00