Commit Graph

121 Commits

Author SHA1 Message Date
Dean Herbert 5026c7a95e SoundControlPoint -> SampleControlPoint 2017-12-23 16:34:34 +09:00
smoogipoo a3fcc0b60c Back to using SortedLists 2017-12-21 19:40:41 +09:00
smoogipoo e8e5e8270b Rename decoder 2017-12-21 14:19:37 +09:00
smoogipoo bfa4f1a2c3 Apply changes in line with master changes 2017-12-21 13:59:03 +09:00
smoogipoo c99ea32574 Merge branch 'master' into beatmap-serialization 2017-12-21 13:39:39 +09:00
smoogipoo b0684cb194 Add storyboard test case but disable for now 2017-12-07 12:02:34 +09:00
smoogipoo 499ecb4edd Add parity checking OsuJsonDecoder test cases 2017-12-07 11:11:38 +09:00
smoogipoo b584178e85 Make Beatmap ISerializable and add more JsonIgnores 2017-12-06 00:37:37 +09:00
Aergwyn cc76c58f5f fall back to .osu file for storyboard if no .osb file is present
+ CI fixes
2017-12-02 16:05:39 +01:00
Aergwyn 2bbfe0dda1 expanded BeatmapDecoder tests, added StoryboardDecoder tests 2017-12-02 15:28:00 +01:00
Aergwyn c466296b14 reverted split at Decoder, moved logic down
I'm done experimenting, sorry
- `Decoder` only returns a "Beatmap"`Decoder` now
- "Storyboard"`Decoder` is retrieved from a "Beatmap"`Decoder`
- moved parse methods down in the hierarchy where I forgot to do that
- renamed `OsuLegacyDecoderTest` to `LegacyDecoderTest`
2017-12-01 22:05:01 +01:00
Aergwyn a49f3479a2 Split retrieving of beatmap and storyboard decoder
Storyboard works again. Not satisfied with the solution though.
2017-12-01 19:11:52 +01:00
Aergwyn 806c0e3b26 restructured OsuLegacyDecoder into LegacyDecoder
Beatmap works, Storyboard not...
2017-12-01 17:43:33 +01:00
Aergwyn c16925059c split parsing a beatmap and parsing a storyboard 2017-11-30 19:16:13 +01: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
Dean Herbert aff30db89d Add thread sleep as a temporary workaround for failing tests 2017-10-22 16:21:41 +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 799f510217 FileStore logic fixes 2017-10-17 10:25:18 +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 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
John Neijzen d9a9616125 EOF remove blank spaces 2017-06-08 14:56:03 +08:00