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: bjzu/MapAttack
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: geoloqi/MapAttack
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.
  • 19 commits
  • 22 files changed
  • 5 contributors

Commits on Dec 12, 2011

  1. Uses new contact form that imports into Highrise.

    @aaronpk
    aaronpk committed Dec 12, 2011
    Configuration menu
    Copy the full SHA
    91715df View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2011

  1. Move to Rainbows, pull sqlite

    API Staging Server committed Dec 14, 2011
    Configuration menu
    Copy the full SHA
    61321c6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:geoloqi/MapAttack

    API Staging Server committed Dec 14, 2011
    Configuration menu
    Copy the full SHA
    0ac9a0d View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2011

  1. Set trigger_rate_limit=0 on MapAttack layers

    @aaronpk
    aaronpk committed Dec 19, 2011
    Configuration menu
    Copy the full SHA
    d8f0fda View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2012

  1. Remove contact form, replace with info about geoloqi

    @aaronpk
    aaronpk committed Mar 13, 2012
    Configuration menu
    Copy the full SHA
    f2399af View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2012

  1. Update for thin, redirect /admin to /admin/games

    @kyledrake
    kyledrake committed Apr 7, 2012
    Configuration menu
    Copy the full SHA
    0070be4 View commit details
    Browse the repository at this point in the history

  2. Update to support anyone creating games

    @kyledrake
    kyledrake committed Apr 7, 2012
    Configuration menu
    Copy the full SHA
    f66a618 View commit details
    Browse the repository at this point in the history

Commits on Apr 8, 2012

  1. Update latest

    API Server committed Apr 8, 2012
    Configuration menu
    Copy the full SHA
    b25d2b4 View commit details
    Browse the repository at this point in the history

  2. Merge fix

    @kyledrake
    kyledrake committed Apr 8, 2012
    Configuration menu
    Copy the full SHA
    2975e43 View commit details
    Browse the repository at this point in the history

  3. initial copy

    @kyledrake
    kyledrake committed Apr 8, 2012
    Configuration menu
    Copy the full SHA
    c019b9e View commit details
    Browse the repository at this point in the history

  4. Update views/splash.erb

    @caseorganic
    caseorganic committed Apr 8, 2012
    Configuration menu
    Copy the full SHA
    9f13e3d View commit details
    Browse the repository at this point in the history

  5. Added a FAQ and numbered the steps of the game.

    @caseorganic
    caseorganic committed Apr 8, 2012
    Configuration menu
    Copy the full SHA
    76cc725 View commit details
    Browse the repository at this point in the history

  6. Made FAQ Look better.

    @caseorganic
    caseorganic committed Apr 8, 2012
    Configuration menu
    Copy the full SHA
    9a6cdfe View commit details
    Browse the repository at this point in the history

  7. change title to "MapAttack Editor"

    @aaronpk
    aaronpk committed Apr 8, 2012
    Configuration menu
    Copy the full SHA
    4e4e233 View commit details
    Browse the repository at this point in the history

  8. Updated game setup instructions to reduce support E-mails down the line.

    @caseorganic
    caseorganic committed Apr 8, 2012
    Configuration menu
    Copy the full SHA
    87a8b64 View commit details
    Browse the repository at this point in the history

  9. Make the admin forms a little nicer looking, added some explanatory t… 

    …ext and clarified some buttons.
    @aaronpk
    aaronpk committed Apr 8, 2012
    Configuration menu
    Copy the full SHA
    988462e View commit details
    Browse the repository at this point in the history

  10. Add google analytics to admin area

    @aaronpk
    aaronpk committed Apr 8, 2012
    Configuration menu
    Copy the full SHA
    db7beec View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2012

  1. Add quadrocopter video

    @aaronpk
    aaronpk committed Jul 11, 2012
    Configuration menu
    Copy the full SHA
    cddca09 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2012

  1. Switch to thread model

    @kyledrake
    kyledrake committed Jul 27, 2012
    Configuration menu
    Copy the full SHA
    9214480 View commit details
    Browse the repository at this point in the history
Loading