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

Feature/#51 make geometryitems clickable #95

Closed
wants to merge 26 commits into from
Closed

Feature/#51 make geometryitems clickable #95

wants to merge 26 commits into from

Commits on Jan 13, 2020

  1. WIP

    @DorianRec
    DorianRec committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    71b9243 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/#51-make-geometryitems-clickable 

    # Conflicts:
#	src/main/java/com/treasure/hunt/game/GameManager.java
#	src/main/java/com/treasure/hunt/strategy/hider/impl/RandomAngleHintHider.java
#	src/main/java/com/treasure/hunt/utils/EventBusUtils.java
#	src/main/java/com/treasure/hunt/view/MainController.java
    @DorianRec
    DorianRec committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    073f202 View commit details
    Browse the repository at this point in the history

  3. WIP

    @DorianRec
    DorianRec committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    ba20d5c View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2020

  1. Merge branch 'master' into feature/#51-make-geometryitems-clickable

    @DorianRec
    DorianRec committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    44a9a51 View commit details
    Browse the repository at this point in the history

  2. WIP

    @DorianRec
    DorianRec committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    b35513d View commit details
    Browse the repository at this point in the history

  3. Added a visible filter for the geometryItems 

    and fixed the exception
    @DorianRec
    DorianRec committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    3aca491 View commit details
    Browse the repository at this point in the history

  4. Bugfix

    @DorianRec
    DorianRec committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    733ac26 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into feature/#51-make-geometryitems-clickable 

    # Conflicts:
#	src/main/java/com/treasure/hunt/game/GameManager.java
#	src/main/java/com/treasure/hunt/jts/geom/Circle.java
#	src/main/java/com/treasure/hunt/strategy/geom/GeometryItem.java
    @DorianRec
    DorianRec committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    ed47ea8 View commit details
    Browse the repository at this point in the history

  6. resolved conflicts

    @DorianRec
    DorianRec committed Jan 14, 2020
    Configuration menu
    Copy the full SHA
    fa6aa83 View commit details
    Browse the repository at this point in the history

Commits on Mar 1, 2020

  1. Merge branch 'master' into feature/#51-make-geometryitems-clickable 

    # Conflicts:
#	src/main/java/com/treasure/hunt/strategy/geom/GeometryItem.java
#	src/main/java/com/treasure/hunt/strategy/geom/GeometryStyle.java
#	src/main/java/com/treasure/hunt/strategy/geom/GeometryType.java
#	src/main/java/com/treasure/hunt/view/CanvasController.java
    @DorianRec
    DorianRec committed Mar 1, 2020
    Configuration menu
    Copy the full SHA
    1fc2942 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2020

  1. Works now

    @DorianRec
    DorianRec committed Mar 5, 2020
    Configuration menu
    Copy the full SHA
    56715e6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into feature/#51-make-geometryitems-clickable 

    # Conflicts:
#	src/main/java/com/treasure/hunt/game/GameEngine.java
#	src/main/java/com/treasure/hunt/game/GameManager.java
#	src/main/java/com/treasure/hunt/strategy/geom/GeometryType.java
#	src/main/java/com/treasure/hunt/strategy/hider/impl/MaxAreaAngularHintStrategy.java
#	src/main/java/com/treasure/hunt/strategy/searcher/impl/NaiveAngleSearcher.java
#	src/main/java/com/treasure/hunt/utils/JTSUtils.java
#	src/main/java/com/treasure/hunt/utils/Renderer.java
    @DorianRec
    DorianRec committed Mar 5, 2020
    Configuration menu
    Copy the full SHA
    51c93a6 View commit details
    Browse the repository at this point in the history

  3. m

    @DorianRec
    DorianRec committed Mar 5, 2020
    Configuration menu
    Copy the full SHA
    f52b33d View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2020

  1. Merge branch 'master' into feature/#51-make-geometryitems-clickable

    dorianreineccius committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    b2d380e View commit details
    Browse the repository at this point in the history

  2. m

    dorianreineccius committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    47f7bc8 View commit details
    Browse the repository at this point in the history

  3. Fixes #181

    dorianreineccius committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    5643a09 View commit details
    Browse the repository at this point in the history

  4. Bugfix

    dorianreineccius committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    02a298f View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into feature/#51-make-geometryitems-clickable

    dorianreineccius committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    4843adf View commit details
    Browse the repository at this point in the history

  6. Merge branch 'bugfix/#181-unique-gemoetryitems' into feature/#51-make… 

    …-geometryitems-clickable
    dorianreineccius committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    abad937 View commit details
    Browse the repository at this point in the history

  7. Bugfix

    dorianreineccius committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    141b57c View commit details
    Browse the repository at this point in the history

  8. Tests fixed

    dorianreineccius committed Mar 6, 2020
    Configuration menu
    Copy the full SHA
    47f6291 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2020

  1. works fine now

    dorianreineccius committed Mar 7, 2020
    Configuration menu
    Copy the full SHA
    3528b94 View commit details
    Browse the repository at this point in the history

  2. m

    dorianreineccius committed Mar 7, 2020
    Configuration menu
    Copy the full SHA
    c79766d View commit details
    Browse the repository at this point in the history

  3. The treasure is only selectable once.

    dorianreineccius committed Mar 7, 2020
    Configuration menu
    Copy the full SHA
    8e3ba0f View commit details
    Browse the repository at this point in the history

  4. m

    dorianreineccius committed Mar 7, 2020
    Configuration menu
    Copy the full SHA
    b8797e9 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2020

  1. Fixed some conservations

    dorianreineccius committed Mar 9, 2020
    Configuration menu
    Copy the full SHA
    cb728bc View commit details
    Browse the repository at this point in the history