3a95db0b0d
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2015-01-19 17:06:27 +00: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
e40ea3032a
chore(news): Stress Strike 2 Bailey
2015-01-19 10:51:07 -06: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
b73518af5f
Removed $root from view
2015-01-18 22:54:07 -06:00
055db157f6
Merge branch 'bug/habitspell' of https://github.com/etaiklein/habitrpg into etaiklein-bug/habitspell
2015-01-18 22:50:26 -06:00
bb78b121da
revert part of a053486, angular is madeningly inconsistent with this bug
2015-01-18 16:38:31 -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
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
1c771fa4db
fixed bug where +habits would behave strangely when targeted by spells
2015-01-14 02:06:41 -05:00
17ab1d660f
chore(news): Stress Strike 1 Bailey
2015-01-13 13:29:10 -06:00
7b9514dc5d
fix final bit of conflict
2015-01-11 14:54:41 +10: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
22446a5ddb
apply active class to special spells too
2015-01-10 11:06:39 -05:00
d6dc2119cb
add active class to spell item when it is selected
2015-01-10 10:36:00 -05:00
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
64bb55e57b
Reworked mixin file to retain gembutton history
2015-01-09 13:48:19 -06:00
41d073d181
fix(world-boss): Achievement badge
2015-01-08 15:47:48 -06:00
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
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
870d9d7e86
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-06 15:04:47 -06:00
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
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
53c466ee7f
Rounds tooltip for exp, health and mana to 2 decimal places
2015-01-06 13:52:22 -06:00
e416b03a59
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-06 09:39:04 -06:00
dd4e8d74c7
Fix for truncated dates on task due date. Closes #4482
2015-01-06 09:37:29 -06:00
8feffa5431
fix(news): Improve accuracy
2015-01-05 17:31:19 -06:00
f0c65be629
Fix to allow for challenges with the same award name. Closes #4479
2015-01-05 17:15:33 -06:00
8529c0f1db
chore(news): Bailey
2015-01-05 16:48:58 -06:00
ad8add58d7
Merge pull request #4461 from negue/markdownText
...
change markdown ngModel to text attribute
2015-01-05 22:12:06 +01:00
cc7b2f70ba
Hide buy gems button if over level 100 in rebirth modal
2015-01-05 13:41:58 -06:00
10451d3296
Removed gem cost if lv 100 or higher
2015-01-05 13:38:00 -06:00
a72faa5d92
Added ctrl+cmd enter command to pms
2015-01-05 13:21:23 -06:00
b409e589f1
Add tooltip with exact health/exp/mana
2015-01-04 17:26:11 -05:00
09f827e9fe
fix(news): Improved plot
2015-01-03 13:18:47 -06:00
914c780053
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-01 23:23:08 -06:00
3a0de8f9c4
chore(January): news and deactivate cards
2015-01-01 23:20:59 -06:00
fc4e43bef8
Merge branch '4401_multiple_buy_gems_popups_with_mixins' of https://github.com/lucymhdavies/habitrpg into gems-mixin
...
Conflicts:
views/shared/gems.jade
views/shared/modals/buy-gems.jade
2015-01-01 23:18:28 -06:00
c561562009
Merge branch 'lucymhdavies-4401_multiple_buy_gems_popups' into develop
...
closes #4401
2015-01-01 23:12:10 -06:00
0cfb705762
Add behaviour specific to the buy-gems popup.
2015-01-02 00:01:44 +00:00
0754b58cc2
Source the new mixin file, and call the mixins in place of including the former gems.jade
2015-01-01 23:58:28 +00:00
153e0db71d
And of course convert this into a mixin
2015-01-01 23:57:08 +00:00
6f3ee14842
Move views/shared/gems.jade -> views/shared/mixins.jade
2015-01-01 23:50:38 +00:00
b3ccdc2859
change markdown ngModel to text attribute
2015-01-01 20:57:57 +01:00
5d958b1456
Adjusted styles for snowball and spookDust so they would align like the coins
2014-12-31 09:31:56 -06:00
ccfe48099f
fix(NYE): fix cards
...
Improve random messages and have Bailey give instruction on where to find cards.
2014-12-30 23:25:34 -06:00
438516b26f
fix(NYE): Correct achievement badge
2014-12-30 22:56:40 -06:00
d1355faa31
Merge pull request #4452 from SabreCat/nye
...
New Year's event features
2014-12-30 22:18:11 -06:00
230482c578
chore(news): Bailey
2014-12-30 21:58:15 -06:00
benmanley