Commit graph

8513 commits

Author SHA1 Message Date
marauder2k7
393bc76a6f
Merge 384c794e6b into 6d8f83bd3a 2026-07-02 07:43:24 +00:00
marauder2k7
384c794e6b Merge remote-tracking branch 'upstream/development' into test-vcpkg-local 2026-07-02 08:41:24 +01:00
Brian Roberts
6d8f83bd3a
Merge pull request #1781 from Areloch/ShapeImportFixes_20260627
Some checks failed
MacOSX Build / macOS ARM Xcode (push) Has been cancelled
Linux Build / Ubuntu GCC Latest (push) Has been cancelled
Linux Build / Ubuntu GCC 13 (push) Has been cancelled
MacOSX Build / macOS ARM Clang Ninja (push) Has been cancelled
Windows Build / Windows MSVC Ninja (push) Has been cancelled
Windows Build / Windows MSVC Visual Studio 2022 (push) Has been cancelled
Windows Build / Windows MSVC Visual Studio 2026 (push) Has been cancelled
Fixes for shape importing/taml writing
2026-06-30 14:31:38 -05:00
Brian Roberts
f93ee21b18
Merge pull request #1778 from marauder2k9-torque/Assmip-AnimationFixes
Assimp Node axis fixes and Extended Animation support
2026-06-30 14:31:22 -05:00
marauder2k7
8c1504bc81 Merge branch 'Assmip-AnimationFixes' into test-vcpkg-local 2026-06-28 07:53:35 +01:00
marauder2k7
b3a7049083 Update assimpShapeLoader.cpp
fix front sign handling
Fix check for bounds in an assimp file
2026-06-28 07:52:35 +01:00
JeffR
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
2026-06-27 11:47:51 -05:00
marauder2k7
6d86f679b0 Merge branch 'Assmip-AnimationFixes' into test-vcpkg-local 2026-06-27 14:55:12 +01:00
marauder2k7
dc8aa598ed more fix attempts 2026-06-27 01:51:07 +01:00
Brian Roberts
20bf6b7de9
Merge pull request #1780 from Azaezel/alpha41/uiCleanups
Some checks failed
Linux Build / Ubuntu GCC Latest (push) Has been cancelled
Linux Build / Ubuntu GCC 13 (push) Has been cancelled
MacOSX Build / macOS ARM Clang Ninja (push) Has been cancelled
MacOSX Build / macOS ARM Xcode (push) Has been cancelled
Windows Build / Windows MSVC Ninja (push) Has been cancelled
Windows Build / Windows MSVC Visual Studio 2022 (push) Has been cancelled
Windows Build / Windows MSVC Visual Studio 2026 (push) Has been cancelled
simplify menu navigation button setup
2026-06-25 00:30:02 -05:00
Brian Roberts
d2ae4473c2
Merge pull request #1779 from Sir-Skurpsalot/player-enhancements-2
Player enhancements 2
2026-06-25 00:29:46 -05:00
Sir-Skurpsalot
b49481dfbf
Update player.h 2026-06-24 22:32:02 -06:00
Sir-Skurpsalot
6e98dd6d03
Update player.cpp 2026-06-24 22:31:11 -06:00
Sir-Skurpsalot
8f99b9004e
Update player.cpp 2026-06-24 20:32:37 -06:00
AzaezelX
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.
2026-06-24 21:11:12 -05:00
Sir-Skurpsalot
a1c49b82c7
Update player.h 2026-06-24 17:49:39 -06:00
Sir-Skurpsalot
fa6e293561
Update player.cpp 2026-06-24 17:46:58 -06:00
Sir-Skurpsalot
405f458e17
Update player.h 2026-06-24 17:31:46 -06:00
Sir-Skurpsalot
019d0b951b
Update player.cpp 2026-06-24 17:30:51 -06:00
marauder2k7
07d0eeed77 Update assimpShapeLoader.cpp 2026-06-24 14:11:13 +01:00
marauder2k7
556418b61d mac cache assets 2026-06-22 22:01:01 +01:00
marauder2k7
142bfc4382 sign dylibs postbuild 2026-06-22 20:50:02 +01:00
marauder2k7
a8640de8ee Update assimpShapeLoader.cpp
allow named actions with multiple nodes (similar to ambient including everything except each authored action should only have 1 track (channel) for each node already)
2026-06-22 19:07:12 +01:00
marauder2k7
f41f94c55a Assimp Animation fixes 2026-06-22 13:45:06 +01:00
marauder2k7
0fe6736634 Merge remote-tracking branch 'upstream/development' into test-vcpkg-local 2026-06-22 08:55:55 +01:00
marauder2k7
5a804dc432 Merge remote-tracking branch 'upstream/development' into test-vcpkg-local 2026-06-22 08:55:32 +01:00
Areloch
e9a517a9f3
Merge pull request #1777 from Azaezel/alpha41/tamlWriteRight
Some checks failed
MacOSX Build / macOS ARM Clang Ninja (push) Has been cancelled
Linux Build / Ubuntu GCC Latest (push) Has been cancelled
Linux Build / Ubuntu GCC 13 (push) Has been cancelled
MacOSX Build / macOS ARM Xcode (push) Has been cancelled
Windows Build / Windows MSVC Ninja (push) Has been cancelled
Windows Build / Windows MSVC Visual Studio 2022 (push) Has been cancelled
Windows Build / Windows MSVC Visual Studio 2026 (push) Has been cancelled
harden Taml::write and Taml::compileCustomState
2026-06-22 02:54:33 -05:00
Areloch
3c0fecb605
Merge pull request #1776 from marauder2k9-torque/Assimp-moar-fixes
Assimp more fixes
2026-06-22 02:54:17 -05:00
AzaezelX
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
2026-06-21 20:43:51 -05:00
marauder2k7
4f7b275266 more fixes
test vigourously
2026-06-21 21:08:48 +01:00
Brian Roberts
f59a640857
Merge pull request #1775 from Azaezel/alpha41/DivNULLnono
Some checks failed
Windows Build / Windows MSVC Ninja (push) Has been cancelled
Windows Build / Windows MSVC Visual Studio 2022 (push) Has been cancelled
Linux Build / Ubuntu GCC Latest (push) Has been cancelled
Linux Build / Ubuntu GCC 13 (push) Has been cancelled
MacOSX Build / macOS ARM Clang Ninja (push) Has been cancelled
MacOSX Build / macOS ARM Xcode (push) Has been cancelled
Windows Build / Windows MSVC Visual Studio 2026 (push) Has been cancelled
avoid divide by zero when counteracting bouyancy bounce for players
2026-06-20 20:37:32 -05:00
AzaezelX
f912bc172d avoid divide by zero when counteracting bouyancy bounce for players
reported by sir_skurpsalot: https://discord.com/channels/358091480004558848/783127087820439582/1518054290524995644
2026-06-20 20:37:05 -05:00
marauder2k7
bbf207872e Merge remote-tracking branch 'upstream/development' into test-vcpkg-local 2026-06-20 19:32:26 +01:00
Brian Roberts
070009df22
Merge pull request #1774 from marauder2k9-torque/Assimp-bounds-axis-fix
Some checks are pending
Linux Build / Ubuntu GCC Latest (push) Waiting to run
Linux Build / Ubuntu GCC 13 (push) Waiting to run
MacOSX Build / macOS ARM Clang Ninja (push) Waiting to run
MacOSX Build / macOS ARM Xcode (push) Waiting to run
Windows Build / Windows MSVC Ninja (push) Waiting to run
Windows Build / Windows MSVC Visual Studio 2022 (push) Waiting to run
Windows Build / Windows MSVC Visual Studio 2026 (push) Waiting to run
Assimp fixes
2026-06-20 12:58:13 -05:00
marauder2k7
97f3485a76 Update assimpShapeLoader.cpp 2026-06-20 18:14:00 +01:00
marauder2k7
887f239a20 Assimp fixes
Should now apply the same corrective fix to modelled bounds
2026-06-20 17:09:43 +01:00
marauder2k7
00f8e08025 add native file dialogs extended from vcpkg
also some required changes to filedialog.cpp to use the updated nfde commented and documented
2026-06-20 12:19:14 +01:00
marauder2k7
392df11e2b VCPKG Full refactor
uses local cache for assets now so should be able to produce an offline build with vcpkg. Only a couple of libraries left that are too big, and the vcpkg repo itself has files that are blocked from the repo. We could get around both issues by utilizing a submodule
2026-06-19 18:06:19 +01:00
Brian Roberts
0b73e701ac
Merge pull request #1772 from Azaezel/alpha41/silentSFXEmitter_Shtapit
Some checks failed
Linux Build / Ubuntu GCC Latest (push) Has been cancelled
Linux Build / Ubuntu GCC 13 (push) Has been cancelled
MacOSX Build / macOS ARM Clang Ninja (push) Has been cancelled
MacOSX Build / macOS ARM Xcode (push) Has been cancelled
Windows Build / Windows MSVC Ninja (push) Has been cancelled
Windows Build / Windows MSVC Visual Studio 2022 (push) Has been cancelled
Windows Build / Windows MSVC Visual Studio 2026 (push) Has been cancelled
crashfix for SFXEmitter
2026-06-18 17:17:26 -05:00
AzaezelX
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
2026-06-18 17:17:07 -05:00
Brian Roberts
2341db8f63
Merge pull request #1771 from Azaezel/alpha41/missionMarkerMangle
Some checks are pending
Linux Build / Ubuntu GCC Latest (push) Waiting to run
Linux Build / Ubuntu GCC 13 (push) Waiting to run
MacOSX Build / macOS ARM Clang Ninja (push) Waiting to run
MacOSX Build / macOS ARM Xcode (push) Waiting to run
Windows Build / Windows MSVC Ninja (push) Waiting to run
Windows Build / Windows MSVC Visual Studio 2022 (push) Waiting to run
Windows Build / Windows MSVC Visual Studio 2026 (push) Waiting to run
crashfix: make sure mShapeInstance is always assigned valid or NULL
2026-06-17 16:50:21 -05:00
AzaezelX
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.
2026-06-17 16:49:49 -05:00
Brian Roberts
280866724d
Merge pull request #1769 from Areloch/ImageAssetConvert
Updates ImageAsset usage to be more standardized
2026-06-17 15:28:08 -05:00
JeffR
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. 2026-06-16 17:39:30 -05:00
Brian Roberts
1683b74937
Merge pull request #1768 from marauder2k9-torque/bugs-reported
Some checks are pending
Linux Build / Ubuntu GCC Latest (push) Waiting to run
Linux Build / Ubuntu GCC 13 (push) Waiting to run
MacOSX Build / macOS ARM Clang Ninja (push) Waiting to run
MacOSX Build / macOS ARM Xcode (push) Waiting to run
Windows Build / Windows MSVC Ninja (push) Waiting to run
Windows Build / Windows MSVC Visual Studio 2022 (push) Waiting to run
Windows Build / Windows MSVC Visual Studio 2026 (push) Waiting to run
Bugs Reported Steve_Yorkshire
2026-06-16 17:12:37 -05:00
marauder2k7
872c765ca0 clean
Removed intel runner from mac, it never run
Removed arm from windows as it will always fail as git ci runners are not arm
removed gcc12 kept gcc13
Added convenience function for checking if a package is active
2026-06-16 22:01:19 +01:00
marauder2k7
4062a1bbbd remove runners that failed explicitly
also https://learn.microsoft.com/en-us/cpp/build/reference/debug-generate-debug-info?view=msvc-170

use /DEBUG:FULL instead of FASTLINK as it is deprecated
2026-06-16 21:48:51 +01:00
marauder2k7
222f476f0e updated runners
multiple different build types added for different configurations, now making full use of the matrix properly so we can have an early warning of different compile setups and errors that may occur
2026-06-16 21:14:21 +01:00
marauder2k7
ae283af384 Update CMakeLists.txt 2026-06-16 20:32:56 +01:00
marauder2k7
d5d1885254 Update CMakeLists.txt 2026-06-16 20:28:16 +01:00