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

806 commits

Author SHA1 Message Date
Tyler Renelle
47bd6dcb79 fix(spells): more $rootScope spell-casting bug fixes 2014-01-22 00:27:55 -08:00
Tyler Renelle
e0646bb98d fix(spells): add some spells tests, don't send up body to spell paths 2014-01-22 00:16:52 -08:00
Tyler Renelle
c6f7ab8a5c fix(spells): some $rootScope.applying action fixes so cast-ending is 
immediate instead of waiting on response. Also, slim down party
population to the essentials to avoid RequestEntityTooLarge
 2014-01-21 23:04:01 -08:00
Tyler Renelle
9e69d7959f feat(quests): add level requirement for quests 2014-01-21 17:46:17 -08:00
Tyler Renelle
ad4ca6655a feat(cheating) prevent +habit spamming with a 10s timer 2014-01-19 19:32:17 -08:00
Tyler Renelle
a1df41ad81 fix(spells): <ESC> to cancel spell-casting 2014-01-18 14:15:45 -07:00
Cole Gleason
0579c43248 fix(profile): fix bug where empty profile displayed on username click 
Due to #2396, Shared was undefined in one controller. There may be other
cases we should look out for.

Fixes #2465
 2014-01-18 01:38:09 -06:00
diablo
7179a30827 Fixed broken test for display name 2014-01-17 19:16:40 -06:00
diablo
16c38634b6 Modifies pet name to be 'Desert Wolf' rather than 'Wolf-Desert' 2014-01-16 21:42:08 -06:00
diablo
dfdccfb458 generifies article for food when feeding to pet 2014-01-16 21:34:10 -06:00
diablo
7e791158d4 Fixes misuse of food.key in modal display and instead uses the text value 2014-01-16 20:42:15 -06:00
Andrew Bloomgarden
dc368bb652 Remove references to $rootScope.Shared & .Content in non-view code. 
Instead, have them request services that return them so tests don’t need to prepare special state.
 2014-01-15 21:33:58 -08:00
Andrew Bloomgarden
77801e458e Change static module name to habitrpgStatic. 
The way the tests are written now, the habitrpg module definition in static.js
was clobbering the one in app.js. In other words, most of the tests weren't
testing what they thought they were testing.
 2014-01-15 21:33:57 -08:00
Tyler Renelle
86220f3e0e Merge pull request #2319 from HabitRPG/sabe/preferences 
Finish up @wc8 suggested user preferences: tags and Advanced Options
 2014-01-15 21:04:05 -08:00
Tyler Renelle
0ce10ef339 Merge pull request #2352 from colegleason/quest-scroll 
Allow users to purchase quest scrolls even if they haven't finished the previous quest
 2014-01-15 15:39:59 -08:00
Sabe Jones
6e821fa681 Create drop notification Growl style 2014-01-14 22:02:22 -06:00
Tyler Renelle
23d4cba3d3 start moving some directives to habitrpg-shared so mobile can use them, 
starting with markdown directive
 2014-01-13 22:15:32 -07:00
Cole Gleason
58803773d2 Allow users to purchase quest scrolls even if they haven't finished the previous quest 2014-01-10 15:43:44 -06:00
steve hiemstra
99dccc288e manual username & password input 
fixes #2295
when using browser/plugin auto-complete from what I understand certain browser events
are not emmited and thus angular never picks up the new values.

This patch adds a fallback using jQuery to set the username & password if the angular
properties are not set.

see: https://github.com/angular/angular.js/issues/1460
 2014-01-09 20:18:33 -05:00
Sabe Jones
27e9dfa0d5 Finish up @wc8 suggested user preferences: tags and Advanced Options start collapsed 2014-01-08 22:19:38 -06:00
Brandon McPhail
521653c102 Rounded critical hit percentages in notifications, e.g. 149.999998% becomes 150% 2014-01-08 15:33:36 -08:00
Brandon McPhail
77278bcffc Fixed issue where only the first markdown link in a message would open in a new tab. Now all do. 2014-01-08 15:33:36 -08:00
Cole Gleason
cdd80f11e8 Copy leave and clickLeave function for party to fix #2304. TODO: Refactor into one function? 2014-01-08 15:09:08 -06:00
Tyler Renelle
f742d3202a Merge pull request #2296 from SyntaxPickax/develop 
Fixed UI issues when editing checklists
 2014-01-07 20:22:52 -08:00
Tyler Renelle
5501969262 Merge pull request #2255 from colegleason/leave-guild-challenges 
When a user leaves a group, remove them from all group challenges
 2014-01-07 19:57:39 -08:00
Brandon McPhail
cf069cbca2 Fixed case where click on trash icon left Checklist string. Test for task.checklist[0] was unnecessary in saveTask(). 2014-01-07 12:30:47 -08:00
Brandon McPhail
07d4fc1184 Fixed UI issues when editing checklists 2014-01-07 11:55:41 -08:00
Tyler Renelle
bef4f0685e Merge pull request #2291 from HabitRPG/sabe/tweak2 
Beef up critical hit notification with its own style and icon
 2014-01-07 10:34:07 -08:00
Sabe Jones
1a92ec1748 Beef up critical hit notification with its own style and icon 2014-01-07 12:03:07 -06:00
Tyler Renelle
54c8f4bc3a Merge pull request #2288 from HabitRPG/sabe/fix 
Client side of Rebirth-related fix: don't remove Wolf Eggs upon unlock
 2014-01-07 09:49:40 -08:00
Tyler Renelle
154abcefbb #2010 Add party stats back in. Depends on habirpg-shared#939ce14 to wrap members 2014-01-07 10:46:51 -07:00
Sabe Jones
be2def91f1 Fix #2048 (streak bonuses not appearing to add up) 2014-01-07 11:14:34 -06:00
Sabe Jones
bbbc9bfe50 Client side of Rebirth-related fix: don't remove Wolf Eggs upon drops unlock if user has some already 2014-01-07 08:13:03 -06:00
Cole Gleason
b10c29f02f Fixed bug where user wasn't really removed. Changed popup depending on if user was in challenges. Fixed selectedChal typo 2014-01-06 23:06:14 -06:00
Tyler Renelle
53aa0bba59 #2245 fix tour wording from 1.5% => 50% class stat bonus 2014-01-06 21:26:55 -07:00
Tyler Renelle
f539108b39 Merge pull request #2275 from colegleason/streak-modal 
Don't show Streak achievement modal on Fix Character Values if it was undefined
 2014-01-06 19:59:14 -08:00
steve hiemstra
fd56c17518 work on #2183 resize checklist items 
such that they resize dynamically; however the text will still not wrap
due to the fact that it is an input.
 2014-01-06 21:21:01 -05:00
Cole Gleason
eb9db5b612 Don't show Streak achievement modal on Fix Character Values if it was previously undefined 2014-01-06 16:43:56 -06:00
Tyler Renelle
f6e6d115ac chat: add +1 (like) to messages. @snicker does views/options/social/chat-message.jade flag you for any performance issues which should be optimized with bindonce? (I'm still a bit of a bo-noob) 2014-01-05 22:12:02 -07:00
Tyler Renelle
eb5a9150ab hall: use infinite-scroll to load patrons, since there are so many 2014-01-05 19:51:33 -07:00
Tyler Renelle
a5db8628e2 hall: start moving admin stuff to hall-of-heroes / hall-of-patrons, so everyone can see contribs / backers 2014-01-05 19:19:34 -07:00
Tyler Renelle
e474278ab3 groups: upon group-creation, creator is automatically assigned as leader 
and only member. Remove sending up leader & members from the client,
should all be handled on the server
 2014-01-05 15:08:10 -07:00
Sabe Jones
7904b8e4db Clear up some confusion caused by AngularJS number filter 2014-01-05 09:32:20 -06:00
Cole Gleason
744d8a6780 When a user leaves a group, remove them from all group challenges 2014-01-04 20:05:48 -06:00
Tyler Renelle
3a5eda1e98 Merge remote-tracking branch 'origin/sabe/attributes' into develop 
Conflicts:
	views/shared/footer.jade
 2014-01-04 16:02:22 -07:00
Dušan Juretić
f854d2d022 Use $window on inventoryCtrl, so it can be mocked on tests 2014-01-04 00:01:29 -03:00
Tyler Renelle
c9e083b602 challenges: add "official habitrpg challenge" option 2014-01-03 13:36:13 -07:00
Cole Gleason
f218a52bf2 Add Critical Hit notification by watching user._tmp.crit 2014-01-02 13:41:50 -06:00
Tyler Renelle
7f3b6a4470 Merge pull request #2209 from benblank/pet-alignment 
Fix (apparent) misalignment of paws on pets/mounts grids
 2014-01-01 20:14:44 -08:00
Tyler Renelle
c5ed6917fe Merge pull request #2210 from benblank/popover-shadows 
Prevent popover shadows from being clipped/overlapped
 2014-01-01 20:13:05 -08:00
Sabe Jones
a9e57a8adf Merge branch 'develop' into sabe/attributes 2014-01-01 12:42:53 -06:00
Ben Blank
56613910f0 prevent popover shadows from being clipped/overlapped 2013-12-31 14:58:47 -08:00
Ben Blank
32d1ff68b4 fix apparent misalignment of paws on pets/mounts grids 2013-12-31 14:34:24 -08:00
Tyler Renelle
09eddd3eb2 checklists #2198 click badge to collapse checklist @sabrecat 2013-12-31 14:03:16 -07:00
Sabe Jones
be38029015 Extend notification time, fix MP alerts 2013-12-31 10:29:48 -06:00
Tyler Renelle
928f7cfdd7 Merge remote-tracking branch 'origin/sabe/rebirth' into develop 
Conflicts:
	src/models/user.js
	views/shared/modals/index.jade
 2013-12-31 08:04:51 -07:00
Tyler Renelle
01ecc616f6 Merge branch 'checklists' into develop 2013-12-31 07:53:34 -07:00
Sabe Jones
9c5f1c2150 Add debug button to hand out levels one at a time 2013-12-30 22:56:01 -06:00
katfang
7205221b86 Minor Text Update to Class Tour 
Spells now happen at level 11 rather than 6.

Reflects change from https://github.com/HabitRPG/habitrpg/issues/2096
 2013-12-30 17:26:44 -05:00
Tyler Renelle
c7dde3cde1 checklists: add CL up/down keyboard nav 2013-12-30 13:42:19 -07:00
Tyler Renelle
1110338b9b checklists: handle backspacing an empty CL item 2013-12-30 13:19:42 -07:00
Tyler Renelle
ebc7cf6bcb checklists: better handling of saveTask, keypress:13, and remove-blur 2013-12-30 12:56:26 -07:00
Tyler Renelle
968b091ccd checklists: checklist as <li> instead of <label>, so that inline-editing 
doesn't trigger checkmark. Unfortunately means we need to replicate some
bootstrap css
 2013-12-30 10:33:48 -07:00
Tyler Renelle
1ace999cb7 Tasks: add double-click to edit, and date-picker-popup for 
due-dates. Show red dates when overdue (basic)
 2013-12-30 10:33:48 -07:00
Tyler Renelle
74c905f1e1 checklists WIP 2013-12-30 10:33:17 -07:00
Tyler Renelle
6f0046dffc Revert b4ff7d4 b20a3b7 . Temporarily remove 
todo-filter. This brings back the big performance issue of always
displaying completed-todos, but fixes #2180 #2189. See #2180 for
discussion.
 2013-12-30 10:19:57 -07:00
Tyler Renelle
61dfb8d129 Merge pull request #2086 from HabitRPG/sabe/tweak2 
Remove sliding effect on avatar mouseover
 2013-12-29 16:19:09 -08:00
Tyler Renelle
e9cb9b8a9f task-icons: larger emoji in task text than chat 2013-12-29 01:24:02 -07:00
Tyler Renelle
b4ff7d4be4 #1499 check that task[0] exists first 2013-12-29 00:33:58 -07:00
Tyler Renelle
b20a3b7381 #1499 add list filter on tasks to not display completed todos at all 
until "completed" tab clicked
 2013-12-29 00:14:46 -07:00
Tyler Renelle
34a955665c Merge pull request #1986 from Magnilucent/develop 
Fixes #1959: petCount was only being updated...
 2013-12-28 21:15:32 -08:00
Tyler Renelle
49d76e1649 fix #2147 put removeMember back in 2013-12-28 12:54:53 -07:00
Tyler Renelle
e863d5927a Merge pull request #2138 from HabitRPG/sabe/tweak4 
Remove padding from <li> when used in Markdown
 2013-12-27 07:53:52 -08:00
Tyler Renelle
13e1792685 Merge pull request #2123 from HabitRPG/sabe/tweak3 
Fix #2072 (add Mana delta alerts)
 2013-12-27 07:53:12 -08:00
Tyler Renelle
f9d858c588 Merge pull request #2118 from HabitRPG/sabe/drops 
Minimal fix for #2092
 2013-12-27 07:48:00 -08:00
Sabe Jones
f3798c0bc8 Remove padding from <li> when used in Markdown 2013-12-27 08:56:55 -06:00
Sabe Jones
601af6ddc0 Make better use of space for customizations and Market 2013-12-26 07:56:01 -06:00
Sabe Jones
3074cc8f16 Fix #2072 (add Mana delta alerts) 2013-12-26 07:31:00 -06:00
Sabe Jones
e5b8a92ea2 Minimal fix for #2092 2013-12-25 23:56:51 -06:00
Sabe Jones
f38b8e41af Final commit for Rebirth feature! Implement achievement and prestige icon 2013-12-25 17:56:55 -06:00
Tyler Renelle
83817ec2ee bosses: add extra notes about losing quest scroll on abort 2013-12-25 11:20:38 -07:00
Tyler Renelle
44e89d1be7 bosses: misc small bugs 2013-12-25 00:55:38 -07:00
Tyler Renelle
f8559b1762 bosses: pretty things up amongst the modals, etc. Move rewards to a 
directive so we can share it. Add dialog on quest-completion using
user.party.quest.completed flag
 2013-12-24 23:30:48 -07:00
Tyler Renelle
094989db13 quests: add collection quests, incl. polar bear pt 2, and quest arks, and achievements 2013-12-24 17:24:09 -07:00
Sabe Jones
3b94b18bb6 Implement Rebirth in controllers and API, revise modal per @wc8 feedback 2013-12-24 18:09:32 -06:00
Tyler Renelle
ae403a55a5 quests: add abort feature 2013-12-23 02:56:55 -07:00
Tyler Renelle
8095397317 Quests: hurt boss via score method, refactor chat function, change all content.*.name to content.*.key for consistency 2013-12-23 01:19:18 -07:00
Tyler Renelle
ecb354e2cc Quests: initial Bosses WIP - invite, accept, reject, etc 2013-12-22 17:46:54 -07:00
Sabe Jones
485209ed74 Remove sliding effect on avatar mouseover 2013-12-22 12:20:35 -06:00
Sabe Jones
60c622f1c1 Initial commit: unlock notification, new modals 2013-12-22 08:32:39 -06:00
Tyler Renelle
61245e31b8 update justin guide re: todos adding 1MP 2013-12-21 18:50:18 -07:00
Tyler Renelle
181bc7f0d1 add justin notif on int bonus for restored MP 2013-12-21 15:22:20 -07:00
Tyler Renelle
8b8f385fff winter: make bailey head more visible with holiday gear (remember to 
revert this after 1/31!)
 2013-12-20 23:14:08 -07:00
Tyler Renelle
bf699ca466 Merge branch 'winter' into develop 2013-12-20 21:59:54 -07:00
Tyler Renelle
58195d9eeb #2012 preventDefault as well as stopPropagation. This will preven the 
checkbox from getting checked, which may not be desirable, but at least
 prevents the bug for now
 2013-12-20 19:57:03 -07:00
Tyler Renelle
a4ba5b036f save user on spell-cast (so we don't get second mp loss notif) 2013-12-20 18:52:14 -07:00
Tyler Renelle
676112c1b5 winter event! npcs, snowball=>snowman, new hairs/beards. Fixes to beard/chin overlays. move Fortify Service => "Fortify Potion" Special. @sabrecat let me know what you think: http://gyazo.com/55cd424f104b8f3acb557b99d918cb4b). Sorry for mixing concerns in this commit, some rebase difficulties 2013-12-20 10:26:23 -07:00
Tyler Renelle
f4fca98bd1 fix #2058 double-task deletion 2013-12-19 21:45:52 -07:00
Tyler Renelle
06ee34c09b fix #2040 - $rootScope.moment = window.moment. Fixes to applying spell 2013-12-17 23:08:41 -07:00
Tyler Renelle
04df61fb53 fix #2030, immediately "fulfill" spell cast, don't wait for server response 2013-12-17 19:33:36 -07:00
Tyler Renelle
41cc6ff3bc fix #2032 - add button to show classes tour, mention 10pt/day mp regen 2013-12-17 19:22:21 -07:00
Tyler Renelle
d03a996946 classes: very simple "buffs applied" icon next to level, add chat message 
for party / member casts (@wc8 @sabrecat)
 2013-12-17 19:16:31 -07:00
Tyler Renelle
03c4a04ff5 classes: better-positioned justin 2013-12-17 17:24:14 -07:00
Tyler Renelle
c059cebdd1 Merge pull request #2027 from muncus/develop 
fix typo in Auto Allocate guide.
 2013-12-17 16:16:07 -08:00
Tyler Renelle
8833a4495d classes: much better justin guide which starts with 
equipment (and *shows* that you still have it), and *then* goes to
through the class system details (@wc8)
 2013-12-17 17:12:39 -07:00
Marc Dougherty
0bd61b90a9 fix typo in Auto Allocate guide. 2013-12-17 15:56:17 -08:00
Tyler Renelle
2efc0972d6 cleanup some inventory tabs. now it's inventory > drops, pet, mounts, equipment 2013-12-17 16:51:27 -07:00
Tyler Renelle
87f4a1d204 #2017 add ability to opt out of classes entirely (@wc8) 2013-12-17 16:44:46 -07:00
Tyler Renelle
ceea1b5909 #2008 add option to disable sticky header 2013-12-17 14:04:38 -07:00
Tyler Renelle
3b02717271 #2008 #2020 fixes to justin popovers so they don't go funky with sticky.js 2013-12-17 13:47:44 -07:00
Tyler Renelle
d2a460769d #2008 #2020 use jquery.sticky instead of bootstrap affix 2013-12-17 13:41:13 -07:00
Tyler Renelle
a79baba45c fix #2016 (grammar) 2013-12-17 12:02:11 -07:00
Tyler Renelle
2b7730b6e3 fix #2007 resotore MPfix restore mp 2013-12-17 09:17:41 -07:00
Tyler Renelle
949cd97b91 fix(#2003) healer gear not showing 2013-12-16 22:50:44 -07:00
Tyler Renelle
4650e2f592 classes: timeout on justin. would prefer of $state.go() had a callback param 2013-12-16 21:16:32 -07:00
Tyler Renelle
ee3e7c2032 [#1990] Spelling updates 2013-12-16 16:28:46 -07:00
Tyler Renelle
91f5da7989 [#1994] dismiss alert fix 2013-12-16 15:43:16 -07:00
Tyler Renelle
b908581473 [#1994] fix "can't add task to challenge" 2013-12-16 15:38:40 -07:00
Tyler Renelle
302340bee2 [#1997] classes: add MP to restore dialog (@wc8 you might find this useful) 2013-12-16 13:38:23 -07:00
Tyler Renelle
5251b4ce3c classes: add just guide for classes unlock 2013-12-16 13:33:05 -07:00
Tyler Renelle
7c2e803475 classes: charge gems for class-change 2013-12-16 11:47:55 -07:00
Tyler Renelle
a7100b6606 classes: cast URL fix 2013-12-16 00:18:50 -07:00
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
b9f8ae3f62 move userServices.js to habitrpg-shared, so mobile can share the code 2013-12-15 21:28:59 -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
Magnilucent
376e977238 Fixes #1959: petCount was only being updated... 
in groupsCtrl.js. This made profile.petCount blank unless the current
user viewed himself in chat. I put the code to set profile.petCount into
userCtrl.js.

Note: petCount (not profile.petCount) is still always equal to the
current user's pet count. There is probably a better solution than this,
I just don't know enough about AngularJS to make it.
 2013-12-14 02:38:08 -05:00
Tyler Renelle
6ae14cc42f classes: misc fixes 2013-12-13 21:53:42 -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
caa2f26003 [#1977] [#1616] move sortTask to user.ops 2013-12-12 17:32:54 -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
a3d2e59033 Merge pull request #1971 from Xatres/develop 
Updated Beginner's Tour, Mk 5
 2013-12-08 16:55:45 -08:00
Xatres
af82ff520c Updated Beginner's Tour, Mk 5 
Fixed Wiki link (double quotes --> single quotes)
 2013-12-08 18:59:38 -05:00
Tyler Renelle
542c72c95c Merge pull request #1957 from Xatres/develop 
Updated Beginner's Tour
 2013-12-08 09:01:11 -08: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
Xatres
8283eca0d4 Updated Beginner's Tour, Mk 4 
Added link to HabitRPG wiki.
 2013-12-08 09:54:36 -05: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
e367985fa8 window.env not available on frontpage, @paglias is this an ok workaround? 2013-12-07 11:56:22 -07:00
Tyler Renelle
59f8727cbf classes: small tweaks 2013-12-07 11:31:11 -07:00
Xatres
2d6fb91273 Updated Beginner's Tour, Mk 3 
Quickfix to changed "sex" to "body type," in anticipation of coming customization updates.
 2013-12-07 11:59:08 -05: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
Xatres
d2a0fb073f Updated Beginner's Tour, Mk 2 
Fixed issues proposed by SabreCat, including gender neutral language, general terminology, and adding a note about unlockable features at the end.
 2013-12-06 15:46:39 -05: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
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
Sabe Jones
469a1e5e12 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-12-05 21:50:47 -06: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
88c64a6f80 classes & grunt-spritesmith: NPCs habitrpg-shared#85164c9 2013-12-04 16:52:06 -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
Xatres
a28327410e Updated Beginner's Tour 
As requested by SabreCat, I've done some editing on the Beginner's Tour. Mostly I just flesh out the guide to how the game works and try to contextualize everything on the page with the user avatar. If we implement these changes, there may need to be a few edits to the starting task descriptions to prevent overlap.

Definitely check to make sure I didn't mess up any of the coding. I'm a writer, not a programmer.
 2013-12-02 19:01:17 -05:00
Nick Gordon
aa133cc5c6 removes line on li elements in markdown, fixes #1951 2013-12-02 15:37:09 -08: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
Tyler Renelle
7200ab16f4 thanksgiving: back to normal 2013-11-30 10:25:51 -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
Nick Gordon
1d03fee4e3 change reference to images directory for emoji, fixes #1935 2013-11-27 20:46:18 -08: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
Matteo Pagliazzi
bdf32325f6 remove emoji css from manifest and move into index.styl 2013-11-27 16:19:56 +01: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
13a7292377 emoji works, huzzah. addresses #681, #1840, and some discussion in #1908 2013-11-26 21:49:53 -08: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
Matteo Pagliazzi
2e8fc8d248 use script tag not eval to execute moment language code 2013-11-25 17:04:07 +01:00
Matteo Pagliazzi
17c97308f3 stable, pets row 100% width 2013-11-25 16:50:51 +01:00
Matteo Pagliazzi
d1698460e0 add momentjs translations, @lefnire this is a little cumbersome, the language is set server-side & momentjs languages are js functions so we can either load another javascript file in the browser or we can load the file content in window.env and execute it with eval which is what is used now. If you do not like this then feel free to revert the commit. It is useful for example for chat messages date and I will also add it to the repeat schedule so that we it is localized too 2013-11-24 21:45:24 +01:00
Nick Gordon
f4323ddc24 markdown links in chat will now open in a blank window. 
* added `target` attribute for the markdown directive to specify. default behavior is `_self`.
 2013-11-24 10:32:51 -08:00
Matteo Pagliazzi
fa2fb8e3fb open named links in new window, @snicker this will not work for links auto detected by marked, we should override this piece of code https://github.com/chjj/marked/blob/master/lib/marked.js#L578 but i am not sure it is possible to do without overriding the whole function 2013-11-24 17:49:12 +01:00
Nick Gordon
0e7c7e439f images shown with markdown now link to themselves in an external browser window 2013-11-23 19:33:41 -08:00
Nick Gordon
aa91d21189 Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2013-11-23 17:39:19 -08:00
Nick Gordon
38225896f4 fix for https://github.com/HabitRPG/habitrpg/issues/1860 change tags to scroll horizontally rather than stack floating left 2013-11-23 17:37:20 -08:00
Tyler Renelle
e9467dc466 Merge pull request #1896 from Fandekasp/party_members_order 
Party members order
 2013-11-23 16:52:31 -08:00
Nick Gordon
b793d2b753 fix for https://github.com/HabitRPG/habitrpg/issues/1900 2013-11-23 16:45:14 -08:00
Nick Gordon
2604d8e21e fix for https://github.com/HabitRPG/habitrpg/issues/1903 2013-11-23 16:20:34 -08:00
Tyler Renelle
83e3a6aff2 classes WIP 2013-11-23 16:59:41 -07:00
Adrien Lemaire
47cf0eb07d add npc color, update leader background 2013-11-24 10:49:33 +11:00
Tyler Renelle
c5a42cbf5a Merge pull request #1899 from Fandekasp/header_colors 
change avatars lvl colors
 2013-11-23 13:12:36 -08:00