sudoxreboot/habitica
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica.git synced 2026-05-25 23:25:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
304 commits 3 branches 0 tags 1.6 GiB
Commit graph

67 commits

Author SHA1 Message Date
Tyler Renelle
6d2e67fab6 Merge branch 'master' into classes 
Conflicts:
	dist/habitrpg-shared.js
	dist/spritesheets.css
	img/sprites/Egg_Sprite_Sheet.png
 2013-12-07 19:50:34 -07:00
Tyler Renelle
d7407506bc Revert "mounts: remove food temporarily. merging to master so we can run schema" 
This reverts commit bf8c0dd9dc.

Conflicts:
	dist/habitrpg-shared.js
	script/algos.coffee
 2013-12-07 11:37:01 -07:00
Tyler Renelle
deb7e83394 cleanup death handling 2013-12-07 11:30:24 -07:00
Tyler Renelle
86dae794b1 classes: death WIP (handling lose 1 gear piece, 1 stat point). This will 
need revisiting and testing
 2013-12-06 17:45:07 -07:00
Tyler Renelle
47524726ea spritesmith #37 shield_warrior_0 (aka, no shield) 2013-12-06 09:25:24 -07:00
Tyler Renelle
2a417cd201 classes: add level requirements for spells, remove derby cleanup, unlock 
classes properly
 2013-12-04 23:53:15 -07:00
Tyler Renelle
a0ea8dbca2 costumes: add costume support (supporting habitrpg#5fea978) 2013-12-04 22:50:43 -07:00
Tyler Renelle
091600d7fc classes: add _statsComputed property, and sample 
`user.stats.buffs.stealth` handling (@SabreCat @danielthebard)
 2013-12-02 19:14:29 -07:00
Tyler Renelle
f662b3af18 Merge branch 'master' into classes 
Conflicts:
	dist/habitrpg-shared.js
	dist/spritesheets.css
	script/items.coffee
 2013-12-01 19:24:40 -07:00
Tyler Renelle
9976610652 classes: armory WIP 2013-11-30 16:32:09 -07:00
Tyler Renelle
282e105ea3 [https://github.com/HabitRPG/habitrpg/issues/1057] don't exit-early when 
attempting to detect if they've switched timezones. Also, don't need to
sanitize user.lastCron in shared, do it in Mongoose
 2013-11-29 17:15:41 -07:00
Tyler Renelle
3d93f63216 classes: multi-class items WIP 2013-11-23 17:00:55 -07:00
Ruthan
c9aeb65d55 Rebalance potion ratios (version 2) 2013-11-14 20:52:24 -05:00
Ruthan
ccd39036b6 Fix drop ratios 2013-11-14 20:22:39 -05:00
Tyler Renelle
bf8c0dd9dc mounts: remove food temporarily. merging to master so we can run schema 
migration and start with item translations. This commit will be reverted
when mounts is fully merged
 2013-11-14 12:40:08 -08:00
Tyler Renelle
a52eaee62f mounts: simpler, cleaner breakdown of potion rarity 2013-11-14 12:37:34 -08:00
Tyler Renelle
ba548ed67b mounts: more item DRY-ing and cleanup 2013-11-14 12:12:49 -08:00
Tyler Renelle
69d9ebe5d3 mounts: some item-def DRYing, provide defaults rather than requiring defined 2013-11-10 19:38:06 -08:00
Tyler Renelle
1bc87f01e9 mounts: factor food into random drops (40% food, 30% eggs, 40% 
pots). This commit needs revisiting
 2013-11-10 13:25:52 -08:00
Tyler Renelle
d747559429 mounts: rewrite item definitions as objects, rather than arrays, to 
support UserSchema overhaul. Add items.food & items.mounts
 2013-11-10 13:25:13 -08:00
Tyler Renelle
317f1a9319 5482a83 add minHistLen as a parameter to preenUserHistory (with a 
default value of 7)
 2013-11-08 13:57:28 -08:00
Tyler Renelle
5482a83a00 add preen_history to user cron (see 
https://github.com/HabitRPG/habitrpg/issues/1492), to cut back on user
object sizes (and hopefully angular performance) dramatically. Start
writing tests, but they're not complete. @djuretic could you take a peak
at this? My brain is melting
 2013-11-05 17:10:31 -08:00
Tyler Renelle
084c7d3001 remove workaround 2013-11-01 13:01:38 -07:00
Tyler Renelle
a374f67549 [#1708] tmp workaround for task not defined 2013-11-01 12:43:57 -07:00
Tyler Renelle
0f621fe00b Merge pull request #30 from HabitRPG/paglias/reeset-lastdrop 
Reset lastDrop to zero when day ends
 2013-10-24 12:05:38 -07:00
Matteo Pagliazzi
9285a3e44b add streak achievements 2013-10-23 18:01:35 +02:00
Matteo Pagliazzi
607336f56e reset lastDrop to zero when day end 2013-10-22 21:45:33 +02:00
Tyler Renelle
04de115877 don't run drops on the client. they will be wiped on refresh anyway, 
only run on the server (we still need a way to notify users when a drop
happened on the server)
 2013-09-02 20:51:21 -04:00
Tyler Renelle
4174412b11 small tweaks to user._tmp, and fixing my own icon 2013-09-02 17:35:00 -04:00
Tyler Renelle
9af5d2d29b no more 'new' deafult lastCron, set it to +new Date() 2013-08-24 19:07:42 -04:00
Tyler Renelle
6aa9483a0b cron: add timezone calculation into the midst. Note: this requires user.preferences.timezoneOffset exist on the user, otherwise it will default to the script-runner timezone (which works fine if user or browser) 2013-08-20 21:40:39 -04:00
Tyler Renelle
fc3d863feb cast values to their appropriate types when running scoring functions 2013-08-15 00:00:12 -04:00
Tyler Renelle
8ae6e361b8 cleanup corrupt stats too 2013-08-14 22:58:20 -04:00
Tyler Renelle
c40ec44644 typo on corrupt task cleanup 2013-08-14 22:51:47 -04:00
Tyler Renelle
81f83be160 safeguard against NaN & null-value tasks 2013-08-13 20:27:42 -04:00
Tyler Renelle
c88fa701a5 add revive to algos.coffee, needed by apiv2 & mobile 2013-08-04 23:45:58 -04: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
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 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
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
66290274b2 cron cleanup (removing shouldCron) 2013-05-27 14:37:31 +01: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