TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-14 04:03:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
5271 commits 5 branches 33 tags 958 MiB
Commit graph

577 commits

Author SHA1 Message Date
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
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
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
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
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
9d2e95a1b1 * BugFix: Correct the usage of a local variable in a non-function scope in the set object locked dropdown item when right clicking in the inspector. 2021-10-28 10:30:43 -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
bf646b604f typofix for impoerter 2021-10-26 17:47:19 -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
7f5766a7fc
Merge pull request #635 from Ragora/bugfix-asset-browser-delete-directory-loop 
BugFix: Address an error where deleting directories may result in an infinite loop
 2021-10-26 00:25:45 -05:00
Brian Roberts
4b3a83c4df
Merge pull request #633 from Ragora/bugfix-asset-browser-horizontal 
BugFix: Allow the asset browser tree view to use a horizontal scroll bar
 2021-10-25 22:57:06 -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
Robert MacGregor
4082fd36e3 * [AssetBrowser] BugFix: Address an error where deleting directories may result in an infinite loop. 2021-10-25 17:58:24 -04:00
Robert MacGregor
27d75486e6 * [Editor] BugFix: Correct the inability to use function keys F1-F10 when running the editor. These keys were supposed to open a series of other editors. 2021-10-24 19:10:59 -04:00
Robert MacGregor
edf9afbd9b * [AssetBrowser] BugFix: Allow the asset browser tree view to use a horizontal scroll bar where necessary. 2021-10-22 11:22:34 -04:00
Brian Roberts
361ae7e2da
Merge pull request #627 from Azaezel/alpha40/soundAssetFollowup 
sound asset followups
 2021-10-21 14:17:39 -05:00
Robert MacGregor
0b24c728ea * [GLSL] BugFix: Correct invalid relative include paths in lightRayOcclude.glsl. 2021-10-18 09:46:58 -04:00
Robert MacGregor
58170a7805 * [AssetBrowser] BugFix: Correct a case where creator categories may get shoved into the first module in the tree when entering asset select mode. 2021-10-17 18:21:29 -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
AzaezelX
9af2de3c4b upconverter tweaks 2021-10-14 19:07:48 -05:00
AzaezelX
c2fdb733fa make mat editor list and set soundassets 2021-10-14 19:07:36 -05:00
AzaezelX
adbd6d0711 sound asset conversions importer script updates - afxmagicmissile for a datablock case and guimltextcrtl for an object-instance case 2021-10-14 15:12:50 -05:00
AzaezelX
f5600826d7 Merge branch 'Preview4_0' into SoundAssetImplements 
# Conflicts:
#	Engine/source/T3D/assets/assetImporter.cpp
#	Engine/source/forest/forestItem.cpp
 2021-10-11 20:11:27 -05:00
Robert MacGregor
8b29dae3b9 * [AssetBrowser] BugFix: Correct the inability to spawn assorted objects. 2021-10-11 20:12:32 -04:00
Brian Roberts
fe3edb8ccf
Merge pull request #613 from Azaezel/kermithelpme 
followups to #582
 2021-10-11 01:27:15 -05:00
Jeff Hutchinson
66887a930b
Merge pull request #614 from DraconicEnt/bugfix-select-asset-path 
* BugFix: Correct the SelectAssetPath Window not Listing any Paths
 2021-10-10 23:23:38 -04:00
Robert MacGregor
d53dcb03c2 * [AssetBrowser] BugFix: Correct an error where on Linux the select asset path function would not list any directories. 2021-10-09 22:16:55 -04:00
AzaezelX
e2e1c491ac Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into kermithelpme 2021-10-09 11:32:13 -05:00
AzaezelX
112dafd8a8 remove basiconly from decals and decal roads. seems we fixed the bit that was causing that to not render 2021-10-09 11:31:26 -05:00
AzaezelX
23e5e891ed simplify callOnModules 2021-10-08 23:45:20 -05:00
AzaezelX
67c889279d fix groundplane material reference in examplelevel 2021-10-03 17:42:32 -05:00
AzaezelX
52040fb072 Merge branch 'Preview4_0' into kermithelpme 2021-10-03 17:23:52 -05:00
AzaezelX
c99c9cc365 include metal FootMetalSound oversight, include correction for mangled entries where a given varname and a given assetname match 2021-10-02 20:58:44 -05:00
Robert MacGregor
1676d102f3 * [AssetBrowser] BugFix: Correct a logic error in the filtering of the asset browser causing tags queries to display all assets. 2021-10-02 16:22:55 -04:00
AzaezelX
d3693bef8d shifted playerdata down to the Long Lists block. fix player enum ref source side 2021-09-30 14:40:03 -05:00
AzaezelX
65774ff123 converter work pt1 2021-09-30 14:15:42 -05:00
AzaezelX
0595a88345 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into SoundAssetImplements 2021-09-27 20:13:36 -05:00
Areloch
737fd70c69 Adjusted handling of field converts in the project importer to deal with fields that didn't contain quotation marks 2021-09-27 18:46:20 -05:00
AzaezelX
7b137c2ee8 genProcessor("LightningData"... attempt. will need to re-review. 2021-09-26 17:30:57 -05:00
Areloch
7a3f735067
Merge pull request #593 from JeffProgrammer/material-editor-fixes 
Material editor fixes from eval cleanup.
 2021-09-25 01:52:15 -05:00
Jeff Hutchinson
f1ee4f781b Material editor fixes from eval cleanup. 2021-09-24 19:09:43 -04:00
Robert MacGregor
d7919950bf * [Editor] BugFix: Correct an object spawning error when attempting to drag and drop datablocks from the asset browser where they would always spawn at origin. 2021-09-24 18:34:57 -04:00
AzaezelX
3fabbc651f Merge branch 'alpha40/splashscreenSuppression' into alpha40/SGCleanups2 2021-09-22 18:50:46 -05:00
AzaezelX
c523951e65 Merge branch 'Preview4_0' into alpha40/SGCleanups2 2021-09-22 18:47:31 -05:00
AzaezelX
901228c3a8 kill splashscreen on nonwindows 
was worth a shot, but it's playing up way too much to focus on at present
 2021-09-21 23:19:00 -05:00
Areloch
ef5daae770 Removed unneeded var 2021-09-19 12:55:56 -05:00
Areloch
9a809dfb6b Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0 2021-09-19 02:28:19 -05:00