Brian Roberts
fd65cd867e
Merge 89fb2990df into 475142b847
2026-01-20 17:57:00 +00:00
AzaezelX
89fb2990df
fix clicking a treeview element tripping expand/collapse
...
set the wasselected check earlier in the test chain, and test against it so just selecting it doesn't automatically also trip expand/collapse
2026-01-20 11:56:44 -06:00
Brian Roberts
475142b847
Merge pull request #1660 from marauder2k9-torque/DefaultArgStringFix
...
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
Fix for String arguments for functions
2026-01-20 04:00:01 -06:00
marauder2k7
3a4e2f8a7e
Update astNodes.cpp
...
strings that are arguments for a function need to be put into the global string table. PrecompileIdent does this for the function name etc so it pulls from that during compiled eval
2026-01-20 08:26:51 +00:00
Brian Roberts
6e96c0510d
Merge pull request #1659 from Azaezel/alpha41/decalInstPreview
...
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 decal instance preview
2026-01-19 21:37:15 -06:00
Brian Roberts
9cd04a2a67
Merge pull request #1657 from Azaezel/alpha41/singletonSpam
...
dont try and recreate singletons
2026-01-19 21:37:10 -06:00
Brian Roberts
5361e59a2d
Merge pull request #1658 from Azaezel/alpha41/itsAboutControl
...
GameBaseData::onNewDataBlock reload state
2026-01-19 21:37:04 -06:00
AzaezelX
0b19bd9aca
fix apcrash when loading a new mission after painting decals but before properly selecting a new one to paint
2026-01-19 21:28:48 -06:00
AzaezelX
d8f585c552
fix decal instance preview
...
update previews for instance selection just like we do db selection
2026-01-19 12:28:10 -06:00
AzaezelX
15f619c1aa
GameBaseData::onNewDataBlock reload state
...
if live editing a datablock for an object you're piloting, reapply the control post onadd
2026-01-19 12:00:10 -06:00
AzaezelX
0f827ac89e
dont try and recreate singletons
2026-01-19 11:15:42 -06:00
Brian Roberts
a80502d50d
Merge pull request #1654 from Azaezel/typofix
...
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
typofix
2026-01-17 12:45:08 -06:00
AzaezelX
7d020b9379
typofix
2026-01-17 12:44:41 -06:00
Brian Roberts
c811140d3b
Merge pull request #1653 from Azaezel/navtoolMinorFixes
...
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
navmesh minor tooling fixes
2026-01-16 08:02:43 -06:00
AzaezelX
b8f7d186d3
default controlables and items to mPathfindingIgnore = true;
2026-01-14 09:21:57 -06:00
AzaezelX
4481bdc726
don't use MarkerObjectTypes for navmesh generation
...
do use a minium radius for clicking on a link to select it in the tooling
2026-01-13 20:02:37 -06:00
Brian Roberts
f2a5b06803
Merge pull request #1643 from Azaezel/dmUI
...
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
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
offload weapon/ammo counter update commands to the generic damagemodel
2026-01-11 11:18:29 -06:00
Areloch
62ab78cb55
Merge pull request #1652 from Areloch/ABAssetPreviewBitmapsFix
...
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
Fix for AB Preview Button Bitmaps display
2026-01-07 18:59:29 -06:00
JeffR
322d3bb093
Allows setBitmap calls on IconButtons to set the bitmap data even if the control isn't awake to avoid issues of a set call being 'skipped'
2026-01-07 17:57:53 -06:00
JeffR
d95f5f798e
Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into ABAssetPreviewBitmapsFix
2026-01-07 17:12:37 -06:00
Brian Roberts
55f7b227f0
Merge pull request #1651 from marauder2k9-torque/development
...
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
Update bitmapUtils.h
2026-01-05 21:06:44 -06:00
JeffR
56db8cadd0
Adjusts the setup of the AB preview buttons so we initialize the fields in the new block rather than risking the button being asleep while trying to set bitmaps.
2026-01-03 02:45:14 -06:00
marauder2k7
1b528b818e
Update bitmapUtils.h
...
the conversion functions were making assumptions that were wrong based on mant being 0 and the out being 0 completely on small numbers also if the sign was flipped it rounded to 0. Also simplified
2026-01-02 11:37:36 +00:00
Brian Roberts
199ca6b3af
Merge pull request #1650 from marauder2k9-torque/development
...
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
Update bitmapUtils.cpp
2026-01-01 10:45:51 -06:00
marauder2k7
848219e226
Update bitmapUtils.cpp
...
add conversions for packed texture formats
2026-01-01 15:07:33 +00:00
Brian Roberts
1c92b5b138
Merge pull request #1649 from marauder2k9-torque/Restore_LibPNG
...
Restore lib png
2026-01-01 08:37:59 -06:00
marauder2k7
948fdfd353
Update pngpriv.h
...
fp.h is deprecated in macosx so just include math
2026-01-01 12:13:12 +00:00
marauder2k7
37934ccdac
downgrade libpng
...
added zlib_root to libpng includes
2026-01-01 11:47:39 +00:00
marauder2k7
782ac5d82c
Update pnglibconf.dfa
2026-01-01 11:13:31 +00:00
marauder2k7
5d644b4ffb
update libpng
...
update libpng, the repo now requires a vcpkg setup for integrating but skipping the install step should allow it to work for windows an linux, mac might need more
2025-12-31 20:11:14 +00:00
marauder2k7
c593d860a0
Update CMakeLists.txt
2025-12-31 19:36:51 +00:00
Brian Roberts
0f32c10a2c
Merge pull request #1647 from marauder2k9-torque/development
...
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
Update guiPopUpCtrl.cpp
2025-12-31 10:00:47 -06:00
Brian Roberts
9ebbd638a0
Merge pull request #1646 from Azaezel/alpha41/nullPtrNoNo
...
dial back nullPtr usage
2025-12-31 10:00:08 -06:00
marauder2k7
7f351ef429
Restore LIBPNG for png files
...
Restores the use of libpng for png files as stb does not support writing out 16bit png files.
2025-12-31 11:00:07 +00:00
marauder2k7
26ae2f8420
Update guiPopUpCtrl.cpp
...
Fix for "|" in text for popupctrl
If 1 was found it was just assuming all other bars existed for a colour input.
there could be a cleaner way to do this but the direct approach allows for clear safeties.
2025-12-31 05:55:11 +00:00
AzaezelX
5ffa3b81f1
dial back nullPtr usage
...
while it still remains a good idea to port as many NULL compares and assignments over to nullPtr as feasable, we do still need to sort out how to better support scripted empty, false, and zero assigns for things like objectIDs.
this means we'll need to both fully convert the backend of the parser to support that kind of thing, but also alter most if not all exisiting NULLs. up to and including things like SAFE_DELETE. while that's certainly feasable, given there's aproximatel 400 nullptr assigns/checks prior to this commit, and roughly 1800 of the prior, if it terminates in a script call and not an aip one direct, we'll be dialing that back until such time as fork fully fopcused on converting and resolving any lingering mismatches is completed.
2025-12-29 17:45:09 -06:00
AzaezelX
235be5eccd
remove damagemodel from the game subgroup
2025-12-29 17:36:08 -06:00
Brian Roberts
e9296bc882
Merge pull request #1645 from Azaezel/alpha41/truncationCorrection
...
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
truncation correction
2025-12-29 14:29:23 -06:00
AzaezelX
c65343b3c2
truncation correction
...
followup to https://github.com/TorqueGameEngines/Torque3D/pull/1639
clean up output calc formatting
2025-12-29 14:26:53 -06:00
Brian Roberts
e9205027f7
Merge pull request #1644 from Azaezel/development
...
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
Revert "Merge pull request #1640 from Azaezel/alpha41/ExtraOnAdds"
2025-12-29 08:07:23 -06:00
AzaezelX
da67ff746f
Revert "Merge pull request #1640 from Azaezel/alpha41/ExtraOnAdds"
...
This reverts commit 7cad8615365246202357
2025-12-29 08:06:45 -06:00
AzaezelX
53ad8ccc6d
offload weapon/ammo counter update commands to the generic damagemodel
2025-12-28 14:19:17 -06:00
Brian Roberts
7519c5693c
Merge pull request #1637 from Azaezel/alpha41/SDLUpdate2.32.10
...
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
update sdl2 to 2.32.10
2025-12-28 14:14:39 -06:00
Brian Roberts
a10a5dedf9
Merge pull request #1642 from vitawrap/patch-1
...
ConvexFeature: Fix collision list object references
2025-12-28 14:12:29 -06:00
vitawrap
f394db4b36
ConvexFeature: Fix collision list object references
...
Turns out ConvexFeature::collide assumes the second round of testVertex calls will only add one entry to the collision list at a time and was erroneously only changing the last object and material reference.
2025-12-28 17:46:46 +01:00
Brian Roberts
e3df069570
Merge pull request #1641 from Azaezel/alpha41/unadd
...
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
Revert "trip onadd in additional places"
2025-12-27 15:30:02 -06:00
AzaezelX
67a74a0553
Revert "trip onadd in additional places"
...
This reverts commit 4f639a16b5
2025-12-27 15:28:27 -06:00
Brian Roberts
7cad861536
Merge pull request #1640 from Azaezel/alpha41/ExtraOnAdds
...
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
trip onadd in additional places
2025-12-27 10:28:49 -06:00
AzaezelX
4f639a16b5
trip onadd in additional places
...
by request,
adds a per object-instance onadd for datablocks if an object instance *also* defines a class.
be mindful not to mix up which namespace is in use there, as you can not tag two different core class instances the same scripted class
implements the same with the same restrictions for simobjects in general
2025-12-27 09:02:21 -06:00
Brian Roberts
5246202357
Merge pull request #1639 from Azaezel/alpha41/matTileScale
...
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Has been cancelled
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (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 material tileScale
2025-12-26 10:30:34 -06:00
