3204418af1
Revert #4291
...
This reverts commit a1ea6869b7
2014-11-29 09:16:44 -07:00
5823a25d06
cleanup 20140829_change_headAccessory_to_eyewear.js
2014-11-29 09:05:27 -07:00
192110e25a
grunt
2014-11-29 09:04:58 -07:00
e63f2b6d97
Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop
...
Conflicts:
database_reports/count_users_who_own_specified_gear.js
2014-11-29 08:33:28 -07:00
5ee9f4904a
Merge remote-tracking branch 'remotes/Alys/eyewear1' into develop
...
Conflicts:
locales/en/gear.json
2014-11-29 08:26:23 -07:00
391bd76c03
Merge pull request #4294 from crookedneighbor/indentation-error
...
Corrected indentation error
2014-11-29 08:18:36 -07:00
e4478355bc
Merge pull request #372 from ShilohT/gear
...
Standardization of locales/en/gear.json
2014-11-29 21:00:12 +10:00
9a1b209da1
Corrected indentation error
2014-11-28 19:41:11 -06:00
eb27a76709
feat(thanksgiving): revert npcs back to normal
2014-11-28 18:34:36 -07:00
607c72049c
Merge pull request #4291 from sbreiler/develop
...
Fix #4259
2014-11-28 20:51:04 +01:00
5011ae63c1
Merge branch 'develop' of https://github.com/HabitRPG/habitrpg into develop
2014-11-27 23:47:38 +00:00
0d7b05dbc6
resolve merge conflict
2014-11-27 23:47:28 +00:00
28b25c6b89
Fix #4259 (always 100% long bars in IE11)
...
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
2014-11-27 22:55:01 +01:00
64a76566a0
Fix #4259 (always 100% long bars in IE11)
...
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
2014-11-27 22:52:03 +01:00
a1ea6869b7
Fix #4259 (always 100% long bars in IE11)
...
Fix issue with IE11 displaying Bars with full length (style: width is ignored) by using ng-style instead of plain style.
Fixes health, level and mana bar.
2014-11-27 22:47:52 +01:00
1c70a5bad5
upgrade angular-ui-router
2014-11-27 12:30:13 -07:00
17f3868b96
Merge pull request #374 from SabreCat/turkey
...
Give Alex and Bailey their Thanksgiving costumes
2014-11-27 12:13:05 -07:00
60bf777668
grunt
2014-11-27 12:11:14 -07:00
a4a94f7973
fix(event): grunt
2014-11-27 09:13:20 -06:00
d37dd90484
fix(event): Festify missed NPCs
2014-11-27 09:05:21 -06:00
50b1cba0a6
refactor(tasks) improve UI consistency
...
* Round corners for UI elements / “8-bit” outlines for RPG elements.
* Tag bar – Make it clearer that “Tags” is a heading, not an option
* Task filters – restyle in line with tag bar + nav menu
2014-11-27 10:32:57 +00:00
0a4dc94474
Merge pull request #370 from Alys/gem-cap-message-2014-11-25
...
make Gold=>Gem conversion cap message more accurate in terms of when to wait until - fixes https://github.com/HabitRPG/habitrpg/issues/3996
2014-11-27 14:46:23 +10:00
a86b92f5a0
Standardized text in gear.json
...
Added "Confers no benefit." if missing.
Added "(Month) 2014 Subscriber Item." if missing.
Rearranged some Mystery Item notes from "(Description). (Month) 2014
Subscriber Item. Confers no benefit." to "(Description). Confers no
benefit. (Month) 2014 Subscriber Item."
- All Special Event accessory notes are written in this order.
Changed "October 2014 Subscriber Outfit" to "October 2014 Subscriber
Item".
- All other preexisting Mystery Item strings read "Item".
Changed "Adds # points to (Stat)" in some Special Event equipment to
"Increases (Stat) by #"
- All other equipment reads "Increases (Stat) by #."
Changed "Confers no stat bonus." to "Confers no benefit." in some
Special Event accessories.
- All other items read "Confers no benefit."
Moved "Limited Edition 2013 Winter Gear." to end of string.
- All other Limited Edition tags are at the end.
Changed and capitalized "Special edition convention armor." to "Special
Edition Convention Item."
- Armor is a type of equipment.
2014-11-26 23:26:30 -05:00
a8cf102610
feat(thanksgiving): add migration for turkey mounts / pets
2014-11-26 19:12:59 -07:00
eb80bdf3e0
grunt(turkey-mount)
2014-11-26 19:10:22 -07:00
be3342cb26
feat(event): Thanksgiving Bailey
2014-11-26 19:34:16 -06:00
645327b9b0
feat(event): Thanksgiving updates
2014-11-26 19:33:01 -06:00
212868010c
bugfix: all-market-poptop breaks on the left side
...
Right side popovers have been switched to 'top', but left side popovers
need to remain 'right'.
2014-11-26 14:17:42 -08:00
4a6cd9c2f3
Fixes market to have popover-placement="top'
...
Market fixed to have popover-placement="top' instead of 'left', which
was causing some problems, and 'right' for consistency.
2014-11-26 14:03:31 -08:00
1e5b7e6f2d
fix( #4282 ): refactor for DRY unlock/hide paths
2014-11-26 10:49:49 -07:00
0278caca76
fix( #4282 ): fix $parse errors in avatar customize screens
2014-11-26 10:49:49 -07:00
f5d0b79573
fix(loading bar): possible fix
2014-11-26 12:38:02 +01:00
c0a3fc887a
fix(costume): better fix for #4274
2014-11-26 12:26:41 +01:00
43fa461a67
fix(costume): fixes #4274
2014-11-26 12:19:33 +01:00
afbd2199e8
fix(datepicker): fixes #4273
2014-11-26 11:51:44 +01:00
d24ece973b
fix(food): popover-placement='top' in foodtray, fixes #4278
2014-11-25 15:26:42 -07:00
89b1242e53
fix(emoji): move back to main jsemoji repo, fixes #4265
2014-11-25 10:22:57 -07:00
2d7d3063b8
Merge pull request #4271 from Alys/like-button-fix-2014-11-25
...
re-enable +1 "like" button, add spaces before delete button, add "quick reply" to chat
2014-11-25 15:51:21 +10:00
f0b3da295c
re-enable +1 button, add spaces before delete button, add "quick reply" to Tavern/guilds/party chat
2014-11-25 14:50:01 +10:00
7de70fb5b1
fix(chat): fix missing like button
2014-11-24 21:28:47 -07:00
c5c096013e
refactor(private): use cpus-1 on prod, max(2) cpus on beta (and
...
incidentally localhost)
2014-11-24 19:47:19 -07:00
0f7f30aa12
bailey: private messages & november mysteries
2014-11-24 19:36:44 -07:00
22cddb1086
feat(mystery): mystery 201411
2014-11-24 19:34:47 -07:00
5f654c4dad
fix(private-messages): move PM buttons to bottom-left of modal
2014-11-24 19:11:49 -07:00
478cba9a5a
feat(members): add options: $modal.open({size, windowClass}). Use those
...
to make avatar modal wider, and "100% window height" (see code, it's kinda hacky)
2014-11-24 18:59:27 -07:00
36ffd8a8b2
fix(quick-reply): only show quick-reply in inbox (cc @crookedneighbor)
2014-11-24 18:14:17 -07:00
c309cb2342
Merge pull request #4267 from crookedneighbor/quick-reply
...
Quick reply
2014-11-24 18:11:43 -07:00
04b8e889f3
Merge branch 'crookedneighbor-add-quick-reply-string' into develop
...
Conflicts:
locales/en/groups.json
2014-11-24 18:11:18 -07:00
e3f126c3db
Merge pull request #369 from crookedneighbor/add-translation-strings
...
Added additional translation strings for pms
2014-11-24 20:20:46 +01:00
a6d7594dc1
Merge pull request #4268 from crookedneighbor/missing-env.ts
...
Changed text to be translatable in inbox and character modal
2014-11-24 20:20:41 +01:00
Tyler Renelle