1d67746d32
fix crash in SongSelect when traversing while zero beatmaps are loaded
2017-12-23 12:53:11 +01:00
7ec4d230b9
Merge branch 'master' into fix-leaderboard-placeholder
2017-12-23 20:04:05 +09:00
aeafa5645a
Make Samples null by default and prepopulate in mania
2017-12-23 18:06:46 +09:00
2db68df999
Simplify DrawableHitObject's sample load code
2017-12-23 17:20:14 +09:00
9ca03c0209
Simplify and tidy sample retrieval
...
Less static weirdness
2017-12-23 16:46:02 +09:00
5026c7a95e
SoundControlPoint -> SampleControlPoint
2017-12-23 16:34:34 +09:00
ff0927e71b
Remove unnecessary newline
2017-12-23 16:23:33 +09:00
46865bbacd
Merge remote-tracking branch 'upstream/master' into taiko-hitsounds-fix
...
# Conflicts:
# osu.Game/Audio/SampleInfo.cs
2017-12-23 14:50:35 +09:00
1fa9dac1bb
Merge remote-tracking branch 'origin/master' into taiko-hitsounds-fix
2017-12-23 14:20:16 +09:00
4d40004e97
Merge branch 'master' into beatmap-serialization
2017-12-22 22:45:00 +09:00
bdda1570d1
Move Placeholder classes to own files
2017-12-22 22:44:18 +09:00
26bb3715fe
Improve state and feel of leaderboard placeholders
...
Closes #1721 .
2017-12-22 22:42:23 +09:00
6a29f6020a
Make HitObjects construct nested hit objects
2017-12-22 21:42:54 +09:00
e5faced9ba
Better variable name
2017-12-22 19:25:59 +09:00
82909f6585
RankChart -> RankGraph
2017-12-22 19:25:18 +09:00
1a318c5c2b
Improve LineGraph invalidation logic
2017-12-22 18:58:35 +09:00
8c50fa0b84
Add testcase
2017-12-22 18:57:23 +09:00
938c5feea4
Simplify interaction condition
2017-12-22 18:45:10 +09:00
94a974a397
Use bindable for a user
2017-12-22 18:45:10 +09:00
e48c515d52
CI fixes
2017-12-22 18:45:10 +09:00
5ffdaf711e
Remove useless array
2017-12-22 18:45:10 +09:00
f3c93c894b
Rank graph improvements
2017-12-22 18:45:10 +09:00
a3d947301b
Merge branch 'master' into beatmap-serialization
2017-12-22 07:38:05 +09:00
aa388885b7
Adjust animation slightly
2017-12-22 00:53:34 +09:00
5c9d484395
Adjust debounce a bit
2017-12-22 00:50:32 +09:00
40ceaf12f2
Merge branch 'master' into leaderboard-scopes
2017-12-22 00:44:24 +09:00
40587411c1
Merge branch 'master' into add-confirmation-dialog
2017-12-22 00:32:25 +09:00
2526ebbbdc
Merge branch 'master' into remove-unnecessary-blocking
2017-12-22 00:18:02 +09:00
ae4abf0f2b
Merge branch 'master' into remove-unnecessary-blocking
2017-12-21 23:55:48 +09:00
eb1b1da732
Merge branch 'master' into overlays-block-keyboard
2017-12-21 23:51:46 +09:00
57fdbda16d
Remove unnecessary IsLoaded check
...
We are always loaded at this point.
2017-12-21 23:48:48 +09:00
65e6206d06
Use local bindable
2017-12-21 23:48:35 +09:00
13fee5402a
Remove unnecessary using
...
visual studio doesn't save
2017-12-21 23:20:11 +09:00
38703e6b85
Merge branch 'master' into add-confirmation-dialog
2017-12-21 22:56:31 +09:00
620e9737c3
Avoid many many unnecessary enumerations
2017-12-21 22:33:16 +09:00
a9039c71e0
Merge branch 'master' into undelete-button-add
2017-12-21 22:32:08 +09:00
87e790080b
Remove manual audio thread synchronisation logic
...
No longer required as calls are blocking.
2017-12-21 22:22:28 +09:00
5cd2a3950e
Merge branch 'master' into overlays-block-keyboard
2017-12-21 22:15:03 +09:00
790aa8be2a
Merge master into beatmap-serialization
2017-12-21 22:13:53 +09:00
866d1c6e0f
Remove now unused references
2017-12-21 22:13:18 +09:00
4bd2c7e95f
Fix minor formatting issue
2017-12-21 21:54:46 +09:00
abe465358c
Fix formatting
2017-12-21 21:46:57 +09:00
644aaa8167
Unsubscribe from API state change event.
2017-12-21 18:00:10 +05:30
63f2436220
Merge branch 'master' into leaderboard-scopes
2017-12-21 21:18:56 +09:00
5b596765c8
Merge branch 'master' into dev-overlay-counter
2017-12-21 21:09:40 +09:00
e4ead36544
Added completion text
2017-12-21 13:01:14 +01:00
cbc1aacf5c
Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add
2017-12-21 13:00:11 +01:00
6fbd06f967
Fix Not update retry counter on PauseOverlay
...
I've find "You've retried xx time(s)" message that something weird.
That is not displayed pause overlay and only see count on FailOverlay
I change code that PauseContainer.Retries property can be set call-back function.
Signed-off-by: Seokho Song <0xdevssh@gmail.com >
2017-12-21 20:40:31 +09:00
d80079a73a
Merge remote-tracking branch 'origin/master' into beatmap-serialization
2017-12-21 20:15:01 +09:00
50afc6e9c9
Merge branch 'master' into fix-gameplay-menu-blocking
2017-12-21 20:07:14 +09:00
