Commit graph

436 commits

Author SHA1 Message Date
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
Dušan Juretić
70001b1feb Mark collected items in collection quests 2014-01-24 22:28:19 -03: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
Marcelo Sizer
ed71522131 Fix version conflict 2014-01-24 07:28:30 -02:00
Marcelo Sizer
fe99bca10f Fix spacing errors #2536 2014-01-23 21:58:38 -02:00
Matteo Pagliazzi
13a7cc9d55 improve(translations): merge pr and lots of fixes 2014-01-23 17:02:16 +01: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
Sabe Jones
d782fc6b6a fix(stats): Better layout for attribute point allocation 2014-01-22 20:34:03 -06:00
Luveluen
0fb8ec9a8b Update tavern.jade
line 68 and following after confirmation
2014-01-23 00:04:17 +01:00
Luveluen
13503986fb Update index.jade
line 39
2014-01-22 23:43:58 +01:00
Luveluen
9f56426472 Update hall.jade
line 47!
2014-01-22 23:34:06 +01:00
Luveluen
098247233f Update group.jade
line 133 problem
2014-01-22 23:21:19 +01:00
Luveluen
39eb590299 Update create-group.jade 2014-01-22 22:51:57 +01:00
Luveluen
7540f6acc9 Update challenges.jade 2014-01-22 22:16:54 +01:00
Luveluen
11a558cd20 Update challenge-box.jade 2014-01-22 21:42:48 +01:00
Matteo Pagliazzi
a6c67f1781 fix(translations): merge @luveluen pull request, fix some syntax 2014-01-22 16:09:32 +01:00
Luveluen
4f07ab39b0 Update inventory.jade 2014-01-22 12:10:51 +01:00
Sabe Jones
5ddf09fe13 fix(settings): reintroduce space between captions and help bubbles stripped during localization 2014-01-21 19:52:04 -06:00
Tyler Renelle
f16654d235 feat(quests): add canBuy so we can exclude certain items from the
market (if you can only find them on quest-drop, etc). This isn't the
prettiest, change?
2014-01-21 14:44:53 -08:00
Luveluen
8b97438607 Update stable.jade 2014-01-20 19:44:33 +01:00
Luveluen
e47afa8965 Update stable.jade 2014-01-20 19:41:17 +01:00
Luveluen
c85e3a2107 Update inventory.jade 2014-01-20 19:23:49 +01:00
Luveluen
18eeafafc8 Update inventory.jade 2014-01-20 19:07:50 +01:00
Luveluen
06132f8a48 Update inventory.jade 2014-01-20 18:55:29 +01:00
Matteo Pagliazzi
52decb7ede fix(translations): @lefnire now everything is ok 2014-01-20 17:51:43 +01:00
Luveluen
fa212b6e93 Update index.jade 2014-01-20 17:50:28 +01:00
Matteo Pagliazzi
fba739535b fix(translations): correct some variables 2014-01-20 17:25:14 +01:00
Matteo Pagliazzi
d000c70679 fix(translations): revert some views 2014-01-20 17:08:27 +01:00
Luveluen
ffff867ba3 Update stable.jade 2014-01-20 16:20:06 +01:00
Luveluen
462f11e48c Update inventory.jade 2014-01-20 16:08:37 +01:00
Luveluen
c37512baa6 Update index.jade 2014-01-20 14:41:51 +01:00
Luveluen
68041f206c Update settings.jade 2014-01-19 22:02:55 +01:00
Luveluen
87d528ce50 Update profile.jade
fullname -> fullName
2014-01-19 21:46:57 +01:00
Luveluen
bfebb61520 Update profile.jade 2014-01-19 21:40:41 +01:00
Luveluen
46e29e8999 Update settings.jade 2014-01-19 21:16:52 +01:00