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

5907 commits

This branch
This branch
All branches
Author SHA1 Message Date
AzaezelX 1eb59e77e8 bloom operates off of color>1.0. adjust defaults to suit 2022-12-08 18:36:58 -06:00
Brian Roberts fc1bbabe46
Merge pull request #931 from Areloch/KeybindRemapCleanup 
Cleanup and standardization of keybind remapping handling
 2022-12-06 00:25:24 -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
Brian Roberts a304198abb
Merge pull request #930 from Azaezel/alpha402/fixORMChanMap 
fix orm vs single channel mapping
 2022-12-03 08:55:43 -06:00
AzaezelX 4c50270e25 fix orm vs single channel mapping 2022-12-03 08:54:30 -06:00
Brian Roberts 178163dba3
Merge pull request #928 from LakoMoor/patch-1 
Fix for build
 2022-12-03 07:36:33 -06:00
Brian Roberts d191b4488c
Merge pull request #929 from Areloch/keybindRemapUIFix 
Fixes the movemap toggle in the options menu
 2022-12-03 04:17:10 -06:00
Areloch 48680558c7 Fixes the movemap toggle in the options menu 2022-12-03 00:57:03 -06:00
LakoMoor 0780cac6c8
Fix for build 
Fix error: "getStringValue: is not a member of ConsoleValue"
 2022-12-02 11:58:45 +06:00
Brian Roberts 120691abee
Merge pull request #923 from Azaezel/alpha402/puppies 
adds wetness
 2022-11-29 12:33:21 -06:00
Brian Roberts 411572d204
Merge pull request #927 from Azaezel/alpah402/lurkingLerps 
use the templated mLerp
 2022-11-29 12:33:12 -06:00
Brian Roberts a56a7312b3
Merge pull request #925 from Azaezel/alpha402/bloomHack 
bloom fix fallback
 2022-11-29 12:32:44 -06:00
AzaezelX 9f9049e6bd use the templated mLerp 
turns out a) it exists, and b) it uses the standard input order, so shoud be easier for new folks to remember
 2022-11-28 22:12:25 -06:00
Jeff Hutchinson 82b5084875
Merge pull request #924 from JeffProgrammer/cpp20 
Compilation fixes for C++20
 2022-11-28 22:32:04 -05:00
Jeff Hutchinson 1940becb2d Compilation fixes for C++20 2022-11-28 21:39:06 -05:00
Brian Roberts d021c5ddfa
Merge pull request #926 from Azaezel/alpha402/soundSafety 
if we have no description, the sounds is never 3d
 2022-11-28 00:10:51 -06:00
AzaezelX ab98909f1e if we have no description, the sounds is never 3d 2022-11-28 00:10:32 -06:00
AzaezelX af1a93f2e1 bloom fix fallback 
-in case a better solution doesn't come along by tuesday
 2022-11-27 23:01:36 -06:00
AzaezelX d23ee397e6 adds wetness 
cliffsnotes:
   $Core::WetnessTexture = "core/rendering/images/wetMap.png"; //for the influence degree map
probes/skylight have a new canDamp boolean, set to off for probes, on for skylight by default.
:levelinfo has a dampness multiplier (0-1)
kicked up numTextures from 8 to 16 for shaderdata and postfx since that hit the 8 texture-in prior limit, and we've already adopted apis that can handle the higher count
 2022-11-21 21:12:23 -06:00
Brian Roberts e16351605b
Merge pull request #922 from Areloch/LinuxCLIFixTwo 
Properly appending the apt commands in the yml
 2022-11-18 00:35:09 -06:00
Areloch c597ae079f Properly appending the apt commands in the yml 2022-11-18 00:31:27 -06:00
Brian Roberts d40351414f
Merge pull request #920 from Azaezel/alpha402/ramblinRoad 
add MeshRoadEditorGui::onRoadCreation callback
 2022-11-17 13:48:00 -06:00
Brian Roberts aa7fc26c39
Merge pull request #921 from Azaezel/alpha402/asAboveSoBelow 
assign default skybox and groundplane values on creation
 2022-11-17 13:47:50 -06:00
AzaezelX d92bc693d3 assign default skybox and groundplane values on creation 2022-11-14 22:06:19 -06:00
AzaezelX 15d5aafadb add MeshRoadEditorGui::onRoadCreation callback 
use it, and the RoadEditorGui::onRoadCreation one to assign default road matrials on initial creation
 2022-11-14 21:30:13 -06:00
Brian Roberts f0206120dc
Merge pull request #919 from Azaezel/alpha402/HDR_Fix 
from @GoldenThumbs: HDR editor bloom fix
 2022-11-10 01:56:02 -06:00
Brian Roberts 85a37b6c7a
Merge pull request #918 from Azaezel/alpha402/stopStringSpam 
supress Mapping string spam unless net debugging
 2022-11-08 15:08:05 -06:00
AzaezelX 22f9d54c0b from @GoldenThumbs: HDR editor bloom fix 2022-11-08 10:29:48 -06:00
AzaezelX be108d8e48 supress Mapping string spam unless net debugging 2022-11-06 15:32:22 -06:00
Brian Roberts 97eaab3f49
Merge pull request #917 from Azaezel/alpha402/terrainBlendCleanups 
cleanups for terrain blending
 2022-11-05 03:08:02 -05:00
AzaezelX 1dd8149074 cleanups for terrain blending 2022-11-03 10:07:27 -05:00
Brian Roberts c2e2ed98ff
Merge pull request #916 from Areloch/CICDLinuxAptGetUpdate 
Tweak to the linux platform CICD testing
 2022-11-02 10:25:34 -05:00
Areloch 83064efbf8 Tweak to the linux platform CICD testing to force it to run apt-get update before installing additional packages, which in theory will reduce the incidence rate of failing to spool up. 2022-11-01 12:11:45 -05:00
Brian Roberts 84f1e673fc
Merge pull request #915 from Azaezel/alpha402/sortSorting 
correct the moduleDependencySort callback
 2022-10-31 19:10:58 -05:00
AzaezelX ac1cbe8198 set default (true) case for findModules 2022-10-30 14:10:36 -05:00
AzaezelX 9f5824ca3e use default (rue) case for findModules in callonmodules 2022-10-30 14:07:33 -05:00
AzaezelX ebcee97d5c leverage the pre-existing vector<foo>.sort(&method) hooks for better self containment. also sort by dependency count, and above all else, skip sorting entirely if we've already populated mModulesLoaded since that already takes dependencies into account when generating the vector 
also defualt to using that one for the general findmodules case
 2022-10-30 14:02:30 -05:00
AzaezelX b48d462fbe debug option for checking module order 2022-10-29 12:11:54 -05:00
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
AzaezelX b168617034 correct the moduleDependencySort callback 2022-10-27 18:14:30 -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