Noah
|
35c3b30272
|
time to push
|
2024-04-25 10:26:53 -04:00 |
|
Noah
|
d9539cf44a
|
Merge branch 'development' into feature/ButtonHittingBall
|
2024-04-25 09:00:28 -04:00 |
|
Noah Calderon
|
d7584e6f4b
|
Merge pull request 'feature/find-ball-easier' (#31) from feature/find-ball-easier into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/31
|
2024-04-25 12:54:53 +00:00 |
|
Noah
|
f17164d52c
|
updates stuff
|
2024-04-25 08:43:17 -04:00 |
|
cbrown
|
48b7960bc5
|
Added Listener to disable floor collider when ball gets in hole
|
2024-04-24 15:53:30 -04:00 |
|
cbrown
|
2ba3088658
|
Added QuickOutline asset
|
2024-04-24 15:52:11 -04:00 |
|
Noah
|
d6bbeb30e0
|
Merge branch 'development' into feature/ButtonHittingBall
|
2024-04-24 15:37:27 -04:00 |
|
Noah
|
b1b4414346
|
Updates in room
|
2024-04-24 15:35:45 -04:00 |
|
Caleb Brown
|
4cb473f161
|
Merge pull request 'Made it realll good' (#30) from Obstical/Placeing-walls into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/30
|
2024-04-24 18:58:29 +00:00 |
|
Noah
|
55ea4f3be0
|
Merge branch 'development' into feature/ButtonHittingBall
|
2024-04-24 14:53:21 -04:00 |
|
Noah
|
380413a4ea
|
Added win and lose screens
|
2024-04-24 14:52:55 -04:00 |
|
|
|
49422cfeb7
|
Made it realll good
|
2024-04-24 14:44:33 -04:00 |
|
Caleb Brown
|
1f64320da5
|
Merge pull request 'Sounds and Power Increase' (#29) from feature/Sounds-Power into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/29
|
2024-04-24 16:57:12 +00:00 |
|
cbrown
|
757c214efe
|
Merge branch 'development' into feature/Sounds-Power
|
2024-04-24 12:52:35 -04:00 |
|
Caleb Brown
|
142f091044
|
Merge pull request 'adding-cool-Sukh' (#28) from adding-cool-Sukh into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/28
|
2024-04-24 16:36:40 +00:00 |
|
Noah
|
75d8deb925
|
updates
|
2024-04-24 11:16:52 -04:00 |
|
Abraham
|
88c7366379
|
Added sounds and increased hit power
|
2024-04-24 11:02:50 -04:00 |
|
Noah
|
49f79344a1
|
Updated Game Play UI
|
2024-04-24 10:53:06 -04:00 |
|
|
|
52e0c52421
|
Fixes
|
2024-04-24 10:38:22 -04:00 |
|
|
|
8df3a21083
|
Colider work
|
2024-04-24 10:36:08 -04:00 |
|
|
|
8ecd1e87b2
|
Move fix
|
2024-04-24 10:14:41 -04:00 |
|
|
|
8e5ca9b248
|
Fixed positioning
|
2024-04-24 09:10:37 -04:00 |
|
|
|
76e38e91f0
|
Final fixes
|
2024-04-24 08:49:06 -04:00 |
|
Kip Taylor
|
cec32a7c3b
|
Merge branch 'development' into adding-cool-Sukh
|
2024-04-23 15:03:28 -04:00 |
|
Kip Taylor
|
5f45fd639c
|
cool [anting
|
2024-04-23 15:03:11 -04:00 |
|
Caleb Brown
|
e36570f22c
|
Merge pull request 'Obstical-Work' (#27) from Obstical-Work into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/27
|
2024-04-23 18:38:36 +00:00 |
|
Kip Taylor
|
7741e80828
|
Merge branch 'development' into Obstical-Work
# Conflicts:
# Assets/CoursePrefabs/AR Content Control Room 1.prefab
# Assets/CoursePrefabs/AR Content Green Room.prefab
# Assets/CoursePrefabs/AR Content Main Room 1.prefab
# Assets/Scenes/TAC Lab.unity
|
2024-04-23 14:34:07 -04:00 |
|
Caleb Brown
|
a73cf79b2f
|
Merge pull request 'Portraits' (#26) from feature/Portraits into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/26
|
2024-04-23 18:30:02 +00:00 |
|
Kip Taylor
|
8c84bc53bd
|
Merge branch 'development' into Obstical-Work
# Conflicts:
# Assets/CoursePrefabs/AR Content Green Room.prefab
# Assets/CoursePrefabs/AR Content Main Room 1.prefab
|
2024-04-23 14:28:32 -04:00 |
|
Abraham Blain
|
e5c75397f1
|
Merge remote-tracking branch 'origin/development' into feature/Portraits
|
2024-04-23 14:25:12 -04:00 |
|
Caleb Brown
|
24c8635300
|
Merge pull request 'Spear/Bomb placement' (#25) from feature/Placing-Spears-Bombs into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/25
|
2024-04-23 18:22:55 +00:00 |
|
Abraham Blain
|
bc540ea9da
|
Placed even more portraits
|
2024-04-23 14:22:18 -04:00 |
|
Kip Taylor
|
86bf49d282
|
Merge branch 'development' into Obstical-Work
|
2024-04-23 14:19:51 -04:00 |
|
Kip Taylor
|
58f23250b9
|
Fire ob added
|
2024-04-23 14:19:33 -04:00 |
|
Abraham Blain
|
a3db22de46
|
Merge remote-tracking branch 'origin/development' into feature/Portraits
|
2024-04-23 14:16:37 -04:00 |
|
Abraham Blain
|
7723f53430
|
Merge remote-tracking branch 'origin/development' into feature/Placing-Spears-Bombs
|
2024-04-23 14:16:03 -04:00 |
|
Abraham Blain
|
8eb341167c
|
Placing more portraits
|
2024-04-23 14:15:40 -04:00 |
|
Caleb Brown
|
9e09e17550
|
Merge pull request 'feature/RoomAlignment' (#24) from feature/RoomAlignment into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/24
|
2024-04-23 18:12:31 +00:00 |
|
Kip Taylor
|
8d6eb84bfe
|
Merge branch 'development' into Obstical-Work
|
2024-04-23 14:09:46 -04:00 |
|
Noah
|
df3c487807
|
Merge branch 'development' into feature/RoomAlignment
|
2024-04-23 14:07:55 -04:00 |
|
Caleb Brown
|
d784215dab
|
Merge pull request 'feature/Swinging-Axe-booogaloo' (#20) from feature/Swinging-Axe-booogaloo into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/20
|
2024-04-23 18:05:23 +00:00 |
|
Kip Taylor
|
dd7cc6aa19
|
Merge branch 'development' into feature/Swinging-Axe-booogaloo
|
2024-04-23 13:59:47 -04:00 |
|
Kip Taylor
|
03729d6ccf
|
Merge branch 'development' into Obstical-Work
|
2024-04-23 13:56:11 -04:00 |
|
Abraham Blain
|
a48fc16087
|
Merge remote-tracking branch 'origin/development' into feature/Placing-Spears-Bombs
|
2024-04-23 13:56:00 -04:00 |
|
Kip Taylor
|
a80f8936d9
|
Green room updating and main room
|
2024-04-23 13:56:00 -04:00 |
|
Abraham Blain
|
feff763e73
|
reverted ar main room rotation
|
2024-04-23 13:55:26 -04:00 |
|
Noah
|
1176df33bb
|
move spawn points
|
2024-04-23 13:54:23 -04:00 |
|
Abraham Blain
|
4ee16e6538
|
Auto stash before merge of "origin/development" and "feature/Portraits"
|
2024-04-23 13:53:53 -04:00 |
|
Abraham Blain
|
8fb1caf7ea
|
Merge remote-tracking branch 'origin/development' into feature/Portraits
|
2024-04-23 13:47:18 -04:00 |
|
Abraham Blain
|
2a84b8ae49
|
Added camera looking portraits
|
2024-04-23 13:47:11 -04:00 |
|
