e5b6e64a98
Added preliminary logic for opening triadBingo modal
2015-01-16 11:47:07 -06:00
cecb2792e0
Added logic so triad bingo only appears in achievements after mount
...
master has been reached
2015-01-16 11:41:36 -06:00
cbdd30b25f
Merge branch 'mountmaster' into triad-bingo
2015-01-16 11:40:36 -06:00
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
ff4c2ade96
Added triadBingo to achievement list
2015-01-16 11:32:41 -06:00
10bc7e4eac
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-16 10:44:52 -06:00
9a087d2d90
update angular and do not send api key to loggly
2015-01-16 17:39:47 +01:00
290e602f21
Added brackets to quest.boss check. Closes #4526
2015-01-16 10:22:47 -06:00
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
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
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
17ab1d660f
chore(news): Stress Strike 1 Bailey
2015-01-13 13:29:10 -06:00
04ff888819
fix(world-boss): Scale based on current HP
2015-01-13 13:19:04 -06:00
f00e1bc660
Merge pull request #4510 from SabreCat/stressbeast
...
Stressbeast healing on rage
2015-01-13 12:06:12 -06:00
ad7c02d50d
feat(world-boss): Healing on rage
2015-01-13 11:49:16 -06:00
385fe36a0a
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-12 21:50:14 -06:00
86c25085fc
Merge remote-tracking branch 'upstream/develop' into fix-chat-visibility-2015-01-13
2015-01-13 07:53:52 +10:00
0bd22e7c77
disallow fetching of chat messages
2015-01-13 06:10:46 +10:00
1557907a1c
Updated string names
2015-01-12 13:12:40 -06:00
ca2d45113c
fix(billing): script to fix current_period_end, see #4420
2015-01-12 11:50:46 -07: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
11f20555c4
Corrected stats page to show profile data instead of user data
2015-01-11 17:23:30 -06:00
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
22446a5ddb
apply active class to special spells too
2015-01-10 11:06:39 -05:00
09c3b643bd
Removed comment because bug was fixed
2015-01-10 09:54:49 -06: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
1c0520c94d
Removed link to picture of all pets, since it is now inaccurate and
...
there is no corresponding one for mounts
2015-01-10 09:38:03 -06:00
d6dc2119cb
add active class to spell item when it is selected
2015-01-10 10:36:00 -05: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
7f20ca7d8b
Made title dynamic
2015-01-10 08:26:11 -06: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
689b13ecb6
fix(world-boss): Justin not stressed yet
2015-01-09 10:00:16 -06:00
cda16d5bc0
Merge pull request #4494 from SabreCat/stressbeast
...
World boss for Winter Wonderland 2015
2015-01-08 15:51:04 -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
cba232ef83
feat(presskit): add presskit page cc @lemoness
2015-01-08 13:41:23 -07:00
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
0807e7856c
Merge remote-tracking branch 'upstream/develop' into mountmaster
2015-01-08 11:31:45 -06:00
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
c96ae618db
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
2015-01-07 10:32:58 -06:00
eca252a269
Corrected moment code to use new format instead of depreciating format
2015-01-07 10:28:46 -06:00
193b92c16b
fix(cds): max hour is 23 not 24
2015-01-06 23:12:03 +01: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
Blade Barringer