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 404 falling ball viscosimeter #511

Merged
merged 69 commits into from
Oct 23, 2024
Merged

Feature/maroon 404 falling ball viscosimeter #511

merged 69 commits into from
Oct 23, 2024

Commits on Jul 19, 2022

  1. initial commit

    @danielliegl
    danielliegl committed Jul 19, 2022
    Configuration menu
    Copy the full SHA
    7603b55 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2022

  1. applying force to the ball

    @danielliegl
    danielliegl committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    ffae76e View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2022

  1. calculation of forces

    @danielliegl
    danielliegl committed Jul 30, 2022
    Configuration menu
    Copy the full SHA
    78b9132 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2022

  1. Merge branch 'develop' into feature/Maroon-404_Falling_Ball_Viscosimeter

    @danielliegl
    danielliegl committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    d43efe6 View commit details
    Browse the repository at this point in the history

  2. viscosity friction force added

    @danielliegl
    danielliegl committed Aug 31, 2022
    Configuration menu
    Copy the full SHA
    5d18a90 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2023

  1. Merge branch 'develop' into feature/Maroon-404_Falling_Ball_Viscosimeter

    @danielliegl
    danielliegl committed Jan 3, 2023
    Configuration menu
    Copy the full SHA
    65f74e4 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2023

  1. Manager and Measurement System

    @danielliegl
    danielliegl committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    4070351 View commit details
    Browse the repository at this point in the history

  2. saved

    @danielliegl
    danielliegl committed Jan 4, 2023
    Configuration menu
    Copy the full SHA
    2015829 View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2023

  1. Merge branch 'develop' into feature/Maroon-404_Falling_Ball_Viscosimeter

    @danielliegl
    danielliegl committed Apr 30, 2023
    Configuration menu
    Copy the full SHA
    536c6d1 View commit details
    Browse the repository at this point in the history

  2. start scale & weighable object

    @danielliegl
    danielliegl committed Apr 30, 2023
    Configuration menu
    Copy the full SHA
    2eb23c9 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. fixed buoyancy force and force application a bit

    @danielliegl
    danielliegl committed May 16, 2023
    Configuration menu
    Copy the full SHA
    9b0b634 View commit details
    Browse the repository at this point in the history

  2. forgot to save scene

    @danielliegl
    danielliegl committed May 16, 2023
    Configuration menu
    Copy the full SHA
    7d61f6c View commit details
    Browse the repository at this point in the history

Commits on May 19, 2023

  1. ball physics look good

    @danielliegl
    danielliegl committed May 19, 2023
    Configuration menu
    Copy the full SHA
    769f754 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2023

  1. Merge branch 'develop' into feature/Maroon-404_Falling_Ball_Viscosimeter

    @danielliegl
    danielliegl committed Jul 14, 2023
    Configuration menu
    Copy the full SHA
    ec16dca View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2023

  1. Begin Drag and Drop

    @danielliegl
    danielliegl committed Jul 17, 2023
    Configuration menu
    Copy the full SHA
    ff97664 View commit details
    Browse the repository at this point in the history

Commits on Jul 18, 2023

  1. Drag and Drop and Scale done.

    @danielliegl
    danielliegl committed Jul 18, 2023
    Configuration menu
    Copy the full SHA
    17593bf View commit details
    Browse the repository at this point in the history

Commits on Aug 6, 2023

  1. weighable reworked, start pycnometer fill 

    not working :(
    @danielliegl
    danielliegl committed Aug 6, 2023
    Configuration menu
    Copy the full SHA
    6ddf3f0 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2023

  1. fixed pycnometer fill

    @danielliegl
    danielliegl committed Aug 13, 2023
    Configuration menu
    Copy the full SHA
    cde436c View commit details
    Browse the repository at this point in the history

Commits on Sep 7, 2023

  1. begin measuring objects functionality

    @danielliegl
    danielliegl committed Sep 7, 2023
    Configuration menu
    Copy the full SHA
    7104c82 View commit details
    Browse the repository at this point in the history

Commits on Sep 11, 2023

  1. caliper drag start

    @danielliegl
    danielliegl committed Sep 11, 2023
    Configuration menu
    Copy the full SHA
    57a608e View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2023

  1. added MeasurementManager.cs

    @danielliegl
    danielliegl committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    2728971 View commit details
    Browse the repository at this point in the history

  2. forgor

    @danielliegl
    danielliegl committed Sep 13, 2023
    Configuration menu
    Copy the full SHA
    d35374c View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2023

  1. fixed caliper drag and drop for ortho camera

    @danielliegl
    danielliegl committed Sep 24, 2023
    Configuration menu
    Copy the full SHA
    92b3507 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2023

  1. improvements to measurement

    @danielliegl
    danielliegl committed Sep 25, 2023
    Configuration menu
    Copy the full SHA
    1332647 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2023

  1. calliper improvements

    @danielliegl
    danielliegl committed Sep 26, 2023
    Configuration menu
    Copy the full SHA
    199985f View commit details
    Browse the repository at this point in the history

Commits on Sep 30, 2023

  1. maxspeed debug text, changed floats to decimal for more precision

    @danielliegl
    danielliegl committed Sep 30, 2023
    Configuration menu
    Copy the full SHA
    7578217 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2023

  1. Merge branch 'feature/Maroon-404_Falling_Ball_Viscosimeter' of https:… 

    …//github.com/GameLabGraz/Maroon into feature/Maroon-404_Falling_Ball_Viscosimeter
    @danielliegl
    danielliegl committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    75b94fe View commit details
    Browse the repository at this point in the history

  2. moved physics calculation to fixed update

    @danielliegl
    danielliegl committed Oct 10, 2023
    Configuration menu
    Copy the full SHA
    faa4462 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2023

  1. QuantityDecimal implemented

    @danielliegl
    danielliegl committed Oct 12, 2023
    Configuration menu
    Copy the full SHA
    93df4f2 View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2023

  1. Added Ball Size Slider, Fixed Scale

    @danielliegl
    danielliegl committed Oct 16, 2023
    Configuration menu
    Copy the full SHA
    f6dde05 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2023

  1. start of something

    @danielliegl
    danielliegl committed Oct 17, 2023
    Configuration menu
    Copy the full SHA
    6125722 View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2023

  1. fixed pause

    @danielliegl
    danielliegl committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    ee34280 View commit details
    Browse the repository at this point in the history

  2. physics reworked

    @danielliegl
    danielliegl committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    312824c View commit details
    Browse the repository at this point in the history

  3. ball no longer inside table lmoa

    @danielliegl
    danielliegl committed Oct 18, 2023
    Configuration menu
    Copy the full SHA
    2a86856 View commit details
    Browse the repository at this point in the history

Commits on Oct 21, 2023

  1. added minSize for Measurement Camera

    @danielliegl
    danielliegl committed Oct 21, 2023
    Configuration menu
    Copy the full SHA
    5c86774 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2023

  1. DragDrop and Measurement improved

    @danielliegl
    danielliegl committed Oct 25, 2023
    Configuration menu
    Copy the full SHA
    ebd6f91 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2023

  1. better camera controls

    @danielliegl
    danielliegl committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    5d8dcae View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2024

  1. Merge branch 'develop' into feature/Maroon-404_Falling_Ball_Viscosimeter

    @danielliegl
    danielliegl committed Mar 11, 2024
    Configuration menu
    Copy the full SHA
    8ae74ce View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2024

  1. UI updates and bug fixes 

    - Ball und Röhre bewegt, damit es besser in schirm passt
- Pyknometer leergewicht bug behoben
- Hahn für Pyknometer
- Messmodus verbessert
- UI Elemente auf die notwendigen reduziert
- Ball Startgröße vergrößert
    @danielliegl
    danielliegl committed Mar 18, 2024
    Configuration menu
    Copy the full SHA
    6ac75f6 View commit details
    Browse the repository at this point in the history

Commits on Mar 19, 2024

  1. start of analog caliper

    @danielliegl
    danielliegl committed Mar 19, 2024
    Configuration menu
    Copy the full SHA
    17379f0 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2024

  1. Caliper with Line renderer, probably not gonna be used. Fixed mouse d… 

    …rag when measuring.
    @danielliegl
    danielliegl committed Mar 27, 2024
    Configuration menu
    Copy the full SHA
    c100c8f View commit details
    Browse the repository at this point in the history

Commits on Apr 2, 2024

  1. Added Better Stopwatch

    @danielliegl
    danielliegl committed Apr 2, 2024
    Configuration menu
    Copy the full SHA
    e3e6ce7 View commit details
    Browse the repository at this point in the history

Commits on Apr 4, 2024

  1. arg

    @danielliegl
    danielliegl committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    41c121f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'feature/Maroon-404_Falling_Ball_Viscosimeter' of https:… 

    …//github.com/GameLabGraz/Maroon into feature/Maroon-404_Falling_Ball_Viscosimeter
    @danielliegl
    danielliegl committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    94d862e View commit details
    Browse the repository at this point in the history

  3. Caliper to texture from wikipedia svg

    @danielliegl
    danielliegl committed Apr 4, 2024
    Configuration menu
    Copy the full SHA
    a77344f View commit details
    Browse the repository at this point in the history

Commits on Apr 5, 2024

  1. random size for ball and weight, clamp caliper

    @danielliegl
    danielliegl committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    b9bfbdb View commit details
    Browse the repository at this point in the history

  2. better pycnometer and scale

    @danielliegl
    danielliegl committed Apr 5, 2024
    Configuration menu
    Copy the full SHA
    365b34c View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2024

  1. added basic oil heating element

    @danielliegl
    danielliegl committed Apr 7, 2024
    Configuration menu
    Copy the full SHA
    1d50274 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2024

  1. Added License for Caliper Sprites

    @danielliegl
    danielliegl committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    96df560 View commit details
    Browse the repository at this point in the history

  2. Measuring Tape Display

    @danielliegl
    danielliegl committed Apr 9, 2024
    Configuration menu
    Copy the full SHA
    a14a155 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2024

  1. line renderer for tape

    @danielliegl
    danielliegl committed Apr 11, 2024
    Configuration menu
    Copy the full SHA
    946be79 View commit details
    Browse the repository at this point in the history

Commits on May 5, 2024

  1. updated physics

    @danielliegl
    danielliegl committed May 5, 2024
    Configuration menu
    Copy the full SHA
    4f22b4f View commit details
    Browse the repository at this point in the history

Commits on May 6, 2024

  1. added Dropdown for Choosing Fluids 

    Moved Fluid property calculation to ViscosimeterManager
    @danielliegl
    danielliegl committed May 6, 2024
    Configuration menu
    Copy the full SHA
    9c11651 View commit details
    Browse the repository at this point in the history

  2. argh

    @danielliegl
    danielliegl committed May 6, 2024
    Configuration menu
    Copy the full SHA
    79ac496 View commit details
    Browse the repository at this point in the history

Commits on May 8, 2024

  1. added more liquids, blur in measurement camera 

    added Raman
    @danielliegl
    danielliegl committed May 8, 2024
    Configuration menu
    Copy the full SHA
    7e23f74 View commit details
    Browse the repository at this point in the history

  2. Update Glycerol.asset

    @danielliegl
    danielliegl committed May 8, 2024
    Configuration menu
    Copy the full SHA
    4e32b23 View commit details
    Browse the repository at this point in the history

Commits on May 15, 2024

  1. new stopwatch, camera

    @danielliegl
    danielliegl committed May 15, 2024
    Configuration menu
    Copy the full SHA
    ab61103 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2024

  1. fix build crash

    @danielliegl
    danielliegl committed May 17, 2024
    Configuration menu
    Copy the full SHA
    a73ba2a View commit details
    Browse the repository at this point in the history

Commits on May 22, 2024

  1. added Simple Tooltip from the Asset Store

    @danielliegl
    danielliegl committed May 22, 2024
    Configuration menu
    Copy the full SHA
    4497b07 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2024

  1. First Feedback Changes 

    - Make Reset Ball more clear
- Make it more clear that slow motion is active.
- Hint for zooming during measurements.
- Change key binding to mouse2 for panning in zoom mode
- disable collider of measured object
- Do not reset temperature after resetting the simulation. Added bool for allowing reset in the QuantityPropertyView
    @danielliegl
    danielliegl committed Aug 12, 2024
    Configuration menu
    Copy the full SHA
    b37a54d View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2024

  1. name changes

    @danielliegl
    danielliegl committed Aug 17, 2024
    Configuration menu
    Copy the full SHA
    4974219 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2024

  1. Experiment added to Maroon Menus + German Translation

    @danielliegl
    danielliegl committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    3b42e58 View commit details
    Browse the repository at this point in the history

  2. fix merge conflict

    @danielliegl
    danielliegl committed Aug 27, 2024
    Configuration menu
    Copy the full SHA
    15e5962 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into feature/Maroon-404_Falling_Ball_Viscosimeter

    @danielliegl
    danielliegl authored Aug 27, 2024
    Configuration menu
    Copy the full SHA
    78ce59a View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. Pull Request Changes

    @danielliegl
    danielliegl committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    6093ce4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into feature/Maroon-404_Falling_Ball_Viscosimeter

    @danielliegl
    danielliegl authored Oct 1, 2024
    Configuration menu
    Copy the full SHA
    c84c5fb View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. More Pull Request Changes

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

Commits on Oct 18, 2024

  1. even more pull request changes

    @danielliegl
    danielliegl committed Oct 18, 2024
    Configuration menu
    Copy the full SHA
    2e0eb9e View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2024

  1. more PR changes + missing translations

    @danielliegl
    danielliegl committed Oct 23, 2024
    Configuration menu
    Copy the full SHA
    916ddff View commit details
    Browse the repository at this point in the history