Commit graph

3266 commits

Author SHA1 Message Date
Jeff Hutchinson 485330ec7a Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 2021-08-30 19:39:06 -04:00
Jeff Hutchinson 6e072dbf91 Merge branch 'Preview4_0_DevHead' into tsneo 2021-08-29 22:28:42 -04:00
AzaezelX ee3ef531e2 ironically, overly paranoid checks were tripping warnings 2021-08-29 18:32:44 -05:00
AzaezelX bdf6bd5c69 account for the possiblity of _set##name(StringTableEntry _in entries somehow getting punted nulls 2021-08-29 17:41:20 -05:00
Jeff Hutchinson 0287f7717b
Merge pull request #553 from Azaezel/alpha40/nodelistnonull
sanity check nodelist presence
2021-08-29 17:49:22 -04:00
AzaezelX ad05a78946 sanity check nodelist presence 2021-08-29 01:11:29 -05:00
Brian Roberts fdcb4c033c
Merge pull request #549 from Azaezel/alpha40/shadergenCleanups
be clear where we're referencing gbuffer render targets
2021-08-28 20:34:10 -05:00
AzaezelX 2287c28d32 be clear where we're referencing gbuffer render targets 2021-08-28 17:21:45 -05:00
Brian Roberts 458eac8474
Merge pull request #544 from JeffProgrammer/mac-font-stuff
[PLEASE TEST BEFORE MERGE] Mac font stuff
2021-08-27 14:29:48 -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
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
Jeff Hutchinson 8ebde0e916 Merge branch 'Preview4_0_Devhead' into mac-font-stuff 2021-08-21 21:12:02 -04: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
Jeff Hutchinson eac0af2644 Merge commit 'c04f3ae166cf028aa005fb556906f935e52e71fb' into mac-font-stuff 2021-08-21 20:14:18 -04: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
Jeff Hutchinson 1b54162580 cleanup todos 2021-08-19 22:25:11 -04:00
Jeff Hutchinson 59312d7d52 debugger support 2021-08-19 22:05:43 -04:00
Jeff Hutchinson 98a2fa0f33 Fix bugs with internalName accessor 2021-08-17 20:52:59 -04:00
Jeff Hutchinson 838395840d script fixes from latest merge and more tests 2021-08-17 20:04:45 -04: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
Jeff Hutchinson ada1c5a021 Merge branch 'Preview4_0_DevHead' into tsneo 2021-08-16 22:50:02 -04:00
Jeff Hutchinson 6ec40e86da Fix bugs with certain properties (and .x .y .z accessors) and add tests. 2021-08-16 22:02:24 -04: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
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
Jeff Hutchinson a449fadde2 hacks to make thedebugger work again. 2021-08-14 01:37:01 -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
Jeff Hutchinson 717c7acca9 Merge remote-tracking branch 'devhead/Preview4_0' into tsneo
# Conflicts:
#	Templates/BaseGame/game/data/ui/guis/loadingGui.gui
#	Templates/BaseGame/game/data/ui/guis/mainMenu.gui
#	Templates/BaseGame/game/tools/MainEditor/guis/MainEditorWindow.gui
#	Templates/BaseGame/game/tools/assetBrowser/guis/assetPreviewButtonsTemplate.gui
#	Templates/BaseGame/game/tools/forestEditor/brushes.tscript
2021-08-13 20:14:39 -04:00
AzaezelX 431fb05b6f get the splash screen on linux to stop corrupting the main window 2021-08-12 18:13:33 -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
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
AzaezelX 76386f433c fix eronous extra glue code in macro, fix slash direction in include 2021-08-09 22:08:55 -05:00
AzaezelX 594c4f65c7 bad constructor usage! bad! GCC no like! 2021-08-09 21:34:24 -05:00
AzaezelX a944b6435c give useful data when not finding a given shader var 2021-08-09 20:19:16 -05:00
Areloch 0dddeeb6dd Corrects preload logic for projectiles to only fail if shape is specified, but failed to load
Corrects logic in Project Importer for if cubemapData is defined in material scripts, it can process them correctly.
2021-08-09 18:55:05 -05:00