Commit graph

4738 commits

Author SHA1 Message Date
Brian Roberts b095134df8
Merge pull request #1451 from Azaezel/alpha41/cleanerCleanups
isobject and obj.delete safties
2025-04-29 20:25:39 -05:00
AzaezelX 62aadf9114 isobject and obj.delete safties
isobject isn't actually one if it's yet to be properlyAdded, or already marked with isRemoved
likewise don't try and delete a deleted thing
2025-04-29 16:45:25 -05:00
Brian Roberts db57f67839
Merge pull request #1450 from Azaezel/alpha41/popUpGoPop
fix PopupMenu::checkItem filter
2025-04-29 15:45:54 -05:00
AzaezelX c04eaa5862 fix PopupMenu::checkItem filter
reminder size is the total element count of the vector
2025-04-29 15:45:39 -05:00
Brian Roberts 798936ebd2
Merge pull request #1325 from Areloch/Standardized_AB_AssetManagement
Updates most of the handling of asset types to follow a more standardized type-registration system.
2025-04-29 13:19:50 -05:00
AzaezelX be35c27411 Merge branch 'development' of https://github.com/TorqueGameEngines/Torque3D into alpha41/DamageModel
# Conflicts:
#	Engine/source/T3D/vehicles/vehicle.cpp
2025-04-28 10:53:53 -05:00
Brian Roberts 2ac15f74f2
Merge pull request #1443 from Azaezel/alpha41/controlModel
add a controlmap entry
2025-04-28 10:50:02 -05:00
AzaezelX 2ae10c7ce1 add reload status to onNewDataBlock callback
and skip calling onremove/onadd if we're not reloading
2025-04-27 19:49:13 -05:00
JeffR 24db0305f6 Modified callback to ensure that when a shapeAsset changes, groundCovers properly re-initialize to reflect the change 2025-04-24 13:24:26 -05:00
JeffR f31acf774e Adds handling for datablocks to be reloaded if the assets they utilize have their files directly edited. 2025-04-24 00:58:20 -05:00
AzaezelX f0c0f3c42c projectile augs
use impactforce to applyimpulse for stock physics too
add an optional explodeOnTmeout
for nonballistic projectiles, track if they hit something before their armingdelay is up, and delete them next simulation cycle
2025-04-16 13:08:39 -05:00
Brian Roberts 75e23e85ea
Merge pull request #1440 from marauder2k9-torque/IntegerParsing
Parse Property Templated function
2025-04-14 10:03:35 -05:00
AzaezelX 5b2c0c7703 add a controlmap entry
for players, vehicles, and turret datablocks
add a client command to setMovemap(%object.getDatablock().controlMap)
2025-04-13 14:51:30 -05:00
marauder2k7 0ff636e9ca Update mathTypes.cpp 2025-04-10 08:56:40 +01:00
marauder2k7 77a7847eed Update mathTypes.cpp 2025-04-10 08:56:20 +01:00
marauder2k7 fae5ebb9e8 null termination was wiping buffer 2025-04-10 08:55:42 +01:00
marauder2k7 2e64d36382 Update mathTypes.cpp
fix matrix types, should of been using columns not the rows
2025-04-10 08:13:10 +01: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 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
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
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
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 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
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 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 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
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
Brian Roberts 85c7a68f46
Merge pull request #1427 from Azaezel/alpha41/riverRun
flowMagnitude and ripplespeed can go negative
2025-03-26 22:16:23 -05:00
AzaezelX 289d42cc10 flowMagnitude and ripplespeed can go negative 2025-03-26 22:12:19 -05:00
Brian Roberts 5436429e05
Merge pull request #1425 from Azaezel/alpha41/forwardFix
fix forward cubemip
2025-03-25 14:28:01 -05:00
Brian Roberts 6ffe7500cd
Merge pull request #1423 from Olathuss/gametsctrl-mouserefactor
Gametsctrl mouserefactor
2025-03-25 14:25:49 -05:00
AzaezelX 5e79c01208 fix forward cubemip
in case of temporary loss of the probe array, fall back to a (slightly) less arbitrary probemanager mip level as oposed to assuming 1 mip exists
2025-03-25 14:25:29 -05:00
Olathuss 3dabbc83ff Fixed callbacks to replace char* with Point classes
Replacing char* in callbacks with Point2I and Point3F classes for better readability and overhead
2025-03-25 11:07:14 -06:00
Olathuss df5ffd9e10 Remove extraneous function
Remove extraneous function makeScriptCall which is no longer used.
2025-03-25 10:47:35 -06:00
Olathuss 32bc068f7f Added PlatformTimer for mouse callbacks
Added PlatformTimer to GameTSCtrl to limit mouse move/drag callbacks.
2025-03-24 12:04:36 -06:00
AzaezelX 61e4107c39 handle feeding a cubemap via 2d textures
courtessey marauder
2025-03-24 11:32:09 -05:00
AzaezelX 61dbbf7102 clean up brdf
it was loading in the wrong colorspace, and there as a mix of texture/textureLOD refs leading to inconsistencies
2025-03-22 13:38:09 -05:00
marauder2k7 c476b292a6 Update gfxD3D11Cubemap.cpp
put arraySize check back in
2025-03-20 15:51:39 +00:00
marauder2k7 ef856e23fa fix and cleanup 2025-03-20 15:26:52 +00:00