Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: guiltylogik/BasicPythonGames
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: tetris
Choose a base ref
...
head repository: guiltylogik/BasicPythonGames
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 11 commits
  • 6 files changed
  • 1 contributor

Commits on Nov 28, 2019

  1. Working on only multi player game.

    @guiltylogik
    guiltylogik committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    063232e View commit details
    Browse the repository at this point in the history

  2. Implemented sending data over the network and added a second player.

    @guiltylogik
    guiltylogik committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    0fb4919 View commit details
    Browse the repository at this point in the history

  3. Implemented send objects over the network and refactored the code a lil.

    @guiltylogik
    guiltylogik committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    d4d7ed4 View commit details
    Browse the repository at this point in the history

  4. Added a game class in the multiplayer game to implement a rock, paper… 

    …, scissors game.
    @guiltylogik
    guiltylogik committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    7d8a9ba View commit details
    Browse the repository at this point in the history

  5. Completed basic functionality of the rock, paper, scissors game (Mult… 

    …iplayer)
    @guiltylogik
    guiltylogik committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    1fc7a05 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'multi-player'

    @guiltylogik
    guiltylogik committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    7a38a7b View commit details
    Browse the repository at this point in the history

  7. Revert "Merge branch 'multi-player'" 

    This reverts commit 7a38a7b, reversing
changes made to 435fcdc.
    @guiltylogik
    guiltylogik committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    6172d05 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'master' into multi-player

    @guiltylogik
    guiltylogik committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    deb4f3f View commit details
    Browse the repository at this point in the history

  9. Revert "Merge branch 'master' into multi-player" 

    This reverts commit deb4f3f, reversing
changes made to 1fc7a05.
    @guiltylogik
    guiltylogik committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    2330e43 View commit details
    Browse the repository at this point in the history

  10. Merged multi-player branch into master branch

    @guiltylogik
    guiltylogik committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    cae88df View commit details
    Browse the repository at this point in the history

  11. Merge branch 'tetris'

    @guiltylogik
    guiltylogik committed Nov 28, 2019
    Configuration menu
    Copy the full SHA
    0ce29b3 View commit details
    Browse the repository at this point in the history
Loading