63a8bf63cb
Merge pull request #5664 from HabitRPG/sabrecat/death-modal
...
Kinder, gentler death
2015-07-24 14:36:33 -07:00
3adb315184
feat(death): Release candidate
...
Version to push live for end user feedback. (Pardon the merge conflict garbage included in prior commit; rerunning spritesmith sorted it out!)
2015-07-24 16:24:14 -05:00
d022a0eb67
Merge branch 'develop' into sabrecat/death-modal
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith0.png
common/dist/sprites/spritesmith2.png
common/dist/sprites/spritesmith3.css
common/dist/sprites/spritesmith3.png
common/dist/sprites/spritesmith4.css
common/dist/sprites/spritesmith4.png
2015-07-24 16:11:51 -05:00
4c316cab72
Merge pull request #5591 from crookedneighbor/analytics-service-server-side
...
Analytics service - server side
2015-07-24 15:28:24 -05:00
fca6f91f13
Merge branch 'develop' into analytics-service-server-side
2015-07-24 15:19:31 -05:00
dc26e1680c
Merge pull request #5661 from HabitRPG/sabrecat/mystery
...
July 2015 subscriber goodies
2015-07-24 12:29:07 -07:00
4ea5e0c71a
Update newGroup spec helper
2015-07-24 14:03:44 -05:00
f6bc929ddd
Refacor how spec factory overrides works
2015-07-24 11:38:52 -05:00
65c2f5c9d5
fix(death): Gentler wording
2015-07-23 17:08:00 -05:00
c8982b3513
fix(analytics): Track intro tour steps 1-2
2015-07-23 15:07:37 -05:00
d32d05e873
feat(mystery): July 2015 goodies
...
Also makes the mystery box opening notification translatable and adds item graphics to it.
2015-07-23 12:05:13 -05:00
bfd56b35e1
Revert armoire counting code back to old system
...
@TODO: work out why it's hpapening and unpend test for new system
2015-07-23 08:43:08 -05:00
c3e2b92546
add all the files I forgot to add for https://github.com/HabitRPG/habitrpg/commit/02cccb01ef1ade15b4eba816148314726e2efb30 (blank placeholder image for collection quests, partial fix for #4936 )
2015-07-23 13:58:38 +10:00
36a082f4ef
chore(i18n): update locales
2015-07-22 21:51:17 -05:00
d8434a5512
chore(i18n): update locales
2015-07-22 21:24:10 -05:00
8a363efc43
Merge branch 'develop' into TheHollidayInn-pet-actions-esc-to-cancel
2015-07-22 17:59:50 -05:00
f876988cb9
Merge pull request #5642 from crookedneighbor/refactor_member_modal_and_stats_page
...
Refactor member modal and stats page
2015-07-22 17:46:57 -05:00
c41271e558
Merge branch 'develop' into refactor_member_modal_and_stats_page
2015-07-22 17:39:39 -05:00
7b9102c88c
Move gear counting to counting script
2015-07-22 17:37:35 -05:00
f40cfd2b66
Move all pet counting to shared count scripts
2015-07-22 17:32:12 -05:00
0f1c92184c
chore(news): iOS update Bailey
2015-07-22 15:42:35 -05:00
c61eccaaba
Removed if statements and fixed style issues
2015-07-22 15:38:17 -05:00
7d622792a8
Merge pull request #5635 from HabitRPG/sabrecat/quests-page
...
Improve quest drop notification
2015-07-22 10:28:16 -07:00
6d52f842ff
fix(quest): Move party jump to cb
2015-07-22 11:52:15 -05:00
de30d6bf0c
chore(i18n): update locales
2015-07-22 07:41:49 -05:00
02cccb01ef
add blank placeholder image for collection quests that don't have quest box artwork - partial fix for https://github.com/HabitRPG/habitrpg/issues/4936
2015-07-22 20:48:06 +10:00
107e27a2c6
Deselect food, egg, and potion when hitting the escape key
2015-07-21 21:52:29 -05:00
063e53b0ea
Added function to count pets that are actually owned
2015-07-21 20:14:15 -05:00
20660f50c0
Add count function for remaining items in gear set
2015-07-21 18:06:07 -05:00
0313170921
feat(quests): Invite party button
2015-07-21 15:25:34 -05:00
5789f22320
WIP(death): Draft with decal
2015-07-21 14:39:08 -05:00
0039a17366
WIP(death): More display tweaks
2015-07-21 13:57:13 -05:00
73e1764413
Move beast/mount master counts to separate file
2015-07-21 08:13:50 -05:00
c286d08bc8
WIP(death): New death modal
2015-07-20 16:24:05 -05:00
632faafa4f
fix(quests): Refactoring
...
Based on feedback from @crookedneighbor and @gisikw. Removes double ternary in the block that normalizes the item type string, and reverts the notification logic to if/else if format instead of switch/case. Also removes a block of commented-out code once used for death notifications.
2015-07-20 14:17:35 -05:00
65c14b1e3f
Refactor inventory ctrl variables
2015-07-20 12:51:10 -05:00
3d40da4004
Remove countPets and countMounts from codebase
2015-07-20 08:11:00 -05:00
610f7faa5c
Add test for count beast/mount master progress
2015-07-20 08:04:03 -05:00
2695419182
Use better beastMaster / mountMaster counts
2015-07-19 21:51:30 -05:00
3643d11d97
Refactor pet and mount count into one method
2015-07-19 20:56:14 -05:00
aee37b2a0e
Swap out pet and mount count with stat calc functions
2015-07-19 20:40:15 -05:00
89bfc83b95
Organize stat functions alphabetically
2015-07-19 20:19:16 -05:00
11f56d491c
Remove close button from menu
...
Closes #3820
2015-07-19 19:08:48 -05:00
1fb068d06d
Update test for new quest name
2015-07-19 10:17:03 -05:00
054d884154
Merge branch 'develop' into analytics-service-server-side
2015-07-19 10:13:34 -05:00
16c6647b34
Bump version number to resolve error message
2015-07-19 10:09:00 -05:00
0ce1183652
Automatically sends item name when item is purchased
2015-07-19 10:06:50 -05:00
a950339f01
Clarify cron
2015-07-19 08:41:45 -05:00
b49995c676
Allow optional value to be passed in
2015-07-19 08:33:44 -05:00
deac9619bc
Refactor to use object method of sending google data
2015-07-19 08:27:16 -05:00
Sabe Jones