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

5668 commits

This branch
This branch
All branches
Author SHA1 Message Date
Areloch 31c4edb3c5
Merge pull request #838 from Areloch/ABReimportRenable 
Re-enables reimport of assets
 2022-08-06 15:04:47 -05:00
Areloch b3c8e0707d Re-enables reimport of assets if there's no external originalFilePath defined(such as due to in-place import, or file path differs from original importing machine) 2022-08-06 14:05:02 -05:00
Areloch 8d8a4b2534
Merge pull request #837 from Areloch/CmakeDebugReleaseFlagFixup 
Cmake DEBUG/RELEASE flag standardization
 2022-08-04 17:19:37 -05:00
Areloch 04e108729e Adjusts logic for definingi TORQUE_DEBUG and TORQUE_RELEASE to be consistent across platforms 2022-08-04 14:01:54 -05:00
Brian Roberts 63f7045fd8
Merge pull request #836 from Azaezel/alpha40/dripdrop 
targeted fix for #45
 2022-07-31 14:59:54 -05:00
AzaezelX 4fd8436911 targeted fix for #45 
as there was no consensus on conversion to explosions from the RFA, holding 7a88b2d489 on back untill we adress that in the ECS pass with 4.1
 2022-07-31 13:24:01 -05:00
Areloch 0a1fd3c278
Merge pull request #831 from Areloch/MiscFixes20220724 
Misc FIxes 2022/07/24
 2022-07-30 01:02:44 -05:00
Brian Roberts 332193b53a
Merge pull request #835 from Azaezel/alpha40/pathShapeSillies 
pathshape cleanups and callbacks
 2022-07-29 17:22:46 -05:00
Brian Roberts 14d1b16892
Merge pull request #833 from Azaezel/alpha40/particlePainPunt 
particle emission safeties
 2022-07-29 17:22:35 -05:00
AzaezelX f4e6060b52 pathshape cleanups and callbacks 
sceneObject:
   UpdateXformChange(mat); operates on the parent object, so made no sense to shove it in void SceneObject::PerformUpdatesForChildren(MatrixF mat){
provide callbacks for when the parent/child relationship changes

simpath+camerapline+pathshape
provide a mechanism to embed a callback for a pathshape defined on a path node. example:

            new Marker() {
               seqNum = "7";
               hitCommand = "TheCommand" // <------------------------------;
               position = "-17.0856 -92.2349 4.00051";
               rotation = "0.0334943 -0.254411 0.966516 179.495";
            };

function PathShapeData::TheCommand(%this,%obj)
{
    echo("Do the thing");
}
 2022-07-27 16:35:09 -05:00
Brian Roberts c8db2ea955
Merge pull request #834 from Azaezel/Preview4_0 
soundAsset profile and description getter fixes
 2022-07-27 16:29:06 -05:00
AzaezelX f59c5f152f soundAsset profile and description getter fixes 2022-07-27 16:28:07 -05:00
AzaezelX 77ef842670 particle emission safeties 
both for player specifically, and emission in general
 2022-07-27 16:26:58 -05:00
Brian Roberts 0cc49122b0
Merge pull request #832 from Jozor/Preview4_0 
Update TORQUE_GAME_ENGINE_VERSION_STRING version number 4.0.0
 2022-07-27 16:00:09 -05:00
Joseph d56227fccd Update TORQUE_GAME_ENGINE_VERSION_STRING version number 4.0.0 
Update TORQUE_GAME_ENGINE_VERSION_STRING version number to reflect current version 4.0
I somehow forgot to push this with my pull request #486 commit 6f52b87360
 2022-07-27 20:18:06 +01:00
Brian Roberts 70971f7c6c
Merge pull request #830 from Azaezel/alpha40/boundsDisplayfix 
fix bounds box display
 2022-07-24 20:56:09 -05:00
Areloch dbf60a95a2 Adds handling to winVolume's _BuildFileName so if it's a filename-less filename(has only extension but no name) then we process the filename string correctly 
Adds logic so when trying to do a path copy, if it's not a valid source filename, we merely fail the copy, rather than crashing due to a nullref
Makes guiPopUpCtrlEx respect the mActive flag so the mouse cannot interact with it if it's inactive
 2022-07-24 13:12:46 -05:00
AzaezelX 74d847c513 fix bounds box display 2022-07-24 00:14:19 -05:00
Brian Roberts 0df6d7fed9
Merge pull request #828 from Areloch/DBEditorAssetFieldFix 
DBEditor callback fix for asset fields
 2022-07-04 18:13:58 -05:00
JeffR 6355740f6c DBEditor callback fix for asset fields 2022-07-04 18:10:25 -05:00
Brian Roberts 32ddf5f791
Merge pull request #827 from Areloch/MiscFIxes20220702 
Misc Fixes 2022/07/02
 2022-07-03 02:25:49 -05:00
JeffR 305e4851e0 Fixes issue with using Edit Asset in RMB menu in AB on datablocks where it wouldn't correctly recognize the datablock 
Fixes issue where the local sfxProfile in a sfxEmitter would share pointer reference to the utilized shapeAsset's sound buffer, so when it's deleted it would nuke the soundAsset's buffer, causing reference exceptions
Adds includes to torqueConfig.h in several files that are blocked out with TORQUE_TOOLS to ensure that if the flag is on in the config file, the files are loaded/compiled as expected
Add sanity check to AssetManager::unloadAsset to ensure that the assetDef being unloaded was actually correctly loaded/registered into the console in the first place
 2022-07-02 23:27:18 -05:00
Brian Roberts fbc304badb
Merge pull request #824 from Azaezel/alpha40/AB_locFix 
fix unspecified storage location mangle for new asset creation
 2022-07-01 16:28:30 -05:00
Brian Roberts 0ff23d234b
Merge pull request #825 from Azaezel/alpha40/volfogManagerMangle 
make sure the volfog manager is dead before we kill scene
 2022-06-26 16:25:08 -05:00
AzaezelX 0aab4b63a5 make sure the volfog manager is dead before we kill scene 2022-06-26 10:04:26 -05:00
AzaezelX fb75b21090 fix unspecified storage location mangle for new asset creation 2022-06-26 10:01:26 -05:00
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