ef548ec9ed
Merge pull request #3588 from negue/feat_pushToTop
...
feat(todolist): Push To Top Button
2014-08-23 17:05:32 -06:00
184e145914
Merge remote-tracking branch 'refs/remotes/nmjones/develop' into develop
...
Conflicts:
views/options/settings.jade
2014-08-23 16:05:17 -06:00
fdf8aa696e
add quest image to party page for collection quests - fixes https://github.com/HabitRPG/habitrpg/issues/3892
2014-08-21 06:27:01 +10:00
50a34eb6c7
fix(tags): fix sortable tags by separating edit & !edit into diff
...
<ul>s (cc @Fandekasp)
2014-08-19 15:21:39 -06:00
88d27e2153
Merge branch 'Fandekasp-sortable_tags' into develop
...
Conflicts:
public/js/directives/directives.js
2014-08-19 15:00:36 -06:00
750135b673
feat(sortable): use angular-ui-sortable instead of jqueryui directly
2014-08-19 14:35:10 -06:00
3ca84d8ef1
Merge pull request #3139 from mapleoin/partygems
...
fix Guild Gems strings on the party tab
2014-08-19 12:55:11 -06:00
faed77f186
bailey(mobile):
2014-08-18 19:58:47 -06:00
ab9393b694
bailey(audio): add bailey for audio
2014-08-18 19:12:05 -06:00
a88fde9862
feat(quests): parrot quest
2014-08-18 19:04:31 -06:00
6d251aeb91
feat(mobile): adapt boss box to mobile
2014-08-17 15:39:12 +02:00
4c8309c8cc
fix(jade): fix warings
2014-08-17 13:32:09 +02:00
0837f2c39b
fix(mobile): start adapting boss to mobile
2014-08-17 13:29:40 +02:00
39911ef8e0
feat(audio): refactor user.preferences.{sound,soundTheme} into just
...
user.preferences.sound. Fix audio dropdown bug by moving to list-items instead
2014-08-15 18:13:59 -06:00
06b6b4cde0
Merge pull request #3856 from Fandekasp/add_audio
...
Add audio
2014-08-15 17:30:12 -06:00
fb16458efd
bailey(quests): lvl 15 ATOM drop
2014-08-12 16:18:26 -07:00
e5bb299ad0
Make tags sortable with drag&drop
2014-08-10 23:00:27 +09:00
d7aaec2262
fix bug switch audio wasn't working
2014-08-09 18:57:17 +09:00
a5f1e30880
fix bug music not playing if music menu not open + integrate daily/todo/reward sounds
2014-08-09 17:29:56 +09:00
dcbd460331
fix audio menu style
2014-08-09 16:58:49 +09:00
2cf8083693
improving music menu
2014-08-08 23:37:04 +09:00
3d2d8fbfef
clean branch from develop to add audio
2014-08-08 23:03:52 +09:00
e500407466
change Request Feature link in footer, Tavern link box, CONTRIBUTING.md
2014-08-07 09:59:31 +10:00
f3707dfe15
bailey(backgrounds): august backgrounds
2014-08-05 15:16:49 -06:00
0871dd074c
Merge pull request #3837 from vIiRuS/patch-4
...
display avatar with closed eyes when sleeping
2014-08-04 16:41:25 -07:00
34a2e4c07a
Merge pull request #3841 from Alys/defaultAvatar
...
split hairstyles into Base (free) and Set 1 (gems) fixes https://github.com/HabitRPG/habitrpg/issues/1529
2014-08-05 08:14:09 +10:00
a6d101202c
fix(avatar.jade): change .notBackground to .noBackgroundImage
...
avatar.jade was applying a class of .notBackground, but the css in
avatar.styl used .noBackgroundImage.
* Changed .notBackground to .noBackgroundImage in avatar.jade and
avatar.styl
* Consolidated css and added more comments
* Amended spacing as Stylus wasn’t compiling correctly
* Removed #profileStable and .pet css as couldn’t find reference to
them anywhere else.
* Commented out styles indicating who is party leader for now. Need a
solution that doesn’t involve background color.
2014-08-04 22:45:10 +01:00
b8b76d6ce9
fix(bailey): tweak
2014-08-04 13:46:25 -06:00
2b2dd97f80
bailey(mobile): update on mobile fix
2014-08-04 13:43:41 -06:00
50d888e7f8
feat(backgrounds): move backgrounds to mixin
2014-08-04 14:41:59 +02:00
49d056fe14
display avatar with closed eyes when sleeping
...
Display the sleeping version, when users are in the inn.
CAUTION: For this to work, this pull request will have to be merged first: https://github.com/HabitRPG/habitrpg-shared/pull/269
Otherwise the _sleep images are missing. ;)
2014-08-03 20:39:09 +02:00
1d92ddd645
feat(i18n): add change language button on front page, fix #3530
2014-08-03 18:23:13 +02:00
e340d584cd
split hairstyles into Base (free) and Set 1 (gems) https://github.com/HabitRPG/habitrpg/issues/1529
2014-08-03 15:56:44 +10:00
46dbb0b78a
Merge pull request #3799 from Alys/avatarNameContribColour
...
apply contributor tier color to avatar name - fixes https://github.com/HabitRPG/habitrpg/issues/3735
2014-08-02 13:08:20 +10:00
2c70c25028
Merge pull request #3792 from Alys/showMoreBackground
...
show more avatar background (remove Lvl, hide avatar name)
2014-08-02 13:06:07 +10:00
26741773c9
split Player Tiers table into entries for individual tiers; partially implement new moderator and staff tiers (still invisible to users)
2014-08-02 10:46:16 +10:00
04f1459cca
bailey(dilatory): forgot announcement on drag'on defeat
2014-08-01 13:44:43 -06:00
38f64c71c2
bailey(august):
2014-07-31 17:37:18 -06:00
072881f986
Merge pull request #3793 from Alys/backgroundOrder
...
display backgrounds in reverse chronological order (most recent at top)
2014-07-30 23:08:12 -06:00
9efda1d955
fix(bailey): small tweaks to 7/31 (spacing, remove project files)
2014-07-30 17:17:51 -06:00
983aaf9682
7/31 Bailey Announcement
2014-07-30 16:08:55 -07:00
4f5b450b38
Bailey reminder - 7/31
2014-07-30 15:55:17 -07:00
a87b651caf
apply contributor tier color to avatar name
2014-07-29 08:53:23 +10:00
d7351932aa
Merge branch 'develop' of git://github.com/HabitRPG/habitrpg into develop
2014-07-27 19:56:09 -05:00
a7502e10ea
display backgrounds in reverse chronological order (most recent at top)
2014-07-27 14:54:17 +10:00
1e797a0b05
show more avatar background (remove Lvl, hide avatar name)
2014-07-27 08:41:33 +10:00
a4ae9332bb
feat(block-user): show "blocked" status in an alert, log the user out
2014-07-25 12:14:48 -06:00
6e29facb98
feat(block-user): allow suspending user accounts (due to TOS violation or such) through Hall. @lemoness
2014-07-25 12:14:48 -06:00
1808dea9ec
bailey(mystery): july mystery item
2014-07-24 19:33:11 -06:00
a1f2375b9d
feat(subscription): disable "update card" for paypal subscribers
2014-07-21 14:55:36 -06:00
Tyler Renelle