b0fe5f4081
add 2x party up/on achieve images and recompile spritesheets
2016-03-09 12:43:54 -05:00
6642a8e131
add party up/on achiev images and recompile spritesheets
2016-03-09 12:02:43 -05:00
fe178a62d9
move party up/on achievs about beast/mount achievs on profile
2016-03-08 21:03:57 -05:00
2ade78fc34
show party up/on achievs on user's profile achievements section
2016-03-08 20:57:19 -05:00
d2d3b9deab
award party {up,on} achiev when party reaches {2,4} members
2016-03-08 20:55:18 -05:00
167eb8973a
add strings for new partyUp and partyOn achievs
2016-03-08 20:45:33 -05:00
98497ea739
Merge branch 'develop' of https://github.com/khipkin/habitrpg into develop
2016-03-07 03:20:58 -05:00
34057c375b
Merge pull request #6819 from zesme/develop
...
Closed issue #6758 - prevent multiple confirm/cancel popups from group Leave button
2016-03-06 20:28:47 +10:00
87bd55cca1
Merge pull request #6780 from colwem/issue6774
...
Improve styling of markdown blockquotes - fixes #6774
2016-03-06 19:59:30 +10:00
e59f614568
Merge pull request #6786 from murraybd/use-level-style-in-modals
...
Use level style in modals
2016-03-06 18:52:21 +10:00
9cac8dd95e
Merge pull request #6741 from delftswa2016/fix-hidden-button-issue-6740
...
Fixed partially hidden button in chat box
2016-03-06 18:18:02 +10:00
612d455fe1
Merge pull request #6782 from andrewcham/issue6779
...
update community guidelines - fixes #6779
2016-03-06 17:42:08 +10:00
b553a6c134
fix: Remove active handles (incompatible with node v4)
2016-03-05 08:11:21 -06:00
a007effddd
chore(i18n): update locales
2016-03-05 07:46:08 -06:00
9517920de6
fix error in nodemon command for running API tests individually
2016-03-05 15:51:54 +10:00
4f4ea8416c
Closed issue #6758
...
After some discussion on the thread, this is probably the neatest
solution to issue #6758 . I have also modified the code on the guild
controller, which displayed the very same problem when pressing the
'Leave' button to leave a guild.
2016-03-04 13:16:37 -03:00
511b003ec5
Merge pull request #6811 from crookedneighbor/upgrade_babel
...
chore: upgrade babel to v6
2016-03-04 08:36:08 -06:00
9447a6ce10
feat: pre-compile babel when used in production
2016-03-04 07:44:22 -06:00
b61cfefc30
fix: fix issue where build would fail but exit as if oy passed
2016-03-03 21:05:06 -06:00
8c6d8163bc
refactor: adjust path to cron module in common code
2016-03-03 18:09:07 -06:00
ea983179a4
Merge pull request #6804 from HabitRPG/sabrecat/active-handles
...
Active handles logging
2016-03-03 13:55:14 -06:00
0406142e0e
chore: upgrade babel to v6
2016-03-02 21:36:27 -06:00
c3107ad3fb
improve commenting style
2016-03-03 13:35:55 +10:00
56e53cc95f
fix Burst of Flames / fireball skill - was doing too much boss damage; add human-friendly names to skills for ease of searching
2016-03-03 08:30:49 +10:00
af38e83e36
fix(logging): don't log without env var
2016-03-02 11:30:49 -05:00
c761944c35
feat(logging): timestamp active handles output
2016-03-02 10:22:46 -05:00
5b012750bb
convert spells to es6
2016-03-02 12:46:06 +01:00
f69a29c152
improve group invitation code and tests
2016-03-02 09:26:55 +10:00
a698559c04
fix(log-handles): don't log verbose code
2016-03-01 16:46:39 -05:00
bff5258a56
fix(logging): get interval from env var
2016-03-01 16:46:39 -05:00
078100aac8
chore(logging): output active handles per 10 minutes
2016-03-01 16:46:38 -05:00
2516eae8d3
Merge pull request #6799 from HabitRPG/sabrecat/armoire-201603
...
Armoire and BGs 2016-03
2016-03-01 15:34:50 -06:00
ea6abbfabc
feat(content): Armoire and BGs 2016-03
2016-03-01 15:59:25 -05:00
ae56dd5c2e
Merge pull request #6796 from crookedneighbor/refactor_remove_unused_common_src_files
...
refactor: Remove unused common script src files
2016-03-01 09:21:58 -06:00
c96ddaeebe
refactor: Remove unused common script src files
2016-03-01 08:49:25 -06:00
531d3969f4
fix cluster.fork
2016-03-01 09:15:13 +01:00
01b12cd8b4
Merge pull request #6793 from Sinble/develop
...
Change Menu Names
2016-03-01 15:43:27 +10:00
b6255e9240
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into menu_name_change
2016-02-29 20:23:24 -06:00
251dd3cb8e
Changed submenu from Hall of Heroes to Hall of Contributors
2016-02-29 20:23:05 -06:00
3464914655
Revert "remove common/script/src"
...
This reverts commit 7c5572608f
2016-03-01 05:30:44 +10:00
7c5572608f
remove common/script/src
2016-02-29 16:35:35 +01:00
cbb29eac55
update gitignore for elastic beanstalk
2016-02-29 16:28:08 +01:00
fae0bbc8f6
Add Moonstone Chain quest art
2016-02-28 19:37:07 -06:00
075ed9f172
updated menu names for better description
2016-02-28 16:10:26 -06:00
8d7c46d79f
Merge branch 'develop' into use-level-style-in-modals
2016-02-28 10:13:10 -08:00
e2ca21f935
Add Message in a Bottle quest art
2016-02-28 17:12:57 +00:00
6cd861dcdc
Merge pull request #6742 from murraybd/develop
...
Display attribute info in Character Build
2016-02-28 19:39:20 +10:00
518532efdc
#6779 Update community-guidelines.jade with current date
2016-02-28 01:20:31 -08:00
c8b5cf95be
Merge pull request #6764 from querry43/add-missing-docker-depends
...
adding two deps to dockerfile required for karma
2016-02-28 19:11:01 +10:00
ccfff7270f
Merge pull request #6763 from querry43/tests-in-docker
...
TEST_DB_URI env override
2016-02-28 19:04:58 +10:00
Kaitlin Hipkin