306 Commits

Author	SHA1	Message	Date
EVAST9919	4b21c83f35	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-11-10 17:24:26 +03:00
EVAST9919	c2f3971188	Extend Beatmap Set Response	2017-11-10 03:01:11 +03:00
Dean Herbert	d8d7165164	Add a test case which starts the game	2017-11-08 13:52:44 +09:00
Dean Herbert	3adcfa8c38	Many fixes	2017-11-03 17:54:35 +09:00
Dean Herbert	27156aeb93	Fix the shit	2017-11-01 17:07:03 +09:00
Dean Herbert	ca8afc0c80	Merge remote-tracking branch 'upstream/master' into intro	2017-10-31 15:49:28 +09:00
Dean Herbert	fcb88de626	Merge branch 'master' into recent-scores	2017-10-30 18:48:26 +09:00
EVAST9919	08637253df	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-10-26 15:04:44 +03:00
EVAST9919	e5dae81356	Move testcase to the right place	2017-10-26 14:42:23 +03:00
Jorolf	0449639f41	remove inner classes and make User property a bindable	2017-10-25 20:07:12 +02:00
Dean Herbert	c30dc77b28	Unique MD5s for unit test	2017-10-25 22:25:28 +09:00
Dan Balasescu	4f64358d67	Merge branch 'master' into extended-textawesome-test	2017-10-24 12:10:24 +09:00
Dean Herbert	0316ec3098	Remove no-longer-necessary Thread.Sleep	2017-10-24 10:08:00 +09:00
Dean Herbert	c704c0349a	Disable IPC test for now	2017-10-24 06:50:33 +09:00
Dean Herbert	7dadb7e21e	Mark IPC non-parallelizable	2017-10-24 06:13:39 +09:00
EVAST9919	d4789e4a9c	Make TextAwesome TestCase more useful	2017-10-23 19:08:53 +03:00
Dean Herbert	22b3f5dd19	Merge remote-tracking branch 'upstream/master' into import-test-fixes	2017-10-23 22:03:37 +09:00
Dean Herbert	4e7c0f11f1	Disable import tests so we can make forward progress	2017-10-23 20:14:17 +09:00
Dean Herbert	e7c935a985	Fix incorrect reference to osu.Game project	2017-10-23 19:33:36 +09:00
Dean Herbert	dc9c474033	Move all TestCases to Testing project ... This allows tests to successfully retrieve rulesets, as they are referenced.	2017-10-23 19:32:02 +09:00
Dean Herbert	aff30db89d	Add thread sleep as a temporary workaround for failing tests	2017-10-22 16:21:41 +09:00
Dean Herbert	908c6d827f	ValueTuple please	2017-10-19 14:49:23 +09:00
Dean Herbert	5d5ea5fb2e	Fix all remaining db structure issues	2017-10-19 14:05:11 +09:00
Dean Herbert	71d614b813	FIx missing columns yet again	2017-10-18 21:57:54 +09:00
Dean Herbert	00be98dba7	Query test assert conditions less often	2017-10-18 20:37:53 +09:00
Dean Herbert	ac4b2797dc	valuetuple nightmare	2017-10-18 20:07:25 +09:00
Dean Herbert	799f510217	FileStore logic fixes	2017-10-17 10:25:18 +09:00
Dean Herbert	eff1c20e38	CI fixing	2017-10-16 22:00:54 +09:00
Dean Herbert	e378d0685d	Remove weird additions	2017-10-16 20:37:10 +09:00
Dean Herbert	d73c0c0c98	Fix test regression	2017-10-16 13:09:01 +09:00
TocoToucan	56e8c7303c	Revert "Fix inconsistent lock usage in BeatmapManager" ... This reverts commit 4a064da30f.	2017-10-16 12:59:59 +09:00
TocoToucan	4a064da30f	Fix inconsistent lock usage in BeatmapManager	2017-10-15 21:56:33 +03:00
smoogipoo	9924f518b7	Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore ... # Conflicts: # osu-framework # osu.Game/Beatmaps/BeatmapMetadata.cs # osu.Game/osu.Game.csproj # osu.Game/packages.config	2017-10-14 16:36:37 +09:00
smoogipoo	b178be21d1	Let's not rename columns yet	2017-10-14 14:30:58 +09:00
smoogipoo	674ad4a30c	Fix compile errors	2017-10-14 12:49:03 +09:00
smoogipoo	b83d7cd4df	Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore ... # Conflicts: # osu-framework # osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs # osu.Game/Beatmaps/BeatmapInfo.cs # osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs	2017-10-14 12:38:59 +09:00
Dean Herbert	ed152c08ac	Fix regressions	2017-10-14 12:27:32 +09:00
Dean Herbert	bf6ab77b0e	Always use live queries to ensure waiting asserts actually get dynamic data	2017-10-11 13:37:24 +09:00
Dean Herbert	b6cfc49b06	Improve resilience of beatmap import test ... Fixes this happening https://ci.appveyor.com/project/peppy/osu/build/master-4694/tests	2017-10-11 12:41:43 +09:00
TocoToucan	887aa7496b	Rework EF Core usage in model classes	2017-10-06 00:23:26 +03:00
TocoToucan	6a4198d0d6	Initial EF Core commit	2017-10-04 22:52:12 +03:00
Dean Herbert	990ef3ca56	Make import tests more resilient to race condition failures ... Also centralises wait-or-assert logic.	2017-09-27 14:51:01 +08:00
Dean Herbert	bbc990a6fd	Assign a name to individual import tests to avoid file contention	2017-09-27 11:26:56 +08:00
Dean Herbert	1e6c480791	Add back missing tests	2017-09-25 11:58:37 +08:00
Dean Herbert	393aa12eec	Remove old files	2017-09-19 16:06:59 +09:00
Dean Herbert	6d3d485565	And then everything became one	2017-09-19 16:06:58 +09:00
Dean Herbert	fb7740a3ab	Update all dependencies in line with framework	2017-09-13 20:25:40 +09:00
Dean Herbert	7170fbd087	Target .NET 4.6.1	2017-09-11 12:39:00 +09:00
Dean Herbert	e777ccc339	Avoid threading conflicts when resetting the database in unit tests	2017-08-23 14:42:46 +09:00
Dean Herbert	5f53426a9a	*Database -> *Store ... Welcome back BeatmapManager	2017-07-27 16:56:41 +09:00
Dean Herbert	cbe7b08642	Make BeatmapStore's BeatmapDatabase private	2017-07-27 15:34:13 +09:00
Dean Herbert	96b08b8777	Simplify and document DatabaseStore API	2017-07-27 15:06:10 +09:00
Dean Herbert	898a601098	Introduce a reference counting file store	2017-07-26 20:22:02 +09:00
Dean Herbert	9e20a02c0a	Split out BeatmapDatabase into BeatmapStore ... Hide database functionality at a lower level in preparation from eventually making it private.	2017-07-26 16:31:34 +09:00
Dean Herbert	fce580d717	Reshuffle namespaces	2017-07-26 13:22:46 +09:00
Thomas Müller	96675965d8	Fix broken test case	2017-07-22 12:16:46 +02:00
Dean Herbert	55d999e4a1	Fix comment	2017-07-11 10:45:43 +09:00
Dean Herbert	e9b397f06f	Remove assert which is not always true on some operating systems	2017-07-11 10:41:18 +09:00
Thomas Müller	4134f84559	Increase test timeout to 1 minute	2017-07-10 12:54:11 +03:00
Dean Herbert	41d4aee4f5	Update nuget packages ... - [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820	2017-06-13 11:50:46 +09:00
John Neijzen	d9a9616125	EOF remove blank spaces	2017-06-08 14:56:03 +08:00
Dean Herbert	0f59645e17	Increase timeout in TestImportOverIPC ... Has been failing CI randomly, so let's increase the timeout a bit.	2017-05-31 15:51:52 +09:00
Dean Herbert	a2f6d8a3e6	Fix broken test cases, remove some recursive lookup methods.	2017-05-11 19:38:28 +09: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
Dean Herbert	d06b3c898f	Update framework with new DI changes.	2017-05-02 15:32:47 +09:00
Dean Herbert	fbd26a1d5e	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
smoogipooo	1be1683a4f	Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion	2017-04-18 09:58:39 +09:00
Dean Herbert	4393c2cb25	Add unit tests to ensure all rulesets' beatmaps are added successfully.	2017-04-18 09:46:14 +09:00
smoogipooo	786446354e	Fix post-rebase errors.	2017-04-18 09:00:53 +09:00
smoogipooo	09208adf81	Re-implement legacy hit object conversion.	2017-04-18 08:58:21 +09:00
Dean Herbert	4b6ba565f8	Fix forgotten revert.	2017-04-17 20:10:51 +09:00
Dean Herbert	af13f97435	Fix regressions and test cases.	2017-04-17 19:44:03 +09:00
Dean Herbert	a4e2f34ee7	Make a RulesetDatabase.	2017-04-17 17:43:48 +09:00
Dean Herbert	ce12cc20bd	Merge remote-tracking branch 'upstream/master' into remove-playmode	2017-04-17 13:00:53 +09:00
Adrian Kaz Scherzinger	60f7879875	Explicitly set C# 6.0 for now.	2017-04-16 06:44:08 +09:00
smoogipooo	0a1376c2db	Remove PlayMode game-wide.	2017-04-15 05:22:41 +09:00
smoogipooo	a89af273be	Make BeatmapInfo expose Ruleset instead of PlayMode.	2017-04-15 05:01:36 +09:00
smoogipooo	59bfc7abad	Move statics to RulesetCollection to avoid conflicts later on.	2017-04-15 04:53:37 +09:00
Dean Herbert	c0338a82e7	Update nuget packages. ... Includes fix in OpenTK for focus issues.	2017-04-12 19:35:16 +09:00
Huo Yaoyuan	411988f038	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
smoogipooo	4cc309e5a7	Make hit sounds into consts.	2017-04-06 12:14:06 +09:00
smoogipooo	2a16eafe8f	Fix assertions.	2017-04-06 11:54:05 +09:00
smoogipooo	eb82a4c090	Back to using SampleInfo + fix taiko beatmap conversion.	2017-04-06 11:41:16 +09:00
smoogipooo	d607207b69	Ability to contain multiple sample banks. Get default bank name from control point.	2017-04-05 21:59:07 +09:00
smoogipooo	2d8239a3f7	Re-implement the SampleBank/Sample structure. No parsing support yet.	2017-04-05 21:34:28 +09:00
smoogipooo	4b424263ce	Fully parse control points.	2017-04-04 13:13:27 +09:00
smoogipooo	15db37d9e0	Cleanup.	2017-04-03 20:27:25 +09:00
smoogipooo	19b5555ef2	Slightly clean up archive readers + decoders. Read beatmap version into BeatmapInfo.	2017-04-03 20:26:46 +09:00
Dean Herbert	a61cb078e3	Increase timeout on IPC wait.	2017-03-23 17:32:57 +09:00
smoogipooo	e0a8c3b1e5	Rename BaseDifficulty -> Difficulty / BeatmapDifficulty.	2017-03-16 23:18:02 +09:00
smoogipooo	1f43370886	Fix failing unit test, move legacy hitobjects to Objects/Legacy/.	2017-03-14 18:06:32 +09:00
Dean Herbert	ba10c3a8db	Revert "Merge pull request #441 from tacchinotacchi/archive-reader" ... This reverts commit 6f20473e65, reversing changes made to c76a495d3d.	2017-03-14 11:46:34 +09:00
Huo Yaoyuan	db104d04d3	Use AutoGenerateBindingRedirects instead of explicit app.config.	2017-03-14 03:20:33 +08:00
Alex Amadori	c84a9d56f5	Fix namespace, comply with naming rules	2017-03-13 11:36:21 +01:00
Alex Amadori	caa6e9c82b	General improvements	2017-03-13 11:29:24 +01:00
Alex Amadori	f969c3b7b3	Fix test	2017-03-09 21:00:13 +01:00
Dean Herbert	30de7aa59c	Remove duplicate reference to nunit.	2017-03-09 16:15:33 +09:00
Dean Herbert	5a42035f88	Update license headers.	2017-03-08 15:50:52 +09:00
Dean Herbert	4430255ec4	Merge remote-tracking branch 'upstream/master' into replay ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs # osu.Desktop/OsuGameDesktop.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs # osu.Game/Database/BeatmapDatabase.cs # osu.Game/Graphics/Cursor/OsuCursorContainer.cs # osu.Game/IPC/BeatmapImporter.cs # osu.Game/Modes/Mod.cs # osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs # osu.Game/Modes/UI/Playfield.cs # osu.Game/Screens/Play/Player.cs # osu.Game/Screens/Play/PlayerInputManager.cs	2017-03-07 13:50:08 +09:00
Dean Herbert	1751532a01	Fix a few regressions.	2017-03-07 13:30:36 +09:00
Dean Herbert	0cad5d7d41	Fix most warnings.	2017-03-07 13:05:57 +09:00
Dean Herbert	aa9d85624d	Change IPC to make sense.	2017-03-04 18:51:16 +09:00
Mikal Stodal	866dbf0b1d	Added new test ... When file is in use, we expect it to presist removal, in other words, fail to delete.	2017-03-02 15:24:12 +01:00
Mikal Stodal	7e72911d3a	Update tests	2017-02-28 14:36:11 +01:00
Dean Herbert	a22216d0b0	Update nuget packages.	2017-02-27 20:38:30 +09:00
Dean Herbert	686372a7f9	Update with framework structural changes.	2017-02-26 20:54:32 +09:00
Thomas Müller	6a67ffa5b3	Attempt to fix failing beatmap import test case	2017-02-25 08:31:29 +01:00
Dean Herbert	9067907789	Better assertions.	2017-02-25 11:55:30 +09:00
Dean Herbert	fdf5867a1a	Add more informative asserts in unit tests.	2017-02-25 11:46:04 +09:00
Dean Herbert	3a89348413	Centralise access to WorkingBeatmaps. ... They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).	2017-02-24 13:43:21 +09:00
Dean Herbert	c5552dfb27	Merge remote-tracking branch 'upstream/master' into remove-usings	2017-02-24 11:29:34 +09:00
Thomas Müller	2689de0c0c	Update framework and add "Async" suffix to asynchronous methods	2017-02-23 22:32:10 +01:00
Thomas Müller	a5dfa7ab06	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
Dean Herbert	da2bfe6d3c	Framework updates.	2017-02-23 16:42:12 +09:00
Thomas Müller	417f146386	Add difficulty calculation ... Adds base classes for difficulty calculations, hooks them up with carousel container, and adds a port of the osu difficulty calculator.	2017-02-19 17:41:51 +01:00
Dean Herbert	f207da6041	Add/update license headers.	2017-02-14 18:17:35 +09:00
Dean Herbert	11643d2e09	Remove unnecessary methods and local variables.	2017-02-13 18:30:51 +09:00
John Leuenhagen	7ad9cd6b6e	add explicit false values to prevent warnings as errors	2017-02-12 02:32:11 -05:00
柯十六夜	acfbf2e32e	Add prefix Online to BeatmapID and BeatmapSetID	2017-01-09 21:05:01 +08:00
Dean Herbert	40ea6e0d72	Fix incorrect folder name.	2016-12-08 21:36:34 +09:00
Dean Herbert	027d71ffd8	Fix unit tests failing.	2016-11-21 12:34:03 +09:00
Dean Herbert	da1f6eeab5	Circle -> HitCircle.	2016-11-16 16:16:45 +09:00
Dean Herbert	d3f810f72f	Introduce concept of HitObjectParsers, fix tests and stop using reflection (unreliable due to lazy loading).	2016-11-14 22:03:39 +09:00
Dean Herbert	4590be552f	Move play modes to their own projects.	2016-11-14 18:54:24 +09:00
Dean Herbert	06f4f93918	Move play modes to Modes namespace.	2016-11-14 18:03:20 +09:00
Dean Herbert	0f4538f69f	Rename GameModes namespace to Screens.	2016-11-14 17:23:33 +09:00
Drew DeVault	19fd6fe249	Introduce dependency injection	2016-11-10 16:38:25 -05:00
Thomas Müller	32ee20b843	Merge branch 'master' of github.com:ppy/osu into better-clocks ... # Conflicts: # osu.Game/Beatmaps/Objects/Osu/Drawable/DrawableCircle.cs	2016-11-06 10:08:24 +01:00
Thomas Müller	a6c0fd29f2	Make use of new timing system in Drawables and Transforms.	2016-11-06 08:25:21 +01:00
Dean Herbert	cc140c9634	Fix broken tests.	2016-11-05 22:48:32 +09:00
Dean Herbert	a11d534067	Add beatmap backgrounds.	2016-11-05 20:00:14 +09:00
Dean Herbert	7a54fdfffb	Fix ImportBeatmapTest.	2016-11-03 16:59:16 +09:00
Dean Herbert	f156ac25be	Fix nunit hint path.	2016-10-29 04:17:56 +09:00
Dean Herbert	5ce102b36c	Fix outdated test attributes.	2016-10-28 16:09:55 +09:00
Drew DeVault	fd867b2eb7	Fix use of obsolete NUnit attribute	2016-10-26 10:37:36 -04:00
Drew DeVault	157512b45f	Merge branch 'master' into song-select	2016-10-26 10:37:18 -04:00
Dean Herbert	3f23900347	Framework & OpenTK updates.	2016-10-26 23:13:44 +09:00
Drew DeVault	ddfa457ad3	Fix up sqlite	2016-10-25 19:39:09 -04:00
Drew DeVault	cea660dce5	Fix up JSON reference	2016-10-24 15:02:13 -04:00
Drew DeVault	d559903ebc	Fix busted test project	2016-10-24 11:41:14 -04:00
Dean Herbert	d3a857edb9	Make importing work properly. ... Moves import code to BeatmapDatabase.	2016-10-24 11:39:53 -04:00
Dean Herbert	6cc5407348	Fix path not being local enough for some unit tests.	2016-10-25 00:27:47 +09:00
Dean Herbert	1ce16afa23	Update nuget package versions.	2016-10-24 22:46:44 +09:00
Drew DeVault	449f04c07b	Refactor the database code	2016-10-18 13:38:27 -04:00
John Leuenhagen	fedfb8a22a	Converted all .cs files to use CRLF line endings.	2016-10-13 23:33:58 -04:00
Drew DeVault	25d08c8e2c	Improve beatmap loading and hydration	2016-10-13 10:29:30 -04:00
Drew DeVault	dd86e75ea7	Minor fixes	2016-10-13 12:19:06 +09:00
Drew DeVault	2f8fbee364	Moved test osz file into osu-resources	2016-10-13 12:18:29 +09:00
Drew DeVault	c39179d299	Add test for hit objects	2016-10-13 12:17:40 +09:00
Drew DeVault	7a4501323b	Decode beatmap colours	2016-10-13 12:17:35 +09:00
Drew DeVault	c0022f3515	Add more tests for legacy decoder	2016-10-13 12:17:31 +09:00
Drew DeVault	34b24e1399	Use embedded resources for test assets	2016-10-13 12:17:23 +09:00
Drew DeVault	9b4bc3e36d	Implement most of the legacy beatmap decoder ... Missing timing points, events, and hit object decoders remain to be written	2016-10-13 12:17:03 +09:00
Drew DeVault	32ab8f97bb	Add more decoding (including full BeatmapMetadata)	2016-10-13 12:16:58 +09:00
Drew DeVault	2a3f047895	Start implementing legacy decoder	2016-10-13 12:16:48 +09:00