Sabe Jones
0a6d9fa23a
WIP(pets): Frog quest
2015-10-19 23:12:24 -04:00
Amin Arria
23114ac929
Fix trailing comma
2015-10-19 17:19:30 -04:30
Amin Arria
3bd809f7c2
Merge branch 'develop' of github.com:HabitRPG/habitrpg into Wrong-max-level-messages
2015-10-19 12:14:38 -04:30
Amin Arria
038039dbee
Fixes #5550 , change message according to rebirthLevel
2015-10-19 12:10:27 -04:30
Blade Barringer
2883dc6c85
Merge branch 'ksami-develop' into develop
2015-10-19 08:14:48 -05:00
Blade Barringer
9ad1dbd8ce
Adjust mystic hourglass string to take in interpolation
2015-10-19 08:10:37 -05:00
Blade Barringer
1a2510e4da
Adjsut string to take in interpolation
2015-10-19 08:03:27 -05:00
Ricardo Mendes
5e3f46d786
Checks user auto-equip preference in buy function
2015-10-19 05:52:46 +00:00
Ricardo Mendes
860abce1d7
Adds auto-equip string to locales/en
2015-10-19 05:20:10 +00:00
Blade Barringer
dbc9c5a48c
Merge pull request #6008 from locks/patch-1
...
Typo in comment string
2015-10-18 15:29:29 -05:00
Sabe Jones
22ec450521
feat(modals): Won Challenge
...
Draft of the modal that appears when a user wins a challenge. Needs better logic for when to display.
2015-10-16 23:36:57 -04:00
ksami
65dc274e49
Make text in options/settings translatable
2015-10-16 20:48:12 +08:00
Sabe Jones
338aced208
feat(modals): Grew Mount
...
A modal now appears when you raise a pet into a mount, which allows the user to immediately equip the new mount.
2015-10-15 17:33:20 -04:00
Sabe Jones
c6dd2a0d10
feat(modals): Hatch Pet modal
...
Complete except for the planned addition of a heart sprite over the pet.
2015-10-15 16:34:53 -04:00
Sabe Jones
380265731f
feat(world-boss): Exhaust Ian's text
2015-10-14 21:02:59 -04:00
Sabe Jones
e88030e15f
Merge pull request #6039 from HabitRPG/sabrecat/halloween-mount
...
Jack-O'-Lantern mounts
2015-10-14 16:46:55 -05:00
Sabe Jones
6505824cb6
feat(modals): Levelup modal
...
Introduces a new modal that displays whenever the user levels up.
2015-10-13 16:32:07 -04:00
Sabe Jones
825b316ba8
fix(analytics): Cap progressUp
...
Previously, users could cron with enormous quest progress values, and this would be logged to the cron event in Analytics. However, for the purposes of damaging world bosses, quest progress is capped at 900. Given that progressUp is primarily used to predict world boss damage, this commit now caps progressUp in analytics at 900 as well.
2015-10-13 14:27:16 -04:00
Alys
30de99b700
adjust world bosses FAQ answer
2015-10-13 06:49:07 +10:00
Sabe Jones
dcf17b5505
feat(event): Jack-O'-Lantern mounts
2015-10-12 14:49:12 -04:00
Blade Barringer
02133600ce
Add ios question to content
2015-10-12 07:40:31 -05:00
Alys
ece3e0d0aa
add FAQ item for World Bosses
2015-10-12 21:26:59 +10:00
Sabe Jones
b775b8f399
feat(modals): Simplified scroll drop
...
Conflicts:
website/views/shared/modals/quests.jade
2015-10-09 14:07:54 -04:00
Alys
20415da586
Merge pull request #6018 from dcecile/develop
...
Issue #2606 - Verify/fix indices during sortTask
2015-10-09 21:30:14 +10:00
Sabe Jones
4044b0cb64
fix(world-boss): Update mechanics explanation
2015-10-08 18:48:13 -04:00
Blade Barringer
60cc428b81
chore(i18n): update locales
2015-10-08 17:42:10 -05:00
Blade Barringer
d873848f81
Commit missing file
2015-10-08 17:37:10 -05:00
Blade Barringer
0ccf07a4e0
Compile sprites
2015-10-08 17:32:34 -05:00
Blade Barringer
ccd77090f4
Fix css template for sprites
2015-10-08 17:31:32 -05:00
Sabe Jones
58801f5025
fix(world-boss): Don't repeat explanation
2015-10-08 13:17:49 -04:00
Sabe Jones
291a135fe1
Merge pull request #6023 from HabitRPG/sabrecat/world-boss
...
Fall 2015 World Boss
2015-10-08 11:15:00 -05:00
Sabe Jones
1d4536fc47
fix(sprites): Remove errant blob
2015-10-08 10:59:44 -05:00
Thrashmandicoot
a1328bc837
Add bolding to item name
2015-10-07 20:10:27 -07:00
Thrashmandicoot
921cb3ca5d
Add displayXForGold keys, refactor sell egg for gold
2015-10-07 19:17:13 -07:00
Sabe Jones
aba3908170
chore(gulp): Compile sprites
2015-10-07 15:15:21 -04:00
Dan Cecile
22284bbc24
Issue #2606 - Verify/fix indices during sortTask
...
Because the 'sortTask' operation uses a 'from' index and a 'to'
index as parameters, the server needs to check if these indices
are valid before performing the client's request. If the task ID
doesn't match the task at the 'from' index, then it's clear that
the client was looking at a preened list of todos (everything except
more-than-3-days-old-non-quest completed tasks). In that case, try
to recalculate the indices before continuing.
2015-10-06 21:24:34 -04:00
Sabe Jones
51355f7eea
fix(quest-eggs): Short-circuit canBuy
...
Also corrects the FAQ link in the site footer to use the new static FAQ page instead of the wiki.
2015-10-06 16:56:17 -04:00
Sabe Jones
d27fb9dba2
WIP(world-boss): Rage and rewards
...
Also finishes out written story content.
2015-10-06 15:59:16 -04:00
Sabe Jones
3ca836a81c
fix(world-boss): Pass test
...
Also uncomment the line used to hide display of the boss in the Tavern, because we won't be doing a dry run of that style this time around.
2015-10-05 17:18:44 -04:00
Sabe Jones
f6abcc0ddf
WIP(world-boss): Initial stats outlay
...
Also quest reward sprites, groundwork for world damage, and partial content build.
2015-10-05 16:59:19 -04:00
Sabe Jones
0d7a57d176
Merge branch 'develop' into sabrecat/world-boss
...
Conflicts:
common/dist/sprites/habitrpg-shared.css
2015-10-05 14:57:59 -04:00
Sabe Jones
dd53383ec6
Merge pull request #6002 from HabitRPG/sabrecat/backgrounds-201510
...
October 2015 backgrounds
2015-10-05 11:29:44 -05:00
Alys
f035dfd8b9
fix "Advanced Options in tasks start collapsed" when "Open new tasks in edit mode" is on - fixes https://github.com/HabitRPG/habitrpg/issues/5981
2015-10-05 19:37:53 +10:00
Ricardo Mendes
f29f3a6b0e
typo
2015-10-04 13:34:22 +01:00
Blade Barringer
393cc71309
Correct gold purchasable quests
2015-10-03 09:21:15 -05:00
Blade Barringer
36d7c59a0c
Add backgrounds to content file
2015-10-03 06:49:14 -05:00
Blade Barringer
6dbfbeec81
Merge branch 'develop' into HabitRPG-sabrecat/backgrounds-201510
2015-10-03 06:40:50 -05:00
Blade Barringer
928e8478f7
Add coffeescript back in
2015-10-03 06:39:10 -05:00
Blade Barringer
655d8de7c8
chore(i18n): update locales
2015-10-02 22:28:12 -05:00
Blade Barringer
7a9bdfc9bf
Correct base sets
2015-10-02 22:26:51 -05:00
