Joshua Latham
|
3f7c09dab4
|
Merge pull request 'development' (#2) from development into main
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-Fortus-450mc/pulls/2
Reviewed-by: Caleb Brown <caleb.brown@udri.udayton.edu>
|
2023-09-07 18:04:02 +00:00 |
|
Joshua Latham
|
60c8370b80
|
Merge pull request 'Removing EOS files' (#1) from hotfix/remove-eos-files into development
Reviewed-on: http://104.1.10.149:3000/MAVRIC/Stratasys-Fortus-450mc/pulls/1
|
2023-09-07 17:40:26 +00:00 |
|
Joshua Latham
|
ab9bbea61c
|
Removing EOS files
|
2023-09-07 12:42:35 -04:00 |
|
LlamaWithOwl
|
eeb9dcf643
|
Merge pull request #8 from LlamaWithOwl/feature/Raycast-AR-Content
Feature/raycast ar content
|
2023-08-02 16:28:14 -04:00 |
|
Abraham
|
f9a2c93456
|
updated canvas scalars
|
2023-08-02 13:08:26 -04:00 |
|
Abraham
|
a3543f5038
|
Added Editor Operator Mode switching
|
2023-08-02 12:35:51 -04:00 |
|
Abraham
|
4f47724059
|
Refactored position input clicker and updated server ui
|
2023-07-30 17:37:14 -04:00 |
|
Abraham Blain
|
104e6468f5
|
added network transform to ar content
|
2023-07-27 13:34:50 -04:00 |
|
Abraham Blain
|
a49084a072
|
changed canister collider layer
|
2023-07-27 13:23:29 -04:00 |
|
LlamaWithOwl
|
90707b7bdb
|
Merge pull request #10 from LlamaWithOwl/feature/add-simple-cannister-collider
Added Collider to cannister
|
2023-07-26 22:33:30 -04:00 |
|
Abraham Blain
|
acb688298c
|
Fixed ARContent facing
|
2023-07-26 22:20:30 -04:00 |
|
Joshua Latham
|
f7079bf23e
|
Added Collider
|
2023-07-26 20:42:05 -04:00 |
|
Abraham Blain
|
c50e0813f4
|
integrated clickable ar content to demo scene
|
2023-07-26 18:12:01 -04:00 |
|
Abraham Blain
|
3af1d3cb53
|
Merge remote-tracking branch 'Github/development' into raycastarrow
|
2023-07-26 17:29:33 -04:00 |
|
Abraham Blain
|
b515f3822f
|
Added Clickable AR content
|
2023-07-26 17:29:21 -04:00 |
|
LlamaWithOwl
|
eab8ccb8c0
|
Merge pull request #7 from LlamaWithOwl/feature/orbit-camera
Feature: Orbit Camera
|
2023-07-26 16:13:52 -04:00 |
|
Brown, Caleb M
|
44733cd4cf
|
Updated VCam's XY speeds
|
2023-07-26 15:33:35 -04:00 |
|
Brown, Caleb M
|
7d46cda55b
|
Updated LookAt position
|
2023-07-26 14:18:25 -04:00 |
|
Brown, Caleb M
|
8918e37f53
|
Fixed flipped mouse invertion
|
2023-07-26 14:10:14 -04:00 |
|
Brown, Caleb M
|
c8e46c223b
|
Merge branch 'development' into feature/orbit-camera
|
2023-07-26 13:29:02 -04:00 |
|
LlamaWithOwl
|
8862581f0b
|
Merge pull request #6 from LlamaWithOwl/feature/update-alignment-model
Feature/update alignment model
|
2023-07-26 12:53:33 -04:00 |
|
LlamaWithOwl
|
fabcb812b8
|
Merge pull request #5 from LlamaWithOwl/feature/MAVRIC_Add_Handling_Video
MAVRIC add handling information video
|
2023-07-26 12:52:56 -04:00 |
|
Brown, Caleb M
|
b0d666eaa5
|
Updated MAVRICCinemachineInputProvider
|
2023-07-26 12:48:58 -04:00 |
|
Brown, Caleb M
|
80fe37f959
|
Added Cinemachine components to the EditorObjects
|
2023-07-26 12:43:46 -04:00 |
|
Brown, Caleb M
|
31a46d107c
|
Ported the UISafeArea component from the netcode sample project
|
2023-07-26 12:43:23 -04:00 |
|
Brown, Caleb M
|
1bfdaa4316
|
Added a MAVRICCinemachineInputProvider for easier debugging
|
2023-07-26 12:42:51 -04:00 |
|
Brown, Caleb M
|
4acd9663ba
|
Added Cinemachine and created a new InputAction asset
|
2023-07-26 12:39:47 -04:00 |
|
Joshua Latham
|
c0fbb7f808
|
Added V3 alignment model
|
2023-07-26 12:23:29 -04:00 |
|
Noah
|
f04ffc2f5a
|
MAVRIC add handling information video
|
2023-07-26 11:34:29 -04:00 |
|
Joshua Latham
|
128b63c337
|
Added alternative alignment models to test
|
2023-07-26 11:19:23 -04:00 |
|
LlamaWithOwl
|
58b13b9b7a
|
Merge pull request #4 from LlamaWithOwl/ui-button-names
UI button names
|
2023-07-25 13:23:24 -04:00 |
|
Abraham Blain
|
a650a167db
|
fixed object active statuses
|
2023-07-25 12:11:53 -04:00 |
|
Abraham Blain
|
f7b1af0686
|
added word description to buttons
|
2023-07-25 12:10:36 -04:00 |
|
LlamaWithOwl
|
68ca73e92f
|
Merge pull request #3 from LlamaWithOwl/feature/MAVRIC-1961_UI-Fixes
Fixed some RectTransform sizings on the AR Menu
|
2023-07-24 18:47:32 -04:00 |
|
Noah
|
e0702cc572
|
Remove duplicates
|
2023-07-24 18:44:19 -04:00 |
|
Brown, Caleb M
|
e423c87409
|
Merge branch 'development' into feature/MAVRIC-1961_UI-Fixes
|
2023-07-24 18:12:56 -04:00 |
|
LlamaWithOwl
|
5df2f8b4c9
|
Merge pull request #2 from LlamaWithOwl/feature/MAVRIC-1961_Create_Animations
Feature/mavric 1961 create animations
|
2023-07-24 17:49:14 -04:00 |
|
Noah
|
af9f33b465
|
MAVRIC-1961 Applying changes to prefabs
|
2023-07-24 17:41:52 -04:00 |
|
Brown, Caleb M
|
a3ceff7fe3
|
Merge branch 'feature/MAVRIC-1961_Create_Animations' into feature/MAVRIC-1961_UI-Fixes
# Conflicts:
# ProjectSettings/ProjectSettings.asset
|
2023-07-24 17:10:51 -04:00 |
|
Brown, Caleb M
|
53309c7251
|
MAVRIC-1961: Various ARKit assets
|
2023-07-24 17:08:33 -04:00 |
|
Brown, Caleb M
|
a84aee314b
|
MAVRIC-1961: Fixed missing ARKit Enabled settings
|
2023-07-24 17:07:50 -04:00 |
|
Noah
|
3641e06820
|
MAVRIC-1961 code fixes and project setting file
|
2023-07-24 16:52:23 -04:00 |
|
Brown, Caleb M
|
dce2d32469
|
MAVRIC-1961: Main Screen UI Formatting bug fix
|
2023-07-24 16:32:40 -04:00 |
|
Noah
|
56f7ae7146
|
MAVRIC-1961 update can position
|
2023-07-24 14:18:30 -04:00 |
|
Noah
|
7d007adc4f
|
MAVRIC-1961 clean update
|
2023-07-24 12:30:09 -04:00 |
|
Noah
|
dd66b1372c
|
MAVRIC-1961 update other stuff
|
2023-07-24 11:41:34 -04:00 |
|
Noah
|
c350ae3150
|
MAVRIC-1961 update scene
|
2023-07-24 10:51:11 -04:00 |
|
Noah
|
1e4005d0f2
|
MAVRIC-1961 push stupid
|
2023-07-24 07:42:31 -04:00 |
|
Noah
|
7f5dc3071c
|
Merge branch 'development' into feature/MAVRIC-1961_Create_Animations
|
2023-07-21 14:27:50 -04:00 |
|
finwak12
|
3dae847ca9
|
Merge pull request #1 from LlamaWithOwl/netcode-update
Netcode-AR Merge Update
|
2023-07-21 12:15:43 -04:00 |
|