Dean Herbert
|
32a6975521
|
Update framework
|
2017-07-25 10:16:10 +09:00 |
|
Dean Herbert
|
3c7546e2c1
|
Merge remote-tracking branch 'upstream/master' into no-more-colourinfo
|
2017-07-25 10:14:48 +09:00 |
|
Dean Herbert
|
4aba6f1903
|
Merge pull request #1054 from Nabile-Rahmani/drawableflag-ctor
Less verbose DrawableFlag constructor
|
2017-07-25 09:51:07 +09:00 |
|
Dean Herbert
|
b528568547
|
Merge branch 'master' into drawableflag-ctor
|
2017-07-25 09:46:27 +09:00 |
|
Dean Herbert
|
1c501df83c
|
Merge pull request #1055 from tgi74/master
Fixed various exceptions when no beatmaps are imported
|
2017-07-25 09:37:30 +09:00 |
|
Dean Herbert
|
84f12c722f
|
Merge branch 'master' into master
|
2017-07-24 18:23:36 +09:00 |
|
Dean Herbert
|
4dc4ff171a
|
Merge pull request #1046 from EVAST9919/scrollable_carousel
Make BeatmapCarousel inherit from OsuScrollContainer
|
2017-07-24 18:23:00 +09:00 |
|
Dean Herbert
|
7fcd24ab69
|
Merge branch 'master' into scrollable_carousel
|
2017-07-24 18:16:47 +09:00 |
|
tgi74000
|
d0e99f0c95
|
check removed beatmap being null, check promptdelete beatmap being default
|
2017-07-24 10:25:33 +02:00 |
|
tgi74000
|
5d30efc090
|
Do not trigger Random if no Beatmaps are imported
|
2017-07-24 09:57:12 +02:00 |
|
Dean Herbert
|
038e47ceda
|
Merge branch 'master' into drawableflag-ctor
|
2017-07-24 16:46:20 +09:00 |
|
Nabile Rahmani
|
c80f5c708a
|
Less verbose DrawableFlag constructor.
|
2017-07-24 09:25:49 +02:00 |
|
Dean Herbert
|
9bb404b799
|
Merge pull request #1050 from benpigchu/playlist-beatmaplist-sync
Update playlist when importing or deleting a beatmap
|
2017-07-24 15:13:32 +09:00 |
|
Dean Herbert
|
750d96be8f
|
Merge branch 'master' into playlist-beatmaplist-sync
|
2017-07-24 14:12:04 +09:00 |
|
Ben Pig Chu
|
950c55d6d0
|
No need to dispose/unbind the delegates
|
2017-07-24 13:10:51 +08:00 |
|
Thomas Müller
|
197f57c129
|
Merge branch 'master' into no-more-colourinfo
|
2017-07-23 13:10:28 +02:00 |
|
Dean Herbert
|
64f2e2dc32
|
Use Colour instead of ColourInfo
|
2017-07-23 13:06:16 +02:00 |
|
EVAST9919
|
d9e9ab22db
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into scrollable_carousel
|
2017-07-23 13:27:03 +03:00 |
|
Ben Pig Chu
|
76edcb4a67
|
Update playlist when adding or removing beatmap set
|
2017-07-23 14:21:10 +08:00 |
|
Dean Herbert
|
65c26f9b24
|
Merge pull request #1052 from Tom94/easing
Rename EasingTypes to Easing
|
2017-07-23 14:30:50 +09:00 |
|
Dean Herbert
|
436e155e23
|
Update framework
|
2017-07-23 13:47:48 +09:00 |
|
Dean Herbert
|
831bd24b00
|
Merge branch 'master' into easing
|
2017-07-23 13:46:35 +09:00 |
|
Dean Herbert
|
660afb40b0
|
Merge pull request #1019 from Tom94/better-transforms
Improve transforms and use new LINQ-like syntax
|
2017-07-23 13:45:52 +09:00 |
|
Dean Herbert
|
c6250e1da5
|
Supress compiler warning
I don't think this is a sustainable solution if we start doing this in more places.
|
2017-07-23 11:34:09 +09:00 |
|
Thomas Müller
|
e68675f970
|
Rename EasingTypes to Easing
|
2017-07-22 20:53:53 +02:00 |
|
Thomas Müller
|
c08cb43b9c
|
Update framework
|
2017-07-22 13:49:41 +02:00 |
|
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
|
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 |
|