From 6d27b898a20a00f1c848b33e2348bed4427305cf Mon Sep 17 00:00:00 2001 From: Andre Casey Date: Tue, 2 Jul 2013 01:37:35 -0700 Subject: [PATCH 01/10] Adjust CSS to show full egg and potion artwork, and center the artwork above the label --- public/img/sprites/PetEggs.css | 40 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/public/img/sprites/PetEggs.css b/public/img/sprites/PetEggs.css index b334806c84..63b3d0de7c 100644 --- a/public/img/sprites/PetEggs.css +++ b/public/img/sprites/PetEggs.css @@ -1,25 +1,25 @@ .Pet_Egg_Wolf, .Pet_Egg_TigerCub, .Pet_Egg_PolarBear, .Pet_Egg_PandaCub, .Pet_Egg_LionCub, .Pet_Egg_Fox, .Pet_Egg_FlyingPig, .Pet_Egg_Dragon, .Pet_Egg_Cactus, .Pet_Egg_BearCub, .Pet_HatchingPotion_Base, .Pet_HatchingPotion_White, .Pet_HatchingPotion_Desert, .Pet_HatchingPotion_Red, .Pet_HatchingPotion_Shade, .Pet_HatchingPotion_Skeleton, .Pet_HatchingPotion_Zombie, .Pet_HatchingPotion_CottonCandyPink, .Pet_HatchingPotion_CottonCandyBlue, .Pet_HatchingPotion_Golden, .Pet_Currency_Gem, .Pet_Currency_Gem2x, .Pet_Currency_Gem1x {background: url("/img/sprites/Egg_Sprite_Sheet.png") no-repeat} -.Pet_Egg_Wolf {background-position: 0px 0px; width: 48px; height: 51px} -.Pet_Egg_TigerCub {background-position: 0px -51px; width: 48px; height: 51px} -.Pet_Egg_PolarBear {background-position: 0px -102px; width: 48px; height: 51px} -.Pet_Egg_PandaCub {background-position: 0px -153px; width: 48px; height: 51px} -.Pet_Egg_LionCub {background-position: 0px -204px; width: 48px; height: 51px} -.Pet_Egg_Fox {background-position: 0px -255px; width: 48px; height: 51px} -.Pet_Egg_FlyingPig {background-position: 0px -306px; width: 48px; height: 51px} -.Pet_Egg_Dragon {background-position: 0px -357px; width: 48px; height: 51px} -.Pet_Egg_Cactus {background-position: 0px -408px; width: 48px; height: 51px} -.Pet_Egg_BearCub {background-position: 0px -459px; width: 48px; height: 51px} +.Pet_Egg_Wolf {background-position: 0px 0px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_TigerCub {background-position: 0px -51px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_PolarBear {background-position: 0px -102px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_PandaCub {background-position: 0px -153px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_LionCub {background-position: 0px -204px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_Fox {background-position: 0px -255px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_FlyingPig {background-position: 0px -306px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_Dragon {background-position: 0px -357px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_Cactus {background-position: 0px -408px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_Egg_BearCub {background-position: 0px -459px; width: 48px; height: 53px; margin-left: 1.25em;} -.Pet_HatchingPotion_Base {background-position: -48px -0px; width: 48px; height: 51px} -.Pet_HatchingPotion_White {background-position: -48px -51px; width: 48px; height: 51px} -.Pet_HatchingPotion_Desert {background-position: -48px -102px; width: 48px; height: 51px} -.Pet_HatchingPotion_Red {background-position: -48px -153px; width: 48px; height: 51px} -.Pet_HatchingPotion_Shade {background-position: -48px -204px; width: 48px; height: 51px} -.Pet_HatchingPotion_Skeleton {background-position: -48px -255px; width: 48px; height: 51px} -.Pet_HatchingPotion_Zombie {background-position: -48px -306px; width: 48px; height: 51px} -.Pet_HatchingPotion_CottonCandyPink {background-position: -48px -357px; width: 48px; height: 51px} -.Pet_HatchingPotion_CottonCandyBlue {background-position: -48px -408px; width: 48px; height: 51px} -.Pet_HatchingPotion_Golden {background-position: -48px -459px; width: 48px; height: 51px} +.Pet_HatchingPotion_Base {background-position: -48px -0px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_White {background-position: -48px -51px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_Desert {background-position: -48px -102px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_Red {background-position: -48px -153px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_Shade {background-position: -48px -204px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_Skeleton {background-position: -48px -255px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_Zombie {background-position: -48px -306px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_CottonCandyPink {background-position: -48px -357px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_CottonCandyBlue {background-position: -48px -408px; width: 48px; height: 53px; margin-left: 1.25em;} +.Pet_HatchingPotion_Golden {background-position: -48px -459px; width: 48px; height: 53px; margin-left: 1.25em;} .Pet_Currency_Gem {background-position: 0px -510px; width: 51px; height: 45px} /* Not an egg or potion so has a different size */ .Pet_Currency_Gem2x {background-position: -55px -513px; width: 34px; height: 30px} From 7db812b116be0b60bf445aed97e3970ba3a5328f Mon Sep 17 00:00:00 2001 From: Andre Casey Date: Tue, 2 Jul 2013 01:44:07 -0700 Subject: [PATCH 02/10] Inventory Layout Fixes - fixed CSS alignment issues with long names breaking flow - gave eggs and potions more wiggle room - centered text beneath newly centered artworks --- styles/app/inventory.styl | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/styles/app/inventory.styl b/styles/app/inventory.styl index 891d570a68..87bfcbb7ff 100644 --- a/styles/app/inventory.styl +++ b/styles/app/inventory.styl @@ -60,17 +60,23 @@ .inventory-list li clear:both .pets-menu > div - float:left + display:inline-block + vertical-align:top padding:.3em + width:7em + margin-top:1em p text-align:center - width:3em + width:6em .hatchingPotion-menu > div - float:left + display:inline-block + vertical-align:top padding:.3em + width:6em + margin-top:1em p text-align:center - width:3em + width:6em .pet-button border: none From 201fb6617b42b1035c225861acaffcb9b5696a3a Mon Sep 17 00:00:00 2001 From: Andre Casey Date: Tue, 2 Jul 2013 01:44:53 -0700 Subject: [PATCH 03/10] moved item labels slightly closer to artwork, for better readability. (thought some people might not agree that it is more readable, thus I am staging it in a separate commit) --- styles/app/inventory.styl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/styles/app/inventory.styl b/styles/app/inventory.styl index 87bfcbb7ff..33a460e29b 100644 --- a/styles/app/inventory.styl +++ b/styles/app/inventory.styl @@ -68,6 +68,7 @@ p text-align:center width:6em + margin-top:-.5em .hatchingPotion-menu > div display:inline-block vertical-align:top @@ -77,6 +78,7 @@ p text-align:center width:6em + margin-top:-.5em .pet-button border: none From 03a73bab7237dad11fe55ce63fe0763d47d4e3f1 Mon Sep 17 00:00:00 2001 From: Andre Casey Date: Tue, 2 Jul 2013 01:56:44 -0700 Subject: [PATCH 04/10] Fix for Tavern Chat and extremely long posts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit TL;DR - made tavern chat posts word-wrap, with a max-height to prevent long posts from disrupting scrolling of site Explanation: Don't know if anyone noticed that random post by an unnamed person (blank name) with the text of "HELLOOOOO…[repeat a bazillion times]. Well this "broke" chat, meaning there was all of a sudden this side scroll action (which is particularly annoying with multitouch mouse pads). This adjustment prevents such a thing from happening again. Think of "code view" in forums, where text is in it's own little scrolly window. --- styles/app/game-pane.styl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/styles/app/game-pane.styl b/styles/app/game-pane.styl index c24db0d7d6..0b1750c508 100644 --- a/styles/app/game-pane.styl +++ b/styles/app/game-pane.styl @@ -21,6 +21,9 @@ padding-top:15px padding-bottom:15px border-bottom 1px solid #ddd + word-wrap: break-word; + max-height: 12em; + overflow: scroll; &.highlight background #EEE From c6da393e71026a11eb4b275988197bda0ccbb4f7 Mon Sep 17 00:00:00 2001 From: Andre Casey Date: Tue, 2 Jul 2013 02:06:24 -0700 Subject: [PATCH 05/10] Revert "Fix for Tavern Chat and extremely long posts" This reverts commit 03a73bab7237dad11fe55ce63fe0763d47d4e3f1. --- styles/app/game-pane.styl | 3 --- 1 file changed, 3 deletions(-) diff --git a/styles/app/game-pane.styl b/styles/app/game-pane.styl index 0b1750c508..c24db0d7d6 100644 --- a/styles/app/game-pane.styl +++ b/styles/app/game-pane.styl @@ -21,9 +21,6 @@ padding-top:15px padding-bottom:15px border-bottom 1px solid #ddd - word-wrap: break-word; - max-height: 12em; - overflow: scroll; &.highlight background #EEE From ae0ee8e03d7d0774f01bf06e25d838a7202e2091 Mon Sep 17 00:00:00 2001 From: Andre Casey Date: Tue, 2 Jul 2013 02:21:14 -0700 Subject: [PATCH 06/10] Fixed my own inconsistency with spacing of eggs and potions. oops. --- styles/app/inventory.styl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/styles/app/inventory.styl b/styles/app/inventory.styl index 33a460e29b..78c1717ecb 100644 --- a/styles/app/inventory.styl +++ b/styles/app/inventory.styl @@ -63,7 +63,7 @@ display:inline-block vertical-align:top padding:.3em - width:7em + width:6em margin-top:1em p text-align:center From c4140f476f2c8cc48fca0742964af76af814ca5b Mon Sep 17 00:00:00 2001 From: Andre Casey Date: Tue, 2 Jul 2013 02:25:00 -0700 Subject: [PATCH 07/10] Moar fixes to my own code, for consistency --- styles/app/game-pane.styl | 3 +++ 1 file changed, 3 insertions(+) diff --git a/styles/app/game-pane.styl b/styles/app/game-pane.styl index c24db0d7d6..4951d91d02 100644 --- a/styles/app/game-pane.styl +++ b/styles/app/game-pane.styl @@ -21,6 +21,9 @@ padding-top:15px padding-bottom:15px border-bottom 1px solid #ddd + word-wrap:break-word + max-height:12em + overflow:scroll &.highlight background #EEE From c9807fd0c694e3a80ce96bc510d2d8571f04b733 Mon Sep 17 00:00:00 2001 From: Nicole Foster Date: Mon, 22 Jul 2013 20:00:01 -0400 Subject: [PATCH 08/10] Extended short option box and removed labels on inventory items --- styles/app/inventory.styl | 2 ++ styles/app/tasks.styl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/styles/app/inventory.styl b/styles/app/inventory.styl index 78c1717ecb..5ba49c9d41 100644 --- a/styles/app/inventory.styl +++ b/styles/app/inventory.styl @@ -57,6 +57,8 @@ .Pet_Currency_Gem2x {background-position: -55px -513px; width: 34px; height: 30px} .Pet_Currency_Gem1x {background-position: -63px -542px; width: 19px; height: 17px} +.inventory-list p + display: none .inventory-list li clear:both .pets-menu > div diff --git a/styles/app/tasks.styl b/styles/app/tasks.styl index 7a9be98804..73894b3372 100644 --- a/styles/app/tasks.styl +++ b/styles/app/tasks.styl @@ -327,7 +327,7 @@ form .option-short .option-content - width: 3em + width: 4em display: inline-block .input-suffix vertical-align: 20% From 60c726ee766cca334a361ac47fcef9f3bc83b89c Mon Sep 17 00:00:00 2001 From: Andre Casey Date: Wed, 24 Jul 2013 07:39:04 -0700 Subject: [PATCH 09/10] Fix #1273 for scrollbars showing on every message in tavern/party/guild chats. --- styles/app/game-pane.styl | 2 -- 1 file changed, 2 deletions(-) diff --git a/styles/app/game-pane.styl b/styles/app/game-pane.styl index 4951d91d02..532238c638 100644 --- a/styles/app/game-pane.styl +++ b/styles/app/game-pane.styl @@ -22,8 +22,6 @@ padding-bottom:15px border-bottom 1px solid #ddd word-wrap:break-word - max-height:12em - overflow:scroll &.highlight background #EEE From e180eb2b395b059b4af8c5672b8d0c28ed54b408 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Wed, 24 Jul 2013 15:29:03 -0400 Subject: [PATCH 10/10] fix to `delete paths['stats.hp']`, hopefully fix #1279 --- src/app/index.coffee | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/app/index.coffee b/src/app/index.coffee index 89cd993836..70e096bce5 100644 --- a/src/app/index.coffee +++ b/src/app/index.coffee @@ -138,7 +138,8 @@ ready (model) -> # remember that the properties are set from uObj & paths AFTER the return of this callback return if _.isEmpty(paths) or (paths['lastCron'] and _.size(paths) is 1) # for everyone else, we need to reset dom - too many changes have been made and won't it breaks dom listeners. - if lostHp = delete paths['stats.hp'] # we'll set this manually so we can get a cool animation + if paths['stats.hp'] + delete paths['stats.hp'] # we'll set this manually so we can get a cool animation setTimeout -> browser.resetDom(model) user.set 'stats.hp', uObj.stats.hp