Commit Graph

3281 Commits

Author SHA1 Message Date
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 bd4385632f mounts: add migration 2013-11-10 15:30:25 -08:00
Tyler Renelle 4c15905cd9 mounts: block creating mount if they already have it 2013-11-10 15:13:50 -08:00
Tyler Renelle 244fe63bdd mounts: add support for rare mounts 2013-11-10 14:36:40 -08:00
Tyler Renelle cd79649100 mounts: fix isUser class bringing user too far down. Fix initial drop bug. Remove items.currentPet if turned into mount 2013-11-10 13:43:11 -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
Tyler Renelle 60421a85cc mounts: revamp UserSchema.items to store all animal-related items as
objects rather than arrays. Preparation for the mount system
2013-11-09 20:14:35 -08:00
Tyler Renelle ddd45d76d4 contrib: fix to upping lvl 0 contrib 2013-11-09 13:24:03 -08:00
Tyler Renelle 66041442da Merge pull request #1770 from snicker/develop
updated README to show initial seeding tasks, and fixed a small typo
2013-11-09 13:19:31 -08:00
Tyler Renelle be7a686657 Merge pull request #1777 from HabitRPG/sabe_tweak
Challenges are no longer an upcoming feature!
2013-11-09 12:25:31 -08:00
Sabe Jones ce1461f0e9 Challenges are no longer an upcoming feature!
Wording tweaks to guild creation text.
2013-11-09 13:34:14 -06:00
Matteo Pagliazzi de1f056af8 typo 2013-11-09 19:32:47 +01:00
Matteo Pagliazzi e198bac475 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-09 19:31:50 +01:00
Matteo Pagliazzi aff43acc84 fix #1769 2013-11-09 19:31:28 +01:00
Tyler Renelle 8c83bc6ad2 challenges: "close" => "end challenge", move outside of edit 2013-11-09 09:37:31 -08:00
Nick Gordon d802c502b0 updated README to show initial seeding tasks, and fixed a small typo 2013-11-09 08:48:38 -08:00
Tyler Renelle 20cac379cf pretty up our bailey notifs 2013-11-08 20:05:12 -08:00
Tyler Renelle f868bcae66 contrib: more enticing bailey announcement 2013-11-08 19:42:13 -08:00
Tyler Renelle 14be0b11c6 contrib: add bailey announcement 2013-11-08 19:28:07 -08:00
Tyler Renelle 242bcda96a contrib: remove gems from admin section, update automatically when they
increase a level
2013-11-08 19:28:07 -08:00
Tyler Renelle c0d36f13ef contrib: links to wikia in tavern & popup 2013-11-08 19:28:07 -08:00
Tyler Renelle 5d6b6c1f2a Merge pull request #1768 from bobbyroberts99/develop
Minor edits to stable.jade
2013-11-08 18:21:43 -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
Tyler Renelle f35df8a47f [#1726] remove updateTasks() batch api route. That's not how we're using
batch (we'll create a proper batch route & document later), and we
shouldn't support this route
2013-11-08 14:01:29 -08:00
Tyler Renelle 5f9d3991ac [#1766] remove "trigger next day" option 2013-11-08 13:54:29 -08:00
Matteo Pagliazzi daf33f9174 remove console.log 2013-11-08 22:37:40 +01:00
Matteo Pagliazzi 9f326e7433 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-08 22:34:28 +01:00
Matteo Pagliazzi 3a332c4c45 port beastMaster achievement, @lefnire shown client side but not set, using user.pre("save") for setting 2013-11-08 22:33:48 +01:00
Tyler Renelle 8e8d88376c Merge pull request #1765 from Shaners/patch-4
Update Inventory Hatching Instructions
2013-11-08 12:40:45 -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 4b35551afc confirm "trigger new day" 2013-11-08 09:18:03 -08:00
Tyler Renelle 4e668a7de4 contrib: heroic at (8) 2013-11-08 08:51:33 -08:00
Matteo Pagliazzi 4a1ed7006e remove comment 2013-11-08 17:49:30 +01:00
Matteo Pagliazzi daac0a4b04 show but disable challenge daily days, fix #1758 2013-11-08 17:42:45 +01:00
Matteo Pagliazzi d419db68f2 typo, fix #1761 2013-11-08 17:23:17 +01:00
Matteo Pagliazzi 03905ef90b solve conflicts 3 2013-11-08 17:09:06 +01:00
Matteo Pagliazzi e1b86c64a6 solve conflicts 2 2013-11-08 17:08:23 +01:00
Matteo Pagliazzi 02651d52a4 solve conflict 2013-11-08 17:05:03 +01:00
Matteo Pagliazzi a78297f129 update chat if necessary after new message posted or deleted 2013-11-08 17:03:10 +01:00
Tyler Renelle 06d1f77ce5 contribu: cleanup tavern, add legend for contrib tiers 2013-11-07 17:25:58 -08:00
Tyler Renelle 4454cc502b contrib: only show contrib alert if they've gained, not lost 2013-11-07 14:22:56 -08:00
Tyler Renelle ade25c47c1 Merge branch 'contrib' into develop 2013-11-07 13:52:04 -08:00
Tyler Renelle 7c94b4b6d3 contrib: add contributor achievement modal 2013-11-07 13:42:29 -08:00