Merge remote-tracking branch 'WD-core/master' into upstream-5

Browse Source

...

This commit is contained in:

BIGZi0348

2024-11-23 18:44:29 +03:00

parent 1e4ab963f6 4ef3b2837e

commit ca3cb97bbd

34 changed files with 499 additions and 199 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

0

Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/equipped-BELT.png → Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands.rsi/equipped-BELT.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 509 B After Width:  |  Height:  |  Size: 509 B

0

Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/equipped-SUITSTORAGE.png → Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands.rsi/equipped-SUITSTORAGE.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 509 B After Width:  |  Height:  |  Size: 509 B

0

Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/inhand-left.png → Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands.rsi/inhand-left.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 966 B After Width:  |  Height:  |  Size: 966 B

0

Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/inhand-right.png → Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands.rsi/inhand-right.png

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 1.0 KiB

0

Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands/meta.json → Resources/Textures/White/Objects/Weapons/Guns/Pistols/cobra-inhands.rsi/meta.json