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
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
marauder2k7
a8d7664fc2
named target material reload clean
...
clean up the previous requirements for namedTarget to display on a material
2025-03-27 08:31:28 +00: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
marauder2k7
3b70689abc
clean out old macros
2025-03-26 21:16:43 +00:00
marauder2k7
7af992970a
Update ImageAsset.cpp
...
update getAssetIdByFilename to also check the imageFile of the asset
This helps match filenames for assets created privately such as probe bakes and targets
2025-03-26 18:51:44 +00:00
marauder2k7
b630442683
Update assetManager.cpp
...
stop crash when dumping declared assets if the asset is private
2025-03-26 17:34:25 +00:00
marauder2k7
086db03bbc
Update ImageAsset.h
2025-03-26 15:42:26 +00:00
marauder2k7
f59ccc3f99
Update ImageAsset.h
2025-03-26 15:41:53 +00:00
marauder2k7
465c79f39d
Update ImageAsset.h
...
update macros to share target functionality
add extra check to see if image asset exists.
2025-03-26 15:07:07 +00:00
marauder2k7
d86962d1fd
requirements for postfx
...
update to handle posteffects with image_asset_refactor
2025-03-26 14:31:11 +00:00
Brian Roberts
a4dcfb0cc2
Merge pull request #1426 from Azaezel/alpha41/wetwipes
...
fix wetness
2025-03-26 06:22:19 -05:00
AzaezelX
9f11f132d3
fix wetness
2025-03-26 06:22:01 -05:00
marauder2k7
e1a2a6d9f9
fix material editor
...
material editor now handles named targets propertly when loading
also update preview image in material editor
2025-03-26 10:55:54 +00:00
marauder2k7
16d219769f
set preview image
...
set the image asset preview image for namedTargets
2025-03-26 10:12:14 +00:00
marauder2k7
bab7878ca6
give named target a fallback
...
we need to give named target a fallback image so references are kept when a named target is not ready.
2025-03-26 09:12:06 +00:00
marauder2k7
9f2ab5a64e
Update particleEmitter.cpp
...
null check around asset
2025-03-26 07:57:14 +00:00
marauder2k7
9ff4c84bc8
Merge remote-tracking branch 'upstream/development' into imageAsset_refactor_rev3
2025-03-25 21:02:57 +00:00
Brian Roberts
5436429e05
Merge pull request #1425 from Azaezel/alpha41/forwardFix
...
fix forward cubemip
2025-03-25 14:28:01 -05:00
