154b8a00e5
Merge pull request #4585 from crookedneighbor/quest-scroll-popover-and-modal-changes
...
Quest scroll popover and modal changes
2015-01-28 15:39:32 -06:00
5f1d138241
Added comment about questPopover function
2015-01-28 15:38:41 -06:00
275f55cbfe
Removed extra space
2015-01-28 15:36:13 -06:00
c328d0fd3c
Removed hp from popover function
2015-01-28 15:11:32 -06:00
84552597d6
Adjusted hrs for popovers
2015-01-28 14:00:06 -06:00
ca897d7cf3
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-28 10:56:57 -06:00
23c31083ef
Fixed triad count to actually check and make sure count is 90
2015-01-28 10:56:16 -06:00
dc5f980083
fix(tasks): improve habit icon alignment
...
See #4539
Align habit buttons using a different CSS technique to prevent plus
icon from being cropped on Chrome for Windows.
2015-01-28 13:25:24 +00:00
4e1716a8db
Added hp to quest popover
2015-01-27 20:15:28 -06:00
b56c5af978
Changed popover text for quest scrolls. Closes #4575
2015-01-27 19:32:06 -06:00
0096873cf5
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-27 09:47:03 -06:00
42c0b443d7
fix(i18n): language selection working on static pages
2015-01-27 15:48:57 +01:00
3a38bb849b
add .border-left
2015-01-26 23:08:15 -08:00
eceaaef954
Merge pull request #4567 from crookedneighbor/add-audio-watts
...
Added Watts' Theme to Audio Choices
2015-01-26 11:27:27 -06:00
9b5b83871f
Refined triad Bingo calculation
2015-01-25 21:00:34 -06:00
d9ecd41c1e
Fixed mountCount calculation
2015-01-25 20:26:51 -06:00
9f38ac86f7
Replaced blank death sound with actual sound files instead of blank
...
files
2015-01-23 15:27:57 -06:00
93c39e81bd
Added death sound. Put blank versions in daniel theme
2015-01-23 14:59:18 -06:00
de59c76609
Added watts themes to audio choices
2015-01-23 14:53:30 -06:00
c3c144223a
Merge branch 'develop' into mountmaster
2015-01-19 14:47:17 -06:00
b26d5ee732
Merge pull request #4540 from crookedneighbor/add-ngsanitize
...
Added ng-sanitize
2015-01-19 21:37:43 +01:00
753cac236b
Added ng-sanitize
2015-01-19 14:17:43 -06:00
f93e0ba6b9
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
...
Conflicts:
views/shared/tasks/task.jade
2015-01-19 17:06:19 +00:00
2c88be85cf
fix(tasks): vertically align habit buttons
...
* When a task has + and - buttons, display the buttons vertically and
expand them to fill the full height of the task.
* Use glyphicons for + and - icons
2015-01-19 16:41:01 +00:00
57637d4271
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
...
ally if it merges an updated upstream into a topic branch.
2015-01-19 17:52:54 +10:00
1318d0de38
Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting
...
Group Sorting
2015-01-18 23:08:40 -06:00
7c10d27c04
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-18 15:56:11 -06:00
13e89f1947
Added sync after changing username so username would update
2015-01-18 15:55:39 -06:00
a44e0f7c31
fix(avatar-sharing): screw it, 1.3.3 backwards compat isn't working at
...
the router level anyway. Besides, avatar sharing hasn't worked via
addthis for a while, so we don't need this
2015-01-18 14:53:18 -07:00
a053486fcd
fix(avatar-sharing): angular@1.3.9 upgrade fixed the /#?memberId=x
...
bug. Also, anon wasn't able to view avatar shares!
2015-01-18 14:51:40 -07:00
503fd9ff51
refactor(services): remove un-used authService, cleanup authCtrl
2015-01-17 18:59:28 -07:00
2306b7c572
refactor(services): move to a single "habitrpg" module for services /
...
directives / filters
2015-01-17 18:43:37 -07:00
f5e9568cef
Consolidated calcTriadBingo function
2015-01-16 21:33:58 -06:00
90c7142da5
refactor(config): move httpInterceptor from website/app.js to habitrpg-shared/config.js.
2015-01-16 16:48:53 -07:00
e25472759a
Added triad bingo achievment
2015-01-16 16:43:48 -06:00
e5b6e64a98
Added preliminary logic for opening triadBingo modal
2015-01-16 11:47:07 -06:00
10bc7e4eac
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-16 10:44:52 -06:00
35e8097b0c
refactor(challenges): wrap group.challenges as $resources, so they're
...
convenience functions $join/$leave/etc can be called directly
2015-01-15 15:24:02 -07:00
385fe36a0a
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-12 21:50:14 -06:00
a72ae097d6
Corrected how count is calculated
2015-01-11 18:23:27 -06:00
f6885427a8
Corrected Beast Master and Mount Master count so it would be accurate.
2015-01-11 17:24:01 -06:00
7660141365
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
...
Conflicts:
views/shared/tasks/lists.jade
views/shared/tasks/task.jade
2015-01-11 14:15:55 +10:00
1e11947c9e
Removed unnecessary comment
2015-01-10 09:52:51 -06:00
819ab0b6e1
Added updated mountCount to releaseBoth function
2015-01-10 09:52:09 -06:00
0f2adcad14
highlight spell item when it has class of 'active'
2015-01-10 10:35:27 -05:00
2b20c52a8d
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-10 09:25:18 -06:00
0f3d6bc751
Explicitly reset mountCount to 0. (Otherwise, will not reset until refresh)
2015-01-10 09:24:30 -06:00
a5d6c9de3f
Force update of mountCount after feedling
2015-01-10 09:22:53 -06:00
c6ef4b52ab
The inventory controllers watch on mounts was creating an inaccurate count (was counting quest and special mounts)
2015-01-10 09:03:59 -06:00
689b13ecb6
fix(world-boss): Justin not stressed yet
2015-01-09 10:00:16 -06:00
Blade Barringer