krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 15:48:04 +01:00
Code Issues Packages Projects Releases Wiki Activity
13,343 Commits 64 Branches 1,226 Tags
a63d5ae97ff8ff58151bbcf2b51aef151e5aa4f5
Commit Graph

728 Commits

Author SHA1 Message Date
Alys
ece0de51cc Revert "assign correct number of attribute points after leveling up - fixes 6434" 
This reverts commit 53e2939ad9.
 2016-01-05 07:05:26 +10:00
Alys
53e2939ad9 assign correct number of attribute points after leveling up - fixes 6434 2016-01-05 06:31:43 +10:00
Sabe Jones
cc00602112 fix(event): remove magic potions 2016-01-04 11:56:34 -05:00
Blade Barringer
2bbdf66d76 fix(common): Corrects bug where stat points could be awarded after level 100 
Closes #6434
 2016-01-04 07:58:59 -06:00
Blade Barringer
874f319d95 fix: Corrects logic where it was possible to customize avatar 
with gem purchasable items without purchasing them.

Closes #6427
Closes #6448

lint(common): Add unnecessary quotes to make object look less weird
 2016-01-03 10:41:44 -06:00
Blade Barringer
76c97dfa6e Merge branch 'api-v3' into api-v3-groups 2016-01-02 22:29:59 -06:00
Blade Barringer
37916271e8 Merge branch 'develop' into api-v3 2016-01-02 22:29:03 -06:00
Sabe Jones
2c6f600703 fix(event): NYE hat for new users 2015-12-31 21:35:17 -05:00
Blade Barringer
7cf43680e6 Merge branch 'api-v3' into api-v3-groups 2015-12-31 12:22:20 -06:00
Blade Barringer
aa6f5fff23 Merge branch 'develop' into api-v3 2015-12-31 12:17:57 -06:00
Sabe Jones
054e3cb361 feat(event): New Year's Eve 2015 2015-12-29 14:55:05 -05:00
Matteo Pagliazzi
61fc490f84 port challenges\' tasks scoring 2015-12-29 18:35:34 +01:00
Matteo Pagliazzi
a44090e1ed Merge branch 'api-v3' into api-v3-groups 2015-12-29 18:17:36 +01:00
Blade Barringer
ae9ec63229 Merge branch 'develop' into api-v3 2015-12-29 08:07:04 -06:00
Blade Barringer
bce049a316 Merge branch 'develop' of github.com:HabitRPG/habitrpg into api-v3 2015-12-29 08:06:22 -06:00
Blade Barringer
f3ae42e49a refactor(common): Update beastmaster functions to use newer each syntax 2015-12-29 08:03:19 -06:00
Blade Barringer
773bb23b88 chore(dependency): Remove unneeded lodash submodules 2015-12-29 07:45:13 -06:00
Blade Barringer
b3050e5a67 chore(dependency): Upgrade lodash from v2 to v3 2015-12-29 07:45:03 -06:00
Blade Barringer
b6ab74ceda refactor(common): Update variable name 2015-12-26 20:10:56 -06:00
Blade Barringer
80ed048d5c tests: Update updateStats test 2015-12-26 19:52:25 -06:00
Blade Barringer
1b118d86b2 refactor: Extract constants into constants file 2015-12-26 19:41:20 -06:00
Blade Barringer
ba31cda85d Merge branch 'develop' into TheHollidayInn-leveling-ensure-user-gets-100-points 2015-12-26 19:14:40 -06:00
Sabe Jones
7a41d36834 fix(mystery): add event timeframe 2015-12-23 20:33:45 -05:00
Sabe Jones
468198b9e2 feat(mystery): subscriber items 2015-12 
Also enables the Snowball in the Seasonal Shop.
 2015-12-22 16:16:30 -05:00
Sabe Jones
1e1f15b495 fix(content): linting errors 2015-12-18 17:27:27 -05:00
Sabe Jones
493ae6f26a feat(event): Winter Wonderland complete 2015-12-18 15:48:14 -05:00
Matteo Pagliazzi
e53bd5079a adapt chat routes to groups saved on user model 2015-12-18 16:29:57 +01:00
Matteo Pagliazzi
ddf77e0e35 add cliff for completed todos and PMs 2015-12-18 16:00:49 +01:00
Matteo Pagliazzi
2e5c7df94f Merge pull request #6343 from HabitRPG/api-v3-tasks2 
[API v3] Tasks 2
 2015-12-16 13:18:05 +01:00
Keith Holliday
ad196ecafb Added Max Stat Points constant 2015-12-15 18:48:47 -06:00
Keith Holliday
ff1f63da9a Removed user.stats.lvl check before attribution 2015-12-15 18:38:33 -06:00
Keith Holliday
298df73619 Added check for total points before skipping attribution 2015-12-15 18:38:33 -06:00
Sabe Jones
6ed9133f70 WIP(event): Winter Wonderland 2015-16 partial 2015-12-15 17:15:02 -05:00
Sabe Jones
3cc2866c76 Merge pull request #6368 from HabitRPG/sabrecat/pets-201512 
December Pet Quest
 2015-12-15 11:55:08 -06:00
Nathan Maton
35a921bf43 feat(content): Make mystery set strings translatable 
Squashed and cleaned up version of
https://github.com/HabitRPG/habitrpg/pull/6367
 2015-12-15 08:47:13 -06:00
Sabe Jones
fe1de12494 feat(pets): December quest 2015-12-14 16:28:39 -05:00
Matteo Pagliazzi
155719996d remove user.tasks getter on the server 2015-12-14 20:10:18 +01:00
Matteo Pagliazzi
409102ae19 wip score tests 2015-12-13 23:51:06 +01:00
Blade Barringer
65bb655a10 Merge branch 'develop' into api-v3 2015-12-13 16:39:59 -06:00
Matteo Pagliazzi
a34f41f0f7 misc fixes, GET user (with tests), more comments for preenHistory 2015-12-13 20:08:14 +01:00
Blade Barringer
dafe014ec8 Merge branch 'develop' into TheHollidayInn-skills-burst-backstap-leveling-fix 2015-12-13 10:06:27 -06:00
Matteo Pagliazzi
501a808893 move cron logic back to common 2015-12-11 11:21:36 +01:00
Matteo Pagliazzi
9ffa0d5893 port cron and preening 2015-12-10 19:07:09 +01:00
Matteo Pagliazzi
0f3b307f40 port tests for score and randomDrop 2015-12-09 10:21:15 +01:00
Matteo Pagliazzi
72b2791bc4 refactor scoreTask 2015-12-08 14:41:42 +01:00
Matteo Pagliazzi
582aeafb4b Merge branch 'develop' into api-v3 2015-12-06 17:17:20 +01:00
Sabe Jones
0f578b79ff feat(pets): Peppermint Hatching Potions 
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
 2015-12-04 17:20:33 -05:00
Sabe Jones
aa00eae0d5 Merge pull request #6324 from ojeytonwilliams/unequip-notification-fix 
Unequip notification fix
 2015-12-03 14:01:45 -06:00
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
Sabe Jones
5b943b4ab9 feat(event): Enable GaymerX armor 2015-12-01 18:11:04 -05:00