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

Jump to bottom

Origin/mockup editor #267

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

Origin/mockup editor #267

Changes from 1 commit
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
812cf41
Implemented List, Instantiation Funktion
Lepi009 Jun 22, 2021
c39db1a
Added all MRTK Prefabs
Lepi009 Jun 23, 2021
3d8710a
Window Prefab created
OrhanCi Jun 24, 2021
a82e530
Changed Button Shape
Lepi009 Jun 24, 2021
4222a5f
Editor window functions added
OrhanCi Jun 24, 2021
ce8042a
Added Primitives
Lepi009 Jun 25, 2021
eff216f
added documentation
Lepi009 Jun 25, 2021
bc42cc0
added a testing list
Lepi009 Jun 25, 2021
7285778
Update descriptiontext
OrhanCi Jun 26, 2021
da3e34f
Bug fixing
OrhanCi Jun 26, 2021
c4c841f
Update First Testing List.asset
Lepi009 Jun 26, 2021
4430baa
Merge pull request #221 from rwth-acis/mockupEditorFeature/EditorWindow
Lepi009 Jun 26, 2021
2f356b1
Merge branch 'origin/mockupEditor' into mockupEditorFeature/Instantia…
Gasser278 Jun 26, 2021
eeec722
Merge pull request #222 from rwth-acis/mockupEditorFeature/Instantiation
Gasser278 Jun 26, 2021
8b9b6fa
Merged Test scenes and added items to Mockup Editor
Lepi009 Jun 26, 2021
a9eb7d7
Added description to editor window
Lepi009 Jun 26, 2021
7f8087c
Update MockUpTest.unity
Lepi009 Jun 26, 2021
2d59fc5
Spawning and Scaling implemented
Lepi009 Jul 3, 2021
267974d
Merge branch 'feature/SpawningAndScaling' into origin/mockupEditor
Lepi009 Jul 3, 2021
9f934d7
Merge pull request #240 from rwth-acis/feature/SpawningAndScaling
Gasser278 Jul 3, 2021
bb04cfe
Merge branch 'origin/mockupEditor' of https://github.com/rwth-acis/VI…
Lepi009 Jul 3, 2021
43d9c69
Implemented different categories
Lepi009 Jul 10, 2021
a344365
Merge pull request #248 from rwth-acis/feature/categories_mockupEditor
Gasser278 Jul 10, 2021
68fc33d
Started to implement new method
Lepi009 Jul 10, 2021
804291b
Added reposition and FollowMe functions
OrhanCi Jul 13, 2021
47a0ade
Merge pull request #249 from rwth-acis/mockupEditorFeature/Reposition…
NoraHis Jul 13, 2021
9716b55
Added automatic close
OrhanCi Jul 13, 2021
8436ced
Merge pull request #250 from rwth-acis/mockupEditorFeature/CloseAutom…
NoraHis Jul 13, 2021
0e49705
Position fine tuning
OrhanCi Jul 13, 2021
3880e91
Merge pull request #251 from rwth-acis/mockupEditorFeature/UIPositioning
NoraHis Jul 13, 2021
6c6477e
Implemented the clear function
Lepi009 Jul 14, 2021
e23d2f1
Merge branch 'origin/mockupEditor' into feature/clearPlatform
Gasser278 Jul 14, 2021
5c44696
Merge pull request #252 from rwth-acis/feature/clearPlatform
Gasser278 Jul 14, 2021
8222ebe
Implemented SaveLoad System
Lepi009 Jul 14, 2021
c5c3876
Merge pull request #253 from rwth-acis/feature/saveLoadSystemMockupEd…
Gasser278 Jul 14, 2021
b526903
Added all icons
OrhanCi Jul 14, 2021
148e548
Merge pull request #256 from rwth-acis/mockupEditorFeature/Icons
NoraHis Jul 15, 2021
da71c38
Fixed error
Lepi009 Jul 16, 2021
fc1255c
Fixed different sizes of the instantiated Mockup Items
Lepi009 Jul 16, 2021
325645b
Added a desc to the SaveLoad Test
Lepi009 Jul 16, 2021
f1998c4
Merge pull request #257 from rwth-acis/hotfix/assetbaseError
Gasser278 Jul 16, 2021
0b193fc
Merge pull request #259 from rwth-acis/hotfix/ResizeAndDescription
Gasser278 Jul 16, 2021
78747bc
fixed network, ownership and instantiation
Lepi009 Jul 17, 2021
79c6e82
Merge pull request #260 from rwth-acis/hotfix/network-Problems
Gasser278 Jul 17, 2021
2ecfc37
Added buttons with preview and a toggle to switch
Lepi009 Jul 17, 2021
03f0291
Merge pull request #262 from rwth-acis/feature/previewButtons
Gasser278 Jul 17, 2021
c57eb6c
Scaled preview buttons, changed description
Lepi009 Jul 17, 2021
bf99ef7
Merge pull request #263 from rwth-acis/feature/UIAdjustments
Gasser278 Jul 17, 2021
39f6908
Changed Say-It-Label to "Select"
Lepi009 Jul 17, 2021
a15e42b
Merge pull request #264 from rwth-acis/feature/SayLabel
Gasser278 Jul 17, 2021
03408c6
Added last comments and fixed too small scaling maximum
Lepi009 Jul 18, 2021
e579e77
Merge pull request #266 from rwth-acis/feature/FixedCommentsAndScaling
Gasser278 Jul 18, 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
Prev Previous commit
Next Next commit
Update MockUpTest.unity
  • Loading branch information
@Lepi009
Lepi009 committed Jun 26, 2021
commit 7f8087c7d24f7fb057a5adf88b68529943c15a79
3 changes: 0 additions & 3 deletions Frontend/VIAProMa/Assets/Tests/MockUpEditor/MockUpTest.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,6 @@ MonoBehaviour:
descriptionPrefab: {fileID: 7178285771126497045, guid: d1c9e4a047ff2054987a6e9898f4a1d8,
type: 3}
descriptionText: {fileID: 0}
desc: "The Mockup Editor can be used to instatiate game objects \nin realtime.
Just click on the buttons to get objects like cubes, spheres and\nother UI elements
from MRTK."
--- !u!1 &694871505
GameObject:
m_ObjectHideFlags: 0
Expand Down