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.

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

Undo-Redo System #576

Open
wants to merge 96 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
f14c7c3
Deletion of UserSettings
jonast2 Jan 4, 2023
b97e9c8
Created "Undo-Redo Menu" button
jonast2 Jan 4, 2023
42f3979
Created UndoRedoMenu
jonast2 Jan 4, 2023
488bc8d
Connected UndoRedoButton to UndoRedoMenu
jonast2 Jan 4, 2023
7ff848c
Integrated UndoRedoMenu into WindowManager
jonast2 Jan 5, 2023
d02964e
Added Constraints to UndoRedoMenu + FollowMe Button
jonast2 Jan 5, 2023
fef894f
Created Command Interface and Command Processor
jonast2 Jan 6, 2023
72eb183
Fixed missing reference to prefab menu
jonast2 Jan 6, 2023
c6a7398
Merge branch 'MinusEins/feature/menu' into MinusEins/feature/UndoRedo
jonast2 Jan 6, 2023
2cd6421
Created CreateMenuCommand and CommandController
jonast2 Jan 7, 2023
dba5f89
Small correction
jonast2 Jan 7, 2023
00b91d2
Fixed wrong position of UndoRedoMenu
jonast2 Jan 7, 2023
a9d286d
Kanban Handles Undo Redo Feature
esthikalt Jan 7, 2023
7b90871
Fixed scaling of Kanban Board via Execute Command
zeynebGueven Jan 8, 2023
278ece2
Undo gefixt
esthikalt Jan 8, 2023
6a88bd9
Kleine Veränderung
esthikalt Jan 8, 2023
64545dd
Undo funktioniert nun auch mit mehreren Befehlen wie gewünscht
esthikalt Jan 8, 2023
c569821
KanBan Redo implemented
zeynebGueven Jan 8, 2023
cb3a84f
Beginn Undo für ProgressBar
esthikalt Jan 8, 2023
570f62d
Kleine Korrektur
esthikalt Jan 8, 2023
b4a51f0
Added Undo/Redo functionality to menus of WindowManager
jonast2 Jan 9, 2023
d0543ce
Materialien an restlichen Menüs angepast, changecolor Methode geschri…
zeynebGueven Jan 11, 2023
5c2b2de
Farbe ändern generell funktioniert schon, Zugriff auf das Button Back…
esthikalt Jan 18, 2023
5c1be41
Farbe ändern funktioniert, aber irgendwie treten nun Probleme mit der…
esthikalt Jan 19, 2023
00ecf9c
Menü Ausgrauen funktioniert jetzt auch mit Redo
zeynebGueven Jan 20, 2023
de759b3
ICommands für AppBar zum skalieren, rotieren, positionieren erstellt …
zeynebGueven Jan 21, 2023
5e7ccb4
ProgressBar Undo funktioniert noch nicht
esthikalt Jan 23, 2023
aa80b0a
Testszene erstellt, Redo funktioniert in dieser Szene noch nicht
zeynebGueven Jan 23, 2023
8857205
Testszene organisiert, funktioniert immernoch nicht ganz
zeynebGueven Jan 23, 2023
bd28428
Kleiner Bugfix
esthikalt Jan 23, 2023
266a9c8
Undo Redo für alle Objekte, die die AppBar nutzen funktioniert jetzt.…
zeynebGueven Jan 23, 2023
b18d8bb
Testszene funktioniert mit Undo und Redo.
zeynebGueven Jan 23, 2023
36ec016
Merge pull request #546 from rwth-acis/MinusEins/feature/menu
esthikalt Jan 24, 2023
d665ecb
Merge pull request #547 from rwth-acis/MinusEins/feature/UndoRedoKanban
esthikalt Jan 24, 2023
e25c715
Merge pull request #548 from rwth-acis/MinusEins/feature/MenueAusgrauen
esthikalt Jan 24, 2023
0dcaf78
Merge pull request #549 from rwth-acis/MinusEins/feature/UndoRedoAppBar
esthikalt Jan 24, 2023
7beab16
Undo and Redo works now with ProgressBarHandles, fixed Bug on Command…
esthikalt Jan 24, 2023
58ffc97
Merge branch 'MinusEins/development' into MinusEins/feature/UndoRedoP…
esthikalt Jan 24, 2023
86b57b3
Merge pull request #550 from rwth-acis/MinusEins/feature/UndoRedoProg…
jonast2 Jan 24, 2023
a4cda82
Restored original settings + refactoring
jonast2 Jan 24, 2023
94abe36
Renamed CommandController to UndoRedoManager
jonast2 Jan 24, 2023
c8cb8ba
Removed Redo method from ICommand
jonast2 Jan 24, 2023
b1c4ac5
Fixed AppBarTransformCommand
jonast2 Jan 25, 2023
69d3bcc
Fixed Redo of ProgressBarHandleCommand
jonast2 Jan 25, 2023
f413c24
Undo button now greys out if undo not possible
jonast2 Jan 25, 2023
9fe2c72
Added back to UndoRedoMenu
jonast2 Jan 25, 2023
a657642
UIHistory button und menü erstellt (noch nicht ganz fertig designt)
zeynebGueven Jan 26, 2023
9b2c628
Merge pull request #553 from rwth-acis/MinusEins/feature/menu2
zeynebGueven Jan 26, 2023
a207d05
Restored Unity version + ProjectPreferences
jonast2 Jan 26, 2023
f2f0861
fixed follow me in menu
zeynebGueven Jan 26, 2023
7fa02a9
Logik zum Anzeigen und Ändern von Textinhalten für die Commandlist de…
zeynebGueven Jan 27, 2023
bc9e24f
Aussehen an Theme angepasst
zeynebGueven Jan 27, 2023
fb39927
Methoden für die Anzeige der Commands in der UI (funktioniert noch ni…
zeynebGueven Jan 27, 2023
2e1d658
scrollen für die UI implementiert
zeynebGueven Jan 27, 2023
da5384d
zurückspringen in history buggy implementiert (funktioniert noch nich…
zeynebGueven Jan 28, 2023
c61647f
Further Undo Redo Actions are now possible
esthikalt Jan 28, 2023
72b9dac
Select method Zwischenstand
zeynebGueven Jan 28, 2023
9e6e563
merge conflict fix
zeynebGueven Jan 28, 2023
207acf4
merge conflict fix
zeynebGueven Jan 28, 2023
d383f42
merge conflict
zeynebGueven Jan 28, 2023
76dd5f6
Merge branch 'MinusEins/feature/Testszene' into MinusEins/development
jonast2 Jan 28, 2023
21fc2d0
Testscene added and project preferences changed
zeynebGueven Jan 28, 2023
de55f19
Added the Undo Redo Function to the IssueShelf and ProjectLoadShelf
esthikalt Jan 28, 2023
cec0b1f
Testscene added and Object path of undo and redo-buttons chnage based…
zeynebGueven Jan 28, 2023
c657eae
Update ProjectPreferences.asset
esthikalt Jan 28, 2023
02df06e
Update ProjectPreferences.asset
jonast2 Jan 28, 2023
18360c8
Merge pull request #560 from rwth-acis/MinusEins/feature/FurtherUndoR…
jonast2 Jan 28, 2023
0679bde
fixed missing menu
zeynebGueven Jan 28, 2023
96bd0d3
scrolling (almost) fixed
zeynebGueven Jan 28, 2023
2dd91a7
restarted UIHistory Script: implemented scroll mechanism that works
zeynebGueven Jan 28, 2023
6e96aee
changed text sizes of TMP, added select method for undoing multiple s…
zeynebGueven Jan 28, 2023
e044cf4
commented code
zeynebGueven Jan 28, 2023
10d3b91
Currently selected command will be colored red
jonast2 Jan 29, 2023
89bd95e
comments added
zeynebGueven Jan 29, 2023
a753eb5
commented and console outputs removed.
zeynebGueven Jan 29, 2023
012f523
Added description of commands + jumping between
jonast2 Jan 29, 2023
530246b
console outputs removed
zeynebGueven Jan 29, 2023
121a0de
Merge branch 'MinusEins/feature/UIHistory' into MinusEins/development
jonast2 Jan 29, 2023
f76271c
Removed duplicate method from merge
jonast2 Jan 29, 2023
6f02d4f
missing uihistory prefab error in testscene fixed. Developer comment …
zeynebGueven Jan 29, 2023
5c6c506
changed spawning position of uihistory menu.
zeynebGueven Jan 29, 2023
67f9cc9
Formatting + comment changes
jonast2 Jan 29, 2023
f977f88
Removed leftover comments
jonast2 Jan 29, 2023
7cb2fe4
Removed accidentally created UI Toolkit files
jonast2 Jan 29, 2023
aa93ef1
Fixed spelling error
jonast2 Jan 29, 2023
857df57
Reset automatically changed files
jonast2 Jan 29, 2023
8686b9c
Added missing new line
jonast2 Jan 29, 2023
a1ec6f5
transparent backplates of undo-redo-menu and ui history-menu fixed
zeynebGueven Jan 29, 2023
117e436
Slightly changed description in test scene
jonast2 Jan 29, 2023
6a89f22
Dealing with Bug of AppBar
esthikalt Jan 29, 2023
84f1635
Added Undo to Avatar Configuration Menu
esthikalt Jan 29, 2023
c563459
Restored original files
jonast2 Jan 29, 2023
c7b8d82
Merge pull request #573 from rwth-acis/MinusEins/BugFix
jonast2 Jan 29, 2023
c9f8fd7
Bug Fix
esthikalt Jan 29, 2023
bf3206b
Update AvatarConfigurator.cs
esthikalt Jan 29, 2023
c3a2c0e
Fixed spelling error
jonast2 Jan 29, 2023
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
1 change: 1 addition & 0 deletions Frontend/VIAProMa/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Uu]ser[Ss]ettings/

# Never ignore Asset meta data
!/[Aa]ssets/**/*.meta
Expand Down
89 changes: 67 additions & 22 deletions Frontend/VIAProMa/Assets/Prefabs/Managers.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -105,12 +105,12 @@ MonoBehaviour:
ObservedComponentsFoldoutOpen: 1
Group: 0
prefixField: -1
observableSearch: 0
Synchronization: 0
OwnershipTransfer: 0
observableSearch: 0
ObservedComponents:
- {fileID: 0}
viewIdField: 0
sceneViewId: 0
InstantiationId: 3
isRuntimeInstantiated: 0
--- !u!114 &566388816382483558
Expand All @@ -137,20 +137,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 81d9debcbaf99472bb70ffc2f99cb23f, type: 3}
m_Name:
m_EditorClassIdentifier:
DisconnectAfterKeepAlive: 0
KeepAliveInBackground: 60000
ApplyDontDestroyOnLoad: 1
logLevel: 1
enableSupportLogger: 0
updateInterval: 50
runInBackground: 1
statsResetInterval: 1000
speakerPrefab: {fileID: 0}
primaryRecorder: {fileID: 4191421764473793288}
globalRecordersLogLevel: 3
globalSpeakersLogLevel: 3
globalPlaybackDelay: 200
usePrimaryRecorder: 0
Settings:
AppIdRealtime:
AppIdFusion:
AppIdChat:
AppIdVoice:
AppVersion:
Expand All @@ -165,12 +162,10 @@ MonoBehaviour:
EnableLobbyStatistics: 0
NetworkLogging: 1
ShowSettings: 0
MinimalTimeScaleToDispatchInFixedUpdate: -1
AutoCreateSpeakerIfNotFound: 1
AutoConnectAndJoin: 1
AutoLeaveAndDisconnect: 1
WorkInOfflineMode: 1
usePunAppSettings: 1
usePunAuthValues: 1
--- !u!114 &4191421764473793288
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -183,13 +178,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 91175dcc15224463780e01a8a98b1b60, type: 3}
m_Name:
m_EditorClassIdentifier:
logLevel: 1
ignoreGlobalLogLevel: 0
voiceDetection: 1
voiceDetectionThreshold: 0.01
voiceDetectionDelayMs: 500
unityMicrophoneDevice: Mikrofon (Sennheiser USB headset)
photonMicrophoneDeviceId: 0
interestGroup: 0
debugEchoMode: 0
reliableMode: 0
Expand All @@ -202,13 +193,20 @@ MonoBehaviour:
microphoneType: 0
audioClip: {fileID: 0}
loopAudioClip: 1
reactOnSystemChanges: 0
autoStart: 1
recordOnlyWhenEnabled: 0
skipDeviceChangeChecks: 0
recordingEnabled: 1
audioSessionParameters:
Category: 4
Mode: 0
CategoryOptions: 0800000004000000
editorAudioSessionPreset: 0
androidNativeMicrophoneSettings:
AcousticEchoCancellation: 1
AutomaticGainControl: 1
NoiseSuppression: 1
stopRecordingWhenPaused: 0
useOnAudioFilterRead: 0
trySamplingRateMatch: 0
useMicrophoneTypeFallback: 1
recordWhenJoined: 1
--- !u!114 &4885869589891658483
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -321,6 +319,8 @@ MonoBehaviour:
type: 3}
anchorMenuPrefab: {fileID: 2805648536711648859, guid: e18e6478ed5508f4c9cbd0dca48e64b4,
type: 3}
undoRedoMenuPrefab: {fileID: 7372155236882747274, guid: 105b5bc1820dec448a917b7fc8205dc1,
type: 3}
--- !u!1 &2902695050403931943
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -578,6 +578,7 @@ Transform:
- {fileID: 7550514611414572532}
- {fileID: 8835965036498097119}
- {fileID: 1924789828437577942}
- {fileID: 1088903505378410646}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -744,6 +745,50 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ed1a1a3bd80066d4faab66204a13916e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &5931906809716084116
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1088903505378410646}
- component: {fileID: 3588073055243203055}
m_Layer: 0
m_Name: UndoRedo Manager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1088903505378410646
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5931906809716084116}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 3215894185288659648}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3588073055243203055
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5931906809716084116}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b922338878ebf00408781b53dc4d5da2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &6670949426813630297
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -807,12 +852,12 @@ MonoBehaviour:
ObservedComponentsFoldoutOpen: 1
Group: 0
prefixField: -1
observableSearch: 0
Synchronization: 0
OwnershipTransfer: 0
observableSearch: 0
ObservedComponents:
- {fileID: 0}
viewIdField: 0
sceneViewId: 0
InstantiationId: 2
isRuntimeInstantiated: 0
--- !u!1 &9087429078540700684
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -335,14 +335,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: dd7fea91fe63f4e1b884ef1e16a975c3, type: 3}
m_Name:
m_EditorClassIdentifier:
logLevel: 1
ignoreGlobalLogLevel: 0
playbackOnlyWhenEnabled: 0
playDelayMs: -1
playbackDelaySettings:
MinDelaySoft: 200
MaxDelaySoft: 400
MaxDelayHard: 1000
playDelayConfig:
Low: 200
High: 400
Max: 1000
SpeedUpPerc: 5
restartOnDeviceChange: 1
--- !u!1001 &6523064825053795340
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -535,13 +533,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 126494ae2a10a34499272ed97a6c9f5d, type: 3}
m_Name:
m_EditorClassIdentifier:
logLevel: 1
ignoreGlobalLogLevel: 0
recorderInUse: {fileID: 0}
speakerInUse: {fileID: 0}
AutoCreateRecorderIfNotFound: 0
UsePrimaryRecorder: 1
SetupDebugSpeaker: 0
--- !u!114 &8393520195314771612
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
Loading