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: java-scripted/ArenaBattleIO
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: java-scripted/ArenaBattleIO
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: patch-4
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 14 commits
  • 13,812 files changed
  • 4 contributors

Commits on Jan 18, 2019

  1. Implemented the client side to multiplayer movement, bug fixes, etc.

    @KryptoCrash
    KryptoCrash committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    14f8aeb View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/kryptocrash/arenabattleio

    @KryptoCrash
    KryptoCrash committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    7eef945 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2019

  1. Worked on server side player movement. BUG: import io from 

    socket.io-client will not work. Please Fix!
    @KryptoCrash
    KryptoCrash committed Jan 19, 2019
    Configuration menu
    Copy the full SHA
    c9d8e15 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2019

  1. removed node modules

    @jspidal
    jspidal committed Jan 20, 2019
    Configuration menu
    Copy the full SHA
    a003705 View commit details
    Browse the repository at this point in the history

  2. Create .gitignore

    @jspidal
    jspidal committed Jan 20, 2019
    Configuration menu
    Copy the full SHA
    add9a76 View commit details
    Browse the repository at this point in the history

  3. Added socket.io source to index.html

    @jspidal
    jspidal committed Jan 20, 2019
    Configuration menu
    Copy the full SHA
    fb4a5f9 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2019

  1. socket.io-client import working. ERROR: this.players[id] is not a game 

    object.
    @KryptoCrash
    KryptoCrash committed Jan 21, 2019
    Configuration menu
    Copy the full SHA
    7550899 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'refs/remotes/origin/master'

    @KryptoCrash
    KryptoCrash committed Jan 21, 2019
    Configuration menu
    Copy the full SHA
    e813a54 View commit details
    Browse the repository at this point in the history

  3. Maybe a fix? Different error now, also updated package.json I think

    @jspidal
    jspidal committed Jan 21, 2019
    Configuration menu
    Copy the full SHA
    8757cd6 View commit details
    Browse the repository at this point in the history

  4. Revert "Maybe a fix? Different error now, also updated package.json I… 

    … think"

This reverts commit 8757cd6.
    @jspidal
    jspidal committed Jan 21, 2019
    Configuration menu
    Copy the full SHA
    789aed6 View commit details
    Browse the repository at this point in the history

  5. Update .gitignore

    @PatheticMustan
    PatheticMustan authored Jan 21, 2019
    Configuration menu
    Copy the full SHA
    1863b76 View commit details
    Browse the repository at this point in the history

  6. removed cache. 

    I had other changes, but my computer's network card died.
Then others did it before me.
Talk about late to the gun, ay?
    @PatheticMustan
    PatheticMustan committed Jan 21, 2019
    Configuration menu
    Copy the full SHA
    d4ffa75 View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2019

  1. Update README.md

    @KryptoCrash
    KryptoCrash authored Jan 22, 2019
    Configuration menu
    Copy the full SHA
    5871fbc View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @java-scripted
    java-scripted authored Jan 22, 2019
    Configuration menu
    Copy the full SHA
    f29a97a View commit details
    Browse the repository at this point in the history
Loading