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

Added synchronization for character selection in Multiplayer #718

Merged
merged 7 commits into from Mar 3, 2012
Merged

Added synchronization for character selection in Multiplayer #718

merged 7 commits into from Mar 3, 2012

Commits on Mar 3, 2012

  1. Changed access of characterIDs

    @GreenLightning
    GreenLightning committed Mar 3, 2012
    Copy the full SHA
    134ac3d View commit details
    Browse the repository at this point in the history

  2. Merge remote branch 'original/develop' into develop

    @GreenLightning
    GreenLightning committed Mar 3, 2012
    Copy the full SHA
    b2ce108 View commit details
    Browse the repository at this point in the history

  3. Added synchronization for your character selection in MP

    @GreenLightning
    GreenLightning committed Mar 3, 2012
    Copy the full SHA
    fcfa43a View commit details
    Browse the repository at this point in the history

  4. Merge remote branch 'original/develop' into develop

    @GreenLightning
    GreenLightning committed Mar 3, 2012
    Copy the full SHA
    f78844c View commit details
    Browse the repository at this point in the history

  5. Fixed formatting

    @GreenLightning
    GreenLightning committed Mar 3, 2012
    Copy the full SHA
    ef40219 View commit details
    Browse the repository at this point in the history

  6. Merge remote branch 'original/develop' into develop

    @GreenLightning
    GreenLightning committed Mar 3, 2012
    Copy the full SHA
    6a09ea6 View commit details
    Browse the repository at this point in the history

  7. Merge remote branch 'original/develop' into develop 

    Conflicts:
	src/com/mojang/mojam/level/Level.java
    @GreenLightning
    GreenLightning committed Mar 3, 2012
    Copy the full SHA
    6a45f32 View commit details
    Browse the repository at this point in the history