11ec69674c
chore(grunt): grunt
2014-12-10 21:49:40 -06:00
2fc0cb8fa1
fix(scoring): move gainMP into score
2014-12-10 21:45:51 -06:00
7b22244f01
feat(scoring): MP gain from Habits and Dailies
...
Turns MP gain from tasks into a function, and calls the function with varying inputs from Habits (1/4 gain), Dailies (normal gain), and To-Dos (normal gain multiplied by checklist completion).
2014-12-10 21:21:09 -06:00
935dc2cd2e
Merge pull request #383 from betaveros/cap-crit-multiplier-cp
...
Diminish critical hit bonus towards 450% (rebalancing-2014-12 copy)
2014-12-10 12:06:39 +10:00
af130a701c
Diminish critical hit bonus towards 450%
2014-12-10 07:03:32 +08:00
3d2c7e8854
Fixed a grammar error in the Golden Knight 2 quest
...
Changed “Perhaps I will shall . . . “ to “Perhaps I will . . . “
2014-12-08 12:19:08 -06:00
6739ec25a3
Merge pull request #379 from andymantell/feature/linking-timetravellers-names
...
Link for Tyler and Vicky's names
2014-12-06 16:48:00 -06:00
3de86f35cb
fix(plans): attempted fix for: Cast to number failed for value "NaN" at
...
path "purchased.plan.consecutive.count", see https://github.com/HabitRPG/habitrpg/issues/4317
2014-12-06 12:49:19 -07:00
17f9d4de72
fix(i18n): fix english string
2014-12-06 19:18:28 +01:00
82cea43e07
Link for Tyler and Vicky's names
2014-12-06 15:42:32 +00:00
b23a76f8c8
Merge pull request #365 from crookedneighbor/fix-moment-deprication-warnings-on-tests
...
Corrected ordering of arguments for moment().add and moment().subtract
2014-12-06 00:56:16 -06:00
2018cc84ab
fix(gem-cap) use customerId in gem purchase
2014-12-05 15:11:27 -07:00
f010bd7ad9
chore(i18n): update locales
2014-12-05 16:21:13 +01:00
09aeaf2812
Merge branch 'crookedneighbor-translate-mystic-items' into develop
2014-12-05 16:06:51 +01:00
198d41d5e8
fix(pr): conflicts
2014-12-05 16:06:15 +01:00
4aacc103db
Merge pull request #377 from SabreCat/gems
...
Prettify Market Gem
2014-12-04 20:31:45 -06:00
a0434e67a6
Revert "fix(style): Pet key margins like sub gems"
...
This reverts commit d584e998ba
2014-12-04 20:26:27 -06:00
d584e998ba
fix(style): Pet key margins like sub gems
2014-12-04 20:14:16 -06:00
6dac81f850
Corrected strings so they only used on variable
2014-12-04 20:03:17 -06:00
6369934ca3
feat(Gems): Add strings for Market gem
2014-12-04 19:04:07 -06:00
a55fa37412
Converted strings to be able to use links
2014-12-03 22:46:41 -06:00
2e2faa6117
Moved pre-subscription time travelers title and popover to shared
2014-12-03 22:24:43 -06:00
87092e8109
Added mystic hourglass and time travelers screens
2014-12-03 22:19:33 -06:00
cc32369497
fix(style): Prettify Market Gem
2014-12-03 22:10:35 -06:00
6ac6f4d476
fix(plans): fix conversion cap
2014-12-03 20:24:35 -07:00
9e64bc3788
fix(plans): move plan reset up for people in inn
2014-12-03 20:16:33 -07:00
9d3e6c71fe
fix(plans): possible safe-check of gemcapextra cc @Sabrecat
2014-12-03 20:03:40 -07:00
cb8c1359c4
fix(plans): mystery 3014 promo
2014-12-03 19:24:26 -07:00
78a4edb38a
i18n(plans): update wording cc @Alys
2014-12-03 19:14:27 -07:00
3dd775235d
fix(): remove some logs
2014-12-03 19:05:54 -07:00
a62a09d7d2
Merge pull request #376 from HabitRPG/block-subs
...
Block Subscriptions
2014-12-03 16:02:14 -07:00
bf7e1e66ed
feat(plans): time traveler - by full sets
2014-12-03 15:24:08 -07:00
d81badde69
feat(plans): add time traveler - buy individual mystery items
2014-12-03 15:24:08 -07:00
76be625f6d
feat(plans): add consecutive-month benefits for subscribers
2014-12-03 15:24:08 -07:00
a6944ec072
Merge pull request #375 from SabreCat/develop
...
December backgrounds
2014-11-30 23:20:22 -06:00
d7b904efec
chore(December): grunt
2014-11-30 23:08:53 -06:00
4d8a9c5287
feat(backgrounds): December purchasables
2014-11-30 22:54:37 -06:00
703451d452
fix(mystery): typo
2014-11-30 14:11:49 -07:00
f7c6e9063b
chore(i18n): update locales
2014-11-30 21:59:49 +01:00
aa6afcdce8
chore(i18n): update locales
2014-11-30 20:21:59 +01:00
192110e25a
grunt
2014-11-29 09:04:58 -07:00
5ee9f4904a
Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop
...
Conflicts:
locales/en/gear.json
2014-11-29 08:26:23 -07:00
e4478355bc
Merge pull request #372 from ShilohT/gear
...
Standardization of locales/en/gear.json
2014-11-29 21:00:12 +10:00
eb27a76709
feat(thanksgiving): revert npcs back to normal
2014-11-28 18:34:36 -07:00
17f3868b96
Merge pull request #374 from SabreCat/turkey
...
Give Alex and Bailey their Thanksgiving costumes
2014-11-27 12:13:05 -07:00
60bf777668
grunt
2014-11-27 12:11:14 -07:00
a4a94f7973
fix(event): grunt
2014-11-27 09:13:20 -06:00
d37dd90484
fix(event): Festify missed NPCs
2014-11-27 09:05:21 -06:00
0a4dc94474
Merge pull request #370 from Alys/gem-cap-message-2014-11-25
...
make Gold=>Gem conversion cap message more accurate in terms of when to wait until - fixes https://github.com/HabitRPG/habitrpg/issues/3996
2014-11-27 14:46:23 +10:00
a86b92f5a0
Standardized text in gear.json
...
Added "Confers no benefit." if missing.
Added "(Month) 2014 Subscriber Item." if missing.
Rearranged some Mystery Item notes from "(Description). (Month) 2014
Subscriber Item. Confers no benefit." to "(Description). Confers no
benefit. (Month) 2014 Subscriber Item."
- All Special Event accessory notes are written in this order.
Changed "October 2014 Subscriber Outfit" to "October 2014 Subscriber
Item".
- All other preexisting Mystery Item strings read "Item".
Changed "Adds # points to (Stat)" in some Special Event equipment to
"Increases (Stat) by #"
- All other equipment reads "Increases (Stat) by #."
Changed "Confers no stat bonus." to "Confers no benefit." in some
Special Event accessories.
- All other items read "Confers no benefit."
Moved "Limited Edition 2013 Winter Gear." to end of string.
- All other Limited Edition tags are at the end.
Changed and capitalized "Special edition convention armor." to "Special
Edition Convention Item."
- Armor is a type of equipment.
2014-11-26 23:26:30 -05:00
Sabe Jones