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

Feature: Connection Lines #55

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

Feature: Connection Lines #55

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
55af0b0
DrawLine UI implemented
JulianStaab Jan 2, 2020
9cc5784
Added comments to LineDrawLogic
JulianStaab Jan 2, 2020
e9138af
DrawMode Logic implemented
JulianStaab Jan 3, 2020
a9799d4
Update Position implemented
JulianStaab Jan 3, 2020
6c8aea4
Delete All Lines implemented
JulianStaab Jan 3, 2020
db622ff
Most Unit Tests completed
JulianStaab Jan 8, 2020
b306a3c
All Unit Tests complete
JulianStaab Jan 8, 2020
d92a423
Small Error Fix
JulianStaab Jan 10, 2020
6f6a5f2
add delete specific lines and save/load
Mareska Jan 10, 2020
6e17ede
Merge branch 'verbindungslinien_bewegungslogik' of https://github.com…
JulianStaab Jan 10, 2020
f375fbe
Correction & Fixes
JulianStaab Jan 10, 2020
831bd36
Enhanced the testscene
JulianStaab Jan 11, 2020
2e76b83
Multiple Issues Higlighted Fixed
JulianStaab Jan 14, 2020
1c5d16a
DrawMode Activated by Multiple Buttons Fixed
JulianStaab Jan 14, 2020
264ccdf
Connection Lines Menu
JulianStaab Jan 14, 2020
7386abf
Sharing to be tested
JulianStaab Jan 19, 2020
57981f5
Color and Width Customization
JulianStaab Jan 19, 2020
d2297d3
LineDelete Bug Fixed
JulianStaab Jan 26, 2020
d72a51a
Added ConnectionLines_README.md
EmilieHK Jan 26, 2020
ebfacda
Creating ConnectionLine Window
EmilieHK Mar 18, 2020
524d03f
Integrated Drawing Logic
EmilieHK Mar 18, 2020
de6815b
Error correction
EmilieHK Mar 18, 2020
04be623
Window Colliders Added
EmilieHK Mar 20, 2020
3d23b02
Added Bounding Boxes
Mar 20, 2020
e5cbeae
ConnectionLine Menu opens
Mar 20, 2020
9a7d335
ConnectionLines react when chlicked
EmilieHK Mar 20, 2020
7411596
Reference change
EmilieHK Mar 25, 2020
5e7ba35
Removed Bounding Box
Mar 25, 2020
baf22fe
Adjusted Selector Scripts
EmilieHK Mar 25, 2020
c2205b9
Referencing ConnectionLinesMenu Script
EmilieHK Mar 25, 2020
f0b4bad
ConnectionLinesMenu tested
Mar 25, 2020
41150f0
Begun implementing "DraggableMenu"
EmilieHK Mar 25, 2020
17bc315
Added Top Bars
EmilieHK Mar 25, 2020
83b1293
Added Highlights to TopBar
EmilieHK Mar 25, 2020
b176bbd
Adjusted TopBar Highlights
EmilieHK Mar 27, 2020
d09ae85
Added Bounding Box
EmilieHK Mar 27, 2020
d177bc0
Added Adjust Buttons
EmilieHK Mar 27, 2020
18b8adb
Adjust Button Layout changed
EmilieHK Apr 1, 2020
322a636
Added ConnectionLinesSerializer and set up serialization for LineRend…
JulianStaab Apr 1, 2020
9bbd092
Adjust Button changed to used Button style
EmilieHK Apr 3, 2020
3687e28
Added AdjustBar prefab
EmilieHK Apr 3, 2020
331d43e
Adjusted Box Colliders of each Window
EmilieHK Apr 3, 2020
246663d
Adjust Button changes Caption
EmilieHK Apr 3, 2020
76a567a
Save/Load implemented and tested
JulianStaab Apr 5, 2020
2aafe48
Getters and Setters instead of public variables reworked
JulianStaab Apr 7, 2020
dbf8787
Fixed variable declaration
EmilieHK Apr 11, 2020
1c8260b
Added Color Chooser to CL Menu
EmilieHK Apr 13, 2020
dca8396
Adjusted Position of Color Chooser
Apr 13, 2020
3fa85dd
Added the ColorChosen Event
EmilieHK Apr 13, 2020
c58672c
Adjusted Visibility of ColorChooser
EmilieHK Apr 13, 2020
63e90aa
Completed ColorChosen Event
EmilieHK Apr 13, 2020
b57a005
CleanUp and integrating LineWidth
EmilieHK Apr 13, 2020
83b313d
Completed Changes in the CL menu Script
EmilieHK Apr 13, 2020
c11e3e6
Color and Width Selection Tested
Apr 13, 2020
d3afa04
CleanUp of the CLMenu Script and minor changes to the CLMenu prefab
EmilieHK Apr 13, 2020
3bd43cd
Update LineDrawLogicTester.cs
EmilieHK Apr 13, 2020
a561b34
Minor Size Adjustment of CLMenu
Apr 13, 2020
843016a
Voice Command of Adjust Button changed
Apr 16, 2020
f0697e3
Added Color and Width of Connection Lines to Save/Load System
JulianStaab Apr 16, 2020
92b0bab
Merge branch 'connectionlines_WindowAdjustment' of https://github.com…
JulianStaab Apr 16, 2020
7c82373
Added a Test Window
EmilieHK Apr 16, 2020
305f6ce
Deleted TestMenu
EmilieHK Apr 16, 2020
6d499c1
Reduced number of GetComponent-Calls in CLMenu
EmilieHK Apr 16, 2020
348d177
Added Another TestWindow
EmilieHK Apr 17, 2020
f890ec3
Changed Orientation of AppBar to fix Bug
JulianStaab Apr 17, 2020
e90c0ac
Merge branch 'connectionlines_WindowAdjustment' of https://github.com…
JulianStaab Apr 17, 2020
42f2536
Fixed Bug #39 by changing the AppBar orientation to faceNormal
JulianStaab Apr 20, 2020
68b2567
BoundingBox separated to child
JulianStaab Apr 21, 2020
dee4e40
Added functioning Bounding Box to all Windows
EmilieHK Apr 21, 2020
fccd59e
Adjusted Size of Bounding Box
Apr 21, 2020
8b9abc9
Changed CL Window Structure
EmilieHK Apr 21, 2020
6948a4c
Tested Window Adjustment
Apr 21, 2020
475ab0f
Deleted seperate ReadMe
EmilieHK Apr 21, 2020
b9a0945
Minor Position Change of Line Draw Button
EmilieHK Apr 21, 2020
934d9b5
Testing Bounding Box Visibility Settings
EmilieHK Apr 27, 2020
cba8c4a
Testing the Visibility of the Bounding Box
EmilieHK Apr 27, 2020
e5b9e24
Testing Bounding Box further
EmilieHK Apr 27, 2020
ad02df0
Further testing
EmilieHK Apr 27, 2020
8af3ccf
Activating Bounding Box test
EmilieHK Apr 27, 2020
c74d9df
Reversed Changes
EmilieHK Apr 27, 2020
486ff95
Finalized Bounding Box
EmilieHK Apr 27, 2020
5f32882
Adjusted Size and Dimension of BoundingBox
EmilieHK May 6, 2020
344fa0b
Minor Size Adjustment in the Save Window
EmilieHK May 6, 2020
8988e29
Removed async from Deserialize method in ConnectionLineSerializer
JulianStaab May 14, 2020
aa487e1
Replaced https with http in build.xml in the backend
JulianStaab May 15, 2020
c8de8e4
Updated Test Scene and Colliders
JulianStaab May 15, 2020
2a6ff59
Changed folder name of ConnectionLine Test folder
JulianStaab May 15, 2020
d6095e6
Bug fixed: DrawLine Button raised
JulianStaab Jun 24, 2020
62c1647
Bug fixed: Lines with same end points
JulianStaab Jun 24, 2020
f5f589c
Bug fixed: Disable mode if window closed
JulianStaab Jun 24, 2020
da460a0
Changed Selection to IssueSelector.Selected + Bug fixed: Line could b…
JulianStaab Jun 24, 2020
191cbaf
Fixed the previous bug also for visualizations
JulianStaab Jun 24, 2020
bc5a0cb
Updated the connectionlines branch to MRTK v2.4.0 and fixed many issu…
JulianStaab Dec 14, 2020
eb889c2
Smaller error fixes
Dec 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion Backend/build.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<target name="download-ivy" unless="skip.download">
<mkdir dir="${ivy.jar.dir}"/>
<echo message="installing ivy..."/>
<get src="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
<get src="https://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.install.version}/ivy-${ivy.install.version}.jar"
dest="${ivy.jar.file}" usetimestamp="true" skipexisting="true"/>
</target>
<!-- Try to load Ivy here from local Ivy directory -->
Expand Down
Loading