Commit Graph

4439 Commits

Author SHA1 Message Date
Marcelo Sizer de2c0280b2 Fix multiple sell buttons appearing simultanously when clicking on food + egg or potion 2014-01-26 01:18:54 -02:00
deilann b44f7088ad new landing copy 2014-01-25 18:21:56 -08:00
Dušan Juretić 117c26cfd3 Added tests for translations (env.t) 2014-01-25 21:01:43 -03:00
deilann 2c0f5fc5d0 removed stray paren
Stray parentheses was cutting off destination for the string submitted upon changing names in profiles.
2014-01-25 13:17:01 -08:00
Cole Gleason 2a91cee0ff Merge branch 'round-boss' into develop 2014-01-25 13:22:49 -06:00
Cole Gleason 1412570484 revert(party): Round boss health up instead of to nearest integer
This reverts commit 626da5681f.

Fixes #2563.
2014-01-25 13:22:24 -06:00
Tyler Renelle 11b37c6047 Merge pull request #2553 from djuretic/mark_collected_items
Mark collected items in collection quests
2014-01-24 17:36:22 -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
Dušan Juretić 70001b1feb Mark collected items in collection quests 2014-01-24 22:28:19 -03:00
Tyler Renelle ecbe780e70 fix(find_uniq_user): fix 2014-01-24 17:04:01 -08:00
Marcelo Sizer 17c63cdc6e Replace string for env.t 2014-01-24 20:26:33 -02:00
Matteo Pagliazzi 13131087ff fix(translations): add env.t to rootScope 2014-01-24 23:19:17 +01:00
Matteo Pagliazzi 2eb7ea5e91 Merge pull request #2550 from HabitRPG/paglias/translations-refactoring
Refactor translations
2014-01-24 13:53:46 -08:00
Matteo Pagliazzi 5336134c7d refactor(translations) 2014-01-24 22:49:36 +01:00
Cole Gleason 0c935f9c9a Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2014-01-24 15:29:17 -06:00
Cole Gleason 626da5681f fix(party): Round boss health up instead of to nearest integer
If the boss has something like 0.2 HP it shows as 0 which is confusing
to the user. Let's round up instead.

Fixes #2504.
2014-01-24 15:27:30 -06: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
Matteo Pagliazzi 95f1dc6e60 improve(translation): allow for data interpolation 2014-01-24 18:08:54 +01:00
Matteo Pagliazzi a9095f3464 fix(translations): remove translations for privacy & terms 2014-01-24 17:38:21 +01:00
Matteo Pagliazzi 756e7be751 Merge branch 'fix-spaces' of git://github.com/Sinza-/habitrpg into
Sinza--fix-spaces
2014-01-24 17:12:00 +01:00
Marcelo Sizer ed71522131 Fix version conflict 2014-01-24 07:28:30 -02: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 fe99bca10f Fix spacing errors #2536 2014-01-23 21:58:38 -02:00
Marcelo Sizer 9e6a9a3d0e Don't show information if the quest is locked 2014-01-23 18:26:55 -02:00
Marcelo Sizer 6c68c51ab5 Fix version conflict 2014-01-23 17:26:37 -02:00
Tyler Renelle 38b4cea732 fix(tests): include select2 in test manifest 2014-01-23 10:12:17 -08: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
Matteo Pagliazzi 50953ddf81 Merge pull request #2525 from Sinza-/develop
Replace a line for env.t
2014-01-23 06:01:06 -08:00
Luveluen 6f3229c679 Update tavern.jade 2014-01-23 10:16:32 +01:00
Luveluen 669789df67 Update index.jade 2014-01-23 09:45:34 +01:00
Luveluen 50f992b63c Update hall.jade 2014-01-23 09:43:17 +01:00
Luveluen ab84219835 Update group.jade 2014-01-23 09:40:31 +01:00
Luveluen ed180692e3 Update create-group.jade 2014-01-23 09:36:32 +01:00
Luveluen 6fb88ee1b5 Update chat-message.jade 2014-01-23 09:35:18 +01:00
Luveluen 34fe364fea Update chat-box.jade 2014-01-23 09:33:41 +01:00
Luveluen 2282e36bac Update challenges.jade 2014-01-23 09:31:33 +01: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 ae0d758d8f feat(challenges): add button for csv export 2014-01-22 23:22:21 -08:00
Tyler Renelle 5201343867 Merge pull request #2528 from HabitRPG/sabe/tweak
docs(rebirth): Bullet point about repurchase of limited ed gear after Rebirth
2014-01-22 22:49:39 -08:00
Tyler Renelle 16a602f94c feat(challenges): add csv export for challenge progress. WIP, will refine this over time - but we need it something like this for the STWC come 1/31. 2014-01-22 22:47:41 -08: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
Sabe Jones d782fc6b6a fix(stats): Better layout for attribute point allocation 2014-01-22 20:34:03 -06:00
Marcelo Sizer 4d834c5c2b Replace a line for env.t 2014-01-22 22:37:09 -02: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
Luveluen 0fb8ec9a8b Update tavern.jade
line 68 and following after confirmation
2014-01-23 00:04:17 +01:00