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

Blingame #24

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

Blingame #24

wants to merge 31 commits into from

Commits on Dec 15, 2017

  1. something

    @Vantuz
    Vantuz committed Dec 15, 2017
    Configuration menu
    Copy the full SHA
    0cc6ecc View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into blingame

    @Vantuz
    Vantuz committed Dec 15, 2017
    Configuration menu
    Copy the full SHA
    1225392 View commit details
    Browse the repository at this point in the history

  3. zapilil

    @Vantuz
    Vantuz committed Dec 15, 2017
    Configuration menu
    Copy the full SHA
    0524e26 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2017

  1. Added game in GameFactory

    @nikitakaberov
    nikitakaberov committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    e095ad0 View commit details
    Browse the repository at this point in the history

  2. fixes

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    230041b View commit details
    Browse the repository at this point in the history

  3. debug out

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    b7ded53 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/master' into blingame

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    1e433b6 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/master' into blingame

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    44ec732 View commit details
    Browse the repository at this point in the history

  6. fix

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    de7b089 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/master' into blingame

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    e291705 View commit details
    Browse the repository at this point in the history

  8. fix dcp

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    f75a2a5 View commit details
    Browse the repository at this point in the history

  9. json yebaniy

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    d88fefd View commit details
    Browse the repository at this point in the history

  10. fixed drisnya

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    31fdb2f View commit details
    Browse the repository at this point in the history

  11. no homo

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    bd3acf6 View commit details
    Browse the repository at this point in the history

  12. Added draw sea_battle

    Areeshka committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    f363c69 View commit details
    Browse the repository at this point in the history

  13. Fixed draw sea_battle

    Areeshka committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    4988aaa View commit details
    Browse the repository at this point in the history

  14. fix dcp (2)

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    4f6f1ac View commit details
    Browse the repository at this point in the history

  15. Merge branch 'blingame' of https://github.com/lapenok-aleksej/Telegra… 

    …mBot into blingame
    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    5c59aca View commit details
    Browse the repository at this point in the history

  16. Merge remote-tracking branch 'origin/master' into blingame

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    8bcfd3b View commit details
    Browse the repository at this point in the history

  17. Merge remote-tracking branch 'origin/master' into blingame

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    7e57551 View commit details
    Browse the repository at this point in the history

  18. revert fuckup again

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    56ea133 View commit details
    Browse the repository at this point in the history

  19. Merge remote-tracking branch 'origin/master' into blingame

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    614619c View commit details
    Browse the repository at this point in the history

  20. Fix sea-draw

    Areeshka committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    6575730 View commit details
    Browse the repository at this point in the history

  21. Merge branch 'blingame' of https://github.com/lapenok-aleksej/Telegra… 

    …mBot into blingame
    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    91366a4 View commit details
    Browse the repository at this point in the history

  22. Merge remote-tracking branch 'origin/master' into blingame

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    e7692d3 View commit details
    Browse the repository at this point in the history

  23. added game

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    6cde04b View commit details
    Browse the repository at this point in the history

  24. pofixil game factory, added my game

    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    04e9ac1 View commit details
    Browse the repository at this point in the history

  25. Merge remote-tracking branch 'origin/master' into blingame 

    # Conflicts:
#	src/main/kotlin/ru/ifmo/telegram/bot/services/main/GameFactory.kt
    @Vantuz
    Vantuz committed Dec 16, 2017
    Configuration menu
    Copy the full SHA
    7d93da2 View commit details
    Browse the repository at this point in the history

Commits on Mar 18, 2018

  1. Merge branch 'master' into blingame

    @aleksej-lapenok
    aleksej-lapenok committed Mar 18, 2018
    Configuration menu
    Copy the full SHA
    9ecdcfa View commit details
    Browse the repository at this point in the history

  2. update kotlin

    @aleksej-lapenok
    aleksej-lapenok committed Mar 18, 2018
    Configuration menu
    Copy the full SHA
    9fa1f7b View commit details
    Browse the repository at this point in the history

  3. update kotlin

    @aleksej-lapenok
    aleksej-lapenok committed Mar 18, 2018
    Configuration menu
    Copy the full SHA
    677c59e View commit details
    Browse the repository at this point in the history