f5e9568cef
Consolidated calcTriadBingo function
2015-01-16 21:33:58 -06:00
465bfe4df9
Merge pull request #443 from HabitRPG/lefnire/httpinterceptor
...
move httpInterceptor from app.js to habitrpg-shared/config.js
2015-01-16 18:32:52 -07:00
f71737a84c
Merge pull request #4530 from HabitRPG/lefnire/httpinterceptor
...
move httpInterceptor from website/app.js to habitrpg-shared/config.js
2015-01-16 18:32:45 -07:00
dbeb6f8c1e
refactor(config): add mobile
2015-01-16 18:31:37 -07:00
90c7142da5
refactor(config): move httpInterceptor from website/app.js to habitrpg-shared/config.js.
2015-01-16 16:48:53 -07:00
6b6802a27a
refactor(config): move httpInterceptor from website/app.js to
...
habitrpg-shared/config.js. Will merge in mobile soon
2015-01-16 16:48:35 -07:00
75971b0f40
Added triad bingo check to releaseBoth function
2015-01-16 17:01:01 -06:00
8b1ba48bfe
Merge branch 'mountmaster' into triad-bingo
2015-01-16 16:53:35 -06:00
d9fed69147
Corrected releasBoth function to reset current pet and deduct the
...
correct amount of gems
2015-01-16 16:52:59 -06:00
e25472759a
Added triad bingo achievment
2015-01-16 16:43:48 -06:00
7860819ee3
Added shell for awarding triad bingo
2015-01-16 12:27:51 -06:00
5b2c4d5a09
Compiled css
2015-01-16 12:23:25 -06:00
1460e5762e
Added sprite
2015-01-16 12:15:22 -06:00
d4d18dcee5
Added triad bingo achievement
2015-01-16 12:14:51 -06:00
ca1f4890ea
Corrected icon for triad bingo
2015-01-16 11:55:23 -06:00
3ba057258f
Added triad bingo achievement modal
2015-01-16 11:49:19 -06:00
3625cf514e
Added triad bingo achievement test
2015-01-16 11:49:00 -06:00
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
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
Blade Barringer