krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,920 Commits 64 Branches 1,225 Tags
b7cd46a6fe02b1ce1db910b8e5549ff39b2bc0a2
Commit Graph

275 Commits

Author SHA1 Message Date
Blade Barringer
b7cd46a6fe Move subscription blocks to separate module 2015-09-19 19:42:47 -05:00
Blade Barringer
4cb7ae4f6f Add translator 2015-09-19 19:42:38 -05:00
Blade Barringer
110480be5a Use single quotes 2015-09-19 19:37:40 -05:00
Blade Barringer
1c0943b5a4 Add parens 2015-09-19 19:36:54 -05:00
Blade Barringer
c01795af2a Move user defaults to separate module 2015-09-19 19:36:35 -05:00
Blade Barringer
6665339229 Remove dist location variable. Wasn't working for some reason :( 2015-09-19 19:29:56 -05:00
Blade Barringer
b51ca509ca Change to export syntax 2015-09-19 19:29:15 -05:00
Blade Barringer
85a16b62e5 Add babel task and move to src directory 2015-09-17 17:42:53 -05:00
Blade Barringer
993b568ad8 Add mount names for all drop pets and make creation more programmic 2015-09-17 12:43:42 -05:00
Blade Barringer
df5a434d71 Move drop eggs into separate module 2015-09-17 08:45:35 -05:00
Blade Barringer
c64fd6e321 Move drop eggs to separate file 2015-09-17 08:42:21 -05:00
Blade Barringer
550ceb8701 Remove uneeded .js extension 2015-09-17 08:09:47 -05:00
Blade Barringer
4681fc6c96 Move card types to separate file 2015-09-17 08:08:09 -05:00
Blade Barringer
d20354dd47 Es2015ify the js content 2015-09-17 08:03:33 -05:00
Blade Barringer
eaaac546b9 Move translator file into helpers folder 2015-09-17 07:47:23 -05:00
Blade Barringer
a1d7ad70af Move spells to won file 2015-09-17 07:41:19 -05:00
Blade Barringer
eecc4e4a22 Rename mystery sets module 2015-09-16 20:29:26 -05:00
Blade Barringer
50d7adcae8 Extract mystery items into module 2015-09-16 20:28:46 -05:00
Blade Barringer
ccdcd32174 Extract time traveler stable into separate module 2015-09-16 20:22:42 -05:00
Blade Barringer
504a2e7a52 Move events to own module 2015-09-16 20:12:09 -05:00
Sabe Jones
c8cc01fc44 feat(hourglass): Buy pets/mounts 
Functionally complete as of this commit. Further commits will provide more polish and refactoring.
 2015-09-16 14:35:43 -04:00
Sabe Jones
ce764ca28e WIP(hourglass): Mystery sets API route 2015-09-15 15:41:57 -04:00
Sabe Jones
2ce52e980d feat(hourglass): Buy pets/mounts 2015-09-15 14:55:38 -04:00
Sabe Jones
66a8be526b WIP(hourglass): Error catches 2015-09-15 12:40:01 -05:00
Sabe Jones
bc16ec1729 Merge branch 'develop' into sabrecat/timetravel-stable 2015-09-15 11:32:28 -05:00
Sabe Jones
41b4d497f7 Merge branch 'develop' into sabrecat/pet-201509 
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-09-08 13:25:10 -05:00
Blade Barringer
e32de87991 Adjust numbering of faq.js 2015-09-06 19:44:37 -05:00
Blade Barringer
6fd2b9e537 Update content with web faq 2015-09-06 17:13:04 -05:00
Blade Barringer
2fcc7df218 Change name of locales keys 2015-09-06 16:36:21 -05:00
Blade Barringer
1bce23c12b Transform magic number to constant 2015-09-06 16:22:06 -05:00
Blade Barringer
898ea845b3 Convert translation function to js 2015-09-06 16:20:14 -05:00
Blade Barringer
245c7d48c8 Simplify faq logic 2015-09-06 16:11:53 -05:00
Blade Barringer
4081a9a62a Add faq to content 2015-09-06 16:08:53 -05:00
Blade Barringer
8a06514c72 Move translation function to separate module 2015-09-06 15:54:38 -05:00
Blade Barringer
b9bbc3f1ea Move content to own directory 2015-09-06 15:31:08 -05:00
Sabe Jones
5274fd236a WIP(time-travel): Time Travel pets/mounts 
Also begins process of adding tests for Mystic Hourglass purchases.
 2015-09-01 17:17:50 -04:00
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
3ccf09ca27 feat(quests): Horse quest 2015-09-01 13:26:41 -04:00
Sabe Jones
5ba6cfc2f5 feat(content): September content adds 2015-08-31 18:16:54 -04:00
Blade Barringer
15a6929b44 Merge branch 'develop' into sabrecat/party-page 2015-08-28 08:41:57 -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
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
Blade Barringer
f792155b45 Order quests with array 2015-08-17 21:48:58 -05:00
Blade Barringer
344eded949 Merge branch 'develop' into sabrecat/party-page 2015-08-17 19:04:25 -05: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