5b9bbb9729
refactor(bs3): settings
2014-02-05 19:54:50 +01:00
0cc31465ed
refactor(bs3): challenges
2014-02-05 19:39:26 +01:00
5d4d82ad51
refactor(bs3): port options (profile, inventory, social (groups and hall)) and misc
2014-02-05 19:05:42 +01:00
b89081dd41
refactor(bs3): misc fixes
2014-02-04 20:18:27 +01:00
685b7a3cd2
Merge branch 'develop' into paglias/bs3
2014-02-04 20:16:00 +01:00
07a47d353d
Merge pull request #2666 from marcgenesis/develop
...
Fixed inventory alignment. Issue #2158
2014-02-04 11:00:52 -08:00
56133894d8
refactor(bs3): sync with develop
2014-02-03 18:45:25 +01:00
f8796e9028
feat(winter): remove purchasable winter hair colors, keep available if
...
they purchased during event
2014-02-02 23:17:54 -07:00
f193790550
Merge pull request #2698 from deilann/fixstats
...
changing order of stats in character build
2014-02-02 15:58:54 -08:00
2e3ee3f97c
removes progress bar of unfeedable pets
2014-02-02 13:22:24 -08:00
07593dc122
refactor(bs3): port quests modals, fix restore modal and various bugs
2014-02-02 16:43:58 +01:00
571954b5cf
refactor(bs3): misc fixes, port restore, delete and reset modals
2014-02-02 16:06:30 +01:00
3e077fea6d
refactor(bs3): port rebirth and reroll modals, misc fixes
2014-02-02 13:52:42 +01:00
f31723b0ab
refactor(bs3): sync with develop
2014-02-02 13:26:35 +01:00
527f230ee5
Merge pull request #2701 from deilann/wizardtomage
...
Change "Wizard" to "Mage" in member modal & inventory
2014-02-01 16:21:32 -08:00
dafd015173
wizard to mage in inventory
2014-02-01 15:20:02 -08:00
d581986dd9
changing order of stats in character build
2014-02-01 13:14:51 -08:00
0afaa69d7d
Created new CSS entry for equipment title and modified inventory.jade accordingly
2014-02-01 13:17:21 -05:00
875698c111
Created new CSS entry for equipment-title and modified inventory.jade accordingly
2014-02-01 12:52:38 -05:00
0a047f5b2f
Merge branch 'develop' into paglias/bs3
2014-02-01 16:47:32 +01:00
52f8f0d5b0
feat(winter): remove winter scrolls & snowballs
2014-02-01 07:43:25 -08:00
800231cf64
feat(quests): allow html in quest notes
2014-01-31 15:06:56 -07:00
cc348b2f11
refactor(bs3): sync with develop & misc
2014-01-31 20:04:40 +01:00
0764aa8c17
refactor(bs3): convert icons to new format
2014-01-31 19:47:48 +01:00
aff885c05c
feat(habitBirthday): add habitrpg birthday event. includes cakes for all
...
pets, absurd party robes, npc swap, badge, etc. @lemoness
2014-01-30 19:20:07 -07:00
2e64b03a63
Fixed inventory alignment. Issue #2158
2014-01-30 19:58:34 -05:00
49ec9d2e5c
Fixed inventory alignment. Issue #2158
2014-01-30 19:57:50 -05:00
76db2d49c2
18n(merge): merge @Sinza- pr, @lefnire now it is ready
2014-01-30 22:25:42 +01:00
44d9ea2a15
i18n(interpolation): Add string interpolation
2014-01-30 18:25:25 -02:00
5f0cf6575c
fix(settings): remove unnecessary code
2014-01-30 18:44:53 +01:00
e9fb7d0343
Merge pull request #2627 from Sinza-/subscriber
...
i18n(subscriber): replace subscriber hard-coded strings for env.t
2014-01-30 09:37:42 -08:00
a6d66f68ba
Merge remote-tracking branch 'upstream/sabe/attributes' into develop
2014-01-30 11:10:09 -06:00
f6e12fa25e
fix(allocateNow): Send empty object to user.ops per @colegleason suggestion
...
Tested with both implemented allocation modes, looks good!
2014-01-30 07:55:27 -06:00
aeb705b652
style(tavern): add space between 2 and gems
2014-01-29 17:38:32 -02:00
2b17b041ca
Merge pull request #2533 from Sinza-/buy-quest
...
Add information to quests on the Market before you buy them
2014-01-28 18:49:29 -08:00
cd4cb0a552
i18n(subscriber): replace subscriber hard-coded strings for env.t
2014-01-28 22:30:05 -02:00
9226b83d84
Merge pull request #2591 from Alys/patch-2
...
Market "Sell..." button: add spaces, remove bracket
2014-01-28 10:48:54 -08:00
abdbaa6fe3
Merge pull request #2583 from Sinza-/split-main-json
...
Split main.json
2014-01-28 10:25:31 -08:00
3785dad215
Merge pull request #2605 from Sinza-/split-fix
...
Remove duplicated 'none' and minor adjusts
2014-01-28 10:24:37 -08:00
76a7ab5bcc
feat(attributes): Add backfill button in flat and classbased allocation modes
...
Partial implementation of a "distribute points now" button for backfilling accrued Attribute points. Works with flat and classbased allocation so far; taskbased will require much fancier handling.
2014-01-28 08:57:29 -06:00
f7f4a0c166
feat(administrators): start adding features page for admin accounts
2014-01-27 18:24:24 -08:00
f8bc2d7618
Remove duplicated 'none' and minor adjusts
2014-01-27 23:27:11 -02:00
2e18f0eb82
feat(premium): backport client-side premium code to public repo, it's
...
client-side anyway (@colegleason @paglias)
2014-01-27 16:34:22 -08:00
06200accad
fix(translation): Fix #2585 .
...
Since it was working before the env.t replacement I put this as translation (and also because I didn't know what else to put =p).
2014-01-27 14:21:50 -02:00
a0dad56a9b
Market "Sell..." button: add spaces, remove bracket
...
Fix some text appearance issues:
- Use item.text instead of item.key so that users see "Tiger Cub" rather than "TigerCub".
- Remove unwanted ) from end of gold value so that users see "3 Gold" instead of "3) Gold". Bracket had been left over from the end of the old env.t(...) function call - see https://github.com/HabitRPG/habitrpg/commit/4f07ab39b0868764c665bbf914474745e11ecc32
- Add spaces between words so that users see "Sell Fox for 3 Gold" instead of "SellFoxfor3Gold". There are other shorter/neater ways to insert those spaces, but making them really obvious with nbsp is probably the best way to ensure they don't get accidentally removed again.
2014-01-27 19:27:06 +10:00
51bff23885
fix(stable): show hatchable combo when petOwned>0 (fyi @deilann)
2014-01-26 17:46:09 -08:00
5caaff1cea
fix(beastmaster): fixes #2557 , adds opacity to previously-owned pets
...
after they're mounted. You can earn them back again
2014-01-26 17:24:48 -08:00
62af638e8a
Merge pull request #2570 from deilann/patch-1
...
removed stray paren in profile.jade
2014-01-26 12:41:06 -08:00
c09d89f872
Fix version conflict
2014-01-26 17:39:36 -02:00
8d41c44ad7
Fix version conflict
2014-01-26 17:37:54 -02:00
Matteo Pagliazzi