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

3467 commits

Author SHA1 Message Date
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
Brian Roberts 4d56b34bbb
Merge pull request #651 from Ragora/bugfix-asan-tsshapeedit 
BugFix: Correct an ASAN use-after-free Error in TSShapeEdit
 2021-11-03 22:19:50 -05:00
Brian Roberts dec886036c
Merge pull request #659 from Ragora/bugfix-delete-and-new-mismatch 
[TAML] BugFix: Correct a delete and new[] mismatch in tamlWriteNode
 2021-11-03 21:17:16 -05:00
Brian Roberts 1a0b66b5e3
Merge pull request #655 from Ragora/bugfix-asan-sync-fetch-and-add 
BugFix: Correct an ASAN reported memory error caused by incorrect usage of __sync_fetch_and_add
 2021-11-03 21:17:07 -05:00
Brian Roberts efed9358f7
Merge pull request #649 from Ragora/bugfix-asan-guigamelistmenuctrl 
BugFix: Correct an ASAN reported memory access error in GuiGameListMenuCtrl
 2021-11-03 21:16:47 -05:00
Brian Roberts 2bb4d34efd
Merge pull request #658 from Azaezel/alpha40/imageArrayProfileFixes 
imageasset array profile fixes
 2021-11-03 21:15:59 -05:00
Brian Roberts e4428cf75a
Merge pull request #657 from Areloch/SeparateImporterLogFile 
Updates asset importer and project importer to output to separate log files into tools/logs
 2021-11-03 21:15:51 -05:00
Robert MacGregor 400db2da88 * [TAML] BugFix: Correct a delete and new[] mismatch in tamlWriteNode reported by ASAN. 2021-11-03 18:27:26 -04:00
AzaezelX 69afd3d370 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into alpha40/imageArrayProfileFixes 2021-11-03 12:48:47 -05:00
AzaezelX e45b959d7d correct imageassetarrays having a singular texture profile as oposed to a type per. 
while that certainly works for most cases it falls apart when dealing with postfx where it's an unnamed array of variable types of inputs.
shifted the profile assignment to #define INIT_IMAGEASSET_ARRAY(name, profile, index) so there's still a really obvious point where you can see the default setting, even if it's not in the more desireable OG definition spot
for postfx in particular, given we can swap that, provided an example of how to do just that
 2021-11-03 12:30:52 -05:00
JeffR fda722e355 Updates asset importer and project importer to output to separate log files into tools/logs 
Add utility console function for getting current datetime
 2021-11-03 00:13:00 -05:00
Robert MacGregor 2311d7d683 * BugFix: Correct an ASAN reported memory error caused by incorrect usage of __sync_fetch_and_add. 2021-11-02 18:11:42 -04:00
Brian Roberts e372545cc6
Merge pull request #647 from Azaezel/alpha40/guiProfileCleanups 
clean up more texture profile refs to kill spam
 2021-11-02 16:39:25 -05:00
Brian Roberts 7c1574355f
Merge pull request #653 from Ragora/bugfix-asan-tabcomplete 
BugFix: Correct an invalid memory access error caused by the tab autocomplete
 2021-11-02 16:38:18 -05:00
Robert MacGregor 215a93e9af * BugFix: Correction for compiling on x86 Unix devices. 2021-11-02 17:36:22 -04:00
Robert MacGregor 2b53c065ce * BugFix: Correct an invalid memory access error caused by the tab autocomplete in the console when attempting to tab complete at the start of the input while there is text to the right. 2021-11-02 13:55:57 -04:00
Robert MacGregor 2eefb4972f * BugFix: Correct an ASAN memory access error in TSShapeEdit caused by reading a reference from the same vector we are pushing to at the same time. 2021-11-02 09:11:25 -04:00
Robert MacGregor 724e4f423c * BugFix: Correct an ASAN reported memory access error when calling updateHeight on GuiGameListMenuCtrl when an invalid profile is initially set. 2021-11-02 08:21:22 -04:00
Robert MacGregor dd03af5041 * BugFix: Corrections to the Unix file IO to allow for compilation on ARM Unix devics. 2021-11-01 08:52:35 -04:00
AzaezelX 0dcd272b87 clean up more texture profile refs to kill spam 2021-10-31 14:38:02 -05:00
Areloch 0fab2ebf54 Added fallback handling to MaterialAssets if the asset was found but the matDef was not 
Added import config handling for prepending Directory to asset name
Added handling for import config of appending a sound suffix
Integrated handling of directory prepend and asset type suffix to rename issue resolution of asset importing
Corrected miswording of warn message for duplicate object names
Correct GUI issues with verve tools
Convert verve tools to utilize assets for their GUI elements
Fix window binding/naming issue depending on window mode for verve
Fix popup menus formatting for verve
WIP fix for material swap in Material editor. Corrects crash, but swap action is unreliable depending on object type
Fix display issue with mission area editor toolbar button image
Fix tooltip display of SFXEmitters in editor tree to correctly show the bound asset
Changed network graph accelerator keybind from just N to Ctrl N to avoid keybind issues when typing
Fixed Create New Emitter button in particle emitter that was showing as no texture
 2021-10-28 23:52:58 -05:00
Brian Roberts f250955f63
Merge pull request #640 from Azaezel/alpha40/iblCleanups 
Alpha40/ibl cleanups
 2021-10-28 12:27:24 -05:00
Robert MacGregor 5c83b417a5 * [GuiControl] BugFix: Don't assume a tooltip profile is going to be set when waking and sleeping. 2021-10-28 10:40:13 -04:00
Brian Roberts 6d0105948d
Merge pull request #636 from Azaezel/alpha40/matAnimAngry 
addsa material.setAnimflags(LAYER,TAGS STRING); method
 2021-10-27 18:58:41 -05:00
AzaezelX 8685173207 typofix 2021-10-27 16:01:37 -05:00
AzaezelX a9bc56944c Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into alpha40/iblCleanups 2021-10-27 13:50:58 -05:00
AzaezelX 42bc6fa358 differentiate forward lit and deferred ibl vars 
since we're not currently using the same arrays et al for the whole pass, need to make sure those don't fight
 2021-10-26 12:32:37 -05:00
Brian Roberts e658c95f90
Merge pull request #632 from Ragora/bugfix-get-sound-filename-crash 
BugFix: Correct a crash caused by sfxProfile
 2021-10-26 11:49:55 -05:00
Robert MacGregor 72b31f6f6b * BugFix: Correct a crash caused by sfxProfile due to returning an address to a temporary value in getSoundFileName. 2021-10-26 12:48:28 -04:00
Brian Roberts 8c2aaaad18
Merge pull request #638 from Ragora/bugfix-create-directory-logic 
BugFix: Correct usage of mkdir in posixVolume.cpp
 2021-10-26 11:17:28 -05:00
Robert MacGregor 0cf8498fce * BugFix: Correct usage of mkdir in posixVolume.cpp to check for the expected successful return value. 2021-10-26 08:22:58 -04:00
Brian Roberts 0f4cf446a3
Merge pull request #631 from Azaezel/alpha40/spotlightSpotting 
adress gl spotlights disapearing for deferred
 2021-10-25 22:57:24 -05:00
AzaezelX 3fdf49f829 addsa material.setAnimflags(LAYER,TAGS STRING); method 
workaround for mat.animFlags[#]= foo; not taking
time of writing seems to not work for scroll for some reason. might be a different bug
 2021-10-25 22:54:19 -05:00
AzaezelX a05c83493e adress gl spotlights disapearing for deferred 
It was mixing vars up between it and forward. resolved by prefixing the forward vars with "in" as the rest are, as well as pointing the val at the const String ShaderGenVars::lightSpotParams("$inlightSpotParams");
 2021-10-21 22:08:56 -05:00
Brian Roberts 14ebeaf3eb
Merge pull request #625 from Ragora/bugfix-case-insensitivity-fatal-assert 
BugFix: Correct a fatal error that may be thrown in case insensitive Unix IO
 2021-10-21 14:17:49 -05:00
Brian Roberts 361ae7e2da
Merge pull request #627 from Azaezel/alpha40/soundAssetFollowup 
sound asset followups
 2021-10-21 14:17:39 -05:00
Jeff Hutchinson 4af4d90f4a Get rid of setLocalVariable entirely. 2021-10-19 20:38:13 -04:00
Jeff Hutchinson 4293aef858 This one slipped through - nextToken can't use local variable for its token variable. This was stated as one of the breaking changes in the origional PR. 2021-10-19 20:34:57 -04:00
AzaezelX 670b246a2a sound asset conversions - playlist (as a point of significance, that no longer uses mSlots.mTrack[ i ] on the backend. just th equivalent of mTrack[i]. While the former was certainly useful for clustering, it's actively fighting standarization) 2021-10-14 22:33:13 -05:00
AzaezelX 9ab5f61c39 sound asset conversions - ambience 2021-10-14 22:31:00 -05:00
Robert MacGregor 42b862a54b * [Unix] BugFix: Correct a fatal error that may be thrown from functions like isFile is passed a bad path. 2021-10-14 20:38:01 -04:00
AzaezelX f0d919e859 sound asset conversions - materials 2021-10-14 19:09:20 -05:00
Robert MacGregor 2586e73145 * BugFix: Correct a few memory leaks. 2021-10-14 19:40:16 -04:00
AzaezelX 00515fffa8 sound asset conversions - afxmagicmissile for a datablock case and guimltextcrtl for an object-instance case 2021-10-14 15:06:49 -05:00
AzaezelX 33210c4a1e minor logic cleanups. we want to ensure if we *do* set the projectile sound to empty via editor, that gets propagated 2021-10-14 15:05:49 -05:00
AzaezelX 9217c62446 sound followups 
debug spam removal
 2021-10-14 15:04:52 -05:00
Brian Roberts ba9debf89f
Merge pull request #617 from Ragora/adjustment-unix-case-insensitivity 
Adjustment: POSIX Case Insensitivty
 2021-10-13 13:12:29 -05:00
Brian Roberts 15aed0efc2
Merge pull request #616 from Azaezel/SoundAssetImplements 
Sound asset implements
 2021-10-13 13:11:57 -05:00
Robert MacGregor bd9b3fd55b * [Win32] Adjustment: Only trigger the Linux compat warning when TORQUE_POSIX_PATH_CASE_INSENSITIVE is disabled. 2021-10-13 11:40:54 -04:00
Jeff Hutchinson 90951b3cc8
Merge pull request #619 from Azaezel/alpha40/glcubefix 
fix opengl cubemap display
 2021-10-11 21:13:25 -04:00