Commit Graph

13 Commits

Author SHA1 Message Date
Tyler Renelle f95a537894 pets: move inventory.styl out of items.styl 2013-03-26 22:35:51 -07:00
Tyler Renelle f6b2c08a60 Merge branch 'develop' into pets
Conflicts:
	views/app/rewards.html
2013-03-26 17:54:31 -07:00
Tyler Renelle c5c6629419 pets: add base food 2013-03-25 12:42:38 -06:00
Tyler Renelle 4af56b998f pets: some better default inventory/stable layout 2013-03-25 11:50:32 -06:00
Zachary Kain b038b74534 checkbox shenanigans fix. 2013-03-25 10:05:44 -04:00
Tyler Renelle acdb9eb5e5 add better temporary pet positioning 2013-03-22 22:40:12 -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
Zachary Kain 0ddac82f1d MAD BUG FIXES YO 2013-03-21 14:49:07 -04:00
Zachary Kain e5a893a710 revamp rewards and pets UI. Obv pets is temporary pending new pet system 2013-03-09 01:34:15 -05:00
Tyler Renelle 61c46e83d9 pet tooltips, checkmark when purchased 2013-02-11 01:07:01 -05:00
Tyler Renelle 63bef37e98 fixes to gold / silver. Add copper, but not using it in the html (it's
currently always calculated at 00)
2013-02-08 16:41:04 -05:00
Tyler Renelle 2be5136a2f shop items now working. really crappy css (@Pandoro save me?) but it works 2013-02-08 13:43:57 -05:00
Tyler Renelle a166f7c909 move *.styls out into their own files 2013-02-08 13:29:09 -05:00