Commit graph

3465 commits

Author SHA1 Message Date
AzaezelX dba0899887 soundasset augments: get<name>Profile methods, test for emptystring, initialize asset arrays
lightning provides a conversion sample (attempt. it's still yelling)
2021-09-26 17:30:13 -05:00
AzaezelX 2181ce08c3 lightning ref fixes 2021-09-26 03:12:14 -05:00
AzaezelX b83babe175 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into SoundAssetImplements 2021-09-26 03:07:23 -05:00
Jeff Hutchinson 9c243bc5e2
Merge pull request #596 from OTHGMars/menuControl
GuiGameListMenuCtrl Update
2021-09-25 20:42:10 -04:00
Brian Roberts 97ddb97410
Merge pull request #594 from JeffProgrammer/executef-fixes
Fix specific usage of Con::executef where it was not being assigned t…
2021-09-25 18:13:27 -05:00
OTHGMars 666065ce6c GuiGameListMenuCtrl Update
Methods to simplify managing localized option lists.
Adds a text key to each option in an option row.
Adds methods for getting the current selections index or key value.
Adds methods for setting the current selection by index or key value.
This change is backward compatible. If the new methods are not called, the control behavior is unaffected.
2021-09-25 02:48:30 -04:00
Jeff Hutchinson e35b5f5119
Merge pull request #591 from Ragora/bugfix-object-deletion-crash
* BugFix: Fix a crash that sometimes occurs when groups of of objects are deleted
2021-09-24 23:28:15 -04:00
Jeff Hutchinson 8aa1f2e881
Merge pull request #589 from Ragora/bugfix-linux-win-console
* BugFix: Corrections to allow the Linux win console to work
2021-09-24 23:27:37 -04:00
Jeff Hutchinson 755bbacaa0 Fix specific usage of Con::executef where it was not being assigned to a ConsoleValue before getting it's data out of it. 2021-09-24 19:32:57 -04:00
Robert MacGregor 12f4af51f5 * [Editor] BugFix: Fix a crash that sometimes occurs when groups of objects are deleted in the world editor. 2021-09-24 17:58:17 -04:00
Robert MacGregor 55063601e6 * [Projectile] BugFix: Correct the onAdd callback not being raised for projectiles. 2021-09-23 22:58:25 -04:00
Robert MacGregor 4cfb3c4f04 * [Linux] BugFix: Corrections to allow the Linux win console (Ie. the terminal you ran the game from) to act as a console input. 2021-09-22 20:28:39 -04:00
Jeff Hutchinson 2d50f52cf1 Allow local variables to be used in eval. 2021-09-20 21:00:33 -04:00
AzaezelX c150afebaa particle cleanups
misc dupe code cleanup bits.
safeties for the varous flavors of void ParticleEmitter::setup
ideally we circle back to break some of that logic on out to shared steps
2021-09-20 13:50:47 -05:00
marauder2k7 57aceb60fb QOC
Code cleaning of unnecessary else'
Remove unnecessary dynamic_casts
2021-09-20 17:57:16 +01:00
marauder2k7 e9d0f68b55 Preload all soundAsset
-Fixed: Preloads need to preload all soundAssets not just the ones it was preloading before.
2021-09-20 17:05:11 +01:00
marauder2k7 30b57c0f95 More turns
-Flying Vehicle
-Proximinity Mine
2021-09-20 14:17:10 +01:00
marauder2k7 704eb27600 More Implements
-Most Vehicles and FX classes
-Vehicle classes may need more preloads for assets.
2021-09-20 13:07:50 +01:00
marauder2k7 1ea693fea6 SoundAsset Array
Few fixes to soundasset array to stop it complaining
2021-09-20 10:49:34 +01:00
marauder2k7 3ad6d47ca9 Update SoundAsset.h
-SoundAsset array setters getters and binds in place
2021-09-20 09:55:36 +01:00
marauder2k7 c92cfe3e81 SoundAssetImplements
-Explosion
-Lightning
-Splash

-Other sound asset implementations will require soundasset array if possible.
2021-09-20 09:37:31 +01: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
Brian Roberts c2d5df4c86
Merge pull request #583 from Ragora/bugfix-opengl-errors-during-load
* [OpenGL] BugFix: Correct shader errors being thrown during load
2021-09-19 01:57:04 -05:00
Brian Roberts c055276d21
Merge pull request #579 from Areloch/PrecipdataSoundConvert
Converts precipitationData to use sound asset macros
2021-09-19 01:56:43 -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
Robert MacGregor c8a5ccb191 * [OpenGL] BugFix: Correct shader errors being thrown during the load phase due to direct use of glUseProgram causing desync with GFXGLDevice. 2021-09-17 17:39:29 -04:00
Robert MacGregor f9b78597f7 * BugFix: Correct an error that causes the engine to crash when calling non-namespaced engine functions incorrectly. 2021-09-16 21:21:04 -04: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
Jeff Hutchinson a7db690b59 Reimplement object copy failures. 2021-09-13 19:46:21 -04:00
Jeff Hutchinson a30f64506f
Merge pull request #570 from JeffProgrammer/remove_fmod
remove FMODex from Torque3D
2021-09-11 20:34:19 -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
Jeff Hutchinson 7f59bc6350 Forgot to null out the datablock after being deleted when it fails to preload. 2021-09-11 15:16:36 -04: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 eb7968538b
Merge pull request #564 from Azaezel/alpha40/macrocleanup
macro cleanup
2021-09-10 18:32:00 -05:00
Brian Roberts 1e7a932a9e
Merge pull request #566 from Azaezel/alpha40/previewPixelfix
don't try to generate mipmaps for images that aren't n^2 dureing prev…
2021-09-10 18:18:46 -05:00
AzaezelX 5f0551b831 don't try to generate mipmaps for images that aren't n^2 dureing preview map generation 2021-09-10 18:18:30 -05:00
Areloch b9c071b9fd Cleanup mismerge lines 2021-09-10 15:14:57 -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
AzaezelX e4d16a8c61 (re) add collision yo noshape.dts
set all rigidshapedatas to default to noshape instead of blank to fix the lack of a basic collision mesh blocking datablock creation
2021-09-09 18:33:03 -05:00
Jeff Hutchinson 35b33f1864 various fixes and memory corruption bug. 2021-09-09 19:30:32 -04:00
AzaezelX 3d488bbbf0 macro cleanup 2021-09-09 13:29:31 -05:00
Brian Roberts 753b6c7189
Merge pull request #561 from Areloch/SoundAssetInitRollin
Sound asset initial rollin
2021-09-08 00:17:38 -05:00
Jeff Hutchinson 27a4868b6e Fix buffer corruption. 2021-09-07 21:52:36 -04:00
Jeff Hutchinson 6d93e96dc3 NULL out an object variable if it fails to register. 2021-09-07 21:03:57 -04:00
Jeff Hutchinson 55c0a748b4 Don't generate op_inc whenever its used as an expression. 2021-09-07 19:43:39 -04:00