Thomas Müller
a7c6decd42
Merge branch 'better-transforms' of github.com:Tom94/osu into prevent-dependency-pollution
2017-07-22 12:16:58 +02:00
Thomas Müller
96675965d8
Fix broken test case
2017-07-22 12:16:46 +02:00
Thomas Müller
7e895f66e0
Don't obtain DependencyContainer via DI
2017-07-22 11:43:52 +02:00
Thomas Müller
750fc0db0e
Merge branch 'prevent-dependency-pollution' of github.com:Tom94/osu into better-transforms
2017-07-22 11:34:27 +02:00
Thomas Müller
598b3f051e
Address CI concerns and update framework
2017-07-22 11:15:45 +02:00
Thomas Müller
dae0f61b2b
Don't obtain DependencyContainer via DI
2017-07-22 11:09:13 +02:00
Thomas Müller
a4dfe3f1fa
Update framework
2017-07-22 11:06:07 +02:00
Thomas Müller
95684f7d40
Merge branch 'master' of github.com:ppy/osu into prevent-dependency-pollution
2017-07-22 10:56:28 +02:00
Thomas Müller
e36b65bfe0
Merge branch 'master' into better-transforms
2017-07-22 10:50:58 +02:00
Thomas Müller
fd4cd5edd1
Merge pull request #1051 from peppy/fix-di-chatline-regression
...
Allow ChatLines to exist without UserProfileOverlay
2017-07-22 10:50:41 +02:00
Thomas Müller
4755529d43
Minor refactor of TestCaseBeatSyncedContainer
2017-07-22 10:48:15 +02:00
Dean Herbert
7549d3a2c4
Allow ChatLines to exist without UserProfileOverlay
...
Fixes testcases failing when logged in.
2017-07-22 17:18:20 +09:00
Thomas Müller
e469a114a6
Update dependency caching according to framework
2017-07-21 19:03:43 +02:00
Thomas Müller
0f2bcb2904
Update framework
2017-07-21 18:23:01 +02:00
Thomas Müller
a7dc8a892b
Update framework
2017-07-21 17:24:09 +02:00
EVAST9919
66f816692f
Better boolean naming
2017-07-21 13:40:09 +03:00
EVAST9919
270ab5c987
Allow ChatOverlay resize only if it dragged by the tabs area only
2017-07-21 13:37:22 +03:00
EVAST9919
388fcfb295
Make BeatmapCarousel inherit from OsuScrollContainer
2017-07-21 13:13:53 +03:00
Thomas Müller
2cd8f6b30c
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-21 11:15:26 +02:00
Dean Herbert
d344452e9b
Merge pull request #1041 from peppy/fix-carousel-debounce-race
...
Fix carousel filter debounce causing a race condition
2017-07-21 17:57:47 +09:00
Dean Herbert
9a33e77d63
Merge branch 'master' into fix-carousel-debounce-race
2017-07-21 17:44:04 +09:00
Dean Herbert
ae2923f074
Merge pull request #1042 from peppy/fix-selection-changing
...
Fix selection changing on entering song select
2017-07-21 17:43:57 +09:00
Thomas Müller
3a086534f8
Merge branch 'master' into fix-selection-changing
2017-07-21 10:22:11 +02:00
Thomas Müller
c9cdb9c865
Merge pull request #1043 from peppy/fix-songprogress-endtime
...
Fix incorrect end time calculation in SongProgressGraph
2017-07-21 10:22:01 +02:00
Dean Herbert
12b6b80d5c
Make method to flush filter requests
2017-07-21 17:20:52 +09:00
Dean Herbert
bf254bf5cf
Merge branch 'master' into fix-songprogress-endtime
2017-07-21 16:46:41 +09:00
Dean Herbert
db35b0ab31
Merge pull request #1040 from MrTheMake/previewtime-seeking
...
Fix double-seek in main menu song playback
2017-07-21 15:11:41 +09:00
Dean Herbert
6bdf6bb675
Merge branch 'master' into previewtime-seeking
2017-07-21 15:06:18 +09:00
Dean Herbert
f7b64a458a
Fix incorrect end time calculation in SongProgressGraph
2017-07-21 10:10:25 +09:00
Dean Herbert
b4dddc98ee
Fix selection changing on entering song select
...
Conditional was backwards, easy fix.
2017-07-21 06:15:44 +09:00
Dean Herbert
fb2f1224b3
Fix carousel filter debounce causing a race condition
...
Clicking a ruleset button on toolbar would schedule a delayed filter of carousel, which could in turn trigger a beatmap change after pushing a Player. This resolves that by forcing any pending operations to complete.
2017-07-21 05:58:58 +09:00
Thomas Müller
31ac083408
Merge pull request #1035 from peppy/fix-empty-carousel
...
Fix selection not being reset correct when changing between rulesets
2017-07-20 21:50:19 +02:00
Thomas Müller
e84d8cc020
Merge branch 'master' into fix-empty-carousel
2017-07-20 21:15:58 +02:00
Thomas Müller
e98dd62e5c
Merge pull request #1032 from peppy/fix-beatmap-select-race
...
Fix hitting down and enter at song select causing a hard-crash
2017-07-20 21:15:48 +02:00
Thomas Müller
4e33efd41f
Merge branch 'master' into fix-empty-carousel
2017-07-20 21:04:45 +02:00
Thomas Müller
518a7c460e
Merge branch 'master' into fix-beatmap-select-race
2017-07-20 21:04:40 +02:00
Thomas Müller
119b4dd04c
Merge pull request #1031 from peppy/always-load-storyboard
...
Remove FullyLoaded logic
2017-07-20 21:04:24 +02:00
Thomas Müller
ed6478be8b
Merge branch 'master' into always-load-storyboard
2017-07-20 20:54:16 +02:00
Thomas Müller
9dc3987834
Merge pull request #1033 from peppy/fix-working-beatmap-double-load
...
Fix WorkingBeatmap being loaded twice when using MusicController at SongSelect
2017-07-20 20:53:53 +02:00
Thomas Müller
e21822cdeb
Merge branch 'master' into fix-working-beatmap-double-load
2017-07-20 20:35:31 +02:00
Thomas Müller
01ff7e8f4b
Merge branch 'master' into fix-empty-carousel
2017-07-20 20:31:06 +02:00
MrTheMake
22f3e97241
Small optimization to the main menu intro seeking.
2017-07-20 17:15:39 +02:00
Dean Herbert
c1a3e4a008
Remove unnecessary using
2017-07-20 20:06:24 +09:00
Dean Herbert
451f92772a
Merge branch 'master' into fixes
2017-07-20 19:46:50 +09:00
Dean Herbert
8bc2df8749
Merge pull request #1022 from jorolf/user-profile-fixes
...
User profile improvements
2017-07-20 19:40:26 +09:00
Dean Herbert
b25188895b
Update framework
2017-07-20 19:32:17 +09:00
Dean Herbert
cb3402098a
Merge remote-tracking branch 'upstream/master' into user-profile-fixes
2017-07-20 19:32:00 +09:00
Dean Herbert
bb167a9f82
Merge pull request #1037 from peppy/no-set-exclusive
...
Remove usage of SetExclusive
2017-07-20 19:29:28 +09:00
Dean Herbert
781d76d094
Merge remote-tracking branch 'upstream/master' into user-profile-fixes
2017-07-20 19:15:21 +09:00
Thomas Müller
8108f3e78d
Merge branch 'master' into no-set-exclusive
2017-07-20 12:11:32 +02:00
