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
5462 commits 5 branches 33 tags 958 MiB
Commit graph

5462 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
AzaezelX 19e4643707 new method tsstatic.getNodeTransform 
used to look up a given node's transform by explicit name in a tsstatic object
 2021-11-03 21:15:00 -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 38e7bb9232 * BugFix: Correct the possibility of the Sim module being deinitialized after the Scene module despite the Sim module being dependentant on the Scene module. 2021-11-02 18:52:54 -04: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
Brian Roberts ca213fe534
Merge pull request #654 from Ragora/bugfix-unix-x86-compile 
* BugFix: Correction for compiling on x86 Unix devices.
 2021-11-02 16:38:02 -05:00
Robert MacGregor 215a93e9af * BugFix: Correction for compiling on x86 Unix devices. 2021-11-02 17:36:22 -04:00
Robert MacGregor b33e1b400b * BugFix: Correct a crash in the variable inspector caused by keeping pointers into tVector managed memory. 2021-11-02 17:32:26 -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
Brian Roberts a0e0e1f220
Merge pull request #648 from Ragora/bugfix-arm-compilation 
BugFix: ARM Compilation
 2021-11-01 17:06:05 -05:00
Robert MacGregor 6f617cace8 * BugFix: Correct compiler warnings induced by adding -msse to the compiler commandline on non-x86 devices. 2021-11-01 09:01:00 -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
Brian Roberts ac3126765f
Merge pull request #646 from Azaezel/alpha40/matScrollFix 
fix material scrolling
 2021-10-30 11:39:34 -05:00
AzaezelX 7b77877c63 fix material scrolling 2021-10-29 16:25:31 -05:00
Brian Roberts f7c6219960
Merge pull request #645 from Areloch/QOL20211028 
Misc QOL and Bugfixes for 2021/10/28
 2021-10-29 16:10:56 -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 59bebe0bb4
Merge pull request #641 from Ragora/bugfix-arm-detection 
Feature: Properly detect ARM32/ARM64 in the CMake build process
 2021-10-28 18:08:07 -05:00
Brian Roberts 1f06cf1dad
Merge pull request #644 from Ragora/adjustment-update-assimp 
Adjustment: Update Assimp version to 5.0.1.
 2021-10-28 17:48:39 -05:00
Brian Roberts f250955f63
Merge pull request #640 from Azaezel/alpha40/iblCleanups 
Alpha40/ibl cleanups
 2021-10-28 12:27:24 -05:00
Brian Roberts 99daf9479e
Merge pull request #643 from Ragora/bugfix-material-selector-invocation 
BugFix: Don't assume a tooltip profile is going to be set when waking and sleeping
 2021-10-28 11:57:05 -05:00
Brian Roberts 8bc2587b43
Merge pull request #642 from Ragora/bugfix-inspector-rightclick-locked 
BugFix: Correct the usage of a local variable in a non-function scope
 2021-10-28 11:56:31 -05:00