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

Master #5

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

Master #5

wants to merge 30 commits into from

Commits on Feb 7, 2016

  1. Mark

    @MarkJDaly
    MarkJDaly committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    8c74b36 View commit details
    Browse the repository at this point in the history

  2. Mark made a comment

    @MarkJDaly
    MarkJDaly committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    ed49558 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/Hack-a-thingie/game-of-will… 

    … into marknewbranch
    @MarkJDaly
    MarkJDaly committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    6061922 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/Hack-a-thingie/game-of-will… 

    … into marknewbranch
    @MarkJDaly
    MarkJDaly committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    5e2bfc8 View commit details
    Browse the repository at this point in the history

  5. some comment

    @Tnieddu
    Tnieddu committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    33dbbaf View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' of https://github.com/Hack-a-thingie/game-of-will… 

    … into marknewbranch
    @MarkJDaly
    MarkJDaly committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    7b772b7 View commit details
    Browse the repository at this point in the history

  7. Added LAN play

    @mauiaw
    mauiaw committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    969c9a6 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' of https://github.com/Hack-a-thingie/game-of-will… 

    … into marknewbranch
    @MarkJDaly
    MarkJDaly committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    0175f71 View commit details
    Browse the repository at this point in the history

  9. changed image file names

    @mauiaw
    mauiaw committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    f56f0b3 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'master' of https://github.com/Hack-a-thingie/game-of-will… 

    … into marknewbranch
    @MarkJDaly
    MarkJDaly committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    dc32c3c View commit details
    Browse the repository at this point in the history

  11. Thomas 4 men

    @MarkJDaly
    MarkJDaly committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    0d3bac4 View commit details
    Browse the repository at this point in the history

  12. some comment2

    @Tnieddu
    Tnieddu committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    4254b39 View commit details
    Browse the repository at this point in the history

  13. Merge branch 'master' of https://github.com/Hack-a-thingie/game-of-will 

    # Conflicts:
#	hex_gen_test.py
    @Tnieddu
    Tnieddu committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    be63fb8 View commit details
    Browse the repository at this point in the history

  14. Added vertices function 

    check that out Mark
    @Tnieddu
    Tnieddu committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    4a4ab2d View commit details
    Browse the repository at this point in the history

  15. trying

    @mauiaw
    mauiaw committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    332f603 View commit details
    Browse the repository at this point in the history

  16. Merge pull request #6 from Hack-a-thingie/willsbranchtry 

    trying
    @willhsp
    willhsp committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    7f083ed View commit details
    Browse the repository at this point in the history

  17. message

    @mauiaw
    mauiaw committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    c25a235 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #7 from Hack-a-thingie/willsbranchtry 

    message
    @willhsp
    willhsp committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    af08d32 View commit details
    Browse the repository at this point in the history

  19. Update hex_gen_test.py

    @MarkJDaly
    MarkJDaly committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    a8bb4d0 View commit details
    Browse the repository at this point in the history

  20. message

    @mauiaw
    mauiaw committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    c2c4ebe View commit details
    Browse the repository at this point in the history

  21. Hex_funcs

    @MarkJDaly
    MarkJDaly committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    d1eca4e View commit details
    Browse the repository at this point in the history

  22. num_terr

    @MarkJDaly
    MarkJDaly committed Feb 7, 2016
    Configuration menu
    Copy the full SHA
    e3794b8 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2016

  1. mes

    @mauiaw
    mauiaw committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    310fcae View commit details
    Browse the repository at this point in the history

  2. mes

    @mauiaw
    mauiaw committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    9f2a50e View commit details
    Browse the repository at this point in the history

  3. added pygame

    @willhsp
    willhsp committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    29025e8 View commit details
    Browse the repository at this point in the history

  4. given hex starting types and method to set

    @willhsp
    willhsp committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    58142f6 View commit details
    Browse the repository at this point in the history

  5. board finished

    @willhsp
    willhsp committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    5783d30 View commit details
    Browse the repository at this point in the history

  6. stuff

    @mauiaw
    mauiaw committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    d191188 View commit details
    Browse the repository at this point in the history

  7. turn indicator

    @willhsp
    willhsp committed Feb 8, 2016
    Configuration menu
    Copy the full SHA
    fdc1a4d View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2016

  1. rewrite

    @willhsp
    willhsp committed Feb 10, 2016
    Configuration menu
    Copy the full SHA
    4ab47c1 View commit details
    Browse the repository at this point in the history