Dean Herbert
|
a5b0d51205
|
Merge remote-tracking branch 'upstream/master' into url-parsing-support
# Conflicts:
# osu.Game/osu.Game.csproj
|
2018-01-27 14:06:58 +09:00 |
|
Dean Herbert
|
7852015db3
|
Remember mod selection when re-entering song select
Removes mod application when exiting back to main menu.
Alternative to #1968.
Closes #1961.
|
2018-01-26 19:32:57 +09:00 |
|
smoogipoo
|
5742e61e68
|
Merge remote-tracking branch 'origin/master' into ruleset-configs
|
2018-01-26 15:39:09 +09:00 |
|
Dean Herbert
|
fd7d7c3953
|
Merge branch 'master' into MakeMusicControllerDraggableAgain
|
2018-01-25 09:01:54 +09:00 |
|
TocoToucan
|
51e188401f
|
Make MusicController draggable again
|
2018-01-25 00:38:22 +03:00 |
|
Aergwyn
|
205d3ed896
|
fix settings not getting injected
|
2018-01-23 19:42:21 +01:00 |
|
Dean Herbert
|
c01f67b0d8
|
Merge remote-tracking branch 'upstream/master' into ruleset-configs
|
2018-01-23 16:23:25 +09:00 |
|
Dean Herbert
|
95f941163b
|
Merge branch 'master' into direct-show-deleted-sets
|
2018-01-22 17:08:10 +09:00 |
|
Dan Balasescu
|
73799832ef
|
Merge branch 'master' into direct-show-deleted-sets
|
2018-01-22 16:54:32 +09:00 |
|
Dean Herbert
|
a931d6e381
|
Merge branch 'master' into fix-user-download-cancel
|
2018-01-22 16:27:26 +09:00 |
|
Aergwyn
|
82c8822888
|
we need to go back
reverted change and instead check `DeletePending` when retrieving existing online IDs
|
2018-01-22 08:04:14 +01:00 |
|
Dan Balasescu
|
20be4bbbcd
|
Merge branch 'master' into better-direct-progress-bar
|
2018-01-22 14:25:23 +09:00 |
|
Dean Herbert
|
3d4e2d400c
|
Remove unused using
|
2018-01-22 13:52:10 +09:00 |
|
Dean Herbert
|
53e40a77dc
|
Don't show error messages when a download is user-cancelled
Resolves #1941.
|
2018-01-22 13:25:49 +09:00 |
|
smoogipoo
|
9ac035f3d5
|
Merge branch 'bdl-cache-changes' into ruleset-configs
|
2018-01-22 13:11:45 +09:00 |
|
Dean Herbert
|
060d80efbe
|
Continue showing progress bar on direct panels when importing
Previously the progrress bar would fade out once downloads completed, which felt unintuitive.
|
2018-01-22 13:05:07 +09:00 |
|
Aergwyn
|
596044e19d
|
show beatmapsets with pending deletion in osu!direct
|
2018-01-19 17:25:32 +01:00 |
|
Dean Herbert
|
652f273961
|
Ensure previews stop playing when they are removed from the draw hierarchy
|
2018-01-19 15:46:42 +09:00 |
|
Dan Balasescu
|
250e936099
|
Merge branch 'master' into preview-fixes
|
2018-01-19 00:03:47 +09:00 |
|
Aergwyn
|
56619ae926
|
use ternary expression
|
2018-01-18 15:53:53 +01:00 |
|
smoogipoo
|
a94ea7025e
|
Register/Unregister -> BeginTracking/StopTracking and add exceptions
|
2018-01-18 18:45:48 +09:00 |
|
smoogipoo
|
dee298c395
|
No more statics + better unregistration
|
2018-01-18 17:40:05 +09:00 |
|
Dean Herbert
|
7ceed8b5eb
|
Stop any playing preview when closing the direct overlay
Resolves #1925
|
2018-01-18 17:28:56 +09:00 |
|
smoogipoo
|
c2c478750d
|
Remove generics from OSD registration methods
|
2018-01-18 16:57:32 +09:00 |
|
smoogipoo
|
09dfea7e29
|
Use tracked settings from ConfigManager changes
|
2018-01-18 15:26:03 +09:00 |
|
Aergwyn
|
65bac6d31a
|
return preview instead of nothing if it exists already
allows listening to it again after reaching the end
|
2018-01-17 20:36:47 +01:00 |
|
Aergwyn
|
f86cb30e47
|
prevent negative width on progress bar
|
2018-01-17 20:35:28 +01:00 |
|
Dean Herbert
|
e7524445ee
|
Use Restart()
|
2018-01-17 21:33:19 +09:00 |
|
Dean Herbert
|
54ed608ddb
|
Mute global track volume when a beatmap preview is playing
|
2018-01-17 21:26:12 +09:00 |
|
Dean Herbert
|
783ca40c64
|
Update with upstream changes
|
2018-01-17 16:51:47 +09:00 |
|
Dean Herbert
|
54b0f4b912
|
Merge branch 'master' into url-parsing-support
|
2018-01-17 16:16:55 +09:00 |
|
Dean Herbert
|
5e1cd8ddc4
|
Apply conditionals directly rather than using an in-between property
|
2018-01-16 20:34:40 +09:00 |
|
Dean Herbert
|
9b33499fe7
|
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
|
2018-01-16 20:04:34 +09:00 |
|
TocoToucan
|
3c11978cfa
|
Use local functions
|
2018-01-15 21:42:17 +03:00 |
|
Aergwyn
|
ae1adfd2f2
|
remove unnecessary empty lines
codefactor.io \(o.o)/
also one unnecessary semicolon
|
2018-01-12 19:30:34 +01:00 |
|
Aergwyn
|
1c5b3d009c
|
remove volume reduction on preview
it doubles with global reduction
|
2018-01-12 17:09:57 +01:00 |
|
Dean Herbert
|
45301d07fd
|
Merge branch 'master' into url-parsing-support
|
2018-01-12 19:34:44 +09:00 |
|
Dean Herbert
|
73aa56a8a7
|
Merge branch 'master' into sliderbar-tooltip-precision
|
2018-01-12 18:58:30 +09:00 |
|
Dean Herbert
|
188b26472c
|
Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision
|
2018-01-12 18:54:36 +09:00 |
|
Dean Herbert
|
ff725f0e32
|
Fix incorrect online conditional check in social browser logic
|
2018-01-12 18:20:46 +09:00 |
|
Dean Herbert
|
29c8400ec7
|
Merge branch 'master' into scrolling-hitobjects-rewrite
|
2018-01-12 17:35:24 +09:00 |
|
Dean Herbert
|
0a06f8069f
|
Remove panel fade out for now
Should be implemented at one level above using a dedicated container.
|
2018-01-12 17:22:51 +09:00 |
|
smoogipoo
|
441e8aced5
|
Better namings for the speed change "algorithms"
|
2018-01-12 17:18:34 +09:00 |
|
Dean Herbert
|
8f7c048c4e
|
Merge branch 'master' into expand-social-tab
|
2018-01-12 15:54:42 +09:00 |
|
smoogipoo
|
712d586d41
|
Revert "Add OSD + config value for scroll speed"
This reverts commit a6d8b28221.
|
2018-01-12 12:28:43 +09:00 |
|
FreezyLemon
|
174fdf5037
|
Nicer code to remove non-existent channels from links
|
2018-01-11 18:51:20 +01:00 |
|
smoogipoo
|
a6d8b28221
|
Add OSD + config value for scroll speed
|
2018-01-11 13:40:46 +09:00 |
|
smoogipoo
|
6a5a3b01b2
|
Fix license headers
|
2018-01-11 12:39:06 +09:00 |
|
Aergwyn
|
312f52072b
|
enable query
change Avatar animation too
add forgotten usings
|
2018-01-10 16:46:55 +01:00 |
|
smoogipoo
|
86b5591583
|
Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite
|
2018-01-10 18:02:49 +09:00 |
|
smoogipoo
|
c010b48b29
|
Remove number format specified from OsuSliderBar, override ToolTipText
Better/cleaner solution.
|
2018-01-10 17:29:16 +09:00 |
|
smoogipoo
|
17e7f75aca
|
More osu!-side bindable fixes
|
2018-01-10 15:41:13 +09:00 |
|
Aergwyn
|
4ce125478a
|
remove unnecessary Schedules
one was bugging out when rapidly switching display styles and the other was... unnecessary
|
2018-01-09 19:03:23 +01:00 |
|
Aergwyn
|
44d821172a
|
tidying up
|
2018-01-09 16:29:12 +01:00 |
|
FreezyLemon
|
3bf9901dd2
|
Fixed bugs and added tests
|
2018-01-09 16:11:45 +01:00 |
|
Dean Herbert
|
c2fadcfc1f
|
Merge branch 'master' into background-blur
|
2018-01-09 21:20:05 +09:00 |
|
Dean Herbert
|
1c9e9cb8af
|
Merge branch 'master' into expand-social-tab
|
2018-01-09 21:08:26 +09:00 |
|
Dean Herbert
|
72624aea18
|
Use a better method of link compilation
Adds word wrap back, simplifies a lot.
|
2018-01-09 20:33:20 +09:00 |
|
Dean Herbert
|
b035a92bda
|
Merge branch 'master' into url-parsing-support
|
2018-01-09 14:28:20 +09:00 |
|
Aergwyn
|
f6c168be27
|
add skip cutscene as "in game" keybinding
|
2018-01-08 18:22:43 +01:00 |
|
smoogipoo
|
c4d1922c8b
|
Add scrolling algorithm to global settings
|
2018-01-08 11:34:37 +09:00 |
|
TocoToucan
|
ae032cbf23
|
Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties
|
2018-01-07 23:40:00 +03:00 |
|
Aergwyn
|
d9866a2052
|
fix hover effects on social panels
|
2018-01-06 11:27:17 +01:00 |
|
Aergwyn
|
a61666d2a7
|
update licence headers
|
2018-01-06 10:54:53 +01:00 |
|
Aergwyn
|
e6b581e259
|
Merge branch 'master' into expand-social-tab
|
2018-01-06 10:48:27 +01:00 |
|
Aergwyn
|
57b44b8c29
|
fix new panels appearing too soon
|
2018-01-06 10:40:18 +01:00 |
|
Dean Herbert
|
a1d94d7adf
|
Merge branch 'master' into sliderbar-tooltip-precision
|
2018-01-05 20:48:30 +09:00 |
|
Dean Herbert
|
d1f03ebf0c
|
Update in line with framework
|
2018-01-05 20:29:14 +09:00 |
|
Dean Herbert
|
37d393bca0
|
Update licence headers
|
2018-01-05 20:21:19 +09:00 |
|
smoogipoo
|
1571c10c42
|
Fix up replay settings sliderbar formatting
|
2018-01-05 14:37:32 +09:00 |
|
smoogipoo
|
b84da31174
|
Change in-line with framework
|
2018-01-05 14:26:46 +09:00 |
|
smoogipoo
|
af86220dcc
|
Merge remote-tracking branch 'origin/master' into update-branch
|
2018-01-05 12:08:50 +09:00 |
|
smoogipoo
|
5eb2dc3d64
|
Cleanup some possible CI errors
Not sure why these aren't being detected on master right now - they should be...
|
2018-01-05 01:20:24 +09:00 |
|
smoogipoo
|
36e9232472
|
Merge master into netstandard
|
2018-01-05 00:42:48 +09:00 |
|
Aergwyn
|
038fa682f7
|
Merge branch 'master' into expand-social-tab
|
2018-01-04 11:49:35 +01:00 |
|
Aergwyn
|
bf64b8fc69
|
added hover effects to panels in social
at least partially QQ
|
2018-01-04 11:42:50 +01:00 |
|
Aergwyn
|
9b70578af6
|
enabled Location as filter tab
forgot it QQ
|
2018-01-03 19:01:10 +01:00 |
|
Aergwyn
|
9d29adce27
|
bring social tab+filter behaviour closer to direct
|
2018-01-03 17:54:20 +01:00 |
|
Aergwyn
|
988f6ac901
|
fix SortDirection default to descending when retrieved data is ascending
|
2018-01-03 17:53:50 +01:00 |
|
Aergwyn
|
0e361aefeb
|
added new tabs and sort criteria
|
2018-01-03 17:52:11 +01:00 |
|
Dean Herbert
|
532c455f92
|
Merge branch 'master' into change-audio-settings-icon
|
2018-01-03 14:34:21 +09:00 |
|
Dan Balasescu
|
fa6db30d30
|
Fix broken xmldoc param
|
2018-01-03 13:12:49 +09:00 |
|
Aergwyn
|
699902234b
|
remove unused code
|
2018-01-02 17:58:11 +01:00 |
|
Aergwyn
|
52c2ba49cf
|
make loading indicator more visible by deleting panels preemptively
|
2018-01-02 17:42:44 +01:00 |
|
Aergwyn
|
313dfd4d46
|
remove unnecessary task + rename method
|
2018-01-02 17:22:12 +01:00 |
|
Aergwyn
|
a00f92dcb4
|
change unnecessary cast
|
2018-01-02 17:18:49 +01:00 |
|
Dean Herbert
|
faf1181fc3
|
Merge branch 'master' into url-parsing-support
|
2018-01-02 17:51:50 +09:00 |
|
Dean Herbert
|
0e1b033008
|
Improve mod cycling logic further
|
2018-01-02 16:55:03 +09:00 |
|
Dean Herbert
|
f72239ef7a
|
Centralise deselect logic and add animation to deselection
|
2018-01-02 16:09:22 +09:00 |
|
Dean Herbert
|
71bcebe7e1
|
Fix selections occurring even though buttons aren't selected
|
2018-01-02 16:08:48 +09:00 |
|
Dean Herbert
|
c0dd812a4c
|
Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods
|
2018-01-02 15:33:08 +09:00 |
|
Dan Balasescu
|
5f3dbfef47
|
Merge branch 'master' into hide-unavailable-functions
|
2018-01-02 12:59:12 +09:00 |
|
Dan Balasescu
|
91c49913c9
|
Merge branch 'master' into focused-overlay-improvements
|
2018-01-02 12:44:09 +09:00 |
|
Dean Herbert
|
2354163900
|
Change icon for audio settings
|
2018-01-02 12:30:55 +09:00 |
|
Aergwyn
|
cc4ef5d0aa
|
Merge branch 'master' into expand-social-tab
|
2018-01-01 12:00:50 +01:00 |
|
FreezyLemon
|
e7721d71f3
|
Changed chat link implementation according to review
|
2017-12-31 00:51:47 +01:00 |
|
Aergwyn
|
ccb69d16d9
|
move HitResult in Scoring namespace to replace HitCount
|
2017-12-30 21:23:18 +01:00 |
|
Dean Herbert
|
1c80f3e918
|
Disallow selection of non-implemented mods
|
2017-12-31 04:28:51 +09:00 |
|
Dean Herbert
|
33dbd1b1a7
|
Remove search button on toolbar
|
2017-12-31 03:47:50 +09:00 |
|
Aergwyn
|
138d78309f
|
add HitCount enum and replace string usage with enum
|
2017-12-30 18:07:30 +01:00 |
|
Aergwyn
|
f7fe083018
|
add tooltip to country flags
|
2017-12-30 14:59:35 +01:00 |
|
Dean Herbert
|
f56e8121da
|
Fix settings overlay pass-through logic
|
2017-12-30 22:13:05 +09:00 |
|
Dean Herbert
|
8733f809a5
|
Remove chat overlay local override
|
2017-12-30 21:10:57 +09:00 |
|
Dean Herbert
|
e332683d18
|
Fix music controller draggability
|
2017-12-30 21:10:40 +09:00 |
|
Aergwyn
|
f03e064c43
|
remove unnecessary update
|
2017-12-30 12:57:32 +01:00 |
|
Aergwyn
|
760d2aff4b
|
readd IOnlineComponent to be able to react to APIState changes
|
2017-12-30 12:56:18 +01:00 |
|
Dean Herbert
|
442a649c63
|
Make all FocusedOverlays hide on clicks outside of themselves
Also allows wheel events to pass through around them.
|
2017-12-30 20:45:41 +09:00 |
|
Aergwyn
|
d37ba2c9a4
|
disable searching/filtering with textbox
it doesn't do anything except from creating unnecessary requests for now
|
2017-12-30 11:54:03 +01:00 |
|
Aergwyn
|
72af5bf672
|
simplify socialoverlay user request structure
|
2017-12-30 11:51:49 +01:00 |
|
Aergwyn
|
8a02900c01
|
changed titles from social tabs
|
2017-12-30 11:33:06 +01:00 |
|
smoogipoo
|
616ad5b723
|
Cleanups
|
2017-12-30 16:55:01 +09:00 |
|
smoogipoo
|
714d93dd92
|
Merge remote-tracking branch 'origin/master'
|
2017-12-30 16:17:14 +09:00 |
|
jai_
|
9660e0885b
|
correctly name tooltip interface
|
2017-12-29 19:20:37 +00:00 |
|
jai_
|
6de41ba172
|
Trim whitespace
|
2017-12-29 19:16:43 +00:00 |
|
jai_
|
b1dd64983d
|
Add tooltip text to supporter icon
|
2017-12-29 19:05:50 +00:00 |
|
FreezyLemon
|
d66d741af2
|
fixed constant naming
|
2017-12-28 22:11:10 +01:00 |
|
FreezyLemon
|
ae79be7b51
|
small style fixes plus new assert in test
|
2017-12-28 21:45:58 +01:00 |
|
FreezyLemon
|
7454633f63
|
Refactor and general tidying up
|
2017-12-28 20:11:21 +01:00 |
|
Aergwyn
|
b029f019b2
|
Merge branch 'master' into expand-social-tab
|
2017-12-28 19:36:22 +01:00 |
|
Aergwyn
|
66f076815f
|
query friends endpoint to fetch friendlist
|
2017-12-28 19:32:06 +01:00 |
|
FreezyLemon
|
128603a99f
|
Added more and fixed the old automated tests
|
2017-12-28 01:12:13 +01:00 |
|
FreezyLemon
|
54a11e24b7
|
Fixed links being removed too early
|
2017-12-27 21:13:32 +01:00 |
|
FreezyLemon
|
4681a0c47b
|
handle chat == null gracefully and remove link from message if channel not found
|
2017-12-27 21:06:48 +01:00 |
|
Dan Balasescu
|
dcd994e65b
|
Merge branch 'master' into better-notification-delays
|
2017-12-27 23:58:04 +09:00 |
|
Dan Balasescu
|
996e156fd0
|
Merge branch 'master' into fix-notification-scheduled-events
|
2017-12-27 23:27:23 +09:00 |
|
Dan Balasescu
|
3bfa6bd9fd
|
Merge branch 'master' into better-notification-delays
|
2017-12-27 23:26:57 +09:00 |
|
Dan Balasescu
|
3de07ddba8
|
Merge branch 'master' into fix-progress-notifications-close
|
2017-12-27 21:43:58 +09:00 |
|
Dean Herbert
|
9a4b2f0d1d
|
Apply workaround at two levels
|
2017-12-27 21:19:06 +09:00 |
|
smoogipoo
|
7a793eaded
|
Merge master into netstandard
|
2017-12-27 20:48:53 +09:00 |
|
Dean Herbert
|
7d0c94fd01
|
Fix notification overlay layout and scheduled tasks being delayed
Closes #1295
|
2017-12-27 19:42:44 +09:00 |
|
Dean Herbert
|
2a7147240f
|
Fix progress notifications not creating their completion notification early enough
FIxes notification overlay thinking it has no notifications left and closing.
|
2017-12-27 13:25:42 +09:00 |
|
FreezyLemon
|
c4f5754f94
|
Fixed only the links being italics for /me messages
|
2017-12-27 02:14:45 +01:00 |
|
Dean Herbert
|
94449ed597
|
Merge branch 'master' into notification-verbosity
|
2017-12-26 20:48:59 +09:00 |
|
Dean Herbert
|
35ae5173cd
|
Merge branch 'master' into better-notification-delays
|
2017-12-26 20:48:41 +09:00 |
|
Dan Balasescu
|
460eeafd32
|
Merge branch 'master' into quieter-notifications
|
2017-12-26 18:18:28 +09:00 |
|
Dean Herbert
|
ab6c93fba4
|
Merge branch 'master' into notification-verbosity
|
2017-12-26 16:14:24 +09:00 |
|
Dean Herbert
|
3524ad3dc2
|
Merge remote-tracking branch 'upstream/master' into better-notification-delays
|
2017-12-26 16:10:57 +09:00 |
|
Dan Balasescu
|
f7a54a203b
|
Merge branch 'master' into beatmap-import-prompt
|
2017-12-26 16:00:37 +09:00 |
|
Dean Herbert
|
24d8d357d0
|
Only bounce and flash notification count when increasing
|
2017-12-26 15:54:37 +09:00 |
|
Dean Herbert
|
45b3acdd6f
|
Fix progress notifications not closing properly when opening their continuation
|
2017-12-26 15:54:33 +09:00 |
|
Dean Herbert
|
ed1df94f77
|
Fix unread light not turning off
|
2017-12-26 15:54:28 +09:00 |
|
Dan Balasescu
|
ef0031a719
|
Merge branch 'master' into popup-word-wrap
|
2017-12-26 15:47:58 +09:00 |
|
Dan Balasescu
|
d089e27cad
|
Merge branch 'master' into osu-prefixed-text
|
2017-12-26 15:40:29 +09:00 |
|
Dan Balasescu
|
ad811961a7
|
Merge branch 'master' into quieter-notifications
|
2017-12-26 15:30:12 +09:00 |
|
ColdVolcano
|
bc90793b1c
|
Trim whitespace
|
2017-12-25 19:18:57 -06:00 |
|
ColdVolcano
|
044e4d0acd
|
Add blur to background in Player
|
2017-12-25 19:11:49 -06:00 |
|
FreezyLemon
|
962e4d7c8a
|
Removed LinkId and word wrapping (for now).
Also reimplemented the OsuHoverContainer properly
|
2017-12-25 20:46:04 +01:00 |
|
FreezyLemon
|
a30448095e
|
Merge branch 'master' into url-parsing-support
|
2017-12-25 19:12:23 +01:00 |
|
Dean Herbert
|
0886107ec9
|
Connect counter with button display
|
2017-12-26 01:56:57 +09:00 |
|
Dean Herbert
|
1fc240f6c5
|
Expose unread notification count
|
2017-12-26 01:50:05 +09:00 |
|