Commit graph

173 commits

Author SHA1 Message Date
Areloch
ce4c8dabc9 Ongoing wipwork of the BaseUI update. Some bugfixes pending 2023-12-16 23:18:33 -06:00
Areloch
616d974212 Wipwork for updating the BaseUI
Adds ability to select an actionmap for a GuiInputCtrl which will push it onto the stack, so menus can enact an action map
Update of the MainMenuGUI to fit new style and have the logic needed for KBM and gamepad navigation
Very early wipwork of OptionsMenu overhaul for new standard
2023-12-06 19:50:51 -06:00
Areloch
d867c1f7d0 - Adds Color Calibration card and Material Grid for reference resources to prototyping module
- Adds arrow primitive shape to prototyping module
2023-11-28 18:54:50 -06:00
Areloch
2a390e98e9 Fixes the issue of changing audio settings causing the SFX re-init'ing to fail 2023-09-10 18:47:27 -05:00
Areloch
37c85bb7ee From Nils' UI work
- Updates various images in core and UI to be more standardized to the default theme
- Updates some spacing, sizing and coloration of gui controls and profiles
2023-09-05 00:05:32 -05:00
AzaezelX
a0f2f2bf06 define particles then emitters
saves a re-execution attempt
2023-07-20 08:54:52 -05:00
AzaezelX
5e6a95866a localization utiity methods
to better adress https://github.com/TorqueGameEngines/Torque3D/issues/1036
2023-06-22 17:52:32 -05:00
Areloch
bd07ce4f2a Adds a Prototyping datablock for a pick-up able item 2023-03-18 14:56:47 -05:00
Brian Roberts
a51bccf222
Merge pull request #973 from AtomicWalrus/KeyBindingScriptFixes
Key rebinding script fixes
2023-02-26 14:27:43 -06:00
Areloch
33ac4a0864 Corrects the dirt lens image reference from filepath to assetId to not have overhead having to look up the asset each frame when setting the postFX 2023-02-26 12:58:50 -06:00
AtomicWalrus
732d76d17c Key rebinding script fixes
Fixes two issues:
-Bindings after the first page were not pointing to the correct remapping entries when actually remapping. Were populating the name and button image correctly, but first item on every page pointed to first item on first page.
-Keybinds were never being saved to file if your action maps all had long-form ("human readable") names defined.
2023-02-25 03:14:30 -07:00
Brian Roberts
7d02eea6e4
Merge pull request #938 from Areloch/OptionsAndRemappingFixes
Misc fixes for options and key remapping
2022-12-16 01:26:12 -06:00
Areloch
f2585fea4d Fixes handling of click/activation events on keybind options ctrls so clicking on it at all activates it, instead of needing to click on the button image specifically
Adjust the scaling of the options rows to be a consistent 50/50 divide between the options name and the actual options values to make the layout and scaling consistent
Fixes key remapping behavior to work properly
Added SubHeader text gui profile that is centered
Made the remapping gui control be stylistically consistent to messageboxes
2022-12-16 00:35:16 -06:00
AzaezelX
1eb59e77e8 bloom operates off of color>1.0. adjust defaults to suit 2022-12-08 18:36:58 -06:00
Areloch
44c894d335 Adds utility function to clean up and standardize the remapping handling for keybinds
Adds sanity check so if no remappable binds are found for an actionMap, it isn't listed in the controls menu
Updates ExampleModule's keybinds to use new utility function
2022-12-06 00:16:13 -06:00
Areloch
48680558c7 Fixes the movemap toggle in the options menu 2022-12-03 00:57:03 -06:00
AzaezelX
208e375336 parseArgs() followup
links functionality up for the -guieditor and -worldeditor cli/shortcut options
2022-10-25 00:02:51 -05: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
Lukas Aldershaab
644a7d7989 Add collision meshes to prototyping primitives 2022-09-20 22:35:21 +02: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
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
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
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
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
Brian Roberts
e8037a1c7b
Merge pull request #855 from Areloch/OptionsIssuesFix
Fixes behavior of various options menu settings to work as expected
2022-08-17 08:29:48 -05:00
Areloch
ee1e07e757 Fixes behavior of various options menu settings to work as expected 2022-08-16 23:25:01 -05:00
Brian Roberts
3006265175
Merge pull request #849 from Azaezel/alpha401/mainMenuAugs
tool trickerey
2022-08-15 22:43:03 -05:00
Areloch
7bd09dcd7c Fixes ordering of controls on PauseMenu gui so the input handler doesn't eat mouse inputs 2022-08-15 19:23:40 -05:00
AzaezelX
8f1b98a4d6 tool trickerey
label the editor buttons with thier respective hotkeys, and hide them if the ToolsModule doesn't exist
2022-08-15 19:09:25 -05:00
JeffR
6d2bfa0368 Adds animations for Playerbot
Fixes PauseMenu navigation behavior and confirms the menu buttons and page nav to standard
Fixes PauseMenu and OptionMenu menu buttons that were not being set correctly on wake
Fixes logic in the shape editor where it wouldn't add new sequences if you were working off a non-assetId sequence in the sequence list(such as ambient)
2022-06-21 00:25:03 -05:00
JeffR
67d8448915 Fixes cleanup handling on guiBitmapButtonCtrl and guiGameSettingsCtrl to release the bound textures like other GUI controls when they sleep, avoiding a texture object leak.
Fixes a call for UINavigation to getPageCount that was erroneously referencing the pageStack
Fixes fetch and binding of the image for display when using the uvEditor
2022-06-09 16:29:32 -05:00
JeffR
f4ca9c5202 Adds sanity check on UINavigation to avoid crashes if there are no pages in the stack.
Removes button to fill import terrain images temporarily to contend with limitations in asset creation workflow
Adds sanity check to saving terrain material that obligates setting of diffuse and detail maps so everything displays and blends properly
2022-06-05 15:35:20 -05:00
JeffR
1acf4b2dae Adjusts engine cleanup ordering on shaderFeatureMgr to avoid periodic crashes on Mac ARM machines
Adds missing disconnect/timeout handling callbacks to the clientServer core module
Adds page refresh function to UINavigation to be able to selectively nudge the current page to refresh its contents if needbe
2022-06-05 01:21:38 -05:00
JeffR
c7763fe3ec Added cleanup of exec stack for module when it's finished to avoid duplicate executions
Added proper container bracketing for the main menu buttons and made that the main navigation target
Added logic to UINav to prevent needlessly re-setting the root page if it already is the root page, which would break the navigation stack
Added logic to UINav toprevent needlessly adding duplicate pages whicn would break the navigation stack
Added logic to close the chooseLevelDlg page when the level is loaded to avoid the page being left hanging on the nav stack
Fixed assetId for no preview image fallback on the chooseLevelDlg page
Fixed display of icons in the shape editor shape helper section
Fixed name lookup on terrain material editor dialogue which would break saving of terrain materials
Disables TORQUE_SFX_DirectX which is currently not in use and nonfunctional
2022-06-02 20:17:23 -05:00
Brian Roberts
d9361a0128
Merge pull request #799 from Areloch/MiscFixes20220530
Misc Fixes for 2022/05/30
2022-05-31 14:33:59 -05:00
JeffR
d56a05c314 Trim unneeded input commands 2022-05-31 01:12:02 -05:00
JeffR
27b20c14d7 Cleans up the ExampleModule to have up-to-date examples of module init'ing, game modes, levels and basic input logic
Cleans up prototyping module to trim unneeded extra scripts and files
Adds PlayerBot model to Prototyping module
Adds metalGray material to Prototyping module
Fixes issue where logic wasn't changed for forcing AB preview images to regenerate
Removes unneeded legacy lines from editor template level
Removes unneeded extra asset import config
Disables terrain material name field from editing in terrain material editor for now to prevent bad behavior
Adds mapTo line to newly created material asset definitions to ensure shapes doing mapTo lookups can properly utilize the materials
2022-05-31 00:26:20 -05:00
dottools
8267c13696 BaseGame Template: Fix script assert on canceling game options changes 2022-05-30 15:54:32 -05:00
Brian Roberts
516163fd5d
Merge pull request #781 from Areloch/MiscFixes20220510
Misc Fixes for 2022/05/10
2022-05-11 01:15:07 -05:00