Skip to content
This repository has been archived by the owner on Apr 13, 2022. It is now read-only.

Game reskins #50

Open
wants to merge 42 commits into
base: development
Choose a base branch
from
Open

Game reskins #50

wants to merge 42 commits into from

Commits on Mar 21, 2014

  1. Configuration menu
    Copy the full SHA
    aa85add View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2014

  1. Configuration menu
    Copy the full SHA
    01e6902 View commit details
    Browse the repository at this point in the history
  2. renaming files to lowercase

    modality committed Mar 22, 2014
    Configuration menu
    Copy the full SHA
    30fd489 View commit details
    Browse the repository at this point in the history
  3. Lowercase rename

    modality committed Mar 22, 2014
    Configuration menu
    Copy the full SHA
    6eb6c6f View commit details
    Browse the repository at this point in the history
  4. Commit new footer styles

    modality committed Mar 22, 2014
    Configuration menu
    Copy the full SHA
    5c2b8a3 View commit details
    Browse the repository at this point in the history
  5. Add Portrait Tag

    modality committed Mar 22, 2014
    Configuration menu
    Copy the full SHA
    5cc75c3 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    d1e0047 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2014

  1. Merge branch 'modality-british_library' into game-reskins

    Add British Library reskins of Zen Tag game.
    mcsooks committed Mar 24, 2014
    Configuration menu
    Copy the full SHA
    77ea846 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2014

  1. Add "wikipedia" box

    modality committed Mar 29, 2014
    Configuration menu
    Copy the full SHA
    9ae46a7 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2014

  1. Finishing up Wikipedia tab

    modality committed Mar 30, 2014
    Configuration menu
    Copy the full SHA
    88807b5 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    f240f7f View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2014

  1. Merge branch 'modality-british_library' into game-reskins

    Include wikipedia tab feature. Can now look up info in wikipedia
    while playing Zen Tag and earn major points!
    mcsooks committed Apr 3, 2014
    Configuration menu
    Copy the full SHA
    db94128 View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2014

  1. Merge branch 'development' into game-reskins

    Development branch included a commit that removed BL Ships Tag files,
    which understandably causes issues when merging into game-reskins branch,
    so undo deletions of BL Ships Tag files and merge.
    
    Conflicts:
    	www/protected/modules/games/assets/blshipstag/css/style.css
    	www/protected/modules/games/assets/blshipstag/js/mg.game.zentag.js
    	www/protected/modules/games/components/BlShipsTagGame.php
    	www/protected/modules/games/controllers/BlShipsTagController.php
    	www/protected/modules/games/views/blShipsTag/index.php
    mcsooks committed Apr 16, 2014
    Configuration menu
    Copy the full SHA
    96f5012 View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2014

  1. Merge branch 'development' into game-reskins

    Undid merge conflicts RE: deleting blshipstag from development branch
    
    Conflicts:
    	www/protected/modules/games/assets/blshipstag/css/style.css
    	www/protected/modules/games/assets/blshipstag/js/mg.game.zentag.js
    	www/protected/modules/games/components/BlShipsTagGame.php
    	www/protected/modules/games/controllers/BlShipsTagController.php
    	www/protected/modules/games/views/blShipsTag/index.php
    mcsooks committed Apr 21, 2014
    Configuration menu
    Copy the full SHA
    b899bc3 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    fdeaa98 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0d34bd3 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2014

  1. Configuration menu
    Copy the full SHA
    76861bd View commit details
    Browse the repository at this point in the history
  2. Add Links to footer images for the Ships, Portrait, and Book tag. Als…

    …o add "type, text, here" prompt in each games' input line.
    thelonelego committed Apr 22, 2014
    Configuration menu
    Copy the full SHA
    536ceac View commit details
    Browse the repository at this point in the history

Commits on Apr 23, 2014

  1. Create British Library Background Link in Book, Portrait, and Ships T…

    …ag. Improve footer links and BL links to open in new tabs.
    thelonelego committed Apr 23, 2014
    Configuration menu
    Copy the full SHA
    db68e7b View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2014

  1. Merge branch 'game-reskins' of https://github.com/thelonelego/mg-game

    …into thelonelego-game-reskins
    mcsooks committed Apr 24, 2014
    Configuration menu
    Copy the full SHA
    cdf84a2 View commit details
    Browse the repository at this point in the history
  2. Remove unused link styles

    mcsooks committed Apr 24, 2014
    Configuration menu
    Copy the full SHA
    9077609 View commit details
    Browse the repository at this point in the history

Commits on May 1, 2014

  1. Configuration menu
    Copy the full SHA
    9965835 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2014

  1. Configuration menu
    Copy the full SHA
    115bdf9 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4a2b034 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    04bb80e View commit details
    Browse the repository at this point in the history

Commits on May 27, 2014

  1. Configuration menu
    Copy the full SHA
    014106e View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    590d676 View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2014

  1. Configuration menu
    Copy the full SHA
    e9a5111 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2014

  1. Configuration menu
    Copy the full SHA
    3e63568 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2014

  1. Configuration menu
    Copy the full SHA
    ec44a65 View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2014

  1. Configuration menu
    Copy the full SHA
    c494d68 View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2014

  1. Apply Zentag querying to Zentag reskins, and update Zentag media limi…

    …t to 300
    
    This commit applies the new ZenTag querying to the various derivatives of
    ZenTag (Ships Tag, Book Tag, and Portrait Tag). In addition, it updates the
    media limit used by the query from 20 (used in testing) to 300.
    ssolbeck committed Jun 16, 2014
    Configuration menu
    Copy the full SHA
    7cc0a57 View commit details
    Browse the repository at this point in the history
  2. Merge pull request #40 from gsolbeck/game-reskins

    Apply Zentag querying to Zentag reskins, and update Zentag media limit to 300
    mcsooks committed Jun 16, 2014
    Configuration menu
    Copy the full SHA
    98c4976 View commit details
    Browse the repository at this point in the history

Commits on Jul 15, 2014

  1. Configuration menu
    Copy the full SHA
    5e2519e View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2014

  1. Configuration menu
    Copy the full SHA
    2237c97 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2014

  1. Configuration menu
    Copy the full SHA
    beaddc6 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2014

  1. Configuration menu
    Copy the full SHA
    a1c6daa View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2014

  1. Configuration menu
    Copy the full SHA
    b43eab1 View commit details
    Browse the repository at this point in the history

Commits on Aug 12, 2014

  1. Configuration menu
    Copy the full SHA
    70add28 View commit details
    Browse the repository at this point in the history
  2. Apply cut/copy/paste prevention to game-reskins

    This commit adds calls to preventEvents() for each of the reskins of
    ZenTag. More information can be found with commit 51bada9... which
    applied the same changes to the other games.
    ssolbeck committed Aug 12, 2014
    Configuration menu
    Copy the full SHA
    c4e5de8 View commit details
    Browse the repository at this point in the history
  3. Merge branch 'gsolbeck-game-reskins' into game-reskins: apply cut/cop…

    …y/paste prevention to BL Games
    mcsooks committed Aug 12, 2014
    Configuration menu
    Copy the full SHA
    0a88e51 View commit details
    Browse the repository at this point in the history

Commits on Mar 3, 2015

  1. Configuration menu
    Copy the full SHA
    ae6694b View commit details
    Browse the repository at this point in the history