Dean Herbert
fcb88de626
Merge branch 'master' into recent-scores
2017-10-30 18:48:26 +09:00
Dean Herbert
7bc0ef44f2
Merge branch 'master' into beatmap-preview-fix
2017-10-30 16:22:47 +09:00
Jorolf
b2c3ba05d7
remove redundant stuff
2017-10-25 20:15:45 +02:00
Jorolf
0449639f41
remove inner classes and make User property a bindable
2017-10-25 20:07:12 +02:00
Dean Herbert
da01e81fc4
Async direct panel lookup
2017-10-25 22:14:47 +09:00
Dean Herbert
ed84cd2035
Greatly improve performance of direct panel loading
...
Still needs to be async'd
2017-10-25 22:14:41 +09:00
Dean Herbert
c765785d00
Mark several long-running tasks as long-running
2017-10-25 11:42:55 +09:00
Jorolf
a2dfef301a
remove unused parameters
2017-10-24 20:56:05 +02:00
Jorolf
f65d4b626e
don't use c# 7 feature
2017-10-24 20:46:15 +02:00
Jorolf
9109b1b3f1
Merge branch 'master' of git://github.com/ppy/osu into recent-scores
2017-10-24 20:34:26 +02:00
Jorolf
aadc699e73
show recent scores
2017-10-24 20:31:38 +02:00
Dean Herbert
15b9307b6c
Fix WaveOverlayContainer appearing incorrectly on first PopIn
2017-10-24 20:26:27 +09:00
Dan Balasescu
ecd641c44a
Merge branch 'master' into startup-load-improvements
2017-10-24 11:54:31 +09:00
Dean Herbert
00bb82215b
Merge branch 'master' into revert-to-default-glow
2017-10-24 10:48:08 +09:00
Dan Balasescu
9eab2deee7
Merge branch 'master' into config-slider-keyboardstep
2017-10-24 10:10:39 +09:00
Dean Herbert
0e04260b3c
Move ToolbarUserArea initialisation to BDL
2017-10-24 10:08:42 +09:00
Dean Herbert
df20845fbb
Share one context per file store for performance reasons
...
There is now a CreateContext method for retrieving a stand-alone context for threaded use.
We may want to add safety against this context being disposed (or just return a fresh one if it is).
2017-10-23 16:35:35 +09:00
Shane Woolcock
ea2934d92c
Add KeyboardStep values for configuration options
2017-10-23 16:06:08 +10:30
Shane Woolcock
2e6a68d358
Rename indicator class, add colour/fade easing, and add tooltip
2017-10-22 16:12:30 +10:30
Shane Woolcock
5785af9f6a
Reenable revert indicator on audio device since the potential crash was addressed in #1101
2017-10-22 14:22:57 +10:30
Shane Woolcock
59b10981dc
CI fixes
2017-10-21 17:06:28 +10:30
Shane Woolcock
f5946c0e07
Fix wrong license header
2017-10-21 16:28:03 +10:30
Shane Woolcock
840ba9f48e
Allow the default indicator colour to be specified, and fix bug where disabled bindables could be reset
2017-10-21 16:05:37 +10:30
Shane Woolcock
b4d575fbcd
Fix namespace and unnecessary using
2017-10-21 13:22:21 +10:30
Shane Woolcock
290fac8990
Temporarily disable revert functionality for audio device, since it crashes
2017-10-21 13:17:03 +10:30
Shane Woolcock
98044a17d3
Fix misaligned settings buttons
2017-10-21 13:16:06 +10:30
Shane Woolcock
2c7343e965
Add revert-to-default glow for settings items
2017-10-21 12:44:47 +10:30
Dean Herbert
35ce6fd2bd
Merge branch 'master' into notification-thread-safety
2017-10-20 11:48:14 +09:00
Dan Balasescu
afaf3b4116
Merge branch 'master' into notification-thread-safety
2017-10-19 21:12:53 +09:00
Dean Herbert
518e5a2245
Make ProgressNotification's status and progress thread-safe
...
Quite regularly a task will hold a reference to a progress notification and udpate it as progress is made. Therefore these operations should be thread-safe.
2017-10-18 10:07:20 +09:00
Dean Herbert
9ee6d1e3f9
Correct and simplify KeyBindingStore
2017-10-16 18:42:49 +09:00
Dean Herbert
acc299c7b9
Correct and simplify RulesetStore
2017-10-16 17:02:31 +09:00
Huo Yaoyuan
5a684f926f
CI fixes.
2017-10-16 12:59:59 +09:00
Huo Yaoyuan
c2836a8393
Use format string for double instead of Math.Round.
2017-10-16 12:59:59 +09:00
Huo Yaoyuan
f837117495
Use localisation engine instead of asking current culture directly.
2017-10-16 12:59:59 +09:00
Huo Yaoyuan
90592b0757
Construct DwarableScore using null weight.
2017-10-16 12:59:59 +09:00
Huo Yaoyuan
06fe874594
CI fixes.
2017-10-15 16:53:30 +08:00
Huo Yaoyuan
9b3676c562
Use format string for double instead of Math.Round.
2017-10-15 16:44:15 +08:00
Huo Yaoyuan
192ebe776f
Use localisation engine instead of asking current culture directly.
2017-10-15 16:30:52 +08:00
Huo Yaoyuan
bed5a64ee2
Construct DwarableScore using null weight.
2017-10-15 16:15:35 +08:00
EVAST9919
bd7bc2c0d2
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-preview-fix
2017-10-15 00:14:59 +03:00
Dan Balasescu
31b26e1d0a
Merge branch 'master' into back-to-desktop
2017-10-14 16:18:28 +09:00
Dean Herbert
c5046f6b3c
Add back osu.Desktop project
...
While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day.
This allows for the project to build again with default visual studio settings.
2017-10-14 14:33:05 +09:00
Dean Herbert
37ed710cbe
Merge branch 'master' into fix-duplicate-user
2017-10-14 13:36:53 +09:00
Dean Herbert
9385fd1cfa
Merge branch 'master' into better-medal-loading
2017-10-14 12:29:15 +09:00
smoogipoo
c3b9644d77
Move infoFlow to local variable
2017-10-14 11:59:18 +09:00
EVAST9919
e8f85a08b8
Fix audio preview still playing after closing the beatmap overlay
2017-10-14 05:58:06 +03:00
smoogipoo
1efb33210f
Only update positions when the medalContainer is loaded.
2017-10-14 11:40:49 +09:00
Dean Herbert
cd722e4abb
Fix beatmap author being stored in two different places
2017-10-14 11:39:55 +09:00
Dean Herbert
3644fa46be
Make sure the loading overlay is hidden when preview is user cancelled
2017-10-14 10:53:39 +09:00
