Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fully implemented GuidedTour (SPP MixedRealityLap WS 2021/2022) #388

Open
wants to merge 94 commits into
base: develop
Choose a base branch
from
Open

Fully implemented GuidedTour (SPP MixedRealityLap WS 2021/2022) #388

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
7be4b24
Implemented basic class structure for Guided Tour, its Tasks and Sect…
Dec 21, 2021
0ce72d6
Merge pull request #291 from rwth-acis/GuidedTour/backend
KKuehlem Dec 21, 2021
3e852f9
Added GuidedTourManger to Scene
Dec 21, 2021
9e2682f
Merge pull request #293 from rwth-acis/GuidedTour/backend
KKuehlem Dec 21, 2021
960ca3c
Work in Progress: Working JSON Configuration File
Dec 23, 2021
e45bc14
Closes Issue #302. Configuration file is fully function
Dec 27, 2021
7b4d3b7
Closes issue #301
Dec 27, 2021
8d6f343
Closes issue #300
Dec 27, 2021
9bb4e05
Closes issue #303. Added functionality to chose the next tasks / sect…
Dec 27, 2021
9652803
Issue #303. Added failsafe for SkipSection() method, if the method is…
Dec 27, 2021
7b626e8
Merge pull request #304 from rwth-acis/GuidedTour/backend
Luk-1 Dec 28, 2021
b22508f
Closes #294 and #295 is still work-in-progress
Dec 29, 2021
ab5f229
Merge pull request #305 from rwth-acis/GuidedTour/interactions
tarikvural Dec 29, 2021
3a8ea00
Closes #296 and #297.
maraReve Dec 29, 2021
7e56741
Adds Prefab for widgets.
maraReve Dec 29, 2021
f1e3442
Merge pull request #307 from rwth-acis/GuidedTour/visualComponents
KKuehlem Dec 29, 2021
04a5f78
Closes issue #306. The work has already been reviewed by the group as…
Dec 29, 2021
cb65190
Close issue #307.SAC
maraReve Jan 2, 2022
8c2296b
Fixed WidgetVisable
maraReve Jan 2, 2022
c265933
Fixed 3D model compatibility.
maraReve Jan 5, 2022
10b1289
Closes #299 Implemented a Board that shows progress on Section Comple…
tarikvural Jan 6, 2022
15c66d0
Close #295 Improved KeyboardTourTask
Luk-1 Jan 6, 2022
e19bc7e
Merge branch 'GuidedTour/develop' into GuidedTour/tourSections
KKuehlem Jan 6, 2022
fd4a45f
Merge pull request #324 from rwth-acis/GuidedTour/tourSections
KKuehlem Jan 6, 2022
d0e3e7d
Reconfigured scene after unsuccessful merge
tarikvural Jan 6, 2022
48f1680
fixed the SectionPlacer Script by changing scope of a variable
tarikvural Jan 8, 2022
02d8ebe
Merge pull request #331 from rwth-acis/GuidedTour/hotfix
KKuehlem Jan 8, 2022
3802482
Merge branch 'GuidedTour/develop' into GuidedTour/keyboard
KKuehlem Jan 8, 2022
913578c
Merge pull request #325 from rwth-acis/GuidedTour/keyboard
KKuehlem Jan 8, 2022
123db62
Added documentation, chnaged order of tasks for prototype
KKuehlem Jan 8, 2022
86d39ee
Fixed missing scripts
KKuehlem Jan 8, 2022
367d359
Fixed missing directional light
Jan 9, 2022
87a81d3
Added task for pressing the room button
Jan 9, 2022
f9d4eaf
Created Prefab Variant for IssueShelf
Jan 9, 2022
19ace27
Text Placer changes by Tarik
Jan 9, 2022
e7ffb3f
Changed position of text
Jan 11, 2022
baaf5f5
Merge pull request #344 from rwth-acis/GuidedTour/prototype
KKuehlem Jan 11, 2022
b43e7df
Closes #351, replaced Active Property of AbstractTourTask with a stat…
Jan 15, 2022
abf4311
Closes #347 Tasks will be linked when activated
Jan 15, 2022
92e8cbf
Merge pull request #362 from rwth-acis/GuidedTour/GuidedTourManager
Luk-1 Jan 16, 2022
25d5e01
Changed color of widget and closes issue #365
maraReve Jan 17, 2022
0aa52ac
Merge branch 'GuidedTour/develop' of https://github.com/rwth-acis/VIA…
maraReve Jan 17, 2022
03bcab8
Closes #363 SimpleTask will be auto created for tasks, which do not h…
Jan 20, 2022
6e32711
Closes #353
Jan 20, 2022
3780d65
Merge branch 'GuidedTour/develop' into GuidedTour/MultiLanguage
KKuehlem Jan 20, 2022
ccfe191
Merge pull request #366 from rwth-acis/GuidedTour/MultiLanguage
maraReve Jan 21, 2022
e4fe916
Delete Core.meta
Luk-1 Jan 23, 2022
e6c2af7
Closes #355 | Implemented indicators
Luk-1 Jan 23, 2022
4c0bc11
Merge branch 'GuidedTour/develop' into GuidedTour/Indicator
KKuehlem Jan 23, 2022
ea7f681
Merge pull request #370 from rwth-acis/GuidedTour/Indicator
KKuehlem Jan 23, 2022
80fa4a2
Fixed language ids
Jan 24, 2022
48a524f
Created Notification Box #352
maraReve Jan 24, 2022
0ce6a60
Merge pull request #372 from rwth-acis/GuidedTour/NotificationWidget
KKuehlem Jan 24, 2022
adcc1c4
Group Meeting
Jan 24, 2022
9f5042d
Changed SectionBoard to be more lightweight and fit in with VIAProMas…
tarikvural Jan 25, 2022
5043b7d
Merge branch 'GuidedTour/develop' into GuidedTour/redesignSectionBoard
KKuehlem Jan 25, 2022
278956e
Merge pull request #373 from rwth-acis/GuidedTour/redesignSectionBoard
KKuehlem Jan 25, 2022
c757f81
changing guidedTourScene and manager script to be runnable again
tarikvural Jan 25, 2022
0d03836
Removed action property for tasks
Jan 26, 2022
6559ede
Meeting
Jan 26, 2022
22f715c
Cofnig files as TextAssets
Jan 26, 2022
a521407
Safty commit during cleanup
Jan 26, 2022
b610f14
Code documentation and cleanup
Jan 26, 2022
e7a49c7
Written the Tour content down in our json files. Needs to be attached…
tarikvural Jan 27, 2022
4c4155a
missing a comma.
tarikvural Jan 27, 2022
3b71dd0
Added sounds for success / failling a task
Jan 27, 2022
526f6e4
Merge pull request #378 from rwth-acis/GuidedTour/audioAndCleanup
tarikvural Jan 27, 2022
a794d0c
Gernal Tasks for Issue Shelf
Jan 27, 2022
3c4134b
Added Tasks for the main menu and network sections of the guided tour…
tarikvural Jan 27, 2022
6142491
Merge branch 'GuidedTour/tourContent' of https://github.com/rwth-acis…
tarikvural Jan 27, 2022
0112bcb
Added the inputBlocker and documentation
Luk-1 Jan 27, 2022
f334ba6
Merge branch 'BlockInput2' into GuidedTour/develop
Luk-1 Jan 27, 2022
9b401c4
added the remaining tasks in preparation for group meeting and change…
tarikvural Jan 28, 2022
ba6215d
Added a start widget for the guided tour
maraReve Jan 28, 2022
ca574e6
Merge branch 'GuidedTour/develop' into GuidedTour/tourContent
KKuehlem Jan 28, 2022
d7d336f
Merge pull request #382 from rwth-acis/GuidedTour/tourContent
KKuehlem Jan 28, 2022
72baca1
After IssueShelf
Jan 28, 2022
9a28641
Scene
Jan 28, 2022
52e2016
Connection WIndow fix
Jan 28, 2022
0f38534
Fixed Room Window
Jan 28, 2022
bc7ad6f
GuidedTour is running
Jan 28, 2022
5d3d1b0
working on final polishing
tarikvural Jan 30, 2022
0d324a0
Lowercase keyboard tasks, blocker material
Jan 30, 2022
8b70fbd
Moved Assets to folders
Jan 30, 2022
f774f86
Removed Load / Save buton from GuidedTour Scene
Jan 30, 2022
29c116e
Integration in MainScene
Jan 30, 2022
0ea8fd8
Settings for last commit
Jan 30, 2022
8b1a1fc
Merge pull request #387 from rwth-acis/GuidedTour/NotificationWidget
KKuehlem Jan 30, 2022
57aff75
adds a start widget to be shown at the beginning
tarikvural Jan 30, 2022
155d545
Merge branch 'GuidedTour/develop' of https://github.com/rwth-acis/VIA…
tarikvural Jan 30, 2022
caefe11
Added Popup for MainScene
Jan 30, 2022
838b705
Fixed arrow
Jan 30, 2022
f806b0e
Removed debug messages
Jan 30, 2022
20fc879
Updated Build Settings for GuidedTour Scene
Jan 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Frontend/VIAProMa/Assets/MRTK/Core.meta → ...VIAProMa/Assets/3D Models/GuidedTour.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Frontend/VIAProMa/Assets/3D Models/GuidedTour/GT_Highlighter.fbx
View file
Open in desktop
Binary file not shown.
97 changes: 97 additions & 0 deletions Frontend/VIAProMa/Assets/3D Models/GuidedTour/GT_Highlighter.fbx.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Frontend/VIAProMa/Assets/3D Models/GuidedTour/GT_IndicatorArrow.fbx
View file
Open in desktop
Binary file not shown.
102 changes: 102 additions & 0 deletions Frontend/VIAProMa/Assets/3D Models/GuidedTour/GT_IndicatorArrow.fbx.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .../VIAProMa/Assets/MRTK/Core/Utilities.meta → Frontend/VIAProMa/Assets/GuidedTour.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...s/MRTK/Core/Utilities/WebRequestRest.meta → ...end/VIAProMa/Assets/GuidedTour/Audio.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Frontend/VIAProMa/Assets/GuidedTour/Audio/error.wav
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions Frontend/VIAProMa/Assets/GuidedTour/Audio/error.wav.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Frontend/VIAProMa/Assets/GuidedTour/Audio/success.wav
View file
Open in desktop
Binary file not shown.
22 changes: 22 additions & 0 deletions Frontend/VIAProMa/Assets/GuidedTour/Audio/success.wav.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Frontend/VIAProMa/Assets/GuidedTour/Configuration.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading