Commit Graph

637 Commits

Author SHA1 Message Date
db2750592d Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects 2017-10-15 14:01:35 +03:00
7cf5d63cd3 Return back DatabaseBackedStore's query and populate functions 2017-10-15 00:40:41 +03:00
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
b178be21d1 Let's not rename columns yet 2017-10-14 14:30:58 +09:00
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
ed152c08ac Fix regressions 2017-10-14 12:27:32 +09:00
cd722e4abb Fix beatmap author being stored in two different places 2017-10-14 11:39:55 +09:00
520b806305 Merge remote-tracking branch 'upstream/master' into ranks-section 2017-10-13 18:49:05 +09:00
8a5e25ce4b Simplify waveform construction 2017-10-12 19:19:42 +09:00
df6409308a Merge remote-tracking branch 'origin/master' into editor-waveform-timeline
# Conflicts:
#	osu-framework
2017-10-12 15:32:11 +09:00
cf7f3411fc Ignore filename case in BeatmapManager. Fixes #1295. 2017-10-11 15:01:02 +08:00
4653470779 Fix RulesetStore preparation 2017-10-10 22:29:16 +03:00
8b01f8671f Merge from ppy/master 2017-10-10 21:07:36 +03:00
b8d2a04fe1 Only split beatmap lines twice 2017-10-10 19:24:24 +09:00
ad344eb719 Use IsNullOrWhiteSpace instead of trimming 2017-10-10 19:21:38 +09:00
cbae19b604 Fix BeatmapMetadata removing 2017-10-10 00:17:12 +03:00
ef417c6388 Small DB-related refactoring 2017-10-09 23:30:32 +03:00
41a90c8b11 Add missing eager loading 2017-10-09 23:28:28 +03:00
29c2a29798 Fix trimming too early in OsuLegacyDecoder crashing storyboards 2017-10-09 18:47:12 +09:00
b97b575b27 Merge remote-tracking branch 'origin/master' into editor-waveform
# Conflicts:
#	osu-framework
2017-10-09 17:20:24 +09:00
19b38983df Update in-line with framework 2017-10-09 17:18:11 +09:00
81b9e08fb6 Fix foreign key constraint failure 2017-10-09 00:30:52 +03:00
bd9f2db477 Trim line 2017-10-08 17:30:21 +09:00
6c5c734ff1 Trim end of line
Fix ArgumentOutOfRangeException when parsing http://osu.ppy.sh/osu/1004136
2017-10-08 09:42:09 +09:00
d3109a5950 Hook up BeatmapPanel "Edit" item 2017-10-07 00:59:14 +09:00
887aa7496b Rework EF Core usage in model classes 2017-10-06 00:23:26 +03:00
6a4198d0d6 Initial EF Core commit 2017-10-04 22:52:12 +03:00
aafead5057 Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-10-03 01:34:42 +03:00
12a9cbad56 Allow Beatmap to populate some metadata defaults if they aren't provided via BetamapInfo 2017-10-02 21:54:26 +08:00
3cd6319ffa Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-27 00:32:38 +03:00
b8b54e95a5 Merge branch 'master' into editor-timing-timeline 2017-09-26 15:54:01 +09:00
d86e81f07c Better expression to avoid invalid values 2017-09-25 18:00:52 +09:00
d787c740fa Fix bookmarks not working
We should be dealing with the array in every situation, with the exception of the database.
2017-09-25 17:46:51 +09:00
72141935e8 make pagination work and remove duplication in RanksSection 2017-09-21 22:07:23 +02:00
cb4818e84e Merge https://github.com/ppy/osu into online-beatmap-set-overlay 2017-09-21 14:25:34 -03:00
6a9572db6c Merge branch 'master' into editor-timing-timeline
# Conflicts:
#	osu-framework
2017-09-20 16:19:08 +09:00
1b0ab414fa Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-19 17:23:10 +03:00
67d3861226 Initial implementation of the EditorTimingTimeline in TestCaseEditorTimingTimeline
Will probably rename this to MiniTimeline or something... But the basic structure is there plus most of functionality minus keyboard input.
2017-09-19 23:09:08 +09:00
3000323727 Give WorkingBeatmap's Metadata a non-null default 2017-09-19 21:41:18 +09:00
4b0eee2bcc Merge remote-tracking branch 'upstream/master' into merge-projects 2017-09-19 20:43:20 +09:00
c41ca10715 Allow files missing on disk to be restored on beatmap import
Previously, in the rare case the database became out of sync with the disk store, it was impossible to feasibly repair a beatmap. Now reimporting checks each file exists on disk and adds it back if it doesn't.
2017-09-19 18:35:52 +09:00
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
5a76ed4000 Fix LegacyFilesystemReader Filenames property. 2017-09-18 10:14:29 +02:00
8944d0f705 make it only look for files instead of directories 2017-09-16 18:44:32 -05:00
47b62803d8 Account for all files instead of just the main directory ones 2017-09-15 15:47:56 -05:00
740e766201 BreakOverlay and LetterboxOverlay implementation 2017-09-15 19:39:55 +03:00
02fa9eeb3b Merge branch 'master' into online-beatmap-set-overlay 2017-09-14 16:52:44 +09:00
33d33a49ae Merge branch 'master' into storyboards 2017-09-14 16:06:19 +09:00
b1145272d1 Update code to support new inspectcode analysis rules 2017-09-14 12:58:32 +09:00
b78c516b74 Merge branch 'master' into scoring-revamp 2017-09-13 20:47:14 +09:00