Sabe Jones
8447259016
Merge pull request #6921 from HabitRPG/sabrecat/spring-2016
...
Spring Fling 2016
2016-03-18 16:08:46 -05:00
Sabe Jones
b5f91a657f
feat(event): Spring Fling complete
2016-03-18 16:56:16 -04:00
Sabe Jones
10a8476aaf
WIP(event): Spring Fling cont'd
2016-03-17 13:10:05 -04:00
Sabe Jones
4effa79e17
WIP(event): Spring Fling partial
2016-03-17 13:04:12 -04:00
Blade Barringer
ced0b44b2f
fix: Remove name from sortable inventory
2016-03-17 08:47:56 -05:00
Blade Barringer
d4d668a7aa
fix: Correct typo in equipment click
2016-03-17 08:09:37 -05:00
Blade Barringer
c7310b97ec
Revert "Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues."
...
This reverts commit 9d50201180 .
2016-03-17 08:09:18 -05:00
Alys
9d50201180
Revert inventory equipment/gear sorting due to inability to de/equip and maybe performance issues.
...
This reverts commits 1c811dbc82 , 146810a3e9 , 9508ed45df , a6fb945120 .
2016-03-17 21:47:29 +10:00
Blade Barringer
1c811dbc82
refactor: Extract orderBy equipment button into mixin
2016-03-15 19:41:24 -05:00
Blade Barringer
9508ed45df
refactor: Move order by equipmentment button to top of view
2016-03-15 19:41:11 -05:00
Matt Harrington
a6fb945120
inventory sorting
...
Add inventory sorting buttons based on name, attribute, and set (armoire):
- Each gear[klass] has its own sorting buttons and sorting state including costume classes
- The attributes sort descending when selected, then by sum of all attributes
- There is no default sort
- The armoire also sorts by set which sorts by item[set] descending, it does not sort within a set (ex "1 of 3" vs "2 of 3")
- Name sorts by .text() ascending
2016-03-15 19:41:11 -05:00
Sabe Jones
f7c9769aab
chore(event): revert Valentine's
2016-02-15 14:48:39 -05:00
Sabe Jones
e1b13db6e8
feat(quests): pets 201602
...
Also enables the Valentine's Day card for selection in the Market.
2016-02-08 16:20:05 -05:00
Sabe Jones
0fcdc49adb
chore(event): end Winter Wonderland
2016-02-01 17:01:17 -05:00
Sabe Jones
cb984d8d22
fix(event): remove NYE card
2016-01-04 18:27:52 -05:00
Sabe Jones
cc00602112
fix(event): remove magic potions
2016-01-04 11:56:34 -05:00
Sabe Jones
6c3e8e2081
feat(event): more NYE
2015-12-30 16:58:57 -05:00
Sabe Jones
468198b9e2
feat(mystery): subscriber items 2015-12
...
Also enables the Snowball in the Seasonal Shop.
2015-12-22 16:16:30 -05:00
Sabe Jones
6ed9133f70
WIP(event): Winter Wonderland 2015-16 partial
2015-12-15 17:15:02 -05:00
Nathan Maton
35a921bf43
feat(content): Make mystery set strings translatable
...
Squashed and cleaned up version of
https://github.com/HabitRPG/habitrpg/pull/6367
2015-12-15 08:47:13 -06:00
Joy Clark
7628882f24
use new css class
2015-12-08 13:22:13 +01:00
Sabe Jones
0f578b79ff
feat(pets): Peppermint Hatching Potions
...
Also fixes an issue where the pet hatching modal would appear when the user attempted to hatch a premium version of a quest pet.
2015-12-04 17:20:33 -05:00
Sabe Jones
2cb4e80019
chore(event): End Fall Festival
2015-11-02 12:55:48 -05:00
Blade Barringer
add761e58e
Remove extraneous div
2015-10-30 23:05:19 -05:00
Blade Barringer
92271c2049
Clean up view for market.
2015-10-30 22:49:13 -05:00
Thrashmandicoot
1051ff0006
Fix inline-styling to be class styling
2015-10-30 20:01:22 -07:00
Thrashmandicoot
64ea4e42e7
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into merchant-button-fix
2015-10-30 03:43:35 -07:00
Thrashmandicoot
0e52a62ad2
dynamic images for merchant, finishes refactor
2015-10-30 03:43:13 -07:00
Thrashmandicoot
e1b26a884c
Add display for selling items, needs right img
2015-10-30 02:27:36 -07:00
Blade Barringer
dd09633d31
Merge branch 'locks-auto-equip' into develop
2015-10-29 12:25:18 -05:00
ksami
f2c856f6e6
Make link translatable in options/inventory/time-travelers
2015-10-23 23:40:11 +08:00
Sabe Jones
d0a34fc0ad
feat(quests): 2015-10 Pet
...
Also adds Exhaust Strike-specific text to the remaining affected NPCs.
2015-10-20 12:32:45 -04:00
Ricardo Mendes
73924df241
Adds auto-equip UI to equipment view
2015-10-19 05:20:11 +00:00
Sabe Jones
380265731f
feat(world-boss): Exhaust Ian's text
2015-10-14 21:02:59 -04:00
Thrashmandicoot
40ea62344b
Add bold to item output when selling item
2015-10-07 20:11:07 -07:00
Thrashmandicoot
7c16197ec9
Refactor market to display eggs properly, wip
2015-10-07 19:19:56 -07:00
Thrashmandicoot
dadf1d5b0b
Add divider between sell button and text for market
2015-10-07 11:52:47 -07: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
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
Blade Barringer
0f8c3e03c2
Correct mount mixin
2015-10-01 13:25:00 -05:00
Blade Barringer
c8afac9580
Put magic pets on their own row
2015-10-01 13:21:15 -05:00
Sabe Jones
9afaa92c2e
feat(magic-potions): Clarify drop behavior
2015-09-30 15:31:09 -04:00
Sabe Jones
feff6fadfa
feat(magic-potions): Final tweaks
2015-09-28 14:58:46 -04:00
Sabe Jones
8dcfe3078f
fix(inventory): Missing pixel paws
2015-09-25 16:31:07 -04:00
Sabe Jones
38bdbf020b
feat(content): Generalize canBuy
2015-09-25 15:01:08 -04:00
Sabe Jones
04416c4d73
feat(pets): Improve egg canBuy logic
2015-09-24 17:33:58 -04:00
Sabe Jones
1aa5757847
fix(magic-potions): Hatching tweaks
...
* Additional notes on popover noting magic potions can't be used on quest pet eggs
* Less techy error message when attempting to hatch quest pet egg with magic potion
* Don't highlight quest pet eggs as targets for magic hatching potion
2015-09-23 16:40:45 -04:00
Sabe Jones
8c67d22a91
feat(pets): Full purchase behavior
2015-09-22 17:03:41 -04:00
Sabe Jones
e96410aa57
feat(pets): Spooky pets/mounts
2015-09-22 14:23:52 -04:00
Sabe Jones
389b5b370a
feat(pets): Magic Hatching Potions WIP
2015-09-21 17:12:23 -04:00