1523 Commits

Author	SHA1	Message	Date
Andrei Zavatski	35516e7304	Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor	2019-06-24 22:52:24 +03:00
Dean Herbert	6a541d9a10	Merge branch 'master' into user_profile_modes	2019-06-25 00:59:51 +09:00
Dan Balasescu	18d64df0c4	Merge branch 'master' into add-numberbox	2019-06-24 15:22:30 +09:00
Dean Herbert	024157b13f	Remove unnecessary type specification	2019-06-24 11:10:29 +09:00
Dean Herbert	da2ba5bf09	Allow tests to be run in non-sequential order	2019-06-24 11:09:59 +09:00
Dean Herbert	4ec064e179	Fix test timing regressions due to increased step count	2019-06-24 11:00:00 +09:00
Andrei Zavatski	60ff497add	Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor	2019-06-24 01:06:54 +03:00
Unknown	cf193cb26f	call MoveMouseTo with Drawable	2019-06-22 17:43:24 +02:00
Unknown	35d9f5841c	simplify asserts, clarify asserts	2019-06-22 17:34:06 +02:00
Unknown	afe9ac1740	fix assert descriptions	2019-06-22 16:11:47 +02:00
Dean Herbert	667125a184	Fix ModSelectOverlay tests failing due to asynchronous loading (#5104) ... Fix ModSelectOverlay tests failing due to asynchronous loading Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>	2019-06-21 22:24:11 +09:00
Dean Herbert	859afefb79	Prevent non-combo affecting judgements from triggering sudden death (#5095) ... Prevent non-combo affecting judgements from triggering sudden death	2019-06-21 22:24:00 +09:00
Unknown	16a4805f1f	add OsuNumberBox with basic tests	2019-06-21 15:04:52 +02:00
iiSaLMaN	a1c58b164c	Merge branch 'master' into not-available-to-download	2019-06-21 14:16:31 +03:00
Dean Herbert	c2b451a55f	Fix ModSelectOverlay tests failing due to asynchronous loading	2019-06-21 17:51:25 +09:00
Dan Balasescu	67246eddd4	Merge branch 'master' into fix-chat-test-scene	2019-06-21 16:34:35 +09:00
Dean Herbert	ae084157e4	Add tournament streaming and management toolchain (#3491) ... Add tournament streaming and management toolchain	2019-06-21 16:02:35 +09:00
Dean Herbert	6627cdefd2	Merge branch 'master' into tournament-tools	2019-06-21 15:52:47 +09:00
Dean Herbert	19be83181f	Add back missing test scene	2019-06-21 15:32:06 +09:00
Dean Herbert	5ed6c09aa9	Merge branch 'master' into key-binding-fixes	2019-06-21 15:12:37 +09:00
Dean Herbert	6c5599f874	Fix chat being dismissed in test scene when it shouldn't	2019-06-21 15:09:54 +09:00
David Zhao	de59e038ac	Prevent non-combo affecting judgements from triggering sudden death	2019-06-21 14:29:16 +09:00
Dean Herbert	f22d0fa1b4	Update test case for dynamic compilation and corret naming	2019-06-21 13:33:51 +09:00
Dan Balasescu	73d307114f	Merge branch 'master' into notification-overlay-always-present	2019-06-21 13:12:04 +09:00
KingLuigi4932	eb9022257d	Update direct panel test	2019-06-20 18:57:52 +03:00
Dean Herbert	fa94f063be	Use correct button type	2019-06-21 00:26:55 +09:00
Dean Herbert	fa263b91a7	Attempt to fix tests	2019-06-21 00:12:39 +09:00
Dean Herbert	7b4180ce86	Fix failing test	2019-06-20 23:51:47 +09:00
Dean Herbert	8c383ddc27	Fix dodgy test scheduling to other tests	2019-06-20 19:23:27 +09:00
Dean Herbert	21a1fd738b	Remove the necessity for NotificationOverlay to always be present ... Now it will only become present when there is a pending notification.	2019-06-20 19:06:21 +09:00
Andrei Zavatski	e83710d3b8	Add a testcase	2019-06-19 23:15:00 +03:00
Dean Herbert	cd2999d0d1	Rename mod select test scene	2019-06-20 01:40:58 +09:00
KingLuigi4932	a9f87e06f8	Make field readonly	2019-06-19 19:08:18 +03:00
KingLuigi4932	4fba255bd9	Remove gap	2019-06-19 17:56:40 +03:00
KingLuigi4932	9f25d3cd72	More changes and improvements	2019-06-19 17:55:36 +03:00
Andrei Zavatski	e16de58450	Add a testcase	2019-06-19 12:34:01 +03:00
KingLuigi4932	6e28294182	Fix another test	2019-06-19 04:27:31 +03:00
KingLuigi4932	3876442143	More simplifies + fix test	2019-06-19 03:37:08 +03:00
KingLuigi4932	a0609f28d7	Revert some changes + simplify BeatmapNotAvailable	2019-06-19 01:43:28 +03:00
iiSaLMaN	5278c5f365	Merge branch 'master' into not-available-to-download	2019-06-19 01:14:32 +03:00
Dean Herbert	7b68ac667b	Merge branch 'master' into tournament-tools	2019-06-18 20:20:13 +09:00
Dean Herbert	2d20c088f7	Remove test which is failing due to magic numbers	2019-06-18 18:31:42 +09:00
Andrei Zavatski	cecbcd21b2	Merge remote-tracking branch 'upstream/master' into toolbar-rulesets-refactor	2019-06-17 23:12:55 +03:00
Dean Herbert	b259710a62	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-06-17 19:30:17 +09:00
Dean Herbert	587edcb716	Merge branch 'master' into fix-beatmapoverlay-graphs	2019-06-15 13:42:13 +09:00
Dean Herbert	1b75fbed9a	Merge remote-tracking branch 'upstream/master' into update-scrollcontainer	2019-06-14 23:25:17 +09:00
Dean Herbert	cf713fbacc	Merge branch 'master' into fix-stacking-shaking	2019-06-14 22:16:35 +09:00
smoogipoo	512b9dfd82	Fix potential songselect testcase failures	2019-06-14 20:18:22 +09:00
smoogipoo	0c293be89c	Wait for track to start running before seeking	2019-06-14 19:51:31 +09:00
smoogipoo	95082d2fcc	Rename testcase	2019-06-14 19:35:47 +09:00
smoogipoo	4972f862e6	Seek track instead	2019-06-14 19:35:35 +09:00
Dean Herbert	bc574520bf	Update ScrollContainer usages in line with framework changes	2019-06-14 15:55:32 +09:00
Dean Herbert	15b9b53d35	Fix IconButtons not being scaled correctly	2019-06-14 13:40:32 +09:00
smoogipoo	d8ef18c56a	Remove unused using	2019-06-13 19:16:19 +09:00
smoogipoo	2ad4045b2e	Refactor beatmap details testcase	2019-06-13 18:51:41 +09:00
smoogipoo	39f9deea96	Add success rate test scene	2019-06-13 18:44:00 +09:00
smoogipoo	f9f32311b7	Add some randomness	2019-06-13 18:43:44 +09:00
smoogipoo	f2b5f274cf	Add details test scene + fix metrics not getting updated correctly	2019-06-13 18:31:39 +09:00
smoogipoo	72f729cf3b	Refactor beatmap set overlay test scene	2019-06-13 18:14:57 +09:00
smoogipoo	f54f6e552b	Fix beatmap details potentially using the incorrect metrics	2019-06-13 18:04:42 +09:00
smoogipoo	0a79b444d9	Move metrics to beatmap set	2019-06-13 16:52:49 +09:00
smoogipoo	aef94ce9f1	Make BeatmapMetrics non-IEnumerables	2019-06-13 16:30:38 +09:00
smoogipoo	f12caaf907	Increase leniency	2019-06-13 15:47:21 +09:00
smoogipoo	44d2514f1a	Add test scene	2019-06-13 14:45:09 +09:00
Dean Herbert	830ddbc2de	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-06-13 12:49:52 +09:00
EVAST9919	3150b5cfb4	Naming adjustments	2019-06-12 20:51:21 +03:00
KingLuigi4932	1a50544c94	Add tests for undownloadable / parts-removed beatmapsets	2019-06-12 20:42:52 +03:00
EVAST9919	065b4cd055	Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor	2019-06-12 20:35:51 +03:00
Dean Herbert	021d0273f9	Split out user activity from user status (#4619) ... Split out user activity from user status Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-06-12 20:14:03 +09:00
Dean Herbert	b2b3df3885	Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build	2019-06-12 18:28:43 +09:00
Dean Herbert	f358fce9ab	Move activity (writable) bindable to APIAccess so it correctly transfers between users	2019-06-12 18:04:57 +09:00
smoogipoo	243cd517ad	Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups ... # Conflicts: # osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs	2019-06-12 17:24:16 +09:00
smoogipoo	28f8b04765	Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups	2019-06-12 16:47:56 +09:00
Dean Herbert	a9c229b1ec	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-06-12 16:00:35 +09:00
Dean Herbert	bb8a77d27d	Apply all steps to same user panel so interactions can be observed	2019-06-12 15:59:52 +09:00
smoogipoo	5d3fa51360	Merge remote-tracking branch 'origin/master' into selection-update	2019-06-12 15:10:57 +09:00
KingLuigi4932	529bde14af	Merge branch 'not-available-to-download' of https://www.github.com/iiSaLMaN/osu into not-available-to-download	2019-06-11 23:11:52 +03:00
KingLuigi4932	35cc45c9d9	Small update	2019-06-11 23:11:03 +03:00
Lucas A	15893bbb75	Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages.	2019-06-11 19:41:48 +02:00
Dean Herbert	606be3d7ce	Merge branch 'master' into backgrounded-beatmap-status-lookups	2019-06-12 00:22:47 +09:00
Dean Herbert	a690a67a6c	Merge branch 'master' into fullscreen-overlay-surface	2019-06-12 00:07:30 +09:00
KingLuigi4932	13cd22e397	Test scene for BeatmapNotAvailable	2019-06-11 14:58:46 +03:00
Dean Herbert	00ee45fe46	Merge remote-tracking branch 'origin/update-visibility-container' into update-framework	2019-06-11 19:36:13 +09:00
Dean Herbert	86b6070ae8	Tween track frequency on pause (#4973) ... Tween track frequency on pause	2019-06-11 18:44:56 +09:00
Arphox	07e17518e9	Fix all "Maintainability" CodeFactor issues	2019-06-11 10:28:16 +02:00
David Zhao	a53ade07a5	remove unused using	2019-06-11 15:51:57 +09:00
David Zhao	975bb3db8a	cleanup	2019-06-11 15:51:14 +09:00
Dean Herbert	620c2311ac	Add test	2019-06-11 15:39:18 +09:00
Dean Herbert	609a82bc94	Update VisibilityContainer usage in line with framework	2019-06-11 15:13:58 +09:00
David Zhao	d4ba67747b	fix test count	2019-06-11 14:24:04 +09:00
Lucas A	141775d98c	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-06-10 21:41:00 +02:00
Lucas A	2e911d0e96	Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build	2019-06-10 19:13:54 +02:00
Dean Herbert	fc0fc8f164	Merge branch 'master' into backgrounded-beatmap-status-lookups	2019-06-10 19:37:35 +09:00
David Zhao	41e3e2222b	fix test	2019-06-10 18:40:49 +09:00
David Zhao	1aa865c3fb	split out method for reuse	2019-06-10 18:34:24 +09:00
Dean Herbert	d7cb932606	Merge branch 'master' into selection-update	2019-06-10 17:51:40 +09:00
Dean Herbert	600503ec8e	Use Task.Run/Wait to avoid warnings	2019-06-10 13:42:29 +09:00
smoogipoo	f090e292c9	Move ArchiveModelManager import process to async flow	2019-06-10 13:42:22 +09:00
EVAST9919	ff9dc18928	TestCaseImprovements	2019-06-10 03:54:15 +03:00
EVAST9919	9b8540d818	Add a testcase	2019-06-10 03:35:00 +03:00
Dean Herbert	59b624d4ba	Fix test regression	2019-06-10 01:08:39 +09:00
iiSaLMaN	fc8644a73e	Use ScoreRank.D instead of F	2019-06-08 19:34:52 +03:00
iiSaLMaN	d3ff2c6dd5	Use ScoreRank.D instead of F	2019-06-08 19:34:03 +03:00
EVAST9919	ea492772cf	Merge remote-tracking branch 'refs/remotes/ppy/master' into user_profile_modes	2019-06-08 11:31:28 +03:00
Dan Balasescu	346c4310c3	Merge branch 'master' into fail-animation	2019-06-07 20:48:36 +09:00
Dean Herbert	011ccffde7	Add an input source toggle on manual input test scenes (#4945) ... Add an input source toggle on manual input test scenes	2019-06-07 20:26:26 +09:00
Dean Herbert	1374da7c41	Remove all calls to return user input	2019-06-07 12:54:57 +09:00
Dean Herbert	6f6b134ec8	Remove return user input calls	2019-06-07 12:52:49 +09:00
Dean Herbert	748c0e5c01	Set default state of test to enabled	2019-06-07 12:42:01 +09:00
Dean Herbert	58174425ed	Make visual test more visible	2019-06-07 12:37:10 +09:00
Dean Herbert	694f2e3a4f	Tidy up test scene's setup usage	2019-06-07 11:59:07 +09:00
Dean Herbert	64d5aa318f	Apply rebased changes	2019-06-07 11:45:58 +09:00
EVAST9919	923f9fb6cd	Naming adjustments	2019-06-07 01:43:26 +03:00
EVAST9919	2a303748e3	Merge remote-tracking branch 'refs/remotes/ppy/master' into user_profile_modes	2019-06-07 01:23:10 +03:00
Lucas A	a2bc5b538e	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-06-05 16:59:38 +02:00
RedMindZ	e9592b1ebe	Merge branch 'master' into autopilot	2019-06-05 15:56:30 +03:00
Dean Herbert	2538f32fae	Merge branch 'osu-clickable-container' into OsuHoverContainer	2019-06-05 10:34:20 +09:00
EVAST9919	54800aa4df	make the variable local	2019-06-04 19:45:46 +03:00
EVAST9919	e9403bf2f7	Move GamemodeControl to UserProfileOverlay	2019-06-04 19:33:55 +03:00
EVAST9919	8dea191998	Add a testcase	2019-06-04 18:37:41 +03:00
Dean Herbert	1d9274427b	Merge branch 'master' into osu-clickable-container	2019-06-04 21:55:14 +09:00
smoogipoo	ff647940ca	Fix incorrect assertion	2019-06-04 19:25:34 +09:00
Dean Herbert	4e7f2b8f47	Merge branch 'master' into osu-clickable-container	2019-06-04 17:42:17 +09:00
Dean Herbert	9c214c3f0e	Add animation on failing	2019-06-04 16:13:16 +09:00
Dean Herbert	80a66b8b3a	Merge remote-tracking branch 'upstream/master' into audio-refactor-update	2019-06-04 12:08:21 +09:00
smoogipoo	4763a41c7e	Cleanups	2019-06-04 11:25:18 +09:00
smoogipoo	cea353975f	Update with further framework-side changes	2019-06-04 11:04:28 +09:00
smoogipoo	53a39e9142	Merge remote-tracking branch 'origin/master' into audio-refactor-update	2019-06-04 10:50:33 +09:00
Dean Herbert	a5a025de68	Add proper tests	2019-06-04 10:26:35 +09:00
Dean Herbert	1eab4e179d	Add sample action to test so hover effect is visible	2019-06-03 17:10:33 +09:00
Dean Herbert	e32f62db5b	Add missing file	2019-06-03 16:48:44 +09:00
Dean Herbert	17d04545fa	Localise GridTestScene as an OsuGridTestScene	2019-06-03 16:45:18 +09:00
Dean Herbert	e55f5efa82	Merge branch 'osu-clickable-container' into settings-footer-show-changelog-current-build	2019-06-03 13:55:23 +09:00
Dean Herbert	3ef17a54f6	Fix sizing of OsuAnimatedButton and OsuClickableContainer ... Was incorrect under some combinations of relative and autosize usage.	2019-06-03 13:53:24 +09:00
Dean Herbert	b249fb3544	Update test scene to support dynamic compilation	2019-06-03 13:37:29 +09:00
Dean Herbert	115a75e4c6	Use a constant for lazer variables	2019-06-03 13:16:05 +09:00
Dean Herbert	dff7053a07	Merge branch 'master' into more_button_update	2019-06-03 11:48:05 +09:00
Dean Herbert	2d15e02406	Merge branch 'master' into selection-update	2019-06-03 11:47:30 +09:00
EVAST9919	6957b20309	Merge remote-tracking branch 'refs/remotes/ppy/master' into underscored_link	2019-06-03 03:13:46 +03:00
Lucas A	b3f6640d11	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-31 12:41:26 +02:00
Dean Herbert	b52276c489	Pass individual components to DummyWorkingBeatmap, not game	2019-05-31 14:51:12 +09:00
Dean Herbert	f33a5bc54c	Centralise and update WorkingBeatmap creation in test cases	2019-05-31 14:40:53 +09:00
smoogipoo	c211f1d0fe	Merge remote-tracking branch 'Joehuu/master' into changelog-overlay	2019-05-31 12:28:28 +09:00
EVAST9919	cfa0ef6fd9	convert field to a local variable	2019-05-30 23:22:08 +03:00
EVAST9919	fe9e53e383	Add a testcase	2019-05-30 23:07:04 +03:00
RedMindZ	41305dc6e1	Merge branch 'master' into autopilot	2019-05-30 16:04:58 +03:00
EVAST9919	52fad723a2	Implement DrawableMostPlayedBeatmap	2019-05-29 19:51:59 +03:00
Dean Herbert	a1cc8c448f	Update TrackVirtual consumption	2019-05-29 16:43:27 +09:00
Dean Herbert	08ab1e5df7	Use new ITrackStore interface	2019-05-29 16:43:15 +09:00
Dean Herbert	a20eda7b5f	Fix remaining cases to work without things	2019-05-28 23:54:42 +09:00
David Zhao	1a871af552	Fix hide selection, add test	2019-05-28 19:15:29 +09:00
Dean Herbert	4ca34bd5e8	Update osu! in line with audio subsystem refactor	2019-05-28 17:06:01 +09:00
David Zhao	436760de96	Change test name	2019-05-28 14:34:52 +09:00
David Zhao	e59a00ac6e	Remove excessive selection updating	2019-05-28 14:04:33 +09:00
Dean Herbert	601b25f05e	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-05-25 19:10:44 +09:00
Lucas A	a819dd764f	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-25 11:02:19 +02:00
EVAST9919	cda97a61fa	Add a bit of smoothness to the rank graph	2019-05-24 19:43:53 +03:00
RedMindZ	63d2f41ea7	Merge branch 'master' into autopilot	2019-05-23 14:33:30 +03:00
Dean Herbert	0bce7241d2	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay	2019-05-23 17:54:13 +09:00
smoogipoo	edfe47fb02	Rename button	2019-05-23 13:37:25 +09:00
RedMindZ	0fb823fe4a	Merge branch 'master' into autopilot	2019-05-22 15:43:35 +03:00
Dean Herbert	b588638740	Use TabControl instead of custom logic	2019-05-22 19:51:16 +09:00
Dean Herbert	9f9e86f18c	Rename classes and fix back-to-front state	2019-05-22 17:04:21 +09:00
Dean Herbert	1d5b7cdec0	Add ExpandingBar UI element	2019-05-22 16:44:47 +09:00
Dean Herbert	92c991494d	Fix (and rename) ExpandingBar	2019-05-22 16:38:15 +09:00
Dean Herbert	555822a68d	Remove unnecessary brackets	2019-05-22 13:28:41 +09:00
Dean Herbert	8025a97b2b	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay	2019-05-21 17:18:23 +09:00
Dean Herbert	7169eb67d2	Merge branch 'master' into abstract-profile-header	2019-05-21 15:33:47 +09:00
Dean Herbert	e8f64247c5	Merge branch 'master' into consolidate-loader-testcase	2019-05-21 15:12:44 +09:00
smoogipoo	aed4634fe0	Consolidate loader animation tests	2019-05-21 14:48:14 +09:00
Dean Herbert	a18e0b3b2f	Fix test scene	2019-05-21 14:46:12 +09:00
Dean Herbert	d1616e09b6	Merge branch 'fix-spritetext-usage' into HoutarouOreki-changelog-overlay	2019-05-21 14:18:01 +09:00
Dean Herbert	4ac2acbfc0	Fix usages of SpriteText (instead of OsuSpriteText)	2019-05-21 14:13:52 +09:00
Dean Herbert	aba945934d	Move OverlayHeaderTabControl to correct namespace	2019-05-21 13:58:12 +09:00
Dean Herbert	5a9c3ab9fa	Move UserProfileOverlay's header into an abstract implementation	2019-05-21 13:58:03 +09:00
Dean Herbert	340b207fa0	Delete breadcrumb implementation	2019-05-21 13:37:35 +09:00
Dean Herbert	9a769c9f15	Move OverlayHeaderTabControl to correct namespace	2019-05-21 13:36:31 +09:00
Dean Herbert	a5bd3262be	Move UserProfileOverlay's header into an abstract implementation	2019-05-20 18:02:13 +09:00
Dean Herbert	3fa1545ea4	Huge refactor pass focusing on ChangelogContent	2019-05-19 02:09:08 +09:00
Dean Herbert	e93fea7dc3	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-05-18 19:20:44 +09:00
Dean Herbert	5d6c599129	Merge remote-tracking branch 'upstream/master' into changelog-overlay	2019-05-18 15:45:40 +09:00
smoogipoo	ccbf3ff812	Update framework	2019-05-17 22:35:23 +09:00
Tav TaOr	7575af6f42	Merged master into autopilot	2019-05-17 14:15:30 +03:00
Dean Herbert	2d56413e35	Update namespaces	2019-05-17 19:15:59 +09:00
Dean Herbert	c41ec20236	Improve load and switch logic between views	2019-05-17 18:31:53 +09:00
Dean Herbert	e94b9feebd	Fix dynamic recompilation in TestSceneChangelogOverlay	2019-05-17 18:31:53 +09:00
David Zhao	fcffad6553	Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode	2019-05-17 11:35:35 +09:00
David Zhao	5bf513eba8	Don't track immediately when entering mode	2019-05-17 11:24:34 +09:00
Lucas A	5a72d509f2	Resolve merge conflicts	2019-05-16 18:48:15 +02:00
Dean Herbert	5d33a742c6	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay	2019-05-16 18:55:28 +09:00
Dean Herbert	1ccef61f7b	Fix some missed instances of TestCase	2019-05-15 18:32:29 +09:00
Dean Herbert	19a179db92	Bring up-to-date with master	2019-05-15 18:30:02 +09:00
Dean Herbert	a717970e11	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay	2019-05-15 18:27:51 +09:00
Dean Herbert	60d244d2d6	Clean up events and states	2019-05-15 18:08:19 +09:00
Dean Herbert	f49b0dc16d	Initial clean-up pass of breadcrumb and header	2019-05-15 17:55:26 +09:00
smoogipoo	5f56c38475	Merge remote-tracking branch 'origin/master' into rename_test_case	2019-05-15 15:52:06 +09:00
Dean Herbert	88528e797f	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay	2019-05-15 14:24:45 +09:00
Dean Herbert	e7409a28a3	Merge branch 'move-screen-dependencies' into tournament-tools	2019-05-15 13:05:12 +09:00
Dean Herbert	1fd44d7945	Move OsuScreenDependencies to GameBase	2019-05-15 13:00:11 +09:00
Dean Herbert	7b56180b8b	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-05-15 12:08:23 +09:00