0f5d2411b1
Adjust calculation of cronMP from checklists
2015-01-26 15:51:55 -05:00
6ca9c10cda
change some comments
2015-01-26 14:53:13 +10:00
731589c0ea
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
2015-01-25 08:39:37 +10:00
ff0906a5c0
Fix completed todos counting as checked dailies and change unless-else to if-else
2015-01-24 12:07:39 -05:00
1e35bcb6ed
Include checklist effect in cron MP gain and account for all gray dailies
2015-01-22 12:16:06 -05:00
350997d7b2
Add initial try for having undone dailies decrease gained MP
2015-01-21 11:26:25 -05:00
32ed4dace7
Fixed triad bingo achievement not being awarded to people who already
...
had it
2015-01-20 19:24:46 -06:00
cc6cb3785e
Merge branch 'mountmaster' into bailey-20150120
...
Conflicts:
dist/habitrpg-shared.css
dist/spritesmith0.css
dist/spritesmith0.png
dist/spritesmith1.css
dist/spritesmith1.png
dist/spritesmith2.css
dist/spritesmith2.png
dist/spritesmith3.css
dist/spritesmith3.png
dist/spritesmith4.css
dist/spritesmith4.png
2015-01-20 10:39:45 -06:00
42e1020c60
Added back in showCompleted=false to display tags
2015-01-19 18:50:54 -06:00
c7ccc5c21d
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
...
Conflicts:
dist/spritesmith0.png
dist/spritesmith1.png
dist/spritesmith2.png
dist/spritesmith3.png
dist/spritesmith4.png
2015-01-20 06:01:09 +10:00
da1a11b62d
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
2015-01-19 17:53:48 +10:00
8401790017
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
...
Conflicts:
dist/habitrpg-shared.css
dist/habitrpg-shared.js
dist/spritesmith0.css
dist/spritesmith0.png
dist/spritesmith1.css
dist/spritesmith1.png
dist/spritesmith2.css
dist/spritesmith2.png
dist/spritesmith3.css
dist/spritesmith3.png
dist/spritesmith4.css
dist/spritesmith4.png
locales/cs/gear.json
locales/de/gear.json
locales/de/generic.json
locales/de/subscriber.json
locales/es/communityguidelines.json
locales/es/gear.json
locales/es/generic.json
locales/es_419/communityguidelines.json
locales/es_419/gear.json
locales/es_419/generic.json
locales/es_419/questscontent.json
locales/fr/gear.json
locales/fr/generic.json
locales/fr/limited.json
locales/hu/backgrounds.json
locales/hu/communityguidelines.json
locales/hu/content.json
locales/hu/front.json
locales/hu/gear.json
locales/hu/generic.json
locales/hu/groups.json
locales/hu/limited.json
locales/hu/messages.json
locales/hu/npc.json
locales/hu/pets.json
locales/hu/questscontent.json
locales/hu/subscriber.json
locales/hu/tasks.json
locales/it/gear.json
locales/it/generic.json
locales/it/groups.json
locales/it/limited.json
locales/it/subscriber.json
locales/nl/gear.json
locales/nl/limited.json
locales/nl/questscontent.json
locales/pl/gear.json
locales/pl/limited.json
locales/pl/subscriber.json
locales/pt/gear.json
locales/ro/gear.json
locales/ru/gear.json
locales/ru/limited.json
script/content.coffee
2015-01-18 15:46:25 +10:00
75971b0f40
Added triad bingo check to releaseBoth function
2015-01-16 17:01:01 -06:00
d9fed69147
Corrected releasBoth function to reset current pet and deduct the
...
correct amount of gems
2015-01-16 16:52:59 -06:00
75cf2a4788
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster
...
Conflicts:
dist/habitrpg-shared.css
dist/habitrpg-shared.js
dist/spritesmith0.css
dist/spritesmith0.png
2015-01-16 10:46:59 -06:00
a805b4f0c9
Brought in lefnire's change so type cannot be changed on updateTask
2015-01-13 20:17:36 -06:00
27dab4ae4e
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
...
Conflicts:
dist/habitrpg-shared.js
2015-01-11 14:18:37 +10:00
d5436dc8ec
Corrected release mounts code
2015-01-10 09:13:25 -06:00
8f90d154a0
Merge remote-tracking branch 'upstream/develop' into mountmaster
...
Conflicts:
dist/habitrpg-shared.css
dist/spritesmith0.css
dist/spritesmith0.png
dist/spritesmith1.css
dist/spritesmith1.png
dist/spritesmith2.css
dist/spritesmith2.png
dist/spritesmith3.css
dist/spritesmith3.png
2015-01-08 11:30:53 -06:00
15eb64c7d2
Fixed cron dayStart option.
...
Wrote test cases to verify fix.
Fixed test cases that were incorrect.
2015-01-05 19:20:21 +01:00
ac08549f84
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
...
Conflicts:
dist/habitrpg-shared.js
2015-01-03 13:01:01 +10:00
0053dd67bd
Adjusted translation key text, added a new one for releasing both. Added
...
releaseBoth function
2015-01-02 13:20:58 -06:00
312aa11272
Refactored release scripts
2015-01-02 12:41:36 -06:00
3389d418ce
Set up system to calculate if Mountmaster should be awarded
2015-01-01 16:51:58 -06:00
3224cf6004
Corrected release2 script to actually release mounts
2014-12-31 17:20:22 -06:00
a5a7d22ce4
Merge branch 'mountmaster' of github.com:HabitRPG/habitrpg-shared into mountmaster
2014-12-31 13:17:21 -06:00
dd13727765
feat(NYE): New Year's cards
2014-12-30 19:58:40 -06:00
9e74d94e48
WIP(NYE): New Year's Cards
2014-12-29 20:57:12 -06:00
f7d45c951e
feat(seasonal): Implement snowball
...
Minor refactoring of special spell purchasing, and turns snowball into Gold- instead of Gem-purchasable.
2014-12-29 19:38:43 -06:00
7d74f36466
improve code for user.items.gear.owned.toObject as lefnire suggested in https://github.com/HabitRPG/habitrpg-shared/pull/305#issuecomment-55528155
2014-12-27 07:28:06 +10:00
71269a762f
reinsert comment that was accidentally removed
2014-12-27 07:28:06 +10:00
8678e10958
improve iteration over all owned items to correctly handle mogoose toObject - ref https://github.com/HabitRPG/habitrpg-shared/pull/305#issuecomment-55469925
2014-12-27 07:28:06 +10:00
0391d1afc4
add mostly pointless comment to trigger a new Travis build test since the last one didn't do what I wanted :)
2014-12-27 07:28:05 +10:00
abc2f59b57
allow the free weapon_warrior_0 equipment to be lost on death so that new players can experience equipment loss
2014-12-27 07:28:05 +10:00
d7f9760c0f
fix typo so that Ryan doesn't make pointed comments at me
2014-12-27 07:28:05 +10:00
87f51913d0
prevent off-class items and free items being lost on death
2014-12-27 07:28:05 +10:00
058e506d13
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
2014-12-27 07:05:52 +10:00
41f4ab7b8a
feat(event): Implement Seasonal Shop
2014-12-25 14:58:25 -06:00
95a6aa5586
Merge branch 'rebalancing-2014-12' of https://github.com/HabitRPG/habitrpg-shared into rebalancing-2014-12
...
Conflicts:
dist/habitrpg-shared.js
2014-12-20 08:48:21 +10:00
e1d44cc54f
HabitRPG/habitrpg#3260 Buttonless habit full width
...
When the user has neither a plus nor a minus button on
one of their habits, the habit’s title will now span the entire
width of the task div instead of having a gap to the left.
2014-12-18 14:01:31 -06:00
43dcded051
feat(quests): Boss damage from Habits
...
+ Habit hits now damage bosses at half the strength of Dailies and To-Dos. Also removed a bit of leftover commentary/logic from back when STR caused tasks to get blue faster.
2014-12-11 19:50:46 -06:00
324077566b
Merge branch 'mountmaster' of https://github.com/taldin/habitrpg-shared into taldin-mountmaster
...
Conflicts:
script/content.coffee
2014-12-11 08:31:19 -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
af130a701c
Diminish critical hit bonus towards 450%
2014-12-10 07:03:32 +08: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
2018cc84ab
fix(gem-cap) use customerId in gem purchase
2014-12-05 15:11:27 -07: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
Verabird