1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 13:22:55 +08:00
Commit Graph

4277 Commits

Author SHA1 Message Date
smoogipooo
cdf827df8e CI fixes. 2017-05-11 13:55:52 +09:00
smoogipooo
94585672b6 Merge remote-tracking branch 'origin/master' into mania-notes 2017-05-11 13:01:00 +09:00
Dean Herbert
ab58acad81 Merge pull request #732 from peppy/general-fixes
Update framework
2017-05-11 12:57:12 +09:00
Dan Balasescu
78ed48d5ef Merge branch 'master' into general-fixes 2017-05-11 12:29:10 +09:00
Dean Herbert
672c22178a Merge pull request #724 from huoyaoyuan/metadata
WorkingBeatmap enhancement
2017-05-11 12:28:15 +09:00
Dean Herbert
70ef503403 Merge branch 'master' into metadata 2017-05-11 12:23:00 +09:00
Dean Herbert
fe47451dbc Merge (fix conflicting framework) 2017-05-11 11:17:44 +09:00
smoogipooo
4614904409 Update framework. 2017-05-10 17:38:59 +09:00
smoogipooo
3b533de8ac Add xmldoc to HitWindows.cs. 2017-05-10 17:29:54 +09:00
Dean Herbert
2e7812956a Update framework. 2017-05-10 14:15:11 +09:00
Dan Balasescu
cdd71b496d Fix unnecessary newline. 2017-05-09 21:08:53 +09:00
Dean Herbert
76380a0792 Merge pull request #731 from smoogipooo/general-fixes
Update framework.
2017-05-09 21:06:40 +09:00
smoogipooo
e1ed785cbf Update framework. 2017-05-09 21:00:40 +09:00
smoogipooo
89bfc0ff22 Fix exception. 2017-05-09 20:55:38 +09:00
smoogipooo
5b323ad483 Cleanups. 2017-05-09 20:55:20 +09:00
smoogipooo
d852567d1d Rewrite notes to have time-relative position and length. 2017-05-09 20:33:59 +09:00
smoogipooo
ea76eff1e1 Merge remote-tracking branch 'origin/master' into mania-notes 2017-05-09 19:31:35 +09:00
Dean Herbert
db6e952ddd Merge pull request #729 from huoyaoyuan/tidy-up
Tidy up
2017-05-09 10:41:24 +09:00
Dean Herbert
ab1768ef80 Merge branch 'master' into tidy-up 2017-05-09 10:27:29 +09:00
Huo Yaoyuan
cb21e98ae1 MatchCreate.ValidForResume = false. 2017-05-08 19:55:04 +08:00
Huo Yaoyuan
01616cc27c Avoid extra MemoryStream in ArchiveReader. 2017-05-08 19:41:22 +08:00
Huo Yaoyuan
ced2332d20 Handle overlay in ToolbarOverlayToggleButton. 2017-05-08 19:37:41 +08:00
Huo Yaoyuan
e466380ee2 Generic infer for IJsonSerializable.DeepClone. 2017-05-08 19:33:37 +08:00
Huo Yaoyuan
345f80b775 Simplify constructor of SampleInfoList. 2017-05-08 19:30:55 +08:00
Huo Yaoyuan
dff05bec79 Use readonly fields. 2017-05-08 18:56:04 +08:00
Huo Yaoyuan
4c26a02e99 Remove unnecessary arguments in WorkingBeatmap's constructor. 2017-05-08 16:42:53 +08:00
Dean Herbert
e6402afe8b Merge pull request #717 from WebFreak001/master
InputResample CursorTrail
2017-05-08 13:15:48 +09:00
Dean Herbert
9f1f926634 Add non-null assurance. 2017-05-08 12:45:55 +09:00
smoogipooo
e3b01e7b8c Merge branch 'master' into mania-notes
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
2017-05-08 12:12:40 +09:00
Dean Herbert
a38e95c607 Merge branch 'master' into master 2017-05-08 11:59:01 +09:00
Dan Balasescu
82a8ce2468 Merge pull request #720 from peppy/hud-mod-display
HUD Mod display
2017-05-08 11:55:19 +09:00
Dean Herbert
48368779ab Avoid polluting Player with HUD-specific code. 2017-05-08 11:48:40 +09:00
Dean Herbert
10910cfcef Make field readonly. 2017-05-08 11:47:06 +09:00
Dean Herbert
2f4fad9d41 Refactor colour selection. 2017-05-08 11:33:22 +09:00
Dean Herbert
df4a737c9b Merge remote-tracking branch 'ppy/master' into hud-mod-display 2017-05-08 10:56:34 +09:00
Dean Herbert
ad4ec7023f Merge pull request #718 from peppy/option-item-refactor
Add OptionItem class
2017-05-08 10:41:49 +09:00
Dan Balasescu
11c2e66cee Merge branch 'master' into option-item-refactor 2017-05-08 10:13:21 +09:00
Dan Balasescu
fbf05f12fc Use controlWithCurrent as per comment. 2017-05-08 10:11:45 +09:00
Dan Balasescu
3adc203a86 Merge pull request #674 from peppy/vscode-updates
Update vscode launch/task configuration.
2017-05-08 09:07:31 +09:00
Dan Balasescu
6d51ef2cc3 Merge branch 'master' into vscode-updates 2017-05-08 08:59:23 +09:00
Huo Yaoyuan
4f8549f220 Standardise usages of exceptions. 2017-05-07 00:38:17 +08:00
Huo Yaoyuan
f37c857af8 CI fixes. 2017-05-06 16:06:38 +08:00
Huo Yaoyuan
767cfaaac3 Access database recursively. 2017-05-06 15:37:53 +08:00
Huo Yaoyuan
146d57953d Use metadata field of WorkingBeatmap. 2017-05-06 14:57:11 +08:00
Huo Yaoyuan
4f49151984 Make metadata a member of WorkingBeatmap. 2017-05-06 14:52:28 +08:00
Dean Herbert
91ad0cb75e Merge pull request #723 from skettios/master
Fix ModSelectOverlay accepting escape when it shouldn't
2017-05-06 10:21:11 +09:00
skettios
36dff94802 removed check if ModSelectOverlay is open 2017-05-05 18:16:48 -07:00
skettios
d129bd0c1f Fix ModSelectOverlay accepting escape when it shouldn't
Because PlaySongSelect is suspending when selecting a song, we don't actually hide ModSelectOverlay.
2017-05-05 17:03:24 -07:00
WebFreak001
5aecc3d761 Made cursortrail work with multiple positions 2017-05-05 17:44:51 +02:00
Dean Herbert
4b385ded26 Tidy up ModIcon. 2017-05-05 13:22:10 +09:00