c7c6181bbc
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-01-30 22:26:28 +01: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
3660f1a85c
feat(premium): backport server code for premium subs (it's just ccard
...
handling & uer model stuff)
2014-01-30 10:51:32 -07: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
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
ffe415e6f3
chore(bailey): add announcement re: STWC processing time
2014-01-28 12:44:19 -08:00
a4524cdb9a
chore(bailey): add bailey for group plans + perfect day achiev. Keep
...
basic-plan announcement up for a bit longer
2014-01-28 12:27:30 -08:00
f15d825dc5
Merge pull request #2600 from Sinza-/envt-drops
...
Replace hard-coded strings for env.t on drops.jade file
2014-01-28 10:24:13 -08: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
aa6ee57ca7
Replace hard-coded strings for env.t on drops.jade file
2014-01-27 15:45:46 -02:00
286a69fd46
chore(bailey): udpated bailey for premium
2014-01-26 13:59:41 -08:00
1dc68112d1
fix(paypal): fixes #2492 , remove environment check for now, only have
...
production-mode option. revisit
2014-01-24 17:29:10 -08:00
5336134c7d
refactor(translations)
2014-01-24 22:49:36 +01:00
635451dc8c
Close quest modal after quest purchase
2014-01-23 16:11:40 -02:00
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
d3f4a561fd
docs(rebirth): Bullet point about repurchase of limited ed gear after Rebirth
...
Requires commit 667a426
2014-01-22 20:45:04 -06:00
c51c9ad03b
improve(translation): merge @Sinza- pr
2014-01-22 19:51:30 +01:00
ef97abf1bf
Fix diverging older version
2014-01-22 16:16:19 -02:00
bb13f37525
Fix identation
2014-01-22 16:07:04 -02:00
6ada7f300f
Replace hard-coded strings for env.t on views/shared/modals folder
2014-01-22 16:04:28 -02:00
5a03409e33
Revert "improve(translations): translated shared/modals/achievements"
...
This reverts commit 090c28a35b
2014-01-22 17:38:19 +01:00
eec6ead971
Revert "improve(translations): translate death modal"
...
This reverts commit 50333026b6
2014-01-22 17:34:54 +01:00
50333026b6
improve(translations): translate death modal
2014-01-22 17:18:35 +01:00
090c28a35b
improve(translations): translated shared/modals/achievements
2014-01-22 17:08:12 +01:00
e48c7277f8
fix(quests): list multiple rewards in dialog
2014-01-21 14:12:09 -08:00
90176444e9
feat(bailey) notif about STWC updates + scroll-purchase deadlines (@colegleason)
2014-01-16 12:47:55 -07:00
003e214080
#2384 add alert on paypal taking a long time to clear
2014-01-15 19:45:07 -07:00
154abcefbb
#2010 Add party stats back in. Depends on habirpg-shared#939ce14 to wrap members
2014-01-07 10:46:51 -07:00
ac1bcd4791
winter: disable gold in restore-values during the WWE event
2014-01-06 18:44:53 -07:00
b3dd1e0a68
bailey: WWE pt 4 (class gear)
2014-01-06 17:44:17 -07:00
1dda9254f3
bailey: notif on task icons & markdown
2013-12-31 09:15:06 -07:00
80e593d49f
new years eve: bailey
2013-12-31 08:43:29 -07:00
928f7cfdd7
Merge remote-tracking branch 'origin/sabe/rebirth' into develop
...
Conflicts:
src/models/user.js
views/shared/modals/index.jade
2013-12-31 08:04:51 -07:00
c3aed6fb28
RPG demystification, cont'd
2013-12-29 20:58:35 -06:00
fd324fc220
classes: fix class-modal heads. Also, little class title display trick
...
@sabrecat (tiny perf bonus)
2013-12-29 12:21:56 -07:00
2f79472439
Some work on demystification of RPG elements
2013-12-29 11:04:31 -06:00
c14e4c8fec
display profile.stats.class in modal
2013-12-29 00:47:39 -07:00
f38b8e41af
Final commit for Rebirth feature! Implement achievement and prestige icon
2013-12-25 17:56:55 -06:00
e9b0ccc057
Evil Santa => Trapper Santa
2013-12-25 08:30:55 -07:00
fc4a141d2e
bosses: bailey
2013-12-25 08:24:39 -07:00
44e89d1be7
bosses: misc small bugs
2013-12-25 00:55:38 -07:00
f8559b1762
bosses: pretty things up amongst the modals, etc. Move rewards to a
...
directive so we can share it. Add dialog on quest-completion using
user.party.quest.completed flag
2013-12-24 23:30:48 -07:00
3b94b18bb6
Implement Rebirth in controllers and API, revise modal per @wc8 feedback
2013-12-24 18:09:32 -06:00
cc3632b611
Add Orb of Rebirth to shop, image to modals, tweak modal text
2013-12-24 09:57:04 -06:00
8095397317
Quests: hurt boss via score method, refactor chat function, change all content.*.name to content.*.key for consistency
2013-12-23 01:19:18 -07:00
ecb354e2cc
Quests: initial Bosses WIP - invite, accept, reject, etc
2013-12-22 17:46:54 -07:00
067fbe861c
remove math updates notif now that things have settled down a bit (most
...
updates now should be subtle). @wc8 @sabrecat let me know if you think
this is premature
2013-12-22 11:47:10 -07:00
60c622f1c1
Initial commit: unlock notification, new modals
2013-12-22 08:32:39 -06:00
Matteo Pagliazzi