1
0
mirror of https://projects.caleb-brown.dev/UDRI-XRT/UDRIGEEKCup2024.git synced 2025-01-22 15:18:25 -05:00
Commit Graph

129 Commits

Author SHA1 Message Date
Kip Taylor
baf421843a Moved objects 2024-04-23 12:59:56 -04:00
Kip Taylor
e55fba92ab Fixing scripts and adding objects 2024-04-23 12:53:11 -04:00
Kip Taylor
887ce10607 Merge branch 'development' into Obstical-Work 2024-04-23 12:27:12 -04:00
Caleb Brown
417d74c484 Merge pull request 'feature/LoadingCourseOnPlane' (#21) from feature/LoadingCourseOnPlane into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/21
2024-04-23 15:43:36 +00:00
Noah
81310d0779 Merge branch 'development' into feature/LoadingCourseOnPlane 2024-04-23 11:15:29 -04:00
Noah
52f19289f1 Good To Go 2024-04-23 11:14:59 -04:00
Kip Taylor
6d2d1b116c Fina laxe fixes 2024-04-23 11:12:08 -04:00
Kip Taylor
bc31e72110 Axe anime fix i Pray 2024-04-23 11:10:56 -04:00
Caleb Brown
58bd883592 Merge pull request 'Swinging axe' (#19) from feature/Swinging-Axe into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/19
2024-04-23 14:51:12 +00:00
Kip Taylor
f3719571ae Removing tax lab add 2024-04-23 10:31:06 -04:00
Kip Taylor
5ddfdbb64f Swinging axe 2024-04-23 10:28:52 -04:00
Noah
1e0552bc57 Merge branch 'development' into feature/LoadingCourseOnPlane 2024-04-23 08:51:54 -04:00
Caleb Brown
16ee0da99f Merge pull request 'Spear Trap' (#15) from feature/Spear-Trap into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/15
2024-04-22 19:46:53 +00:00
cbrown
3d4658f9a0 Merge branch 'development' into feature/Spear-Trap
# Conflicts:
#	Assets/Scenes/TestControls.unity
2024-04-22 15:42:34 -04:00
Caleb Brown
cfefb33d7e Merge pull request 'HOTFIX: Removed half distance check on MoveFloor component' (#18) from hotfix/move-floor-distance-scale-check into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/18
2024-04-22 19:37:05 +00:00
cbrown
e6969d0805 HOTFIX: Removed half distance check on MoveFloor component 2024-04-22 15:32:35 -04:00
Caleb Brown
c0b0092845 Merge pull request 'feature/Swinging-Blade' (#14) from feature/Swinging-Blade into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/14
2024-04-22 19:11:05 +00:00
cbrown
ed3fc42dea Merge branch 'development' into feature/Swinging-Blade
# Conflicts:
#	Assets/Scenes/TestControls.unity
2024-04-22 15:06:46 -04:00
Caleb Brown
711e73f8da Merge pull request 'feature/Moving-Floor-Up-Down' (#13) from feature/Moving-Floor-Up-Down into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/13
2024-04-22 18:48:31 +00:00
cbrown
350fa0b8e8 Merge branch 'development' into feature/Moving-Floor-Up-Down 2024-04-22 14:43:59 -04:00
cbrown
d1fe9789eb Small fix to the MoveFloor script 2024-04-22 14:43:40 -04:00
Caleb Brown
70c080ef60 Merge pull request 'Moving Floor Build' (#12) from feature/Moving-Floor into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/12
2024-04-22 18:14:24 +00:00
Joshua Latham
d1d5c2345e Merge pull request 'Fixed hole and ball issues. Created gameplay prefabs.' (#16) from Holeandballupdates into feature/LoadingCourseOnPlane
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/16
2024-04-22 17:47:35 +00:00
Joshua Latham
bac34dfcaf Should fix stroke count and reset issues. 2024-04-22 13:40:07 -04:00
Joshua Latham
fca315e745 Merge branch 'feature/LoadingCourseOnPlane' into Holeandballupdates 2024-04-22 13:01:20 -04:00
Joshua Latham
2cdd2896af Fixed hole and ball issues. Created gameplay prefabs. 2024-04-22 12:15:01 -04:00
Noah
4ecc72cc3a Added team ID 2024-04-22 11:51:00 -04:00
Noah
240f28e34d Merge branch 'development' into feature/LoadingCourseOnPlane 2024-04-22 11:47:12 -04:00
Noah
5a9c2748cb Merge branch 'feature/LoadingCourseOnPlane' of https://udrimavric.com/MAVRIC/UDRIGolf2024 into feature/LoadingCourseOnPlane 2024-04-22 11:46:34 -04:00
Noah
00f6421ec3 Added Spawn points 2024-04-22 11:45:49 -04:00
Joshua Latham
9e0faf5386 Updated prefabs to have colliders respond to Hole events. 2024-04-22 11:12:26 -04:00
Noah
6fac57dc51 save point 2024-04-22 10:33:22 -04:00
0764212875 Merge branch 'feature/Moving-Floor-Up-Down' into feature/Swinging-Blade
# Conflicts:
#	Assets/Scenes/TestControls.unity
2024-04-22 09:51:14 -04:00
9ca0bf5ba9 Final changes for script 2024-04-22 09:50:47 -04:00
c57b958220 Merge branch 'feature/Moving-Floor-Left-Right' into feature/Moving-Floor-Up-Down
# Conflicts:
#	Assets/Scenes/TestControls.unity
2024-04-22 09:49:51 -04:00
1fcf2fa4b0 fixes 2024-04-22 09:48:40 -04:00
13394322e2 fixed, added script and way more functionality. 2024-04-22 09:47:46 -04:00
f477607d05 Editing and fixing center of sickles 2024-04-22 09:22:22 -04:00
4e455c0a45 Fixin stuffs 2024-04-22 08:56:15 -04:00
Abraham
ded53d8ce2 Created Spear Trap and Multi-Spear Trap 2024-04-21 22:15:04 -04:00
Noah
0ccbe59c30 save point 2024-04-21 21:57:49 -04:00
Noah
97593365fe adjust GamePlayUI 2024-04-21 20:45:58 -04:00
Noah
dee8e442ae save point 2024-04-21 19:52:47 -04:00
eab4124525 Final fixes 2024-04-21 09:35:33 -04:00
99819bdfea Added Spinning Sickles
Fun little sickles
2024-04-21 09:30:49 -04:00
5ba2a7dee9 Fixes to overides 2024-04-21 08:34:09 -04:00
a5b64e99d5 Fixing scene 2024-04-21 08:28:23 -04:00
3cc7957726 Setting For Left right and Up Down Moving 2024-04-21 08:25:14 -04:00
25e6460039 Distinction between LR and UD 2024-04-21 08:07:31 -04:00
b8c3a5d791 Moving Floor Build 2024-04-21 08:02:16 -04:00