Commit graph

2509 commits

Author SHA1 Message Date
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
Tyler Renelle
2306b7c572 refactor(services): move to a single "habitrpg" module for services /
directives / filters
2015-01-17 18:43:37 -07: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
Sabe Jones
17ab1d660f chore(news): Stress Strike 1 Bailey 2015-01-13 13:29:10 -06:00
K. Belardinelli
22446a5ddb apply active class to special spells too 2015-01-10 11:06:39 -05:00
K Bell
d6dc2119cb add active class to spell item when it is selected 2015-01-10 10:36:00 -05: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
cda16d5bc0 Merge pull request #4494 from SabreCat/stressbeast
World boss for Winter Wonderland 2015
2015-01-08 15:51:04 -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
Tyler Renelle
cba232ef83 feat(presskit): add presskit page cc @lemoness 2015-01-08 13:41:23 -07:00
Matteo Pagliazzi
193b92c16b fix(cds): max hour is 23 not 24 2015-01-06 23:12:03 +01: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
Sabe Jones
8529c0f1db chore(news): Bailey 2015-01-05 16:48:58 -06:00
negue
aa6b1e3f81 add remove-watch to markdown-directive 2015-01-05 22:19:05 +01:00
negue
ad8add58d7 Merge pull request #4461 from negue/markdownText
change markdown ngModel to text attribute
2015-01-05 22:12:06 +01:00
Blade Barringer
cc7b2f70ba Hide buy gems button if over level 100 in rebirth modal 2015-01-05 13:41:58 -06:00
Blade Barringer
10451d3296 Removed gem cost if lv 100 or higher 2015-01-05 13:38:00 -06:00
Blade Barringer
f3676fcbf4 Added spaces between quantity and gem symbol 2015-01-05 13:33:43 -06:00
Blade Barringer
a72faa5d92 Added ctrl+cmd enter command to pms 2015-01-05 13:21:23 -06:00
Blade Barringer
5deb72c457 Added ability to send chat via cmd/ctrl + enter 2015-01-05 13:17:23 -06:00
Jackson Popkin
b409e589f1 Add tooltip with exact health/exp/mana 2015-01-04 17:26:11 -05:00
Sabe Jones
09f827e9fe fix(news): Improved plot 2015-01-03 13:18:47 -06:00
Blade Barringer
914c780053 Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-01 23:23:08 -06:00
Sabe Jones
3a0de8f9c4 chore(January): news and deactivate cards 2015-01-01 23:20:59 -06:00
Blade Barringer
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
Blade Barringer
c561562009 Merge branch 'lucymhdavies-4401_multiple_buy_gems_popups' into develop
closes #4401
2015-01-01 23:12:10 -06:00
Lucy Davies
0cfb705762 Add behaviour specific to the buy-gems popup. 2015-01-02 00:01:44 +00:00
Lucy Davies
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
Lucy Davies
153e0db71d And of course convert this into a mixin 2015-01-01 23:57:08 +00:00
Lucy Davies
6f3ee14842 Move views/shared/gems.jade -> views/shared/mixins.jade 2015-01-01 23:50:38 +00:00
Negue
b3ccdc2859 change markdown ngModel to text attribute 2015-01-01 20:57:57 +01:00
Blade Barringer
5d958b1456 Adjusted styles for snowball and spookDust so they would align like the coins 2014-12-31 09:31:56 -06:00
Sabe Jones
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
Sabe Jones
438516b26f fix(NYE): Correct achievement badge 2014-12-30 22:56:40 -06:00
Sabe Jones
d1355faa31 Merge pull request #4452 from SabreCat/nye
New Year's event features
2014-12-30 22:18:11 -06:00
Sabe Jones
230482c578 chore(news): Bailey 2014-12-30 21:58:15 -06:00
Tyler Renelle
edf66cbb59 feat(discount) google discount & use sub.key instead of sub.months 2014-12-30 20:05:07 -07:00
Sabe Jones
e35722865a fix(NYE): I18N for random text 2014-12-30 20:52:06 -06:00
Sabe Jones
51acc477fe feat(NYE): New Year's cards 2014-12-30 19:57:24 -06:00
Blade Barringer
303d30a270 Merge pull request #4439 from crookedneighbor/transparent-gems
Added transparent class to gem purchasing if zero gems are available for purchase
2014-12-30 11:11:32 -06:00