Commit graph

70 commits

Author SHA1 Message Date
Tyler Renelle
0d2f9c9314 Merge pull request #11 from SabreCat/patch-1
Remove misleading "one day" from egg drop text
2013-07-31 15:34:23 -07: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
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
Tyler Renelle
06a2989d3b Revert "change to require('./index.js') as per 002d4f9541"
This reverts commit 6ca82b2443.
2013-06-04 12:51:33 -04:00
Tyler Renelle
6ca82b2443 change to require('./index.js') as per 002d4f9541 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
Tyler Renelle
d040680ca1 Merge pull request #10 from Shaners/master
Increase egg drop rate, reduce potion drop rate
2013-06-03 10:24:06 -07: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
yangit
244842618b recompiled sources for browser 2013-05-29 12:33:57 +08: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
Tyler Renelle
5afe1d9cc1 Merge pull request #7 from SyntaxPickax/master
Spelling: Enforced Shield -> Reinforced Shield
2013-05-26 02:54:23 -07: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
12ef6edf8d tests: add checked-test for dailys 2013-05-25 18:05:31 +01:00
Tyler Renelle
caf6981550 tests: refactored to a cron-matrix so we can come up with some complex combinations 2013-05-25 18:01:03 +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
ca665d334a tests: get rid of some old useless ones, add in 1-day for dailys 2013-05-24 16:24:18 +01:00
Tyler Renelle
5a2540ec10 test: todos - one day missed 2013-05-24 16:12:55 +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
be670dcb04 start adding mocha tests, based on the old user.mocha.coffee 2013-05-24 14:28:57 +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
c7f8626040 Coffee sourceMaps! 2013-05-24 15:03:20 +08: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
7f486d8b3c ignore .idea 2013-05-19 18:06:32 +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
Yan
3d6aec94a7 Merge pull request #6 from yangit/master
Coffescript all over!
2013-05-16 19:33:38 -07:00
yangit
6c7bb7d4ab CS all the way! 2013-05-17 10:30:19 +08:00
Yan
e586b8bde5 Merge pull request #5 from yangit/master
readme.fix
2013-05-15 07:09:44 -07:00
yangit
d3cf80ec02 readme.fix
Alogos are still BROKEN. I'm deploying them here for testing.
2013-05-15 22:08:35 +08:00
Yan
a3e8ed78b3 Merge pull request #4 from yangit/master
items.js
2013-05-15 07:01:59 -07: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