TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-21 21:24:46 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
4926 commits 5 branches 33 tags 958 MiB
Commit graph

4926 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeff Hutchinson 485330ec7a Merge remote-tracking branch 'devhead/Preview4_0' into tsneo 2021-08-30 19:39:06 -04:00
Brian Roberts ef6efbf738
Merge pull request #554 from Azaezel/alpha40/setNULLnono 
account for the possiblity of _set##name(StringTableEntry _in entries somehow getting punted nulls
 2021-08-30 01:38:58 -05:00
Brian Roberts f6d3a30638
Merge pull request #551 from Azaezel/alpha40/decalDemangle 
DiffuseRenderPassManager.addManager "cleanups"
 2021-08-30 01:38:47 -05:00
Brian Roberts 61cb93643c
Merge pull request #552 from Azaezel/alpha40/classconvertsafety 
ensure new (foo) lines being converted are valid according to findObj…
 2021-08-30 01:38:35 -05:00
Jeff Hutchinson a2d5e475fb fix script issue. 2021-08-29 22:41:48 -04:00
Jeff Hutchinson 6e072dbf91 Merge branch 'Preview4_0_DevHead' into tsneo 2021-08-29 22:28:42 -04:00
Jeff Hutchinson aa5fc9207c
Merge pull request #2 from Ragora/tsneo-fixes 
BugFix: Corrections for script files in TSNeo
 2021-08-29 21:55:30 -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
AzaezelX 28dd431118 ensure new (foo) lines being converted are valid according to findObjectClass 2021-08-29 01:08:19 -05:00
Brian Roberts be3fd039af
Merge pull request #548 from Azaezel/alpha40/glowchanCleanups 
kill off glowchan leftovers
 2021-08-28 20:34:19 -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 68c6b343d5 DiffuseRenderPassManager.addManager "cleanups" 
adds bintypes where they're lacking, since that's an active object-type filter to avoid accidently rendering things twice. (particleBin being like glowmanager, a seperate flow, that acts up if filtered in that manner)
basiconly likewise is intended to avoid multiple-pass insertions, despite the varname.
 2021-08-28 19:27:53 -05:00
AzaezelX 2287c28d32 be clear where we're referencing gbuffer render targets 2021-08-28 17:21:45 -05:00
AzaezelX cabfeea76b nother stray 2021-08-28 16:20:58 -05:00
AzaezelX 50fb4df1f0 kill off glowchan leftovers 2021-08-28 15:54:21 -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 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
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 'c04f3ae166cf028aa005fb556906f935e52e71fb' 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