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

3685 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tyler Renelle
714dad6e91 classes: small bug fixes 2013-12-07 20:41:48 -07:00
Tyler Renelle
f8f8a1334b Merge branch 'develop' into classes 
Conflicts:
	views/options/inventory/stable.jade
 2013-12-07 20:23:26 -07:00
Tyler Renelle
a85baa2725 groups: send down full user.items for party / guilds. It's not that much 
really, and trying to keep it up-to-date with ever-evolving
UserSchema.items is a pain (eg, needed to add mounts)
 2013-12-07 19:53:50 -07:00
Tyler Renelle
46f91db14c Mounts: prevent feeding special pets 2013-12-07 13:54:19 -07:00
Tyler Renelle
8f75b84b42 mounts: bugfix to drop notif for food 2013-12-07 12:17:03 -07:00
Tyler Renelle
680f0e974e mounts: bailey notif 2013-12-07 11:56:34 -07:00
Tyler Renelle
e367985fa8 window.env not available on frontpage, @paglias is this an ok workaround? 2013-12-07 11:56:22 -07:00
Tyler Renelle
79e8b2f4a5 Revert "mounts: temporarily remove mounts code from views. merging to master so" 
This reverts commit d245c87f29.
 2013-12-07 11:34:53 -07:00
Tyler Renelle
59f8727cbf classes: small tweaks 2013-12-07 11:31:11 -07:00
Tyler Renelle
c51cdd0849 classes: proper handling of items on class-switch, un-equipping items, 
etc. Paves way for item-loss on death. See habitrpg-shared#acae9c3
 2013-12-06 15:41:58 -07:00
Matteo Pagliazzi
9b459e37f3 fix siteVerion check & reload page after batchUpdate if needed, @lefnire let me know what do you think and if it needs to be applied to other routes too 2013-12-06 21:43:25 +01:00
Matteo Pagliazzi
524796ba25 send only one momementjs language 2013-12-06 21:29:13 +01:00
Matteo Pagliazzi
c30934bc96 add force refresh middleware & add to batchUpdate 2013-12-06 21:16:22 +01:00
Tyler Renelle
b852d9a9f2 classes #943 more general solution to two-handed weapons habitrpg-shared#41da82f 2013-12-06 11:46:07 -07:00
Tyler Renelle
8216828514 classes #943 reroll sets you on your new class's item track. Handling of two-handed staves 2013-12-06 10:51:23 -07:00
Tyler Renelle
3e5c213694 classes armory: separate gear listings by class type, show selected gear 2013-12-06 09:26:02 -07:00
Tyler Renelle
7f1892b34a classes: move item-store sorting from web to shard (so we can share with 
mobile) habitrpg-shared#6651665
 2013-12-05 18:20:09 -07:00
Tyler Renelle
b9845aec4a classes: fixes to buying special-gear & regular gear habitrpg-shared#ee4777d 2013-12-05 15:48:50 -07:00
Tyler Renelle
e5c34af7fd grunt-spritesmith contrib gear habitrpg-shared#69d248f 2013-12-05 15:47:08 -07:00
Tyler Renelle
ad0c953d0a classes: misc spell-casting fixes, support party spells 2013-12-05 11:05:47 -07:00
Tyler Renelle
5fd378ebed classes: fixes to beard / chin overlap 2013-12-05 11:05:36 -07:00
Tyler Renelle
80e97a71ed classes: misc fixes 2013-12-05 09:52:41 -07:00
Tyler Renelle
2563ec5763 classes: beards & mustaches! 2013-12-05 03:31:02 -07:00
Tyler Renelle
dde0655900 classes: fixes to class-selection & reroll, remove show/hide gear since 
we're using costumes
 2013-12-04 23:53:55 -07:00
Tyler Renelle
62d50a1f4d classes: fixes to buying items 2013-12-04 23:10:14 -07:00
Tyler Renelle
5fea978e6b costumes: add costume support in inventory 2013-12-04 22:50:20 -07:00
Tyler Renelle
decaa2867b classes: misc fixes. start a running migration file (add to, or add notes as we go along) 2013-12-04 17:50:40 -07:00
Tyler Renelle
88c64a6f80 classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9 2013-12-04 16:52:06 -07:00
Tyler Renelle
8803df46c0 classes & grunt-spritesmith: death, paws, gems-cleanup 2013-12-04 16:02:08 -07:00
Tyler Renelle
55d0a0a94d classes: fix customizations based on habitrpg-shared#9821a88 2013-12-04 15:09:56 -07:00
Tyler Renelle
350e3681d7 classes: grunt-spritesmith fixes 2013-12-03 18:51:19 -07:00
Tyler Renelle
19b6eb73e0 Merge branch 'develop' into classes 
Conflicts:
	public/css/index.styl
	src/models/user.js
	views/options/profile.jade
	views/shared/header/avatar.jade
	views/shared/tasks/lists.jade
	views/shared/tasks/task.jade
 2013-12-02 18:24:33 -07:00
Nick Gordon
aa133cc5c6 removes line on li elements in markdown, fixes #1951 2013-12-02 15:37:09 -08:00
Tyler Renelle
91c141140d classes: armory WIP 2013-11-30 16:33:21 -07:00
Tyler Renelle
1000796ddd Merge pull request #1946 from theyliveforever/develop 
Spanish translation revised
 2013-11-30 13:22:49 -08:00
Tyler Renelle
7200ab16f4 thanksgiving: back to normal 2013-11-30 10:25:51 -07:00
Andrea
2cd35472fc Update app.json 2013-11-30 00:07:39 -02:00
Nick Gordon
9bb4e2c272 update userschema to use specialPets from habitrpg-shared https://github.com/HabitRPG/habitrpg-shared/pull/45 2013-11-29 09:06:13 -08:00
Nicole Foster
e7373b173d JP translation fixes 2013-11-29 09:05:16 +11:00
Nicole Foster
20d7651a66 Some JP translations 2013-11-29 09:04:57 +11:00
Nick Gordon
5b610bfc5c small fix for sanity 2013-11-27 22:48:48 -08:00
Nick Gordon
62aeb7087a fixes #1936. petCount was only being calculated for the current user, not for the profile being displayed. This data should probably be calculated in the model rather than in a controller 2013-11-27 21:22:15 -08:00
Nick Gordon
1d03fee4e3 change reference to images directory for emoji, fixes #1935 2013-11-27 20:46:18 -08:00
Tyler Renelle
63e44062b4 thanksgiving: newstuff too 2013-11-27 11:59:07 -07:00
Tyler Renelle
7c20988c41 Merge branch 'thanksgiving' into develop 2013-11-27 11:53:18 -07:00
Tyler Renelle
db5befb570 thanksgiving turkey & npcs 2013-11-27 11:50:18 -07:00
Tyler Renelle
962b854f87 Merge remote-tracking branch 'origin/sabe_tweak' into develop 
Conflicts:
	views/options/social/tavern.jade
 2013-11-27 11:28:31 -07:00
Tyler Renelle
caaebe01a2 re: d3eed22 , migration to fix 0'd dayStarts (@paglias, thanks for the fix!) 2013-11-27 10:53:47 -07:00
Tyler Renelle
68bb5993c9 Merge pull request #1925 from bobbyroberts99/patch-1 
Update Contributing.md
 2013-11-27 08:26:18 -08:00
Matteo Pagliazzi
44401a9162 add emoji.js file to tests, fix travis build 2013-11-27 16:28:09 +01:00