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: bloominstituteoftechnology/Intro-Python-II
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: jaytee-padilla/Intro-Python-II
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.
  • 7 commits
  • 4 files changed
  • 2 contributors

Commits on Apr 9, 2020

  1. Currently working on adv.py, making progress on gameplay logic for pl… 

    …ayer movement
    @jaytee-padilla
    jaytee-padilla committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    69cc484 View commit details
    Browse the repository at this point in the history

  2. Added classes to player.py and room.py

    @jaytee-padilla
    jaytee-padilla committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    fda3506 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #1 from jaytee-padilla/jaytee-padilla 

    Jaytee padilla
    @jaytee-padilla
    jaytee-padilla authored Apr 9, 2020
    Configuration menu
    Copy the full SHA
    d35b6a9 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2020

  1. Fleshing out more of the gameplay logic in adv.py

    @jaytee-padilla
    jaytee-padilla committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    0112d2c View commit details
    Browse the repository at this point in the history

  2. Player movement logic complete. Currently working on giving the playe… 

    …r the ability to pick up and drop items found in rooms
    @jaytee-padilla
    jaytee-padilla committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    117f723 View commit details
    Browse the repository at this point in the history

  3. Project MVP and a few stretch goals complete. Added items to room and… 

    … the ability for the player to interact with items
    @jaytee-padilla
    jaytee-padilla committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    9052821 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #2 from jaytee-padilla/jaytee-padilla 

    Jaytee padilla
    @jaytee-padilla
    jaytee-padilla authored Apr 10, 2020
    Configuration menu
    Copy the full SHA
    0824bac View commit details
    Browse the repository at this point in the history
Loading