Commit Graph

385 Commits

Author SHA1 Message Date
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 abdbaa6fe3 Merge pull request #2583 from Sinza-/split-main-json
Split main.json
2014-01-28 10:25:31 -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
Marcelo Sizer 8f4016d669 Split main.json 2014-01-26 17:30:41 -02:00
Sabe Jones bc1adeb127 fix(mounts): Move avatar upward when mounted regardless of pet
Step 1 toward fixing some of our mount sprite positioning issues. If the avatar always moves up when mounted, we gain substantial freedom to reposition the mount, especially on the vertical axis.
2014-01-26 11:02:59 -06:00
Matteo Pagliazzi 4274090205 fix(translations): fix #2564 and similar ones 2014-01-26 14:48:38 +01: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
Matteo Pagliazzi d107db7013 refactor(translations) 2014-01-24 21:27:06 +01:00
Matteo Pagliazzi 8e99186e9c refactor(translations): achievements 2014-01-24 20:07:02 +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
Matteo Pagliazzi 13a7cc9d55 improve(translations): merge pr and lots of fixes 2014-01-23 17:02:16 +01: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
Luveluen 077e23519c Update avatar.jade 2014-01-23 00:24:15 +01:00
Luveluen c4a230d73c Update avatar.jade 2014-01-23 00:19:42 +01: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
Paul Sainsbury 66582b2d05 Added FAQ and Tutorials links, linking the Vimeo Tutorial and Wiki FAQ 2014-01-19 22:24:54 +02:00
Tyler Renelle 90176444e9 feat(bailey) notif about STWC updates + scroll-purchase deadlines (@colegleason) 2014-01-16 12:47:55 -07:00
Tyler Renelle 518f200a8f fix(#2375) merge in @SabreCat's stats.jade changes "More elegant
show/hide setup for attribute bonuses"
2014-01-15 22:15:26 -07:00
Tyler Renelle 86220f3e0e Merge pull request #2319 from HabitRPG/sabe/preferences
Finish up @wc8 suggested user preferences: tags and Advanced Options
2014-01-15 21:04:05 -08: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 b52ea3f495 Merge pull request #2403 from HabitRPG/sabe/fix
Misc UI fixes
2014-01-15 16:24:03 -08:00
Tyler Renelle e66fdd80ef feat(perfect-day achievement) 2014-01-15 16:24:23 -07:00
Matteo Pagliazzi 2e12ffefc6 revert previous change 2014-01-15 16:56:40 +01:00
Matteo Pagliazzi 178086ef30 fix some translation strings 2014-01-15 16:54:37 +01:00
Sabe Jones 5521dd0bb1 UI fixes: Firefox display and checkbox issues, task attributes appearing with auto-allocate off 2014-01-14 21:07:46 -06:00