Matteo Pagliazzi
317a148760
refactor(bs3): port newStuff and member modals, misc fixes
2014-02-02 15:55:01 +01:00
Matteo Pagliazzi
3e077fea6d
refactor(bs3): port rebirth and reroll modals, misc fixes
2014-02-02 13:52:42 +01:00
Matteo Pagliazzi
f31723b0ab
refactor(bs3): sync with develop
2014-02-02 13:26:35 +01:00
Cole Gleason
61a4a90d2c
Merge pull request #2610 from etryn/develop
...
Fixed unnecessary margin on button group buttons
2014-02-01 23:56:43 -08:00
Cole Gleason
dab9ddbda2
fix(quests): quests with a level cap cannot be bought before that level.
...
Users were buying the vice quest hoping to play it, not realizing it
would drop at that level. Let's restrict buying the quest (at least in
the short term) until you reach that level.
Fixes #2707 .
2014-02-02 01:54:23 -06:00
Matteo Pagliazzi
8b29eb530a
refactor(bs3): port drops modals
2014-02-01 19:39:05 +01:00
Matteo Pagliazzi
f6a8b9e4cb
refactor(bs3): port some modals & css fixes
2014-02-01 19:19:48 +01:00
Matteo Pagliazzi
4dcf74a38a
refactor(bs3): port avatar level label
2014-02-01 17:18:37 +01:00
Matteo Pagliazzi
af42ec263e
refactor(bs3): port several modals & css fixes
2014-02-01 17:04:21 +01:00
Matteo Pagliazzi
0a047f5b2f
Merge branch 'develop' into paglias/bs3
2014-02-01 16:47:32 +01:00
Matteo Pagliazzi
ff49695635
refactor(bs3): misc fixes & port death modal
2014-02-01 16:46:48 +01:00
Sabe Jones
2d97577708
Textual tweaks for spellcasting
...
Makes the notification for casting a spell on the party consistent with the message generated in party chat.
2014-02-01 07:01:40 -06:00
Tyler Renelle
800231cf64
feat(quests): allow html in quest notes
2014-01-31 15:06:56 -07:00
Matteo Pagliazzi
f4c30390f5
refactor(bs3): start porting app, general layout and filters
2014-01-31 21:18:44 +01:00
Matteo Pagliazzi
7354efc1d5
refactor(bs3): working register & prettier login modal
2014-01-29 21:28:11 +01:00
Matteo Pagliazzi
3f3869ea28
refactor(bs3): working login modals, had to readd bootstrap origin javascript plugins
2014-01-29 18:37:51 +01:00
Matteo Pagliazzi
4c9da6883f
refactor(bs3): static pages
...
works everything exeception made for the login modal, it opens but since this directive has had a lot of changes in angular-ui-bootstrap it will require more work (like all modals), @lefnire
2014-01-29 18:26:58 +01:00
Matteo Pagliazzi
f0ebd597b3
refactor(dependencies): update dependencies for bootstrap 3 upgrade @lefnire
2014-01-29 16:44:12 +01:00
Cole Gleason
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
Tyler Renelle
a582a0546d
feat(marketing): some frontpage updates, a screenshot, & "contact us"
...
button mods
2014-01-28 10:36:05 -08:00
Matteo Pagliazzi
14b01836c5
fix(merge)
2014-01-28 19:10:07 +01:00
Matteo Pagliazzi
6ac7f9e5c7
merge @speg pr
2014-01-28 19:08:35 +01:00
Tyler Renelle
66f95cdd4c
feat(premium): updates to group plans info page
2014-01-28 09:22:46 -08:00
Etryn
9fa8646768
Fixed unnecessary margin on button group buttons
...
Buttons in groups in bootstrap are styled to touch on inside edges to
appear joined, so should not have a 5 px margin between them.
2014-01-28 01:13:24 -08:00
Tyler Renelle
f7f4a0c166
feat(administrators): start adding features page for admin accounts
2014-01-27 18:24:24 -08:00
Tyler Renelle
0ddaae4d75
feat(homepage): start cleaning up homepage, add navbar for play button & upcoming links
2014-01-27 17:40:43 -08:00
Tyler Renelle
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
Tyler Renelle
1d8539837c
Merge pull request #2576 from Sinza-/mult-sell-buttons
...
Fix multiple sell buttons appearing simultanously when clicking on food + egg or potion
2014-01-26 17:26:42 -08:00
Tyler Renelle
47bcaf83e7
feat(homepage): use .marketing for centering, add playbutton as static
...
in footer. This is pretty
ugly (http://gyazo.com/215e20729569689ab48cf56c71c1fe28 ), let's iterate
/ prettify. @deilann
2014-01-26 14:22:01 -08:00
Marcelo Sizer
de2c0280b2
Fix multiple sell buttons appearing simultanously when clicking on food + egg or potion
2014-01-26 01:18:54 -02:00
Dušan Juretić
70001b1feb
Mark collected items in collection quests
2014-01-24 22:28:19 -03:00
Matteo Pagliazzi
13131087ff
fix(translations): add env.t to rootScope
2014-01-24 23:19:17 +01:00
Matteo Pagliazzi
5336134c7d
refactor(translations)
2014-01-24 22:49:36 +01:00
Matteo Pagliazzi
95f1dc6e60
improve(translation): allow for data interpolation
2014-01-24 18:08:54 +01:00
Marcelo Sizer
17e70e84d6
Remove level lock to purchase
2014-01-23 23:30:11 -02:00
Marcelo Sizer
d3d970b87f
Make locked quests purchasable
2014-01-23 23:11:30 -02:00
Marcelo Sizer
9e6a9a3d0e
Don't show information if the quest is locked
2014-01-23 18:26:55 -02:00
Marcelo Sizer
b2d5e2a090
Add popover quest description to quests in the Market and add buyQuest modal to show text and rewards before purchasing the quest
2014-01-23 15:53:42 -02:00
Tyler Renelle
9fa4521739
feat(challenges): add angular-ui-select2 for simpler find/select
...
challenge winner.
2014-01-22 23:22:21 -08:00
Tyler Renelle
6878596cb4
Merge branch 'lefnire/spells' into develop
2014-01-22 00:32:29 -08:00
Tyler Renelle
32dc651bfb
Revert "feat(cheating) prevent +habit spamming with a 10s timer"
...
This reverts commit ad4ca6655a
2014-01-22 00:29:55 -08:00
Tyler Renelle
47bd6dcb79
fix(spells): more $rootScope spell-casting bug fixes
2014-01-22 00:27:55 -08:00
Tyler Renelle
e0646bb98d
fix(spells): add some spells tests, don't send up body to spell paths
2014-01-22 00:16:52 -08:00
Tyler Renelle
c6f7ab8a5c
fix(spells): some $rootScope.applying action fixes so cast-ending is
...
immediate instead of waiting on response. Also, slim down party
population to the essentials to avoid RequestEntityTooLarge
2014-01-21 23:04:01 -08:00
Tyler Renelle
9e69d7959f
feat(quests): add level requirement for quests
2014-01-21 17:46:17 -08:00
Tyler Renelle
ad4ca6655a
feat(cheating) prevent +habit spamming with a 10s timer
2014-01-19 19:32:17 -08:00
Tyler Renelle
a1df41ad81
fix(spells): <ESC> to cancel spell-casting
2014-01-18 14:15:45 -07:00
Cole Gleason
0579c43248
fix(profile): fix bug where empty profile displayed on username click
...
Due to #2396 , Shared was undefined in one controller. There may be other
cases we should look out for.
Fixes #2465
2014-01-18 01:38:09 -06:00
diablo
7179a30827
Fixed broken test for display name
2014-01-17 19:16:40 -06:00
diablo
16c38634b6
Modifies pet name to be 'Desert Wolf' rather than 'Wolf-Desert'
2014-01-16 21:42:08 -06:00
