Commit Graph

22 Commits

Author SHA1 Message Date
Tyler Renelle 2b286ba889 [#1821] [#1723] fix pet counters (incl for member modals) 2013-11-15 17:51:00 -08:00
Tyler Renelle 1e6dec0bbe pets: popover placement fixes 2013-11-14 22:07:08 -08:00
Tyler Renelle 4c3f04cc49 Merge branch 'mounts' into develop
Conflicts:
	views/options/inventory/stable.jade
2013-11-14 13:04:44 -08:00
Tyler Renelle d245c87f29 mounts: temporarily remove mounts code from views. merging to master so
we can run schema migration and start with item translations. This commit will be reverted
when mounts is fully merged
2013-11-14 12:59:00 -08:00
Adrien Lemaire 340590774c replace github contributing links → wikia link 2013-11-14 15:09:20 +11:00
Tyler Renelle dda3670d03 mounts: only show mount head in stable (fix later), use egg.mountText
for grown mount popovers. replace pet/mount tooltips with popovers
2013-11-11 13:50:11 -08:00
Tyler Renelle bfbc907fa1 mounts: show when selectedFood by green-circle highlighting pets 2013-11-10 22:53:20 -08:00
Tyler Renelle e6f524fce2 mounts: much cleaner inventory interface. Replace text (underneath) with
gem cost. Use popover instead of tooltip, show item.text & item.notes
for more details than before (especially useful for saddle). Screenshot: http://goo.gl/0AfLfG
2013-11-10 20:03:54 -08:00
Tyler Renelle 543635dd37 mounts: change growth-points requirement to 50 (@lemoness) 2013-11-10 19:20:34 -08:00
Tyler Renelle 05c3e71a92 mounts: fixes to starter food css 2013-11-10 19:18:06 -08:00
Tyler Renelle 4f2a4b1f02 mounts: rare mounts html fix 2013-11-10 17:17:24 -08:00
Tyler Renelle 244fe63bdd mounts: add support for rare mounts 2013-11-10 14:36:40 -08:00
Tyler Renelle 284114c056 mounts: counting bug fixes, put pets & mounts in tabs 2013-11-10 12:28:08 -08:00
Tyler Renelle 085919c000 mounts: update all html & javascript to support UserSchema overhaul (60421a8). Also add very basic feeding & saddling mounts functionality. use progress bars to indicate pet feeding progress 2013-11-10 11:04:41 -08:00
Bob Steffes 8773e8ee88 Minor edits
Fix a runon sentence, add a space after a comma and change adventure to
venture by your side.

Happy note, I finally got my local copy running. Needed to edit
config.json with my actual settings.
2013-11-08 17:40:23 -08:00
Bob Steffes dd2e8144bb Revert "Minor edits"
This reverts commit 43bb1bf485.
2013-11-08 17:15:03 -08:00
Bob Steffes 43bb1bf485 Minor edits
Add a space at of sentence and fix run.
2013-11-08 17:01:24 -08:00
Shane Lister 64ed414ae6 Update inventory.jade 2013-11-08 10:53:28 -08:00
Shane Lister 30e4dbcb98 Update Hatching Instructions
On behalf of @bobbyroberts99
2013-11-08 10:43:22 -08:00
Tyler Renelle e387ee9d13 Merge remote-tracking branch 'Shaners/patch-3' into contrib
Conflicts:
	views/options/pets.jade
2013-11-06 17:40:02 -08:00
bobbyroberts99 5b09bd30b4 Clarify pet hatching instructions
This is my first PR. Hope I'm in the right place.
2013-10-31 09:34:43 -07:00
Tyler Renelle 35c4a62de0 challenges: switch from ngRoute to ui-router 2013-10-28 11:34:08 -07:00