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

Conversation

3009420
Copy link

@3009420 3009420 commented Feb 16, 2016

No description provided.

modality and others added 30 commits March 20, 2014 23:53
Add British Library reskins of Zen Tag game.
Include wikipedia tab feature. Can now look up info in wikipedia
while playing Zen Tag and earn major points!
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
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
…o add "type, text, here" prompt in each games' input line.
…ag. Improve footer links and BL links to open in new tabs.
mcsooks and others added 12 commits June 13, 2014 19:03
…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.
Apply Zentag querying to Zentag reskins, and update Zentag media limit to 300
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.
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants