TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-03 20:40:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
6156 commits 5 branches 33 tags 960 MiB
Commit graph

6156 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jeff Hutchinson
8ebde0e916 Merge branch 'Preview4_0_Devhead' into mac-font-stuff 2021-08-21 21:12:02 -04: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
Jeff Hutchinson
eac0af2644 Merge commit 'c04f3ae166' into mac-font-stuff 2021-08-21 20:14:18 -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
Robert MacGregor
452ef71274 * BugFix: Correct $i and %i interchangeably being used in parseArgs.tscript. 2021-08-20 20:38:24 -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
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
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
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
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
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
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
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
Jeff Hutchinson
60e05df624
Merge pull request #1 from Ragora/tsneo 
BugFix: Linux compilation for TSNeo
 2021-08-10 23:32:11 -04:00