Commit graph

348 commits

Author SHA1 Message Date
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
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
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
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
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
Areloch
adec6e7c74 Adds load status to MaterialAsset for if the Script file itself has been loaded, but the material itself hasn't yet been processed.
Fixed String -> StringTableEntry conversion in prefab file to correct corruption when setting the filename
Cleaned up message spam from the MaterialSlot fields on TSStatics
Added getter/setters for terrain file and assets
Removed unneeded exec of tools profiles for MainMenuGUI
Add logic to remove creators section of AB if in select mode
Fixed misc. messageBox invokes that were erroneously converted to 'toolsMessageBox'
Fix classname for NotesObject in AB Creator Entry
Fix issue where ConvexShapeEditor toolbar would hide after being seen once
Changed keybind for quick AB access from 'space' to 'shift space' to avoid input issues when typing in fields in some cases
Fixed default image assignments for River objects on foam/ripple/depth
Added handling for Material, Sound and Shape asset fields in Object Builder, and updated various objectBuilder class entries to utilize them now.
Updated various fields' defaults for ObjectBuilder to utilize correct assetId's
Fixed editor SceneTree tooltips for TSShape and GroundCovert to correctly reference assets as needed
Added logic to properly check terrain asset validity when prompting to save changes, which would break saving actions before
Added menubar items in the Object category to take control and release control of control objects quickly for testing
2021-09-19 01:01:47 -05:00
Areloch
2a8f8c15f3 Shifted long-form check/fetch of sound asset's SFXProfile to a convenience function
Fixed formatting on projectImporter.tscript file
2021-09-18 02:46:15 -05:00
Areloch
17d1253ba2 Converts precipitationData to use sound asset macros
Adds handling for soundProfile fields and lookups of sound assets by SFXProfile name in project importer
2021-09-15 00:41:23 -05:00
Brian Roberts
4effefce91
Merge pull request #576 from JeffProgrammer/more-eval-cleanups
Clean up more evals that have local variables are not working correctly.
2021-09-12 22:03:23 -05:00
Jeff Hutchinson
7556e403e7 Clean up more evals that have local variables are not working correctly. 2021-09-12 15:09:33 -04:00
Areloch
5892ff7428 Adds handling for drag-and-drop import of files even if asset browser is not open. If world or gui editor are the active controls, then it will injest the incoming files and prompt what their destination module and path will be via a new popup window. After clicking OK, import continues into that destination.
Cleaned up commented lines from drag-and-drop functions.
Fixed issue where material icon on buttons in the object creator windows wouldn't display.
Fixed issue where it wasn't correctly binding cloud textures for BasicClouds object or ripple/foam/depth textures for water objects when newly created
Fixed issue where when double-clicking on a datablock type in the datablock editor, wasn't correctly going through the module selection process, making an invalid destination.
Added handling for Trigger object creation via TriggerData class
Standardized double-click handling of datablock entries in AB to respect double click action mode, and properly either open the datablock editor to the given datablock, or spawn it.
Made Create New Datablock prompt window indicate the destination module to be clearer where it's going if force-prompt of module setting is off.
2021-09-12 05:32:30 -05:00
Jeff Hutchinson
a30f64506f
Merge pull request #570 from JeffProgrammer/remove_fmod
remove FMODex from Torque3D
2021-09-11 20:34:19 -04:00
Areloch
97584a9838 Fixes initial indexing of the tool palette widgets 2021-09-11 17:07:20 -05:00
Jeff Hutchinson
efb98d420d Fix local variable being eval'd in materialEditor 2021-09-11 16:31:10 -04:00
Jeff Hutchinson
41bd5ef6b6 remove FMODex from Torque3D
The current version of FMod in Torque3D uses the legacy ex plugin, which hasn't been around for a long time.
2021-09-11 16:29:32 -04:00
Areloch
4cf40defe6 Adds handling to project importer so if incoming gui files have the %guiContent declaration at the start, it's converted to a global to comply with the script interpreter 2021-09-11 02:28:14 -05:00
Brian Roberts
86fbb3748b
Merge pull request #565 from Areloch/BugfixQOL_20210909
Bugfix qol 20210909
2021-09-11 01:52:19 -05:00
Brian Roberts
7e887e79cc
Merge pull request #568 from Azaezel/alpha40/upconvertPhysicsShapeData
fix PhysicsShapeData upconvert entry
2021-09-11 01:15:08 -05:00
AzaezelX
3384d7f426 fix PhysicsShapeData upconvert entry 2021-09-10 22:37:05 -05:00
Robert MacGregor
f6f204a13a * BugFix: Correct an error where the GUI editor cannot be opened when going from GUI editor to mission editor (or any other editor). 2021-09-10 20:10:53 -04:00
Areloch
140c575f47 Minor corrections for localvar issues 2021-09-10 16:23:00 -05:00
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
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
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