Commit graph

5766 commits

Author SHA1 Message Date
Samuel Skiff c8e950ccbc Merge Bloom post effect with HDR post effect 2022-09-01 00:48:16 -05: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
Brian Roberts 6d17991988
Merge pull request #874 from Areloch/MiscFixes20220829
Misc Fixes for 2022/08/29
2022-08-30 02:08:55 -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
Brian Roberts dbb7fbc9ac
Merge pull request #873 from Azaezel/alpha401/compilefix
leftover profile reference flaw
2022-08-29 22:23:45 -05:00
AzaezelX 73c1a902de cAps fix 2022-08-29 21:43:14 -05:00
AzaezelX 65275a8a35 leftover profile reference flaw 2022-08-29 21:18:20 -05:00
Brian Roberts 0f42caae97
Merge pull request #872 from Azaezel/alpha401/compilefix
remove leftover
2022-08-29 20:39:30 -05:00
AzaezelX b79b1ae65e remove leftover 2022-08-29 20:39:04 -05:00
Brian Roberts 4abadfeba7
Merge pull request #871 from Azaezel/alpha401/resolveAudioConflict
Alpha401/resolve audio conflict
2022-08-29 17:47:25 -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
Brian Roberts 7f598e18fc
Merge pull request #869 from Azaezel/alpha401/audioFIxes
soundasset sourcegroup fallback
2022-08-29 17:39:50 -05: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
Brian Roberts ebbf0947b3
Merge pull request #868 from marauder2k9-torque/OpenalQuickFix
Mac OpenAL 1.1
2022-08-29 14:26:32 -05:00
marauder2k7 fe47048293 Mac OpenAL 1.1
Added compatibility function to return max sources the old way.

If openal 1.2 method returns 0 it will do it the old way.
2022-08-29 20:06:29 +01:00
Brian Roberts 964183b7e5
Merge pull request #867 from marauder2k9-torque/OpenalQuickFix
OpenAL Mac
2022-08-29 13:00:27 -05:00
marauder2k7 5b1e20f28c OpenAL Mac
Cleanup print functions cos mac hates them. All these functions did was print what was capable on openal anyway end user doesn't really get any benefit from this. Will save these for the refactor.
2022-08-29 18:04:55 +01:00
Brian Roberts 282678c28d
Merge pull request #866 from Azaezel/alpha401/hdrConvert
hdr upgrade, courtesy yeaf
2022-08-29 11:04:15 -05:00
Samuel Skiff 452a54ff51 Merge branch 'development_gld' of https://github.com/GoldenThumbs/Torque3D.git 2022-08-29 04:56:25 -05:00
Samuel Skiff 1f0ff8e418 Bloom Tweaks 2022-08-29 04:55:36 -05:00
GoldenThumbs b4a0f5577c
Merge branch 'TorqueGameEngines:development' into development_gld 2022-08-29 00:11:51 -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
AzaezelX 05409537b0 eroneous convertsion leftover 2022-08-28 22:31:01 -05:00
AzaezelX 7efc7281db from yeaf - HDR revamp
gl side is wipwork
2022-08-28 22:24:23 -05:00
Brian Roberts 05a6b80224
Merge pull request #865 from Azaezel/alpha401/generalCapturefix
correct capturing flag test
2022-08-28 17:25:26 -05:00
AzaezelX 5453d53f4c correct capturing flag test 2022-08-28 17:24:59 -05:00
Brian Roberts 8da0cd07c9
Merge pull request #864 from Azaezel/alpha401/lightcapturefix
adds light fade and cap trackign to probe manager
2022-08-28 16:11:45 -05:00
AzaezelX 748f884671 adds light fade and cap trackign to probe manager
prebake removes them, postbake restores them to ap settings.
also went ahead and threw the probes::capturing val at it as well
2022-08-28 14:27:15 -05:00
GoldenThumbs 6832086ecb
Merge branch 'TorqueGameEngines:development' into development_gld 2022-08-27 20:35:13 -05:00
Brian Roberts 280fca2fbe
Merge pull request #862 from Azaezel/alpha401/metalCaptureFix
probe capture cleanups pt1
2022-08-27 17:58:15 -05:00
AzaezelX 111f0c840d probe capture cleanups pt1
fix high-metalness object capture (had the lerp the wrong direction for canceling out NULL-ibl due to full metallic)
use dStrcmp for (Con::getVariable("$Probes::Capturing", "0") comparisons. and early out on rendering probes when we are capturing, not when we aren't.
2022-08-27 17:25:35 -05:00
Brian Roberts 00638eeb3d
Merge pull request #861 from Azaezel/alpha401/badFallbackIsBad
Revert "provide a new levelinfo. fallbackAmbient value for scenes wit…
2022-08-27 15:17:14 -05:00
AzaezelX d24df92a8b Revert "provide a new levelinfo. fallbackAmbient value for scenes with no global light source"
This reverts commit 270cf0e054.
2022-08-27 15:14:09 -05:00
GoldenThumbs 666de4ab36
Merge branch 'TorqueGameEngines:development' into development_gld 2022-08-27 00:23:36 -05:00
Brian Roberts 63d8c5a699
Merge pull request #860 from Areloch/MiscFixes20220825
Misc Fixes for 2022/08/25
2022-08-26 22:09:46 -05:00
Samuel Skiff 26801dbe77 Bloom Tweaks & OpenGL Support 2022-08-26 18:05:25 -05:00
Areloch ded99cd8cb * Fixes handling for Image, Material and Shape Assets' inspector fields so they properly work with non-object targeted inspectors, such as the PostFXEditor
* Updated PostFXEditor scripts to handle refreshing properly when certainl field types(assetId fields) are changed
* Adjusted display handling of slider values on guiGameSettingsCtrl to show 0.x decimal format instead of 0.xxxxx
* Fixed pad length of item names in guiTreeView for items that are marked to avoid console spam
* Fixed local offseting for popupMenus so scaled/offset window position doesn't cause the popup menu to offset from mouse click position(courtesy OTHG_Mars)
* Fix issue with terrain where, due to default value save validation, the global scope for the terrain collision list would be whiped when saving, causing players to fall through terrain. Moved to per-terrain convexLists
* Fixed issue with the core camera model mesh and updated references so camera bookmarks display properly
* Fixed console spam during asset browser initialization where it would try and expand the directory tree even though the dir tree isn't populated yet
* Fixed handling of Open File Location RMB menu action to properly deal with script and datablock types
* Removed unusuable "Create ___" asset type prompts from the RMB menus for the AB to avoid confusion
* Improved slider offset positioning for various popup sliders on editor toolbars
* Anchored the visibility popup menu to the button for more consistent formatting and better feel
* Shifted various visibility toggles from 'in place' on the menu buttons to functions, allowing it to also properly mark the menu entries as checked or not, improving usability
2022-08-26 15:25:17 -05:00
Brian Roberts 00d67475e7
Merge pull request #859 from Azaezel/alpha401/probleblendblunder
probe blend adjustments
2022-08-25 14:47:06 -05:00
AzaezelX 743f5ec380 probe blend adjustments
adjust probe vs probe blend to further mitigate overlap artifacts while preserving probe vs skylight falloff blending
2022-08-24 13:57:43 -05:00
Samuel Skiff 963d226f43 Bloom Tweaks 2022-08-24 12:29:38 -05:00
Samuel Skiff ecf7298c68 Bloom Updates 2022-08-24 11:54:18 -05:00