Commit Graph

182 Commits

Author SHA1 Message Date
Tyler Renelle 527f230ee5 Merge pull request #2701 from deilann/wizardtomage
Change "Wizard" to "Mage" in member modal & inventory
2014-02-01 16:21:32 -08:00
deilann 8843577858 show mage not wizard in inventory and member modal 2014-02-01 15:17:14 -08:00
Tyler Renelle a9d7add1e3 chore(bailey): baconsaur update 2014-01-31 22:03:52 -07:00
Tyler Renelle b29231056b chore(bailey): vice notif 2014-01-31 15:36:47 -07:00
Tyler Renelle 800231cf64 feat(quests): allow html in quest notes 2014-01-31 15:06:56 -07:00
Tyler Renelle 179316e10f feat(restore): add restore-gp back in. Parly to end the winter event,
partly due to the convo at #2681 regarding subscriptions. Fixes #2681
2014-01-31 12:54:37 -07:00
Tyler Renelle 4ba5a9cf26 refactor(restore): remove restore-gear commented-out code, that stuff is
incompatible with new gear setup (circa class system)
2014-01-31 12:50:13 -07:00
Tyler Renelle 0a0c6c73a5 chore(bailey): fix bailey notifs to say Jan 31 for cut off dates @lemoness 2014-01-30 21:34:06 -07:00
Tyler Renelle 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
Matteo Pagliazzi c7c6181bbc Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop 2014-01-30 22:26:28 +01:00
Matteo Pagliazzi 76db2d49c2 18n(merge): merge @Sinza- pr, @lefnire now it is ready 2014-01-30 22:25:42 +01:00
Marcelo Sizer 44d9ea2a15 i18n(interpolation): Add string interpolation 2014-01-30 18:25:25 -02:00
Tyler Renelle 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
Matteo Pagliazzi 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
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
Marcelo Sizer cd4cb0a552 i18n(subscriber): replace subscriber hard-coded strings for env.t 2014-01-28 22:30:05 -02:00
Tyler Renelle ffe415e6f3 chore(bailey): add announcement re: STWC processing time 2014-01-28 12:44:19 -08:00
Tyler Renelle 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
Matteo Pagliazzi 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
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
Marcelo Sizer aa6ee57ca7 Replace hard-coded strings for env.t on drops.jade file 2014-01-27 15:45:46 -02:00
Tyler Renelle 286a69fd46 chore(bailey): udpated bailey for premium 2014-01-26 13:59:41 -08:00
Tyler Renelle 1dc68112d1 fix(paypal): fixes #2492, remove environment check for now, only have
production-mode option. revisit
2014-01-24 17:29:10 -08:00
Matteo Pagliazzi 5336134c7d refactor(translations) 2014-01-24 22:49:36 +01:00
Marcelo Sizer 635451dc8c Close quest modal after quest purchase 2014-01-23 16:11:40 -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
Sabe Jones d3f4a561fd docs(rebirth): Bullet point about repurchase of limited ed gear after Rebirth
Requires commit 667a426 on habitrpg-shared. Adds a line to the Rebirth modal informing users that limited edition gear can be repurchased after Rebirth. Removed a line from the top of the modal to make room, preventing scrolling at ordinary resolutions--I'm open to suggestions if we think that line is crucial.
2014-01-22 20:45:04 -06:00
Matteo Pagliazzi c51c9ad03b improve(translation): merge @Sinza- pr 2014-01-22 19:51:30 +01:00
Marcelo Sizer ef97abf1bf Fix diverging older version 2014-01-22 16:16:19 -02:00
Marcelo Sizer bb13f37525 Fix identation 2014-01-22 16:07:04 -02:00
Marcelo Sizer 6ada7f300f Replace hard-coded strings for env.t on views/shared/modals folder 2014-01-22 16:04:28 -02:00
Matteo Pagliazzi 5a03409e33 Revert "improve(translations): translated shared/modals/achievements"
This reverts commit 090c28a35b.
2014-01-22 17:38:19 +01:00
Matteo Pagliazzi eec6ead971 Revert "improve(translations): translate death modal"
This reverts commit 50333026b6.
2014-01-22 17:34:54 +01:00
Matteo Pagliazzi 50333026b6 improve(translations): translate death modal 2014-01-22 17:18:35 +01:00
Matteo Pagliazzi 090c28a35b improve(translations): translated shared/modals/achievements 2014-01-22 17:08:12 +01:00
Tyler Renelle e48c7277f8 fix(quests): list multiple rewards in dialog 2014-01-21 14:12:09 -08:00
Tyler Renelle 90176444e9 feat(bailey) notif about STWC updates + scroll-purchase deadlines (@colegleason) 2014-01-16 12:47:55 -07:00
Tyler Renelle 003e214080 #2384 add alert on paypal taking a long time to clear 2014-01-15 19:45:07 -07:00
Tyler Renelle 154abcefbb #2010 Add party stats back in. Depends on habirpg-shared#939ce14 to wrap members 2014-01-07 10:46:51 -07:00
Tyler Renelle ac1bcd4791 winter: disable gold in restore-values during the WWE event 2014-01-06 18:44:53 -07:00
Tyler Renelle b3dd1e0a68 bailey: WWE pt 4 (class gear) 2014-01-06 17:44:17 -07:00
Tyler Renelle 1dda9254f3 bailey: notif on task icons & markdown 2013-12-31 09:15:06 -07:00
Tyler Renelle 80e593d49f new years eve: bailey 2013-12-31 08:43:29 -07:00
Tyler Renelle 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
Sabe Jones c3aed6fb28 RPG demystification, cont'd 2013-12-29 20:58:35 -06:00
Tyler Renelle fd324fc220 classes: fix class-modal heads. Also, little class title display trick
@sabrecat (tiny perf bonus)
2013-12-29 12:21:56 -07:00
Sabe Jones 2f79472439 Some work on demystification of RPG elements 2013-12-29 11:04:31 -06:00
Tyler Renelle c14e4c8fec display profile.stats.class in modal 2013-12-29 00:47:39 -07:00
Sabe Jones f38b8e41af Final commit for Rebirth feature! Implement achievement and prestige icon 2013-12-25 17:56:55 -06:00
Tyler Renelle e9b0ccc057 Evil Santa => Trapper Santa 2013-12-25 08:30:55 -07:00