-
Notifications
You must be signed in to change notification settings - Fork 17
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
Maroon-399 Tools UI #409
Open
dpdsw
wants to merge
40
commits into
develop
Choose a base branch
from
feature/Maroon-399_ToolsUI
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Maroon-399 Tools UI #409
Changes from 11 commits
Commits
Show all changes
40 commits
Select commit
Hold shift + click to select a range
bf10f35
Add tools suite and leightweight version of Coulombs law experiment
dpdsw 3971287
Initial Commit
dpdsw 3224428
Added lightweight coulombslaw scene
dpdsw e6d5cbf
Add leightweight version of coulombs law experiment
dpdsw 6e253a1
Update UIParticleDragHandler.cs
dpdsw b3168ed
Remove uneccessary file
dpdsw d0c46a6
Change Canvas Render Mode to Overlay
michaelholly d877e0e
Added Simulation, Materials
dpdsw ace744a
Moved Files to according folders
dpdsw 183596a
Moved to ExperimentSetting
dpdsw 5b5e9e9
Adapted Dragging
dpdsw dd4c9c9
applieder scaling to UI
dpdsw 5c5df5b
Added z input variable
dpdsw 8d22b81
adapted namespace
dpdsw c079147
fine tuning particle properties
dpdsw 150122f
fix CoordSystem calculations
michaelholly a98bd1d
Fixed scale of visualization
dpdsw 9f819b0
Fixed dependency errors and warnings post merge
Averimon 661aa15
Changed coordinate system to micrometer
Averimon 4b83a11
Fixed shader + materials for ColoumbsLawRemake
Averimon f4a1c32
Disabled z-axis movement for Voltmeter+Ruler pins
Averimon de1a627
Adjusted ruler and voltmeter to new unit (nanometer)
Averimon f6157e9
Implemented ToolController
Averimon 7db4697
Swapped out old CoulombsLaw with Remake
Averimon 574490d
Changed pin colors of ruler
Averimon b4788ab
Fix Check fails (multiple UICameras+removed unknown script)
Averimon 7d36e20
Removed deprecated ColumbsLaw
Averimon 004e16c
Fixed missing references
Averimon cfd5289
Renamed CoulombsLaw scene
Averimon fc3c55f
Bugfix: Add charge button works again
Averimon ad2bc77
Added Language file to CoulombsLaw
Averimon 6953b50
Added VectorFieldVisualization and Toggle Vector Field
Averimon c8d282e
Removed author comment and made Start methods private
Averimon 73d5799
Added Maroon.Experiments.CoulombsLaw namespace
Averimon f9697a6
Simplified code
Averimon b25269a
Fixed missing prefabs
Averimon 0910bce
Made abstract IField functions non-abstract
Averimon d243b0c
Capitalized function names
Averimon 2e0238b
Fixed incorrect indentation
Averimon c126883
CoulombsLaw Physics improvements
Averimon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
3 changes: 0 additions & 3 deletions
3
unity/Assets/Maroon/reusableGui/Experiment/Scripts/Runtime/ToggleUIElement.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,3 @@ | ||
| // | ||
| //Author: Tobias Stöckl | ||
| // | ||
| using UnityEngine; | ||
|
|
||
| public class ToggleUIElement : MonoBehaviour | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is this file used anywhere now? if not can it be removed
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
sorry, but I can't seem to find out if this file is used anywhere?