Commit Graph

Select branches

Hide Pull Requests

CourseDesign

Holeandballupdates

Obstical-Work

Obstical/Placeing-walls

adding-cool-Sukh

development

feature/AR-Anchoring

feature/Bombs

feature/ButtonHittingBall

feature/FloorRamp

feature/LoadingCourseOnPlane

feature/Moving-Floor

feature/Moving-Floor-Up-Down

feature/Placing-Spears-Bombs

feature/PlaneAnchoring

feature/PlaneAnchoring-caleb

feature/Portraits

feature/QR-Code

feature/RoomAlignment

feature/Sounds-Power

feature/Spear-Trap

feature/Swinging-Axe

feature/Swinging-Axe-booogaloo

feature/Swinging-Blade

feature/ardk-occlusion

feature/ball-sucker-trigger

feature/find-ball-easier

feature/image-position-tracking

feature/occlusion-mat

feature/outside-room

feature/set-ball-on-course-finalize

main

#1

#10

#11

#12

#13

#14

#15

#16

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#30

#31

#32

#33

#5

#6

#7

#8

#9

v1.0

Mono Color

• f2da18680d Merge pull request 'Finished product' (#33) from development into main main v1.0 Joshua Latham 2024-04-29 17:19:09 +0000
• 16155f4211 Merge pull request 'Last Minute Updates' (#32) from feature/image-position-tracking into development development Caleb Brown 2024-04-29 12:38:43 +0000
• a2c73d32e5 Last minute updates (from yesterday) feature/image-position-tracking cbrown 2024-04-26 08:52:12 -0400
• 8657ab340b Merge branch 'feature/ButtonHittingBall' into feature/image-position-tracking cbrown 2024-04-26 08:51:52 -0400
• 7a4c352b0d Fixed QR Code Tracking cbrown 2024-04-25 13:31:00 -0400
• 56af2e87ae update courses feature/ButtonHittingBall Noah 2024-04-25 13:26:43 -0400
• 33b44e84dc Merge branch 'feature/outside-room' into feature/image-position-tracking cbrown 2024-04-25 12:41:34 -0400
• eaa28b9b1d POST IT feature/outside-room Kip Taylor 2024-04-25 12:37:57 -0400
• a09b9529e4 Updated Render queue for OutsideRoom cbrown 2024-04-25 11:43:12 -0400
• 70b526a315 update Noah 2024-04-25 11:24:54 -0400
• 5cc8f8cbfb Merge branch 'development' into feature/image-position-tracking cbrown 2024-04-25 10:39:44 -0400
• 35c3b30272 time to push Noah 2024-04-25 10:26:53 -0400
• d9539cf44a Merge branch 'development' into feature/ButtonHittingBall Noah 2024-04-25 09:00:28 -0400
• d7584e6f4b Merge pull request 'feature/find-ball-easier' (#31) from feature/find-ball-easier into development Noah Calderon 2024-04-25 12:54:53 +0000
• f17164d52c updates stuff Noah 2024-04-25 08:43:17 -0400
• 48b7960bc5 Added Listener to disable floor collider when ball gets in hole feature/find-ball-easier cbrown 2024-04-24 15:53:30 -0400
• 2ba3088658 Added QuickOutline asset cbrown 2024-04-24 15:52:11 -0400
• d6bbeb30e0 Merge branch 'development' into feature/ButtonHittingBall Noah 2024-04-24 15:37:27 -0400
• b1b4414346 Updates in room Noah 2024-04-24 15:35:45 -0400
• bf391ac9a6 Merge branch 'development' into feature/image-position-tracking cbrown 2024-04-24 15:17:03 -0400
• ce3821b38c Updated the course spawn position/rotation cbrown 2024-04-24 15:16:55 -0400
• 89a212c66c Figured out how to use the qr code to position/rotate the course using the ObjectSpawner script cbrown 2024-04-24 15:16:26 -0400
• 4cb473f161 Merge pull request 'Made it realll good' (#30) from Obstical/Placeing-walls into development Caleb Brown 2024-04-24 18:58:29 +0000
• 55ea4f3be0 Merge branch 'development' into feature/ButtonHittingBall Noah 2024-04-24 14:53:21 -0400
• 380413a4ea Added win and lose screens Noah 2024-04-24 14:52:55 -0400
• 49422cfeb7 Made it realll good Obstical/Placeing-walls Ktaylor 2024-04-24 14:44:33 -0400
• 1f64320da5 Merge pull request 'Sounds and Power Increase' (#29) from feature/Sounds-Power into development Caleb Brown 2024-04-24 16:57:12 +0000
• 757c214efe Merge branch 'development' into feature/Sounds-Power feature/Sounds-Power cbrown 2024-04-24 12:52:35 -0400
• 142f091044 Merge pull request 'adding-cool-Sukh' (#28) from adding-cool-Sukh into development Caleb Brown 2024-04-24 16:36:40 +0000
• 75d8deb925 updates Noah 2024-04-24 11:16:52 -0400
• 88c7366379 Added sounds and increased hit power Abraham 2024-04-24 11:02:50 -0400
• 49f79344a1 Updated Game Play UI Noah 2024-04-24 10:53:06 -0400
• 52e0c52421 Fixes adding-cool-Sukh Ktaylor 2024-04-24 10:38:22 -0400
• 8df3a21083 Colider work Ktaylor 2024-04-24 10:36:08 -0400
• 8ecd1e87b2 Move fix Ktaylor 2024-04-24 10:14:41 -0400
• 8e5ca9b248 Fixed positioning Ktaylor 2024-04-24 09:10:37 -0400
• 76e38e91f0 Final fixes Ktaylor 2024-04-24 08:49:06 -0400
• 7763de0276 Disabled mesh renderer feature/ardk-occlusion cbrown 2024-04-23 17:14:14 -0400
• 59625219f5 Merge branch 'development' into feature/ardk-occlusion cbrown 2024-04-23 15:28:03 -0400
• 3e325e5855 WIP: ARDK Occlusion cbrown 2024-04-23 15:27:41 -0400
• cec32a7c3b Merge branch 'development' into adding-cool-Sukh Kip Taylor 2024-04-23 15:03:28 -0400
• 5f45fd639c cool [anting Kip Taylor 2024-04-23 15:03:11 -0400
• e36570f22c Merge pull request 'Obstical-Work' (#27) from Obstical-Work into development Caleb Brown 2024-04-23 18:38:36 +0000
• 7741e80828 Merge branch 'development' into Obstical-Work Obstical-Work Kip Taylor 2024-04-23 14:34:07 -0400
• a73cf79b2f Merge pull request 'Portraits' (#26) from feature/Portraits into development Caleb Brown 2024-04-23 18:30:02 +0000
• 8c84bc53bd Merge branch 'development' into Obstical-Work Kip Taylor 2024-04-23 14:28:32 -0400
• e5c75397f1 Merge remote-tracking branch 'origin/development' into feature/Portraits feature/Portraits Abraham Blain 2024-04-23 14:25:12 -0400
• 24c8635300 Merge pull request 'Spear/Bomb placement' (#25) from feature/Placing-Spears-Bombs into development Caleb Brown 2024-04-23 18:22:55 +0000
• bc540ea9da Placed even more portraits Abraham Blain 2024-04-23 14:22:18 -0400
• 86bf49d282 Merge branch 'development' into Obstical-Work Kip Taylor 2024-04-23 14:19:51 -0400
• 58f23250b9 Fire ob added Kip Taylor 2024-04-23 14:19:33 -0400
• a3db22de46 Merge remote-tracking branch 'origin/development' into feature/Portraits Abraham Blain 2024-04-23 14:16:37 -0400
• 7723f53430 Merge remote-tracking branch 'origin/development' into feature/Placing-Spears-Bombs feature/Placing-Spears-Bombs Abraham Blain 2024-04-23 14:16:03 -0400
• 8eb341167c Placing more portraits Abraham Blain 2024-04-23 14:15:40 -0400
• 9e09e17550 Merge pull request 'feature/RoomAlignment' (#24) from feature/RoomAlignment into development Caleb Brown 2024-04-23 18:12:31 +0000
• 8d6eb84bfe Merge branch 'development' into Obstical-Work Kip Taylor 2024-04-23 14:09:46 -0400
• df3c487807 Merge branch 'development' into feature/RoomAlignment feature/RoomAlignment Noah 2024-04-23 14:07:55 -0400
• d784215dab Merge pull request 'feature/Swinging-Axe-booogaloo' (#20) from feature/Swinging-Axe-booogaloo into development Caleb Brown 2024-04-23 18:05:23 +0000
• dd7cc6aa19 Merge branch 'development' into feature/Swinging-Axe-booogaloo feature/Swinging-Axe-booogaloo Kip Taylor 2024-04-23 13:59:47 -0400
• 03729d6ccf Merge branch 'development' into Obstical-Work Kip Taylor 2024-04-23 13:56:11 -0400
• a48fc16087 Merge remote-tracking branch 'origin/development' into feature/Placing-Spears-Bombs Abraham Blain 2024-04-23 13:56:00 -0400
• a80f8936d9 Green room updating and main room Kip Taylor 2024-04-23 13:56:00 -0400
• feff763e73 reverted ar main room rotation Abraham Blain 2024-04-23 13:55:26 -0400
• 1176df33bb move spawn points Noah 2024-04-23 13:54:23 -0400
• 4ee16e6538 Auto stash before merge of "origin/development" and "feature/Portraits" Abraham Blain 2024-04-23 13:53:53 -0400
• 8fb1caf7ea Merge remote-tracking branch 'origin/development' into feature/Portraits Abraham Blain 2024-04-23 13:47:18 -0400
• 2a84b8ae49 Added camera looking portraits Abraham Blain 2024-04-23 13:47:11 -0400
• 3b43d9b159 Merge branch 'development' into feature/RoomAlignment Noah 2024-04-23 13:45:44 -0400
• d6b4a8fe00 Merge pull request 'feature/occlusion-mat' (#23) from feature/occlusion-mat into development Noah Calderon 2024-04-23 17:38:55 +0000
• 7055f5611c Merge branch 'development' into feature/occlusion-mat feature/occlusion-mat cbrown 2024-04-23 13:14:30 -0400
• 4280f9f7e9 Added fake occlusion material cbrown 2024-04-23 13:14:20 -0400
• a4050af022 Merge branch 'development' into Obstical-Work Kip Taylor 2024-04-23 13:00:38 -0400
• baf421843a Moved objects Kip Taylor 2024-04-23 12:59:56 -0400
• e55fba92ab Fixing scripts and adding objects Kip Taylor 2024-04-23 12:53:11 -0400
• 288155d6ac Merge pull request 'feature/ball-sucker-trigger' (#22) from feature/ball-sucker-trigger into development Caleb Brown 2024-04-23 16:50:36 +0000
• a237c2efb1 Added Ball Attraction force trigger to hole feature/ball-sucker-trigger cbrown 2024-04-23 12:35:13 -0400
• 887ce10607 Merge branch 'development' into Obstical-Work Kip Taylor 2024-04-23 12:27:12 -0400
• fa8889bc0f save point Noah 2024-04-23 12:12:01 -0400
• 482d1b17e3 added spear trap to main room Abraham Blain 2024-04-23 11:55:44 -0400
• 37ed1d1934 Merge branch 'development' into feature/Obstacles-On-Course Abraham Blain 2024-04-23 11:48:10 -0400
• 9c34971064 Updated from dev Abraham Blain 2024-04-23 11:47:32 -0400
• ab04b76de0 Merge branch 'development' into feature/ball-sucker-trigger cbrown 2024-04-23 11:46:17 -0400
• 90e040676f Added bomb timeout Abraham Blain 2024-04-23 11:45:53 -0400
• 417d74c484 Merge pull request 'feature/LoadingCourseOnPlane' (#21) from feature/LoadingCourseOnPlane into development Caleb Brown 2024-04-23 15:43:36 +0000
• 81310d0779 Merge branch 'development' into feature/LoadingCourseOnPlane feature/LoadingCourseOnPlane Noah 2024-04-23 11:15:29 -0400
• 52f19289f1 Good To Go Noah 2024-04-23 11:14:59 -0400
• 6d2d1b116c Fina laxe fixes Kip Taylor 2024-04-23 11:12:08 -0400
• bc31e72110 Axe anime fix i Pray Kip Taylor 2024-04-23 11:10:56 -0400
• 513fae84fb Merge remote-tracking branch 'origin/feature/LoadingCourseOnPlane' into feature/ball-sucker-trigger cbrown 2024-04-23 11:07:00 -0400
• 58bd883592 Merge pull request 'Swinging axe' (#19) from feature/Swinging-Axe into development Caleb Brown 2024-04-23 14:51:12 +0000
• f3719571ae Removing tax lab add feature/Swinging-Axe Kip Taylor 2024-04-23 10:31:06 -0400
• 5ddfdbb64f Swinging axe Kip Taylor 2024-04-23 10:28:52 -0400
• 1e0552bc57 Merge branch 'development' into feature/LoadingCourseOnPlane Noah 2024-04-23 08:51:54 -0400
• 16ee0da99f Merge pull request 'Spear Trap' (#15) from feature/Spear-Trap into development Caleb Brown 2024-04-22 19:46:53 +0000
• 3d4658f9a0 Merge branch 'development' into feature/Spear-Trap feature/Spear-Trap cbrown 2024-04-22 15:42:34 -0400
• cfefb33d7e Merge pull request 'HOTFIX: Removed half distance check on MoveFloor component' (#18) from hotfix/move-floor-distance-scale-check into development Caleb Brown 2024-04-22 19:37:05 +0000
• e6969d0805 HOTFIX: Removed half distance check on MoveFloor component cbrown 2024-04-22 15:32:35 -0400
• c0b0092845 Merge pull request 'feature/Swinging-Blade' (#14) from feature/Swinging-Blade into development Caleb Brown 2024-04-22 19:11:05 +0000
• ed3fc42dea Merge branch 'development' into feature/Swinging-Blade feature/Swinging-Blade cbrown 2024-04-22 15:06:46 -0400
• 711e73f8da Merge pull request 'feature/Moving-Floor-Up-Down' (#13) from feature/Moving-Floor-Up-Down into development Caleb Brown 2024-04-22 18:48:31 +0000