Commit graph

1353 commits

Author SHA1 Message Date
mgnrsb
40bcf979d5 Updated capitalization for consistency
e.g. dailies --> Dailies
2014-10-09 20:37:15 -05:00
Tyler Renelle
d843ff1ae4 feat(item-store): unlock item-store earlier (lvl 1), see #4134 2014-10-09 17:23:54 -06:00
Alice Harris
4e3b0e1dfe Merge pull request #332 from Alys/Gaelan-hide_completed_dailies-modified
add strings for Dailies tabs (Due and Grey)
2014-10-09 20:18:26 +10:00
Alice Harris
1d8906dd3b remove irrelevant changes to dist/habitrpg-shared.js 2014-10-09 20:14:42 +10:00
Alice Harris
571b8afc86 add strings for Dailies tabs (Due and Grey) 2014-10-09 20:07:15 +10:00
Alice Harris
3d8d103a02 Merge pull request #328 from betaveros/have-unallocated
Add haveUnallocated string
2014-10-09 17:54:55 +10:00
Tyler Renelle
a699c2924e chore(moment): upgrade moment, run grunt 2014-10-08 17:44:47 -06:00
Tyler Renelle
1e9c1295e5 fix(moment): fix deprecated warnings, use updated moment syntax 2014-10-08 17:38:37 -06:00
Matteo Pagliazzi
6248d056d1 Merge pull request #330 from AnnaPhilips/develop
Fix misspelled artist's name in Rooster quest
2014-10-08 19:45:25 +02:00
Anna Philips
0def172bfc Fix misspelled artist's name in Rooster quest
"extrajordinary" is changed to "extrajordanary"
Issue: #4089
2014-10-08 17:04:25 +05:30
Matteo Pagliazzi
a0072b88f3 chore(i18n): update locales 2014-10-07 17:35:21 +02:00
Matteo Pagliazzi
d94a36fb10 Merge branch 'brandonjreid-uncheck' into develop 2014-10-07 17:01:24 +02:00
Matteo Pagliazzi
166d53ac1b chore(github): merge pr #327 2014-10-07 17:01:06 +02:00
Tyler Renelle
76d4f684cf feat(halloween): add jackolantern pet 2014-10-06 15:39:38 -06:00
Brandon Reid
d0cebce605 Fixed bug when calculating the reverse delta.
Added in a case for a todo with checklists
so the gp and exp for those are reversed correctly.
Added a couple test cases for checking then unchecking tasks.
2014-10-06 13:33:43 -06:00
Brian Chen
3a6a61e5ca Add haveUnallocated string 2014-10-04 20:29:58 +08:00
Matteo Pagliazzi
34fd824b1a chore(i18n): update locales 2014-10-04 13:53:35 +02:00
Tyler Renelle
3d638e4182 fix(spookDust): rename to spooky sparkles 2014-10-03 13:22:06 -06:00
Tyler Renelle
8cef966713 fix(spookDust): user serverside method for spookdust as it's path-protected 2014-10-03 00:31:49 -06:00
Tyler Renelle
5718fb183a feat(backgrounds): replace spookyForest with pumpkinPatch 2014-10-02 23:06:34 -06:00
Tyler Renelle
786f9a92df feat(spookDust): add the spookDust special spell, like snowballs. Note: this is handled specially so spookDust can be bought with GP, is a WIP 2014-10-02 23:05:28 -06:00
Tyler Renelle
29262826e2 feat(backgrounds): october backgrounds 2014-10-02 18:47:11 -06:00
Tyler Renelle
e754ed48f7 fix(memleak): add a "nullify" function to user wrapper. This is stupid,
find a better way. See HabitRPG/habitrpg#4079
2014-10-02 16:44:33 -06:00
Brandon Reid
65b3561fb0 Changed calculateDelta() so when unchecking a task it removes the right amount of gold and exp 2014-10-01 17:13:51 -06:00
negue
93f59936c4 Merge pull request #318 from negue/markdown_notes
add markdown as angular filter
2014-10-01 20:15:11 +02:00
negue
57ef833aea Merge pull request #288 from negue/apiUrlService
ApiUrlService as preparation for custom endpoints
2014-10-01 19:57:33 +02:00
Tyler Renelle
c6b56706fa feat(mystery): oct present art 2014-09-30 21:46:28 -06:00
Tyler Renelle
8cce88a5ad feat(halloween): add seasonal i18n strings 2014-09-30 21:25:19 -06:00
Tyler Renelle
c635fef960 grunt() 2014-09-30 20:29:16 -06:00
Tyler Renelle
2f937b6340 Merge pull request #325 from lemoness/develop
Fall Festival 2014 Skins and Hair Colors
2014-09-30 19:28:27 -06:00
Alice Harris
7d22fb0944 Merge pull request #322 from deilann/release_pets_shared
feat(pets): release pets
2014-10-01 06:35:47 +10:00
Lemoness
23a57ac9ad Fall Festival 2014 Skins and Hair Colors
Skins and Hair Colors for the Fall Festival Event
2014-09-30 11:50:42 -07:00
deilann
2054d10de2 release pets feature 2014-09-29 15:11:24 -07:00
Matteo Pagliazzi
2445ff33ca Merge pull request #321 from Alys/readmes-Sep28-2
add extra README files to help translators realise they should not edit directly
2014-09-28 20:51:07 +02:00
Alice Harris
e15e041797 do not edit any files in this directory 2014-09-28 08:57:26 +10:00
Matteo Pagliazzi
94511f3a1c chore(i18n): update locales 2014-09-27 18:54:59 +02:00
Matteo Pagliazzi
b00e9034b6 Merge pull request #320 from hazel-nut/snowflake-wand
correcting snowflake wand text. fixes HabitRPG/habitrpg#3989
2014-09-27 18:36:42 +02:00
Tyler Renelle
ee39286c8d feat(mystery): 201409 2014-09-24 23:21:05 -06:00
Jess Virdó
64622666a0 correcting snowflake wand text. fixes #3989 2014-09-23 15:37:10 -04:00
Matteo Pagliazzi
c453343502 chore(i18n): update locales 2014-09-21 21:48:08 +02:00
Alice Harris
d82a8440ec Merge pull request #317 from Alys/mysteryDate-Sep20
add more on-hover text to Mystery Item box to explain when it is released
2014-09-21 08:40:50 +10:00
Tyler Renelle
731d75a059 Merge branch 'fall-fest' into develop 2014-09-20 14:01:30 -06:00
Negue
47e6dda82c add markdown as angular filter 2014-09-20 12:05:26 +02:00
Alice Harris
eb51a3f989 add on-hover text to Mystery Item box to explain when it is released because SO MANY QUESTIONS EVERY MONTH 2014-09-20 11:13:18 +10:00
Tyler Renelle
30be8749c4 Merge pull request #313 from Alys/develop1
allows stats to change for users who used rebirth
2014-09-16 20:55:19 -06:00
Tyler Renelle
bf7f65e8c8 feat(fall): npc-swap 2014-09-16 17:43:46 -06:00
Tyler Renelle
133634c247 feat(fall): special fall gear 2014-09-16 17:30:22 -06:00
Tyler Renelle
2790ee1bab feat(fall): Add candy drops. Add canDrop & canBuy to food, handled separately for this
event and future events
2014-09-16 17:25:58 -06:00
Tyler Renelle
fc73c0841f feat(quests): add rooster rampage quest 2014-09-16 16:08:21 -06:00
Alice Harris
b93445ed93 allows stats to change for users who used rebirth 2014-09-17 06:24:39 +10:00