4595 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
EVAST9919	315f1f1256	CI fixes	2017-05-09 06:23:03 +03:00
EVAST9919	2c92ee432b	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-09 06:05:46 +03:00
EVAST9919	2826c663fd	Apply suggested changes	2017-05-09 06:05:37 +03: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
EVAST9919	de2486b8e6	Moved timeLeft recalculation to property	2017-05-08 20:36:02 +03:00
EVAST9919	17d1ecb8f5	Use float type for progress value	2017-05-08 19:42:36 +03:00
Jorolf	9aaac4ab0c	Merge branch 'new-option-search' of github.com:Jorolf/osu into new-option-search	2017-05-08 18:30:33 +02:00
Jorolf	86f0173c6b	fix license header	2017-05-08 18:30:00 +02:00
EVAST9919	4b5e24cc36	Changed logic a bit	2017-05-08 19:14:19 +03:00
jorolf	3abf1b2a0b	Merge branch 'master' into new-option-search	2017-05-08 17:25:47 +02:00
EVAST9919	ae2186970c	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-08 18:16:16 +03: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	5131371c93	Merge branch 'master' into new-option-search	2017-05-08 10:49:49 +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
DrabWeb	de8428c95b	Make requested changes	2017-05-07 22:23:33 -03:00
EVAST9919	376e4e1840	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-08 04:18:15 +03: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
EVAST9919	f0145c7f4f	Trying to woke up AppVeyor	2017-05-08 02:16:56 +03:00
EVAST9919	926ed907c2	CI fixes	2017-05-08 02:00:21 +03:00
EVAST9919	dda25219bc	code fixes	2017-05-08 01:54:31 +03:00
EVAST9919	c3a42ded36	Fixed Graph/seeking offset	2017-05-08 01:23:51 +03:00
EVAST9919	531f2c410a	removed useless variable	2017-05-08 00:26:34 +03:00
EVAST9919	ea28a9f7ce	Adjust values	2017-05-08 00:16:58 +03:00
Jorolf	3c4faae554	add search box and the ability to search	2017-05-07 20:35:57 +02:00
Huo Yaoyuan	4f8549f220	Standardise usages of exceptions.	2017-05-07 00:38:17 +08:00
Jorolf	ef02f80881	Merge branch 'option-item-refactor' of git://github.com/peppy/osu into new-option-search	2017-05-06 17:55:28 +02:00
EVAST9919	d06b5783cb	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-06 17:33:51 +03: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