ff4c2ade96
Added triadBingo to achievement list
2015-01-16 11:32:41 -06:00
e565bf7896
Added initial strings for triad bingo
2015-01-16 11:25:49 -06:00
e8b6779be6
Merge branch 'mountmaster' of github.com:HabitRPG/habitrpg-shared into mountmaster
2015-01-16 10:47:50 -06:00
75cf2a4788
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster
...
Conflicts:
dist/habitrpg-shared.css
dist/habitrpg-shared.js
dist/spritesmith0.css
dist/spritesmith0.png
2015-01-16 10:46:59 -06:00
c301bd3e89
fix(console): remove console.log
2015-01-16 17:46:47 +01: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
73d684987e
chore(grunt): compile
2015-01-16 17:33:44 +01:00
4a22b1dc57
fix(sync): fix for when data is null, ie. server offline
2015-01-16 17:33:15 +01:00
290e602f21
Added brackets to quest.boss check. Closes #4526
2015-01-16 10:22:47 -06:00
1f1cd750cb
chore(i18n): update locales
2015-01-16 17:16:48 +01:00
c1d1d7d4a5
chore(grunt): grunt full
2015-01-15 16:52:59 -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
3e17834b5d
Merge pull request #440 from SabreCat/develop
...
T-Rex pet quest
2015-01-15 16:39:38 -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
5c28730dc1
markdown timeoutTime attribute
2015-01-15 22:53:47 +01:00
c260362d96
feat(quest): T-Rex pet
...
Implements two new Quests, and the "tyrannosaur" pets included as rewards for same.
2015-01-15 15:45:56 -06: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
f9b507e782
changed links to relative, corrected mailto link
2015-01-15 08:23:23 -05:00
9fe93351ae
applied .muted to text so less cluttered looking
2015-01-14 22:38:02 -05:00
273dc4909f
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into issue4468
2015-01-14 22:29:07 -05:00
8a2e9caca9
chore(i18n): update locales
2015-01-14 19:53:17 +01:00
ce1c0d9008
Merge pull request #438 from crookedneighbor/prevent-type-changing
...
Prevent type changing
2015-01-14 19:41:44 +01:00
1c771fa4db
fixed bug where +habits would behave strangely when targeted by spells
2015-01-14 02:06:41 -05:00
2bd1af587b
Compiled coffeescript
2015-01-13 20:18:06 -06:00
a805b4f0c9
Brought in lefnire's change so type cannot be changed on updateTask
2015-01-13 20:17:36 -06:00
cb835f97b2
Merge pull request #437 from taldin/mountmaster-modal-edit-from-taldin
...
Rewritten modal
2015-01-13 19:55:43 -06:00
150909cc95
Rewritten modal
...
As per comments in #4374 .
2015-01-13 11:31:02 -08:00
17ab1d660f
chore(news): Stress Strike 1 Bailey
2015-01-13 13:29:10 -06:00
4e50c43da2
fix(world-boss): Scale based on current HP
2015-01-13 13:19:38 -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
625d1dfbed
Merge pull request #436 from SabreCat/stressbeast
...
Stressbeast healing on rage
2015-01-13 12:04:42 -06:00
a2be1bc472
fix(world-boss): Bit stronger healing
2015-01-13 12:00:06 -06:00
480b4e2764
feat(world-boss): Healing on rage
2015-01-13 11:50:15 -06:00
ad7c02d50d
feat(world-boss): Healing on rage
2015-01-13 11:49:16 -06:00
ddff5afda7
Merge branch 'develop' of github.com:HabitRPG/habitrpg-shared into mountmaster
...
Conflicts:
dist/habitrpg-shared.js
2015-01-12 21:50:57 -06:00
385fe36a0a
Merge branch 'develop' of github.com:HabitRPG/habitrpg into mountmaster
2015-01-12 21:50:14 -06:00
41364f6c59
modified login/display name info to be more descriptive
2015-01-12 21:45:58 -05:00
9456653263
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into issue4468
...
Hopefully this doesn't break anything...
2015-01-12 21:36:44 -05: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
f1e354ba0e
Added string for both beast master and mount master
2015-01-12 13:12:50 -06:00
1557907a1c
Updated string names
2015-01-12 13:12:40 -06:00
1fd068ae89
Corrected capitalization
2015-01-12 13:09:51 -06:00
c7d8c40b0b
Updated strings to use master instead of abreviated mast
2015-01-12 12:58:55 -06:00
ca2d45113c
fix(billing): script to fix current_period_end, see #4420
2015-01-12 11:50:46 -07:00
45ae1ec7d6
changed display name description to be consistent with login name description
2015-01-11 20:31:52 -05:00
8e3e66dc08
added description of login name and link to page to edit display name
2015-01-11 20:30:25 -05:00
6c99bbc948
added translatable strings for login name description
2015-01-11 20:29:36 -05:00
Blade Barringer