Commit graph

2604 commits

Author SHA1 Message Date
Tyler Renelle
955c2841ea tests: get rid of user.mocha.coffee, now it's in habitrpg-shared 2013-05-25 18:29:42 +01:00
Tyler Renelle
c894f87310 habitrpg-shared: fix cron to work with habitrpg-shared d293f74 2013-05-24 18:49:18 +01:00
Tyler Renelle
467741570a pet selection bug fix with lodash (_.findWhere => _.find), fixes #902 2013-05-24 12:25:32 +01:00
Tyler Renelle
62c9e45e2e habitrpg-shared: use newUser from shared helpers instead of in character.coffee 2013-05-24 11:34:17 +01:00
Tyler Renelle
3ed2412f87 habitrpg-shared: bug fix in API 2013-05-23 18:35:32 +01:00
Tyler Renelle
9e2c9045c5 habitrpg-shared: move task.score => misc.score so api can use it too 2013-05-23 17:35:24 +01:00
Tyler Renelle
32cf11b533 use lodash in tests for consistency 2013-05-23 17:34:27 +01:00
Tyler Renelle
fee39a8b7e habitrpg-shared: add streakBonus back in 2013-05-23 17:00:54 +01:00
Tyler Renelle
69e1f991b7 habitrpg-shared: put drops back in 2013-05-23 16:53:13 +01:00
Tyler Renelle
73fe8ebfdd fix preen_cron 2013-05-23 15:06:42 +01:00
Tyler Renelle
60a4ce5888 update find_unique_user to use lodash 2013-05-23 14:40:34 +01:00
Tyler Renelle
77e37804e8 habitrpg-shared: bug fixes on hydrate() 2013-05-22 13:57:10 +01:00
Tyler Renelle
258cf55abb fix int() view helper (restore streak) 2013-05-22 11:30:17 +01:00
Tyler Renelle
1596808c25 move everything to lodash, since we're using it for other things
anyway (cloneDeep, findIndex, etc). make sure to return `true`
explicitly after all _.each functions! if you accidently return
false (happens more often than you'd think), it kills the loop. As a
result, I'm using .forEach() native function where i can for
simplicity, but many of our _.each iterate object keys
2013-05-22 11:29:24 +01:00
Tyler Renelle
a31eb184a2 habitrpg-shared: don't forget the package req! 2013-05-22 11:27:16 +01:00
Tyler Renelle
5a25244096 Merge branch 'habitrpg-shared' into develop
Conflicts:
	src/app/helpers.coffee
	src/app/items.coffee
2013-05-22 11:13:27 +01:00
Tyler Renelle
598f2f6c46 habitrpg-shared: don't cloneDeep our user object for the time being. we can't access __proto__ objects as a result (see https://github.com/codeparty/racer/issues/116), the negative side-effect is this cause certain notifications not to show, because model.on() listeners can't tell the difference between $spec object properties & model.get() 2013-05-22 11:08:05 +01:00
Tyler Renelle
2230ce6688 habitpg-shared: move viewHelpers to misc, add hydrate() function (see https://github.com/codeparty/racer/issues/116) to prevent data-loss on user.get() 2013-05-22 00:40:54 +01:00
Tyler Renelle
bc49e4668c only show restore-streak on dailies 2013-05-21 14:39:23 +01:00
Tyler Renelle
ff2fedda48 add ability to restore lost streaks, also add int() view helper
function (pretty cool actually, https://groups.google.com/forum/?fromgroups#!topic/derbyjs/otFCLu2p7yY)
2013-05-21 14:33:31 +01:00
Tyler Renelle
e21bc9869d Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-21 12:57:40 +01:00
Tyler Renelle
cc097c32f7 clean up of preen_cron, which I'm re-enstating 2013-05-21 12:54:06 +01:00
Philip How
b77a62e915 Merge pull request #1002 from MrConcept/master
Merge Master
2013-05-20 11:09:37 -07:00
Philip How
105087c823 Removes +4 Gems on Reset exploit 2013-05-20 19:52:37 +02:00
Tyler Renelle
f412a20203 habitrpg-shared: cron bug-fixes 2013-05-20 10:56:38 +01:00
Tyler Renelle
5776bec545 Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-20 10:28:49 +01:00
Tyler Renelle
ed057799a3 put coin_single_[silver|gold].png back in (thought we weren't using
anymore, i was wrong)
2013-05-20 10:27:53 +01:00
Stan Lindsey
9c173e3a08 HP potion description clarify.
People getting confused about its use.
2013-05-20 11:08:04 +02:00
Slappybag
d870325169 Margin on Buttons for #996 & 128eb8a 2013-05-20 09:59:36 +01:00
Tyler Renelle
83ac2adb79 habithabitrpg-shared: cron mostly working wiht habitrpg-shared 7805a2ba26 2013-05-20 01:15:33 +01:00
Tyler Renelle
0b445df909 habitrpg-shared: *almost* working wth new scoring (c0cf9780fe) - need to fix for cron, API, and other misc bugs 2013-05-19 23:50:41 +01:00
Tyler Renelle
128eb8adb7 tavern: add submit bug / feature buttons up top, fixes #996 2013-05-19 20:43:48 +01:00
Tyler Renelle
6a36f4bd1d habitrpg-shared: helpers now working d42ac5d53c 2013-05-19 18:53:13 +01:00
Tyler Renelle
5d1368e794 habitrpg-shared: got items working (see 1feb209c24) 2013-05-19 18:01:50 +01:00
Tyler Renelle
6a6a75edda Merge branch 'develop' of github.com:lefnire/habitrpg into develop 2013-05-19 15:02:50 +01:00
Tyler Renelle
ae4c5723e0 chat: allow admins to remove other people's messages 2013-05-19 15:02:04 +01:00
Tyler Renelle
9b46805452 Merge pull request #989 from Shaners/develop
Bacon Bacon
2013-05-18 01:09:05 -07:00
Shane Lister
5cff970947 Bacon Bacon
Putting some bacon into the tavern NPC graphic. The people demand bacon.
2013-05-17 16:42:26 -07:00
Shane Lister
081b5be657 Merge pull request #17 from lefnire/develop
Update my Develop
2013-05-17 16:36:30 -07:00
Tyler Renelle
e7558139e6 challenges: require challenge title, when user subscribe add new tag of challenge name. unsubscribe deletes tasks 2013-05-18 00:09:52 +01:00
Tyler Renelle
9b41712ca6 challenges: fix to not apply user's active tags to new challenge
tasks, but also not apply filters except to main user's list
2013-05-17 23:32:24 +01:00
Tyler Renelle
6507795d99 challenges: prevent some task options (such as scoring, check-marking,
tags, etc) for challenge edits
2013-05-17 20:59:29 +01:00
Tyler Renelle
0a291bf892 challenges: add challenge.id to task so we can get the icon-bullhorn 2013-05-17 14:06:27 +01:00
Tyler Renelle
ae8a283d0e challenges: chevron in collapsing title 2013-05-17 14:06:27 +01:00
Tyler Renelle
57f51048a1 challenges: basics for challenge subscription 2013-05-17 14:06:27 +01:00
Tyler Renelle
b8ef0789df challneges: semi-functional challenge creation for parties 2013-05-17 14:06:27 +01:00
Tyler Renelle
5ea6e55e11 challenges: add assignTo option on challenge-creation 2013-05-17 14:06:27 +01:00
Tyler Renelle
d28edaf30d challenges: list taken dynamically from scope so we can push/unshift to various task lists depending on location of add-task form. be careful with this commit, not the {{}} instead of {} - seems to be required otherwise things get weird 2013-05-17 14:06:27 +01:00
Tyler Renelle
0a37637daf challenges: fix up lists to use new list templates 2013-05-17 14:06:26 +01:00
Tyler Renelle
836787906d bstart building challenges 2013-05-17 14:06:26 +01:00