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/maroon 399 tools UI #409

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

Feature/maroon 399 tools UI #409

wants to merge 30 commits into from

Commits on Aug 2, 2022

  1. Initial Commit

    @dpdsw
    dpdsw committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    07e1f90 View commit details
    Browse the repository at this point in the history

  2. Fix coord systems world position, improve example scene

    @dpdsw
    dpdsw committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    b62d3ff View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2022

  1. Added lightweight coulombslaw scene

    @dpdsw
    dpdsw committed Aug 12, 2022
    Configuration menu
    Copy the full SHA
    e0a054a View commit details
    Browse the repository at this point in the history

Commits on Aug 19, 2022

  1. Add leightweight version of coulombs law experiment

    @dpdsw
    dpdsw committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    989389c View commit details
    Browse the repository at this point in the history

  2. Add tools suite and leightweight version of Coulombs law experiment

    @dpdsw
    dpdsw committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    0cd0ed5 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/Maroon-399_ToolsUI' of https://github.com/GameL… 

    …abGraz/Maroon into feature/Maroon-399_ToolsUI
    @dpdsw
    dpdsw committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    72d94c7 View commit details
    Browse the repository at this point in the history

  4. Update UIParticleDragHandler.cs 

    Fix issue
    @dpdsw
    dpdsw committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    7d0d8ac View commit details
    Browse the repository at this point in the history

  5. Remove uneccessary file

    @dpdsw
    dpdsw committed Aug 19, 2022
    Configuration menu
    Copy the full SHA
    b08b68f View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2022

  1. Merge remote-tracking branch 'remotes/origin/develop' into feature/Ma… 

    …roon-399_ToolsUI
    @michaelholly
    michaelholly committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    7c8a535 View commit details
    Browse the repository at this point in the history

  2. Change Canvas Render Mode to Overlay

    @michaelholly
    michaelholly committed Aug 29, 2022
    Configuration menu
    Copy the full SHA
    2251064 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2022

  1. Added Simulation, Materials

    @dpdsw
    dpdsw committed Sep 12, 2022
    Configuration menu
    Copy the full SHA
    cc95672 View commit details
    Browse the repository at this point in the history

Commits on Sep 21, 2022

  1. Merge remote-tracking branch 'remotes/origin/develop' into feature/Ma… 

    …roon-399_ToolsUI
    @michaelholly
    michaelholly committed Sep 21, 2022
    Configuration menu
    Copy the full SHA
    78b8726 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2022

  1. Moved Files to according folders

    @dpdsw
    dpdsw committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    6748dc2 View commit details
    Browse the repository at this point in the history

  2. Moved to ExperimentSetting

    @dpdsw
    dpdsw committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    c85096a View commit details
    Browse the repository at this point in the history

  3. Adapted Dragging

    @dpdsw
    dpdsw committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    62816f6 View commit details
    Browse the repository at this point in the history

  4. applieder scaling to UI

    @dpdsw
    dpdsw committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    144c5b6 View commit details
    Browse the repository at this point in the history

  5. Added z input variable

    @dpdsw
    dpdsw committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    d65c61d View commit details
    Browse the repository at this point in the history

  6. adapted namespace

    @dpdsw
    dpdsw committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    42d65b3 View commit details
    Browse the repository at this point in the history

  7. fine tuning particle properties

    @dpdsw
    dpdsw committed Sep 24, 2022
    Configuration menu
    Copy the full SHA
    2ca1abc View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2022

  1. fix CoordSystem calculations

    @michaelholly
    michaelholly committed Oct 3, 2022
    Configuration menu
    Copy the full SHA
    b200ac7 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2022

  1. Fixed scale of visualization

    @dpdsw
    dpdsw committed Oct 28, 2022
    Configuration menu
    Copy the full SHA
    5deb15a View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Merge branch 'develop' into feature/Maroon-399_ToolsUI 

    # Conflicts:
#	unity/Assets/Maroon/reusableGui/Experiment/UI.prefab
#	unity/Assets/Maroon/scenes/experiments/OpticsSimulations/Optics.pc.unity
    @Averimon
    Averimon committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    b7442d8 View commit details
    Browse the repository at this point in the history

  2. Fixed dependency errors and warnings post merge

    @Averimon
    Averimon committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    085a25f View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. Changed coordinate system to micrometer

    @Averimon
    Averimon committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    510598f View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2024

  1. Fixed shader + materials for ColoumbsLawRemake

    @Averimon
    Averimon committed Oct 25, 2024
    Configuration menu
    Copy the full SHA
    0cf409c View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2024

  1. Disabled z-axis movement for Voltmeter+Ruler pins

    @Averimon
    Averimon committed Oct 28, 2024
    Configuration menu
    Copy the full SHA
    ff4c8bb View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2024

  1. Adjusted ruler and voltmeter to new unit (nanometer)

    @Averimon
    Averimon committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    6f77030 View commit details
    Browse the repository at this point in the history

  2. Implemented ToolController

    @Averimon
    Averimon committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    9e9cb57 View commit details
    Browse the repository at this point in the history

  3. Swapped out old CoulombsLaw with Remake

    @Averimon
    Averimon committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    1b01ef3 View commit details
    Browse the repository at this point in the history

  4. Changed pin colors of ruler

    @Averimon
    Averimon committed Oct 29, 2024
    Configuration menu
    Copy the full SHA
    35df500 View commit details
    Browse the repository at this point in the history