Commit graph

89 commits

Author SHA1 Message Date
kholliday
f28bc31a2c Added dequip ability per ticket: 3730 2015-03-04 21:43:17 -06:00
Sabe Jones
27446da338 chore(grunt): compile sprites 2015-03-03 21:49:07 -06:00
Sabe Jones
21fd8061cf feat(backgrounds): March BGs 2015-03-03 21:42:15 -06:00
Matteo Pagliazzi
85b547196e chore(i18n): update locales 2015-02-28 18:23:17 +01:00
Sabe Jones
3d3438e074 chore(grunt): Compile sprites 2015-02-24 20:45:50 -06:00
Sabe Jones
7d943d9007 fix(mystery): Last missing sprite 2015-02-24 20:40:32 -06:00
Sabe Jones
f5f21718ae fix(mystery): Missing sprites 2015-02-24 20:33:02 -06:00
Sabe Jones
d4f8acd0ef feat(mystery): February 2015 2015-02-24 20:15:31 -06:00
Blade Barringer
016e359690 Fixes #4749 2015-02-24 16:58:48 -06:00
Blade Barringer
6eeff5a0af Changed matt back to brown hair version 2015-02-24 13:37:14 -06:00
Matteo Pagliazzi
14d6a59e96 chore(i18n): update locales 2015-02-23 21:53:50 +01:00
Matteo Pagliazzi
4151b0733f add ability to unsubscribe from a single event using a dedicated link 2015-02-23 21:25:01 +01:00
Blade Barringer
a2eda6c91a Merge pull request #4733 from remmz0r/gemDisplay
Gem Display Text in Modals (new) - Fixes #4645
2015-02-22 13:17:47 -05:00
Blade Barringer
5aa4015249 Refactored pet display name changes 2015-02-22 12:12:38 -05:00
Blade Barringer
f355672b3b Merge pull request #4703 from scribblypanda/issue2825
added pet colour to feed/evolve notif
2015-02-22 12:12:23 -05:00
Bryce Wojtowicz
0931d52d56 Edit: fixed tabs instead of spaces issue 2015-02-22 13:39:19 +08:00
Bryce Wojtowicz
44478d3792 Fixes #4645
Fixes Gem Display in modals to say [Gem] You have [n] Gems
Modified code to use a translatable string!
Thanks for the tip :)
2015-02-22 13:35:50 +08:00
Matteo Pagliazzi
397a293ca8 change text for recapture emails settings 2015-02-20 18:15:47 +01:00
Matteo Pagliazzi
ba11d827bb chore(i18n): update locales 2015-02-20 18:04:01 +01:00
Blade Barringer
c215b90869 Merge pull request #4699 from chimericdream/bulk-add-tasks
Bulk add tasks (first version; seeking review & feedback)
2015-02-18 16:41:31 -06:00
Blade Barringer
0bd912be30 Merge pull request #4690 from chimericdream/task-difficulty-context-classes
Add difficulty context class to task list items
2015-02-18 16:37:53 -06:00
Matteo Pagliazzi
37433ee1aa chore(i18n): update locales 2015-02-18 17:41:31 +01:00
Bill Parrott
3599eaefaf Merge branch 'develop' into bulk-add-tasks 2015-02-17 22:32:28 -06:00
Bill Parrott
789575d6fb Merge branch 'develop' into task-difficulty-context-classes 2015-02-17 22:31:27 -06:00
Sabe Jones
87b13d5fc8 chore(grunt): compile sprites 2015-02-17 20:46:40 -06:00
Sabe Jones
47f3122c2d chore(news): Pet rocks Bailey
Also fixes incorrectly named golden rocks.
2015-02-17 20:39:04 -06:00
Sabe Jones
0608ac5caa feat(quest): Pet Rocks 2015-02-17 20:02:06 -06:00
Blade Barringer
78430b1910 Collapsed 3 strings into single string 2015-02-17 15:26:42 -06:00
Bryce Wojtowicz
3a86435655 fixes #4670
edited groups.json (again)
sorry last edit
!!!
2015-02-18 05:08:02 +08:00
Bryce Wojtowicz
9f49626156 fixes #4670
edit: fixed the linkLFG so it included the entire Guild name
2015-02-18 05:06:13 +08:00
Bryce Wojtowicz
33520fc64d Fixed groups.json
fixes #4702

Cheers
2015-02-18 05:03:34 +08:00
Bill Parrott
7042c97d5d removing export functionality to move to its own branch 2015-02-17 14:23:55 -06:00
Bill Parrott
4563d22bf0 minor updates from code review 2015-02-17 14:05:09 -06:00
scribblypanda
d46633b089 added pet colour to feed/evolve notif 2015-02-17 12:54:34 -05:00
Blade Barringer
48e688d815 Merge branch 'bulk-add-tasks' of https://github.com/chimericdream/habitrpg into bulk-add 2015-02-17 08:05:36 -06:00
Bill Parrott
2de3a5dd55 first draft of bulk add 2015-02-17 00:25:56 -06:00
Bill Parrott
b1b478bc74 add task export functionality 2015-02-16 21:21:49 -06:00
Sabe Jones
e0cbeaadc5 chore(grunt): compile sprites 2015-02-16 18:31:00 -06:00
Sabe Jones
130261dacf feat(event): End Valentine's 2015-02-16 18:15:09 -06:00
Blade Barringer
6d26d3e053 Added original user achievement badge 2015-02-16 17:55:18 -06:00
Bill Parrott
9cf4d9086b be more explicit about priority value vs context class 2015-02-16 15:49:31 -06:00
Bill Parrott
812599cb77 add difficulty context class to task list items 2015-02-16 15:02:04 -06:00
Blade Barringer
16140089b0 Compiled sprites for bunny quest 2015-02-15 21:08:14 -06:00
Blade Barringer
c23f83c5ac Added new files for bunny quest 2015-02-15 21:05:03 -06:00
Matteo Pagliazzi
34d8a910e3 chore(i18n): update locales 2015-02-14 17:56:11 +01:00
Blade Barringer
28c648bb0b Compiled sprites for new backgrounds 2015-02-13 16:22:28 -06:00
Blade Barringer
235cf8cc24 Added new backgrounds 2015-02-13 16:20:49 -06:00
Blade Barringer
368d1b9941 Added instruction about compiling sprites 2015-02-12 21:58:44 -06:00
Blade Barringer
e605acffbe Corrected paths or nodemonignore 2015-02-12 21:45:37 -06:00
Blade Barringer
cb7f382a85 Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into common-convert
Conflicts:
	common/dist/scripts/habitrpg-shared.js
	common/dist/sprites/habitrpg-shared.css
2015-02-12 15:40:12 -06:00