krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 22:57:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
11,726 Commits 63 Branches 1,225 Tags
dcd7cae31295566b8fd08e5a8cec076f975b45b0
Commit Graph

463 Commits

Author SHA1 Message Date
Oliver Eyton-Williams
dcd7cae312 Reverted changes related to multiple messages and changed handleTwoHanded to send single, clearer, messages. 2015-12-02 16:51:01 +01:00
Oliver Eyton-Williams
da35eb6067 user.ops functions can now send multiple messages at once. Clearer messages are sent when equipping/unequipping two-handed weapons. 2015-12-01 18:24:23 +01:00
Alys
9f53365648 add comment for refactoring to fix reset bug that doesn't unequip gear properly (e.g., https://github.com/HabitRPG/habitrpg/issues/6304) 2015-11-27 06:13:14 +10:00
Sabe Jones
5d02b70be1 Merge pull request #6264 from ojeytonwilliams/two-handed-weapon-fix 
Two-handed weapons no longer automatically equip unless desired. fixes #6231
 2015-11-26 10:53:50 -06:00
Sabe Jones
29a84e6666 feat(event): Habitica Thanksgiving 2015-11-25 17:06:52 -05:00
Oliver Eyton-Williams
707cd08a8b Merged: updating two-handed tests to use arrow functions. 2015-11-25 12:12:22 +01:00
Alys
69553260d3 revert refactor of preenHistory 2015-11-24 08:24:33 +10:00
Blade Barringer
7d49a8cbf8 Merge branch 'develop' into HabitRPG-sabrecat/modularize-statHelpers 2015-11-23 08:07:58 -06:00
Alys
65c276c477 fix formatting in preenHistory 2015-11-22 21:08:51 +10:00
Alys
1082bb1f81 refactor preenHistory from index.js to cron.js 2015-11-22 15:52:30 +10:00
Alys
83ea085c21 refactor api.shouldDo and associated code; fix new bug in sanitizeOptions() 2015-11-22 11:28:51 +10:00
Alys
728a94d199 improve coding style 2015-11-22 11:05:03 +10:00
Alys
a380c1aa30 refactor api.daysSince to a cron.js function not exposed on api 2015-11-22 10:48:15 +10:00
Alys
2f8b6d68e8 refactor api.startOfDay to a cron.js function not exposed on api 2015-11-22 07:13:44 +10:00
Alys
6183fd9e71 refactor api.startOfWeek to a cron.js function not exposed on api 2015-11-21 22:26:05 +10:00
Alys
e0784a9791 refactor sanitizeOptions from index.js to cron.js 2015-11-21 22:06:02 +10:00
Alys
a73662bab6 refactor api.dayMapping to DAY_MAPPING const, not exposed on api 2015-11-21 20:48:18 +10:00
Sabe Jones
fb17c3ae80 Merge branch 'develop' into sabrecat/modularize-statHelpers 2015-11-20 13:27:25 -05:00
Sabe Jones
72ea9426dd fix(lint): Space infix operator (?) 2015-11-18 15:18:44 -05:00
Sabe Jones
ed443b490a refactor(constant): Screaming camel MAX_LEVEL 2015-11-18 15:14:47 -05:00
Sabe Jones
31b68219d1 refactor(stats): Address PR comments 2015-11-18 15:06:55 -05:00
Blade Barringer
f94394127a Remove unused var 2015-11-18 08:00:14 -06:00
Blade Barringer
9e557c43d3 Fix bug where seasonal items could not be purchased. 2015-11-18 07:58:01 -06:00
Blade Barringer
26b82dff4b Fix bug where armoire items could not be repurchased. 2015-11-18 07:57:45 -06:00
Oliver Eyton-Williams
cae267c0fa Two-handed weapons no longer automatically equip unless desired. 2015-11-18 11:59:31 +01:00
Blade Barringer
a11048b604 Split out wondercon gear into separate module 2015-11-17 17:16:38 -06:00
Blade Barringer
f58b3eee64 Move special gear into own subdirectory 2015-11-17 17:06:00 -06:00
Sabe Jones
7d2643063f fix(math-helpers): diminishingReturns parameter logic 2015-11-17 16:00:18 -05:00
Sabe Jones
4bf20959dd refactor(stats): Math helpers ES2015 module 2015-11-17 15:41:26 -05:00
Blade Barringer
195b39561b Move contributor gear to own module 2015-11-17 09:01:38 -06:00
Blade Barringer
2bac9c3c17 Separate out backer gear into own module 2015-11-17 08:17:40 -06:00
Blade Barringer
03c1a957f6 Correct ownsItem function to allow owning item if user has ever previously owned the item. 2015-11-17 08:13:20 -06:00
Blade Barringer
3000517b06 Fix bug where any backer or contributor item could be purchased. 2015-11-16 21:47:46 -06:00
Blade Barringer
639dfb31d7 Pull out gear into separate modules 2015-11-16 17:29:13 -06:00
Blade Barringer
2a7dfe09a0 Move user can own quest categories constant to constants module. 2015-11-15 12:27:16 -06:00
Blade Barringer
40cee42e03 Remove unneeded return statement 2015-11-15 11:04:17 -06:00
Blade Barringer
6ec864ea4e Remove unused src files in content directory 2015-11-15 11:03:30 -06:00
Blade Barringer
1a31c26330 Add item list to common constants module 2015-11-15 11:03:17 -06:00
Blade Barringer
411946e487 Modularize mystery sets 2015-11-15 10:08:40 -06:00
Blade Barringer
600f3e4554 Extract classes, events and gearTypes into constants file. 2015-11-15 09:47:06 -06:00
Blade Barringer
b13b2d0f62 Remove coffee content index file 2015-11-15 09:28:26 -06:00
Blade Barringer
e5d99ce271 Convert common files to es2015. 2015-11-15 08:16:55 -06:00
Blade Barringer
5ebead68ab Remove coffee version of i18n 2015-11-11 21:24:21 -06:00
Blade Barringer
774a42d67e Convert coffee files to JS 2015-11-11 20:32:00 -06:00
Sabe Jones
83b61f9aa3 Merge branch 'develop' into sabrecat/pet-201511 
Conflicts:
	common/dist/sprites/spritesmith-main-5.css
	common/dist/sprites/spritesmith-main-5.png
	common/dist/sprites/spritesmith-main-6.css
	common/dist/sprites/spritesmith-main-6.png
	common/dist/sprites/spritesmith-main-7.css
	common/dist/sprites/spritesmith-main-7.png
	common/dist/sprites/spritesmith-main-8.css
	common/dist/sprites/spritesmith-main-8.png
	common/dist/sprites/spritesmith-main-9.css
	common/dist/sprites/spritesmith-main-9.png
 2015-11-11 18:36:25 -05:00
Sabe Jones
eba2ac386e feat(pets): November quest 
Fully functional commit. Missing only Bailey and the quest scroll sprite.
 2015-11-11 17:23:16 -05:00
Sabe Jones
502e7f0af2 Merge branch 'develop' into sabrecat/more-modals 2015-11-03 14:29:23 -05:00
Sabe Jones
6b3fcd3d11 fix(content): Correct stats for Royal Robes 
...in newtype content file
 2015-11-02 17:34:59 -05:00
Sabe Jones
510080325d fix(content): Correct missing Armoire items 
...in newstyle content files
 2015-11-02 17:33:03 -05:00
Sabe Jones
e74c83be2e feat(content): November backgrounds and Armoire 2015-11-02 17:28:20 -05:00