Commit graph

7886 commits

Author SHA1 Message Date
marauder2k7
2e64d36382 Update mathTypes.cpp
fix matrix types, should of been using columns not the rows
2025-04-10 08:13:10 +01:00
Brian Roberts
cdaa6533b2
Merge pull request #1441 from Azaezel/alpha41/controlConfusion
handle relfecting the health of the controlled object
2025-04-09 12:08:49 -05:00
marauder2k7
ee4acc98fe Update propertyParsing.h
bahhh humbug
2025-04-09 16:29:03 +01:00
marauder2k7
cd7666bf2a rename overloaded function so linux and mac stop bitching 2025-04-09 16:05:22 +01:00
marauder2k7
7c3fbfc9d8 add getter for console get types
templated function for getting data from a field
2025-04-09 15:14:46 +01:00
AzaezelX
9007aa9532 basic vehicle eject onDestroyed code
leverages Parent to also call the rest of the deletions
also fix setdamagedirection for players driving vehicles instead of either on thier own
2025-04-08 19:50:47 -05:00
AzaezelX
d0d2e1f343 handle relfecting the health of the controlled object
players and vehicles can both be the controlobject, or you can control a vehicle *through* a player.
set the health bar/text controls to reflect that state
2025-04-08 18:30:06 -05:00
marauder2k7
47f68d9371
Merge pull request #6 from Azaezel/IntegerParsing
on balance we'll want to round instead of truncate
2025-04-08 22:15:19 +01:00
AzaezelX
b886cbb527 on balance we'll want to round instead of truncate 2025-04-08 16:09:54 -05:00
marauder2k7
f30ff6734e Update mathTypes.cpp
mathtypes.cpp ConsoleSetTypes now converted
2025-04-08 10:13:48 +01:00
marauder2k7
1cb2109d6e Update mathTypes.cpp
update matrix/ang types to use the new function
change all print's to warn's
2025-04-08 09:51:38 +01:00
marauder2k7
802f90bf69 init commit
initial commit of templated ParseProperty function
TypePoint and TypeRect consoleSetTypes now use the new templated function
2025-04-08 08:16:09 +01:00
AzaezelX
5cf54580e6 Generic Damagemodel
included in root/data/ as a module so theres a generic folks can riff off of
additionally, includes a physcs based damage option inspector exposed augment for velicity based collisions, as well as utilities for applying damage to the object a given thing is mounted to
further. also fixes a lack of vehicles being able to use thier mvTriggerCount4 and 5 for the additional 2 mountpoints allowed
2025-04-06 16:09:14 -05:00
Brian Roberts
a996c09b04
Merge pull request #1437 from Azaezel/alpha41/bakePosPoke
fix make a mesh sometimes shifting position in level
2025-04-05 21:10:04 -05:00
AzaezelX
8ef5760b5d fix make a mesh sometimes shifting position in level
leverage the fact that when we create the backup prefab, that compresses down to one selected object
from there we can get it's position and use that for the bake location
2025-04-05 16:38:27 -05:00
marauder2k7
7c4d41ee21 Merge remote-tracking branch 'upstream/development' into imageAsset_refactor_rev3 2025-04-05 15:59:02 +01:00
Brian Roberts
86627f2fca
Merge pull request #1436 from Azaezel/alpha41/rangeFinding
add difFloatPi range validator
2025-04-03 16:53:18 -05:00
AzaezelX
2d974cebf5 add difFloatPi range validator
player:
apply to player min/max angle
allow fallingspeedthreshold to go negative
splashdata:
velocity, hieght, acceleration and startradius can all be negative
wrap material animation range from -1 to 1
2025-04-03 16:52:49 -05:00
Brian Roberts
68f44c1596
Merge pull request #1435 from Azaezel/alpha41/rotationRot
fix (?) rotation
2025-04-03 12:05:56 -05:00
AzaezelX
0e78312e95 fix (?) rotation
set the behaviour back to prior calcs, plus allow the desired scroll combo to work
2025-04-02 23:07:09 -05:00
Brian Roberts
67a1805061
Merge pull request #1434 from Azaezel/alpha41/badDB
typofix for bad %client.spawnDataBlock filtering
2025-04-02 17:40:53 -05:00
AzaezelX
3b2651c0ab typofix for bad %client.spawnDataBlock filtering 2025-04-02 17:40:37 -05:00
Brian Roberts
f41cdaaa7e
Merge pull request #1430 from Azaezel/alpha41/GFXRedundancyCleanups
clean up (some) shader variation redundancies
2025-04-02 16:21:57 -05:00
Brian Roberts
46a4cd71e2
Merge pull request #1433 from Azaezel/alpha41/dontBeATool
encapsulate tool-only code for levelassets
2025-04-02 16:21:47 -05:00
Brian Roberts
2e33228009
Merge pull request #1432 from Azaezel/alpha41/percent
add 0-100 percent ranges
2025-04-02 16:21:36 -05:00
Brian Roberts
79ceb9a798
Merge pull request #1431 from Azaezel/alpha41/fixFailspawn
fix spawn failure reports
2025-04-02 16:21:23 -05:00
AzaezelX
664e9db571 fix S32Percent type-o 2025-04-02 15:44:49 -05:00
AzaezelX
b299b54467 encapsulate tool-only code for levelassets 2025-04-02 15:38:43 -05:00
AzaezelX
3d2a923a30 add 0-100 percent ranges
F32 and S32
apply to guibitmapbarctrl
2025-04-02 15:33:39 -05:00
AzaezelX
8ac9da0e9f fix spawn failure reports
also force the fallbacks on failures
2025-04-01 20:48:50 -05:00
AzaezelX
d82e8dbec4 clean up (some) shader variation redundencies
don't need to use macros for the shader textfile hashkeys
several no longer used GFXVertexFormats removed
2025-04-01 18:23:29 -05:00
JeffR
0bf38aacf3 Made the Asset Properties inspector ctrl be a regular GuiInspector control
Standardized the image asset action menu and editing callbacks while leaving it open for modification/expansion later as needed
2025-04-01 02:10:13 -05:00
JeffR
5566f8a396 Updated handling of subscenes in assets to be it's own distinct definition to avoid parsing and detection issues, as well as fields to be handled distinctly between the types 2025-03-30 16:36:15 -05:00
JeffR
c2af4e578b Merge branch 'Standardized_AB_AssetManagement' of https://github.com/Areloch/Torque3D into development 2025-03-30 15:03:43 -05:00
marauder2k7
79e046d379 Update processedShaderMaterial.cpp
requires extra safety when the diffusemap asset is null, this is something that will be fixed by the material asset refactor
2025-03-30 12:22:17 +01:00
marauder2k7
774bd874b5 Update ImageAsset.cpp
early out of generateTexture
2025-03-30 11:44:55 +01:00
marauder2k7
73ad92b757 review notes from Az
Should render fallback for namedTarget if namedTarget fails
Add safety around namedtarget getTexture to stop assert
Missing assets should revert to fallback image and print a warning to console
Remove REFACTOR tag from all macros.
2025-03-30 11:22:42 +01:00
Brian Roberts
0546eae408
Merge pull request #1428 from Azaezel/sgCleanups
clean up shadergen ambient handling
2025-03-29 14:58:01 -05:00
AzaezelX
b92b5b34fd clean up shadergen ambient handling
fallback needs to a) set the same value as elswhere. b) treat uniforms the same. c) exist on both ends to ensure order of ops doesn't mangle things
2025-03-29 14:43:03 -05:00
marauder2k7
b707b2e2b7 final rev
add safeties to getters
getTextureBitmap/ functions to return member variable that is collected when the image is set
2025-03-28 15:32:16 +00:00
marauder2k7
6eac6d767b cleanup areas checking for named tex target in materials 2025-03-28 14:05:03 +00:00
marauder2k7
435462c738 fix the other previewss 2025-03-28 13:00:25 +00:00
marauder2k7
9cf17ae9a0 Update assetBrowser.tscript
remove spam from debug echos
2025-03-28 12:41:42 +00:00
marauder2k7
bfe2401ebb get image metadata
adds ability to get image metadata without loading the texture
since we are using the getOwned parameter correctly now new assets must have the full path to the image file when being created
when the asset becomes owned again the image file path will be updated.
2025-03-28 11:14:21 +00:00
marauder2k7
db8c565416 ID10T issue
we dont want both fileChanged and resourcechanged.... causes issues
2025-03-27 19:34:11 +00:00
marauder2k7
fc30d178af fix asset refresh on materialAssets 2025-03-27 18:33:37 +00:00
marauder2k7
4d14610753 Update materialEditor.ed.tscript
cleanup materialEditor script
2025-03-27 09:22:22 +00:00
marauder2k7
fad397d914 always cleanup -_- 2025-03-27 09:11:40 +00:00
marauder2k7
ea49af52a5 Update materialManager.cpp 2025-03-27 09:00:12 +00:00
marauder2k7
c025ea86b4 more cleanups
cleanup the type removing the refactor tag
materialManager restored to its original state
2025-03-27 08:59:50 +00:00