Brian Roberts
2a9aa3a9d5
Merge pull request #1461 from Azaezel/alpha41/CreateCompositeCleanups
...
cleanup strays
2025-05-18 08:29:05 -05:00
Brian Roberts
4ec85c1e43
Merge pull request #1466 from marauder2k9-torque/ISPLAYERBUILD-Added-function
...
add isPlayerBuild functon
2025-05-18 08:28:51 -05:00
marauder2k7
ecd8102688
Update consoleFunctions.cpp
...
add isPlayerBuild functon to see if this is a playback only build of torque.
2025-05-18 13:23:45 +01:00
Brian Roberts
70502d1b0f
Merge pull request #1465 from Areloch/NoToolsBuildFix
...
Adds the necessary ifdef flags to re-enable the ability to build with tools disabled
2025-05-17 18:42:28 -05:00
JeffR
cac068d2c5
Adds the necessary ifdef flags to re-enable the ability to build with tools disabled
2025-05-17 18:41:15 -05:00
Brian Roberts
a0838b58f2
Merge pull request #1464 from Azaezel/alpha41/PrototypingPunt
...
shift prototyping UI into tools proper
2025-05-17 16:25:28 -05:00
AzaezelX
26d0e427de
shift prototyping UI into tools proper
...
was prototyped in the prototyping module. now properly resides in tools
2025-05-17 16:25:07 -05:00
Brian Roberts
557101b338
Merge pull request #1463 from Azaezel/alpha41/rewdebugLeaktracking
...
allow relwdebug leak tracing
2025-05-17 13:59:12 -05:00
AzaezelX
c160401c72
allow relwdebug leak tracing
...
use TORQUE_ENABLE_ASSERTS, not just DEBUG for a filter
2025-05-17 13:58:48 -05:00
Brian Roberts
5d4f8b37d7
Merge pull request #1462 from marauder2k9-torque/development
...
BUGFIX: Reported by Steve at 16052025
2025-05-16 11:37:02 -05:00
marauder2k7
f24e9f5195
Update mathTypes.cpp
...
TransformF can take 7 or 3 values so on false just set position for now. We may need to change ParseProperty to return a count for such cases as this and be able to tell whether its just position, rotation or both being set
2025-05-16 17:27:34 +01:00
AzaezelX
37f28dfbd7
cleanup strays
...
handle clearing composite input textures
we no longer have a material value labeled emissive.
2025-05-16 10:54:00 -05:00
Brian Roberts
e2faa8c49c
Merge pull request #1460 from marauder2k9-torque/FIX-Channel-buttons-feeding-createComposite-not-working
...
Fix the channel selection for the create composite texture
2025-05-16 10:46:07 -05:00
marauder2k7
f64c7ce7aa
Update materialDefinition.h
...
the values holding the channel selection were set to floats when they were expecting integer values.
2025-05-16 16:16:41 +01:00
Brian Roberts
3fd333d3a2
Merge pull request #1459 from marauder2k9-torque/BUGFIX-reported-bug-by-steve-16052025
...
Update assetImporter.cpp
2025-05-16 09:35:33 -05:00
marauder2k7
a9240b87f4
Update assetImporter.cpp
...
image asset importer was doubling up on the filepath.
2025-05-16 08:14:25 +01:00
Brian Roberts
debcd31faa
Merge pull request #1458 from Areloch/FixSimView
...
Fixes for SimView window
2025-05-15 20:29:26 -05:00
JeffR
311878829c
Fixes the layout of the Torque SimView window so the layout is correct and also adds in the search functionality that had been removed accidentally
2025-05-15 20:22:11 -05:00
Brian Roberts
efa9878173
Merge pull request #1457 from Areloch/AssetBrowserCreatorFixes
...
Fixes the handling of creator entries in the asset browser
2025-05-15 17:46:07 -05:00
JeffR
65c290a770
Simplified the code to the important part as we do the position math previously.
...
Also added the stub for the onGUIEditorDropped
2025-05-15 12:50:21 -05:00
JeffR
c6213f0d12
Fixes the handling of creator entries in the asset browser
2025-05-15 11:14:53 -05:00
Brian Roberts
4bed40e545
Merge pull request #1456 from Azaezel/fixControllerAssign
...
fix controller autoasignment script
2025-05-14 10:18:13 -05:00
AzaezelX
9b2ccb8bd5
fix controller autoasignment script
...
the navmesh editor will try and bolt on an aicontroller initially referencing a datablock.aiControllerData for any given thing clicked on.
make sure if you saved a file with one still referenced, it wont try to use the old one
2025-05-14 10:17:55 -05:00
Brian Roberts
5e2e82bf7a
Merge pull request #1455 from marauder2k9-torque/BUGFIX-Reported-by-Wizk-13052025
...
BUG: Reported by Wizk 13/05/2025
2025-05-13 19:25:33 -05:00
marauder2k7
6870a040e2
purge assets and clear image
...
image asset was missing a clear, passing a null value should clear the image asset and set it to null on materials.
2025-05-14 00:57:38 +01:00
marauder2k7
aa3f07e339
update macro
...
Added get##name##File to macro that will check to make sure the asset is not null before getting the image file.
2025-05-14 00:30:47 +01:00
marauder2k7
a52069bbc5
processed material null ref
...
processedMaterial was not checking to see if each asset was null before getting the image filename inside the call to _createCompositeTexture
2025-05-13 23:46:54 +01:00
Brian Roberts
c0d87cd3f1
Merge pull request #1454 from marauder2k9-torque/FixCompile-imageAsset
...
Fix after merge of image_asset
2025-05-12 19:27:30 -05:00
marauder2k7
cbde207fdd
Update assetManager.cpp
...
fix crash on exit
2025-05-12 22:58:52 +01:00
marauder2k7
f86497434e
is named target
...
clear out texHandles on teardown of imageAssets.
2025-05-12 22:17:01 +01:00
Brian Roberts
1ef3d4066c
Merge pull request #1453 from Azaezel/stray
...
kill stray merge leftover
2025-05-12 15:51:32 -05:00
marauder2k7
18b1b6d1d0
Update image.tscript
2025-05-12 21:51:16 +01:00
AzaezelX
e13abbcf00
kill stray merge leftover
2025-05-12 15:51:15 -05:00
Brian Roberts
6cda97867c
Merge pull request #1452 from marauder2k9-torque/MEMORY-MANAGER-REFACTOR
...
Memory Manager Refactor
2025-05-12 15:31:06 -05:00
Brian Roberts
5aa67f680f
Merge pull request #1343 from marauder2k9-torque/imageAsset_refactor_rev3
...
Image Asset Refactor - For 4.2
2025-05-12 15:30:37 -05:00
marauder2k7
fb1840ab1d
Update console.h
2025-05-12 21:17:26 +01:00
marauder2k7
eec4573782
Update torqueConfig.h.in
2025-05-12 16:49:08 +01:00
marauder2k7
2207ae4a65
Update console.h
2025-05-12 16:35:08 +01:00
marauder2k7
e1c01cd49a
Merge remote-tracking branch 'upstream/development' into imageAsset_refactor_rev3
2025-05-12 14:45:41 +01:00
marauder2k7
41c3f610be
remove free from scripting lanugage
...
was causing issues with foreach
2025-05-12 12:50:49 +01:00
marauder2k7
04fa9d87f4
Revert "Update EditorGui.ed.tscript"
...
This reverts commit 0f819a3af4
2025-05-12 12:50:31 +01:00
marauder2k7
0f819a3af4
Update EditorGui.ed.tscript
...
clean teardown around editorPluginSet not sure why this is failing at the foreach but editorPluginSet doesnt seem to exist during the teardown of everything and foreach causes a null reference to be fired off.
2025-05-12 11:56:26 +01:00
marauder2k7
b54ed77f7a
Update console.h
2025-05-12 11:50:57 +01:00
marauder2k7
e5e3efb30c
Update platformMemory.h
2025-05-12 11:50:56 +01:00
marauder2k7
f3046a9c3e
Update ScriptTest.cpp
2025-05-12 11:50:54 +01:00
marauder2k7
c6e0eade04
az changes
2025-05-12 11:50:53 +01:00
marauder2k7
1ddc7219a5
Update console.h
2025-05-12 11:50:52 +01:00
marauder2k7
954c3b03db
Revert "Update console.h"
...
This reverts commit 76c17179e695df08466c34bf334c1e819ad59c76.
2025-05-12 11:50:51 +01:00
marauder2k7
bdcd60f8af
Revert "Update ScriptTest.cpp"
...
This reverts commit 40aa2414ebeb14274aed4d2b77f6847ac0f8b28b.
2025-05-12 11:50:50 +01:00
marauder2k7
f2d4d7103a
Revert "Update torqueConfig.h.in"
...
This reverts commit bf6c8827a1e6863804c32905f20b1df15b74fa1f.
2025-05-12 11:50:49 +01:00
