Commit Graph

68 Commits

Author SHA1 Message Date
Tyler Renelle 9e86248120 "unlock all the pets" style stable layout 2013-04-15 02:03:32 -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
Shane Lister 63f0a9f3a4 Mount Sprite Sheet, Mount CSS, Revised Pet Egg CSS
Here is a copy of the mount sprite sheet, mount CSS, and a revised pet
egg CSS. CSS now matches the player CSS structure. Removed individual
mount images as they'd no longer be needed.
2013-03-18 22:19:20 -07:00
Daniel Saewitz 7083e7a103 yarr, fix all teh bugs 2013-03-16 16:30:45 -04:00
Daniel Saewitz 2ffe0aecf9 FeedEgg 2013-03-16 11:18:27 -04:00
Shane Lister 644a23cc57 Pet Egg Sprite Sheet and CSS 2013-03-14 21:57:08 -07:00
Tyler Renelle 65b7f432a9 get the pets working for the avatar box, with consistent names (need
to manually apply with model.set for now)
2013-03-09 12:03:38 -05:00
Tyler Renelle e280be3f62 gut old pet images, now we're using sprites. begin on new items.pets[] structure 2013-03-08 13:01:29 -05:00
Tyler Renelle b3247e32d0 add . to player / pet sprite classes 2013-03-08 12:21:59 -05:00
Alex 811e9a673c Added Pet css sprite and removed genders from player css sprites
Added one sprites containing all of @Shaners' pets.

Fused male and female back together to 1 spritesheet again. Genders were removed although the same appearance should be obtainable with the new system!
2013-03-04 00:54:18 +01:00
Tyler Renelle 39a98446b9 move all custom sprites to /img/sprites, and all BrowserQuest image references to /vendor/BrowserQuest (a git submodule) 2013-02-27 23:27:01 -05:00
Tyler Renelle 22ac8e1d16 add faux achievements, fix error page 2013-02-17 15:07:56 -05:00
Tyler Renelle 3aef9f1ac0 Merge branch 'master' into develop 2013-02-17 12:32:15 -05:00
Tyler Renelle c14bc8ef76 Merge pull request #410 from Shaners/master
75 New Pet Sprites, 1 New Mount
2013-02-17 09:12:08 -08:00
Shane Lister ca41e1dab6 75 New Pets, 1 New Mount
Mainly just colour variations for the previously made pets. 1 New pet
and 1 new Mount.
2013-02-17 02:57:08 -08:00
Tyler Renelle 0669511ebe Merge branch 'master' into develop 2013-02-17 02:46:36 -05:00
Tyler Renelle 31489f0869 logos by Joanna 2013-02-16 23:25:41 -05:00
Tyler Renelle 219065907d add calendar icons 2013-02-15 14:17:27 -05:00
Stan Lindsey ba5cf3a06c Merge pull request #352 from Shaners/master
Addition of 1 New Mount and 1 Pet, Plus Revised Bear Cub Pet
2013-02-09 03:18:38 -08:00
Shane Lister 868ed4604c 1 New Mount, 1 Revised Pet, and 1 New Pet
New Bear Mount Base, a Revised Bear Cub Pet, and a new Cactus Pet.
Cactus pet may not fit with the current style (too cutesie?)
2013-02-09 02:19:25 -08:00
Stan Lindsey 83f60e424e Merge pull request #349 from Shaners/master
Addition of 3 New Pet Sprites and Renaming of 3 Old Pet Sprites.
2013-02-08 17:01:21 -08:00
Shane Lister b06e57254f Added 3 new pet sprites and renamed 3 pet sprites.
Added Pet: Tiger Cub, Panda Cub, and Lion Cub. Renamed Pets: Lion Base
-> Mount Lion Base, Panda Base -> Mount Panda Base, Tiger Base -> Mount
Tiger Base. Renamed because these pet sprites were too big and likely
will work better as mounts.
2013-02-08 16:56:16 -08:00
Tyler Renelle 3fa27a6a48 Merge pull request #343 from Pandoro/new_pixel_art
Reorganized and improved sprites
2013-02-08 07:38:17 -08:00
Alex eb804a1d7d Reorganized and improved sprites
*Gimp file into female and male.
*Created sprites for both of them
*Created a shop.xcf Here shop versions for all items will be kept.
*Created a shop sprite. Includes potion, reroll icon and gold, silver, copper coins

*Created a development xcf. This will contain items which are in development and a base pixel art for male and female which can be used to cross check your new items against. E.g. does my helmet fit the system yes or no?
2013-02-08 15:18:44 +01:00
Stan Lindsey 0f0f2b0582 Merge pull request #342 from Orangyfresh/master
Gimp files for Iron, Red Robes and Rogue armor sets.
2013-02-08 06:06:21 -08:00
Harry Stringer 9e5554b2a4 Gimp files for Iron, Red Robes and Rogue armor sets. 2013-02-09 00:51:36 +11:00
Shane Lister 1a74640a97 New Pet Sprites
New sprites for pet: tiger, panda, and flying pig.
2013-02-07 20:04:16 -08:00
Shane Lister 1883ee4a28 New Pet Sprites
New Pet Sprites for: Fox, Bear Cub, Dragon, and Lion.
2013-02-06 18:00:47 -08:00