Commit graph

4867 commits

Author SHA1 Message Date
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
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
Brian Roberts
0a150e342f
Merge pull request #545 from Areloch/AssetFileCaseSensitivityFix
Enforces filename string case sensitivity for assets' internal filenames
2021-08-23 19:22:22 -05:00
Brian Roberts
5ac2b30162
Merge pull request #542 from Azaezel/alpha40/tooltipWip
tooltip work
2021-08-23 19:22:14 -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
Areloch
cfe122f714 Enforces filename string case sensitivity for assets' internal filenames, which avoids the stringtable messing with the case preventing file name case sensitivity issues. 2021-08-21 23:12:37 -05:00
Brian Roberts
db1e868cda
Merge pull request #543 from JeffProgrammer/macfixes
MacOS fixes
2021-08-21 19:50:02 -05:00
Jeff Hutchinson
37dc8626f5 MacOS fixes
This fixes an issue where Con::getVariable can't be used in the global scope before the console system is initialized. I'm honestly surprised this error didn't happen on any other platform.
2021-08-21 20:48:26 -04:00
AzaezelX
3c79aace74 tooltip work 2021-08-21 17:13:57 -05:00
Brian Roberts
c04f3ae166
Merge pull request #533 from Ragora/bugfix-linux-release-builds
Bugfix linux release builds for Clang
2021-08-20 21:55:16 -05:00
Robert MacGregor
3ecdf292d7 * Adjustment: Remove some unnecessary ifdef logic in UUID headers. 2021-08-20 22:53:45 -04:00
Brian Roberts
1dafb3463e
Merge pull request #540 from Areloch/ParticleEmitterButtonImageFix
Fixes new emitter button bitmap to proper fieldname
2021-08-18 12:16:08 -05:00
Areloch
19ba408354 Fixes new emitter button bitmap to proper fieldname 2021-08-18 00:48:30 -05:00
Brian Roberts
773a90f1ed
Merge pull request #539 from Azaezel/alpha40/perturbedPrefabs
crash fixes
2021-08-18 00:12:04 -05:00
AzaezelX
69abcb862c assetbase crashes: test (most) cases for mpAssetDefinition existing before returning values. return empty if it doesn't. 2021-08-17 15:32:05 -05:00
AzaezelX
0bf97ad2c8 decal safeties via if (mMaterialAsset.notNull() && mMaterialAsset->getStatus() == MaterialAsset::Ok) 2021-08-17 15:27:23 -05:00
AzaezelX
68fee78744 prefab safeties 2021-08-17 14:41:09 -05: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
Brian Roberts
2e68f56b59
Merge pull request #534 from Areloch/ImporterSanitizing
Importer sanitizing
2021-08-15 14:05:07 -05:00
Areloch
8ae8eeb2f9 Merge branch 'Preview4_0' of https://github.com/TorqueGameEngines/Torque3D into Preview4_0 2021-08-15 03:07:51 -05: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
Robert MacGregor
3f34c9020e * [ParticleEmitter] BugFix: Make GCC happy by removing the inline specification on updateKeyData. 2021-08-14 18:22:30 -04:00
Robert MacGregor
eca3fbfa67 * [UUID] BugFix: Correct a memory mismanagement error in UUID programming due to the way xuuid_t is utilized. 2021-08-14 17:44:17 -04:00
Brian Roberts
aeb3626256
Merge pull request #532 from Ragora/bugfix-openal-loading
Linux BugFix: OpenAL Loading
2021-08-14 14:42:10 -05:00
Robert MacGregor
b84c959c36 * [OpenAL, Linux] BugFix: Change the OpenAL library loaded on Linux systems to allow it to work without development packages installed for some Linux distros.
* [OpenAL, Linux] Adjustment: Change the dlopen loading procedure for OpenAL to not perform lazy binding of symbols.
2021-08-14 14:40:20 -04:00
Robert MacGregor
3c61538811 Merge remote-tracking branch 'main/Preview4_0' into Preview4_0 2021-08-14 14:36:49 -04: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
Brian Roberts
0be2086e0f
Merge pull request #529 from Azaezel/alpha40/splashscreenNixFix
get the splash screen on linux to stop corrupting the main window
2021-08-13 22:20:48 -05:00
Brian Roberts
f43619b994
Merge pull request #530 from Ragora/bugfix-material-editor-pathing
* [Material Editor] BugFix: Correct case sensitivity errors on the model previews when running on case sensitive systems (Ie. Linux).
2021-08-13 20:20:43 -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
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
431fb05b6f get the splash screen on linux to stop corrupting the main window 2021-08-12 18:13:33 -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
Brian Roberts
9dd9e9fae5
Merge pull request #522 from Azaezel/alpha40/stringstringShenanigans
bad constructor usage! bad! GCC no like!
2021-08-10 22:31:21 -05:00
Brian Roberts
86a8fb5854
Merge pull request #523 from Azaezel/alpha40/windowWonk
report if SDL_CreateWindow is unable to create a window at all
2021-08-10 22:29:05 -05:00
Brian Roberts
d843a3247a
Merge pull request #521 from Azaezel/alpha40/uniformReportRetort
give useful data when not finding a given shader var
2021-08-10 16:46:31 -05:00
AzaezelX
a2ecbe53dd gcc seems to have an issue converting nullptr to Resource<TSShape>, so this will at least get it compiling 2021-08-10 03:13:46 -05:00
AzaezelX
c7b44203ad sanity check 2021-08-10 03:11:52 -05:00
AzaezelX
fc9d767256 report if SDL_CreateWindow is unable to create a window at all 2021-08-09 23:48:01 -05:00
AzaezelX
0285e073b9 wrap all the things! 2021-08-09 22:40:41 -05:00
AzaezelX
cd6e027d1f nother specifier wrapper 2021-08-09 22:31:58 -05:00
AzaezelX
20e4f3c120 wrap to remove ambiguity 2021-08-09 22:24:20 -05:00
AzaezelX
1037b5d718 extraneous entry 2021-08-09 22:24:03 -05:00