Commit Graph

27 Commits

Author SHA1 Message Date
Viljam Ilves cdf564afe8 Merge branch 'main' of https://cgvrgit.ulno.net/Villui/VRTowerDef 2024-05-26 22:05:56 +03:00
Viljam Ilves f58f3552bc New merge test 2024-05-26 22:05:40 +03:00
Villui 9a84f66b13 Merge pull request 'mergebranch' (#3) from mergebranch into main
Reviewed-on: #3
2024-05-26 19:03:25 +00:00
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
Viljam Ilves 1c80ebaab4 Merge commit 2024-05-26 21:42:03 +03:00
Henri b881ab3333 Merge remote-tracking branch 'origin/main'
# Conflicts:
#	Content/VRTemplate/Maps/VRTemplateMap.umap
2024-05-22 16:03:34 +03:00
Henri 97b01f5581 ballista improvements again 2024-05-22 15:55:18 +03:00
DOMENIS\kkits 959985ca71 spline added to viljam map 2024-05-22 15:46:07 +03:00
DOMENIS\kkits 2b7111084e spline movement 2024-05-22 15:42:02 +03:00
DOMENIS\villui 5eefea1399 small changes to level 2024-05-22 15:38:59 +03:00
DOMENIS\villui 9b98ae234a Initial level layout 2024-05-22 15:28:41 +03:00
Henri d9ef57118a corrected ballista bolt model 2024-05-22 13:11:14 +03:00
Henri f8dc961a28 reimport VRPawn + fix ballista physics 2024-05-15 15:34:03 +03:00
HSellis d830e91de9 some fixes to ballista bolt loading 2024-05-15 09:47:13 +03:00
HSellis 3ec4b96858 ballista reloading 2024-05-14 23:20:33 +03:00
HSellis 887ee2dde3 WIP modify GrabComponent and VRPawn to support SnapColliding 2024-05-14 21:34:21 +03:00
HSellis 03dd83cbbb Ballista reloads bolt after shooting 2024-05-14 10:21:22 +03:00
HSellis 0a0c09c86b Ballista firing sound effect 2024-05-14 09:47:30 +03:00
HSellis c1ddb20ed5 trying to fix GrabComponent 2024-05-07 21:50:46 +03:00
HSellis b310b8c8f1 WIP custom GrabComponent with SnapColliding options 2024-05-07 21:40:11 +03:00
Kevin Kits 2d5e1ae544 ballista shoots bolts 2024-04-17 03:06:23 +03:00
HSellis 0c099eb951 Ballista prototype 2024-04-13 12:26:36 +03:00
DOMENIS\villui ea7239b76a Updated to UE 5.3 2024-04-10 14:19:30 +03:00
Henri 1174b5e324 VR Project Template 2024-04-10 13:55:02 +03:00
Villui f6ab9c9395 Initial commit 2024-04-10 10:37:51 +00:00