TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-02-26 18:13:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
5849 commits 5 branches 33 tags 960 MiB
Commit graph

771 commits

Author SHA1 Message Date
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
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
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
27b488f801 Merge branch 'development' of https://github.com/vvv-yeaf/Torque3D into development 2022-09-20 22:31:26 -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
Brian Roberts
3f78e90870
Merge pull request #901 from Azaezel/alpha401/smaaSlippage 
fix smaa backbuffer  colorspace
 2022-09-20 19:28:58 -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
Lukas Aldershaab
644a7d7989 Add collision meshes to prototyping primitives 2022-09-20 22:35:21 +02:00
Areloch
f93f7cce21 Properly saved edit for glsl file to remove macro define 2022-09-16 17:54:34 -05:00
Areloch
5e9d7d63a1 Adjusts handling for httpObject class so that if curl flag is off, files are not included and references are disabled to avoid compilation issues 
Adds SMAA anti aliasing
Adjusts AA option setting to properly work and facilitate SMAA
Added defaults for AA to facilitate SMAA
Updated brightness and HDR values on Example Level to comply more closely to the Editor default to give better default results
Fixed issue where ShapeEditor wasn't initialized properly when we'd open it from the Asset Browser
 2022-09-16 16:16:12 -05:00
AzaezelX
a2145bb398 fix ab CreateNewModule appending ScriptFile extension 
exec et al no longer need the extension spelled out, and it can actively get in the way
 2022-09-14 20:10:45 -05:00
vvv-yeaf
b5fb864ad6 Editor GUI Update 2022-09-13 19:55:27 -03:00
vvv-yeaf
f08d2f74f8 Merge branch 'Misc-HDR-And-Levels' of https://github.com/vvv-yeaf/Torque3D into Misc-HDR-And-Levels 
# Conflicts:
#	Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.glsl
#	Templates/BaseGame/game/core/postFX/scripts/HDR/HDR_finalPass.hlsl
 2022-09-11 18:50:54 -03:00
vvv-yeaf
1212e72d11 Updated default levels and pre-exposed ACES Tonemapper 2022-09-11 18:31:19 -03:00
vvv-yeaf
309138699b Updated default levels and pre-exposed ACES Tonemapper 2022-09-11 10:37:55 -03:00
AzaezelX
2016f5a7f9 bloom gl compile fix 2022-09-10 01:10:47 -05:00
AzaezelX
eff457b00d shift the probe file colorspace to gamma 
seems the math is mangling for the capture to irradiance and prefilter hard files. as a temporary measure till we can better dig, shifting the result via toGamma
 2022-09-08 13:40:24 -05:00
AzaezelX
e4d0122ea4 fix playerbot mounts 2022-09-07 15:13:12 -05:00
AzaezelX
d826398f2d prototyping:playerbot look fix 
need to pad the look animation out beyond 1 frame
it gets confused trying to lerp along the timeline otherwise
 2022-09-04 16:07:20 -05:00
Brian Roberts
70081f01b9
Merge pull request #880 from Areloch/FullscreenFix_and_BloomPref 
Fullscreen 'Fix' and Bloom Pref
 2022-09-04 09:05:17 -05:00
Areloch
628532d006 Temp disables fullscreen on Windows platform due to various system behavioral issues with it 
Integrates the HDR's bloom toggle into the Shader Quality setting
 2022-09-03 14:40:10 -05:00
Brian Roberts
c0853c49d2
Merge pull request #879 from lukaspj/fix/transparent-kork 
Make Kork Chan transparent by default
 2022-09-03 12:35:16 -05:00
Lukas Aldershaab
6991d5e789 Make Kork Chan transparent by default 2022-09-03 19:36:41 +02:00
Brian Roberts
9b783784b1
Update default.postfxpreset.tscript 2022-09-02 12:05:58 -05:00
Areloch
f4a6a0f7ae
Merge pull request #875 from GoldenThumbs/development_gld 
New Bloom Post Processing Effect
 2022-09-01 23:57:43 -05:00
Samuel Skiff
54ac395c1b Bloom Fix & Tweaks 2022-09-01 02:04:55 -05:00
Samuel Skiff
c8e950ccbc Merge Bloom post effect with HDR post effect 2022-09-01 00:48:16 -05:00
AzaezelX
ed200ce1ef from @oth_mars - fix borderless value lookup 2022-08-31 17:12:34 -05:00
vvv-yeaf
d9a133e66d Splash Screen Replecement 
Updated splash screen to be more eye pleasing until a better one is made!
 2022-08-30 17:51:20 -03:00
Samuel Skiff
e9be30b932 Convert Tabs to Space & Enable Glow Effect 2022-08-30 05:37:58 -05:00
Samuel Skiff
606da2e8ba Merge remote-tracking branch 'refs/remotes/upstream/development' 
Conflicts:
	Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript
 2022-08-30 05:16:25 -05:00
Samuel Skiff
76bdccd244 Bloom Tweaks 2022-08-30 05:10:26 -05:00
Samuel Skiff
02be085847 Merge remote-tracking branch 'refs/remotes/upstream/development' 
Conflicts:
	Templates/BaseGame/game/core/postFX/scripts/default.postfxpreset.tscript
 2022-08-30 02:01:29 -05:00
Samuel Skiff
af60fcb709 Bloom Tweaks (& Improvements, Thanks yeaf!) 2022-08-30 01:34:30 -05:00
Areloch
fb5ad738e0
Merge branch 'development' into MiscFixes20220829 2022-08-30 01:31:42 -05:00
Areloch
cd82186231 Fixes setter issue for image/shape/material custom inspector fields where it was not correctly passing through the changed value from the Asset Browser select 
Swapped the water's disableTrueReflections variable to be enableTrueReflections for simplicity and consistency(also fixed a persistent typo)
Swapped disableVerticalSync to be enableVerticalSync for simplicity and consistency
Swapped disableParallaxMapping to be enableParallaxMapping for simplicity and consistency
Fix click detection on slider mode entries for guiGameSettingsCtrl so the click position correctly matches the percentage
Fixed problem where postFX initialization would always exec default.postfxpreset.tscript, even if a level's got it's own preset, which can cause problems
Fixed range field type behavior so that editing the values applies in real time, and also consistently applies between slider and text field
 2022-08-30 01:29:39 -05:00
AzaezelX
4590e14a13 Merge branch 'GuiProfileSoundAssets' of https://github.com/marauder2k9-torque/Torque3D into alpha401/resolveAudioConflict 
# Conflicts:
#	Templates/BaseGame/game/data/UI/UI.tscript
#	Templates/BaseGame/game/data/UI/sounds/buttonClick.asset.taml
#	Templates/BaseGame/game/data/UI/sounds/buttonHover.asset.taml
 2022-08-29 17:47:07 -05:00
marauder2k7
5d85664b40 Change GuiProfile to use Sound Asset 
-Added SoundAssetInspector to bypass circular issue
-Added SoundAsset to GuiTypes
 2022-08-29 23:40:51 +01:00
AzaezelX
53b0f0530c soundasset sourcegroup fallback 
ensure if there's no assigned sourcegroup, we at least point at "AudioChannelMaster" so overall sound volume can have it's say
turn on button hover and click profiles by unremming the file
assign hoverasset and buttonclick assets to audioChannelGUI
todo: sort volume hooks for non-AudioChannelMaster
long term: resolve the requirement that gui profiles need direct sound profiles instead of the capacity to take assets
 2022-08-29 16:36:17 -05:00
Samuel Skiff
1f0ff8e418 Bloom Tweaks 2022-08-29 04:55:36 -05:00
Samuel Skiff
e4999a3351 Bloom GL Fix 2022-08-29 00:11:08 -05:00
Samuel Skiff
ce1a542d69 Bloom Tweaks 2022-08-28 23:31:03 -05:00
AzaezelX
eda7862f7d correct tag 2022-08-28 23:23:01 -05:00
AzaezelX
433149a0af mat3 is the other hand from matrix3x3 
also vec3 from float3 for consistency
 2022-08-28 22:58:40 -05:00