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
Tyler Renelle
d737bd0714
remove a ton of public/vendor git submodules, using CDN instead. The
...
reason we're removing the submodules (intead of keeping them around
for offline development) is that derby does some watchfile magic on the
public directory, and it causes a "max file limit" operating system
error (mitigated by `ulimit -u 2048`). For offline developers, you may
want to have some symlinks and a git stash handy
2013-03-21 11:11:15 -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
Zachary Kain
e18c53f97f
middle of wrasslin the new header
2013-03-18 16:48:47 -04:00
Tyler Renelle
2276867f6c
use cloudflare cdn for bootstrap too
2013-03-17 09:45:57 -04:00
Tyler Renelle
6182a474c7
remoe bootstrap import from .styl, start pulling in from
...
CDN (500.html, static, & dynamic pages)
2013-03-17 09:33:14 -04:00
Tyler Renelle
ee9e6064b2
add a ton of static page, beef up the footer, make this website look
...
official! @zakkain, I hope I didn't break anything!
2013-03-16 23:03:59 -04:00
Tyler Renelle
b1fe9b64a9
Merge branch 'develop' into static-pages
2013-03-16 20:29:22 -04: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
Daniel Saewitz
c83da2ae79
Merge branch 'develop' of github.com:lefnire/habitrpg into inventory
2013-03-13 06:15:17 -04:00
Tyler Renelle
b34bfc886d
start static-pages redesign
2013-03-11 01:32:24 -04:00
Tyler Renelle
a534eec548
[documentation] level 2 unlocks items
2013-03-10 12:21:30 -04: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
