Commit graph

7666 commits

Author SHA1 Message Date
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
marauder2k7
8795a4f330 Revert "Update torqueConfig.h.in"
This reverts commit f624a85ce4c4bb89d9281ddf4f65f5318eab4c01.
2025-05-12 11:50:48 +01:00
marauder2k7
8fc91bbc1e Revert "Update console.h"
This reverts commit ffac34b2d3eb24ec6a460f2cf77e172543c15772.
2025-05-12 11:50:47 +01:00
marauder2k7
0df6e99a75 Revert "Update console.h"
This reverts commit f10080489995570036e2e5ba762357559a0abd34.
2025-05-12 11:50:46 +01:00
marauder2k7
2b14e5448e Revert "update"
This reverts commit 7ac9c55bf1efa23db674dba4f2c7ada7ca344d7d.
2025-05-12 11:50:45 +01:00
marauder2k7
5cc2abc9ae update
revert console.h to best working version
wrap includes around the TORQUE_DISABLE_MEMORY_MANAGER macro
in torqueConfig.h.in add check for whether we are in release and make sure TORQUE_DISABLE_MEMORY_MANAGER is defined.
2025-05-12 11:50:44 +01:00
marauder2k7
cb7dab4052 Update console.h 2025-05-12 11:50:42 +01:00
marauder2k7
656a8ac0bd Update console.h 2025-05-12 11:50:41 +01:00
marauder2k7
a993b72881 Update torqueConfig.h.in 2025-05-12 11:50:39 +01:00
marauder2k7
0ba8d6102d Update torqueConfig.h.in 2025-05-12 11:50:38 +01:00
marauder2k7
0690ad912a Update ScriptTest.cpp 2025-05-12 11:50:36 +01:00
marauder2k7
338eaea786 Update console.h
az: stringtable insert for stentry
2025-05-12 11:50:35 +01:00
marauder2k7
dc16c50e4e Update console.h 2025-05-12 11:50:33 +01:00
marauder2k7
8176145aaa remove more std::move
std::move needs to be used with pointers, we werent doing that and so a temp var was being copied onto the heap when it should of stayed on the stack. This caused memory leaks
2025-05-12 11:50:32 +01:00
marauder2k7
5fc9da789b changes from az
leak damn near fixed with these changes
2025-05-12 11:50:30 +01:00
marauder2k7
ee0cf872a0 moar leak plug attempts 2025-05-12 11:50:29 +01:00
marauder2k7
ea39c83afd Update console.h
might not fix the leak we were having around callbacks, but it really slows down the upcreep of memory
2025-05-12 11:50:28 +01:00
marauder2k7
bab75a3a46 clang-tidy complained about std::moves 2025-05-12 11:50:26 +01:00
marauder2k7
6237703140 Update platformMemory.cpp
stop memleaker from leaking...... yes i see the irony
free was being blocked from running when unitialized
in shutdown reset our allocList allocCount and currentAllocId so the array can be written to again
2025-05-12 11:50:25 +01:00
marauder2k7
d93f094cf5 Update console.cpp
move shutdown function to after PathExpandos is defined and clear it to remove it from memlog
2025-05-12 11:50:24 +01:00
marauder2k7
d8315267e8 clear utf16 cache
this stops the unicode global cache from showing in the memleak output
2025-05-12 11:50:22 +01:00
marauder2k7
8926d1c32b Update assetManager.cpp
purgeAssets correctly on tear down of the asset manager
2025-05-12 11:50:21 +01:00