Commit Graph

1408 Commits

Author SHA1 Message Date
Matteo Pagliazzi ae852f9a2e complete preening and enable for challenges too 2016-01-08 17:47:08 +01:00
Matteo Pagliazzi 243b839392 wip: new history preening, delineate process and differentiate between subscribers and non 2016-01-07 20:07:13 +01:00
Matteo Pagliazzi fdd5ab724a begin implementing new preenUserHistory method: port current code to es6 and setup tests 2016-01-07 18:44:25 +01:00
Daniel Van Camp 99a694bb10 added EU version of t-shirt 2016-01-06 23:15:36 +01:00
Daniel Van Camp 0362977dbd Merge branch 'develop' into static-page-merch 2016-01-06 22:38:19 +01:00
Sabe Jones adfa248dd0 feat(content): backgrounds and Armoire 2016-01 2016-01-06 15:11:20 -05:00
Blade Barringer 8a546c7ec3 chore(i18n): update locales 2016-01-05 08:40:48 -06:00
Blade Barringer 75f71bc2ca fix: Corrects stat allocation bug where it was possible to recieve more points than 100
fixes #6434
2016-01-05 08:35:40 -06:00
Alys 8db492099c Revert "fix(common): Corrects bug where stat points could be awarded after level 100"
This reverts commit 2bbdf66d76.
2016-01-05 07:05:40 +10:00
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
Matteo Pagliazzi 3bc8945bcc adapt current tests and change urls to avoid conflicts 2016-01-04 22:03:21 +01:00
Alys 53e2939ad9 assign correct number of attribute points after leveling up - fixes 6434 2016-01-05 06:31:43 +10:00
Matteo Pagliazzi 6680853078 finish adding challenges support for tasks (except syncing) 2016-01-04 20:48:48 +01:00
Matteo Pagliazzi d25cb70f66 wip get and create tasks plus initial user syncing 2016-01-04 19:44:39 +01: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
Alys 5304b37102 properly fix Winter Flame Set 2015-12-31 22:09:06 +10:00
Alys e7cbb2cd16 add Winter Flame Set to locale file - fixes #6433 2015-12-31 21:49:21 +10:00
Sabe Jones 6c3e8e2081 feat(event): more NYE 2015-12-30 16:58:57 -05:00
Georgi Gardev beaf0b83bb Add option to reverse order of chat messages 2015-12-30 23:47:03 +02:00
Matteo Pagliazzi 6003dad24b misc fixes, port challenge task scoring, delete chal and select winner 2015-12-29 20:57:20 +01: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 33714b4947 chore(i18n): update locales 2015-12-28 21:40:51 -06:00
Georgi Gardev ea54ec607a Add confirmation popover for Release pets/mounts
Add tests for releasing pets and mounts

Refactor tests to use expect syntax from sinon-chai

tests(karma): Refine settings controller tests

refactor(client): Remove unecessary releaseX functions from $scope in settings ctrl
2015-12-28 21:37:38 -06:00
Georgi Gardev f6f82cafc4 Add confirmation popover for Rebirth
Add confirmation popover for Fortify/Reroll

Add tests for reroll and rebirth
2015-12-28 21:37:23 -06:00
Paul Rich c9fdff38f9 Fix for issue #4648, parts 3 and 4 2015-12-28 14:24:48 -05:00
Paul Rich 56a00efb19 Fix for Issue #3517 Display Current Page Name
Revision for Fix for issue #3517

lint: Remove extraneous white space in app.js file

fix: Correct attribute from pageTitle to title in $state interface
2015-12-28 07:53:51 -06:00
Matteo Pagliazzi ba0fb884dd port create challenge 2015-12-28 12:14:56 +01:00
Matteo Pagliazzi 6ae2c5fa89 wip on groups controller 2015-12-27 17:24:55 +01:00
Alys 7ef4fab289 change scroll drop text for The Golden Knight, Part 1 quest - it drops Gold Knight (Scroll) not Tarnished Gold (Scroll) 2015-12-28 01:06:08 +10:00
Blade Barringer e46436f77b chore(i18n): update locales 2015-12-26 22:28:55 -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
Blade Barringer 5127068ca7 chore: Compile css 2015-12-26 19:02:28 -06:00
Blade Barringer 7df3b333f6 feat: Refine clear local storage function 2015-12-26 19:00:45 -06:00