12230 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	8a6ef0dabb	Merge branch 'master' into beatmap-conversion-rework	2018-05-10 19:10:07 +08:00
Dean Herbert	7fd38e4780	Merge pull request #2490 from smoogipoo/i-beatmap ... Migrate the game to use an IBeatmap interface	2018-05-10 19:07:17 +08:00
Dean Herbert	9e26bcd571	Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap	2018-05-10 19:51:52 +09:00
Dean Herbert	40c1b24b3d	Move IBeatmap to its own file	2018-05-10 19:51:40 +09:00
Dean Herbert	ea838f57fc	Merge branch 'master' into exit-hold-confirmation	2018-05-10 18:37:56 +08:00
Dean Herbert	4b3c2466a4	Merge remote-tracking branch 'upstream/master' into disable-mouse-buttons	2018-05-10 19:16:52 +09:00
smoogipoo	df604c40cc	Keep shortcut padding even when there is no shortut	2018-05-10 18:49:33 +09:00
smoogipoo	c03ab9014f	Improve TestCaseOnScreenDisplay ... Now doesn't rely on framesync.	2018-05-10 18:48:48 +09:00
Jacob Odgård Tørring	a8ca0c899d	Merge branch 'master' of https://github.com/odgaard/osu	2018-05-10 11:29:39 +02:00
Jacob Odgård Tørring	5b99d8df62	Fixes private method name capitalization	2018-05-10 11:29:19 +02:00
Dean Herbert	1db5ca0d73	Merge branch 'master' into master	2018-05-10 17:18:50 +08:00
Dean Herbert	2bb671cf9e	Merge pull request #2516 from peppy/update-framework ... Update framework	2018-05-10 17:18:39 +08:00
Dean Herbert	c7443e6b3b	Update framework	2018-05-10 17:52:48 +09:00
Dean Herbert	fadb1a5e0b	Add tests and expand functionality to ensure single fire	2018-05-10 17:31:16 +09:00
Jacob Odgård Tørring	bb6478cdc3	Adds a check to disable music controller's seek	2018-05-10 10:15:47 +02:00
Dean Herbert	63e10ec3c2	Update framework	2018-05-10 17:10:42 +09:00
Dean Herbert	5df9f126d1	Implement a hold-to-confirm screen when exiting game using escape key	2018-05-10 17:07:19 +09:00
Dean Herbert	3504f7393f	Merge pull request #2482 from smoogipoo/use-bindable-transforms ... Use bindable transforms	2018-05-10 13:50:13 +08:00
smoogipoo	853680ca51	Merge remote-tracking branch 'origin/master' into disable-mouse-buttons	2018-05-10 14:31:52 +09:00
Dean Herbert	2e9c91c32f	Merge branch 'master' into use-bindable-transforms	2018-05-10 11:45:29 +08:00
Dean Herbert	aa69e0ef12	Merge pull request #2495 from smoogipoo/fix-editor-beatmap-change ... Fix beatmap/ruleset being changeable while in the editor	2018-05-10 11:45:23 +08:00
Dean Herbert	fff34be814	Merge branch 'master' into fix-editor-beatmap-change	2018-05-10 11:37:36 +08:00
Dean Herbert	e44faebea6	Merge pull request #2501 from smoogipoo/remove-explicit-clock ... Remove explicit clock in TestCaseBreakOverlay	2018-05-10 11:15:06 +08:00
Dean Herbert	5f5e97220d	Merge branch 'master' into remove-explicit-clock	2018-05-10 11:06:49 +08:00
Dan Balasescu	3c689359af	Merge pull request #2471 from UselessToucan/change_ruleset_via_direct_while_on_scorescreen ... Decouple FilterControl.Ruleset from the game-wide ruleset bindable	2018-05-09 14:09:54 +09:00
Dan Balasescu	929e8f16df	Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen	2018-05-09 14:02:20 +09:00
smoogipoo	c7bc79bce3	Remove explicit clock in TestCaseBreakOverlay	2018-05-09 12:40:04 +09:00
UselessToucan	38d54f2a6c	Merge branch 'master' into back_mouse_button_support	2018-05-08 10:35:11 +03:00
Dan Balasescu	96baee4e5c	Merge pull request #2498 from peppy/update-cfs ... Update CodeFileSanity	2018-05-08 10:24:21 +09:00
Roman Kapustin	44bbb8700e	Handle mouse back button using OnMouseDown override instead of using GlobalAction	2018-05-08 00:22:11 +03:00
Dean Herbert	c2979a5c48	Update CodeFileSanity	2018-05-07 22:08:45 +09:00
smoogipoo	674e45d49b	Fix beatmap/ruleset being changeable while in the editor	2018-05-07 16:32:15 +09:00
smoogipoo	fbd7ccc03f	Make BeatmapInfoWedge display properly for converts	2018-05-07 15:51:08 +09:00
smoogipoo	09c70a9362	Add info label tests to TestCaseBeatmapInfoWedge	2018-05-07 15:51:08 +09:00
smoogipoo	6a9f139d9b	Instantiate convertible hitobjects for beatmap info wedge	2018-05-07 15:51:08 +09:00
smoogipoo	251bdfdee8	Simplify statistics in osu ruleset	2018-05-07 15:51:08 +09:00
smoogipoo	7eb64ab590	Remove object counts from mania/taiko/catch	2018-05-07 15:51:08 +09:00
smoogipoo	b9e4b59e46	Actually construct catch beatmaps	2018-05-07 15:51:08 +09:00
smoogipoo	5f74dc2c17	Simplify osu-ruleset statistics	2018-05-07 15:51:08 +09:00
smoogipoo	b737644208	Add mania statistics	2018-05-07 15:51:08 +09:00
smoogipoo	8a4717d2e9	Add catch statistics	2018-05-07 15:51:08 +09:00
smoogipoo	accffda532	Add taiko statistics	2018-05-07 15:51:08 +09:00
smoogipoo	5489976c20	Implement ruleset-specific beatmap statistics	2018-05-07 15:51:08 +09:00
smoogipoo	9f1efeb19d	Move keybind to last in enum	2018-05-07 15:41:14 +09:00
smoogipoo	30a3f4f29f	Fix not being able to convert beatmaps with 0 hitobjects	2018-05-07 15:27:45 +09:00
Dean Herbert	1be1b10059	Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen	2018-05-07 13:32:19 +08:00
smoogipoo	68441f1ef0	Output ruleset instantiation info	2018-05-07 14:28:30 +09:00
smoogipoo	6867886f4c	Give conversion-tested beatmaps a ruleset	2018-05-07 14:04:37 +09:00
smoogipoo	7ee8228a37	Fix testcases	2018-05-07 13:28:01 +09:00
smoogipoo	ad2c2a5fe6	Restore star difficulty calculation	2018-05-07 12:25:21 +09:00