1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-26 03:52:57 +08:00
Commit Graph

107 Commits

Author SHA1 Message Date
Dan Balasescu
7ba59d9d56
Merge branch 'master' into fix-import-context-state 2018-01-03 14:21:04 +09:00
Dean Herbert
7154efa1c6 Refresh import context on import error 2018-01-02 12:31:21 +09:00
Dean Herbert
f2d302f8dc Create a LargeTextureStore for cached (but not atlased) global textures
Also
- Fixes first transition depth being incorrect.
- Improves smoothness of transitions (and adds a slight delay to offset from screen switches).
2017-12-31 07:05:04 +09:00
Dean Herbert
3c8d30f8e6 Add a dialog offering to import beatmaps from stable 2017-12-26 00:52:11 +09:00
Dean Herbert
620e9737c3 Avoid many many unnecessary enumerations 2017-12-21 22:33:16 +09:00
FreezyLemon
e4ead36544 Added completion text 2017-12-21 13:01:14 +01:00
FreezyLemon
cbc1aacf5c Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add 2017-12-21 13:00:11 +01:00
FreezyLemon
3644eda9a9 Changed notification from "installed" to "imported" on beatmap download 2017-12-19 11:34:23 +01:00
FreezyLemon
ba614883ea used Any() instead of manually checking count == 0 (CI) 2017-12-18 11:16:57 +01:00
FreezyLemon
f898481523 Changed existing implementations to have a custom CompletionText 2017-12-18 11:14:07 +01:00
FreezyLemon
d2b80fdbfc Moved "undelete all" logic to BeatmapManager and added a progress notification 2017-12-18 10:55:07 +01:00
Dean Herbert
4c45102d61
Merge branch 'master' into undelete-button-add 2017-12-18 16:28:32 +09:00
Dean Herbert
1146ba02d7 Make GetWorkingBeatmap return a sane default rather than exception on lookup failure 2017-12-15 14:36:51 +09:00
Dean Herbert
3880c7157b
Merge branch 'master' into fix-missing-metadata 2017-12-11 16:04:08 +09:00
FreezyLemon
8cbd6f32cb Moved menu music hash property back to intro and changed check (before undeleting) to "Protected" field. 2017-12-10 11:31:37 +01:00
FreezyLemon
1691a74b14 Merge branch 'undelete-button-add' of https://github.com/freezylemon/osu into undelete-button-add 2017-12-10 11:26:31 +01:00
FreezyLemon
e1c04a1f44 Added check for "menu music beatmap hash" before undeleting so circles.osu doesn't get imported on Undelete. Also moved the const property to BeatmapManager. 2017-12-08 12:50:04 +01:00
FreezyLemon
d93a1fdaae Merge branch 'master' of https://github.com/ppy/osu into undelete-button-add 2017-12-08 10:30:42 +01:00
Dean Herbert
31884a951a Remove "redundant" parenthesis 2017-12-08 15:53:59 +09:00
Dean Herbert
2e1dfa16a2 Fix checks disallowing import of older beatmaps with no embedded online IDs 2017-12-08 14:59:32 +09:00
Dean Herbert
f2eef6621a
Merge branch 'master' into fix-missing-metadata 2017-12-07 19:23:51 +09:00
Aergwyn
ad8cd7eb5d fix possible NullReference?
AppVeyor pls?
2017-12-02 17:04:42 +01: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
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
c16925059c split parsing a beatmap and parsing a storyboard 2017-11-30 19:16:13 +01:00
Aergwyn
016057ab01 readd storyboard to beatmap + minor cleanup 2017-11-30 16:49:53 +01:00
FreezyLemon
b09ba19d3f Used the already-existing private method to undelete a mapset 2017-11-30 11:02:53 +01:00
FreezyLemon
bf386598b6 Added a new "undelete" button that restores every beatmap with "DeletePending" set to true. 2017-11-30 10:58:32 +01:00
Aergwyn
cd653c1cbc split storyboard loading into GetStoryboard() 2017-11-29 21:28:02 +01:00
Dean Herbert
2dcc3b9e74
Merge branch 'master' into fix-missing-metadata 2017-11-27 12:28:33 +09:00
Aergwyn
e3a230320a compare metdata and remove duplicate from beatmap to prevent redundant storage 2017-11-23 19:46:58 +01:00
Dean Herbert
6e51664544
Merge branch 'master' into beatmap-overlay-download 2017-11-23 17:11:28 +09:00
Aergwyn
0df5432f5e removed line that set metadata per beatmap to null 2017-11-22 21:45:18 +01:00
Aergwyn
e5dfe4ff2e Make error more verbose when beatmap import fails (#1537)
Add name of beatmap set to error message if import fails
2017-11-22 19:35:25 +09:00
Dean Herbert
8919e98d13 Fix CI issue 2017-11-20 11:32:20 +09:00
Dean Herbert
d704e9cf7e Ensure we correctly handle importing beatmaps/sets when the onlineID already exists locally 2017-11-19 01:45:17 +09:00
naoey
5aeeb9aac6 Merge remote-tracking branch 'upstream/master' into beatmap-overlay-download 2017-11-15 17:38:38 +05:30
Unknown
16e48ed187 Hook up download logic with BeatmapSetOverlay download buttons.
- Add noVideo option to DownloadBeatmapSetRequest
- Make Download fire an event with new download instead of returning it
2017-11-12 18:41:10 +05:30
smoogipoo
04b271cce9 Migrate osu.Game project to VS2017 project structure 2017-10-30 22:24:11 +09:00
Dean Herbert
4d4b505ef7 Add AsNoTracking to common read-only queries 2017-10-25 23:56:05 +09:00
Dean Herbert
195d75d045 Flip flop let's expose IEnumerables for now 2017-10-25 22:12:20 +09:00
Dean Herbert
4e1922c556 Fix query methods not using IQueryable/Expressions
No database-level where clauses were being used in many cases they should be.
2017-10-25 22:10:45 +09:00
Dean Herbert
f1f7557f6e Add importing state to download notification 2017-10-25 11:49:00 +09:00
Dean Herbert
040fa3aa15 Fix import after direct download being scheduled to update thread
Caused a stall as experienced in #1364.
2017-10-25 11:43:30 +09:00
Dean Herbert
c765785d00 Mark several long-running tasks as long-running 2017-10-25 11:42:55 +09:00
Dean Herbert
4a68dd88cb Centralise BeginTransaction and disable transaction use for now 2017-10-23 14:53:13 +09:00
Dean Herbert
29fcd210aa Centralise transaction committing 2017-10-22 16:17:40 +09:00
Dean Herbert
12900a8b15 Remove unnecessary second call to AutoTransactionsEnabled 2017-10-19 15:53:11 +09:00
Dean Herbert
b73b4755eb Ignore r# locked context inspection here 2017-10-18 18:41:04 +09:00