Commit Graph

105 Commits

Author SHA1 Message Date
d6968ca09c Remove FullyLoaded logic
Always parse storyboards for now.

Let's not optimise this until it is necessary. It was leading to weird threading problems due to the load call in Player's async load method.
2017-07-20 11:01:50 +09:00
da92fccdb0 Merge branch 'master' into non-null-beatmap 2017-07-19 18:32:42 +09:00
35157ca6b8 Make DefaultBeatmap private get. 2017-07-19 18:09:59 +09:00
f168ee660c Move dummy to BeatmapDatabase 2017-07-19 15:16:43 +09:00
f00140f0a4 Avoid crashes on attempting to import the same path twice in quick succession 2017-07-19 14:56:24 +09:00
5761eb30a0 Fix nullref error on re-importing a DeletePending beatmap
Callback was expecting the beatmap to be populated where it wasn't being.
2017-07-19 14:56:20 +09:00
fe7ac20e29 Read menu music from osz resource 2017-05-23 16:38:43 +09:00
a9b3f74218 Fix ruleset not always getting populated in a WorkingBeatmap 2017-05-12 20:05:44 +09:00
a2f6d8a3e6 Fix broken test cases, remove some recursive lookup methods. 2017-05-11 19:38:28 +09:00
4c26a02e99 Remove unnecessary arguments in WorkingBeatmap's constructor. 2017-05-08 16:42:53 +08:00
767cfaaac3 Access database recursively. 2017-05-06 15:37:53 +08:00
4f49151984 Make metadata a member of WorkingBeatmap. 2017-05-06 14:52:28 +08:00
5939ba9143 Fix ruleset not always being initialised correctly. 2017-04-18 10:55:33 +09:00
f2174054ea Fix song select. 2017-04-18 10:04:32 +09:00
d3c1520a2d Fix beatmaps not getting the correct ruleset on import. 2017-04-18 09:47:29 +09:00
af13f97435 Fix regressions and test cases. 2017-04-17 19:44:03 +09:00
a4e2f34ee7 Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
83b083ce64 Move SQLite connections out of database classes; make abstract Database. 2017-04-17 14:37:52 +09:00
19b5555ef2 Slightly clean up archive readers + decoders. Read beatmap version into BeatmapInfo. 2017-04-03 20:26:46 +09:00
54e1b24fe9 Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
2e1f596b2a Move DatabaseWorkingBeatmap out of partial class 2017-03-22 06:50:48 -04:00
cc2b4c5c5b Refactor WorkingBeatmap
Gets ArchiveReader out of WorkingBeatmap and delegates extracting stuff
from it to subclasses. Should enable us to make an OnlineWorkingBeatmap
or so.
2017-03-22 05:57:08 -04:00
3401759665 Don't batch imports for now. 2017-03-17 18:57:24 +09:00
cd98af29c4 Only calculate difficulties on import for now. 2017-03-17 11:53:13 +09:00
e0a8c3b1e5 Rename BaseDifficulty -> Difficulty / BeatmapDifficulty. 2017-03-16 23:18:02 +09:00
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
c84a9d56f5 Fix namespace, comply with naming rules 2017-03-13 11:36:21 +01:00
caa6e9c82b General improvements 2017-03-13 11:29:24 +01:00
9f40a888ec Update BeatmapArchiveReader's test 2017-03-08 21:55:38 +01:00
309019aab3 Merge remote tracking branch 'upstream/master' into archive-reader 2017-03-07 08:41:44 +01:00
5cbcf7a20a Fix error-level inspections. 2017-03-07 14:31:54 +09:00
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
0cad5d7d41 Fix most warnings. 2017-03-07 13:05:57 +09:00
fd53d10264 Refactor ArchiveReader for extensibility 2017-03-06 23:56:08 +01:00
95e2e2b027 Replay loading via drag-drop huzzah! 2017-03-04 19:02:43 +09:00
aa9d85624d Change IPC to make sense. 2017-03-04 18:51:16 +09:00
398b1fcf03 Add comment about .ID == 0 check. 2017-03-03 20:51:07 +09:00
c88c6c4c62 More summaries 2017-03-02 15:37:45 +01:00
dfa21444b4 Ensure correct exception logged 2017-03-02 14:10:32 +01:00
47162a3e91 Update summary and commentary 2017-03-02 13:39:02 +01:00
6661195e92 Only add set if ID is 0 2017-03-02 13:36:01 +01:00
418ae24fea Document private method getBeatmapSet(path) 2017-03-01 17:57:57 +01:00
1e901a1604 Only set StoryBoardFile once 2017-03-01 17:08:12 +01:00
eff66a1da6 Only delete on successful import. 2017-02-28 14:46:16 +01:00
d54a75a5c5 Delete file after importing BeatmapSet w/error handling,
also changed batch-commit of multiple sets to database.
2017-02-28 14:35:42 +01:00
4a4f1f4d82 Actually delete all related database entries, not just the set. 2017-02-27 18:27:38 +09:00
7a60a5e499 Lock the BeatmapDatabase's connection during imports.
This should avoid any potential issues with intertwined transactions on the same connection while still allowing higher throughput when importing.
2017-02-25 10:39:13 +09:00
c178493877 Add support for undeleting beatmaps if they are imported during an undeleted state. 2017-02-24 18:13:38 +09:00
d24403e58e Remove unused using statement. 2017-02-24 17:20:00 +09:00
958bf54c31 Add safe deletion support. 2017-02-24 17:08:13 +09:00