Dean Herbert
|
7afcac3660
|
Move PreferredPlayMode to WorkingBeatmap.
|
2017-03-05 17:45:40 +09:00 |
|
Dean Herbert
|
4e4408cd20
|
Merge branch 'master' into replay
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
|
2017-03-05 17:45:03 +09:00 |
|
Dean Herbert
|
a7d7abe70e
|
Merge pull request #440 from Tom94/update-frameworrk
Update framework
|
2017-03-05 12:02:52 +09:00 |
|
Dean Herbert
|
fdfaaca45b
|
Update framework #2.
|
2017-03-05 11:49:47 +09:00 |
|
Thomas Müller
|
73fef85b12
|
Remove unnecessary usings
|
2017-03-04 19:43:59 +01:00 |
|
Thomas Müller
|
a14bdf8624
|
Use Color4Extensions from Framework and remove redundant Name
|
2017-03-04 19:42:37 +01:00 |
|
Dean Herbert
|
65699eb39d
|
Fix missing .config files from nuspec.
These are required to correctly redirect dll dependencies.
|
2017-03-05 02:48:44 +09:00 |
|
Dean Herbert
|
7db319d384
|
Merge pull request #431 from Jorolf/moarOptions
SelectRandom doesnt select hidden groups now
|
2017-03-05 01:28:14 +09:00 |
|
Jorolf
|
7eebee36ab
|
Merge branch 'master' into moarOptions
|
2017-03-04 16:11:27 +01:00 |
|
Dean Herbert
|
adad248ae3
|
Merge pull request #435 from Tom94/update-flow
Update usage of FillDirection
|
2017-03-04 23:44:43 +09:00 |
|
Thomas Müller
|
a3f1cb2232
|
Merge branch 'master' into update-flow
|
2017-03-04 15:35:53 +01:00 |
|
Thomas Müller
|
fd3b998f35
|
Merge pull request #437 from smoogipooo/tournament_drawings
Fix unnecessarily throwing exception if there's no last drawings resu…
|
2017-03-04 15:35:39 +01:00 |
|
Jorolf
|
5c5066e1ae
|
renamed local groups
|
2017-03-04 15:30:14 +01:00 |
|
Dean Herbert
|
e12d89529c
|
Merge remote-tracking branch 'upstream/master' into update-flow
|
2017-03-04 23:28:39 +09:00 |
|
smoogipooo
|
112545f135
|
Fix unnecessarily throwing exception if there's no last drawings results file.
|
2017-03-04 23:24:32 +09:00 |
|
Dean Herbert
|
00fdffe9c8
|
Update framework (and fix non-conforming anchors in FillFlowContainers).
|
2017-03-04 23:24:13 +09:00 |
|
Dean Herbert
|
84d84f6539
|
Merge pull request #434 from Tom94/song-select-refactorr
Song select refactor
|
2017-03-04 22:14:35 +09:00 |
|
Dean Herbert
|
9fe41fe177
|
Update framework.
|
2017-03-04 22:10:56 +09:00 |
|
Dean Herbert
|
389635c7ed
|
Avoid panel state changes when performing a sort.
|
2017-03-04 22:05:16 +09:00 |
|
Dean Herbert
|
8f3621ca24
|
Make selectGroup a private method.
|
2017-03-04 22:05:02 +09:00 |
|
Dean Herbert
|
7a6a614358
|
Don't show pause menu when watching replays.
|
2017-03-04 21:35:26 +09:00 |
|
Dean Herbert
|
a5d044067c
|
Cancel previous load attempts before starting a new score load.
|
2017-03-04 21:35:12 +09:00 |
|
Dean Herbert
|
95e2e2b027
|
Replay loading via drag-drop huzzah!
|
2017-03-04 19:02:43 +09:00 |
|
Dean Herbert
|
a8deb4ff50
|
Fix WaveOverlayContainer always being visible.
|
2017-03-04 19:02:13 +09:00 |
|
Thomas Müller
|
a2317e5a1e
|
Update usage of FillDirection
|
2017-03-04 11:00:17 +01:00 |
|
Dean Herbert
|
aa9d85624d
|
Change IPC to make sense.
|
2017-03-04 18:51:16 +09:00 |
|
Thomas Müller
|
a2b79de672
|
Add comments to CarouselContainer
|
2017-03-04 09:34:39 +01:00 |
|
Thomas Müller
|
aaa1f766af
|
Fix beatmap removal
|
2017-03-04 09:34:28 +01:00 |
|
Thomas Müller
|
9bddd1ed4b
|
Fix broken CarouselContainer animations
The previous commit broke animations of difficulty panels when
selecting beatmaps. This commit fixes these.
|
2017-03-04 09:33:24 +01:00 |
|
Thomas Müller
|
a97a7f1024
|
No more custom lifetimelist in CarouselContainer
|
2017-03-04 08:54:14 +01:00 |
|
Dean Herbert
|
58f4f02e26
|
Merge pull request #433 from theguii/master
Fixed accuracy's counter first value change.
|
2017-03-04 16:53:45 +09:00 |
|
TheGui
|
e3c3806759
|
Fixed accuracy's counter first value change.
|
2017-03-04 04:48:32 -03:00 |
|
Dean Herbert
|
b294386077
|
Remove misleading beatmap import method.
|
2017-03-04 16:47:37 +09:00 |
|
Dean Herbert
|
833b83ed62
|
Merge pull request #430 from Tom94/mod-select-performance
Massively improves fill-rate of mod select screen
|
2017-03-04 15:39:50 +09:00 |
|
Thomas Müller
|
c44bf5291c
|
Merge branch 'master' into mod-select-performance
|
2017-03-04 07:35:40 +01:00 |
|
Dean Herbert
|
adb6f01e39
|
Create class hierarchy for Score/Replay storage.
|
2017-03-04 15:32:41 +09:00 |
|
Dean Herbert
|
9e1383fa48
|
Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
# osu.Game.Modes.Catch/CatchRuleset.cs
# osu.Game.Modes.Mania/ManiaRuleset.cs
# osu.Game.Modes.Taiko/TaikoRuleset.cs
# osu.Game/Screens/Play/Player.cs
|
2017-03-04 13:17:01 +09:00 |
|
Dean Herbert
|
7dce1fbe3a
|
Merge pull request #432 from DrabWeb/mod-overlay-cleanup
Minor mod overlay cleanups
|
2017-03-04 12:43:35 +09:00 |
|
DrabWeb
|
9141d244bf
|
Focus trigger in WaveOverlayContainer
|
2017-03-03 18:05:43 -04:00 |
|
DrabWeb
|
5a83687a27
|
Small cleanups
|
2017-03-03 18:02:31 -04:00 |
|
Jorolf
|
b9e4c920c5
|
SelectRandom doesnt select hidden groups now
|
2017-03-03 21:11:38 +01:00 |
|
Jorolf
|
4888d8568c
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into moarOptions
|
2017-03-03 20:54:47 +01:00 |
|
Thomas Müller
|
aff9e3617d
|
Massively improves fill-rate of mod select screen
This is done by masking away the parts of WaveOverlayContainer that
are behind the content.
|
2017-03-03 20:42:03 +01:00 |
|
Dean Herbert
|
3c714fe056
|
Merge pull request #428 from peppy/general-fixes
Log errors with updating.
|
2017-03-03 21:09:38 +09:00 |
|
Dean Herbert
|
6f3b59268a
|
Merge pull request #385 from DrabWeb/mod-overlay
Mod select
|
2017-03-03 21:09:08 +09:00 |
|
Dean Herbert
|
9fe86583f1
|
Merge pull request #412 from revam/remove-source-on-import
Remove source on Import(IEnumerable<string> paths), Import(string path)
|
2017-03-03 20:59:26 +09:00 |
|
Dean Herbert
|
7c1599a0de
|
Merge pull request #427 from smoogipooo/tournament_drawings
Tournament drawings
|
2017-03-03 20:53:24 +09:00 |
|
Dean Herbert
|
7a294f770a
|
Merge branch 'master' into remove-source-on-import
|
2017-03-03 20:51:39 +09:00 |
|
Dean Herbert
|
398b1fcf03
|
Add comment about .ID == 0 check.
|
2017-03-03 20:51:07 +09:00 |
|
Dean Herbert
|
dc6a728cce
|
Merge branch 'master' into tournament_drawings
|
2017-03-03 20:48:07 +09:00 |
|