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

Merge current develop branch into master #24

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Merge current develop branch into master #24

wants to merge 15 commits into from

Commits on Mar 27, 2019

  1. fixed errors when using MSVC

    @mmaurus
    mmaurus committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    1b13f82 View commit details
    Browse the repository at this point in the history

  2. consistent formatting; added done() functionality to properly close o… 

    …sgviz when using update() in a while loop
    @mmaurus
    mmaurus committed Mar 27, 2019
    Configuration menu
    Copy the full SHA
    599125a View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2019

  1. changes so that an externally created window can be added

    @mmaurus
    mmaurus committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    cefd6fa View commit details
    Browse the repository at this point in the history

  2. return osg::ref_ptr instaed of *

    @ric-cave
    ric-cave committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    514a239 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'getHUD' into develop

    @ric-cave
    ric-cave committed Apr 11, 2019
    Configuration menu
    Copy the full SHA
    4a214cf View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2019

  1. consistently use osg::ref_ptr in HUD and Main.cpp

    @planthaber
    planthaber committed Apr 17, 2019
    Configuration menu
    Copy the full SHA
    9b88544 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2019

  1. remove find_package(OpenSceneGraph), pkg_config is used later

    @planthaber
    planthaber committed May 2, 2019
    Configuration menu
    Copy the full SHA
    7b6f5a0 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2019

  1. fixed fullscreen by reading the DISPLAY env variable

    @planthaber
    planthaber committed May 3, 2019
    Configuration menu
    Copy the full SHA
    125d673 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2019

  1. add modules to Readme

    @planthaber
    planthaber committed Jul 12, 2019
    Configuration menu
    Copy the full SHA
    e7c13e4 View commit details
    Browse the repository at this point in the history

  2. readme update

    @planthaber
    planthaber committed Jul 12, 2019
    Configuration menu
    Copy the full SHA
    b3a73fa View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2020

  1. searchNodes::searchByName: use const std::string& as param

    @planthaber
    planthaber committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    29e2dfe View commit details
    Browse the repository at this point in the history

Commits on Apr 1, 2020

  1. remove unused variable

    @planthaber
    planthaber committed Apr 1, 2020
    Configuration menu
    Copy the full SHA
    45bf475 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2020

  1. Only run frame() on realized windows

    @pierrewillenbrockdfki @planthaber
    pierrewillenbrockdfki authored and planthaber committed May 27, 2020
    Configuration menu
    Copy the full SHA
    5fa901a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop'

    @planthaber
    planthaber committed May 27, 2020
    Configuration menu
    Copy the full SHA
    ce3b4c9 View commit details
    Browse the repository at this point in the history

Commits on May 29, 2020

  1. Revert "Only run frame() on realized windows" 

    This reverts commit 5fa901a.
    @planthaber
    planthaber committed May 29, 2020
    Configuration menu
    Copy the full SHA
    930439d View commit details
    Browse the repository at this point in the history