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

Beau extra #7

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

Beau extra #7

wants to merge 167 commits into from

Commits on Jun 18, 2019

  1. lobbySettings

    @LarsPB
    LarsPB committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    ae0085e View commit details
    Browse the repository at this point in the history

  2. lobbySettings

    @LarsPB
    LarsPB committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    81b9091 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/realDragonium/SmallWorld … 

    …into BeauExtra

# Conflicts:
#	pom.xml
    @YoranFox
    YoranFox committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    35394b7 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'lobby-branch' of https://github.com/realDragonium/Small… 

    …World into Firebase
    @realDragonium
    realDragonium committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    716ceac View commit details
    Browse the repository at this point in the history

  5. Lobby is connectbaar met firebase. 

    ook is Account toegevoegd.
    @realDragonium
    realDragonium committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    3c0065b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into Firebase

# Conflicts:
#	src/main/java/Controller/CombinationController.java
#	src/main/java/Controller/GameTurn.java
    @realDragonium
    realDragonium committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    6c32a54 View commit details
    Browse the repository at this point in the history

  7. Unused import deleted

    @realDragonium
    realDragonium committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    3cbf6ff View commit details
    Browse the repository at this point in the history

  8. java doc

    @LarsPB
    LarsPB committed Jun 18, 2019
    Configuration menu
    Copy the full SHA
    12e669f View commit details
    Browse the repository at this point in the history

Commits on Jun 19, 2019

  1. Merge branch 'master' of https://github.com/realDragonium/SmallWorld … 

    …into BeauExtra

# Conflicts:
#	pom.xml
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    88b971e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Applicatie/Applicatie.java
#	src/main/java/Managers/SceneManager.java
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    e0598ae View commit details
    Browse the repository at this point in the history

  3. ff snel van yoran met lobby 196 1130

    MartijnSteen committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    47d5cde View commit details
    Browse the repository at this point in the history

  4. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into mapkwijtmartijn
    MartijnSteen committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    bb07d14 View commit details
    Browse the repository at this point in the history

  5. wanneer 1 speler start, start de rest ook

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    7446e8e View commit details
    Browse the repository at this point in the history

  6. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into Firebase
    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    513adf2 View commit details
    Browse the repository at this point in the history

  7. merged firebase with beauextra

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    d53f8a9 View commit details
    Browse the repository at this point in the history

  8. lobby fixed?

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    3e4839a View commit details
    Browse the repository at this point in the history

  9. player id fixed

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    67310e1 View commit details
    Browse the repository at this point in the history

  10. player id fixed

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    1a159af View commit details
    Browse the repository at this point in the history

  11. @Overriding helemaal naar de getver

    MartijnSteen committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    6da0dfb View commit details
    Browse the repository at this point in the history

  12. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into mapkwijtmartijn
    MartijnSteen committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    5c409ce View commit details
    Browse the repository at this point in the history

  13. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Applicatie/Applicatie.java
#	src/main/java/Managers/SceneManager.java
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    773b4bd View commit details
    Browse the repository at this point in the history

  14. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    033478c View commit details
    Browse the repository at this point in the history

  15. Lobby algemene start gefixed

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    99f1696 View commit details
    Browse the repository at this point in the history

  16. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Applicatie/Applicatie.java
#	src/main/java/Managers/SceneManager.java
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    d565f0f View commit details
    Browse the repository at this point in the history

  17. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameController.java
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    175cc8f View commit details
    Browse the repository at this point in the history

  18. JUNIT test proberen 1330

    MartijnSteen committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    bc08b82 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into mapkwijtmartijn
    MartijnSteen committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    1c06fd2 View commit details
    Browse the repository at this point in the history

  20. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameController.java
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    6042e4b View commit details
    Browse the repository at this point in the history

  21. commit before merge

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    343188c View commit details
    Browse the repository at this point in the history

  22. mogelijk om met firebase te werken

    @winosabelis
    winosabelis committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    636de01 View commit details
    Browse the repository at this point in the history

  23. fiches en punten via firebase

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    6e27757 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameController.java
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    29b4b39 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    8097150 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameController.java
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    5e0363a View commit details
    Browse the repository at this point in the history

  27. met namen erin

    @winosabelis
    winosabelis committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    f1fad25 View commit details
    Browse the repository at this point in the history

  28. inlobby players

    @LarsPB
    LarsPB committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    93747dd View commit details
    Browse the repository at this point in the history

  29. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameController.java
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    f9417e9 View commit details
    Browse the repository at this point in the history

  30. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameController.java
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    a267008 View commit details
    Browse the repository at this point in the history

  31. areas loaded within firebase

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    a20f4ee View commit details
    Browse the repository at this point in the history

  32. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    065f832 View commit details
    Browse the repository at this point in the history

  33. areas loaded within firebase

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    b813a4b View commit details
    Browse the repository at this point in the history

  34. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameController.java
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    0475f55 View commit details
    Browse the repository at this point in the history

  35. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    5746fa0 View commit details
    Browse the repository at this point in the history

  36. autolobby delete wanneer game is gestart, werkt.

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    14e5c91 View commit details
    Browse the repository at this point in the history

  37. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameController.java
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    1287dad View commit details
    Browse the repository at this point in the history

  38. timer firebase, not tested.

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    7071691 View commit details
    Browse the repository at this point in the history

  39. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    3fad92c View commit details
    Browse the repository at this point in the history

  40. fxml lobby scenes

    @LarsPB
    LarsPB committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    7814bad View commit details
    Browse the repository at this point in the history

  41. timer firebase error fixed

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    b472f78 View commit details
    Browse the repository at this point in the history

  42. Merge remote-tracking branch 'origin/lobby-branch' into lobby-branch

    @LarsPB
    LarsPB committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    e7ae678 View commit details
    Browse the repository at this point in the history

  43. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameController.java
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    fd1bdb9 View commit details
    Browse the repository at this point in the history

  44. firebase werkt weer

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    408f4fb View commit details
    Browse the repository at this point in the history

  45. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameController.java
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    2c2b25d View commit details
    Browse the repository at this point in the history

  46. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameTimer.java
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    0c70111 View commit details
    Browse the repository at this point in the history

  47. begin aan top3, commit before pull

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    3360fc5 View commit details
    Browse the repository at this point in the history

  48. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    69310fb View commit details
    Browse the repository at this point in the history

  49. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameTimer.java
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    4029963 View commit details
    Browse the repository at this point in the history

  50. commit before pull

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    dff2b60 View commit details
    Browse the repository at this point in the history

  51. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    8eb6a4a View commit details
    Browse the repository at this point in the history

  52. Geen idee meer......................

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    820f9c0 View commit details
    Browse the repository at this point in the history

  53. timer werkt weer

    @realDragonium
    realDragonium committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    71dd458 View commit details
    Browse the repository at this point in the history

  54. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameTimer.java
    @YoranFox
    YoranFox committed Jun 19, 2019
    Configuration menu
    Copy the full SHA
    824ab4e View commit details
    Browse the repository at this point in the history

Commits on Jun 20, 2019

  1. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into lobby-branch
    @LarsPB
    LarsPB committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    229cef3 View commit details
    Browse the repository at this point in the history

  2. fxml lobby scenes

    @LarsPB
    LarsPB committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    25202ea View commit details
    Browse the repository at this point in the history

  3. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameTimer.java
    @YoranFox
    YoranFox committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    c1ab84d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @YoranFox
    YoranFox committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    4f864e7 View commit details
    Browse the repository at this point in the history

  5. commit before pull

    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    6387132 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'Test' of https://github.com/realDragonium/SmallWorld in… 

    …to BeauExtra

# Conflicts:
#	src/main/java/Model/LeaderboardModel.java
#	src/main/java/View/HomeScreenView.java
#	src/main/java/View/LeaderboardView.java

wino's leaderbord toegevoegd
    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    3f003da View commit details
    Browse the repository at this point in the history

  7. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameTimer.java
    @YoranFox
    YoranFox committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    1f18c0e View commit details
    Browse the repository at this point in the history

  8. Dice werkt samen met nieuwste versie

    @winosabelis
    winosabelis committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    ff52cc8 View commit details
    Browse the repository at this point in the history

  9. Java doc to lobbies

    @LarsPB
    LarsPB committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    10c0908 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameTimer.java
    @YoranFox
    YoranFox committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    3c2a28d View commit details
    Browse the repository at this point in the history

  11. Java doc to lobbies

    @LarsPB
    LarsPB committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    a635368 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into lobby-branch
    @LarsPB
    LarsPB committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    96ab0b1 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'Test' of https://github.com/realDragonium/SmallWorld in… 

    …to BeauExtra

# Conflicts:
#	src/main/java/Applicatie/Applicatie.java
#	src/main/java/Model/AreaModel.java
#	src/main/java/View/HomeScreenView.java
    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    c829b3d View commit details
    Browse the repository at this point in the history

  14. JUNIT test proberen 206 1145

    MartijnSteen committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    5ca06df View commit details
    Browse the repository at this point in the history

  15. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into mapkwijtmartijn
    MartijnSteen committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    b61f0a5 View commit details
    Browse the repository at this point in the history

  16. De leaderboard haalt de naam en de waarde van de spelers op

    @winosabelis
    winosabelis committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    83528f8 View commit details
    Browse the repository at this point in the history

  17. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Applicatie/Applicatie.java
#	src/main/java/Model/AreaModel.java
commit before pull
    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    f488442 View commit details
    Browse the repository at this point in the history

  18. verandering gamescreen

    @YoranFox
    YoranFox committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    eeb97d9 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @YoranFox
    YoranFox committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    a1e7b14 View commit details
    Browse the repository at this point in the history

  20. verandering gamescreen

    @YoranFox
    YoranFox committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    8fff928 View commit details
    Browse the repository at this point in the history

  21. Merge branches 'BeauExtra' and 'Test' of https://github.com/realDrago… 

    …nium/SmallWorld into BeauExtra

# Conflicts:
#	src/main/java/View/HomeScreenView.java
commit before pull
    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    00500ee View commit details
    Browse the repository at this point in the history

  22. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/GameTurn.java
    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    067d500 View commit details
    Browse the repository at this point in the history

  23. firebased aanvallen werkt?

    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    039ecdc View commit details
    Browse the repository at this point in the history

  24. Java doc to lobbies

    @LarsPB
    LarsPB committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    62157ae View commit details
    Browse the repository at this point in the history

  25. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into lobby-branch
    @LarsPB
    LarsPB committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    6cf3200 View commit details
    Browse the repository at this point in the history

  26. Java doc to lobbies

    @LarsPB
    LarsPB committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    cf35e64 View commit details
    Browse the repository at this point in the history

  27. Java doc to lobbies

    @LarsPB
    LarsPB committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    59b8ad8 View commit details
    Browse the repository at this point in the history

  28. Dice logic toegevoegd en phaseEnder gemaakt

    @YoranFox
    YoranFox committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    488d41f View commit details
    Browse the repository at this point in the history

  29. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @YoranFox
    YoranFox committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    153750e View commit details
    Browse the repository at this point in the history

  30. cijfers werken weer

    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    64a2bf4 View commit details
    Browse the repository at this point in the history

  31. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    d1e09f3 View commit details
    Browse the repository at this point in the history

  32. Dice logic toegevoegd en phaseEnder gemaakt

    @YoranFox
    YoranFox committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    58bb54d View commit details
    Browse the repository at this point in the history

  33. commit before pull

    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    f142a71 View commit details
    Browse the repository at this point in the history

  34. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    8a1db52 View commit details
    Browse the repository at this point in the history

  35. firebase area info wordt nu nog maar een keer geladen

    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    508040e View commit details
    Browse the repository at this point in the history

  36. area attack bug fixed

    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    a32426b View commit details
    Browse the repository at this point in the history

  37. Info scherm toegevoegd in game

    @YoranFox
    YoranFox committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    d812d08 View commit details
    Browse the repository at this point in the history

  38. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @YoranFox
    YoranFox committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    276ca4a View commit details
    Browse the repository at this point in the history

  39. Java doc to lobbies

    @LarsPB
    LarsPB committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    76f4aa3 View commit details
    Browse the repository at this point in the history

  40. JUNIT test proberen 206 1530

    MartijnSteen committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    a07c354 View commit details
    Browse the repository at this point in the history

  41. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into lobby-branch
    @LarsPB
    LarsPB committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    8986f17 View commit details
    Browse the repository at this point in the history

  42. shop via firebase en kan items buiten bereik niet meer kopen

    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    3c4bd0b View commit details
    Browse the repository at this point in the history

  43. Java doc to lobbies

    @LarsPB
    LarsPB committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    3b040b9 View commit details
    Browse the repository at this point in the history

  44. Timer fixed

    @YoranFox
    YoranFox committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    9182232 View commit details
    Browse the repository at this point in the history

  45. Dice gefixt

    @YoranFox
    YoranFox committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    925f7f6 View commit details
    Browse the repository at this point in the history

  46. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @YoranFox
    YoranFox committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    1b5b2a3 View commit details
    Browse the repository at this point in the history

  47. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    4695ce7 View commit details
    Browse the repository at this point in the history

  48. shop werkt weer

    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    af8d7de View commit details
    Browse the repository at this point in the history

  49. fixed some attack dingen

    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    411cf6b View commit details
    Browse the repository at this point in the history

  50. je kan alleen nog maar buren aanvallen

    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    c0f1b4a View commit details
    Browse the repository at this point in the history

  51. gonna solve some warnings

    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    df243d1 View commit details
    Browse the repository at this point in the history

  52. Failed login attempt message

    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    65630a1 View commit details
    Browse the repository at this point in the history

  53. Failed register message

    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    e8b6228 View commit details
    Browse the repository at this point in the history

  54. register account set fixed

    @realDragonium
    realDragonium committed Jun 20, 2019
    Configuration menu
    Copy the full SHA
    ae41532 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2019

  1. Java doc to lobbies

    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    ff3579f View commit details
    Browse the repository at this point in the history

  2. redeploy firebase test

    @realDragonium
    realDragonium committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    84d6094 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into lobby-branch

# Conflicts:
#	src/main/java/Firebase/FirebaseServiceOwn.java
    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    0f2e582 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into lobby-branch
    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    3ba8766 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into lobby-branch

# Conflicts:
#	src/main/java/Firebase/FirebaseServiceOwn.java
    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    847fd10 View commit details
    Browse the repository at this point in the history

  6. login fixed

    @realDragonium
    realDragonium committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    f2de1fd View commit details
    Browse the repository at this point in the history

  7. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into lobby-branch

# Conflicts:
#	src/main/java/Firebase/FirebaseServiceOwn.java
    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    494114c View commit details
    Browse the repository at this point in the history

  8. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into lobby-branch
    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    3b7cbaf View commit details
    Browse the repository at this point in the history

  9. miauwwie 2161030

    MartijnSteen committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    f39a998 View commit details
    Browse the repository at this point in the history

  10. Dice gefixt

    @YoranFox
    YoranFox committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    333d145 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @YoranFox
    YoranFox committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    f2fbb35 View commit details
    Browse the repository at this point in the history

  12. redeploy fb fixed?

    @realDragonium
    realDragonium committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    b97093e View commit details
    Browse the repository at this point in the history

  13. fb punten

    @realDragonium
    realDragonium committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    41e44df View commit details
    Browse the repository at this point in the history

  14. Niet

    @YoranFox
    YoranFox committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    4ec4a95 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into lobby-branch

# Conflicts:
#	src/main/java/Firebase/FirebaseServiceOwn.java
    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    321102f View commit details
    Browse the repository at this point in the history

  16. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into lobby-branch
    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    454f6b2 View commit details
    Browse the repository at this point in the history

  17. Krachten gefixt

    @YoranFox
    YoranFox committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    004e9b2 View commit details
    Browse the repository at this point in the history

  18. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into lobby-branch
    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    5ced4a6 View commit details
    Browse the repository at this point in the history

  19. jdocs

    @YoranFox
    YoranFox committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    5eb590e View commit details
    Browse the repository at this point in the history

  20. 216 1420

    MartijnSteen committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    4cd3131 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into mapkwijtmartijn
    MartijnSteen committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    0bb5a7b View commit details
    Browse the repository at this point in the history

  22. Javadoc of all observers

    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    236ae42 View commit details
    Browse the repository at this point in the history

  23. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into lobby-branch
    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    2aa7041 View commit details
    Browse the repository at this point in the history

  24. nu doen de turns en rondes het wel

    MartijnSteen committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    3b01637 View commit details
    Browse the repository at this point in the history

  25. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into mapkwijtmartijn
    MartijnSteen committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    a089170 View commit details
    Browse the repository at this point in the history

  26. commit before pull

    @realDragonium
    realDragonium committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    d525391 View commit details
    Browse the repository at this point in the history

  27. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/View/VervallenView.java
vervallen test
    @realDragonium
    realDragonium committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    34c1a26 View commit details
    Browse the repository at this point in the history

  28. nu doen de turns en rondes het wel 216 1515

    MartijnSteen committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    09a065e View commit details
    Browse the repository at this point in the history

  29. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into mapkwijtmartijn
    MartijnSteen committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    0cdd13f View commit details
    Browse the repository at this point in the history

  30. aanvallen fixed?

    @realDragonium
    realDragonium committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    f41bee5 View commit details
    Browse the repository at this point in the history

  31. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into mapkwijtmartijn
    MartijnSteen committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    95507f1 View commit details
    Browse the repository at this point in the history

  32. Javadoc of all observables

    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    7fb9b82 View commit details
    Browse the repository at this point in the history

  33. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into lobby-branch
    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    af3e686 View commit details
    Browse the repository at this point in the history

  34. Javadoc of all observables

    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    6445cf0 View commit details
    Browse the repository at this point in the history

  35. Javadoc of all observables

    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    77c6cd0 View commit details
    Browse the repository at this point in the history

  36. Javadoc of all observables

    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    0573e71 View commit details
    Browse the repository at this point in the history

  37. Javadoc of all observables

    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    70d0a9e View commit details
    Browse the repository at this point in the history

  38. aanvallen verbeterd

    @realDragonium
    realDragonium committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    61b22c9 View commit details
    Browse the repository at this point in the history

  39. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @realDragonium
    realDragonium committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    3064362 View commit details
    Browse the repository at this point in the history

  40. nu doen de turns en rondes het wel 216 1615

    MartijnSteen committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    4df2d9c View commit details
    Browse the repository at this point in the history

  41. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into mapkwijtmartijn
    MartijnSteen committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    2f3b83a View commit details
    Browse the repository at this point in the history

  42. Javadoc created

    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    691a6a4 View commit details
    Browse the repository at this point in the history

  43. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into lobby-branch
    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    25a9280 View commit details
    Browse the repository at this point in the history

  44. Javadoc created

    @LarsPB
    LarsPB committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    c6a1283 View commit details
    Browse the repository at this point in the history

  45. javadoc pulled

    @realDragonium
    realDragonium committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    48fd650 View commit details
    Browse the repository at this point in the history

  46. 1715 nu ben ik er helemaal klaar mee

    MartijnSteen committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    6e8271d View commit details
    Browse the repository at this point in the history

  47. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into mapkwijtmartijn
    MartijnSteen committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    2bcae03 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2019

  1. Player info toegevoegd 

    More player info available
    @YoranFox
    YoranFox committed Jun 23, 2019
    Configuration menu
    Copy the full SHA
    c2ecbda View commit details
    Browse the repository at this point in the history

  2. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra

# Conflicts:
#	src/main/java/Controller/AreaController.java
#	src/main/java/Observable/AreaObservable.java
    @YoranFox
    YoranFox committed Jun 23, 2019
    Configuration menu
    Copy the full SHA
    6053f04 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'BeauExtra' of https://github.com/realDragonium/SmallWorld… 

    … into BeauExtra
    @realDragonium
    realDragonium committed Jun 23, 2019
    Configuration menu
    Copy the full SHA
    60b5341 View commit details
    Browse the repository at this point in the history

  4. fixed farm color

    @realDragonium
    realDragonium committed Jun 23, 2019
    Configuration menu
    Copy the full SHA
    512194c View commit details
    Browse the repository at this point in the history