Blade Barringer
b0bb3adf53
removed quest line text
2015-01-20 16:09:43 -06:00
Blade Barringer
7842bbe22e
Added stressbeast strike news
2015-01-20 15:58:00 -06:00
Blade Barringer
ebd5bbd19b
Added new info to Bailey announcement
2015-01-20 14:37:17 -06:00
Blade Barringer
c3c144223a
Merge branch 'develop' into mountmaster
2015-01-19 14:47:17 -06:00
benmanley
3a95db0b0d
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2015-01-19 17:06:27 +00:00
benmanley
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
Sabe Jones
e40ea3032a
chore(news): Stress Strike 2 Bailey
2015-01-19 10:51:07 -06:00
benmanley
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
Alice Harris
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
Blade Barringer
b73518af5f
Removed $root from view
2015-01-18 22:54:07 -06:00
Blade Barringer
055db157f6
Merge branch 'bug/habitspell' of https://github.com/etaiklein/habitrpg into etaiklein-bug/habitspell
2015-01-18 22:50:26 -06:00
Tyler Renelle
bb78b121da
revert part of a053486, angular is madeningly inconsistent with this bug
2015-01-18 16:38:31 -07:00
Tyler Renelle
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
Blade Barringer
f64bc5b2ed
Removed if that would hide the triad bingo achievement until mount
...
master attained
2015-01-17 09:54:16 -06:00
Blade Barringer
373d5a5b64
Merge branch 'mountmaster' into triad-bingo
2015-01-17 09:53:56 -06:00
Blade Barringer
3d904f18b9
Allowed mountMaster achievement to always be shown
2015-01-17 09:53:28 -06:00
Blade Barringer
ca1f4890ea
Corrected icon for triad bingo
2015-01-16 11:55:23 -06:00
Blade Barringer
3ba057258f
Added triad bingo achievement modal
2015-01-16 11:49:19 -06:00
Blade Barringer
cecb2792e0
Added logic so triad bingo only appears in achievements after mount
...
master has been reached
2015-01-16 11:41:36 -06:00
Blade Barringer
cbdd30b25f
Merge branch 'mountmaster' into triad-bingo
2015-01-16 11:40:36 -06:00
Blade Barringer
6a63f55a94
Added logic so muted version of mount master only appears if user has
...
achieved beast master
2015-01-16 11:37:20 -06:00
Blade Barringer
ff4c2ade96
Added triadBingo to achievement list
2015-01-16 11:32:41 -06:00
Blade Barringer
10bc7e4eac
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-16 10:44:52 -06:00
Sabe Jones
0b63e48c6e
feat(quest): T-Rex pet
...
Includes news announcements for 1/15/2014, Market implementation for T-Rex dual quest, and the ability for "healing" type Rage meters to work in party-scale boss fights.
2015-01-15 15:38:51 -06:00
etaiklein
1c771fa4db
fixed bug where +habits would behave strangely when targeted by spells
2015-01-14 02:06:41 -05:00
Sabe Jones
17ab1d660f
chore(news): Stress Strike 1 Bailey
2015-01-13 13:29:10 -06:00
Blade Barringer
385fe36a0a
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-12 21:50:14 -06:00
Blade Barringer
1557907a1c
Updated string names
2015-01-12 13:12:40 -06:00
Blade Barringer
11f20555c4
Corrected stats page to show profile data instead of user data
2015-01-11 17:23:30 -06:00
Alice Harris
7b9514dc5d
fix final bit of conflict
2015-01-11 14:54:41 +10:00
Alice Harris
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
K. Belardinelli
22446a5ddb
apply active class to special spells too
2015-01-10 11:06:39 -05:00
Blade Barringer
09c3b643bd
Removed comment because bug was fixed
2015-01-10 09:54:49 -06:00
K Bell
d6dc2119cb
add active class to spell item when it is selected
2015-01-10 10:36:00 -05:00
Blade Barringer
2b20c52a8d
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-10 09:25:18 -06:00
Blade Barringer
7f20ca7d8b
Made title dynamic
2015-01-10 08:26:11 -06:00
Blade Barringer
dc37442691
Merge pull request #4478 from crookedneighbor/cmd-enter-for-chat
...
Cmd/Ctrl + enter for chat and pms.
2015-01-09 13:51:21 -06:00
Blade Barringer
64bb55e57b
Reworked mixin file to retain gembutton history
2015-01-09 13:48:19 -06:00
Sabe Jones
41d073d181
fix(world-boss): Achievement badge
2015-01-08 15:47:48 -06:00
Sabe Jones
ee339fba4a
feat(event): World boss
...
Implements the second HabitRPG world boss, the Abominable Stressbeast of Stoïkalm!
2015-01-08 15:22:42 -06:00
Blade Barringer
0807e7856c
Merge remote-tracking branch 'upstream/develop' into mountmaster
2015-01-08 11:31:45 -06:00
Blade Barringer
8ba0bb5d88
Changed spellObj to skill to be more semantic, and match the text in the
...
rewards column
2015-01-06 15:31:07 -06:00
Blade Barringer
870d9d7e86
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-06 15:04:47 -06:00
Blade Barringer
9da000ec4e
Changed spell to spellObj in ng-repeat for class spells in order to
...
assist with applying an active class to current spell. (would collide
with $scope.spell in rootCtrl.js)
2015-01-06 15:03:54 -06:00
Blade Barringer
96b48324f8
Merge pull request #4484 from crookedneighbor/fix-for-date-on-tasks
...
Fix for truncated dates on task due date. Closes #4482
2015-01-06 14:29:16 -06:00
Blade Barringer
53c466ee7f
Rounds tooltip for exp, health and mana to 2 decimal places
2015-01-06 13:52:22 -06:00
Blade Barringer
e416b03a59
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-06 09:39:04 -06:00
Blade Barringer
dd4e8d74c7
Fix for truncated dates on task due date. Closes #4482
2015-01-06 09:37:29 -06:00
Sabe Jones
8feffa5431
fix(news): Improve accuracy
2015-01-05 17:31:19 -06:00
Blade Barringer
f0c65be629
Fix to allow for challenges with the same award name. Closes #4479
2015-01-05 17:15:33 -06:00
