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
5842 commits 5 branches 33 tags 958 MiB
Commit graph

5842 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brian Roberts e708ae53d2
Merge pull request #823 from Azaezel/alpha40/tamltypos 
fix a pair of taml typos
 2022-06-24 16:23:44 -05:00
AzaezelX 0b1da8c5ca fix a pair of taml typos 2022-06-22 19:10:36 -05:00
Brian Roberts 7d9d21de04
Merge pull request #822 from Ragora/bugfix-console-background 
BugFix: Correct a missing asset for filling the background of the console
 2022-06-21 22:46:12 -05:00
Robert MacGregor 7e896425f6 * BugFix: Correct a missing asset for filling the background of the bottom of the console. 2022-06-21 23:28:38 -04:00
Brian Roberts a08543d5dd
Merge pull request #821 from Areloch/MiscFixes20220620 
Misc Fixes 2022/06/20
 2022-06-21 00:57:12 -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
Brian Roberts c8ef1c5c85
Merge pull request #820 from Azaezel/alpha40/shapeErrcodes 
fix shape errorcodes
 2022-06-16 22:37:51 -05:00
AzaezelX f0b218f1e2 fix shape errorcodes 
corrects out of bounds flaw
 2022-06-16 22:07:45 -05:00
Brian Roberts b753c9d91c
Merge pull request #713 from Ragora/feature-vfs-security 
Feature: VFS Security
 2022-06-16 21:23:49 -05:00
Brian Roberts 41f5350173
Merge pull request #815 from Azaezel/alpha40/TORQUE_TOOLS 
fix TORQUE_TOOLS = off compilation
 2022-06-16 21:23:38 -05:00
Robert MacGregor 35b348f93c * Adjustment: Change Platform::makeFullPathName to use "game:/" as cwd if none is specified. 2022-06-16 19:04:43 -04:00
Robert MacGregor 2a865d387a * BugFix: When loading sound assets, don't resolve the absolute path. 2022-06-16 18:46:25 -04:00
Robert MacGregor 2b8f9e3999 Merge https://github.com/TorqueGameEngines/Torque3D into feature-vfs-security 2022-06-15 18:12:39 -04:00
Brian Roberts 2a52d7db1e
Merge pull request #819 from Azaezel/alpha40/rangefix2 
you want the higher number, not the lower
 2022-06-15 16:47:19 -05:00
AzaezelX a808990bc6 you want the higher number, not the lower 2022-06-15 16:46:54 -05:00
Brian Roberts 003ba9f059
Merge pull request #818 from Azaezel/alpha40/fixForward 
fix computeForwardProbes shadergen gl side
 2022-06-14 23:18:15 -05:00
AzaezelX 691eb5f2ba fix computeForwardProbes shadergen gl side 2022-06-14 22:40:40 -05:00
Brian Roberts fedee8d2a0
Merge pull request #817 from Azaezel/alpha40/arrayObjectOutOfBoundFix2 
fix out of bounds reference in arrayobject
 2022-06-13 21:38:07 -05:00
AzaezelX c91002d5ec fix out of bounds reference in arrayobject 2022-06-13 21:10:28 -05:00
Brian Roberts 5fb227a1e7
Merge pull request #813 from Areloch/MiscConvexToolFixes 
Fix Misc ConvexShape Tooling Issues
 2022-06-13 16:32:04 -05:00
AzaezelX 4a7104e5ea fix TORQUE_TOOLS = off compilation 2022-06-13 12:38:08 -05:00
Robert MacGregor bd3a990140 * BugFix: Correct the 'gotoWebPage' function not using the VFS. 2022-06-13 12:21:06 -04:00
Robert MacGregor 0a45fac224 * BugFix: Switch a few raw platform calls in reflectionProbe.cpp to the VFS. 2022-06-13 12:02:58 -04:00
Robert MacGregor 1cd2b3ead9 * BugFix: Correct a small typo in the script function 'compareFileTimes'. 2022-06-13 11:45:05 -04:00
Robert MacGregor a390e0d8d5 * BugFix: Correct script function 'compareFileTimes' not going through the VFS when making the comparisons. 2022-06-13 11:43:43 -04:00
Robert MacGregor 3dafdef5da * BugFix: Mount home:/ to refer to Torque's original Documents/<APPNAME> output for eg. prefs while leaving data:/ as an option for those that may want it. 2022-06-13 10:53:01 -04:00
Robert MacGregor 59cf242a7a * BugFix: Fix the data:/ VFS not being mounted if the root directory didn't already exist. 2022-06-13 10:32:39 -04:00
Robert MacGregor 93a4f8780c * BugFix: Correct simple incorrect references after changing Platform::isFile to Torque::FS::isFile in the asset importer. 2022-06-13 08:20:46 -04:00
Robert MacGregor ba07e6c6d7 * Cleanup: Remove the partial editor tools integration from the TORQUE_SECURE_VFS implementation in preference for developers building mod tools builds instead. 2022-06-13 08:08:43 -04:00
Robert MacGregor 161ffc62fe Merge branch 'Preview4_0' into feature-vfs-security 2022-06-13 08:05:26 -04:00
Brian Roberts 9836f6eb30
Merge pull request #814 from Azaezel/alpha40/vectorlightvisfix 
fix vectorlight visualizer varnames
 2022-06-12 15:24:16 -05:00
AzaezelX e60927f2f7 opengl does *not* like casting floats to vec#s as a general rule. 2022-06-12 15:08:00 -05:00
AzaezelX 01ba199dc7 fix vectorlight visualizer varnames 2022-06-12 14:43:26 -05:00
JeffR 7cdace8da3 Fixes bounds scaling issue making the object box in the editor be double the convex's size 
Fixes loading of modified surfaceTextures by properly inserting into stringtable
Fixes display of the active and default material previews in the ConvexShape editor
Adds buttons to hollow and recenter selected convex to tool window
 2022-06-12 04:27:32 -05:00
Brian Roberts 607f62bf03
Merge pull request #812 from Ragora/str_cpp_memory_experiment 
BugFix: Remove the GCC Workaround
 2022-06-09 22:49:59 -05:00
Robert MacGregor 4ef3f89280 * BugFix: Correct a minor post-merge typo. 2022-06-09 23:10:13 -04:00
Robert MacGregor 1e9aa8b86f Merge branch 'Preview4_0' into str_cpp_memory_experiment 2022-06-09 22:49:43 -04:00
Robert MacGregor 704113577b * Cleanup: Remove leftover comments from str.cpp. 2022-06-09 19:30:25 -04:00
Robert MacGregor 6d0e81763b * BugFix: Correct not setting the string to interned when allocating a StringData with a DataChunker in str.cpp. 2022-06-09 19:26:39 -04:00
Brian Roberts 3e709328a9
Merge pull request #811 from Areloch/MiscFixes20220609 
Misc Fixes 2022/06/09
 2022-06-09 17:29:55 -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
Robert MacGregor 2cdfe70e50 * Experiment: Change the way StringData is allocated in the code, experimentally. 2022-06-08 11:27:16 -04:00
Brian Roberts 53aea82614
Merge pull request #809 from Azaezel/alpha40/ambientAug 
allow ambient light injection into ibl
 2022-06-07 22:12:24 -05:00
AzaezelX 66820fee90 let me underscore this is painfully incorrect and we'll want to revisit it when we have more time, but... this seems to fix mangled decal and decalroad rendering 2022-06-07 22:06:48 -05:00
AzaezelX de6ee93159 slim ambient down to vec3, default to premul for translucency 2022-06-07 22:05:47 -05:00
AzaezelX 0e0088cab9 forward lit ambient application. fix GL side IBL overwriting forward lit color.a 2022-06-07 11:18:53 -05:00
AzaezelX 5be18a4638 allow ambient light injection into ibl 2022-06-06 17:50:34 -05:00
Brian Roberts 82119ea2df
Merge pull request #808 from Areloch/MiscFixes20220605 
Misc Fixes 2022/06/05
 2022-06-05 16:28:05 -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
Brian Roberts a73695a01a
Merge pull request #807 from Areloch/DisconnectAndCleanupFix 
Disconnect and Shutdown fixes
 2022-06-05 01:26:42 -05:00