 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
|
2e3c166a40
|
Add test for removing quest data from user
|
2015-08-28 21:58:00 -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
|
6ecf3a0e50
|
Merge pull request #5851 from HabitRPG/sabrecat/onboarding-tweaks
Sabrecat/onboarding tweaks
|
2015-08-28 13:50:42 -05: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 |
|
|
Sabe Jones
|
f308116c54
|
feat(tutorial): Moar avatars
|
2015-08-28 11:48:30 -05: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
|
f5c08c4ae5
|
WIP(tutorial): Gregarious Vice
|
2015-08-27 15:36:53 -05:00 |
|
|
Sabe Jones
|
f8994a3ee3
|
WIP(tutorial): Revised images
|
2015-08-27 15:21:09 -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
|
5c4ebef0a9
|
feat(tutorial): New intro images
|
2015-08-27 13:08:12 -05:00 |
|
|
Alys
|
049f9280a2
|
Merge pull request #5798 from Alys/rebirth-keeps-free-gear-2015-08-12
prevent Orb of Rebirth from removing free gear (equipment that has zero gold cost) - partial fix for https://github.com/HabitRPG/habitrpg/issues/5750
|
2015-08-26 22:01:29 +10: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 |
|
|
Sabe Jones
|
9ed1e2ba6d
|
fix(mystery): Force coffee compile
|
2015-08-24 23:37:54 -05:00 |
|
|
Sabe Jones
|
d70aa46ec1
|
fix(mystery): Adjust date range
|
2015-08-24 21:33:02 -05:00 |
|
|
Blade Barringer
|
5b583f43d6
|
Fix api and karma test
|
2015-08-24 18:07:21 -05:00 |
|
|
Blade Barringer
|
484609c634
|
Stub Q
|
2015-08-24 17:55:20 -05:00 |
|
|
Blade Barringer
|
ce7d0039f8
|
Q-ify save functions
|
2015-08-24 17:36:06 -05:00 |
|
|
Sabe Jones
|
99a9647c46
|
Merge pull request #5837 from HabitRPG/sabrecat/august-mystery
August Mystery Items
|
2015-08-24 16:29:09 -05:00 |
|
|
Sabe Jones
|
c23312f771
|
feat(mystery): 2015 August items
|
2015-08-24 17:19:12 -04:00 |
|
|
Sabe Jones
|
a0e1d50bd6
|
feat(mystery): 2015 August sprites
|
2015-08-24 15:38:09 -05: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
|
af20986fbc
|
Simplify qroup service quest functions
|
2015-08-24 08:06:34 -05:00 |
|
|
Blade Barringer
|
928a54911a
|
Return promises in groups service
|
2015-08-24 07:47:01 -05:00 |
|
|
Blade Barringer
|
fbd4490dbc
|
Fix sinon assertions
|
2015-08-24 07:46:37 -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 |
|