TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1599 from Azaezel/cleanupCleanups
Some checks failed
Linux Build / ${{matrix.config.name}} (map[build_type:Release cc:gcc cxx:g++ generator:Ninja name:Ubuntu Latest GCC]) (push) Has been cancelled
Details
MacOSX Build / ${{matrix.config.name}} (map[build_type:Release cc:clang cxx:clang++ generator:Ninja name:MacOSX Latest Clang]) (push) Has been cancelled
Details
Windows Build / ${{matrix.config.name}} (map[build_type:Release cc:cl cxx:cl environment_script:C:/Program Files (x86)/Microsoft Visual Studio/2022/Enterprise/VC/Auxiliary/Build/vcvars64.bat generator:Visual Studio 17 2022 name:Windows Latest MSVC]) (push) Has been cancelled
Details

Browse source 
clean up polluted placeholder slots
This commit is contained in:
Brian Roberts 2025-12-04 20:52:26 -06:00 committed by GitHub
parent 2ebd49a058 d822ebb178
commit 563c0266e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Templates/BaseGame/game/data/DamageModel/guis/damageGuiOverlay.gui
View file

@ -25,8 +25,7 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
};
new GuiCrossHairHud(Reticle) {
damageOffset = "0 10";
BitmapAsset = "FPSEquipment:crosshair_image";
BitmapFile = "data/FPSEquipment/images/weaponHud/crossHair.png";
BitmapAsset = "";
position = "624 344";
extent = "32 32";
minExtent = "8 8";
@ -64,8 +63,7 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
tooltipProfile = "GuiToolTipProfile";
};
new GuiBitmapCtrl(previewImage) {
BitmapAsset = "FPSEquipment:ryder_image";
BitmapFile = "data/FPSEquipment/images/weaponHud/ryder.png";
BitmapAsset = "UI:hudfill_image";
position = "8 0";
extent = "108 56";
horizSizing = "width";