Commit Graph

48 Commits

Author SHA1 Message Date
Tyler Renelle cafcde01ec bug fixes: don't allow dotSet/Get on undefined paths, remove @hydrate
from derbyUserToAPI()
2013-08-11 12:18:58 -04:00
Tyler Renelle 6b56067668 add some derby-specific routes that are required by the new api, upgrade
lodash so we can use _.transofrm
2013-08-10 23:30:17 -04:00
Tyler Renelle c88fa701a5 add revive to algos.coffee, needed by apiv2 & mobile 2013-08-04 23:45:58 -04:00
Tyler Renelle 4df34095aa Merge branch 'develop' 2013-08-04 22:32:41 -04:00
Sabe Jones 07907ae28f Remove misleading "one day" from egg drop text
Pouring a potion on an egg hatches the pet instantly. Until such time as that feature is changed, I've removed the "one day" from the relevant string.
2013-07-31 16:19:16 -05:00
Tyler Renelle dab72e5865 cap items to maximum in their array, in case the user manually entered
a number larger than the max allowed item in the "restore" modal
2013-07-24 16:45:48 -04:00
Tyler Renelle a5eb64f771 Merge branch 'master' of github.com:HabitRPG/habitrpg-shared 2013-07-12 16:56:47 -04:00
Tyler Renelle 2bb5ad43e0 require items, algos, helpers locally instead of via index.js 2013-07-12 16:32:28 -04:00
yangit 68e8819c21 Merge remote-tracking branch 'remotes/upstream/master' 2013-06-26 09:56:29 +07:00
yangit 014f2df5c7 remove buying rewards for health (you can buy for money only) 2013-06-26 09:52:40 +07:00
Tyler Renelle 7bb95795c7 Merge branch 'develop' 2013-06-20 20:39:13 -04:00
Tyler Renelle 6bf0305ea4 fixed the empty helpers issue. it was circular dependencies - algos
dep'd helpers, helpers dep'd algos. Since one came first, it didn't
have the other - so it was an empty object. maybe this top-level
index.js combinging ./script/* files isn't such a good idea, because I
think manual requires from within a file will resolve circular
dependencies @yangit
2013-06-18 21:40:43 -04:00
Tyler Renelle 6998fb70f3 export all scripts into top-level index.js, so that coffeeify includes
can import these properly. Hopefully this fixes the empty helpers bug.
@yangit I'll merge this into master once I'm sure it works
2013-06-18 18:21:27 -04:00
yangit f6750ffc16 fix for confirmation window when buying rewards w\o money. 2013-06-14 15:07:18 +08:00
Tyler Renelle 06a2989d3b Revert "change to require('./index.js') as per https://github.com/HabitRPG/habitrpg-shared/commit/002d4f9541ca531955be611f7c0fc2ba813f18ea"
This reverts commit 6ca82b2443.
2013-06-04 12:51:33 -04:00
Tyler Renelle 6ca82b2443 change to require('./index.js') as per https://github.com/HabitRPG/habitrpg-shared/commit/002d4f9541ca531955be611f7c0fc2ba813f18ea 2013-06-04 12:41:50 -04:00
Tyler Renelle 9e7a02ef78 Merge branch 'master' of github.com:HabitRPG/habitrpg-shared 2013-06-03 14:45:37 -04:00
Shane Lister de73086f56 Update algos.coffee
Increase egg drop percentage by 10 decrease potion percentage by 10.
2013-06-03 11:03:12 -06:00
Tyler Renelle ac74cb0d74 challenges: new party invitation setup 2013-05-28 17:32:31 +01:00
Tyler Renelle 4e7233f100 Merge branch 'master' into challenges 2013-05-27 14:44:52 +01:00
Tyler Renelle fe86a11854 Merge branch 'master' of github.com:HabitRPG/habitrpg-shared 2013-05-27 14:38:24 +01:00
Tyler Renelle 66290274b2 cron cleanup (removing shouldCron) 2013-05-27 14:37:31 +01:00
Tyler Renelle 41da6c2162 pull in taskClasses changes for the website challenges branch 2013-05-26 15:22:49 +01:00
Brandon McPhail 8f6fe2456a Enforced Shield -> Reinforced Shield
Renamed.
2013-05-26 00:29:31 -06:00
Tyler Renelle 002d4f9541 very strange bug here. If called form the API, require() statements
sometimes return blank objects, but only when required from within
habitrpg-shared - i can require the files directly from the API just
fine. Doesn't help however since habitrpg-shared has dependencies on
itself. @yangit any thoughts?
2013-05-25 19:34:45 +01:00
Tyler Renelle 51a80b6626 some bug-fixes on shouldDo() for today-check 2013-05-25 18:26:07 +01:00
Tyler Renelle c4e18b5f04 tests: first pass at cron tests 2013-05-25 16:53:35 +01:00
Tyler Renelle 85eb6789ac update daily.value when checked off, not on cron. Better for
testability, and I'm not sure why I was doing it the other way before?
2013-05-25 15:22:04 +01:00
Tyler Renelle f5b7968132 tests: all the simple scoring test, getting ready for the complex cron
stuff.
2013-05-25 15:03:03 +01:00
Tyler Renelle 6e4f1a40f8 fixes #1036 2013-05-24 18:54:39 +01:00
Tyler Renelle d293f7415f always pass paths in options{} for consistency, and that way we can add extra uncommon params to the options{} param without needing to pass paths param 2013-05-24 16:12:25 +01:00
Tyler Renelle 30f4f091a4 add newUser to helpers, will be needed when creating new users on mobile 2013-05-24 11:31:32 +01:00
yangit ef9ec0cc22 Coffeeify plugin for browserify to compile .coffee into browser.js. 2013-05-24 13:29:04 +08:00
Tyler Renelle 4a3e8fdcfa backer tier bug fix 2013-05-23 19:41:28 +01:00
Tyler Renelle f0f68ce5d1 bug fix to todos v cron 2013-05-23 17:33:04 +01:00
Tyler Renelle a8ab98f99a not on instant-use potion 2013-05-22 11:14:59 +01:00
Tyler Renelle 93b629c901 algos bug fixes 2013-05-22 11:03:32 +01:00
Tyler Renelle abb1c7947b fix shouldCron bug 2013-05-22 00:36:43 +01:00
Tyler Renelle 9882e70026 add shouldCron so we can test before running cron 2013-05-20 10:56:55 +01:00
Tyler Renelle 7805a2ba26 fix bugs, add paths method to cron. Now mostly works with the website 2013-05-20 00:51:50 +01:00
Tyler Renelle c0cf9780fe use the path-setting method to notify derby of things that model must change 2013-05-19 23:23:06 +01:00
Tyler Renelle ad9c1940a9 re-jig all algos.coffee. add in changes I made in the recent past, put cron back in (why was this removed altogether??), fix some bugs 2013-05-19 23:22:37 +01:00
Tyler Renelle d42ac5d53c helpers.coffee now working with the website 2013-05-19 18:52:13 +01:00
Tyler Renelle 1feb209c24 Moving back to the Browserify method of concat'd JS files, which will
then be exposed to the browser as a global. This was decided between
@yangit and me, as we found RequireJS to be too painful to setup for
our use case. This Browserify + Global works just fine for us, and it
fits perfectly as require() statements in our node.js backend
2013-05-19 18:01:01 +01:00
yangit 28aa7d2e4f Requred items.js from algos.coffee We do not need to pass items{} to scoring function anymore.
Alogos are still BROKEN. I'm deploying them here for testing.
2013-05-15 21:59:01 +08:00
yangit 15c2dc3497 Boilerplate added to helpers.js to be able to include it properly.
Alogos are still BROKEN. I'm deploying them here for testing.
2013-05-15 14:33:12 +08:00
yangit ffdf279ee1 Require.js example expanded.
Helpers.js\moment.js included.
Alogos are still BROKEN. I'm deploying them here for testing.
2013-05-15 14:17:53 +08:00
yangit ff8721b4a3 Require.js example.
Alogos are still BROKEN. I'm deploying them here for testing.
2013-05-15 13:27:17 +08:00