Compare commits

..

93 Commits

Author SHA1 Message Date
Sabe Jones
168bc952d1 3.18.0 2016-06-29 19:30:59 +00:00
Sabe Jones
e1dc4a5480 chore(npm): update shrinkwrap 2016-06-29 19:30:23 +00:00
Sabe Jones
52b34bb6b8 fix(bower): pin habitica-markdown 2016-06-29 19:08:25 +00:00
Sabe Jones
25100a487a chore(gulp): compile sprites 2016-06-29 19:06:01 +00:00
Sabe Jones
d498f5dee3 It's dangerous to go alone. Take This gear. (#7713)
* feat(content): Take This equipment

* chore(sprites): add icons
2016-06-29 13:33:56 -05:00
Sabe Jones
cabb66c5b3 Shrinkwrap dependencies (redux) (#7732)
* fix(versioning): shrinkwrap and pinning

* fix(versioning): install/shrinkwrap on 4.4.3

* fix(versioning): workaround deps/devdeps issue

* feat(npm): shrinkwrap

* fix(bower): unpin habitica-markdown
2016-06-29 13:32:35 -05:00
Sabe Jones
723bf7358b feat(customization): enable Splashy Skins (#7740) 2016-06-29 13:31:37 -05:00
Blade Barringer
6ad65c35fc 3.17.0 2016-06-28 09:53:01 -05:00
Blade Barringer
af4402afb0 chore(i18n): update locales 2016-06-28 09:05:51 -05:00
Blade Barringer
70253ea584 chore(tests): Don't restart test server when modifying test file 2016-06-28 09:00:45 -05:00
Blade Barringer
c22bf2e38b Merge pull request #7736 from crookedneighbor/fix_post_chat
fix(client): Prevent group from freezing up when sending a chat message
2016-06-28 08:59:41 -05:00
Blade Barringer
f8e1e51c21 fix(client): Prevent group from freezing up when sending a chat message 2016-06-28 08:13:09 -05:00
Blade Barringer
24287df702 fix(client): msg notification properly leaves after visiting party page
closes #7393
closes #7735
closes #7445
2016-06-28 07:37:27 -05:00
Blade Barringer
c9f2389765 chore(test): Unpend cancel subscription test 2016-06-26 09:49:48 -05:00
Blade Barringer
37e638a64d fix(test): Pend send email test 2016-06-26 09:27:29 -05:00
Blade Barringer
81ac45f2a7 fix(api): Grant remaining perks when canceling an Amazon subscription
* Add tests for payments lib
* Add placeholder it blocks to be filled in

closes #7660
closes #4840
2016-06-26 08:08:49 -05:00
Alys
a7d4b76c58 remove bad comma from end of a locales file 2016-06-25 09:47:09 +10:00
Alys
8055db2e54 add missing gearNotOwned string 2016-06-25 09:30:04 +10:00
Travis
30cf4f5a96 fix(client): Stop duplicating completed todos (#7709)
* Deduping completed tasks on load. closes #7708

* Addressing paglias' comment
2016-06-24 07:57:15 -05:00
Alys
e441f45ac5 improve texts for password reset feature
- Removes full stop from the end of the password (very misleading).
- Makes messages about the password emails more accurate.
2016-06-24 21:59:34 +10:00
Alys
3d94c2e7f1 fix error in comment in apidoc for ExportUserAvatarPng 2016-06-24 20:13:22 +10:00
Matteo Pagliazzi
430160ef0e feat(eb): update npm to v3 (#7711) 2016-06-24 10:31:19 +02:00
Sabe Jones
db2ed83a58 3.16.0 2016-06-23 19:48:52 +00:00
Sabe Jones
9d1f1fa321 Correct GA unsub info (#7676)
* fix(analytics): better GA category handling

* refactor(analytics): chained OR

* fix(analytics): prefer gaCategory
2016-06-23 14:29:50 -05:00
Sabe Jones
cfe688daa5 feat(mystery): subscriber items 201606 (#7707)
* feat(mystery): subscriber items 201606

* chore(news): announce Android
2016-06-23 14:01:11 -05:00
Matteo Pagliazzi
7edde56dad fix(deps): add apn package 2016-06-23 17:27:20 +02:00
Blade Barringer
e274f63f9d chore(i18n): update locales 2016-06-23 07:59:25 -05:00
Blade Barringer
1484090d27 Merge branch 'Hus274-7701' into develop 2016-06-23 07:55:56 -05:00
Travis
0af1ced462 fix(client): Sort gear by stat from class bonus (#7710)
* Accounting for class bonus when sorting equipment by stats. closes #7701

* Fixing unintended impact on last page and including special classes

* Addressing comments
2016-06-23 07:55:00 -05:00
Blade Barringer
2d3e5f86f7 feat(client): Display if gear gets class multiplier in notes 2016-06-23 07:53:01 -05:00
Blade Barringer
d5a354b499 fix(api): Only award participating members the quest rewards (#7706) 2016-06-23 07:10:56 -05:00
Husman
c7b54a0abf Addressing comments 2016-06-22 20:19:48 -07:00
Blade Barringer
b27b18b323 Merge pull request #7703 from khipkin/small_api_typo
fix mistake in apidoc for Feed a pet
2016-06-22 22:04:46 -05:00
Husman
2d327ca6ea Fixing unintended impact on last page and including special classes 2016-06-22 19:58:36 -07:00
Husman
cc476a0dee Accounting for class bonus when sorting equipment by stats. closes #7701 2016-06-22 19:28:44 -07:00
Matteo Pagliazzi
08d7727881 Push notifications (#7682)
* Fix Social Push notifications

* Fix code formatting issues

* Fix commented issues

* Fix Syntax errors

* update push notify dependency

* specify push-notify version

* change how apn key is loaded

* feat(push-notifications): improve logging

* feat(push-notifications): disable v2 push notifications

* test(push-notifications): add unit tests and improve integration ones

* fix(push-notifications): throw when required params are missing

* fix(tests): correct descriptions and remove wrong comment

* fix(push-notifications): trim APN key

* fix(apn): log feedback only if it has data

* fix(apn): load cert and key differently

* fix(tests): correctly load apn during tests

* download creds from S3 and create AWS lib

* convert s3 buffer to a string

* fix(apn): remove console.log and do not use cert twice

* invert key and cert, disable failing test

* invert key and cert
2016-06-23 00:19:37 +02:00
Matteo Pagliazzi
09c7c45cd5 fix trailing spaces 2016-06-22 12:18:42 +02:00
Matteo Pagliazzi
3924bdc7c5 Fetch entire user when resetting password 2016-06-22 11:56:39 +02:00
Sabe Jones
b3c9bd9021 3.15.0 2016-06-22 01:13:26 +00:00
Sabe Jones
cf258676a2 feat(event): Summer Splash 2016 (#7705) 2016-06-21 19:22:50 -05:00
Kaitlin Hipkin
b94872a69f fix copypasta mistake 2016-06-21 20:10:25 +02:00
Blade Barringer
cfacf039df refactor(client): assign tasks data to tasks variable on initial sync 2016-06-21 07:34:44 -05:00
Blade Barringer
138217fe6a fix(client): Load completed todos on sync
closes #7392
closes #7673
2016-06-21 07:31:19 -05:00
Christopher Wells
fd746c19d2 Fix grammar mistakes in license file
Correct usage of "is" to "are", as "Assets and content" is plural rather than singular.

closes #7700
2016-06-21 06:42:20 -05:00
Blade Barringer
d18f42fe7a fix(client): Use $state on $rootScope 2016-06-20 06:35:21 -05:00
Blade Barringer
94ddd82cae fix(lint): Correct group test file 2016-06-19 21:00:02 -05:00
Blade Barringer
e920734648 feat(api): Stop alerting about new messages for large groups
closes #6706
closes #6762
2016-06-19 20:54:30 -05:00
Blade Barringer
a4dba82d14 fix(client): Refresh party page when inviting users 2016-06-19 09:41:43 -05:00
Blade Barringer
851ad59fb8 fix(client): Display message about needing a party in quest modal
closes #7684
closes #7686
2016-06-19 09:25:57 -05:00
Blade Barringer
7fd3ad3731 fix: Do a hard redirect after creating party
closes #7694
2016-06-19 09:06:21 -05:00
Blade Barringer
ef2535aadc fix: Use translatable string for mana in header
closes #7695
2016-06-19 09:00:59 -05:00
Blade Barringer
09ecc0eada Merge branch 'Hus274-7689' into develop 2016-06-19 08:38:37 -05:00
Blade Barringer
941ff10cdc fix: Prevent message from displaying if no new messages exist 2016-06-19 08:38:07 -05:00
Matteo Pagliazzi
36ef208e18 3.14.0 2016-06-19 12:33:45 +02:00
Husman
b62fbab6f8 Mark private messages as read when entering the inbox and syncing while in the inbox. closes #7689 2016-06-18 19:42:11 -07:00
Blade Barringer
e28946bcfb fix(client): Allow users to reject invites to new parties
closes #7691
2016-06-18 20:21:27 -05:00
Blade Barringer
813aa2cf38 chore(client): Remove unused clearCompleted user.ops function 2016-06-18 12:23:40 -05:00
Husman
1a19605ee6 fix: Update client to remove completed todos immediately
closes #7549
closes #7685
2016-06-18 12:23:28 -05:00
Blade Barringer
ea5a148add fix(lint): Add missing semicolons 2016-06-18 12:07:30 -05:00
Blade Barringer
7c08563937 Merge branch 'velezsarain-attribute' into develop 2016-06-18 11:59:30 -05:00
Blade Barringer
b20bd86f98 refactor(common): Clarify autoallocate code 2016-06-18 11:59:04 -05:00
Blade Barringer
7cf28f6f2a refactor(tests): Rewrite stat autoallocation tests 2016-06-18 11:58:02 -05:00
Blade Barringer
757792bcdf chore(i18n): update locales 2016-06-18 07:25:41 -05:00
Blade Barringer
007ac4abfd chore(i18n): update locales 2016-06-18 07:15:30 -05:00
Blade Barringer
b2c5c8d8e7 fix(locales): Correct string key
fixes #7683
2016-06-18 07:10:32 -05:00
Sabe Jones
4b98295977 3.13.0 2016-06-18 00:44:54 +00:00
Sabe Jones
8cb0d91f77 chore(news): misc announce 2016-06-17 23:35:23 +00:00
Blade Barringer
ca32cac6fe chore(dependency): Pin to version of eslint that is not broken 2016-06-17 17:36:48 -05:00
Blade Barringer
8919efbbdd Merge pull request #7681 from thompsnm/develop
Separate call to upgrade npm so that it occurs before any other installs
2016-06-17 17:20:32 -05:00
Alys
7a10d61281 fix inconsistencies in apidoc for member routes (#7679) 2016-06-17 13:10:49 +02:00
Alys
76e86bda86 fix error in API docs - flag chat had been documented as like 2016-06-17 20:25:14 +10:00
Matteo Pagliazzi
a424892dd3 Fix auth if localStorage is missing or corrupted (#7674)
* fix(auth): correctly redirect to logout page if localstorage is corrupted

* fix(auth): do not break site if localStorage has invalid JSON

* fix(karma): use $window instead of windo

* disable failing karma tests

* fix(tests): Provide mockwindow for tests

* fix(tests): Call habitrpgShared without $window
2016-06-17 12:14:41 +02:00
Nathan Thompson
a87647995d Separate call to upgrade npm so that it occurs before any other installs 2016-06-17 00:53:08 -06:00
Blade Barringer
5a3082bd88 fix(docs): correct apidoc param for task alias|id 2016-06-16 12:55:56 -05:00
Blade Barringer
b7b61e6251 Shortname (#7655)
* feat: Add alias property to task model
2016-06-16 12:28:45 -05:00
Blade Barringer
c34c21192b Merge pull request #7657 from Hus274/7600
Removing accepted guild invitations from the local copy of the user o…
2016-06-16 07:20:43 -05:00
Alys
27b7173f6c change pet names to initial upper case in "Unlocks purchasable Petname eggs..." fixes #5631 2016-06-16 16:20:17 +10:00
Travis
1de2c839c8 Adding ticks back into gifted gems receive message #7540 (#7671)
* Adding ticks back into gifted gems receive message #7540

* Removing raw string concatenation and fixing tests
2016-06-15 22:29:04 -05:00
Blade Barringer
3d7d41c517 Merge pull request #7672 from Hus274/7629
Fixing quest naming according to @lemoness #7629
2016-06-15 22:23:32 -05:00
Blade Barringer
d067403959 chore: Add migration file for fixing invalid emails 2016-06-15 21:46:17 -05:00
Husman
09a4930745 Fixing naming according to @lemoness #7629 2016-06-15 17:37:49 -07:00
Alys
00140eee35 3.12.1 2016-06-16 10:35:10 +10:00
Alys
a03b1fc6cb prevents damage to quest participants with false or null values - partial fix for #7653 (#7665) 2016-06-16 09:36:58 +10:00
Sabe Jones
23c854f068 3.12.0 2016-06-15 17:37:53 +00:00
Sabe Jones
28e45aea4d June Pet: Axolotl (#7663)
* feat(quests): Axolotl pet

* feat(pets): finish axolotl build
2016-06-15 12:14:25 -05:00
Alys
337cb22a9d replace inaccurate Gems tip with Grand Gala tip; fix unrelated typo 2016-06-14 19:35:37 +10:00
Alys
514962a9c7 improve loading tip: replace "Pirate Cove" and "tile"; fix capitals
Replaces the Pirate Cove with the Guild Leaders & Challenge Creators Guild.
Describes backgrounds as connecting instead of tiling.
Makes capitalisation of various words consistent.
2016-06-13 21:35:36 +10:00
Husman
4a3e0eb884 Removing accepted guild invitations from the local copy of the user object so the notification goes away without having to refresh. #7600 2016-06-12 16:03:44 -07:00
Blade Barringer
345a736c27 Merge pull request #7656 from Hus274/develop
Fixing mispelling
2016-06-12 14:06:31 -05:00
Husman
7ee81bb5f6 Fixing mispelling
I accidentally had a mispelling in the last pull request. Fixing.
2016-06-12 07:57:44 -07:00
Husman
9b12d46741 feat: Add group by button to equipment page
Closes #7636
Closes #7651

This commit creates a new button on the equipment page that allows the user to group their equipment type (body location) instead of simply by class.
2016-06-12 09:40:25 -05:00
MathWhiz
a58bf4ee2b Turn automaticAllocation to false when resetting or rebirthing
closes #7627
fixes #7620
2016-06-12 08:34:41 -05:00
Shervin Sarain
31ad6db568 fix training values not resetting at level up 2016-06-11 21:08:58 +02:00
595 changed files with 45178 additions and 8564 deletions

View File

@@ -1,15 +1,22 @@
commands: commands:
01_sym: 01_sym_node:
command: "ln -sf $(ls -td /opt/elasticbeanstalk/node-install/node-* | head -1)/bin/node /bin/node" command: "ln -sf $(ls -td /opt/elasticbeanstalk/node-install/node-* | head -1)/bin/node /bin/node"
files:
"/opt/elasticbeanstalk/hooks/appdeploy/pre/41update_npm.sh" :
mode: "000775"
owner: root
group: users
content: |
$(ls -td /opt/elasticbeanstalk/node-install/node-* | head -1)/bin/npm install -g npm@3
container_commands: container_commands:
01_makeBabel: 01_makeBabel:
command: "touch /tmp/.babel.json" command: "touch /tmp/.babel.json"
02_ownBabel: 02_ownBabel:
command: "chmod a+rw /tmp/.babel.json" command: "chmod a+rw /tmp/.babel.json"
03_installBower: 03_installBower:
command: "$NODE_HOME/bin/npm install -g bower" command: "npm install -g bower"
04_installGulp: 04_installGulp:
command: "$NODE_HOME/bin/npm install -g gulp" command: "npm install -g gulp"
05_runBower: 05_runBower:
command: "$NODE_HOME/lib/node_modules/bower/bin/bower --config.interactive=false --allow-root install -f" command: "$NODE_HOME/lib/node_modules/bower/bin/bower --config.interactive=false --allow-root install -f"
06_runGulp: 06_runGulp:

View File

@@ -4,6 +4,7 @@
"habitrpg/babel" "habitrpg/babel"
], ],
"globals": { "globals": {
"Promise": true "Promise": true,
"Set": false
} }
} }

View File

@@ -5,6 +5,7 @@ node_modules/**
website/client/** website/client/**
website/views/** website/views/**
website/build/** website/build/**
test/**
.git/** .git/**
Gruntfile.js Gruntfile.js
CHANGELOG.md CHANGELOG.md

View File

@@ -25,7 +25,8 @@ RUN apt-get clean
RUN rm -rf /var/lib/apt/lists/* RUN rm -rf /var/lib/apt/lists/*
# Install global packages # Install global packages
RUN npm install -g gulp grunt-cli bower npm@3 RUN npm install -g npm@3
RUN npm install -g gulp grunt-cli bower
# Clone Habitica repo and install dependencies # Clone Habitica repo and install dependencies
WORKDIR /habitrpg WORKDIR /habitrpg

View File

@@ -2,8 +2,9 @@
This Source Code is subject to the terms of the GNU General Public License, v. 3.0. This Source Code is subject to the terms of the GNU General Public License, v. 3.0.
If a copy of the GPL was not distributed with this file, You can obtain one at http://www.gnu.org/licenses/gpl-3.0.txt If a copy of the GPL was not distributed with this file, You can obtain one at http://www.gnu.org/licenses/gpl-3.0.txt
* Assets and content designed for Mozilla BrowserQuest is licensed under CC-BY-SA 3.0: * Assets and content designed for Mozilla BrowserQuest are licensed under CC-BY-SA 3.0:
http://creativecommons.org/licenses/by-sa/3.0/ http://creativecommons.org/licenses/by-sa/3.0/
* Assets and content designed for HabitRPG is licensed under CC-BY-NC-SA 3.0: * Assets and content designed for HabitRPG are licensed under CC-BY-NC-SA 3.0:
http://creativecommons.org/licenses/by-nc-sa/3.0/ http://creativecommons.org/licenses/by-nc-sa/3.0/

View File

@@ -38,10 +38,10 @@
"js-emoji": "snicker/js-emoji#f25d8a303f", "js-emoji": "snicker/js-emoji#f25d8a303f",
"ngInfiniteScroll": "1.0.0", "ngInfiniteScroll": "1.0.0",
"pnotify": "1.3.1", "pnotify": "1.3.1",
"sticky": "*", "sticky": "1.0.3",
"swagger-ui": "wordnik/swagger-ui#v2.0.24", "swagger-ui": "wordnik/swagger-ui#v2.0.24",
"smart-app-banner": "78ef9c0679723b25be1a0ae04f7b4aef7cbced4f", "smart-app-banner": "78ef9c0679723b25be1a0ae04f7b4aef7cbced4f",
"habitica-markdown": "^1.1.0" "habitica-markdown": "1.2.1"
}, },
"devDependencies": { "devDependencies": {
"angular-mocks": "1.3.9" "angular-mocks": "1.3.9"

View File

@@ -1,9 +1,9 @@
/* Comment out for holiday events */ /* Comment out for holiday events */
.npc_ian { /* .npc_ian {
background: url("/common/img/sprites/npc_ian.gif") no-repeat; background: url("/common/img/sprites/npc_ian.gif") no-repeat;
width: 78px; width: 78px;
height: 135px; height: 135px;
} } */
.quest_burnout { .quest_burnout {
background: url("/common/img/sprites/quest_burnout.gif") no-repeat; background: url("/common/img/sprites/quest_burnout.gif") no-repeat;

View File

@@ -1,42 +1,42 @@
.2014_Fall_HealerPROMO2 { .2014_Fall_HealerPROMO2 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1333px -1252px; background-position: -949px -1310px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.2014_Fall_Mage_PROMO9 { .2014_Fall_Mage_PROMO9 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -306px -220px; background-position: -1201px -866px;
width: 120px; width: 120px;
height: 90px; height: 90px;
} }
.2014_Fall_RoguePROMO3 { .2014_Fall_RoguePROMO3 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -308px -1252px; background-position: -109px -1310px;
width: 105px; width: 105px;
height: 90px; height: 90px;
} }
.2014_Fall_Warrior_PROMO { .2014_Fall_Warrior_PROMO {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -787px -1252px; background-position: -403px -1310px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.promo_android { .promo_android {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -176px -1076px; background-position: -1095px -508px;
width: 175px; width: 175px;
height: 175px; height: 175px;
} }
.promo_backgrounds_armoire_201602 { .promo_backgrounds_armoire_201602 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1017px -103px; background-position: -306px -220px;
width: 141px; width: 141px;
height: 294px; height: 294px;
} }
.promo_backgrounds_armoire_201603 { .promo_backgrounds_armoire_201603 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -875px -103px; background-position: -875px -241px;
width: 141px; width: 141px;
height: 294px; height: 294px;
} }
@@ -60,91 +60,91 @@
} }
.promo_backtoschool { .promo_backtoschool {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1305px -584px; background-position: -1342px -553px;
width: 150px; width: 150px;
height: 150px; height: 150px;
} }
.promo_burnout { .promo_burnout {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -525px; background-position: -875px 0px;
width: 219px; width: 219px;
height: 240px; height: 240px;
} }
.promo_chairs_glasses { .promo_chairs_glasses {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -306px -311px; background-position: -1017px -241px;
width: 51px; width: 51px;
height: 210px; height: 210px;
} }
.promo_classes_fall_2014 { .promo_classes_fall_2014 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -363px -862px; background-position: -363px -1005px;
width: 321px; width: 321px;
height: 100px; height: 100px;
} }
.promo_classes_fall_2015 { .promo_classes_fall_2015 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -875px -712px; background-position: -281px -857px;
width: 377px; width: 377px;
height: 99px; height: 99px;
} }
.promo_dilatoryDistress { .promo_dilatoryDistress {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -455px -1344px; background-position: 0px -1401px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.promo_egg_mounts { .promo_egg_mounts {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -875px -398px; background-position: 0px -857px;
width: 280px; width: 280px;
height: 147px; height: 147px;
} }
.promo_enchanted_armoire { .promo_enchanted_armoire {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -685px -862px; background-position: -271px -772px;
width: 374px; width: 374px;
height: 76px; height: 76px;
} }
.promo_enchanted_armoire_201507 { .promo_enchanted_armoire_201507 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1305px -1034px; background-position: -1342px -1000px;
width: 217px; width: 217px;
height: 90px; height: 90px;
} }
.promo_enchanted_armoire_201508 { .promo_enchanted_armoire_201508 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1122px -546px; background-position: -875px -536px;
width: 180px; width: 180px;
height: 90px; height: 90px;
} }
.promo_enchanted_armoire_201509 { .promo_enchanted_armoire_201509 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -696px -1252px; background-position: -182px -1401px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.promo_enchanted_armoire_201511 { .promo_enchanted_armoire_201511 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1456px -584px; background-position: -1201px -684px;
width: 122px; width: 122px;
height: 90px; height: 90px;
} }
.promo_enchanted_armoire_201601 { .promo_enchanted_armoire_201601 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -969px -1252px; background-position: -676px -1310px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.promo_floral_potions { .promo_floral_potions {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1159px -103px; background-position: -1095px -684px;
width: 105px; width: 105px;
height: 273px; height: 273px;
} }
.promo_habitica { .promo_habitica {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -1076px; background-position: -1095px -332px;
width: 175px; width: 175px;
height: 175px; height: 175px;
} }
@@ -156,307 +156,325 @@
} }
.promo_haunted_hair { .promo_haunted_hair {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1462px -285px; background-position: -1483px -704px;
width: 100px; width: 100px;
height: 137px; height: 137px;
} }
.promo_item_notif { .promo_item_notif {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1305px -182px; background-position: -1342px 0px;
width: 249px; width: 249px;
height: 102px; height: 102px;
} }
.promo_mystery_201405 { .promo_mystery_201405 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1424px -1252px; background-position: -1222px -1310px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.promo_mystery_201406 { .promo_mystery_201406 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -358px -417px; background-position: -1493px -402px;
width: 90px; width: 90px;
height: 96px; height: 96px;
} }
.promo_mystery_201407 { .promo_mystery_201407 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1253px -712px; background-position: -777px -442px;
width: 42px; width: 42px;
height: 62px; height: 62px;
} }
.promo_mystery_201408 { .promo_mystery_201408 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1523px -1125px; background-position: -1271px -414px;
width: 60px; width: 60px;
height: 71px; height: 71px;
} }
.promo_mystery_201409 { .promo_mystery_201409 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -878px -1252px; background-position: -494px -1310px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.promo_mystery_201410 { .promo_mystery_201410 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1156px -474px; background-position: -1017px -452px;
width: 72px; width: 72px;
height: 63px; height: 63px;
} }
.promo_mystery_201411 { .promo_mystery_201411 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1151px -1252px; background-position: -858px -1310px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.promo_mystery_201412 { .promo_mystery_201412 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1226px -637px; background-position: -734px -442px;
width: 42px; width: 42px;
height: 66px; height: 66px;
} }
.promo_mystery_201501 { .promo_mystery_201501 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1229px -474px; background-position: -1541px -1182px;
width: 48px; width: 48px;
height: 63px; height: 63px;
} }
.promo_mystery_201502 { .promo_mystery_201502 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -182px -1344px; background-position: -1404px -1310px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.promo_mystery_201503 { .promo_mystery_201503 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -364px -1344px; background-position: -1495px -1310px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.promo_mystery_201504 { .promo_mystery_201504 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1122px -637px; background-position: -1271px -508px;
width: 60px; width: 60px;
height: 69px; height: 69px;
} }
.promo_mystery_201505 { .promo_mystery_201505 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -546px -1344px; background-position: -91px -1401px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.promo_mystery_201506 { .promo_mystery_201506 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1183px -637px; background-position: -1271px -578px;
width: 42px; width: 42px;
height: 69px; height: 69px;
} }
.promo_mystery_201507 { .promo_mystery_201507 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -358px -311px; background-position: -1499px -103px;
width: 90px; width: 90px;
height: 105px; height: 105px;
} }
.promo_mystery_201508 { .promo_mystery_201508 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -602px -1252px; background-position: -1493px -553px;
width: 93px; width: 93px;
height: 90px; height: 90px;
} }
.promo_mystery_201509 { .promo_mystery_201509 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1060px -1252px; background-position: -585px -1310px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.promo_mystery_201510 { .promo_mystery_201510 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -414px -1252px; background-position: -215px -1310px;
width: 93px; width: 93px;
height: 90px; height: 90px;
} }
.promo_mystery_201511 { .promo_mystery_201511 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1242px -1252px; background-position: -767px -1310px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.promo_mystery_201512 { .promo_mystery_201512 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1523px -1034px; background-position: -1271px -332px;
width: 60px; width: 60px;
height: 81px; height: 81px;
} }
.promo_mystery_201601 { .promo_mystery_201601 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1456px -735px; background-position: -1201px -775px;
width: 120px; width: 120px;
height: 90px; height: 90px;
} }
.promo_mystery_201602 { .promo_mystery_201602 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -1344px; background-position: -1040px -1310px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.promo_mystery_201603 { .promo_mystery_201603 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -91px -1344px; background-position: -1131px -1310px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.promo_mystery_201604 { .promo_mystery_201604 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -508px -1252px; background-position: -309px -1310px;
width: 93px; width: 93px;
height: 90px; height: 90px;
} }
.promo_mystery_201605 { .promo_mystery_201605 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -273px -1344px; background-position: -1313px -1310px;
width: 90px; width: 90px;
height: 90px; height: 90px;
} }
.promo_mystery_201606 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -1493px -251px;
width: 90px;
height: 105px;
}
.promo_mystery_3014 { .promo_mystery_3014 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1305px -1125px; background-position: -1342px -1091px;
width: 217px; width: 217px;
height: 90px; height: 90px;
} }
.promo_orca { .promo_orca {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1456px -433px; background-position: -1483px -852px;
width: 105px; width: 105px;
height: 105px; height: 105px;
} }
.promo_partyhats { .promo_partyhats {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1456px -675px; background-position: -875px -627px;
width: 115px; width: 115px;
height: 47px; height: 47px;
} }
.promo_pastel_skin { .promo_pastel_skin {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -657px -965px; background-position: -326px -1108px;
width: 330px; width: 330px;
height: 83px; height: 83px;
} }
.customize-option.promo_pastel_skin { .customize-option.promo_pastel_skin {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -682px -980px; background-position: -351px -1123px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.promo_peppermint_flame { .promo_peppermint_flame {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1446px -886px; background-position: -1342px -852px;
width: 140px; width: 140px;
height: 147px; height: 147px;
} }
.promo_pet_skins { .promo_pet_skins {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1305px -886px; background-position: -1342px -704px;
width: 140px; width: 140px;
height: 147px; height: 147px;
} }
.customize-option.promo_pet_skins { .customize-option.promo_pet_skins {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1330px -901px; background-position: -1367px -719px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.promo_shimmer_hair { .promo_shimmer_hair {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -326px -965px; background-position: -685px -1005px;
width: 330px; width: 330px;
height: 83px; height: 83px;
} }
.promo_splashyskins { .promo_splashyskins {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -1252px; background-position: -1342px -1182px;
width: 198px; width: 198px;
height: 91px; height: 91px;
} }
.customize-option.promo_splashyskins { .customize-option.promo_splashyskins {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -25px -1267px; background-position: -1367px -1197px;
width: 60px; width: 60px;
height: 60px; height: 60px;
} }
.promo_spring_classes_2016 { .promo_spring_classes_2016 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -862px; background-position: 0px -1005px;
width: 362px; width: 362px;
height: 102px; height: 102px;
} }
.promo_springclasses2014 { .promo_springclasses2014 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1305px 0px; background-position: -289px -1219px;
width: 288px; width: 288px;
height: 90px; height: 90px;
} }
.promo_springclasses2015 { .promo_springclasses2015 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1305px -91px; background-position: 0px -1219px;
width: 288px; width: 288px;
height: 90px; height: 90px;
} }
.promo_summer_classes_2014 { .promo_summer_classes_2014 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -875px 0px; background-position: -401px -525px;
width: 429px; width: 429px;
height: 102px; height: 102px;
} }
.promo_summer_classes_2015 { .promo_summer_classes_2015 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -352px -1076px; background-position: -770px -676px;
width: 300px; width: 300px;
height: 88px; height: 88px;
} }
.promo_summer_classes_2016 {
background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -525px;
width: 400px;
height: 150px;
}
.promo_takeThis_gear {
background-image: url(spritesmith-largeSprites-0.png);
background-position: -578px -1219px;
width: 114px;
height: 87px;
}
.promo_takethis_armor { .promo_takethis_armor {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -738px -525px; background-position: -693px -1219px;
width: 114px; width: 114px;
height: 87px; height: 87px;
} }
.promo_updos { .promo_updos {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1305px -285px; background-position: -1342px -103px;
width: 156px; width: 156px;
height: 147px; height: 147px;
} }
.promo_veteran_pets { .promo_veteran_pets {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1156px -398px; background-position: -799px -772px;
width: 146px; width: 146px;
height: 75px; height: 75px;
} }
.promo_winter_classes_2016 { .promo_winter_classes_2016 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -499px -766px; background-position: -659px -857px;
width: 360px; width: 360px;
height: 90px; height: 90px;
} }
.promo_winterclasses2015 { .promo_winterclasses2015 {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -965px; background-position: 0px -1108px;
width: 325px; width: 325px;
height: 110px; height: 110px;
} }
.promo_winteryhair { .promo_winteryhair {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1060px -862px; background-position: -646px -772px;
width: 152px; width: 152px;
height: 75px; height: 75px;
} }
.avatar_variety { .avatar_variety {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: 0px -766px; background-position: -271px -676px;
width: 498px; width: 498px;
height: 95px; height: 95px;
} }
.npc_viirus { .npc_viirus {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -199px -1252px; background-position: 0px -1310px;
width: 108px; width: 108px;
height: 90px; height: 90px;
} }
@@ -468,31 +486,31 @@
} }
.scene_coding { .scene_coding {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1305px -433px; background-position: -1342px -402px;
width: 150px; width: 150px;
height: 150px; height: 150px;
} }
.scene_phone_peek { .scene_phone_peek {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -1305px -735px; background-position: -1342px -251px;
width: 150px; width: 150px;
height: 150px; height: 150px;
} }
.welcome_basic_avatars { .welcome_basic_avatars {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -491px -525px; background-position: -1095px 0px;
width: 246px; width: 246px;
height: 165px; height: 165px;
} }
.welcome_promo_party { .welcome_promo_party {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -220px -525px; background-position: 0px -676px;
width: 270px; width: 270px;
height: 180px; height: 180px;
} }
.welcome_sample_tasks { .welcome_sample_tasks {
background-image: url(spritesmith-largeSprites-0.png); background-image: url(spritesmith-largeSprites-0.png);
background-position: -875px -546px; background-position: -1095px -166px;
width: 246px; width: 246px;
height: 165px; height: 165px;
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 340 KiB

After

Width:  |  Height:  |  Size: 346 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 KiB

After

Width:  |  Height:  |  Size: 145 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 151 KiB

After

Width:  |  Height:  |  Size: 147 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 134 KiB

After

Width:  |  Height:  |  Size: 160 KiB

View File

@@ -0,0 +1,252 @@
.Pet-Unicorn-Red {
background-image: url(spritesmith-main-13.png);
background-position: -82px 0px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Shade {
background-image: url(spritesmith-main-13.png);
background-position: -410px -100px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Skeleton {
background-image: url(spritesmith-main-13.png);
background-position: -164px 0px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-White {
background-image: url(spritesmith-main-13.png);
background-position: 0px -100px;
width: 81px;
height: 99px;
}
.Pet-Unicorn-Zombie {
background-image: url(spritesmith-main-13.png);
background-position: -82px -100px;
width: 81px;
height: 99px;
}
.Pet-Whale-Base {
background-image: url(spritesmith-main-13.png);
background-position: -164px -100px;
width: 81px;
height: 99px;
}
.Pet-Whale-CottonCandyBlue {
background-image: url(spritesmith-main-13.png);
background-position: -246px 0px;
width: 81px;
height: 99px;
}
.Pet-Whale-CottonCandyPink {
background-image: url(spritesmith-main-13.png);
background-position: -246px -100px;
width: 81px;
height: 99px;
}
.Pet-Whale-Desert {
background-image: url(spritesmith-main-13.png);
background-position: 0px -200px;
width: 81px;
height: 99px;
}
.Pet-Whale-Golden {
background-image: url(spritesmith-main-13.png);
background-position: -82px -200px;
width: 81px;
height: 99px;
}
.Pet-Whale-Red {
background-image: url(spritesmith-main-13.png);
background-position: -164px -200px;
width: 81px;
height: 99px;
}
.Pet-Whale-Shade {
background-image: url(spritesmith-main-13.png);
background-position: -246px -200px;
width: 81px;
height: 99px;
}
.Pet-Whale-Skeleton {
background-image: url(spritesmith-main-13.png);
background-position: -328px 0px;
width: 81px;
height: 99px;
}
.Pet-Whale-White {
background-image: url(spritesmith-main-13.png);
background-position: -328px -100px;
width: 81px;
height: 99px;
}
.Pet-Whale-Zombie {
background-image: url(spritesmith-main-13.png);
background-position: -328px -200px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Base {
background-image: url(spritesmith-main-13.png);
background-position: 0px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-CottonCandyBlue {
background-image: url(spritesmith-main-13.png);
background-position: -82px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-CottonCandyPink {
background-image: url(spritesmith-main-13.png);
background-position: -164px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Desert {
background-image: url(spritesmith-main-13.png);
background-position: -246px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Floral {
background-image: url(spritesmith-main-13.png);
background-position: -328px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Golden {
background-image: url(spritesmith-main-13.png);
background-position: -410px 0px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Peppermint {
background-image: url(spritesmith-main-13.png);
background-position: 0px 0px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Red {
background-image: url(spritesmith-main-13.png);
background-position: -410px -200px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Shade {
background-image: url(spritesmith-main-13.png);
background-position: -410px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Skeleton {
background-image: url(spritesmith-main-13.png);
background-position: -492px 0px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Spooky {
background-image: url(spritesmith-main-13.png);
background-position: -492px -100px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Veteran {
background-image: url(spritesmith-main-13.png);
background-position: -492px -200px;
width: 81px;
height: 99px;
}
.Pet-Wolf-White {
background-image: url(spritesmith-main-13.png);
background-position: -492px -300px;
width: 81px;
height: 99px;
}
.Pet-Wolf-Zombie {
background-image: url(spritesmith-main-13.png);
background-position: 0px -400px;
width: 81px;
height: 99px;
}
.Pet_HatchingPotion_Base {
background-image: url(spritesmith-main-13.png);
background-position: -131px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_CottonCandyBlue {
background-image: url(spritesmith-main-13.png);
background-position: -376px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_CottonCandyPink {
background-image: url(spritesmith-main-13.png);
background-position: -180px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Desert {
background-image: url(spritesmith-main-13.png);
background-position: -229px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Floral {
background-image: url(spritesmith-main-13.png);
background-position: -278px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Golden {
background-image: url(spritesmith-main-13.png);
background-position: -327px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Peppermint {
background-image: url(spritesmith-main-13.png);
background-position: -82px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Red {
background-image: url(spritesmith-main-13.png);
background-position: -425px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Shade {
background-image: url(spritesmith-main-13.png);
background-position: -474px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Skeleton {
background-image: url(spritesmith-main-13.png);
background-position: -523px -400px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Spooky {
background-image: url(spritesmith-main-13.png);
background-position: 0px -500px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_White {
background-image: url(spritesmith-main-13.png);
background-position: -49px -500px;
width: 48px;
height: 51px;
}
.Pet_HatchingPotion_Zombie {
background-image: url(spritesmith-main-13.png);
background-position: -98px -500px;
width: 48px;
height: 51px;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 136 KiB

After

Width:  |  Height:  |  Size: 136 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 191 KiB

After

Width:  |  Height:  |  Size: 179 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 363 KiB

After

Width:  |  Height:  |  Size: 372 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 150 KiB

After

Width:  |  Height:  |  Size: 155 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 145 KiB

After

Width:  |  Height:  |  Size: 132 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 138 KiB

After

Width:  |  Height:  |  Size: 145 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 714 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 892 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 586 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 461 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 473 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 780 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 557 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 583 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 824 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 547 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 643 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 728 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 405 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 612 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 420 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.0 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.7 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.8 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 6.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

Some files were not shown because too many files have changed in this diff Show More