 Alice Harris
|
27ef50fe26
|
fix typo in comment characters - sorry for commit spam
|
2014-12-27 07:28:05 +10:00 |
|
|
Alice Harris
|
ac233a2b04
|
update death "doesn't break unbreakables" test to match the new code behaviour
|
2014-12-27 07:28:05 +10:00 |
|
|
Alice Harris
|
0391d1afc4
|
add mostly pointless comment to trigger a new Travis build test since the last one didn't do what I wanted :)
|
2014-12-27 07:28:05 +10:00 |
|
|
Alice Harris
|
abc2f59b57
|
allow the free weapon_warrior_0 equipment to be lost on death so that new players can experience equipment loss
|
2014-12-27 07:28:05 +10:00 |
|
|
Alice Harris
|
d7f9760c0f
|
fix typo so that Ryan doesn't make pointed comments at me
|
2014-12-27 07:28:05 +10:00 |
|
|
Alice Harris
|
87f51913d0
|
prevent off-class items and free items being lost on death
|
2014-12-27 07:28:05 +10:00 |
|
|
Verabird
|
9b10081117
|
Removed useless comment in task.jade
|
2014-12-26 16:07:54 -05:00 |
|
|
Alice Harris
|
058e506d13
|
Merge remote-tracking branch 'upstream/develop' into rebalancing-2014-12
|
2014-12-27 07:05:52 +10:00 |
|
|
Verabird
|
2de3e65043
|
Fix merge conflicts with test values
|
2014-12-26 16:00:45 -05:00 |
|
|
Verabird
|
8852ad61b2
|
Add dateFormat preference field to user model and make settingsCtrl change the field when form is changed
|
2014-12-26 15:52:42 -05:00 |
|
|
Verabird
|
7297429888
|
Make it possible to choose between MM/dd and dd/MM date format
|
2014-12-26 15:52:42 -05:00 |
|
|
Verabird
|
e391fc04f0
|
Add variables for medium-length date display
|
2014-12-26 15:52:42 -05:00 |
|
|
Verabird
|
13be267efb
|
added variable for date display and checking line ending issue
|
2014-12-26 15:52:41 -05:00 |
|
|
Verabird
|
baa528fe7b
|
Add dateFormat phrase for translation
|
2014-12-26 15:48:20 -05:00 |
|
|
Verabird
|
a3f0d4dea5
|
Add default values for shortdate and mediumdate formats
|
2014-12-26 15:48:19 -05:00 |
|
|
Matteo Pagliazzi
|
971ea8a495
|
chore(i18n): update locales
|
2014-12-26 11:33:21 +01:00 |
|
|
Blade Barringer
|
f5a0bd6903
|
Added trasnparent class to seasonal items already owned
|
2014-12-25 21:32:07 -06:00 |
|
|
Lucy Davies
|
33ed0794b9
|
Remove the onClick action of this file is included in the Buy Gems popup
|
2014-12-26 01:06:30 +00:00 |
|
|
Lucy Davies
|
c65fe65d4e
|
Remove the + icon if this file is included in the Buy Gems popup
|
2014-12-26 00:34:48 +00:00 |
|
|
Lucy Davies
|
d29971695e
|
Define the variable to control display of the + icon and the onClick functionality
|
2014-12-26 00:17:03 +00:00 |
|
|
Sabe Jones
|
2cac24ebe9
|
chore(grunt): grunt full
|
2014-12-25 18:09:29 -06:00 |
|
|
Sabe Jones
|
37db763fc2
|
fix(event): Mystery sprite error
|
2014-12-25 18:08:14 -06:00 |
|
|
Sabe Jones
|
6c8f9e39b6
|
fix(event): Mystery typo
|
2014-12-25 18:05:04 -06:00 |
|
|
Sabe Jones
|
620fcd1144
|
Merge pull request #413 from SabreCat/seasonal
Winter Wonderland 2015 Cont'd
|
2014-12-25 17:48:12 -06:00 |
|
|
Sabe Jones
|
a1eb4bfa5b
|
Merge pull request #4408 from SabreCat/seasonal
Winter Wonderland 2015 Cont'd
|
2014-12-25 17:47:50 -06:00 |
|
|
Sabe Jones
|
9d279b7a77
|
chore(grunt): grunt full
|
2014-12-25 17:43:31 -06:00 |
|
|
Sabe Jones
|
1b4843ff58
|
fix(event): Better quest text placement
|
2014-12-25 17:42:09 -06:00 |
|
|
Sabe Jones
|
f4c582eb24
|
fix(event): quest syntax
|
2014-12-25 17:40:49 -06:00 |
|
|
Sabe Jones
|
597793e3ca
|
feat(event): Quests and Bailey
|
2014-12-25 17:36:16 -06:00 |
|
|
Sabe Jones
|
6d4d9451a5
|
feat(event): Mystery migration
|
2014-12-25 17:09:06 -06:00 |
|
|
Alice Harris
|
5836436b7b
|
Merge pull request #404 from Alys/develop
Style Guide for Equipment Descriptions
|
2014-12-26 08:26:20 +10:00 |
|
|
Sabe Jones
|
9471393776
|
feat(event): 2014 Mystery Items
|
2014-12-25 16:08:06 -06:00 |
|
|
Sabe Jones
|
1c90886548
|
fix(event): Better shop flow
|
2014-12-25 15:52:26 -06:00 |
|
|
Sabe Jones
|
41f4ab7b8a
|
feat(event): Implement Seasonal Shop
|
2014-12-25 14:58:25 -06:00 |
|
|
Alice Harris
|
6fcf6b7d05
|
Merge pull request #412 from lacrimae/develop
Restored missing quote
|
2014-12-26 06:47:14 +10:00 |
|
|
lacrimae
|
93119d7eab
|
... and the quote I missed :P
|
2014-12-25 21:41:11 +01:00 |
|
|
lacrimae
|
772994c8a0
|
Restored missing quote
|
2014-12-25 21:40:24 +01:00 |
|
|
Sabe Jones
|
0e28f04c90
|
feat(event): Implement Seasonal Shop
|
2014-12-25 14:33:11 -06:00 |
|
|
Blade Barringer
|
aeceb70b54
|
Merge pull request #411 from lacrimae/develop
Corrected wording
|
2014-12-25 08:35:06 -06:00 |
|
|
lacrimae
|
17233ef5df
|
Corrected wording
"may become grow more severe" -> "may grow more severe"
|
2014-12-25 15:21:29 +01:00 |
|
|
Verabird
|
03f12a3718
|
Make it possible to choose between MM/dd and dd/MM date format
|
2014-12-24 22:18:50 -05:00 |
|
|
Blade Barringer
|
a8459c2f96
|
Changing button to a element fixed the delete on enter problem
|
2014-12-24 11:17:05 -06:00 |
|
|
Blade Barringer
|
0339bdf43f
|
Merge branch 'develop' of github.com:HabitRPG/habitrpg into develop
|
2014-12-24 09:02:20 -06:00 |
|
|
Blade Barringer
|
fdcc22bde9
|
Closes #4361
|
2014-12-24 09:02:03 -06:00 |
|
|
benmanley
|
118ba88d3d
|
fix(tasks): improve UI consistency and layout
* Match UI elements with rest of site
* Tidy up layout
|
2014-12-24 09:53:41 +00:00 |
|
|
benmanley
|
8cf3cd66cc
|
fix(avatar): prevent avatar from obscuring name
Increase z-index of avatar-name so that avatar image doesn’t obscure it
when riding a mount
|
2014-12-24 09:53:40 +00:00 |
|
|
breiste
|
e1eaefa943
|
Fix #4296 (Subscription "Update Card" message is cut off)
|
2014-12-24 00:14:08 +01:00 |
|
|
Steffen Breiler
|
e33101b762
|
Fix #4296 (Subscription "Update Card" message is cut off)
|
2014-12-24 00:06:17 +01:00 |
|
|
Matteo Pagliazzi
|
635ebf626b
|
fix(flag-email): correctly format date
|
2014-12-23 18:54:56 +01:00 |
|
|
Matteo Pagliazzi
|
c55ebf5c07
|
Merge pull request #4402 from HabitRPG/add-flag-to-chat
Add flag to chat
|
2014-12-23 18:36:23 +01:00 |
|