Merge pull request #149 from HabitRPG/paglias/optimizations

Optimizations
This commit is contained in:
Matteo Pagliazzi
2014-02-12 19:20:56 +01:00
8 changed files with 1923 additions and 1925 deletions
+3 -5
View File
@@ -6,9 +6,7 @@ module.exports = function(grunt) {
// Cleanup previous spritesmith files
clean: {
main : {
src : [ "dist/spritesmith-*.png"]
}
main: ['dist/spritesmith.png']
},
/**
@@ -20,7 +18,7 @@ module.exports = function(grunt) {
sprite:{
customizer: {
src: 'img/sprites/spritesmith/**/*.png',
destImg: 'dist/spritesmith-' + timestamp + '.png',
destImg: 'dist/spritesmith.png',
destCSS: 'dist/customizer.css',
algorithm: 'binary-tree',
cssVarMap: function (sprite) {
@@ -45,7 +43,7 @@ module.exports = function(grunt) {
},
main: {
src: 'img/sprites/spritesmith/**/*.png',
destImg: 'dist/spritesmith-' + timestamp + '.png',
destImg: 'dist/spritesmith.png',
destCSS: 'dist/spritesmith.css',
algorithm: 'binary-tree',
cssOpts: {
+959 -959
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
File diff suppressed because one or more lines are too long
+959 -959
View File
File diff suppressed because it is too large Load Diff

Before

Width:  |  Height:  |  Size: 481 KiB

After

Width:  |  Height:  |  Size: 481 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.3 KiB

+1 -1
View File
@@ -4,7 +4,7 @@
"subWarning2": "experience issues",
"subWarning3": "with it.",
"disableAds": "Disable ads",
"disableAdsText": "Ads will stay disabled while you have an active account (original users with disabled ads are grandfathered).",
"disableAdsText": "Ads will stay disabled while you have an active subscription (original users with disabled ads are grandfathered).",
"buyGemsGold": "Buy Gems with Gold",
"buyGemsGoldText": "(1 Gem costs <%= gemCost %> Gold) Addresses the \"pay to win\" concern, as everything is now achievable through hard work. There's a <%= gemLimit %>G monthly conversion cap to prevent farming.",
"retainHistory": "Retain full history entries",