krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,938 Commits 63 Branches 1,225 Tags
1610a62b824b0a84bdd918b1d5b70a56c1ef9f57
Commit Graph

138 Commits

Author SHA1 Message Date
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
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
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
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
Sabe Jones
ab91a6fba9 Merge pull request #5781 from HabitRPG/sabrecat/greeting-cards 
Greeting and Thank-You Cards
 2015-08-13 22:35:25 -05:00
Sabe Jones
00a212660a feat(greeting-cards): Thank-You & Greets 2015-08-13 16:58:31 -05:00
Sabe Jones
b2100c2c54 WIP(greeting-cards): Abandon spell refactor 2015-08-13 14:31:34 -05:00
Blade Barringer
39ead02d6c Remove comment 2015-08-12 19:09:11 -05:00
Blade Barringer
bcf7c9712e Split out potion and armoire out of the itemStore object 
Fixes #5743
 2015-08-12 18:53:49 -05:00
Blade Barringer
203a26b6df Refactor how cards are recieved 2015-08-12 08:36:57 -05:00
Alys
fd0176f4fc fix an outdated comment 2015-08-09 14:09:10 +10:00
Alys
262340147d remove code that was added purely for testing and development 2015-08-09 14:08:28 +10:00
Alys
06fd9c7a67 replace _.times with for loop to allow break 2015-08-09 13:58:18 +10:00
Alys
c3d65f0bcf initial changes to cause cron to count multiple missed days as one missed day 2015-08-09 13:58:18 +10:00
Blade Barringer
383ae3be55 Merge pull request #5746 from crookedneighbor/enchanted_armoire_test_improvements 
Enchanted armoire test improvements
 2015-08-05 18:13:12 -05:00
Blade Barringer
e22e853f21 Fix some formatting 2015-08-05 08:18:03 -05:00
Blade Barringer
008a5f1209 Merge branch 'develop' of github.com:HabitRPG/habitrpg into vIiRuS-armoireResponse 2015-08-04 19:52:11 -05:00
Sabe Jones
13ab60cafe feat(drops): Enable pets at Level 3 2015-07-28 13:28:45 -05:00
Alys
f5c66e51d1 refactor cron process for todos and dailys to give them separate code 2015-07-26 11:27:00 +10:00
Blade Barringer
fca6f91f13 Merge branch 'develop' into analytics-service-server-side 2015-07-24 15:19:31 -05:00
Sabe Jones
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
Blade Barringer
c41271e558 Merge branch 'develop' into refactor_member_modal_and_stats_page 2015-07-22 17:39:39 -05:00
Blade Barringer
7b9102c88c Move gear counting to counting script 2015-07-22 17:37:35 -05:00
Blade Barringer
f40cfd2b66 Move all pet counting to shared count scripts 2015-07-22 17:32:12 -05:00
Blade Barringer
3d40da4004 Remove countPets and countMounts from codebase 2015-07-20 08:11:00 -05:00
Blade Barringer
2695419182 Use better beastMaster / mountMaster counts 2015-07-19 21:51:30 -05:00
Blade Barringer
054d884154 Merge branch 'develop' into analytics-service-server-side 2015-07-19 10:13:34 -05:00
Blade Barringer
a950339f01 Clarify cron 2015-07-19 08:41:45 -05:00
Blade Barringer
f9304bd28f Move stat calc scripts to angular service 2015-07-18 16:00:06 -05:00
Blade Barringer
3926a6e95a Remove unnecssary semicolons 2015-07-18 16:00:06 -05:00
Blade Barringer
2b4e48fbe6 Add stat calc to common 2015-07-18 16:00:05 -05:00
Sabe Jones
ffc441ab82 feat(quests): Improve drop notif 2015-07-16 16:22:49 -05:00
Sabe Jones
266b6b87e2 test(quests): Quests Service spec WIP 
First test on new Quests Service. Also fix Armoire tests to account for new items.
 2015-07-13 19:16:29 -05:00
Sabe Jones
b9f795529b feat(quests): Dilatory Distress 
Implements the "Dilatory Distress" quest chain, purchasable for Gold. Also adds four new items to the Enchanted Armoire.
 2015-07-13 18:21:32 -05:00
Blade Barringer
87f5449267 Merge branch 'develop' into quests-fix-merge-coflicts 2015-07-13 08:20:52 -05:00
Matteo Pagliazzi
4b170cd4dc chore(i18n): update locales 2015-07-12 23:45:26 +02:00
Blade Barringer
316c3e9c2e Sort out conflicts from develop 2015-07-12 13:51:42 -05:00
Blade Barringer
74de248109 Adjust how quest drops are sent 2015-07-12 10:05:00 -05:00
Blade Barringer
284fa03223 Add platform, change itemName to itemKey 2015-07-12 10:03:41 -05:00
Alys
18db504d2a allow Trivial priority (difficulty) to cause a tiny amount of damage from a boss 2015-07-12 11:05:01 +10:00
Blade Barringer
305414e152 Merge pull request #5553 from Lokeh/Lokeh/maxHealth 
maxHealth refactor
 2015-07-11 00:18:15 -05:00
Blade Barringer
2f1d3400bc Added additional analytics info 2015-07-10 07:47:52 -05:00
Blade Barringer
52620bb69d Impliment analytics in user actions; remove mixpanel 2015-07-09 22:18:37 -05:00
Sabe Jones
c0d35dc472 WIP(quests): Quests page cont'd 
Test fixes and addition of function for buying Quests with Gold
 2015-07-08 17:43:08 -05:00