 Blade Barringer
|
cdc54038ba
|
Remove bad file encoding
|
2015-07-14 07:56:53 -05:00 |
|
|
unknown
|
7e60864d41
|
Fixing color on blurbs
|
2015-07-14 07:46:57 -05:00 |
|
|
unknown
|
1789bf3c6a
|
Making suggests changes to issue 5513
|
2015-07-14 07:44:51 -05:00 |
|
|
unknown
|
a25296a855
|
adding more links to heroes blurb and links not included in json
|
2015-07-14 07:44:51 -05:00 |
|
|
unknown
|
65b7465081
|
adding blurbs to pages
|
2015-07-14 07:44:51 -05:00 |
|
|
Matteo Pagliazzi
|
6cf0840c71
|
chore(i18n): update locales
|
2015-07-14 13:55:03 +02:00 |
|
|
Blade Barringer
|
a01b2756f2
|
Merge pull request #5605 from hairlessbear/join-party-quest-invite-fix
Invite a new party member to a quest if the quest is still in the invitation stage (fixes #5598)
|
2015-07-13 22:37:46 -05:00 |
|
|
Alys
|
cb9f5bcff3
|
Merge pull request #5523 from hairlessbear/update_isOnQuest_logic
Removed user.party.quest.key checks from isOnQuest and added check for user ID in quest members
|
2015-07-14 08:11:35 +10:00 |
|
|
hairlessbear
|
7223eeb681
|
Invites a new party member to a quest if the quest is still in the invitation stage (fixes #5598)
|
2015-07-13 13:01:35 -04:00 |
|
|
Blade Barringer
|
60e92805dd
|
Remove unneeded comment
|
2015-07-13 08:36:01 -05:00 |
|
|
Blade Barringer
|
148e418c8a
|
Change file names to use hyphen syntax
|
2015-07-13 08:19:15 -05:00 |
|
|
Blade Barringer
|
b01e4489ef
|
Compile sprites
|
2015-07-12 22:30:46 -05:00 |
|
|
Blade Barringer
|
6f4b76edc5
|
Rename rancher armor to rancher robes
|
2015-07-12 22:25:05 -05:00 |
|
|
Blade Barringer
|
dad6a9527b
|
Added shop versions of armoire stuff
|
2015-07-12 22:21:39 -05:00 |
|
|
Blade Barringer
|
9ebf5dee2c
|
Renamed crown sprite
|
2015-07-12 22:18:08 -05:00 |
|
|
Matteo Pagliazzi
|
fefc8ee732
|
Merge pull request #5600 from gisikw/remove-apdex-check
Remove apdex check from middleware until NR is back
|
2015-07-12 23:50:35 +02:00 |
|
|
Matteo Pagliazzi
|
4b170cd4dc
|
chore(i18n): update locales
|
2015-07-12 23:45:26 +02:00 |
|
|
Kevin Gisi
|
c82e5a885d
|
Put memory check back in
|
2015-07-12 13:51:22 -04:00 |
|
|
Kevin Gisi
|
be420a67a0
|
Remove apdex check from middleware until NR is back
|
2015-07-12 13:39:16 -04:00 |
|
|
Blade Barringer
|
add35bc17c
|
Correct names of sprites
|
2015-07-12 12:21:12 -05:00 |
|
|
Blade Barringer
|
6ac049cc71
|
Allow animal ears to be added to costume or equipped gear
|
2015-07-12 09:23:03 -05:00 |
|
|
Blade Barringer
|
d09b24e1a5
|
Add sprites to website
|
2015-07-12 08:24:03 -05:00 |
|
|
Alys
|
92bfc66c67
|
fix a bug where if you had "Use Costume" ticked, any Battle Gear or Costume choice would be added to your costume, never to Battle Gear
|
2015-07-12 18:18:31 +10:00 |
|
|
Alys
|
18db504d2a
|
allow Trivial priority (difficulty) to cause a tiny amount of damage from a boss
|
2015-07-12 11:05:01 +10:00 |
|
|
Blade Barringer
|
87dddb178f
|
Merge branch 'duckspeaker-issue-5570-hall-of-heroes-table-resize' into develop
|
2015-07-11 16:53:09 -05:00 |
|
|
Blade Barringer
|
18ebbdac67
|
Remove extra class
|
2015-07-11 16:52:55 -05:00 |
|
|
Blade Barringer
|
c9ac32231d
|
Remove inventory again
|
2015-07-11 16:37:26 -05:00 |
|
|
Blade Barringer
|
4a9ea83d6b
|
Added whale quest back in, refactor
|
2015-07-11 16:35:16 -05:00 |
|
|
Blade Barringer
|
4acc0c03a8
|
Add in changes to equipment and seasonalshop
|
2015-07-11 16:16:29 -05:00 |
|
|
Blade Barringer
|
b71f68ef32
|
Merge branch 'develop' into equipment-refactor-merge-into-develop
|
2015-07-11 15:55:53 -05:00 |
|
|
Blade Barringer
|
74dee2727e
|
Remove out of date todo
|
2015-07-11 15:54:09 -05:00 |
|
|
Blade Barringer
|
dccc10aa4d
|
Refactor
|
2015-07-11 15:05:58 -05:00 |
|
|
Blade Barringer
|
ba13f2d9aa
|
Add locale strings
|
2015-07-11 15:05:32 -05:00 |
|
|
Blade Barringer
|
eeae12b002
|
Refactore inventory pages
|
2015-07-11 13:50:30 -05:00 |
|
|
Blade Barringer
|
066206f41c
|
Refactored inventory into separate files
|
2015-07-11 13:13:00 -05:00 |
|
|
Blade Barringer
|
c33a22ceb3
|
Put locale key creation into private function
|
2015-07-11 12:07:20 -05:00 |
|
|
Blade Barringer
|
94cd0bb852
|
Use user variable
|
2015-07-11 11:18:19 -05:00 |
|
|
Blade Barringer
|
d2e61bf5ef
|
Change string to str
|
2015-07-11 11:15:04 -05:00 |
|
|
Blade Barringer
|
cb4b2e43bf
|
Change variable name to itemList
|
2015-07-11 11:14:50 -05:00 |
|
|
Alys
|
ef496525a1
|
change white "Report" button to red "Report Violation" button in chat message flag modal
|
2015-07-11 21:23:39 +10:00 |
|
|
Joe Gallo
|
aabc50e992
|
surround tables in table-responsive class
|
2015-07-11 01:19:47 -04:00 |
|
|
Blade Barringer
|
305414e152
|
Merge pull request #5553 from Lokeh/Lokeh/maxHealth
maxHealth refactor
|
2015-07-11 00:18:15 -05:00 |
|
|
Arbixal
|
48b520509c
|
fixes https://github.com/HabitRPG/habitrpg/issues/5555
|
2015-07-11 00:15:55 -05:00 |
|
|
Blade Barringer
|
c941511d11
|
Merge branch 'barbourkd-develop' into develop
|
2015-07-11 00:11:23 -05:00 |
|
|
Blade Barringer
|
50a924e470
|
Add space
|
2015-07-11 00:11:02 -05:00 |
|
|
Blade Barringer
|
09d85f39fc
|
Merge pull request #5586 from GitHubSphinx/Sphinx-entry2
Introducing a class for buttons allowing wrapping
|
2015-07-11 00:07:26 -05:00 |
|
|
Blade Barringer
|
ddf2489664
|
Merge pull request #5581 from barbourkd/bugfix/5552
Show Extra Notes icon regardless of task ownership.
|
2015-07-11 00:05:04 -05:00 |
|
|
Blade Barringer
|
2722651cc8
|
Merge branch 'GitHubSphinx-Sphinx-entry3' into develop
|
2015-07-10 23:47:42 -05:00 |
|
|
Blade Barringer
|
3644d43f0a
|
Remove unnecessary duplication
|
2015-07-10 23:47:23 -05:00 |
|
|
Blade Barringer
|
ab1870c1aa
|
Merge branch 'TheHollidayInn-groups-remove-message-when-kick' into develop
|
2015-07-10 23:24:20 -05:00 |
|