1126 Commits

Author	SHA1	Message	Date
Dean Herbert	367bc53a06	Revert some more instances of 'e' variable names	2019-02-22 20:15:25 +09:00
Dean Herbert	3015d40f8f	Merge branch 'master' into osu-fontusage	2019-02-22 18:09:23 +09:00
Dean Herbert	3fe4b8fd1c	Update variable names ... Also cleans up some weird code	2019-02-22 17:51:39 +09:00
Dean Herbert	2c9e6adfd4	Merge branch 'master' into bindable-valuechanged	2019-02-22 17:14:05 +09:00
Dean Herbert	452caabd40	Apply suggestions from code review ... Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>	2019-02-22 17:06:49 +09:00
smoogipoo	d4bdae4b04	Disable TestInstantPolling	2019-02-22 16:59:52 +09:00
smoogipoo	d99eaa3fce	Simplify expression	2019-02-21 19:25:08 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
smoogipoo	7e41fbc29b	Remove LegacyDifficultyCalculator	2019-02-21 13:12:37 +09:00
smoogipoo	cc33f230b4	Merge remote-tracking branch 'origin/master' into osu-fontusage	2019-02-20 20:37:48 +09:00
smoogipoo	0693ab8e7d	Merge remote-tracking branch 'origin/master' into osu-fontusage ... # Conflicts: # osu.Game/Screens/Multi/Components/BeatmapTitle.cs	2019-02-20 15:04:08 +09:00
smoogipoo	a2aa3ec5cb	Adjust sprite texts in-line with framework changes	2019-02-20 15:03:20 +09:00
Dean Herbert	f2ad2931c7	Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock	2019-02-20 11:37:33 +09:00
Dean Herbert	2bf5534bf1	Merge pull request #4292 from peppy/fix-multi-screen-test ... Fix TestCaseMultiScreen intermittent failures	2019-02-19 17:08:59 +09:00
Dean Herbert	4504aee089	Unnecessary using	2019-02-19 16:50:56 +09:00
Dean Herbert	618455f7ba	Remove exit step (needs login to show properly)	2019-02-19 16:47:59 +09:00
Dean Herbert	0609fcf7d4	Fix TestCaseMultiScreen intermittent failures	2019-02-19 15:52:53 +09:00
smoogipoo	93b7b51d0a	timeRate -> clockRate	2019-02-19 14:29:23 +09:00
smoogipoo	9d8ba4073c	Add tests for LimitedCapacityStack	2019-02-19 14:18:49 +09:00
Dean Herbert	0fce23a36b	Fix test regression	2019-02-19 12:38:45 +09:00
Dean Herbert	f8033a3b35	Give TestWorkingBeatmap a reference clock	2019-02-19 12:27:30 +09:00
smoogipoo	a8faa942a6	Implement new difficulty calculator structure	2019-02-18 14:49:43 +09:00
Dean Herbert	aceb8c4cb0	Fix TestCasePlaySongSelect	2019-02-15 21:50:40 +09:00
Dean Herbert	fc583590d3	Fix OsuGame testcase	2019-02-15 17:40:49 +09:00
Dean Herbert	65721a01ab	Fix regressed screen test cases	2019-02-15 17:01:06 +09:00
Dean Herbert	b967b93b88	Fix regressions in tests	2019-02-12 19:53:08 +09:00
Dean Herbert	88ffc78103	Restructure	2019-02-11 19:11:34 +09:00
Dean Herbert	e2e615cc5c	Merge branch 'master' into leased-bindables-dont-work	2019-02-11 16:30:12 +09:00
smoogipoo	7aca0f4a1d	Fix failing test cases	2019-02-08 16:08:23 +09:00
smoogipoo	ee5ff283d1	Remove compiler warnings	2019-02-08 16:02:00 +09:00
smoogipoo	fdd37dbc4b	Merge remote-tracking branch 'origin/master' into cmc-rooms	2019-02-08 15:44:33 +09:00
smoogipoo	aac371ba6e	Use CMC for all of multiplayer	2019-02-05 19:00:08 +09:00
Dean Herbert	8ae2861ed6	Fix class name	2019-02-05 18:09:15 +09:00
Dean Herbert	a6b2e9eb0b	Remove unused pieces of ini	2019-02-05 18:08:27 +09:00
Dean Herbert	2f8f4fac64	Fix combo colour fallbacks when skin is not providing any	2019-02-05 17:54:14 +09:00
Dean Herbert	ca5c8d37d1	Use leased bindables	2019-02-01 16:44:06 +09:00
Dean Herbert	09056fd0d8	Merge branch 'master' into resources-via-nuget	2019-01-31 18:40:45 +09:00
smoogipoo	91302ea0bc	Merge remote-tracking branch 'origin/master' into iscreen ... # Conflicts: # osu.Game/Screens/Multi/Match/MatchSubScreen.cs # osu.Game/Screens/Multi/Multiplayer.cs # osu.Game/Screens/Multi/MultiplayerSubScreen.cs # osu.Game/Screens/OsuScreen.cs # osu.Game/osu.Game.csproj # osu.sln	2019-01-29 21:21:36 +09:00
Dean Herbert	bbc24bbfdd	Merge remote-tracking branch 'upstream/master' into resources-via-nuget ... # Conflicts: # osu-resources # osu.sln	2019-01-29 12:19:35 +09:00
Dean Herbert	8d4faafdbe	Rename file to match class	2019-01-28 18:41:57 +09:00
Dean Herbert	628b3e1119	Move osu-resources to nuget	2019-01-28 18:33:39 +09:00
Dean Herbert	1404ba6625	Remove unnecessary changes	2019-01-28 15:56:55 +09:00
Dean Herbert	014ea972d9	Merge remote-tracking branch 'origin/master' into samah-ios	2019-01-25 11:51:44 +09:00
smoogipoo	8ea7ec6445	Convert everything to use IScreen	2019-01-24 19:47:44 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Shane Woolcock	728c744e4d	Merge branch 'master' into samah-ios	2019-01-23 22:19:49 +10:30
Dean Herbert	f107a922b4	Add tests for key counter inside player heirarchy	2019-01-23 14:51:25 +09:00
Shane Woolcock	fbed8c3242	Pass GameHost to BeatmapManager in visual tests	2019-01-22 22:07:41 +10:30
Shane Woolcock	10b91e18bd	Merge branch 'master' into samah-ios ... # Conflicts: # osu.Game/osu.Game.csproj	2019-01-19 18:03:58 +10:30