 Blade Barringer
|
8cb11aa85d
|
Remove merge conflict marking
|
2015-08-29 07:18:17 -05:00 |
|
|
Blade Barringer
|
a0040d736f
|
Merge branch 'develop' into sabrecat/party-page
|
2015-08-28 23:06:00 -05:00 |
|
|
Blade Barringer
|
fcf187fb47
|
Remove logic for removing quest info
|
2015-08-28 22:55:02 -05:00 |
|
|
Blade Barringer
|
29c7dd3e77
|
Merge branch 'sabrecat/party-page' of github.com:HabitRPG/habitrpg into sabrecat/party-page
|
2015-08-28 22:41:50 -05:00 |
|
|
Blade Barringer
|
342343d34f
|
Prevent user from leaving party during active quest
|
2015-08-28 22:41:30 -05:00 |
|
|
Blade Barringer
|
4af1a4d6ac
|
Rename image rendering class
|
2015-08-28 21:48:42 -05:00 |
|
|
Blade Barringer
|
dd1e69b9d5
|
Merge branch 'RossBrunton-develop' into develop
|
2015-08-28 21:42:16 -05:00 |
|
|
Blade Barringer
|
df3c498fcc
|
Add rasterize class
|
2015-08-28 21:41:53 -05:00 |
|
|
Sabe Jones
|
5e8894a0a6
|
fix(groups): Show specific invite modal
|
2015-08-28 16:48:39 -04:00 |
|
|
Sabe Jones
|
3ad95e1ab7
|
fix(tutorial): Unstick Justin head
Fixes #5497.
|
2015-08-28 16:12:45 -04:00 |
|
|
Sabe Jones
|
9e45017faa
|
Merge branch 'develop' into sabrecat/onboarding-tweaks
Conflicts:
common/dist/sprites/habitrpg-shared.css
common/dist/sprites/spritesmith2.css
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-08-28 13:24:10 -05:00 |
|
|
Sabe Jones
|
8d713a53c4
|
feat(tutorial): Splash screen overhaul complete
|
2015-08-28 13:58:30 -04:00 |
|
|
Blade Barringer
|
15a6929b44
|
Merge branch 'develop' into sabrecat/party-page
|
2015-08-28 08:41:57 -05:00 |
|
|
Sabe Jones
|
f88c536836
|
chore(news): Back to School Bailey
|
2015-08-27 16:20:15 -05:00 |
|
|
Sabe Jones
|
c4012ad762
|
WIP(tutorial): New intro splash
|
2015-08-27 16:04:59 -04:00 |
|
|
Ross Brunton
|
821d562998
|
Set image-rendering to pixelated
Closes #5846
I explictly disabled it on img because most things that use the img tag
tend not to be pixel art.
|
2015-08-27 19:17:42 +01:00 |
|
|
Sabe Jones
|
2a8529012b
|
feat(tutorial): GP and EXP awards
|
2015-08-25 17:09:51 -04:00 |
|
|
Sabe Jones
|
0c0525640c
|
Merge branch 'develop' into sabrecat/onboarding-tweaks
|
2015-08-25 16:47:46 -04:00 |
|
|
Sabe Jones
|
6564cb52dc
|
fix(news): wording tweak
|
2015-08-25 13:10:33 -04:00 |
|
|
Alys
|
bbcb9e6063
|
fix problem of Cheetah Costume Set mystery items not staying put -- code is ugly, improve later
|
2015-08-25 19:23:25 +10:00 |
|
|
Blade Barringer
|
ce7d0039f8
|
Q-ify save functions
|
2015-08-24 17:36:06 -05:00 |
|
|
Sabe Jones
|
c23312f771
|
feat(mystery): 2015 August items
|
2015-08-24 17:19:12 -04:00 |
|
|
Sabe Jones
|
23259cd456
|
WIP(tutorial): Award GP and XP
|
2015-08-24 16:02:25 -04:00 |
|
|
Blade Barringer
|
f584b173c8
|
Add user scrub quest data back in
|
2015-08-24 12:58:31 -05:00 |
|
|
Blade Barringer
|
66d16fefc3
|
Send back 204 from questLeave route
|
2015-08-24 12:38:43 -05:00 |
|
|
Blade Barringer
|
928a54911a
|
Return promises in groups service
|
2015-08-24 07:47:01 -05:00 |
|
|
Blade Barringer
|
bc24fa8130
|
Add front end button to leave quest
|
2015-08-23 22:38:55 -05:00 |
|
|
Blade Barringer
|
0b7e43f156
|
Add route for leaving active quest
|
2015-08-23 20:29:57 -05:00 |
|
|
Blade Barringer
|
6955add15d
|
Use locale string
|
2015-08-23 15:05:49 -05:00 |
|
|
Blade Barringer
|
427fbb959b
|
Add join existing party button
|
2015-08-23 14:59:06 -05:00 |
|
|
Blade Barringer
|
3098c7d460
|
Refactor invite
|
2015-08-23 14:47:10 -05:00 |
|
|
Blade Barringer
|
63315ce281
|
Remove extra ng-if
|
2015-08-23 10:23:41 -05:00 |
|
|
Blade Barringer
|
a685828226
|
remove unused classes
|
2015-08-23 10:21:21 -05:00 |
|
|
Blade Barringer
|
12137428e9
|
Show loading new party message when creating a solo party
|
2015-08-23 10:17:48 -05:00 |
|
|
Blade Barringer
|
1144defbca
|
Restructure party page
|
2015-08-23 10:15:00 -05:00 |
|
|
Blade Barringer
|
74bef58537
|
Simplify text-centering
|
2015-08-23 09:32:59 -05:00 |
|
|
Blade Barringer
|
08edcb6743
|
Move loading new party to own partial
|
2015-08-23 09:31:46 -05:00 |
|
|
Blade Barringer
|
963b136a91
|
Reorg party views
|
2015-08-23 09:28:45 -05:00 |
|
|
Blade Barringer
|
a36c08930e
|
Separate out party sections
|
2015-08-23 09:24:55 -05:00 |
|
|
Blade Barringer
|
3f874e25a4
|
Fix bug where booting a member makes them appear in the other members list
|
2015-08-23 09:07:18 -05:00 |
|
|
Blade Barringer
|
ccff3998bd
|
Hide quest button if quest is pending or active
|
2015-08-23 08:42:15 -05:00 |
|
|
Blade Barringer
|
e6fb8f34bb
|
Add user id to solo party page
|
2015-08-23 08:34:33 -05:00 |
|
|
Blade Barringer
|
fd35f58ccd
|
Display invite party to quest only if party has more than one member
|
2015-08-23 08:29:45 -05:00 |
|
|
Blade Barringer
|
59a2d2b2f0
|
Improve quest modal appearance
|
2015-08-23 08:22:34 -05:00 |
|
|
Blade Barringer
|
fefcbd1d2f
|
Merge branch 'develop' into sabrecat/party-page
|
2015-08-22 21:42:05 -05:00 |
|
|
Alys
|
5b8c161932
|
changed habitrpg.wikia.com to habitica.wikia.com
|
2015-08-23 12:31:10 +10:00 |
|
|
Alys
|
fd446fc5e5
|
convert habitica.com to BASE_URL
|
2015-08-23 12:23:35 +10:00 |
|
|
Blade Barringer
|
99d2b7f749
|
Merge branch 'develop' into sabrecat/party-page
|
2015-08-22 19:18:08 -05:00 |
|
|
Blade Barringer
|
8fc69102aa
|
Merge branch 'develop' into 3onyc-fix-hash-leak
|
2015-08-22 17:45:47 -05:00 |
|
|
Blade Barringer
|
b41b629e93
|
Remove test variable
|
2015-08-22 17:08:28 -05:00 |
|