Kai/habitica
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
10,677 Commits 64 Branches 1,256 Tags
6f85fcfde282f319a2e2c2d7d7a2e8376adba0a6
Commit Graph

800 Commits

Author SHA1 Message Date
Sabe Jones 6f85fcfde2 Merge branch 'develop' into sabrecat/party-page 
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-09-01 13:40:20 -05:00
Sabe Jones 5ba6cfc2f5 feat(content): September content adds 2015-08-31 18:16:54 -04:00
Sabe Jones c0a47130e4 chore(content): Compile sprites 2015-08-31 15:54:08 -05:00
Blade Barringer 6e7787dcf5 chore(i18n): update locales 2015-08-30 10:25:55 -05:00
Blade Barringer 0b4c03a678 chore(i18n): update locales 2015-08-29 17:41:19 -05:00
Blade Barringer 19c3e22176 chore(i18n): update locales 2015-08-29 11:46:01 -05:00
Blade Barringer cbea9f4200 chore(i18n): update locales 2015-08-29 07:38:54 -05:00
Blade Barringer a0040d736f Merge branch 'develop' into sabrecat/party-page 2015-08-28 23:06:00 -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 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
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
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
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
Blade Barringer bc24fa8130 Add front end button to leave quest 2015-08-23 22:38:55 -05:00
Blade Barringer 427fbb959b Add join existing party button 2015-08-23 14:59:06 -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 e4f2a1a699 Adjust text 2015-08-23 07:59:40 -05:00
Alys 3d47f3f835 remove "as if you had created a new account" from Orb of Rebirth description 2015-08-23 17:43:33 +10:00
Blade Barringer 99d2b7f749 Merge branch 'develop' into sabrecat/party-page 2015-08-22 19:18:08 -05:00
Blade Barringer 67e60e7d06 Add loading screen between leaving old party and joining new one 2015-08-22 12:42:52 -05:00
Blade Barringer 93f02363e5 Add feature to join new party if user is in a party of one 2015-08-22 12:19:37 -05:00
lacrimae b8bd87eeb8 Wording: Proper English it was not 2015-08-20 16:55:05 +02:00
Blade Barringer 65888d3f8a Merge branch 'develop' into sabrecat/party-page 2015-08-20 07:39:25 -05:00
Sabe Jones 190fdd5bb9 feat(pets): August cheetah quest 2015-08-19 16:55:14 -04:00
Sabe Jones 3e848ce67e chore(pets): Compile sprites 2015-08-19 14:59:26 -05:00
Sabe Jones 2a09eb8911 feat(pets): August sprites 2015-08-19 14:50:09 -05:00
Blade Barringer b902ff63a2 Merge branch 'develop' into sabrecat/party-page 2015-08-19 08:07:34 -05:00
Blade Barringer 00ec16877b Merge pull request #5799 from Alys/challenges-editable-by-admins-2015-08-16 
allow Challenges to be edited, closed, and deleted by staff and moderators
 2015-08-18 17:20:19 -05:00
Blade Barringer f792155b45 Order quests with array 2015-08-17 21:48:58 -05:00
Blade Barringer 8ed13f1c12 Update wiki url 2015-08-17 21:34:20 -05:00
Blade Barringer 344eded949 Merge branch 'develop' into sabrecat/party-page 2015-08-17 19:04:25 -05:00
Garrison Taylor 94a31985b7 Update information about max levels for buffs. 2015-08-17 11:34:30 -05:00
GihHubSphinx a1f8035515 Change 2 strings to exclude html character codes 
exclude mldr and rsquo character codes not shown correctly on the front
page
 2015-08-16 14:17:26 +05:00
Alys 71a9f7caf4 make challenge permission error messages translatable 2015-08-16 17:30:51 +10:00
Alys c957fa476e remove text about unlocking Item Shop because it is now available to new players 2015-08-16 13:42:53 +10:00
Alys a94dd0d6a3 adjust Orb of Rebirth modal to state that you keep free equipment 2015-08-16 13:12:53 +10:00
Alys 57e7fc93d7 prevent Orb of Rebirth removing free equipment (gear that has zero gold cost) - partial fix for https://github.com/HabitRPG/habitrpg/issues/5750 2015-08-16 12:33:40 +10:00
Blade Barringer a040acf739 Compile sprites 2015-08-14 23:26:50 -05:00
Blade Barringer f6dbea008a Merge pull request #5792 from Alys/deleteDefaultDaily 
remove unused default tasks
 2015-08-14 23:23:54 -05:00
Alys 7f0889f405 remove commented-out default task code and unused default task locale strings - fixes https://github.com/HabitRPG/habitrpg/issues/5631#issuecomment-130619901 (comment by GitHubSphinx) 2015-08-15 13:23:42 +10:00