4257 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
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
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
Dean Herbert	44f06e5423	Add hover expand support.	2017-05-05 13:17:36 +09:00
Dean Herbert	9c4f813da1	Remove unnecessary hide/show logic. ... Also change the way the overlay appears when actually playing.	2017-05-05 13:14:44 +09:00
Dean Herbert	b547dd6893	CI Fixes.	2017-05-05 13:06:54 +09:00
Dean Herbert	c9ba1ac4f6	Adjust namespaces. ... Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.	2017-05-05 13:00:05 +09:00
Dean Herbert	6298b3effd	Refactor ModSection and ModIcon to avoid null mods.	2017-05-05 12:16:41 +09:00
EVAST9919	95f6c999bd	Adjust scale and CI fixes	2017-05-04 17:59:01 +03:00
EVAST9919	66c858030a	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-04 17:35:41 +03:00
Dean Herbert	98b3b82c07	Apply CI fixes.	2017-05-04 23:32:27 +09:00
EVAST9919	475eb6fe5f	Cleanup	2017-05-04 17:29:52 +03:00
Dean Herbert	153951d3dd	Add OptionItem class ... Allow for centalised logic for all option UI controls.	2017-05-04 23:07:48 +09:00
smoogipooo	4ad3e3d64e	Basic implementation of hold notes (not finalized yet).	2017-05-04 18:02:43 +09:00
EVAST9919	57c4232416	Added testcase	2017-05-04 11:58:37 +03:00
Dean Herbert	b98ae5d7c3	Merge pull request #704 from smoogipooo/mania-stage ... Mania playfield	2017-05-04 17:02:42 +09:00
Dean Herbert	efa60ee287	Merge branch 'master' into mania-stage	2017-05-04 16:58:16 +09:00
smoogipooo	f945c636c2	Make note accent colour work again.	2017-05-04 15:36:37 +09:00
smoogipooo	72b2467e74	Throw exception if SpecialColumnPosition is set after IsLoaded.	2017-05-04 15:18:20 +09:00
smoogipooo	e307b6d563	Make SpecialColumnPosition only have an effect during load().	2017-05-04 15:12:32 +09:00
smoogipooo	a2bdd020e5	ColumnStyle -> ColumnPosition.	2017-05-04 14:54:31 +09:00
WebFreak001	063b606a12	Fix readonly warning	2017-05-03 18:48:17 +02:00
WebFreak001	008ff9d2f9	InputResample CursorTrail	2017-05-03 18:33:42 +02:00