Commit Graph

1281 Commits

Author SHA1 Message Date
Matteo Pagliazzi 2e5c7df94f Merge pull request #6343 from HabitRPG/api-v3-tasks2
[API v3] Tasks 2
2015-12-16 13:18:05 +01:00
Matteo Pagliazzi e547eb2dde add tests for tags ops on tasks 2015-12-14 22:44:50 +01: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
Blade Barringer 0f789ba780 Merge branch 'TheHollidayInn-skills-burst-backstap-leveling-fix' into develop 2015-12-13 15:38:03 -06:00
Alys 9edb0831c0 specify $ USD for subscription prices 2015-12-14 07:16:22 +10: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
Blade Barringer 73c8db01ad chore(sprites): Update readme 2015-12-12 17:17:04 -06:00
Blade Barringer 81067efd19 Merge branch 'joyclark-new_mount_heads' into develop 2015-12-12 17:16:36 -06:00
Blade Barringer ee87d1b4b7 chore(sprites): Compile 2015-12-12 17:12:53 -06:00
Blade Barringer a7ffb41acd fix(sprites): Correct size of tiger mount icon 2015-12-12 16:04:03 -06:00
Blade Barringer 1f37338782 fix(sprites): Correct mount head icons for peppermint pets 2015-12-12 14:35:14 -06:00
Blade Barringer 6d6e1caf0f fix(sprites): Correct spooky pet mount icons 2015-12-12 14:20:38 -06:00
Blade Barringer 8ad2b07253 fix(sprites): Correct gryphon mount icon sizing 2015-12-12 11:09:27 -06:00
Blade Barringer 9aa73db281 fix(sprites): Correct size of tiger sprites 2015-12-12 11:02:54 -06:00
Alys 5d6c4d4dcd add Android app with Google Play logo to static apps page; remove mailing list signup form 2015-12-12 11:32:17 +10:00
Matteo Pagliazzi 501a808893 move cron logic back to common 2015-12-11 11:21:36 +01:00
Sabe Jones f6cdf5d257 chore(news): Android Bailey 2015-12-10 17:00:48 -05: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
Joy Clark 8756aeebfa fixing wolf sprite 2015-12-08 18:05:18 +01:00
Matteo Pagliazzi 72b2791bc4 refactor scoreTask 2015-12-08 14:41:42 +01:00
joyclark faf2611ca3 making change for peppermit heads. 2015-12-08 13:36:25 +01:00
Joy Clark 1769fc15f7 css files and sprite sheets 2015-12-08 13:22:13 +01:00
Joy Clark d8b0774618 Add Mount_Icon images 2015-12-08 13:22:12 +01:00
Sabe Jones 3385cb807e Merge pull request #6334 from bennyty/develop
Normalize theme audio volumes
2015-12-07 18:33:39 -06: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
bennyty ed944f83bf Rebalance audio themes 2015-12-04 13:39:29 -05:00
Blade Barringer a3665e7095 chore(image): Add vice2 quest image 2015-12-04 07:46:02 -06:00
Sabe Jones aa00eae0d5 Merge pull request #6324 from ojeytonwilliams/unequip-notification-fix
Unequip notification fix
2015-12-03 14:01:45 -06:00
Matteo Pagliazzi a6648fc638 add tags routes, misc fixes 2015-12-03 19:19:53 +01:00
Oliver Eyton-Williams 36df8138fc Fixed template syntax. 2015-12-03 13:33:52 +01: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
Blade Barringer 6aa164ab31 chore(i18n): update locales 2015-12-02 07:42:29 -06:00
Matteo Pagliazzi 62708d4365 cleanup 2015-12-02 11:30:58 +01:00
Matteo Pagliazzi 427c805ea5 fix user tests and misc changes 2015-12-02 11:22:53 +01:00
Sabe Jones 5b943b4ab9 feat(event): Enable GaymerX armor 2015-12-01 18:11:04 -05:00
Sabe Jones 03222bf084 feat(content): Armoire and backgrounds 2015/12 2015-12-01 16:29:22 -05:00
Sabe Jones 483ff8cb67 Merge pull request #6275 from TheHollidayInn/tasks-add-push-to-bottom
Tasks add push to bottom
2015-12-01 14:20:02 -06: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 c4f3c2b1f4 change website FAQ to link to Overview for New Users on website instead of wiki 2015-12-01 07:08:07 +10:00
Matteo Pagliazzi 93fcc7957e fix trying to move completed todos 2015-11-30 20:22:22 +01:00
Matteo Pagliazzi 67bcfde6dc implement move task 2015-11-30 20:14:53 +01:00
Matteo Pagliazzi ebdfe4c49b add checklists routes 2015-11-30 17:25:40 +01:00
Matteo Pagliazzi 3002db3d75 add ability to update tasks, can pass additional fields to Model.sanitize at runtime 2015-11-29 19:05:24 +01:00
Keith Holliday 06ee603942 Initialized usr._temp when score function is skipped 2015-11-29 11:11:06 -06:00
Keith Holliday 0dcba276a6 Fixed task push text and move ctrlPressed logic to rootScope. 2015-11-28 12:06:34 -06:00