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: AdrianDevCode/gw2CardGame
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: update
Choose a base ref
...
head repository: AdrianDevCode/gw2CardGame
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.
  • 16 commits
  • 1 file changed
  • 1 contributor

Commits on Aug 9, 2018

  1. Merge pull request #28 from AdrianDevCode/update 

    Update
    Adrian Piotrek Wiszniewski authored Aug 9, 2018
    Configuration menu
    Copy the full SHA
    04d4afe View commit details
    Browse the repository at this point in the history

  2. Merge pull request #29 from AdrianDevCode/update 

    added media queries for phones
    Adrian Piotrek Wiszniewski authored Aug 9, 2018
    Configuration menu
    Copy the full SHA
    515f866 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #30 from AdrianDevCode/update 

    fixed phone view on text so does not spill over container
    Adrian Piotrek Wiszniewski authored Aug 9, 2018
    Configuration menu
    Copy the full SHA
    d863291 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #31 from AdrianDevCode/update 

    fixed name of pets to take out 'juvenile' part
    Adrian Piotrek Wiszniewski authored Aug 9, 2018
    Configuration menu
    Copy the full SHA
    146e064 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2018

  1. Merge pull request #32 from AdrianDevCode/update 

    Update
    Adrian Piotrek Wiszniewski authored Aug 14, 2018
    Configuration menu
    Copy the full SHA
    870aa23 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2018

  1. Merge pull request #33 from AdrianDevCode/update 

    rendered board and homepage correctly with cards
    Adrian Piotrek Wiszniewski authored Aug 16, 2018
    Configuration menu
    Copy the full SHA
    9ed9970 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2018

  1. Merge pull request #34 from AdrianDevCode/update 

    added render to board for cards, added logic to copy from each deck t…
    Adrian Piotrek Wiszniewski authored Aug 17, 2018
    Configuration menu
    Copy the full SHA
    2bc5ec8 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2018

  1. Merge pull request #35 from AdrianDevCode/update 

    worked on game logic and now cards calculate attacks and change state
    Adrian Piotrek Wiszniewski authored Aug 20, 2018
    Configuration menu
    Copy the full SHA
    395b4e6 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2018

  1. Merge pull request #36 from AdrianDevCode/update 

    worked on end game alerts and reroutes
    Adrian Piotrek Wiszniewski authored Aug 23, 2018
    Configuration menu
    Copy the full SHA
    97df18f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #37 from AdrianDevCode/update 

    added routes for new cards to come in after game ends
    Adrian Piotrek Wiszniewski authored Aug 23, 2018
    Configuration menu
    Copy the full SHA
    2d2986a View commit details
    Browse the repository at this point in the history

  3. Merge pull request #38 from AdrianDevCode/update 

    Update
    Adrian Piotrek Wiszniewski authored Aug 23, 2018
    Configuration menu
    Copy the full SHA
    3c3adc5 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #39 from AdrianDevCode/update 

    corrected endgame to pick the right winner
    Adrian Piotrek Wiszniewski authored Aug 23, 2018
    Configuration menu
    Copy the full SHA
    dc04784 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2018

  1. Update README.md

    Adrian Piotrek Wiszniewski authored Aug 27, 2018
    Configuration menu
    Copy the full SHA
    d3c78a0 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2018

  1. Merge pull request #40 from AdrianDevCode/update 

    added phases to moves set and aded some AI
    Adrian Piotrek Wiszniewski authored Aug 29, 2018
    Configuration menu
    Copy the full SHA
    25c03ca View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2018

  1. Merge pull request #41 from AdrianDevCode/update 

    added simplistic AI bot.
    Adrian Piotrek Wiszniewski authored Aug 30, 2018
    Configuration menu
    Copy the full SHA
    60066ce View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2018

  1. Merge pull request #42 from AdrianDevCode/update 

    created random AI bot and alerts
    Adrian Piotrek Wiszniewski authored Aug 31, 2018
    Configuration menu
    Copy the full SHA
    12da1ba View commit details
    Browse the repository at this point in the history
Loading