Commit graph

174 commits

Author SHA1 Message Date
Tyler Renelle
ed057799a3 put coin_single_[silver|gold].png back in (thought we weren't using
anymore, i was wrong)
2013-05-20 10:27:53 +01:00
Shane Lister
5cff970947 Bacon Bacon
Putting some bacon into the tavern NPC graphic. The people demand bacon.
2013-05-17 16:42:26 -07:00
Tyler Renelle
f6df9a610a get rid of some old unused images 2013-05-16 12:16:24 +01:00
Tyler Renelle
af8dbb9f1a Use @Shaners new NPCs sprites instead of images 2013-05-16 12:00:04 +01:00
Shane Lister
2cebbb93e5 NPC Sprite Sheet and CSS 2013-05-15 21:44:39 -07:00
Shane Lister
8bb0718cea Backer-Gear Tweaks, NPCs 2013-05-15 17:22:32 -07:00
Tyler Renelle
be08568c3b npcs: matt stable-master in the the pets tab (bravo @Shaners!). also
include link to the pets spritesheet, and some info on mounts
2013-05-13 21:29:27 +01:00
Slappybag
88e6f40804 Tokens = Gems for front-end display. 2013-05-10 17:30:13 +01:00
Tyler Renelle
cd6a7fbcc4 nix old paw 2013-05-10 11:21:12 +01:00
Shane Lister
2234f57d73 Resting icon and pixely version of missing pet 2013-05-09 16:41:44 -07:00
Shane Lister
bbf08efd44 105x Sprite Sheet and Lowered Shade Helmet
I made a 105x sized Sprite Sheet but haven't done the new CSS. Could
still be used for some testing with some quick CSS.
2013-05-08 23:40:12 -07:00
Shane Lister
25e3500f74 Backer-only GIF Timing Adjustments 2013-05-08 22:11:29 -07:00
Shane Lister
4300e04e43 Backer-Only Shop Sprites 2013-05-08 17:02:39 -07:00
Tyler Renelle
e95e313e45 temporary shop sprites to test how things work, will replace with
@Shaners official stuff
2013-05-08 22:28:17 +01:00
Shane Lister
26b33d7da4 Backer Only Gear
Animated GIFs and a sprite sheet.
2013-05-07 17:38:13 -07:00
Tyler Renelle
2b9f4e336b add achievemnts in as spritesheet 2013-05-03 15:46:59 +01:00
Tyler Renelle
710e45cc84 Merge branch 'develop' 2013-05-02 17:59:05 +01:00
Tyler Renelle
77bd61c244 Add bailey the crier for alerts. move CHANGELOG.md into the modal 2013-05-02 16:56:43 +01:00
Tyler Renelle
a40a41fa9c add in alexander the merchant 2013-05-02 15:12:00 +01:00
Tyler Renelle
e22634658a add in daniel / tavern tab content 2013-05-02 15:01:11 +01:00
Tyler Renelle
166225b8b0 add logo assets (@litenull) 2013-05-02 12:27:08 +01:00
Tyler Renelle
9e86248120 "unlock all the pets" style stable layout 2013-04-15 02:03:32 -04:00
Tyler Renelle
f9db24354f Merge branch 'develop' 2013-04-09 23:02:19 -04:00
Tyler Renelle
d2f6597e9f remove jquery-ui as git submodule, add it into public/vendor manually due to large direcotry size with build files 2013-04-09 13:45:09 -04:00
Tyler Renelle
72ee444608 back to our roots: store vendor files in public/vendor instead of
using CDN, hoping to fix #773 (hoping! will follow up). We can close #755 as a result. We use
require() to min/concat for performance. Note, previously we had "too
many files open" error because we had /vendor tracking git submodules,
which includes all files for those projects - now we're downloading
manually, which gives us minimum required files from each project's
build steps
2013-04-09 13:21:20 -04:00
Tyler Renelle
3918eb6731 Merge branch 'develop' 2013-04-06 13:17:07 -04:00
Shane Lister
35da5c2a1e Fix to some pixel grid alignment issues 2013-04-06 10:06:37 -07:00
Tyler Renelle
db4ebe3813 add bs-docs-masthead 2013-04-05 14:16:26 -04:00
Shane Lister
b5665cdd7c new line 2013-03-29 22:50:15 -07:00
Shane Lister
86102ce8e7 More Gem sizes 2013-03-29 22:44:44 -07:00
Shane Lister
f72c8f33ec Added Gem to Sprite Sheet and Egg CSS 2013-03-28 19:04:01 -07:00
Tyler Renelle
a84d1920bf pets: remove unecessary css 2013-03-27 17:57:39 -07:00
Shane Lister
0ac25e7686 Last four potions for new pet system 2013-03-27 17:16:49 -07:00
Tyler Renelle
6520bfb789 pets: rename shaners Item_HatchingPotion to Pet_HatchingPotion to fit
previous architecture, add some placeholders for the un-finished
potions. got them working
2013-03-27 00:20:33 -07:00
Shane Lister
2cb5fed3fc egg and mount image update 2013-03-26 23:28:20 -07:00
Shane Lister
ca66c658d7 Update PetEggs.css
Fixed flying pig and fox positions since they seemed to be reversed. Added positions for new hatching potion items.
2013-03-26 22:52:45 -07:00
Tyler Renelle
8ce1945001 pets: pull @Shaners updated sprites with wolf-base 2013-03-26 18:29:16 -07:00
Tyler Renelle
b95fd4a053 Merge pull request #731 from Shaners/patch-1
Update Mounts.css
2013-03-26 11:28:56 -07:00
Shane Lister
79ead2cdff Update pet_sprites.css
Added missing wolf base position.
2013-03-26 09:40:01 -07:00
Shane Lister
2f38286716 Update Mounts.css
periods and ethereal lion position
2013-03-26 09:31:42 -07:00
Tyler Renelle
62892bdc9b remove more unecessary imgs 2013-03-25 14:02:55 -07:00
Tyler Renelle
3c75caffd8 Merge branch 'develop' into pets 2013-03-22 23:50:41 -06:00
Tyler Renelle
e7fe8f40a7 move backer mount into backer/ 2013-03-22 23:41:22 -06:00
Tyler Renelle
7ab4abad60 adding in as much currently-designed, unused pixel art that I could find into public/img/unprocessed 2013-03-22 23:39:33 -06:00
Tyler Renelle
b490133bd8 fix cactus css sprites 2013-03-22 22:16:30 -06:00
Tyler Renelle
fc788f3f86 fix eggs css - was missing fox 2013-03-22 19:35:40 -06:00
Tyler Renelle
a1a85241d5 add "hatching powder" (as temporary pet food), clean up some dialogs,
fix eggs using their actual animal sprites
2013-03-21 14:56:25 -06:00
Tyler Renelle
3ce2686662 Merge branch 'develop' into switz-inventory
Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
Merge branch 'develop' into switz-inventory

Conflicts:
	src/app/helpers.coffee
	styles/app/avatar.styl
	styles/app/index.styl
	views/app/avatar.html
	views/app/tasks.html
2013-03-21 13:51:38 -06:00
Tyler Renelle
fa89b20dd5 Merge branch 'develop' into zakkain-ui-tweaks
Conflicts:
	styles/app/index.styl
	styles/app/tasks.styl
	views/app/alerts.html
	views/app/avatar.html
	views/app/header.html
	views/app/index.html
Merge branch 'develop' into zakkain-ui-tweaks

Conflicts:
	styles/app/index.styl
	styles/app/tasks.styl
	views/app/alerts.html
	views/app/avatar.html
	views/app/header.html
	views/app/index.html
by popular demand, we're dropping the crosshatched square and going blank

Conflicts:
	styles/app/tasks.styl
2013-03-21 12:36:05 -06:00
Tyler Renelle
7c77126129 try some protocol-agnostics to fix homepage css 2013-03-21 11:23:46 -06:00