Compare commits

merge into: Villui/VRTowerDef:HEAD

Branches Tags

Villui/VRTowerDef:main Villui/VRTowerDef:mergebranch Villui/VRTowerDef:HEAD

...

pull from: Villui/VRTowerDef:mergebranch

Branches Tags

Villui/VRTowerDef:main Villui/VRTowerDef:mergebranch Villui/VRTowerDef:HEAD

4 Commits

HEAD ... mergebranch

Author	SHA1	Message	Date
Villui	723de18aa4	Merge branch 'main' into mergebranch	2024-05-26 19:02:37 +00:00
Villui	bb82cc5da7	revert 1c80ebaab4 ... revert Merge commit	2024-05-26 19:01:38 +00:00
Villui	98b2e5d1ad	Merge pull request 'Merge commit' (#1) from mergebranch into main ... Reviewed-on: #1	2024-05-26 18:52:14 +00:00
Villui	1c80ebaab4	Merge commit	2024-05-26 21:42:03 +03:00

8 changed files with 16 additions and 16 deletions

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

Expand all files Collapse all files

Content/Blueprints/BP_Ballista_Projectile.uasset

LFS

BIN

Binary file not shown.

Content/Blueprints/BP_Ballista_v2.uasset

LFS

BIN

Binary file not shown.

Content/Models/Ballista_bolt.uasset

LFS

BIN

Binary file not shown.

Content/Models/Ballista_bow.uasset

LFS

BIN

Binary file not shown.

Content/Models/Ballista_frame.uasset

LFS

BIN

Binary file not shown.

Content/VRTemplate/Blueprints/GrabComponent.uasset

LFS

BIN

Binary file not shown.

Content/VRTemplate/Blueprints/VRPawn.uasset

LFS

BIN

Binary file not shown.

Content/VRTemplate/Maps/VRTemplateMap.umap

LFS

BIN

Binary file not shown.