286a69fd46
chore(bailey): udpated bailey for premium
2014-01-26 13:59:41 -08:00
62af638e8a
Merge pull request #2570 from deilann/patch-1
...
removed stray paren in profile.jade
2014-01-26 12:41:06 -08:00
4ca67bdee8
Merge pull request #2574 from deilann/copy-3
...
new landing copy
2014-01-26 12:37:49 -08:00
c09d89f872
Fix version conflict
2014-01-26 17:39:36 -02:00
8d41c44ad7
Fix version conflict
2014-01-26 17:37:54 -02:00
8f4016d669
Split main.json
2014-01-26 17:30:41 -02:00
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
4274090205
fix(translations): fix #2564 and similar ones
2014-01-26 14:48:38 +01:00
b44f7088ad
new landing copy
2014-01-25 18:21:56 -08:00
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
2a91cee0ff
Merge branch 'round-boss' into develop
2014-01-25 13:22:49 -06:00
1412570484
revert(party): Round boss health up instead of to nearest integer
...
This reverts commit 626da5681fFixes #2563 .
2014-01-25 13:22:24 -06:00
11b37c6047
Merge pull request #2553 from djuretic/mark_collected_items
...
Mark collected items in collection quests
2014-01-24 17:36:22 -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
70001b1feb
Mark collected items in collection quests
2014-01-24 22:28:19 -03:00
17c63cdc6e
Replace string for env.t
2014-01-24 20:26:33 -02:00
2eb7ea5e91
Merge pull request #2550 from HabitRPG/paglias/translations-refactoring
...
Refactor translations
2014-01-24 13:53:46 -08:00
5336134c7d
refactor(translations)
2014-01-24 22:49:36 +01:00
0c935f9c9a
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2014-01-24 15:29:17 -06:00
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
d107db7013
refactor(translations)
2014-01-24 21:27:06 +01:00
8e99186e9c
refactor(translations): achievements
2014-01-24 20:07:02 +01:00
a9095f3464
fix(translations): remove translations for privacy & terms
2014-01-24 17:38:21 +01:00
ed71522131
Fix version conflict
2014-01-24 07:28:30 -02:00
d3d970b87f
Make locked quests purchasable
2014-01-23 23:11:30 -02:00
fe99bca10f
Fix spacing errors #2536
2014-01-23 21:58:38 -02:00
9e6a9a3d0e
Don't show information if the quest is locked
2014-01-23 18:26:55 -02:00
6c68c51ab5
Fix version conflict
2014-01-23 17:26:37 -02: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
13a7cc9d55
improve(translations): merge pr and lots of fixes
2014-01-23 17:02:16 +01:00
50953ddf81
Merge pull request #2525 from Sinza-/develop
...
Replace a line for env.t
2014-01-23 06:01:06 -08:00
6f3229c679
Update tavern.jade
2014-01-23 10:16:32 +01:00
669789df67
Update index.jade
2014-01-23 09:45:34 +01:00
50f992b63c
Update hall.jade
2014-01-23 09:43:17 +01:00
ab84219835
Update group.jade
2014-01-23 09:40:31 +01:00
ed180692e3
Update create-group.jade
2014-01-23 09:36:32 +01:00
6fb88ee1b5
Update chat-message.jade
2014-01-23 09:35:18 +01:00
34fe364fea
Update chat-box.jade
2014-01-23 09:33:41 +01:00
2282e36bac
Update challenges.jade
2014-01-23 09:31:33 +01:00
9fa4521739
feat(challenges): add angular-ui-select2 for simpler find/select
...
challenge winner.
2014-01-22 23:22:21 -08:00
ae0d758d8f
feat(challenges): add button for csv export
2014-01-22 23:22:21 -08: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
d782fc6b6a
fix(stats): Better layout for attribute point allocation
2014-01-22 20:34:03 -06:00
4d834c5c2b
Replace a line for env.t
2014-01-22 22:37:09 -02:00
077e23519c
Update avatar.jade
2014-01-23 00:24:15 +01:00
c4a230d73c
Update avatar.jade
2014-01-23 00:19:42 +01:00
0fb8ec9a8b
Update tavern.jade
...
line 68 and following after confirmation
2014-01-23 00:04:17 +01:00
13503986fb
Update index.jade
...
line 39
2014-01-22 23:43:58 +01:00
9f56426472
Update hall.jade
...
line 47!
2014-01-22 23:34:06 +01:00
Tyler Renelle