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

581 commits

Author SHA1 Message Date
Tyler Renelle
75b966bda4 [https://github.com/HabitRPG/habitrpg/issues/1994] fixes to purchasing shirts 2013-12-16 15:59:46 -07:00
Tyler Renelle
41c2218976 [https://github.com/HabitRPG/habitrpg/issues/1994] fix TigerCub not appearing 2013-12-16 15:37:58 -07:00
Tyler Renelle
ce04027802 classes: fixes & balancing of spells 2013-12-16 12:54:46 -07:00
Tyler Renelle
64db3041da classes: add .3*PER to chanceMultiplier in drops. Add .5+(.05*STR) to 
crits (.03 chance) This is a temporary until we get all the numbers worked out. @SabreCat
 2013-12-16 11:47:06 -07:00
Tyler Renelle
953e062cbe classes: charge gems for change-class 2013-12-16 11:25:59 -07:00
Tyler Renelle
b055b2d9a4 classes: replenish 10MP on cron 2013-12-16 11:11:47 -07:00
Tyler Renelle
49ba74f9bd classes: add maxMP to statsComputed [https://github.com/HabitRPG/habitrpg/issues/1994] 2013-12-16 11:09:03 -07:00
Tyler Renelle
e6d684ed7a show message when buying items 2013-12-16 00:34:48 -07:00
Tyler Renelle
58a2f2de67 move updateStore back outside of user.fns. It's causing issues there, 
need to investigate
 2013-12-15 22:37:40 -07:00
Tyler Renelle
5d390561d2 move userServices.js to habitrpg-shared, so mobile can share the code 2013-12-15 21:29:28 -07:00
Tyler Renelle
2b92ced77a Merge remote-tracking branch 'origin/sabe/classes' into develop 
Conflicts:
	script/content.coffee
 2013-12-15 18:24:52 -07:00
Tyler Renelle
c8a3c8ce9e APIv2 some finalization of apiv2. Re-rigging some query/params vars, and bug-fixes 2013-12-15 16:52:08 -07:00
Tyler Renelle
7e8ae43958 apiv2: move tags (update, delete, create) to Shared.ops 2013-12-15 14:02:15 -07:00
Tyler Renelle
ab27840a61 mark task*tags as modified (since Schema.Types.Mixed) 2013-12-15 13:23:27 -07:00
Tyler Renelle
786061d116 classes: fixes to two-handed handling 2013-12-15 11:26:13 -07:00
Tyler Renelle
63765ec013 classes: rogue tree = knife*4 > chuck > katana > hook. alas that we were 
pressed for time, we can revisit later. Edit starter rogue details for
content.coffee
 2013-12-14 23:42:31 -07:00
Tyler Renelle
f939ca7d8e customizations: rename skins for more political correctness (see https://trello.com/c/YKXmHNjY/306-customization-redo) 2013-12-14 15:29:30 -07:00
Tyler Renelle
ab7e05b19c bug fix subtractPoints() for hp modification 2013-12-14 13:19:48 -07:00
Tyler Renelle
6a107db7a3 death: notify users of broken item 2013-12-14 13:01:13 -07:00
Tyler Renelle
2d23803207 classes: use predictable randomness. This allows us to run an op on both 
client and server, and if randomness is involved (eg, item drops,
critical hits, losing gear/stats on death) - then it will be equivalent
on both client and server, while still seeming "random". This is
required for the new death mechanic. Kudos to @snicker for providing the
predictableRandom() function. @paglias we can probably stop using _.tmp
now, and simply flag on the client when user drops an item / streak
bonus. @SabreCat this will be used for crits, I'll keep you posted
 2013-12-14 12:49:37 -07:00
Tyler Renelle
8a5c46da2b classes: fix item & stat loss on death bugs 2013-12-14 11:33:11 -07:00
Tyler Renelle
adc7b7f6a6 [https://github.com/HabitRPG/habitrpg/pull/1969] move armor_base_0_* to 
shirt_*, special handling under user.preferences.shirt. Removed
stray pixels to bottom left.
 2013-12-14 00:27:19 -07:00
Tyler Renelle
31fec0c173 fixes: unlock, task.history, customizations 2013-12-13 22:58:48 -07:00
Tyler Renelle
bf52efa2ca classes: add a second grunt-spritesmith pass which creates 
.customize-options.SPRITE_NAME to resize buttons as 60x60 & reposition
the sprite. This seems pretty dirty because the images are parsed twice,
@paglias let me know if you think there's a better way
 2013-12-13 21:48:23 -07:00
Tyler Renelle
9142bba779 classes: add level-up stat point & auto-allocation handling 2013-12-13 17:50:09 -07:00
Tyler Renelle
2f8b4c552b classes: refactor score function. Merge all separate functions into the 
score function (I'll do something for unit tests, they were just too
scattered). Factor in the new passive-stats (STR, PER, INT,
CON). They're not formalized, just starters. @SabreCat :)
 2013-12-13 17:07:57 -07:00
Tyler Renelle
15826f3722 start moving scoring functions from module.exports to user.fns. Will want to clean this up & optimize 2013-12-13 15:12:41 -07:00
Tyler Renelle
cb20776858 classes: migrate priority from !,!!,!!! to Number (prep for passive stats) 2013-12-12 20:40:20 -07:00
Tyler Renelle
5fd7ff9bbf migrate flags.rest => preferences.sleep 2013-12-12 20:23:32 -07:00
Tyler Renelle
6d0a2ad5b3 fix(classes) misc class fixes 2013-12-12 19:29:27 -07:00
Tyler Renelle
98be57a82c [#1977] misc fixes 2013-12-12 17:38:19 -07:00
Tyler Renelle
2956ae0462 move sortTask to user.ops 
[https://github.com/HabitRPG/habitrpg/issues/1977] [https://github.com/HabitRPG/habitrpg/issues/1616]
 2013-12-12 17:32:02 -07:00
Tyler Renelle
a5bf3440c8 [https://github.com/HabitRPG/habitrpg/issues/1977] move sleep & 
clear-completed to user.ops
 2013-12-12 17:00:42 -07:00
Tyler Renelle
ab5bd6d5af [https://github.com/HabitRPG/habitrpg/issues/1977] port pet-feeding to 
user.ops, so that it's now available in the API. Also add handling of
200 errors to simply notify and continue on up to server (friendly messages)
 2013-12-12 15:57:01 -07:00
Tyler Renelle
954cdf7f29 [https://github.com/HabitRPG/habitrpg/issues/1977] APIv2 WIP - start of a framework where operations are shared between client & server. If the op is called on the client, it updates the user & then POSTs to the server with op of the same name. If called on server, it updates the user and user.save()s 2013-12-11 21:42:05 -07:00
Tyler Renelle
9bee4b9f9e Merge branch 'master' into develop 2013-12-08 22:57:18 -07:00
Tyler Renelle
1144752f52 remove reroll from items.coffee 2013-12-08 19:02:50 -07:00
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
1ec0dc12b3 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 20:09:45 -05: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
acae9c36fe classes spritesmith #37 move from using *_warrior_0 for all "blank" 
items, to *_base_0. Any left-over {type}_{class}_0 now are
significant (eg, weapon_*_0, as well as shield_rogue_0). This is
necessary for proper traversing up/down class shop, and allows for
completely random item deletions on death.
 2013-12-06 15:41:11 -07:00
Tyler Renelle
41da82ff57 classes: add twoHanded attr on weapons (@sabrecat easy-peasy) 2013-12-06 11:45:30 -07:00
Tyler Renelle
47524726ea spritesmith #37 shield_warrior_0 (aka, no shield) 2013-12-06 09:25:24 -07:00
Tyler Renelle
665166507e classes: move item-store sorting from web to shard (so we can share with 
mobile)
 2013-12-05 18:19:39 -07:00
Tyler Renelle
ba6e416e4d 300-tier: support buying 300 tier (see http://goo.gl/qDCmX6) (FYI @danielthebard @SabreCat) 2013-12-05 16:13:56 -07:00
Tyler Renelle
b5c928238b grunt-spritesmith #37 contributor pet 2013-12-05 15:56:47 -07:00
Tyler Renelle
617d29b3fb classes: support buying special gear (backer, contrib, etc) from item store 2013-12-05 15:48:13 -07:00
Tyler Renelle
69d248f826 grunt-spritesmith #37 backer & contrib spritesheets support 2013-12-05 15:46:08 -07:00
Tyler Renelle
ee4777d5e8 classes spritesmith #37 remove chin outlines from helms so they won't 
cover beards. move head_warrior_0 to head_0 so it doesn't add
extra chin outline. We'll need to figure out how to handle class_0 for
each class
 2013-12-05 10:46:27 -07:00
Tyler Renelle
9ce88004cb classes spritesmith #37 rogue knife weapon/off-hand shop-sprites 2013-12-05 10:10:10 -07:00
Tyler Renelle
3c68bd90da classes & spritesmith [#37] fixes to top 3 rogue helms 2013-12-05 09:49:56 -07:00
Tyler Renelle
4818c0a830 classes: temporarily switch rogues to knives instead of bows, revisit 
this commit - incomplete
 2013-12-05 03:46:11 -07:00
Tyler Renelle
e7c7ab099e spritesmith [#37] @crystalphoenix BEARDS! 2013-12-05 02:27:43 -07:00
Tyler Renelle
7c6d2cfe31 classes spritesmith [#37] add shop 300-tier items 2013-12-05 02:04:03 -07:00
Tyler Renelle
1fd63c00c1 grunt-spritesmith [#37] add initial shop-sprites (these may need adjusting) 2013-12-05 01:34:07 -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
80eb0f564a spritesmith [#37] fixes to shop-sprites 2013-12-04 23:09:45 -07:00
Tyler Renelle
a0ea8dbca2 costumes: add costume support (supporting habitrpg#5fea978) 2013-12-04 22:50:43 -07:00
Tyler Renelle
b74f4905f9 [#37]grunt-spritesmith: re-organize folders 2013-12-04 20:01:37 -07:00
Tyler Renelle
8aa89b8ee4 [#37]grunt-spritesmith: add 300-tier (@lemoness) 2013-12-04 20:01:35 -07:00
Tyler Renelle
94603fa0ca [#37]grunt-spritesmith: NPCs (this is a big one!) 2013-12-04 20:01:33 -07:00
Tyler Renelle
417986c6b4 [#37]grunt-spritesmith: shop sprites 2013-12-04 20:01:29 -07:00
Tyler Renelle
0f3f67b6b3 [#37]grunt-spritesmith: death & paws 2013-12-04 20:01:27 -07:00
Tyler Renelle
7dd4216b0f [#37]grunt-spritesmith: death 2013-12-04 20:01:25 -07:00
Tyler Renelle
3026cc2132 [#37] grunt-spritesmith: achievements 2013-12-04 20:01:14 -07:00
Tyler Renelle
9c135482a2 [#37] classes: move m/f => broad/slim, add those body-types in, fix hair positioning 2013-12-04 20:00:50 -07:00
Tyler Renelle
6c927414d1 grunt-spritesmith: eggs, food, hatchingPotions, gems #37 2013-12-03 18:43:08 -07:00
Tyler Renelle
dbd7aaf4c4 classes: spritesmith add pets 2013-12-03 17:58:37 -07:00
Tyler Renelle
5ebf3a7802 classes: spritesmith wip #37 2013-12-03 16:49:54 -07:00
Tyler Renelle
c46795e7a5 classes: grunt-spritesmith WIP #37 (working for male sprites now) 2013-12-03 16:32:20 -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
bf7f7b6583 [#1057] use sanitized o.dayStart, not options.dayStart. slightly better sanitize(dayStart) 2013-11-29 16:47:08 -07:00
snicker
671c130512 Merge pull request #45 from snicker/master 
suggested fix for adding "special" pets
 2013-11-28 13:45:40 -08:00
Nick Gordon
9b0eea6624 grunted 2013-11-28 13:42:29 -08:00
Tyler Renelle
73d8e00406 thanksgiving turkey & npcs 2013-11-27 11:58:19 -07:00
Tyler Renelle
3d93f63216 classes: multi-class items WIP 2013-11-23 17:00:55 -07:00
Tyler Renelle
1ef6bb18a8 classes WIP 2013-11-21 10:15:44 -08:00
Tyler Renelle
d98257812f build 2013-11-20 15:16:07 -08:00
Matteo Pagliazzi
ec1681fce4 add countPets helper 2013-11-18 16:07:23 +01:00
Matteo Pagliazzi
7c5818c876 build 2013-11-17 22:34:49 +01:00
Matteo Pagliazzi
4547417d62 build, export moment & lodash as helpers (to be used in $rootScope) 2013-11-17 13:27:50 +01:00
Tyler Renelle
ecd7a32974 Merge pull request #40 from therufs/fix-rarity 
Fix drop ratios
 2013-11-14 20:37:02 -08: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
30b19b5e7d pets: add adjectives (@SabreCat) 2013-11-14 14:05:44 -08: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
d124968273 mounts: add egg.mountText so "cub" text doesn't show up for mounts 2013-11-14 11:49:37 -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
d1cc6a3dd7 mounts: fix spritesheets for rare mounts to work with mount system 2013-11-10 14:36:02 -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
fd4e54ef84 mounts: fix up spritesheets mount system 2013-11-10 13:22:44 -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
761887da18 contrib: move equipped() helper to items.coffee, use a more robust 
method of determining which item is available in the store, and which
items i can legally equip. It's a bit wild, I think we should find a
different approach
 2013-11-07 13:11:35 -08:00
Tyler Renelle
54229ee406 contrib: update css to accomodate new contributor only store & equipment (@Shaners could you take a peek at the css positioning issues in backer.css?) 2013-11-07 13:10:41 -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
8e38aa1332 better task defaults, since we may not be able to use Mongoose 
TaskSchema (see http://goo.gl/a5irq4)
 2013-11-02 11:11:28 -07:00
Matteo Pagliazzi
8503c37fde compile & upgrade browserify for grunt-browserify 2013-11-02 09:55:18 +01:00
Tyler Renelle
f785621da4 grunt for task defaults issue 2013-11-01 13:27:08 -07:00
Tyler Renelle
1bfb6a88fd Merge remote-tracking branch 'shaners/rewrite' 
Conflicts:
	dist/spritesheets.css
 2013-10-29 23:15:03 -07:00
Tyler Renelle
91c1bd2ddb challenges: remove derby stuff 2013-10-28 09:13:18 -07:00
Shane Lister
c05430aecc Update spritesheets.css 2013-10-27 19:15:33 -07:00
Matteo Pagliazzi
72bf5d7073 Merge branch 'rewrite' of https://github.com/HabitRPG/habitrpg-shared into rewrite 2013-10-27 12:13:26 +01:00
Matteo Pagliazzi
d7416117f9 award ultimate gear achievement 2013-10-27 12:13:06 +01:00
Shaners
8fed3f5c5a Add contributor-only pet - Hydra 2013-10-26 18:17:44 -07:00
Tyler Renelle
04048e9768 [#30] grunt 2013-10-24 12:12:13 -07:00
Tyler Renelle
e84b1975a9 add hair to customizer options & run grunt 2013-10-24 10:56:15 -07:00
Shaners
212a4206c6 Added red hair option. Fixed a few minor pixel grid alignment issues 2013-10-23 23:50:11 -07:00
Matteo Pagliazzi
79e0d5cba2 upgrade browseridy to 2.34.x and grunt build 2013-10-23 18:25:41 +02:00
Tyler Renelle
2ca7b27503 add inline for gems 2013-10-22 19:23:27 -07:00
Tyler Renelle
06e489dfc5 halloween: consolidate customizer button css. was duplicated bw mobile & 
web, copy into habitrpg-shared, remove from those projects, remove regex
css selectors (they weren't working), add crazy & monster skins
 2013-10-22 16:05:20 -07:00
Tyler Renelle
f9c2fce4aa halloween: male sprites 2013-10-22 14:46:44 -07:00
Tyler Renelle
d7482fedc5 halloween: add Crazy Skin & Halloween Skin for female sprites 2013-10-22 14:32:26 -07:00
Tyler Renelle
b0ebeb8c2c grunt build 2013-10-21 10:25:27 -07:00
meaganoff
46bc1545d1 hopefully fix for apparent ios7 issue 2013-10-20 19:34:53 -05:00
Shaners
a5c7578e6d Adds new skin tones 2013-09-24 21:56:08 -07:00
Tyler Renelle
fc23bdb7c8 fixes to dotSet & dotGet which allow getting / setting deep paths that don't exist 2013-09-17 13:45:30 -04:00
Matteo Pagliazzi
ae4f3a6481 order css files & rebuild 2013-09-13 21:09:32 +02:00
Tyler Renelle
1e9ef6d2e2 re-build. was getting revive errors for some reason 2013-09-04 15:49:39 -04:00
Matteo Pagliazzi
da70845b94 build 2013-09-04 13:10:44 +02:00
Tyler Renelle
516f947d9b fail-safe dotSet for now until I can figure out what's triggering the error 2013-09-03 22:03:36 -04:00
Matteo Pagliazzi
fd9fee93e1 change some paths, js file size reduced by around 400kb 2013-09-03 17:08:22 +02:00
Tyler Renelle
76afd47953 build with new changes 2013-09-02 21:40:45 -04:00
Matteo Pagliazzi
bd7adda005 add zzz light version and classes 2013-08-30 10:19:13 +02:00
Tyler Renelle
d29f267425 move browserify step to Grunt instead of Make (for consistency). Build files now in dist/ as dist/habitrpg-shared.js & dist/spritesheets.css 2013-08-26 22:09:02 -04:00