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

232 commits

Author SHA1 Message Date
Tyler Renelle
616cf41017 MOBILE_APP on static, deep-watch user.items.gear.equipped 2013-12-15 23:17:09 -07:00
Tyler Renelle
07a27d1c22 use updateStore outside of user.fns (habitrpg-shared#5d39056) 2013-12-15 22:38:08 -07:00
Tyler Renelle
259f9033c4 APIv2: add paths /api/v2/* and /api/v1/*. v1 has limited deprecated routes (only the things I know currently work), and we'll notify 3rd-partyists to migrate to apiv2 once it's documented and tested 2013-12-15 17:54:34 -07:00
Tyler Renelle
91e1287d06 APIv2: some finalization of APIv2. Add new routes, re-rigg 
query/param/body requirements. This overhauls the API pretty
substantially, so we'll indeed be moving this to apiv2, using v1 for the
old API, and limiting it's use substantially
 2013-12-15 16:53:06 -07:00
Tyler Renelle
d0b07ba4db apiv2: move tags to apiv2 (remove from client/server, move to Shared.ops) 2013-12-15 14:16:04 -07:00
Tyler Renelle
12cc6f51eb classes: reposition inventory, fix saddle confirm dialog, gems & food tweaks 2013-12-15 13:25:19 -07:00
Tyler Renelle
774775de7a fixes: appliedTags, add moment to rootScope (repeat i18n issues). Also, 
discard the sync-queue if errors were detected. Previously, if an op
triggered server error, the op is still in the queue and will keep
trying. Thus, in-browser user is corrupt - they'll need to logout /
clear localStorage. This *should* fix that, while still allowing the
sync-queue to build up when offline (status appears to == 0 in those
cases). @paglias just FYI - should be good, but wanna loop you in just
in case.
 2013-12-15 12:11:25 -07:00
Tyler Renelle
bc0034f022 apiv2 handle notifications circular-dependency. migration 
fixes. Rest=>Sleep fixes
 2013-12-15 10:57:53 -07:00
Tyler Renelle
26697546e8 classes: header z-index:100, generalized shop_money classes, only show 
owned gear if == true
 2013-12-14 11:34:41 -07:00
Tyler Renelle
d2121a8587 fix(classes) misc fixes 2013-12-13 17:08:25 -07:00
Tyler Renelle
478be61113 fix(classes) misc class fixes (not @snicker, ng-if on item store since 
we dynamically swap it sometimes)
 2013-12-12 20:03:32 -07:00
Tyler Renelle
6b0a6692ff [#1977] misc fixes 2013-12-12 17:38:01 -07:00
Tyler Renelle
dc63eff41d [#1977] move sleep & clear-completed to user.ops 2013-12-12 16:59:53 -07:00
Tyler Renelle
d4e0ae85a0 [#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:58:17 -07:00
Tyler Renelle
ee1cd3c05d [#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:57 -07:00
Tyler Renelle
76565384d3 Merge branch 'classes' into develop 
Conflicts:
	public/js/controllers/tasksCtrl.js
	views/shared/modals/settings.jade
 2013-12-08 18:17:53 -07:00
Tyler Renelle
c524972aa2 Merge pull request #1952 from HabitRPG/sabe/tweak 
Tweaks from Sabe
 2013-12-08 08:50:37 -08:00
Tyler Renelle
4d3a359d6b fixes to sabe/tweak #1952 @SabreCat (put gems inline with fortify 
button, remove reroll from store)
 2013-12-08 09:46:30 -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
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
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
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
ad0c953d0a classes: misc spell-casting fixes, support party spells 2013-12-05 11:05:47 -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
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
Sabe Jones
30a5b349f8 Fix #1909 (keep stack selected after selling item) 2013-12-01 10:16:21 -06:00
Tyler Renelle
91c141140d classes: armory WIP 2013-11-30 16:33:21 -07: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
Matteo Pagliazzi
a196cc0586 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-27 15:59:02 +01:00
Nick Gordon
86f62ac2b2 fix for #1920, again. this is very 'un-angular' but it *actually* works. the proper way to do this is make a directive for 'userlevel' or something and have that apply the proper styles 2013-11-26 14:56:24 -08:00
Tyler Renelle
2b128f71f4 [#1532] add better validation on preferences.dayStart, and a migration to 
cleanup corrupt ones
 2013-11-26 15:18:20 -07:00
Matteo Pagliazzi
860a084c69 fix for multiple guilds creation 2013-11-26 20:16:10 +01:00
Matteo Pagliazzi
c4e8de2ee0 fix language switching 2013-11-25 17:34:41 +01:00
Tyler Renelle
e9467dc466 Merge pull request #1896 from Fandekasp/party_members_order 
Party members order
 2013-11-23 16:52:31 -08:00
Tyler Renelle
83e3a6aff2 classes WIP 2013-11-23 16:59:41 -07:00
Matteo Pagliazzi
1dfd3b8b05 remove code moved in previous commit 2013-11-23 17:45:03 +01:00
Matteo Pagliazzi
df5a436338 use countPets also for stats, fix #1898 2013-11-23 17:42:47 +01:00
Adrien Lemaire
b36a288f04 add sort by date joined option 2013-11-23 22:06:22 +11:00
Adrien Lemaire
dcd0e7e95b add setting in Social→Party→Members 2013-11-23 21:59:58 +11:00
Adrien Lemaire
5579030d20 party.order set and cases added 2013-11-23 21:18:33 +11:00
Adrien Lemaire
be4691cf58 sort by level 2013-11-23 16:21:43 +11:00
Matteo Pagliazzi
e722a064c8 revert drop notification change 2013-11-22 20:11:35 +01:00