Commit graph

8052 commits

Author SHA1 Message Date
JeffR 66f924ebd4 Updates TerrainMaterialAsset to utilize similar macros to everything else
Updates groundCover to utilize TerrainMaterialAsset macros in place of straight StringTableEntry for type layers
Fixes formatting for several asset types' inspector fields so they correctly call down into prompting the AssetBrowser being shown with correct field naming, thus allowing fields that are arrays to have the right index when setting the target variable
Updates several asset helper macros to handle blank values for network traffic to actually be sent to client, thus allowing setting an asset to blank on the client, rather than only falling back
2025-12-03 00:33:14 -06:00
Brian Roberts 9fe2eec813
Merge pull request #1587 from marauder2k9-torque/development
Some checks failed
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Has been cancelled
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Has been cancelled
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Has been cancelled
Placeholder function argument vars
2025-11-26 02:08:42 -06:00
Brian Roberts 95482349e6
Merge pull request #1593 from marauder2k9-torque/AssimpImportFixes
Some checks are pending
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Waiting to run
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Waiting to run
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Waiting to run
fix assimp import
2025-11-25 19:10:53 -06:00
marauder2k7 e345120d81
Merge pull request #8 from Azaezel/dsqFilters
dsq detection filters
2025-11-26 01:09:41 +00:00
AzaezelX 9bcf8a90b2 dsq detection filters 2025-11-25 19:03:38 -06:00
marauder2k7 891ede5d59 Update assimpAppNode.cpp 2025-11-25 10:09:18 +00:00
marauder2k7 f817d7d903 further assimp fixes
AppMesh position was being scaled twice since the node is now being scaled
Try and resolve fps from file instead of default 30
maxKeyTime should be outside the loop
2025-11-25 08:34:00 +00:00
marauder2k7 a5ed09fa57 fix assimp import
Assimp importer now sets the collada options to fix up axis transformation
bounds are now created by tsmesh
top level nodes are now added to the processNodes stack so bounds and other root nodes can be found correctly
2025-11-24 07:54:53 +00:00
Brian Roberts aa9a8154e1
Merge pull request #1592 from Azaezel/alpha41/crashTestDummies
Some checks failed
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Has been cancelled
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Has been cancelled
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Has been cancelled
crashfixes
2025-11-23 20:55:41 -06:00
AzaezelX 2b8d7855e4 crashfixes
IRangeValidatorScaled display was looking in the wrong var
afxMagicMissileData was misconverted and lacked a NULL initializer
2025-11-23 15:10:37 -06:00
Areloch f2da4ac828
Merge pull request #1588 from marauder2k9-torque/XM-Document-Blind-Traversal
Some checks failed
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Has been cancelled
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Has been cancelled
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Has been cancelled
XML Document Blind element traversal
2025-11-21 22:06:29 -06:00
Areloch 91e354fe99
Merge pull request #1591 from Azaezel/alpha41/thumbsSideways
scroll thumb safety
2025-11-21 21:55:57 -06:00
Areloch b8ae99e70e
Merge pull request #1590 from Azaezel/alpha41/glCVBSafety
circular volatile buffer safety
2025-11-21 21:55:47 -06:00
AzaezelX 75883f74cf scroll thumb safety
avoid divnull
2025-11-20 20:56:18 -06:00
AzaezelX 473a45fbca circular volatile buffer safety
add padding to the circular volative buffer overlap test to avoid loop artifacting
2025-11-20 10:04:20 -06:00
Brian Roberts d563583feb
Merge pull request #1589 from Azaezel/alpha41/splineColor
Some checks failed
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Has been cancelled
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Has been cancelled
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Has been cancelled
spline color visibility tweak
2025-11-18 18:57:04 -06:00
AzaezelX 6c7f15cff2 spline color visibility tweak 2025-11-18 18:56:24 -06:00
marauder2k7 b29de841ea we should be failing on error
fail when a unit test fails
2025-11-16 14:19:01 +00:00
marauder2k7 fe982c730c Revert "Update astNodes.cpp"
This reverts commit 9d9fe0db77.
2025-11-16 14:17:14 +00:00
marauder2k7 9d9fe0db77 Update astNodes.cpp 2025-11-16 06:02:53 +00:00
marauder2k7 c53d79a8cf XML Document element traversal
Allows traversing an xml document by element without needing to know the element name
Blind traversal allows more dynamic loading of xml docs and logic to wrap different outcomes

new script functions:
prevElement
nextElement
nextChildElement

<main> <--- we are here
  <child> <-- nextChildElement will take us here
  </child>
  <child2> <-- after nextChildElement nextElement will take us here
  </child2>
</main>
<main2> <-- next element will bring us here
</main2>
2025-11-15 19:02:45 +00:00
marauder2k7 b0f8a5f9bd tscript change
Adds the ability to declare defaults for function arguments

eg
function testFunc(%x = 1, %y = 1)
{
    return %x + %y;
}

can now be called as
testFunc(10) and it will return the value of 11.
2025-11-15 17:38:13 +00:00
Brian Roberts 7e64493dbf
Merge pull request #1586 from Azaezel/alpha41/missionMarkerFilter
Some checks failed
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Has been cancelled
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Has been cancelled
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Has been cancelled
add conditional filter for missionmarker autospawn
2025-11-13 15:24:33 -06:00
Brian Roberts 8c0e7492f6
Merge pull request #1585 from Azaezel/alpha41/miscFixes11.13.25
misc fixes
2025-11-13 15:24:09 -06:00
AzaezelX cbf407bc10 add conditional filter for missionmarker autospawn 2025-11-13 14:58:36 -06:00
AzaezelX cce40efd35 fix particle glow
multiple preloads were failing to return false or mesages on failure of mandatory entries.
clear out redundant isScriptFile definition
fix default order of /scripts/managedData script files
2025-11-13 14:29:25 -06:00
Areloch 9ec752b646
Merge pull request #1584 from marauder2k9-torque/libsndfile_sharedbuildFix
LibSndFile compile as DLL
2025-11-07 13:03:27 -06:00
marauder2k7 01873502e3 Update portfile.cmake
add the "d"
2025-10-29 14:15:25 +00:00
marauder2k7 28b7babfc0 Update torque_configs.cmake
add clean after build
2025-10-29 02:19:03 +00:00
marauder2k7 0ff57142cd Update torque_configs.cmake 2025-10-29 02:15:14 +00:00
marauder2k7 ebc6566cee Update torque_configs.cmake 2025-10-29 01:48:33 +00:00
marauder2k7 320b91fe34 link libs 2025-10-29 01:47:22 +00:00
marauder2k7 873fbbf1fe usse vcpkg just for the libsndfile build chain 2025-10-29 01:40:27 +00:00
marauder2k7 a577d36679 Update CMakeLists.txt 2025-10-28 17:11:25 +00:00
marauder2k7 574ca023d9 update libsndfile to fix linux build 2025-10-28 17:10:28 +00:00
marauder2k7 d4cc9a8324 Update CMakeLists.txt 2025-10-28 16:33:33 +00:00
marauder2k7 cbd3edf872 Update CMakeLists.txt 2025-10-28 16:26:15 +00:00
marauder2k7 44921231a6 Update CMakeLists.txt 2025-10-28 16:24:01 +00:00
marauder2k7 20c0d0c940 Update CMakeLists.txt 2025-10-28 16:19:35 +00:00
marauder2k7 c065943cb4 fix builds 2025-10-28 15:47:36 +00:00
marauder2k7 582c20fbce Update CMakeLists.txt 2025-10-28 15:44:45 +00:00
Brian Roberts ca2c502269
Merge pull request #1581 from Azaezel/alpha41/netpipeNarrowing
Alpha41/netpipe narrowing
2025-10-23 14:47:40 -05:00
AzaezelX 3ff3a5eef4 sceneobject xform transmission review 2025-10-23 09:42:47 -05:00
AzaezelX 4579f327b4 network reductons
first pass, tsstatic
sceneobject under review
2025-10-22 23:35:35 -05:00
Brian Roberts 486cb63528
Merge pull request #1580 from Azaezel/alpha41/ParticleGlow
Alpha41/particle glow
2025-10-20 19:57:28 -05:00
AzaezelX c0bd8de143 shift glow logic to use a bool. we'll likely make that a scalar at some point, but not at the last second
gl math parity. for proper *command* parity we'll need to hunt down why it' forcing it to version 110
2025-10-20 12:11:56 -05:00
AzaezelX ab80a842aa fix particle glow 2025-10-20 10:56:19 -05:00
Brian Roberts 5d260bc58f
Merge pull request #1578 from Azaezel/development
PROFILE_START_IF profiler macro
2025-10-16 19:37:48 -05:00
AzaezelX ba18fdbe6d PROFILE_START_IF profiler macro
sig is an action, a stringtable variable, and an unquoted string to compare against
demonstrated with bitmapSTB
2025-10-16 18:11:29 -05:00
Brian Roberts fda3e7bf86
Merge pull request #1577 from Azaezel/alpha41/channelVolume0
fix $pref::SFX::channelVolume0 default
2025-10-16 15:28:27 -05:00