Commit graph

501 commits

Author SHA1 Message Date
Areloch
dec9f54a9b Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into BugfixQOL_20210909 2021-09-10 02:20:13 -05:00
Areloch
8781f2ab55 Add getScriptPath console function to GUIAsset
Shifted tracking of importing asset status to an enum for more robust handling
Added logic to properly init freshly created shapeConstructors with the newly imported shapeAsset
Fixed handling of assets that have been marked to be skipped, but needed to fill in the parent's dependencies(UseForDependencies enum value)
Cleaned up redundant recursive logic for importing assets
Disable Create Game Objects button in inspector
Fixed material assignment for convex proxies
Updated asset icons for AB with WIP images to be more clear
Fixed issue where type-generic icons in the creator items in the AB weren't showing correctly.
Force AB to show creator entries in list mode for efficiency and avoid icon scaling issues
Moved creator functions for AB to separate file for convenience
Filled out GUIControls in the AB's creator mode, and context world editor and GUI creator entries based on active editor
Added drag-n-drop handling for guiControls via AB creator in guiEditor mode
Added more types' profiles in the AB gui profiles to give more unique border colors for better visual clarity of asset type
Added editor setting to indicate if the editor should load into the last edited level, or the editor default scene
Fixed setting of highlight material overlay in shapeEditor
Added global keybind for GUIEditor so space also toggles assetbrowser
Fixed up binding/finding of shapeConstructor by assetId, which also fixed displaying of shape's material listing
2021-09-10 02:13:56 -05:00
Areloch
6487e2eede
Merge pull request #495 from JeffProgrammer/tsneo
TorqueScript Interpreter 2.0
2021-09-09 19:22:15 -05:00
Brian Roberts
ad5d0b6d1b
Merge pull request #563 from Bloodknight/Minor_Module_Fixes
replace new with singleton to fix cannot re-declare object log file …
2021-09-08 12:48:44 -05:00
Marc
c285813540 replace new with singletone to fix cannot re-declare object lof file spam 2021-09-08 15:18:04 +01:00
Areloch
6439cb84d4 Adds handling in project import to process SFXDescriptions and Profiles into assets and remove the redundant OG declarations 2021-09-05 23:47:11 -05:00
Areloch
0ca66b99db Added fix so if a looping sound is preview-playing in the AB and you edit the properties, it doesn't try to reload the asset while it's playing, causing a crash
Added console method for looking up a soundAsset by filename
Added initial pass of project importer for sound assets content
2021-09-05 03:43:41 -05:00
Areloch
df0f8dafa6 Imported in UI sounds
Fixed asset properties editing so it applies after saving
Added fix for making sound asset preview playback properly
2021-09-04 02:27:21 -05:00
Areloch
cd1fd1ccf4 Merge branch 'SoundAssetInitRollin' of https://github.com/Areloch/Torque3D into Preview4_0 2021-09-04 01:38:22 -05:00
Jeff Hutchinson
b0549118b6 various misc fixes from merge. 2021-09-01 22:36:59 -04:00
Jeff Hutchinson
17231ca9fb Merge remote-tracking branch 'devhead/Preview4_0' into tsneo
# Conflicts:
#	Engine/source/platform/types.visualc.h
#	Templates/BaseGame/game/tools/assetBrowser/scripts/assetBrowser.tscript
#	Templates/BaseGame/game/tools/assetBrowser/scripts/assetTypes/terrain.tscript
#	Templates/BaseGame/game/tools/gui/editorSettingsWindow.ed.tscript
#	Templates/BaseGame/game/tools/gui/scriptEditorDlg.ed.gui
2021-09-01 22:26:23 -04:00
Areloch
e8a49ef4ca Requested cleanups 2021-09-01 17:57:21 -05:00
Areloch
25a32cba2a Merge branch 'MiscQOLFixes20210828' of https://github.com/Areloch/Torque3D into Preview4_0 2021-09-01 17:44:43 -05:00
Brian Roberts
09492f0885
Merge pull request #558 from Areloch/MiscFixes20210901
Misc Fixes and QOL improvements
2021-09-01 17:38:24 -05:00
Areloch
534d90c002 Missed line adding ShapeEditorToolbar to main editor UI needlessly. 2021-09-01 01:19:53 -05:00
Areloch
683c438b09 Improves handling of rendering guiPopupCtrls where if the height extent is taller than the bitmap array height, it'll adjust the height to recenter the displayed bitmap elements.
Streamlined the toolbar for the gui and world editors to utilize a stack, making the behavior and manipulation of toolbar elements significantly more consistent.
Added Settings and Asset Browser buttons to both gui and world editor toolbars for easier access.
Moved all tool toolbars over to work with the stack system to make them more consistent and better formatting
Added saving of asset browser's last position and extent so it remembers it on load.
Added editor setting to close the asset browser after completing a drag-n-drop action.
Added keybind to editor keybind list, making space toggle the asset browser
2021-09-01 01:12:16 -05:00
JeffR
56b0a0cb85 Initial hook-in of the sound asset's integration into sfxEmitter, as well as some fixups for editor/workflow usage. 2021-08-31 00:54:05 -05:00
Jeff Hutchinson
485330ec7a Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 2021-08-30 19:39:06 -04:00
AzaezelX
66d7b0c49f mini cleanups for ab
seems some operating systems don't play nice with setting `extent =` outside of a define{init} block,
cleaned up %assetarray using $AssetBrowser::AssetArray
cleanup for terrain definition path display
2021-08-30 01:50:47 -05:00
Brian Roberts
f6d3a30638
Merge pull request #551 from Azaezel/alpha40/decalDemangle
DiffuseRenderPassManager.addManager "cleanups"
2021-08-30 01:38:47 -05:00
Brian Roberts
61cb93643c
Merge pull request #552 from Azaezel/alpha40/classconvertsafety
ensure new (foo) lines being converted are valid according to findObj…
2021-08-30 01:38:35 -05:00
Jeff Hutchinson
a2d5e475fb fix script issue. 2021-08-29 22:41:48 -04:00
Jeff Hutchinson
6e072dbf91 Merge branch 'Preview4_0_DevHead' into tsneo 2021-08-29 22:28:42 -04:00
AzaezelX
28dd431118 ensure new (foo) lines being converted are valid according to findObjectClass 2021-08-29 01:08:19 -05:00
Brian Roberts
be3fd039af
Merge pull request #548 from Azaezel/alpha40/glowchanCleanups
kill off glowchan leftovers
2021-08-28 20:34:19 -05:00
AzaezelX
68c6b343d5 DiffuseRenderPassManager.addManager "cleanups"
adds bintypes where they're lacking, since that's an active object-type filter to avoid accidently rendering things twice. (particleBin being like glowmanager, a seperate flow, that acts up if filtered in that manner)
basiconly likewise is intended to avoid multiple-pass insertions, despite the varname.
2021-08-28 19:27:53 -05:00
Areloch
ec85e9021c Misc Quality of Life and Bug fixes
Added handling for if preview images on image assets fails to generate, will fallback to using the full image
Added handling for double clicking or drag-n-dropping terrain assets to create them
Improved handling of field labels in variable inspector by making the stringtable be case sensitive.
Added editor settings for handling of asset double click behavior. Can now select between Edit Asset and Spawn Asset. Support is asset type dependent.
Added editor setting for auto-importing loose files when navigating to a folder. If on and the user has flagged to also enable auto-import generally, will auto import all unaffiliated loose files in as assets.
Added editor setting for default module to use when creating new assets. Updated various tooling logic so when creating a new material, if this and the 'Always Prompt Module Target' setting is off, it will fill in the target module and target asset path info based on the default module.
Fixed issue with editors that use managedData scripts where if the path didn't exist, the script file wouldn't be made.
Fixed display issue in terrain editor where if you clear the detail map, the normal/macro/orm maps would disable, but not also clear.
Fixed handling of cleared maps in terrain editor so it no longer fills empty maps in with the no image image.
Fixed handling of creating new material where it would fill in the diffuse with a no texture image as the default.
Fixed issue where canceling out of creating a module would still prompt to create the common default folders.
Fixed issue where the Select Module window couldn't be closed via the cancel or x buttons.
Based on feedback, reduced default size of the Text Pad window.
Fixed issue where the Drop At menu list wouldn't correctly display which item was marked after it was changed.
Fixed spawning shape asset handling so it uses whatever the editor's Drop At setting is.
Improved themeing of regular bitmap buttons in the editor.
Based on feedback, flipped layout of Target Module and Target Path in the Create New Asset window.
Improved handling of setting up the Target Path for when creating new assets. If a path is not set, and the user has a Default Module, it will default the path to that module.
2021-08-28 18:51:27 -05:00
AzaezelX
cabfeea76b nother stray 2021-08-28 16:20:58 -05:00
AzaezelX
50fb4df1f0 kill off glowchan leftovers 2021-08-28 15:54:21 -05:00
Brian Roberts
6fc67a11bb
Merge pull request #547 from Azaezel/alpha40/tooltipWip
fixes for copypastas that somehow slipped in
2021-08-23 19:37:52 -05:00
AzaezelX
868bd6c361 fixes for copypastas that somehow slipped in 2021-08-23 19:37:09 -05:00
Brian Roberts
a585c8736f
Merge pull request #546 from Areloch/AFXAssetify
Converts most of AFX classes to utilize assets
2021-08-23 19:22:30 -05:00
Areloch
64b98b0c10 Converts most of AFX classes to utilize assets
Adds modified classes to project importer convert logic
2021-08-22 02:15:14 -05:00
AzaezelX
3c79aace74 tooltip work 2021-08-21 17:13:57 -05:00
Robert MacGregor
452ef71274 * BugFix: Correct $i and %i interchangeably being used in parseArgs.tscript. 2021-08-20 20:38:24 -04:00
Areloch
19ba408354 Fixes new emitter button bitmap to proper fieldname 2021-08-18 00:48:30 -05:00
Jeff Hutchinson
838395840d script fixes from latest merge and more tests 2021-08-17 20:04:45 -04:00
Jeff Hutchinson
ada1c5a021 Merge branch 'Preview4_0_DevHead' into tsneo 2021-08-16 22:50:02 -04:00
Brian Roberts
7a01f687ac
Merge pull request #535 from Ragora/bugfix-shapeeditor-mounting
* [Shape Editor] BugFix: Correct a bad octahedron.dts reference when using the mount viewer.
2021-08-16 14:07:51 -05:00
Robert MacGregor
aa91ccfd39 * [Shape Editor] BugFix: Correct a bad octahedron.dts reference when using the mount viewer. 2021-08-15 23:33:33 -04:00
Areloch
48e994f7bd Shift file handling in importer to a standardized function
Added santizing of strings to filenames, object names and asset names for the importer process
Added sanitizeString console function for above
Added processing of terrainBlock object's fields for importer
Added check to avoid updateTSShapeLoadProgress spam
Adjusted folderPrefix logic to walk up directory to find assetName that isn't already in use.
2021-08-15 03:07:40 -05:00
Brian Roberts
190343cbc7
Merge pull request #531 from Ragora/bugfix-asset-browser-linux
Asset Browser on Linux Fixes
2021-08-13 22:35:40 -05:00
Robert MacGregor
3a4f0e8808 * [x86UNIXFileio] BugFix: Correct an error in the initial call to recurseDumpDirectories that causes an empty list of directories to always be returned.
* [UI Module] BugFix: Change module directory name to uppercase for matching the declared module name in its module file for asset tree browsing to work correctly on case sensitive systems.
2021-08-13 23:31:29 -04:00
Brian Roberts
8d9f57b077
Merge pull request #526 from Azaezel/alpha40/abExecOrder
ensure the asset browser is executed prior to other pseudo-modules that may need bits
2021-08-13 22:21:06 -05:00
Brian Roberts
c9d2ec0f56
Merge pull request #527 from Azaezel/alpha40/stopTheBleeding_Materials
suppress deletion of temp material created by the editor
2021-08-13 22:20:58 -05:00
Robert MacGregor
8d4d4b7588 * [Material Editor] BugFix: Correct case sensitivity errors on the model previews when running on case sensitive systems (Ie. Linux). 2021-08-13 21:07:29 -04:00
Jeff Hutchinson
717c7acca9 Merge remote-tracking branch 'devhead/Preview4_0' into tsneo
# Conflicts:
#	Templates/BaseGame/game/data/ui/guis/loadingGui.gui
#	Templates/BaseGame/game/data/ui/guis/mainMenu.gui
#	Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui
#	Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui
#	Templates/BaseGame/game/tools/forestEditor/brushes.tscript
2021-08-13 20:14:39 -04:00
AzaezelX
1e119141d2 ok, turns out the asset browser needs to have the world editor spooled up to slot in place 2021-08-12 19:08:04 -05:00
AzaezelX
98941702a7 supress deletion of temp mateiral created by the editor
stops it from crashing out swapping back and forth into the mat editor
not a proper fix, just ensures we have *something* for the weekend if we don't do a better job.
2021-08-12 17:02:13 -05:00
AzaezelX
d4c739c348 ensure the asset browser is executed prior to other tll pseudo-modules that may need bits 2021-08-10 23:29:48 -05:00