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

Feature: Virtuelle Haftnotizen #178

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

Feature: Virtuelle Haftnotizen #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
c68b73c
initialer commit für das feature haftnotizen
newtonGnu Jan 13, 2021
ff25d0e
[Add] First notes prefab prototype
sleepyeldrazi Jan 16, 2021
1e70429
[EDITED] Haftnotizen Text Eigenschaften
CarlosClassen Jan 16, 2021
57da62d
[ADDED] Test Szene für VirtuelleHaftnotizen
CarlosClassen Jan 16, 2021
d3ae781
[ADDED] Notizaufruf im Hauptmenue (Unfertig)
CarlosClassen Jan 18, 2021
8b00009
[Add] Save Button and Menu ordering
sleepyeldrazi Jan 20, 2021
70e410a
[FIXED] Initial Note Position
CarlosClassen Jan 21, 2021
8c3ff46
[EDITDED] Button für Objektmanipulation + löschen
newtonGnu Jan 23, 2021
00a9258
[Add] Saving notes
sleepyeldrazi Jan 24, 2021
8c9fad9
[Fix] Reordering some files and choosing better variable names
sleepyeldrazi Jan 24, 2021
11230ea
Merge pull request #166 from rwth-acis/virtuelleHaftnotizen/development
sleepyeldrazi Jan 24, 2021
3603ec2
[EDITED] Testscenes for Notes
CarlosClassen Feb 1, 2021
36bc7cc
[FIXED] TestsceneWithMenu
CarlosClassen Feb 3, 2021
50eea8d
[Add] Prototype Synchronization and Multiple notes
sleepyeldrazi Feb 3, 2021
3c017d4
[Fix] Fixed synchronization problems and multiple note saving
sleepyeldrazi Feb 3, 2021
25dae13
[FIXED] Testscene Position in Project
CarlosClassen Feb 3, 2021
8204e95
[EDITED] added unpin button, see #174
newtonGnu Feb 4, 2021
1cc379d
[ADDED] ColorCycler Script + button
newtonGnu Feb 5, 2021
7300f30
[EDITED] button "show" -> "unpin"
newtonGnu Feb 6, 2021
2c8cffb
[ADDED] TestDescription in Note-Menu Test
CarlosClassen Feb 6, 2021
7ca712a
[Add] Synchronization and Saving of note color
sleepyeldrazi Feb 6, 2021
3910e13
[Fix] Added the color button in the visual controller
sleepyeldrazi Feb 6, 2021
0484e00
[EDITED] Testscene-Notes
CarlosClassen Feb 6, 2021
6222556
[EDITED] Testscene-Notes
CarlosClassen Feb 6, 2021
8ecef50
[EDITED] Fixed initial position of new notes #172
newtonGnu Feb 6, 2021
744e75b
[EDITED] Testscene-Notes
CarlosClassen Feb 6, 2021
b4d8de9
Merge branch 'virtuelleHaftnotizen/development' of github.com:rwth-ac…
CarlosClassen Feb 6, 2021
c74811e
[EDITED] Naming of project feature
CarlosClassen Feb 6, 2021
f863f8f
Merge pull request #177 from rwth-acis/virtuelleHaftnotizen/development
sleepyeldrazi Feb 6, 2021
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
9 changes: 8 additions & 1 deletion Frontend/VIAProMa/Assets/Prefabs/Multiplayer/Resources/Avatar Networked.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ MonoBehaviour:
ObservedComponentsFoldoutOpen: 1
Group: 0
prefixField: -1
observableSearch: 0
Synchronization: 3
OwnershipTransfer: 0
ObservedComponents:
Expand All @@ -47,6 +48,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
logLevel: 1
ignoreGlobalLogLevel: 0
recorderInUse: {fileID: 0}
speakerInUse: {fileID: 0}
AutoCreateRecorderIfNotFound: 0
Expand Down Expand Up @@ -403,8 +405,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
logLevel: 1
ignoreGlobalLogLevel: 0
playbackOnlyWhenEnabled: 0
PlayDelayMs: 200
playDelayMs: -1
playbackDelaySettings:
MinDelaySoft: 200
MaxDelaySoft: 400
MaxDelayHard: 1000
--- !u!1001 &6523064825053795340
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
6 changes: 3 additions & 3 deletions Frontend/VIAProMa/Assets/Prefabs/Shelves/Resources/IssueShelf.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -578,7 +578,7 @@ MonoBehaviour:
m_Calls: []
m_text: Category
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontAsset: {fileID: 0}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
Expand Down Expand Up @@ -1375,6 +1375,7 @@ MonoBehaviour:
ObservedComponentsFoldoutOpen: 1
Group: 0
prefixField: -1
observableSearch: 0
Synchronization: 3
OwnershipTransfer: 0
ObservedComponents:
Expand Down Expand Up @@ -3219,8 +3220,7 @@ PrefabInstance:
type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee,
type: 2}
objectReference: {fileID: 0}
- target: {fileID: 3965540706693377731, guid: 451a9f192a2909b4b818cf53fcb08d29,
type: 3}
propertyPath: m_LocalPosition.x
Expand Down
21 changes: 11 additions & 10 deletions Frontend/VIAProMa/Assets/Prefabs/UI/Color Chooser.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,24 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cf12ee76e7e00a44a9a84256760020e6, type: 3}
m_Name:
m_EditorClassIdentifier:
nodeList: []
ignoreInactiveTransforms: 1
sortType: 0
surfaceType: 1
orientType: 0
layout: 2
anchor: 4
anchorAlongAxis: 0
columnAlignment: 0
rowAlignment: 0
radius: 2
radialRange: 180
distance: 0
rows: 1
columns: 3
cellWidth: 0.075
cellHeight: 0.075
assetVersion: 1
--- !u!114 &3895528340368958930
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -115,13 +123,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8adeb8b21c6d120408d0aea984f6b26d, type: 3}
m_Name:
m_EditorClassIdentifier:
ToggleList: []
CurrentIndex: 0
toggleList: []
currentIndex: 0
OnSelectionEvents:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!1 &5390975440228021464
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -232,8 +238,6 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_text: 'Select Kanban Board Color:'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: afc8299d5d5bbd440a0616c8ecbc7217, type: 2}
Expand Down Expand Up @@ -271,7 +275,6 @@ MonoBehaviour:
m_fontSizeMax: 72
m_fontStyle: 0
m_textAlignment: 257
m_isAlignmentEnumConverted: 1
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
Expand All @@ -298,6 +301,7 @@ MonoBehaviour:
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_VertexBufferAutoSizeReduction: 1
m_firstVisibleCharacter: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
Expand All @@ -312,12 +316,9 @@ MonoBehaviour:
lineCount: 1
pageCount: 1
materialCount: 1
m_havePropertiesChanged: 0
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_spriteAnimator: {fileID: 0}
m_isInputParsingRequired: 0
m_inputSource: 0
m_hasFontAssetChanged: 0
m_renderer: {fileID: 7687569188753143181}
m_subTextObjects:
Expand Down
6 changes: 6 additions & 0 deletions ...Assets/Prefabs/Visualizations/BuildingProgress Bar/Resources/Building Progress Bar.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -448,6 +448,7 @@ MonoBehaviour:
ObservedComponentsFoldoutOpen: 1
Group: 0
prefixField: -1
observableSearch: 0
Synchronization: 3
OwnershipTransfer: 2
ObservedComponents:
Expand Down Expand Up @@ -515,6 +516,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4b892db2811b14b438397dedf7569633, type: 3}
m_Name:
m_EditorClassIdentifier:
synchronizeColor: 0
--- !u!114 &6007069650333747261
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -527,6 +529,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 99f94f734fbefdb469c2d50a394ce4b2, type: 3}
m_Name:
m_EditorClassIdentifier:
synchronizePosition: 1
synchronizeRotation: 1
synchronizeScale: 0
lerpSpeed: 15
--- !u!114 &2516406491857940383
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
1 change: 1 addition & 0 deletions ...ProMa/Assets/Prefabs/Visualizations/Competence Display/Resources/CompetenceDisplay.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@ MonoBehaviour:
ObservedComponentsFoldoutOpen: 1
Group: 0
prefixField: -1
observableSearch: 0
Synchronization: 3
OwnershipTransfer: 2
ObservedComponents:
Expand Down
6 changes: 6 additions & 0 deletions Frontend/VIAProMa/Assets/Prefabs/Visualizations/Resources/Progress Bar.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ MonoBehaviour:
ObservedComponentsFoldoutOpen: 1
Group: 0
prefixField: -1
observableSearch: 0
Synchronization: 3
OwnershipTransfer: 2
ObservedComponents:
Expand Down Expand Up @@ -518,6 +519,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a337d624553c7854c9370e9088add9d8, type: 3}
m_Name:
m_EditorClassIdentifier:
synchronizePosition: 1
synchronizeRotation: 1
synchronizeScale: 0
lerpSpeed: 15
--- !u!114 &3390457831152519555
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -530,6 +535,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4b892db2811b14b438397dedf7569633, type: 3}
m_Name:
m_EditorClassIdentifier:
synchronizeColor: 0
--- !u!114 &1907927049844227124
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
Loading