Blade Barringer
eceaaef954
Merge pull request #4567 from crookedneighbor/add-audio-watts
...
Added Watts' Theme to Audio Choices
2015-01-26 11:27:27 -06:00
Sabe Jones
65af7f362e
Merge branch 'scrolls' into develop
...
Conflicts:
views/shared/new-stuff.jade
2015-01-26 11:18:48 -06:00
Sabe Jones
ad08f1be9a
fix(news): Errant parenthesis
2015-01-26 11:11:04 -06:00
Sabe Jones
524761f1cf
feat(mystery): January subscriber set
2015-01-26 11:00:02 -06:00
Blade Barringer
9b5b83871f
Refined triad Bingo calculation
2015-01-25 21:00:34 -06:00
Blade Barringer
d9ecd41c1e
Fixed mountCount calculation
2015-01-25 20:26:51 -06:00
Alice Harris
9ab86b536f
adjusted comments
2015-01-24 16:46:18 +10:00
Alice Harris
a95522e165
create script to convert false to null in items.mounts for https://github.com/HabitRPG/habitrpg/pull/4374#issuecomment-71038795
2015-01-24 16:16:05 +10:00
Blade Barringer
9f38ac86f7
Replaced blank death sound with actual sound files instead of blank
...
files
2015-01-23 15:27:57 -06:00
Blade Barringer
93c39e81bd
Added death sound. Put blank versions in daniel theme
2015-01-23 14:59:18 -06:00
Blade Barringer
de59c76609
Added watts themes to audio choices
2015-01-23 14:53:30 -06:00
Sabe Jones
412417505f
feat(quests): Differentiated scrolls
...
Implements logic to show specific scroll images per quest, falling back to the present scroll image if none is present. Also implements a "locked scroll" picture for unavailable quests in addition to the current background dimming.
2015-01-23 10:40:32 -06:00
Sabe Jones
ec114d6a3e
chore(news): Victory Bailey
...
Also includes a fix to disallow party quest bosses from using Rage healing to exceed initial Health.
2015-01-23 10:20:50 -06:00
Blade Barringer
042f2fbceb
Merge pull request #4498 from crookedneighbor/see-mp
...
See mp on stats page
2015-01-22 11:57:15 -06:00
Sabe Jones
9d7fc1efbb
chore(news): Stress Strike 3 Bailey
2015-01-21 10:17:19 -06:00
Blade Barringer
5c8450ba1a
Corrected triad bingo achievement for users that already had it
2015-01-20 19:26:29 -06:00
Blade Barringer
5246257f62
Merge pull request #4550 from HabitRPG/bailey-20150120
...
Bailey 20150120 & Mount Master
2015-01-20 17:06:14 -06:00
Blade Barringer
c73fb9eb31
Added in missing p tag
2015-01-20 16:44:49 -06:00
Blade Barringer
d4ab70b174
Removed errant comma
2015-01-20 16:41:36 -06:00
Blade Barringer
e95b238041
Gave credit to badge creators
2015-01-20 16:33:18 -06:00
Blade Barringer
cc65ea1346
Lemoness removed from items she didn't work on
2015-01-20 16:32:30 -06:00
Blade Barringer
de1c0240f6
Restored changelog
2015-01-20 16:22:29 -06:00
Blade Barringer
b0bb3adf53
removed quest line text
2015-01-20 16:09:43 -06:00
Blade Barringer
7842bbe22e
Added stressbeast strike news
2015-01-20 15:58:00 -06:00
Blade Barringer
ebd5bbd19b
Added new info to Bailey announcement
2015-01-20 14:37:17 -06:00
Matteo Pagliazzi
925bfe8af4
fix(emails): parse json
2015-01-20 20:59:43 +01:00
Matteo Pagliazzi
9d22e65e19
fix(flags-emails): allow arrays in FLAG_REPORT_EMAIL
2015-01-20 18:33:49 +01:00
Matteo Pagliazzi
065227fa8c
fix(flags-emails): allow arrays in tnxEmails
2015-01-20 18:29:46 +01:00
Blade Barringer
07fec4a205
Merge branch 'mountmaster' into bailey-20150120
2015-01-20 10:30:40 -06:00
Sabe Jones
f0d4135d54
Merge pull request #4546 from SabreCat/stressbeast
...
World boss desperation move
2015-01-19 23:17:32 -06:00
Sabe Jones
da2d59734c
fix(world-boss): simplify desperation stats
2015-01-19 23:00:00 -06:00
Sabe Jones
0137dd7209
fix(world-boss): Need markModified
2015-01-19 22:36:10 -06:00
Sabe Jones
0a0a3f78cf
fix(world-boss): Desperation logic
2015-01-19 22:14:09 -06:00
Blade Barringer
3189ab92af
Wrote error message for when trying to send gems to self from balance
2015-01-19 22:13:21 -06:00
Sabe Jones
3ee965d8d2
feat(world-boss): Desperation move
2015-01-19 21:48:58 -06:00
Blade Barringer
c3c144223a
Merge branch 'develop' into mountmaster
2015-01-19 14:47:17 -06:00
Matteo Pagliazzi
b26d5ee732
Merge pull request #4540 from crookedneighbor/add-ngsanitize
...
Added ng-sanitize
2015-01-19 21:37:43 +01:00
Blade Barringer
753cac236b
Added ng-sanitize
2015-01-19 14:17:43 -06:00
benmanley
3a95db0b0d
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2015-01-19 17:06:27 +00:00
benmanley
f93e0ba6b9
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
...
Conflicts:
views/shared/tasks/task.jade
2015-01-19 17:06:19 +00:00
Sabe Jones
e40ea3032a
chore(news): Stress Strike 2 Bailey
2015-01-19 10:51:07 -06:00
benmanley
2c88be85cf
fix(tasks): vertically align habit buttons
...
* When a task has + and - buttons, display the buttons vertically and
expand them to fill the full height of the task.
* Use glyphicons for + and - icons
2015-01-19 16:41:01 +00:00
Alice Harris
fa8ead20c4
Merge pull request #4208 from Alys/todos-dated-tab-2014-11-01
...
create a "Dated" To-Dos tab
2015-01-19 18:16:22 +10:00
Alice Harris
57637d4271
Merge remote-tracking branch 'upstream/develop' into todos-dated-tab-2014-11-01
...
ally if it merges an updated upstream into a topic branch.
2015-01-19 17:52:54 +10:00
Blade Barringer
1318d0de38
Merge pull request #4451 from crookedneighbor/vIiRuS-groupSorting
...
Group Sorting
2015-01-18 23:08:40 -06:00
Blade Barringer
5d572c2a40
Merge pull request #4501 from crookedneighbor/fix-day-start
...
Closes #4490 . Day start saves on blur instead of change
2015-01-18 22:57:23 -06:00
Blade Barringer
b73518af5f
Removed $root from view
2015-01-18 22:54:07 -06:00
Blade Barringer
055db157f6
Merge branch 'bug/habitspell' of https://github.com/etaiklein/habitrpg into etaiklein-bug/habitspell
2015-01-18 22:50:26 -06:00
Blade Barringer
5a11dea855
Merge pull request #4529 from HabitRPG/triad-bingo
...
Triad bingo
2015-01-18 19:12:28 -06:00
Tyler Renelle
bb78b121da
revert part of a053486, angular is madeningly inconsistent with this bug
2015-01-18 16:38:31 -07:00
