TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-14 01:40:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3
5868 commits 5 branches 33 tags 977 MiB
Commit graph

5868 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Roberts
cf76fc5b88
Merge pull request #911 from Bloodknight/UpdateAssimp_5.2.5 
Update assimp 5.2.5
 2022-10-28 08:45:05 -05:00
Brian Roberts
330ea4b4cf
Merge pull request #912 from Areloch/binaryDownloadhttpObjFix 
Fixes the setting of binary file download config for httpObject
 2022-10-28 08:44:44 -05:00
Brian Roberts
112426e1f5
Merge pull request #914 from Azaezel/alpha402/fixMoarFlags 
parseArgs() followup
 2022-10-25 00:03:28 -05:00
AzaezelX
208e375336 parseArgs() followup 
links functionality up for the -guieditor and -worldeditor cli/shortcut options
 2022-10-25 00:02:51 -05:00
Areloch
e4cca8d3f0 Fixes the setting of binary file download config for httpObject 2022-10-16 11:39:56 -05:00
Bloodknight
19e284f5ab
Merge branch 'TorqueGameEngines:development' into UpdateAssimp_5.2.5 2022-10-15 08:22:16 +01:00
Brian Roberts
f92c1706c6
Merge pull request #910 from Azaezel/alpha402/GFXTextureArrayAwry 
kill console spam
 2022-10-09 15:15:34 -05:00
AzaezelX
cdf3b6cf79 kill console spam 
no point in reporting mismatched texture formats the line right before we try and convert the things and report if we couldn't
*was mostly due to excessive reports for fully compatible rgb vs rgba mixes
 2022-10-09 00:30:06 -05:00
Bloodknight
6fed06b1e7 Update Assimp default importers 2022-10-02 20:14:53 +01:00
Bloodknight
16f3710058 Update Assimp from 5.2.3 to 5.2.5 2022-10-02 19:21:41 +01:00
Brian Roberts
ea7ca63301
Merge pull request #908 from Azaezel/alpha401/dediserverfixes 
dedicated server cleanups
 2022-10-01 14:19:42 -05:00
AzaezelX
04f4a5fcf4 dedicated server nulltexturemanager work 
also supress warning for imageassets not loading a texture in nulldevice, and early out of _determineFeatures shadergen methods under the same conditions
 2022-10-01 12:44:45 -05:00
AzaezelX
02aee76fc9 Merge branch 'alpha401/dediserverfixes' of https://github.com/Azaezel/Torque3D-1 into alpha401/dediserverfixes 2022-10-01 01:41:41 -05:00
AzaezelX
4f00c48ff0 sfx bypass doe dediservers. 2022-10-01 01:41:24 -05:00
Brian Roberts
4e9e478742
Update main.tscript.in 2022-09-29 11:58:36 -05:00
Brian Roberts
85169b95f8
Merge pull request #907 from vvv-yeaf/development 
console font size slip
 2022-09-29 11:56:27 -05:00
Brian Roberts
e7e11b19c3
Merge pull request #906 from OTHGMars/monitorIdFixes 
Monitor Id fixes
 2022-09-29 11:56:13 -05:00
vvv-yeaf
4079e9fd3e Merge branch 'development' of https://github.com/vvv-yeaf/Torque3D into development 2022-09-29 09:33:07 -03:00
vvv-yeaf
db08474827 Merge branch 'development' of https://github.com/vvv-yeaf/Torque3D into development 2022-09-29 09:31:41 -03:00
vvv-yeaf
6c51440fe1 console font size oversight 2022-09-29 09:31:16 -03:00
OTHGMars
640af98807 Monitor DeviceId setting. 
The SDL_WINDOWEVENT_DISPLAY_CHANGED event reports an incorrect DeviceId when changed via command. The resolution sanity check that is applied when changing monitors is moved to the SDL_WINDOWEVENT_MOVED event where DeviceId is properly detected.
 2022-09-29 03:45:25 -04:00
OTHGMars
582751ae42 Resolution change detection. 
Makes sure that automatic resolution changes resulting from canvas mode switches are applied.
 2022-09-29 03:39:03 -04:00
AzaezelX
8343c096df need to surpess billboard generation attempts on dedicated servers 2022-09-29 02:04:51 -05:00
AzaezelX
8a71a6141f correct the %dedicated var in function parseArgs() 
-it's supposed to be a global like the rest.
also by request, added a help.txt file dump to the -help cli arg
 2022-09-29 00:51:44 -05:00
Brian Roberts
8993052a14
Merge pull request #905 from Azaezel/version4.0.1 
lock in version point
 2022-09-28 18:15:48 -05:00
AzaezelX
0e8e93f1e5 lock in version point 2022-09-28 18:13:59 -05:00
Brian Roberts
aef26bda3e
Merge pull request #904 from Azaezel/glParity 
conform gl to dx
 2022-09-22 13:05:09 -05:00
AzaezelX
f419227d30 conform gl to dx 2022-09-22 13:04:42 -05:00
Brian Roberts
8895dc6549
Merge pull request #903 from vvv-yeaf/development 
Fix for Linear Tonemapper color space
 2022-09-22 12:58:30 -05:00
vvv-yeaf
5fedd9b857 Fix for Linear Tonemapper color space 2022-09-22 14:26:28 -03:00
Brian Roberts
21479e80e5
Merge pull request #902 from vvv-yeaf/development 
Editor GUI Update pt.2
 2022-09-20 20:48:17 -05:00
vvv-yeaf
b9ed4b3d04 Merge branch 'development' of https://github.com/vvv-yeaf/Torque3D into development 2022-09-20 22:31:37 -03:00
vvv-yeaf
27b488f801 Merge branch 'development' of https://github.com/vvv-yeaf/Torque3D into development 2022-09-20 22:31:26 -03:00
vvv-yeaf
049028480f Merge branch 'development' of https://github.com/vvv-yeaf/Torque3D into development 2022-09-20 22:00:39 -03:00
vvv-yeaf
3d41ac7d79 Editor GUI Update PT.2 
- Console color scheme + increased font size
- Changed bar extend
- fixed highlights
 2022-09-20 21:59:05 -03:00
AzaezelX
be0f3097d6 $platform $= "macos" is used throughout the codebase 2022-09-20 19:58:02 -05:00
Brian Roberts
3f78e90870
Merge pull request #901 from Azaezel/alpha401/smaaSlippage 
fix smaa backbuffer  colorspace
 2022-09-20 19:28:58 -05:00
Brian Roberts
2eda1b1129
Merge pull request #900 from Azaezel/alpha401/lightStateblockReview 
ligh shader final review
 2022-09-20 19:17:45 -05:00
AzaezelX
b54a03d388 fix smaa backbuffer colorspace 
as we do not at time of writing have a specifier for what colorspace to load a backbuffer in, we leverage the old toGamma and toLinear macros to upshift the backbuffer for lumina edge detection via a clone
 2022-09-20 19:12:21 -05:00
AzaezelX
752f94b11e ligh shader final review 
1) prunes extraneous garbage variables from GFXStateBlockData
2) re-orgs texture slots for lights as follows to better support stateblock slots:
0-norm|depth buffer
1- shadowmap
2-taprotationtex
3-colorbuffer
4-maitinfobuffer
5-cookiemap (AL_ConvexLightState only)
 2022-09-20 17:01:42 -05:00
Brian Roberts
72230e2124
Merge pull request #899 from Azaezel/alpha401/fixFileRef 
correct constructorfile reference
 2022-09-20 16:08:47 -05:00
AzaezelX
6ce2d4cd9e helps to report which asse... 2022-09-20 16:08:36 -05:00
AzaezelX
91d843b8bd correct constructorfile reference 2022-09-20 15:39:42 -05:00
Brian Roberts
af35853f46
Merge pull request #898 from lukaspj/feature/proto-primitives-col-meshes 
Add collision meshes to prototyping primitives
 2022-09-20 15:36:23 -05:00
Lukas Aldershaab
644a7d7989 Add collision meshes to prototyping primitives 2022-09-20 22:35:21 +02:00
Brian Roberts
0137778641
Merge pull request #897 from Azaezel/alpha401/glTypofix 
add debug reportingfor cubemap arrays, and correct transcription flaw
 2022-09-18 07:31:12 -05:00
AzaezelX
aafbb7bfba add debug reportingfor cubemap arrays, and correct transcription flaw 2022-09-18 07:30:47 -05:00
Brian Roberts
ada1e83de2
Merge pull request #896 from Azaezel/alpha401/setTextureTweak 
aug GFXTextureArray::setTexture to report what texture sizes are mism…
 2022-09-18 05:36:31 -05:00
AzaezelX
62a99adb74 aug GFXTextureArray::setTexture to report what texture sizes are mismatching 2022-09-18 05:36:11 -05:00
Brian Roberts
391b656e2c
Merge pull request #894 from Areloch/SMAA_and_Misc20220916 
Implements SMAA and a few unaffiliated fixes
 2022-09-16 23:11:39 -05:00