3668 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	1842d80e28	Update test case.	2017-04-07 09:43:08 +09:00
Dean Herbert	6d001d8517	Don't recommend property code style changes for now.	2017-04-07 09:41:10 +09:00
Dan Balasescu	9c6d08405a	Merge pull request #601 from peppy/general-fixes ... General fixes	2017-04-07 09:38:55 +09:00
Dean Herbert	fba72b9a9e	Snaking out on by default.	2017-04-07 09:28:13 +09:00
Dean Herbert	12d2102a88	Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Modes/UI/HudOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj	2017-04-07 09:22:18 +09:00
Jorolf	e59c0a770f	Merge branch 'master' into details	2017-04-06 15:42:00 +02:00
Jorolf	28193cbaaa	hide BeatmapDetails on entering the Select screen	2017-04-06 15:39:23 +02:00
Dean Herbert	4a29263cd6	Merge pull request #599 from EVAST9919/testcase_fix ... Fix Pause/Fail testcase	2017-04-06 18:43:21 +09:00
Andrey Zavadskiy	b380cbfd7a	Merge remote-tracking branch 'refs/remotes/ppy/master' into testcase_fix	2017-04-06 12:28:44 +03:00
Andrey Zavadskiy	c6f4cff2e7	Fix Pause/Fail testcase	2017-04-06 12:27:45 +03:00
Dean Herbert	7b7c0733d1	Merge pull request #598 from huoyaoyuan/code-sanity-update ... Update CodeFileSanity.	2017-04-06 18:22:47 +09:00
Huo Yaoyuan	ff469ee5f6	Update resources for CodeFileSanity.	2017-04-06 16:56:27 +08:00
Huo Yaoyuan	411988f038	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Huo Yaoyuan	9b1e010dcc	Fix filename mismatch.	2017-04-06 16:05:41 +08:00
Huo Yaoyuan	f8f75430e4	Merge branch 'master' into code-sanity-update	2017-04-06 15:55:14 +08:00
Dean Herbert	96f814db6c	Merge pull request #595 from smoogipooo/taiko-fixes ... Taiko fixes	2017-04-06 16:32:03 +09:00
smoogipooo	0107772737	Fix using.	2017-04-06 16:25:46 +09:00
Dan Balasescu	6fc1384927	Merge branch 'master' into taiko-fixes	2017-04-06 16:23:22 +09:00
smoogipooo	9260d1c24d	Fix incorrect scroll time calculation.	2017-04-06 16:21:18 +09:00
smoogipooo	bc216f6470	Legacy multiplier only needs to be applied to SliderMultiplier.	2017-04-06 16:20:57 +09:00
Dean Herbert	85dfd8297b	Merge pull request #594 from smoogipooo/better-hitsounds ... Better hitsounds	2017-04-06 16:12:40 +09:00
Dean Herbert	1942ef9e8f	Fix merge fail.	2017-04-06 16:06:02 +09:00
Dean Herbert	4783d17d94	Merge branch 'master' into better-hitsounds	2017-04-06 16:00:56 +09:00
smoogipooo	cec8bca78a	Implement IJsonSerializable, BeatmapInfo IJsonSerializable.	2017-04-06 15:54:50 +09:00
Dean Herbert	0a8d63ead8	Merge pull request #562 from EVAST9919/pause_buttons_refactor ... PauseOverlay/FailOverlay refactor	2017-04-06 15:47:57 +09:00
Dean Herbert	942699218a	Merge branch 'master' into details	2017-04-06 15:44:43 +09:00
Dean Herbert	7c63c8394b	Remove unnecessary depth setting.	2017-04-06 15:36:03 +09:00
Dean Herbert	a18367454d	InGameOverlay -> MenuOverlay.	2017-04-06 15:34:52 +09:00
Dean Herbert	856696b17e	Fix incorrect verbatim strings.	2017-04-06 15:31:21 +09:00
Dean Herbert	6285f3eea8	Merge branch 'master' into pause_buttons_refactor	2017-04-06 15:00:48 +09:00
smoogipooo	37129bf03d	Make combo be changed by the base ScoreProcessor.	2017-04-06 14:37:21 +09:00
Dean Herbert	bb65d2e3d3	Merge pull request #580 from EVAST9919/hud_visibility ... HudOverlay visibility	2017-04-06 14:27:50 +09:00
Dean Herbert	2bb99eac72	fix typo	2017-04-06 14:27:23 +09:00
Dean Herbert	5fa0d9f6f1	Update CodeFileSanity.	2017-04-06 13:58:32 +09:00
smoogipooo	98630dd06c	Fix combo calculations.	2017-04-06 13:46:26 +09:00
smoogipooo	d87a65f19e	Fix accuracy calculations.	2017-04-06 13:44:43 +09:00
Dean Herbert	efe82ef88c	Merge branch 'master' into hud_visibility	2017-04-06 13:40:10 +09:00
Dan Balasescu	0acf5b45b1	Merge pull request #591 from peppy/taiko-wtf ... taiko improvements	2017-04-06 13:23:25 +09:00
Dean Herbert	18ff8efd46	Mark TODO for BeatmapVersion.	2017-04-06 13:15:33 +09:00
Dean Herbert	f193af2a2a	Add better defaults for BaseDifficulty.	2017-04-06 13:15:21 +09:00
Dean Herbert	c50960af63	Add better defaults for ControlPoint.	2017-04-06 13:15:12 +09:00
Dean Herbert	042aa787a5	Fix typo.	2017-04-06 13:14:52 +09:00
smoogipooo	e299d7286e	Update framework + fix TestCaseTaikoHitObjects.	2017-04-06 12:52:56 +09:00
Dan Balasescu	326baae615	Merge branch 'master' into taiko-wtf	2017-04-06 12:30:44 +09:00
Dan Balasescu	7c57ae3ae1	Merge pull request #593 from peppy/general-fixes ... Fix crash on changing play mode too early.	2017-04-06 12:30:31 +09:00
smoogipooo	982dbb5bba	Cleanup + bow down to resharper.	2017-04-06 12:27:35 +09:00
smoogipooo	73e2ddaf26	Revert DrawableHitObject changes, make them less conflicting.	2017-04-06 12:24:17 +09:00
smoogipooo	4cc309e5a7	Make hit sounds into consts.	2017-04-06 12:14:06 +09:00
smoogipooo	c65ab5b6f1	General cleanup.	2017-04-06 11:56:19 +09:00
smoogipooo	2a16eafe8f	Fix assertions.	2017-04-06 11:54:05 +09:00