Commit graph

  • 393bc76a6f
    Merge 384c794e6b into 6d8f83bd3a marauder2k7 2026-07-02 07:43:24 +00:00
  • 384c794e6b Merge remote-tracking branch 'upstream/development' into test-vcpkg-local marauder2k7 2026-07-02 08:41:24 +01:00
  • 6d8f83bd3a
    Merge pull request #1781 from Areloch/ShapeImportFixes_20260627 development Brian Roberts 2026-06-30 14:31:38 -05:00
  • f93ee21b18
    Merge pull request #1778 from marauder2k9-torque/Assmip-AnimationFixes Brian Roberts 2026-06-30 14:31:22 -05:00
  • fd730b057d
    Merge 7d65976c31 into 20bf6b7de9 Brian Roberts 2026-06-28 14:57:02 +01:00
  • 8c1504bc81 Merge branch 'Assmip-AnimationFixes' into test-vcpkg-local marauder2k7 2026-06-28 07:53:35 +01:00
  • b3a7049083 Update assimpShapeLoader.cpp marauder2k7 2026-06-28 07:52:35 +01:00
  • b3190ddc81 - Flips the order of the taml object compilation and flag for locking the write so we can properly clear and reprocess objects if they're accessed/written again - Re-adds the filecopy check so if dragging-and-dropping an external shape file for importing(Secure VFS flag allowing) it properly copies the source file to the destination directory on import JeffR 2026-06-27 11:47:51 -05:00
  • 6d86f679b0 Merge branch 'Assmip-AnimationFixes' into test-vcpkg-local marauder2k7 2026-06-27 14:55:12 +01:00
  • dc8aa598ed more fix attempts marauder2k7 2026-06-27 01:51:07 +01:00
  • 7e3bed2126
    Merge 971e8c44b2 into 20bf6b7de9 marauder2k7 2026-06-26 06:49:00 +02:00
  • 20bf6b7de9
    Merge pull request #1780 from Azaezel/alpha41/uiCleanups Brian Roberts 2026-06-25 00:30:02 -05:00
  • d2ae4473c2
    Merge pull request #1779 from Sir-Skurpsalot/player-enhancements-2 Brian Roberts 2026-06-25 00:29:46 -05:00
  • b49481dfbf
    Update player.h Sir-Skurpsalot 2026-06-24 22:32:02 -06:00
  • 6e98dd6d03
    Update player.cpp Sir-Skurpsalot 2026-06-24 22:31:11 -06:00
  • 8f99b9004e
    Update player.cpp Sir-Skurpsalot 2026-06-24 20:32:37 -06:00
  • ee4542ed80 simplify menu navigation button setup remove position lookup logic for the choose level and choose game modes nav button icons in favor of the built in source side ones. The elements they relate to are centered as is, so set the encapsulating element for them to horizontal=centered as well, and the sub elements to thier respective left-and right as prepwork if someone *did* want to make the elements they reference scale hoizontally. AzaezelX 2026-06-24 21:11:12 -05:00
  • a1c49b82c7
    Update player.h Sir-Skurpsalot 2026-06-24 17:49:39 -06:00
  • fa6e293561
    Update player.cpp Sir-Skurpsalot 2026-06-24 17:46:58 -06:00
  • 405f458e17
    Update player.h Sir-Skurpsalot 2026-06-24 17:31:46 -06:00
  • 019d0b951b
    Update player.cpp Sir-Skurpsalot 2026-06-24 17:30:51 -06:00
  • 07d0eeed77 Update assimpShapeLoader.cpp marauder2k7 2026-06-24 14:11:13 +01:00
  • 556418b61d mac cache assets marauder2k7 2026-06-22 22:01:01 +01:00
  • 142bfc4382 sign dylibs postbuild marauder2k7 2026-06-22 20:50:02 +01:00
  • a8640de8ee Update assimpShapeLoader.cpp marauder2k7 2026-06-22 19:07:12 +01:00
  • f41f94c55a Assimp Animation fixes marauder2k7 2026-06-22 13:45:06 +01:00
  • 0fe6736634 Merge remote-tracking branch 'upstream/development' into test-vcpkg-local marauder2k7 2026-06-22 08:55:55 +01:00
  • 5a804dc432 Merge remote-tracking branch 'upstream/development' into test-vcpkg-local marauder2k7 2026-06-22 08:55:32 +01:00
  • e9a517a9f3
    Merge pull request #1777 from Azaezel/alpha41/tamlWriteRight Areloch 2026-06-22 02:54:33 -05:00
  • 3c0fecb605
    Merge pull request #1776 from marauder2k9-torque/Assimp-moar-fixes Areloch 2026-06-22 02:54:17 -05:00
  • cf61a6b831 harden Taml::write and Taml::compileCustomState make sure we don't end up clearing the vector we're itterating by recursively chaining writes, and that we actually have a mCompiledNodes to itterate for compileCustomState AzaezelX 2026-06-21 20:43:51 -05:00
  • 4f7b275266 more fixes marauder2k7 2026-06-21 21:08:48 +01:00
  • f59a640857
    Merge pull request #1775 from Azaezel/alpha41/DivNULLnono Brian Roberts 2026-06-20 20:37:32 -05:00
  • f912bc172d avoid divide by zero when counteracting bouyancy bounce for players reported by sir_skurpsalot: https://discord.com/channels/358091480004558848/783127087820439582/1518054290524995644 AzaezelX 2026-06-20 20:37:05 -05:00
  • bbf207872e Merge remote-tracking branch 'upstream/development' into test-vcpkg-local marauder2k7 2026-06-20 19:32:26 +01:00
  • 070009df22
    Merge pull request #1774 from marauder2k9-torque/Assimp-bounds-axis-fix Brian Roberts 2026-06-20 12:58:13 -05:00
  • 97f3485a76 Update assimpShapeLoader.cpp marauder2k7 2026-06-20 18:14:00 +01:00
  • 887f239a20 Assimp fixes marauder2k7 2026-06-20 17:09:43 +01:00
  • 00f8e08025 add native file dialogs extended from vcpkg marauder2k7 2026-06-20 12:19:14 +01:00
  • 392df11e2b VCPKG Full refactor marauder2k7 2026-06-19 14:52:43 +01:00
  • 4fe95631e6
    Merge db07f3d8d5 into 0b73e701ac marauder2k7 2026-06-18 22:53:55 +00:00
  • 3af6f616e5
    Merge ca454bfc7a into 0b73e701ac marauder2k7 2026-06-18 22:43:37 +00:00
  • 9028b355e0
    Merge 839debff57 into 0b73e701ac marauder2k7 2026-06-18 22:43:31 +00:00
  • 0b73e701ac
    Merge pull request #1772 from Azaezel/alpha41/silentSFXEmitter_Shtapit Brian Roberts 2026-06-18 17:17:26 -05:00
  • 6a448cf118 crashfix for SFXEmitter the last refactor broke spawning sfxemitters with blank entries. this will fix that, though we'll need to circle back and correct other issues, like looping override AzaezelX 2026-06-18 17:17:07 -05:00
  • 2341db8f63
    Merge pull request #1771 from Azaezel/alpha41/missionMarkerMangle Brian Roberts 2026-06-17 16:50:21 -05:00
  • 17d2765592 crashfix: make sure mShapeInstance is always assigned valid or NULL there were a couple code routes that could lead to mShapeInstance holding on to the old ram loc. used SAFE_DELETE preemptively to ensure that never happens. AzaezelX 2026-06-17 16:49:49 -05:00
  • 280866724d
    Merge pull request #1769 from Areloch/ImageAssetConvert Brian Roberts 2026-06-17 15:28:08 -05:00
  • fe05474f1e restore the precompiled header marauder2k7 2026-06-17 07:16:17 +01:00
  • 34e3f78a22 Updates ImageAsset usage to utilize AssetRef, and standardizes the setter/getter functions and naming conventions, as well as the ability to use and bind named targets. JeffR 2026-06-16 17:39:30 -05:00
  • 1683b74937
    Merge pull request #1768 from marauder2k9-torque/bugs-reported Brian Roberts 2026-06-16 17:12:37 -05:00
  • 872c765ca0 clean marauder2k7 2026-06-16 22:01:19 +01:00
  • 4062a1bbbd remove runners that failed explicitly marauder2k7 2026-06-16 21:48:51 +01:00
  • 222f476f0e updated runners marauder2k7 2026-06-16 21:14:21 +01:00
  • ae283af384 Update CMakeLists.txt marauder2k7 2026-06-16 20:32:56 +01:00
  • d5d1885254 Update CMakeLists.txt marauder2k7 2026-06-16 20:28:16 +01:00
  • a858d8624e
    Merge pull request #1767 from Azaezel/alpha41/assimpUpdate6_0_5 Brian Roberts 2026-06-09 15:08:05 -05:00
  • f5cf21cfeb update assimp to 6.0.5 AzaezelX 2026-06-09 12:46:56 -05:00
  • fa8dd7decc Fix heap-buffer-overflow in vendored assimp Quick3D importer (CVE-2025-11277) dkgkdfg65 2026-06-10 01:25:46 +08:00
  • 2d2eb57e2e
    Merge pull request #1763 from marauder2k9-torque/small-fixes Brian Roberts 2026-06-08 15:44:34 -05:00
  • a63ec0d018 Update convexShape.cpp marauder2k7 2026-06-08 21:43:58 +01:00
  • 28f0d523a6 Update CMakeLists.txt marauder2k7 2026-06-08 10:29:25 +01:00
  • 11a5354e67 convex shape error marauder2k7 2026-06-08 10:09:40 +01:00
  • 6c7a92a5b8
    Merge pull request #1762 from marauder2k9-torque/Compile-Changes-To-CMakeLists Brian Roberts 2026-06-07 19:59:39 -05:00
  • 3868c1faeb
    Merge d35de7afc0 into bac9ed99b3 marauder2k7 2026-06-07 19:47:47 -05:00
  • 874b314fee Update CMakeLists.txt marauder2k7 2026-06-08 01:38:45 +01:00
  • ab188ed064 Merge remote-tracking branch 'upstream/development' into VCPKG-Refactor marauder2k7 2026-06-08 01:25:42 +01:00
  • 506ef184fe Update build-windows-msvc.yml marauder2k7 2026-05-17 21:01:16 +01:00
  • 1d516f3dd9 Update CMakeLists.txt marauder2k7 2026-06-08 00:52:32 +01:00
  • bac9ed99b3
    Merge pull request #1760 from marauder2k9-torque/ShaderGen-produce-shaderdata Brian Roberts 2026-06-07 18:23:21 -05:00
  • 059417e593
    Merge pull request #1761 from marauder2k9-torque/Fix-GlobalRegistrionVectors-XcodeIssue Brian Roberts 2026-06-07 18:18:30 -05:00
  • d4e9275240 replace specific names for a universal getRegistrations marauder2k7 2026-06-07 22:37:20 +01:00
  • 3aac9af35e same change but for gbitmap marauder2k7 2026-06-07 22:30:56 +01:00
  • e83bab90d7 fix for shape registration marauder2k7 2026-06-07 22:10:52 +01:00
  • 839debff57 update rigid to work with physics api marauder2k7 2026-06-06 16:06:17 +01:00
  • c03cedec6f use simplified jolt character controller marauder2k7 2026-06-07 20:24:15 +01:00
  • c81a809444 few more tweaks marauder2k7 2026-06-07 17:32:27 +01:00
  • 174e4d3329 Update joltPlayer.cpp marauder2k7 2026-06-07 02:39:25 +01:00
  • 51f5d507ed multiple fixes, marauder2k7 2026-06-06 20:24:34 +01:00
  • f3b9c65411 Update joltCollision.cpp marauder2k7 2026-06-06 18:11:56 +01:00
  • 4beee81c12 jolt build folder marauder2k7 2026-05-17 18:51:01 +01:00
  • 8acf7da95b initial commit jolt marauder2k7 2026-05-17 17:34:15 +01:00
  • 663fc9b83e Update gfxGLShader.cpp marauder2k7 2026-06-05 15:55:50 +01:00
  • dacc4db708 dx caching result marauder2k7 2026-06-05 14:52:30 +01:00
  • 0c2aa5328c
    Merge pull request #1759 from Areloch/TSStaticFallbackShapePtrFix Brian Roberts 2026-06-05 08:03:56 -05:00
  • 4cf780e7b8 Shader Gen to produce ShaderData marauder2k7 2026-06-05 11:29:18 +01:00
  • ceb1cf2938 linux fixes marauder2k7 2026-06-05 09:51:00 +01:00
  • eade131ad2 Adjusts the logic for collision and physics setup functions in TSStatic because we utilize/allow for the fallback shape and so need to contend for if we have a shapeInstance but our shapeAsset ptr is invalid. JeffR 2026-06-05 01:56:09 -05:00
  • 3d11bd5baf Update CMakeLists.txt marauder2k7 2026-06-04 22:31:39 +01:00
  • 28d51dbebc Update CMakeLists.txt marauder2k7 2026-06-04 21:26:20 +01:00
  • 68e762130d Compilation changes marauder2k7 2026-05-21 23:55:35 +01:00
  • 8adf692da5
    Merge pull request #1756 from marauder2k9-torque/Update-Bullet Brian Roberts 2026-06-04 11:50:38 -05:00
  • 0df3bea9ca
    Merge pull request #1757 from Azaezel/alpha41/colFilterFix Brian Roberts 2026-06-03 19:45:41 -05:00
  • 9750e7dcc8 fix advanced shader editor slider blocker AzaezelX 2026-06-03 19:24:02 -05:00
  • 13fa178cf6 update bullet so it actually works marauder2k7 2026-06-03 15:08:51 +01:00
  • c7be48130a
    Merge pull request #1755 from Azaezel/alpha41/fixSetImageOptional Brian Roberts 2026-06-02 15:34:19 -05:00
  • 6485d48e38 fix optional skin param for ShapeBase::setImage AzaezelX 2026-06-02 13:46:25 -05:00
  • c58f6825dc
    Merge pull request #1754 from Areloch/ShapeAssetCleanupRefactor Brian Roberts 2026-05-31 16:29:21 -05:00
  • d53892fb80 Corrected handling for invalid shapes using fallback shape on TSStatics JeffR 2026-05-31 16:22:12 -05:00
  • b338510921 Minor fixes and corrections JeffR 2026-05-31 11:53:41 -05:00