Commit graph

69 commits

Author SHA1 Message Date
Alice Harris
f0c3b3db4c add pipes in front of plain text to prevent "Warning: missing space before text for line nn of jade file ..." 2014-10-09 15:56:06 +10:00
Jonathan Klein
41de8014a0 Putting the boot icon on the same line as the member name in group members 2014-10-07 14:10:15 -04:00
Matteo Pagliazzi
7e53eaf1ae Revert "Revert "ngRepeat with track by""
This reverts commit c90c8f9a5f.
2014-09-18 18:37:02 +02:00
Alice Harris
5afb258aa9 add sort by name and background for party avatars in header, remove sort option from guilds pages 2014-09-12 09:47:02 +10:00
Matteo Pagliazzi
c90c8f9a5f Revert "ngRepeat with track by"
This reverts commit 397ef5e72c.
2014-09-08 12:30:30 +02:00
Negue
397ef5e72c ngRepeat with track by 2014-09-05 20:10:13 +02:00
Tyler Renelle
3ca84d8ef1 Merge pull request #3139 from mapleoin/partygems
fix Guild Gems strings on the party tab
2014-08-19 12:55:11 -06:00
Matteo Pagliazzi
0837f2c39b fix(mobile): start adapting boss to mobile 2014-08-17 13:29:40 +02:00
Skyrunner
3ed977dad6 Fixed #3756?
It seems to be fixed, but I don't know the good development habits for
jade/whatever technology it is. Please comment & close if the fix is not
acceptable.
2014-07-20 16:54:18 +09:00
Tyler Renelle
7107f2d323 refactor(bosses): DRY bosses so we can share code between tavern boss &
party boss
2014-06-25 13:34:44 -06:00
benmanley
57eb80f9db refactor(.hero-stats): restyle status meters
Add text to icons to clarify purpose of each bar
Tidy up tooltip behaviour
Aesthetic changes
2014-06-05 16:19:22 +01:00
Matteo Pagliazzi
d242ee3291 refactor(i18n): use strings for content 2014-05-06 20:04:09 +02:00
Ionuț Arțăriși
64ed79b830 don't show GuildGems on the party tab 2014-03-25 23:29:37 +01:00
Sabe Jones
ff3f1c590c fix(bosses): Use ceiling rounding for boss HP
Corrects the issue reported by some users where boss HP shows 0 but they're not actually defeated yet. Man, Angular "number" directive, why you gotta round like that?
2014-02-28 19:07:57 -06:00
Matteo Pagliazzi
fa2c64d2d8 chore(i18n): prepare english for transifex: remove ending or starting space & _comment strings 2014-02-11 19:30:55 +01:00
Matteo Pagliazzi
a7e3e76daa refactor(bs3): add fixed height modals & panels for quests & group members 2014-02-09 16:29:16 +01:00
Matteo Pagliazzi
1a44c3cf0c refactor(bs3): css 2014-02-09 16:16:43 +01:00
Matteo Pagliazzi
9ea9ed841d refactor(bs3): buyQuest fix, add back badges colors, minor fixes 2014-02-08 19:20:10 +01:00
Matteo Pagliazzi
0fe0cb4f2d refactor(bs3): labels style and text, buttons classes 2014-02-08 16:27:34 +01:00
Matteo Pagliazzi
5d4d82ad51 refactor(bs3): port options (profile, inventory, social (groups and hall)) and misc 2014-02-05 19:05:42 +01:00
Matteo Pagliazzi
0a047f5b2f Merge branch 'develop' into paglias/bs3 2014-02-01 16:47:32 +01:00
Tyler Renelle
800231cf64 feat(quests): allow html in quest notes 2014-01-31 15:06:56 -07:00
Matteo Pagliazzi
cc348b2f11 refactor(bs3): sync with develop & misc 2014-01-31 20:04:40 +01:00
Matteo Pagliazzi
0764aa8c17 refactor(bs3): convert icons to new format 2014-01-31 19:47:48 +01:00
Marcelo Sizer
44d9ea2a15 i18n(interpolation): Add string interpolation 2014-01-30 18:25:25 -02:00
Matteo Pagliazzi
abdbaa6fe3 Merge pull request #2583 from Sinza-/split-main-json
Split main.json
2014-01-28 10:25:31 -08:00
Marcelo Sizer
c09d89f872 Fix version conflict 2014-01-26 17:39:36 -02:00
Marcelo Sizer
8d41c44ad7 Fix version conflict 2014-01-26 17:37:54 -02:00
Marcelo Sizer
8f4016d669 Split main.json 2014-01-26 17:30:41 -02:00
Matteo Pagliazzi
4274090205 fix(translations): fix #2564 and similar ones 2014-01-26 14:48:38 +01: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
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
13a7cc9d55 improve(translations): merge pr and lots of fixes 2014-01-23 17:02:16 +01:00
Luveluen
ab84219835 Update group.jade 2014-01-23 09:40:31 +01:00
Luveluen
098247233f Update group.jade
line 133 problem
2014-01-22 23:21:19 +01:00
Cole Gleason
744d8a6780 When a user leaves a group, remove them from all group challenges 2014-01-04 20:05:48 -06:00
Tyler Renelle
57cd53cfc9 fix #2155 . Since quest.leader is new, doesn't apply to quests started
before today. Show abort/begin for all quest members if quest.leader
doesn't exist, otherwise only show those options to the leader
2013-12-28 21:54:25 -07:00
Tyler Renelle
ea0b5b9291 quest: add quest leader. only quest-leader can begin/abort. Abort
restores quest scroll to leader. Bug fixes on clearing quest
data (completion, abort, etc)
2013-12-28 16:36:16 -07:00
Tyler Renelle
e9e2f26a9f collection quest item icons fix 2013-12-25 21:26:51 -07:00
Tyler Renelle
76da27478a bosses: update wording to make cron-calculations more obvious 2013-12-25 11:45:29 -07:00
Tyler Renelle
44e89d1be7 bosses: misc small bugs 2013-12-25 00:55:38 -07:00
Tyler Renelle
f8559b1762 bosses: pretty things up amongst the modals, etc. Move rewards to a
directive so we can share it. Add dialog on quest-completion using
user.party.quest.completed flag
2013-12-24 23:30:48 -07:00
Tyler Renelle
094989db13 quests: add collection quests, incl. polar bear pt 2, and quest arks, and achievements 2013-12-24 17:24:09 -07:00
Tyler Renelle
ae403a55a5 quests: add abort feature 2013-12-23 02:56:55 -07:00
Tyler Renelle
8095397317 Quests: hurt boss via score method, refactor chat function, change all content.*.name to content.*.key for consistency 2013-12-23 01:19:18 -07:00
Tyler Renelle
ecb354e2cc Quests: initial Bosses WIP - invite, accept, reject, etc 2013-12-22 17:46:54 -07:00