Commit graph

6057 commits

Author SHA1 Message Date
Tyler Renelle
2306b7c572 refactor(services): move to a single "habitrpg" module for services /
directives / filters
2015-01-17 18:43:37 -07:00
Tyler Renelle
90c7142da5 refactor(config): move httpInterceptor from website/app.js to habitrpg-shared/config.js. 2015-01-16 16:48:53 -07:00
Matteo Pagliazzi
9a087d2d90 update angular and do not send api key to loggly 2015-01-16 17:39:47 +01:00
Blade Barringer
290e602f21 Added brackets to quest.boss check. Closes #4526 2015-01-16 10:22:47 -06:00
Sabe Jones
94d003ca5d Merge pull request #4524 from SabreCat/develop
T-Rex pet quest and party boss Rage implementation
2015-01-15 16:41:07 -06:00
Tyler Renelle
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
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
Sabe Jones
04ff888819 fix(world-boss): Scale based on current HP 2015-01-13 13:19:04 -06:00
Sabe Jones
f00e1bc660 Merge pull request #4510 from SabreCat/stressbeast
Stressbeast healing on rage
2015-01-13 12:06:12 -06:00
Sabe Jones
ad7c02d50d feat(world-boss): Healing on rage 2015-01-13 11:49:16 -06:00
Alice Harris
86c25085fc Merge remote-tracking branch 'upstream/develop' into fix-chat-visibility-2015-01-13 2015-01-13 07:53:52 +10:00
Alice Harris
0bd22e7c77 disallow fetching of chat messages 2015-01-13 06:10:46 +10:00
Tyler Renelle
ca2d45113c fix(billing): script to fix current_period_end, see #4420 2015-01-12 11:50:46 -07:00
Blade Barringer
c9f5113daa Merge pull request #4486 from kangabell/spell-active-highlight
Give greater indication to which spell is currently being cast.
2015-01-10 11:59:35 -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
K Bell
0f2adcad14 highlight spell item when it has class of 'active' 2015-01-10 10:35:27 -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
689b13ecb6 fix(world-boss): Justin not stressed yet 2015-01-09 10:00:16 -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
Tyler Renelle
6626103d06 chore(cores): allow cores==0 to not use cluster at all (even w/ single
core). Good for running debugger. If cores==1, it will use cluster to
restart the single node on error
2015-01-08 13:19:11 -07:00
Tyler Renelle
0b28f6df55 fix(plans): when gifting subscription, set plan.dateUpdated so it can
roll gemCapExtra next month. Fixes #4480
2015-01-07 14:59:38 -07:00
Blade Barringer
c96ae618db Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop 2015-01-07 10:32:58 -06:00
Blade Barringer
eca252a269 Corrected moment code to use new format instead of depreciating format 2015-01-07 10:28:46 -06: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
Matteo Pagliazzi
b854663b92 fix(loggly): do not pass apiKey 2015-01-06 09:05:30 +01: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
Alice Harris
dc7c6f8625 Merge pull request #4476 from jdpopkin/stat_tooltips_3223
Add tooltip with exact health/exp/mana
2015-01-05 18:06:57 +10:00
Jackson Popkin
b409e589f1 Add tooltip with exact health/exp/mana 2015-01-04 17:26:11 -05:00