Commit Graph

2789 Commits

Author SHA1 Message Date
62656b98df Internalize HitObjects to playfields, since some playfields may not use that container. 2017-05-10 20:39:13 +09:00
ba998035a8 More concrete way to determine whether all hit objects have been judged. 2017-05-10 20:37:59 +09:00
89bfc0ff22 Fix exception. 2017-05-09 20:55:38 +09:00
ea76eff1e1 Merge remote-tracking branch 'origin/master' into mania-notes 2017-05-09 19:31:35 +09:00
ab1768ef80 Merge branch 'master' into tidy-up 2017-05-09 10:27:29 +09:00
cb21e98ae1 MatchCreate.ValidForResume = false. 2017-05-08 19:55:04 +08:00
01616cc27c Avoid extra MemoryStream in ArchiveReader. 2017-05-08 19:41:22 +08:00
ced2332d20 Handle overlay in ToolbarOverlayToggleButton. 2017-05-08 19:37:41 +08:00
e466380ee2 Generic infer for IJsonSerializable.DeepClone. 2017-05-08 19:33:37 +08:00
345f80b775 Simplify constructor of SampleInfoList. 2017-05-08 19:30:55 +08:00
dff05bec79 Use readonly fields. 2017-05-08 18:56:04 +08:00
9f1f926634 Add non-null assurance. 2017-05-08 12:45:55 +09:00
e3b01e7b8c Merge branch 'master' into mania-notes
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
2017-05-08 12:12:40 +09:00
a38e95c607 Merge branch 'master' into master 2017-05-08 11:59:01 +09:00
48368779ab Avoid polluting Player with HUD-specific code. 2017-05-08 11:48:40 +09:00
10910cfcef Make field readonly. 2017-05-08 11:47:06 +09:00
2f4fad9d41 Refactor colour selection. 2017-05-08 11:33:22 +09:00
df4a737c9b Merge remote-tracking branch 'ppy/master' into hud-mod-display 2017-05-08 10:56:34 +09:00
11c2e66cee Merge branch 'master' into option-item-refactor 2017-05-08 10:13:21 +09:00
fbf05f12fc Use controlWithCurrent as per comment. 2017-05-08 10:11:45 +09:00
4f8549f220 Standardise usages of exceptions. 2017-05-07 00:38:17 +08:00
36dff94802 removed check if ModSelectOverlay is open 2017-05-05 18:16:48 -07:00
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
5aecc3d761 Made cursortrail work with multiple positions 2017-05-05 17:44:51 +02:00
4b385ded26 Tidy up ModIcon. 2017-05-05 13:22:10 +09:00
44f06e5423 Add hover expand support. 2017-05-05 13:17:36 +09:00
9c4f813da1 Remove unnecessary hide/show logic.
Also change the way the overlay appears when actually playing.
2017-05-05 13:14:44 +09:00
b547dd6893 CI Fixes. 2017-05-05 13:06:54 +09:00
c9ba1ac4f6 Adjust namespaces.
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
2017-05-05 13:00:05 +09:00
6298b3effd Refactor ModSection and ModIcon to avoid null mods. 2017-05-05 12:16:41 +09:00
95f6c999bd Adjust scale and CI fixes 2017-05-04 17:59:01 +03:00
66c858030a Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor 2017-05-04 17:35:41 +03:00
98b3b82c07 Apply CI fixes. 2017-05-04 23:32:27 +09:00
475eb6fe5f Cleanup 2017-05-04 17:29:52 +03:00
153951d3dd Add OptionItem class
Allow for centalised logic for all option UI controls.
2017-05-04 23:07:48 +09:00
57c4232416 Added testcase 2017-05-04 11:58:37 +03:00
efa60ee287 Merge branch 'master' into mania-stage 2017-05-04 16:58:16 +09:00
063b606a12 Fix readonly warning 2017-05-03 18:48:17 +02:00
008ff9d2f9 InputResample CursorTrail 2017-05-03 18:33:42 +02:00
6063231e40 float value fix 2017-05-03 16:58:10 +03:00
26985dbc62 Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor 2017-05-03 16:22:40 +03:00
19f6d58723 Merge remote-tracking branch 'upstream/master' into options-implementation 2017-05-03 21:54:27 +09:00
330dd458bd Trim whitespace. 2017-05-03 20:49:52 +09:00
489f586887 Add FPS display toggling.
Kinda temporary but better than nothing.
2017-05-03 20:34:53 +09:00
956a7288fb Add basic DrawableNote. 2017-05-03 20:12:27 +09:00
5f2f1d2763 CI fixes 2017-05-03 14:01:43 +03:00
9e35eb8d97 Fixes 2017-05-03 13:53:45 +03:00
06e014708a Defer virtual method to load(). 2017-05-03 15:57:15 +09:00
e7a8619f01 ModIcon refactor 2017-05-03 09:48:10 +03:00
898d9495ff line fix 2017-05-03 08:27:47 +03:00