Commit graph

953 commits

Author SHA1 Message Date
AzaezelX
10f2453cee setget was causing active interference with INITPERSISTFIELD_SOUNDASSET_ENUMED 2021-10-02 23:24:46 -05:00
AzaezelX
19eb3c42f0 more enum work, now with somewhat clearer boundary names, and some debug spam for initpersistfields, and pack and unpack macros to help us try and trace why those are scrambling 2021-10-02 21:05:04 -05:00
AzaezelX
0760621212 fix item->importStatus tagging in importer 2021-10-02 21:01:14 -05:00
AzaezelX
5c7069555a filter out array entries without enum strings 2021-09-30 16:00:37 -05: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
64a87ceba8 trim assetEnumNameConcat to 2 values, set INITPERSISTFIELD_SOUNDASSET_ENUMED to exclude maxValue 2021-09-30 13:46:03 -05:00
AzaezelX
0c6ca6c701 conflict resolution 2021-09-29 12:38:47 -05:00
marauder2k7
656096e016 Another way of doing shapeBase, this requires fewer changes but will have an empty asset in each stateData until it is filled with an asset.
Both these will need to be tested to see which one is better.
2021-09-29 12:48:37 +01:00
marauder2k7
1c14dc5ec4 The beast is ready for a look over.
Can't have a soundAsset inside a struct. If we could this might work better.
PrevState needs to be kept track of for clearing looping sounds before the next state is loaded in. This might cause issues when switching weapons.
2021-09-29 12:36:02 +01:00
marauder2k7
d700ea4878 Committing player separately.
shapeBase is its own beast and will require a very critical look over once its up.
2021-09-29 11:41:57 +01:00
marauder2k7
3d7f092c52 Merge branch 'SoundAssetImplements' of https://github.com/Azaezel/Torque3D-1 into SoundAssetImplements
# Conflicts:
#	Engine/source/T3D/fx/lightning.cpp
2021-09-29 06:31:56 +01:00
AzaezelX
2630b4ada6 corrected and simplified the is<foo>Valid method macro injections 2021-09-28 18:50:35 -05:00
AzaezelX
776741770d boolean is<thing>valid chjecks for assets. tests wether it's non-empty and reporting zero flaws 2021-09-28 18:16:14 -05:00
marauder2k7
6bec47d3fa -SoundAsset added init for enum types.
-Vehicles updated to use enum initpersistfield.
2021-09-28 23:36:04 +01:00
AzaezelX
96891e5673 early out if any asset feed route results in explicitly being told to use an emptystring 2021-09-28 17:33:36 -05:00
marauder2k7
76addc52eb Checks for emptyString in preload
Sound asset out for emptyString
2021-09-28 21:10:48 +01:00
marauder2k7
4429de59b0 okay so addArray isn't even required. 2021-09-28 14:08:27 +01:00
marauder2k7
8a1d3f2021 Working thunder. These changes may need to be applied to other sound arrays or image arrays. 2021-09-28 13:56:35 +01:00
AzaezelX
ad0c141189 use _set<assetname> for all network recipts of shapes, sounds, images and materials to ensure we at least try and fill that out whichever way is ghosted to us 2021-09-27 21:12:27 -05:00
AzaezelX
44b81ace69 don't check a profile if we don't have a sound asset 2021-09-27 20:04:58 -05:00
AzaezelX
ef652ad8b9 clean out of the manual getSFXProfile() methods 2021-09-26 20:07:49 -05:00
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
Robert MacGregor
55063601e6 * [Projectile] BugFix: Correct the onAdd callback not being raised for projectiles. 2021-09-23 22:58:25 -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
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
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
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
AzaezelX
3d488bbbf0 macro cleanup 2021-09-09 13:29:31 -05:00
Jeff Hutchinson
27a4868b6e Fix buffer corruption. 2021-09-07 21:52:36 -04: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
cd1fd1ccf4 Merge branch 'SoundAssetInitRollin' of https://github.com/Areloch/Torque3D into Preview4_0 2021-09-04 01:38:22 -05: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
25a32cba2a Merge branch 'MiscQOLFixes20210828' of https://github.com/Areloch/Torque3D into Preview4_0 2021-09-01 17:44:43 -05:00