TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-13 19:53:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
5171 commits 5 branches 33 tags 958 MiB
Commit graph

551 commits

Author SHA1 Message Date
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
Brian Roberts
2fe767f2cd
Merge pull request #578 from Azaezel/alpha40/dedicatedGFXnullouts 
dedicated gfx device suppression
 2021-09-19 01:57:22 -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
AzaezelX
21c17d0ed1 cleanups for shadergen and the visibility feature 
math fixes, feature inclusion removal. will still need to circle back on why the crosshatch.. isn't
 2021-09-17 01:24:20 -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
AzaezelX
98a4e7fb12 dedicated gfx device surpression 
augments $Video::forceDisplayAdapter = -1; to force usage of GFXAdapterType::NullDevice
skips trying to open a splash window for dedicated servers
bypasses guicanvas window display if window does not exist
 2021-09-14 17:49:27 -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
Brian Roberts
4860e548d0
Merge pull request #573 from Areloch/toolPaletteFix 
Fixes initial indexing of the tool palette widgets
 2021-09-11 17:17:17 -05:00
Areloch
3bfb9a320a Updates Prototyping module. Reorganizes primitive shapes, adds some vehicle shapes, adds datablocks for prototyping wheeled, hover and flying vehicles. 2021-09-11 17:13:23 -05: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
Brian Roberts
465b1815d7
Merge pull request #567 from Ragora/bugfix-guieditor-mission-editor 
* BugFix: Correct an error where the GUI editor cannot be opened
 2021-09-11 01:14:13 -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
Brian Roberts
eb7968538b
Merge pull request #564 from Azaezel/alpha40/macrocleanup 
macro cleanup
 2021-09-10 18:32:00 -05: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