From 5f9d3991acec71676405ab5e9b68f263230f717c Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 8 Nov 2013 13:54:09 -0800 Subject: [PATCH 01/11] [#1766] remove "trigger next day" option --- views/shared/modals/settings.jade | 1 + 1 file changed, 1 insertion(+) diff --git a/views/shared/modals/settings.jade b/views/shared/modals/settings.jade index 23476805de..6aafed4060 100644 --- a/views/shared/modals/settings.jade +++ b/views/shared/modals/settings.jade @@ -46,6 +46,7 @@ div(ng-controller='SettingsCtrl') .option-group.option-medium input.option-content(type='number', data-for='achievements.streak', ng-model='restoreValues.achievements.streak') span.input-suffix 21-Day Streak + //- This is causing too many problems for users h3 Other a.btn.btn-small.btn-warning(ng-controller='FooterCtrl', ng-click='addMissedDay()') Trigger New Day .modal-footer From f35df8a47f0de3975ff062f30f88fc9d632ea744 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 8 Nov 2013 14:01:29 -0800 Subject: [PATCH 02/11] [#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 --- src/controllers/user.js | 29 ----------------------------- src/routes/api.js | 1 - 2 files changed, 30 deletions(-) diff --git a/src/controllers/user.js b/src/controllers/user.js index d353546536..b67c61fe42 100644 --- a/src/controllers/user.js +++ b/src/controllers/user.js @@ -174,35 +174,6 @@ api.updateTask = function(req, res, next) { }); }; -/** - * Update tasks (plural). This will update, add new, delete, etc all at once. - * TODO Should we keep this? - */ -api.updateTasks = function(req, res, next) { - var user = res.locals.user; - var tasks = req.body; - _.each(tasks, function(task, idx) { - if (task.id) { - // delete - if (task.del) { - user.deleteTask(task.id); - task = {deleted: true}; - } else { - // Update - // updateTask(user, task.id, task); //FIXME - } - } else { - // Create - task = addTask(user, task); - } - tasks[idx] = task; - }); - user.save(function(err, saved) { - if (err) return res.json(500, {err: err}); - return res.json(201, tasks); - }); -}; - api.createTask = function(req, res, next) { var user = res.locals.user; var task = addTask(user, req.body); diff --git a/src/routes/api.js b/src/routes/api.js index 6ee338f3f6..467c1290fe 100644 --- a/src/routes/api.js +++ b/src/routes/api.js @@ -32,7 +32,6 @@ router.post('/user/tasks/:id/:direction', auth.auth, cron, user.scoreTask); router.get('/user/tasks', auth.auth, cron, user.getTasks); router.get('/user/task/:id', auth.auth, cron, user.getTask); router.put('/user/task/:id', auth.auth, cron, verifyTaskExists, user.updateTask); -router.post('/user/tasks', auth.auth, cron, user.updateTasks); router["delete"]('/user/task/:id', auth.auth, cron, verifyTaskExists, user.deleteTask); router.post('/user/task', auth.auth, cron, user.createTask); router.put('/user/task/:id/sort', auth.auth, cron, verifyTaskExists, user.sortTask); From 43bb1bf4856ee6f218b4ff3330e3e1584837d99b Mon Sep 17 00:00:00 2001 From: Bob Steffes Date: Fri, 8 Nov 2013 17:01:24 -0800 Subject: [PATCH 03/11] Minor edits Add a space at of sentence and fix run. --- views/options/inventory/stable.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/options/inventory/stable.jade b/views/options/inventory/stable.jade index ab58c7fb3b..ba768b52bf 100644 --- a/views/options/inventory/stable.jade +++ b/views/options/inventory/stable.jade @@ -7,9 +7,9 @@ script(type='text/ng-template', id='partials/options.inventory.stable.html') a(target='_blank', href='http://www.kickstarter.com/profile/mattboch') Matt Boch .popover-content p - | Welcome to the Stable! I'm Matt, the beast master. Choose a pet here to adventure at your side - they aren't much help yet, but I forsee a time when they're able to + | Welcome to the Stable! I'm Matt, the beast master. Choose a pet here to adventure at your side. They aren't much help yet, but I forsee a time when they're able to a(href='https://trello.com/card/mounts/50e5d3684fe3a7266b0036d6/221') grow into powerful steeds - | ! Until that day, + | ! Until that day, a(target='_blank', href='https://f.cloud.github.com/assets/2374703/164631/3ed5fa6c-78cd-11e2-8743-f65ac477b55e.png') have a look-see | at all the pets you can collect. h4 {{userPets.length}} / {{totalPets}} Pets Found From dd2e8144bbff1de9f854daa7eb65c21bc9a85f24 Mon Sep 17 00:00:00 2001 From: Bob Steffes Date: Fri, 8 Nov 2013 17:15:03 -0800 Subject: [PATCH 04/11] Revert "Minor edits" This reverts commit 43bb1bf4856ee6f218b4ff3330e3e1584837d99b. --- views/options/inventory/stable.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/options/inventory/stable.jade b/views/options/inventory/stable.jade index ba768b52bf..ab58c7fb3b 100644 --- a/views/options/inventory/stable.jade +++ b/views/options/inventory/stable.jade @@ -7,9 +7,9 @@ script(type='text/ng-template', id='partials/options.inventory.stable.html') a(target='_blank', href='http://www.kickstarter.com/profile/mattboch') Matt Boch .popover-content p - | Welcome to the Stable! I'm Matt, the beast master. Choose a pet here to adventure at your side. They aren't much help yet, but I forsee a time when they're able to + | Welcome to the Stable! I'm Matt, the beast master. Choose a pet here to adventure at your side - they aren't much help yet, but I forsee a time when they're able to a(href='https://trello.com/card/mounts/50e5d3684fe3a7266b0036d6/221') grow into powerful steeds - | ! Until that day, + | ! Until that day, a(target='_blank', href='https://f.cloud.github.com/assets/2374703/164631/3ed5fa6c-78cd-11e2-8743-f65ac477b55e.png') have a look-see | at all the pets you can collect. h4 {{userPets.length}} / {{totalPets}} Pets Found From 8773e8ee883dd10a1dba95e4226e227cc3753415 Mon Sep 17 00:00:00 2001 From: Bob Steffes Date: Fri, 8 Nov 2013 17:40:23 -0800 Subject: [PATCH 05/11] 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. --- views/options/inventory/stable.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/options/inventory/stable.jade b/views/options/inventory/stable.jade index ab58c7fb3b..042970aed9 100644 --- a/views/options/inventory/stable.jade +++ b/views/options/inventory/stable.jade @@ -7,9 +7,9 @@ script(type='text/ng-template', id='partials/options.inventory.stable.html') a(target='_blank', href='http://www.kickstarter.com/profile/mattboch') Matt Boch .popover-content p - | Welcome to the Stable! I'm Matt, the beast master. Choose a pet here to adventure at your side - they aren't much help yet, but I forsee a time when they're able to + | Welcome to the Stable! I'm Matt, the beast master. Choose a pet here to venture at your side. They aren't much help yet, but I forsee a time when they're able to a(href='https://trello.com/card/mounts/50e5d3684fe3a7266b0036d6/221') grow into powerful steeds - | ! Until that day, + | ! Until that day, a(target='_blank', href='https://f.cloud.github.com/assets/2374703/164631/3ed5fa6c-78cd-11e2-8743-f65ac477b55e.png') have a look-see | at all the pets you can collect. h4 {{userPets.length}} / {{totalPets}} Pets Found From c0d36f13ef3bf71a34a361fc5434111781c0009f Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 8 Nov 2013 19:20:19 -0800 Subject: [PATCH 06/11] contrib: links to wikia in tavern & popup --- views/options/social/tavern.jade | 3 ++- views/shared/modals/achievements.jade | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/views/options/social/tavern.jade b/views/options/social/tavern.jade index c5a60f805f..7dd6754c26 100644 --- a/views/options/social/tavern.jade +++ b/views/options/social/tavern.jade @@ -49,7 +49,8 @@ .modal-header h3 Player Tier Legend .modal-body - small (click each for details) + small. + Click labels to expand. See contribution details. table.table.table-striped tr td diff --git a/views/shared/modals/achievements.jade b/views/shared/modals/achievements.jade index 31c0c6c2e5..fd05296c54 100644 --- a/views/shared/modals/achievements.jade +++ b/views/shared/modals/achievements.jade @@ -37,7 +37,7 @@ div(modal='user.flags.contributor') .modal-body .NPC-Justin.float-left p. - {{user.profile.name}}, you awesome person! You're now a level {{user.contributor.level}} contributor for pitching in to Habit. See Trello for what prizes you've earned for your contribution level. + {{user.profile.name}}, you awesome person! You're now a level {{user.contributor.level}} contributor for helping HabitRPG. See what prizes you've earned for your contribution! .modal-footer button.btn.btn-default.cancel(ng-click='set("flags.contributor",false)') Ok From 242bcda96a14e2136fefc114027d2e33e06f0c17 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 8 Nov 2013 19:20:42 -0800 Subject: [PATCH 07/11] contrib: remove gems from admin section, update automatically when they increase a level --- migrations/20131108_add_gems_for_contribs.js | 4 ++++ src/controllers/groups.js | 7 +++++-- views/options/admin.jade | 3 --- 3 files changed, 9 insertions(+), 5 deletions(-) create mode 100644 migrations/20131108_add_gems_for_contribs.js diff --git a/migrations/20131108_add_gems_for_contribs.js b/migrations/20131108_add_gems_for_contribs.js new file mode 100644 index 0000000000..03ff44e721 --- /dev/null +++ b/migrations/20131108_add_gems_for_contribs.js @@ -0,0 +1,4 @@ +// Increase everyone's gems per their contribution level +db.users.find({'contributor.level':{$gt:0}},{contributor:1, balance:1}).forEach(function(user){ + db.users.update({_id:user._id}, {$inc: {balance: (user.contributor.level * .5)} }); +}); \ No newline at end of file diff --git a/src/controllers/groups.js b/src/controllers/groups.js index 8632d6e48d..08829344b4 100644 --- a/src/controllers/groups.js +++ b/src/controllers/groups.js @@ -55,8 +55,11 @@ api.updateMember = function(req, res) { }, function(member, cb){ if (!member) return res.json(404, {err: "User not found"}); - if (req.body.contributor.level > (member.contributor && member.contributor.level || 0)) member.flags.contributor = true; - _.merge(member, _.pick(req.body, ['contributor', 'balance'])); + if (req.body.contributor.level > (member.contributor && member.contributor.level || 0)) { + member.flags.contributor = true; + member.balance += (req.body.contributor.level - member.contributor.level)*.5 // +2 gems per tier + } + _.merge(member, _.pick(req.body, 'contributor')); if (!member.items.pets) member.items.pets = []; var i = member.items.pets.indexOf('Dragon-Hydra'); if (!~i && member.contributor.level >= 6) member.items.pets.push('Dragon-Hydra'); diff --git a/views/options/admin.jade b/views/options/admin.jade index aded591834..e53f537161 100644 --- a/views/options/admin.jade +++ b/views/options/admin.jade @@ -16,9 +16,6 @@ script(id='partials/options.admin.html', type="text/ng-template") br small [1-7] this determines which items, pets, and mounts are available. Also determines name-tag coloring.  a(target='_blank', href='https://trello.com/c/wkFzONhE/277-contributor-gear') More details. - .control-group.option-medium - input.option-content(type='number', step="any", ng-model='profile.balance') - span.input-suffix $ (Gems/4) .control-group.option-medium label.checkbox input(type='checkbox', ng-model='profile.contributor.admin') From 14be0b11c65896a877ad5b54eea58bac9b920990 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 8 Nov 2013 19:27:51 -0800 Subject: [PATCH 08/11] contrib: add bailey announcement --- views/shared/modals/new-stuff.jade | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/views/shared/modals/new-stuff.jade b/views/shared/modals/new-stuff.jade index d50e235f13..a35c2165f3 100644 --- a/views/shared/modals/new-stuff.jade +++ b/views/shared/modals/new-stuff.jade @@ -12,15 +12,20 @@ div(modal='modals.newStuff') h3.popover-title a(target='_blank', href='https://twitter.com/Mihakuu') Bailey .popover-content - strong 11/01/2013 + strong 11/08/2013 p ul.modal-indented-list - li Challenges! Compete with your party, guilds, or the tavern on certain tasks. Win gem prizes. Read more. - li Backend overhaul, including bookmark-able paths throughout the application. Will pave the way towards improved performance. + li. + Contrib Gear. You can now unlock a new top-tier gear set and pet by contributing to HabitRPG. Read more. hr h3 Archive p + h4 11/01/2013 + ul + li Challenges! Compete with your party, guilds, or the tavern on certain tasks. Win gem prizes. Read more. + li Backend overhaul, including bookmark-able paths throughout the application. Will pave the way towards improved performance. + h4 10/22/2013 ul li TRICK OR TREAT! It's Habit Halloween! Some of the NPCs have decorated for the occasion. Can you spot us? From f868bcae661926c2305eb528f3990e2d25060859 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 8 Nov 2013 19:42:13 -0800 Subject: [PATCH 09/11] contrib: more enticing bailey announcement --- views/shared/modals/new-stuff.jade | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/views/shared/modals/new-stuff.jade b/views/shared/modals/new-stuff.jade index a35c2165f3..c632b5c548 100644 --- a/views/shared/modals/new-stuff.jade +++ b/views/shared/modals/new-stuff.jade @@ -12,11 +12,22 @@ div(modal='modals.newStuff') h3.popover-title a(target='_blank', href='https://twitter.com/Mihakuu') Bailey .popover-content - strong 11/08/2013 - p - ul.modal-indented-list - li. - Contrib Gear. You can now unlock a new top-tier gear set and pet by contributing to HabitRPG. Read more. + table + tr + td + //ul.modal-indented-list + h4 Contrib Gear + p. + You can now unlock new top-tier gear and pet by contributing to HabitRPG. Read more + small.muted 11/08/2013 + td + .herobox(style='background-color:transparent;') + .character-sprites + span.armor_7 + span.head_7 + span.shield_7 + span.weapon_8 + span.current-pet.Pet-Dragon-Hydra hr h3 Archive From 20cac379cfd245a209345fbe449a348fea4d879f Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Fri, 8 Nov 2013 20:05:12 -0800 Subject: [PATCH 10/11] pretty up our bailey notifs --- views/shared/modals/new-stuff.jade | 239 +++++++++++++++++------------ 1 file changed, 139 insertions(+), 100 deletions(-) diff --git a/views/shared/modals/new-stuff.jade b/views/shared/modals/new-stuff.jade index c632b5c548..e0066f301e 100644 --- a/views/shared/modals/new-stuff.jade +++ b/views/shared/modals/new-stuff.jade @@ -18,7 +18,7 @@ div(modal='modals.newStuff') //ul.modal-indented-list h4 Contrib Gear p. - You can now unlock new top-tier gear and pet by contributing to HabitRPG. Read more + You can now unlock new a top-tier gear set and pet by contributing (code, art, docs, etc) to HabitRPG. Read more small.muted 11/08/2013 td .herobox(style='background-color:transparent;') @@ -30,83 +30,102 @@ div(modal='modals.newStuff') span.current-pet.Pet-Dragon-Hydra hr - h3 Archive - p - h4 11/01/2013 - ul - li Challenges! Compete with your party, guilds, or the tavern on certain tasks. Win gem prizes. Read more. - li Backend overhaul, including bookmark-able paths throughout the application. Will pave the way towards improved performance. - h4 10/22/2013 - ul - li TRICK OR TREAT! It's Habit Halloween! Some of the NPCs have decorated for the occasion. Can you spot us? - li Two gem-purchasable skin tones are now available! The Rainbow Skin Set is here to stay, but in honor of Halloween, we also have the LIMITED EDITION SPOOKY SKIN SET. You will only be able to purchase the Spooky Skin Set until November 10th, so if you want a monstrous avatar, now's the time to act! - li Do note, skins won't work on mobile until the app is updated. We'll update Android ASAP, iPhone usually takes ~1wk to approve. + h5 11/01/2013 + table.table.table-striped + tr + td. + Challenges! Compete with your party, guilds, or the tavern on certain tasks. Win gem prizes. Read more. + tr + td Backend overhaul, including bookmark-able paths throughout the application. Will pave the way towards improved performance. - h4 10/19/2013 - ul - li. - New custom skin colors are now available! Go check them out in the Profile section. Also, the new mobile update, 0.0.10, is now available to download! It includes the new skin tones and the ability to hide or show your helm, among other things. - li. - You can now sell un-wanted drops to Alex the Merchant. Trade those troves of eggs for gold! - h4 09/01/2013 - ul - li. + h5 10/22/2013 + table.table.table-striped + tr + td TRICK OR TREAT! It's Habit Halloween! Some of the NPCs have decorated for the occasion. Can you spot us? + tr + td Two gem-purchasable skin tones are now available! The Rainbow Skin Set is here to stay, but in honor of Halloween, we also have the LIMITED EDITION SPOOKY SKIN SET. You will only be able to purchase the Spooky Skin Set until November 10th, so if you want a monstrous avatar, now's the time to act! + tr + td Do note, skins won't work on mobile until the app is updated. We'll update Android ASAP, iPhone usually takes ~1wk to approve. + + h5 10/19/2013 + table.table.table-striped + tr + td New custom skin colors are now available! Go check them out in the Profile section. Also, the new mobile update, 0.0.10, is now available to download! It includes the new skin tones and the ability to hide or show your helm, among other things. + tr + td You can now sell un-wanted drops to Alex the Merchant. Trade those troves of eggs for gold! + + h5 09/01/2013 + table.table.table-striped + tr + td. We re-wrote the website from the ground up And in case you missed it, Android & iOS Apps are out! Both apps and the website are open source, and we desparately need your help porting the rest of the features, and polishing off the bugs. Read this guide to getting started. We're working on a system of Contributor Gear to reward the awesome people who help out, so stay tuned! - h4 The Rewrite! (Mid August) - ul - li. + h5 The Rewrite! (Mid August) + table.table.table-striped + tr + td. Hello my Habiteers! I have some amazing news to share with you, it's huge! Has Habit ever crashed for you? (Joke). Well we re-wrote the website from the ground up to conquor those critical bugs once and for all (more from Tyler in a bit). If you haven't seen me for a while (due to a bug in the old site), be sure to catch up with me on the right side of the screen for any missed news. Importantly: - .alert.alert-success(style='margin-bottom:5px'). - Android & iOS Apps are out! - li. + Android & iOS Apps are out! + tr + td. They're open source, so help us make them awesome. As for the rewrite: not all features are yet ported, but don't worry - you're still getting drops and streak-bonuses in the background, even if you can't see them yet. We'll be working hard to bring in all the missing features. And if you're not already, be sure to follow our updates on Tumblr (there are some fun member highlights recently). One more thing: if you are a Veteran of the old site, I have granted you a Veteran Wolf! Check your inventory :) - li. + tr + td. JavaScript developers! To me! We must finish vanquishing the old site, as not all features have been ported. We rewrote Habit on AngularJS + Express. We desparately need your help porting the rest of the features, and polishing off the bugs. Read this guide to getting started. Thanks everyone for all your support and patience! - h4 8/20/2013 - ul - li. + h5 8/20/2013 + table.table.table-striped + tr + td. Timezone + custom day start issues fixed, your dailies should now reset properly and in your own timezone. (This was vexing Android users particularly). If you're still experiencing issues, chime in here. - li - | API developers, the above means that - strong cron - | is automatically run for your users! Weee, they no longer have to log into the website to reset their dailies! - h4 8/18/2013 - ul - li. + tr + td. + API developers, the above means that cron is automatically run for your users! Weee, they no longer have to log into the website to reset their dailies! + + h5 8/18/2013 + table.table.table-striped + tr + td. The Mobile Apps are out! iOS app and Android. There's a bug with Android 2.3, follow the progress here. For more details, see our Tumblr post - li + tr + td | Hey guys! Long time no see :) We want to make sure you guys have a better idea of what's going on behind the scenes, so we're going to be releasing b weekly status reports | of what we're currently working on! This weekend, we are working hard to fix the "Not Enough GP" bug, a cruel and greedy monster that has wrapped itself around the rewards box and is refusing to let anyone purchase anything. Rest assured that our heroic Tyler will slay this beast soon! Then it wiil be full steam ahead on the new site upgrade process. a(target='_blank', href='http://habitrpg.tumblr.com/post/57627483715/news-about-upgrade-and-app') Read more about how that will work in this post here - h4 6/03/2013 - ul - li + + h5 6/03/2013 + table.table.table-striped + tr + td a(target='_blank', href='https://trello.com/card/groups-guilds/50e5d3684fe3a7266b0036d6/84') Guilds! | You can now belong to multiple groups, not just your party. There are public and private guilds, think "Subreddits" v "multiple friend groups". - h4 5/27/2013 - ul - li + + h5 5/27/2013 + table.table.table-striped + tr + td | Get the "Helped Habit Grow" badge by a(href='http://community.habitrpg.com/node/290', target='_blank') filling out this survey. - li + tr + td a(href='http://habitrpg.tumblr.com/post/51476277225/upcoming-features-bugs-update-user-survey', target='_blank') New blog post | about upcoming Guilds & Challenges features, & huge bug-fixes on the horizon. - h4 5/25/2013 - ul - li + + h5 5/25/2013 + table.table.table-striped + tr + td | Code logic migrated to a(target='_blank', href='https://github.com/habitrpg/habitrpg-shared') habitrpg-shared | . See @@ -114,87 +133,107 @@ div(modal='modals.newStuff') | , but two takeaways: (1) keep an eye out and a(href='http://community.habitrpg.com/content/submitting-bugs', target='_blank') report a problem | if you experience any issues, (2) this is going to allow for much less buggy code (read previous link for reasoning). - h4 5/12/2013 - ul - li Renamed "Tokens" to "Gems". Tokens caused confusion. - h4 5/10/2013 - ul - li + + h5 5/12/2013 + table.table.table-striped + tr + td Renamed "Tokens" to "Gems". Tokens caused confusion. + h5 5/10/2013 + table.table.table-striped + tr + td | Less harsh death: Used to be you lose everything, now you lose GP & one random gear piece, 1 level. We're working on a a(_target='blank', href='https://trello.com/card/death-mechanic/50e5d3684fe3a7266b0036d6/204') really cool death mechanic here. | , but this is a stop-gap so people don't lose heart presently. - li Chat messages: can delete your own message, fix the duplicate messages issue. - h4 5/9/2013 - ul - li + tr + td Chat messages: can delete your own message, fix the duplicate messages issue. + + h5 5/9/2013 + table.table.table-striped + tr + td a(_target='blank', href='https://trello.com/card/backer-gear/50e5d3684fe3a7266b0036d6/213') Backer Gear | : There's a new top-tier gear set for Kickstarter Backers. $45+ gets new Shield, Helm, Armor. $70+ that plus Weapon. $80+ that plus Pet. Keep leveling my friends, get that gear! Discuss gear-unlocking mechanic a(href='https://trello.com/card/backer-items-availability-mechanic/50e5d3684fe3a7266b0036d6/188', target='_blank') here | , and if you're top-gear but not seeing backer stuff, message me from your KS profile. - h4 5/7/2013 - ul - li + + h5 5/7/2013 + table.table.table-striped + tr + td a(_target='blank', href='https://trello.com/card/tags-categories/50e5d3684fe3a7266b0036d6/43') Tags | . You can now categorize your tasks, eg "Work", "Home", "Morning", "Taxes", etc. - h4 5/4/2013 - ul - li + + h5 5/4/2013 + table.table.table-striped + tr + td a(_target='blank', href='https://trello.com/card/streaks-consecutive-bonus/50e5d3684fe3a7266b0036d6/182') Streaks | . You get a GP & drop-% increase the longer you hold daily streaks (they stack). You also get a stacking badge for each 21-day streak. - h4 5/3/2013 - ul - li + + h5 5/3/2013 + table.table.table-striped + tr + td | Two new achievements: Beast Master & Ultimate Gear. Got ideas for more achievements? a(target='_blank', href='https://trello.com/card/awards-badges/50e5d3684fe3a7266b0036d6/19') chime in here - h4 5/2/2013 - ul - li + + h5 5/2/2013 + table.table.table-striped + tr + td a(target='_blank', href='https://trello.com/card/party-chat/50e5d3684fe3a7266b0036d6/267') Party Chat! | also, Tavern Chat (LFG) - li + tr + td a(target='_blank', href='https://trello.com/card/rest-in-tavern/50e5d3684fe3a7266b0036d6/14') Rest in Tavern | (basic implementation, more to come) - li - | NPCs! - a(target='_blank', href='https://twitter.com/Mihakuu') Bailey - | the Town Crier, - a(target='_blank', href='http://www.kickstarter.com/profile/523661924') Alexander - | the - a(target='_blank', href='https://trello.com/card/marketplace/50e5d3684fe3a7266b0036d6/167') Merchant - | , - a(target='_blank', href='http://www.kickstarter.com/profile/2014640723') Daniel - | the - a(target='_blank', href='http://goo.gl/FkSib') Tavern Keep - li + tr + td. + NPCs! Bailey the Town Crier, Alexander the Merchant, Daniel the Tavern Keep. + tr + td a(href='https://github.com/lefnire/habitrpg/issues/828') New "Game Options" layout | (click your avatar to see) - h4 3/27/2013 - ul - li + + h5 3/27/2013 + table.table.table-striped + tr + td | Drop system + pets overhaul ( a(href='http://www.kickstarter.com/projects/lefnire/habitrpg-mobile/posts/439433') Blog Post | | a(href='https://trello.com/card/pets/50e5d3684fe3a7266b0036d6/166') Trello Card | ) - h4 3/21/2013 - ul - li + + h5 3/21/2013 + table.table.table-striped + tr + td a(href='https://github.com/lefnire/habitrpg/issues/585') More design tweaks to header & avatars - h4 3/20/2013 - ul - li + + h5 3/20/2013 + table.table.table-striped + tr + td a(href='https://github.com/lefnire/habitrpg/issues/585') New Design - li + tr + td a(href='https://trello.com/card/toggle-helm-visible/50e5d3684fe3a7266b0036d6/153') Toggle helm visible - li + tr + td a(href='https://trello.com/card/toggle-header/50e5d3684fe3a7266b0036d6/241') Toggle Header - li + tr + td a(href='https://trello.com/card/deletable-accounts/50e5d3684fe3a7266b0036d6/69') Deletable Accounts - li + tr + td a(href='https://trello.com/card/undo-button/50e5d3684fe3a7266b0036d6/20') Undo Button - h4 3/3/2013 - ul - li + + h5 3/3/2013 + table.table.table-striped + tr + td a(href='https://trello.com/card/custom-day-start/50e5d3684fe3a7266b0036d6/15') Add custom day start .modal-footer From 8c83bc6ad2fc167a558d120e47f6917655e0f525 Mon Sep 17 00:00:00 2001 From: Tyler Renelle Date: Sat, 9 Nov 2013 09:37:31 -0800 Subject: [PATCH 11/11] challenges: "close" => "end challenge", move outside of edit --- views/options/social/challenges.jade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/views/options/social/challenges.jade b/views/options/social/challenges.jade index a24c7f1791..5811ec2cc9 100644 --- a/views/options/social/challenges.jade +++ b/views/options/social/challenges.jade @@ -22,10 +22,10 @@ script(type='text/ng-template', id='partials/options.social.challenges.detail.ht ul.unstyled li(ng-hide='challenge._locked==false') button.btn.btn-small.btn-default(ng-click='challenge._locked = false') Edit + button.btn.btn-small.btn-warning(ng-click='close(challenge, $event)', tooltip='Delete or select winner') End Challenge li(ng-show='challenge._locked==false') button.btn.btn-small.btn-primary(ng-click='save(challenge)') Save button.btn.btn-small.btn-default(ng-click='challenge._locked=true') Cancel - button.btn.btn-small.btn-default(ng-click='close(challenge, $event)', tooltip='Delete or select winner') Close div(ng-show='challenge._locked==false') .-options