Dean Herbert
4c45102d61
Merge branch 'master' into undelete-button-add
2017-12-18 16:28:32 +09:00
Dean Herbert
49ce42d90c
Add ToString() overrides on many classes to make debugging easier
2017-12-16 16:14:01 +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
78dd975a35
Initial carousel infrastructue changes
2017-12-15 14:36:51 +09:00
Dean Herbert
69653c7f4f
Don't use nested ternary if
2017-12-12 13:07:34 +09:00
Dean Herbert
8dea999908
Order difficulty icons by ruleset
2017-12-11 21:35:47 +09:00
Dean Herbert
b10240d7ef
Handle the case where the selected panel is no longer a valid selection better
2017-12-11 21:31:26 +09:00
Dean Herbert
970e55fc4a
Update difficulty icons on headers to match filtered difficulties
2017-12-11 20:49:27 +09:00
Dean Herbert
f58c554d19
Add per-difficulty filtering support
...
Filters based on selected ruleset
2017-12-11 20:22:10 +09:00
Dean Herbert
3880c7157b
Merge branch 'master' into fix-missing-metadata
2017-12-11 16:04:08 +09:00
Dean Herbert
08727266e7
Merge branch 'master' into add-ruleset-shortname
2017-12-11 15:41:11 +09:00
Dean Herbert
9069f1ccba
Merge branch 'master' into most-played-beatmaps-section
2017-12-11 12:12:23 +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
Dean Herbert
679134c030
Add ShortName to rulesets
2017-12-08 18:55:25 +09: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
Aergwyn
95955d68ef
rephrased description of local context checking
2017-12-07 14:14:50 +01:00
Aergwyn
1dcbfab18e
removed redundant comment
2017-12-07 13:56:37 +01:00
Aergwyn
76c09ae59e
added comments for local context checking
2017-12-07 13:44:47 +01:00
Dean Herbert
f2eef6621a
Merge branch 'master' into fix-missing-metadata
2017-12-07 19:23:51 +09:00
Dean Herbert
2a1a9b9f1f
Fix post-merge issue
2017-12-07 17:26:39 +09:00
smoogipoo
09f54b06ac
Just don't serialize Author altogether for now
2017-12-07 15:55:22 +09:00
smoogipoo
0ba8988580
Don't serialize Author + add SerializableAttributes
2017-12-07 15:32:39 +09:00
Dean Herbert
44ee11e75f
Merge branch 'master' into fix-beatmap-carousel-lag
2017-12-07 15:30:50 +09:00
smoogipoo
f5f7658e90
Don't serialize TotalBreakTime
2017-12-07 14:40:28 +09:00
smoogipoo
dfc10d42e8
Merge remote-tracking branch 'origin/master' into beatmap-serialization
2017-12-07 12:49:27 +09:00
smoogipoo
f1dbcc4f1a
Remove misleading comments
2017-12-07 12:23:53 +09:00
smoogipoo
0e3b001b13
Make maps with storyboards decode correctly with OsuJsonDecoder
2017-12-07 10:37:51 +09:00
smoogipoo
a8db3a9484
Add progress notification to migration
2017-12-07 04:09:03 +09:00
smoogipoo
b6b26cfe25
Add basic method to migrate beatmaps to the new JSON format
2017-12-07 03:04:36 +09:00
Dean Herbert
34596b3368
Rename and comment for clarification
2017-12-06 21:47:48 +09:00
smoogipoo
ed5f7e5353
Make OsuJsonDecoder apply defaults similar to OsuLegacyDecoder
2017-12-06 16:28:34 +09:00
smoogipoo
f9e34dfa3d
Assume that control points are already sequentially-ordered
...
Fixes up deserializing.
2017-12-06 16:24:09 +09:00
Dean Herbert
04ae64e9fd
Add missing IsCompleted check to ensureValid
2017-12-06 16:20:49 +09:00
smoogipoo
887b81148d
Don't ignore RulesetId for now
2017-12-06 14:14:07 +09:00
Dean Herbert
15ed3b4aac
Fix IsValueCreated method not cecking whether the async task was completed
...
Caused potential stutters for components that relied on this check.
2017-12-06 09:49:12 +09:00
smoogipoo
d2dc7c8937
Add OsuJsonDecoder
2017-12-06 00:38:12 +09:00
smoogipoo
b584178e85
Make Beatmap ISerializable and add more JsonIgnores
2017-12-06 00:37:37 +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
db50ad794e
CI adjustments
...
- removing unnecessary `using`s
- name Fields/Methods according to rules
- removing unnecessary initializations
2017-12-01 17:58:11 +01:00
Aergwyn
806c0e3b26
restructured OsuLegacyDecoder into LegacyDecoder
...
Beatmap works, Storyboard not...
2017-12-01 17:43:33 +01:00
Dean Herbert
7532795935
Lock during validity checks
2017-12-01 22:43:49 +09:00
Aergwyn
7080711cb2
remove unnecessary using
2017-11-30 20:13:10 +01:00
Aergwyn
be018a63c6
remove unnecessary lines
2017-11-30 19:17:11 +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
jorolf
22403cac89
Merge branch 'master' of git://github.com/ppy/osu into most-played-beatmaps-section
2017-11-29 23:09:04 +01:00
Aergwyn
96f5bd3323
remove Storyboard from Beatmap, add it to WorkingBeatmap
2017-11-29 21:54:04 +01:00
Aergwyn
cd653c1cbc
split storyboard loading into GetStoryboard()
2017-11-29 21:28:02 +01:00
Dean Herbert
d402222f17
Fix DisposeTrack and improve AsyncLazy to support disposal
2017-11-30 05:05:07 +09:00
smoogipoo
267bb75458
Merge remote-tracking branch 'Aergwyn/master' into netstandard
2017-11-29 23:45:29 +09:00
smoogipoo
a9cc156d7a
Merge remote-tracking branch 'origin/master' into performance-calculator
2017-11-28 21:38:26 +09:00
Dean Herbert
23b4d2163c
Fix spelling and grammar
2017-11-28 21:30:03 +09:00
Dean Herbert
bd88df2722
Add note about sequential execution of ConvertHitObject
2017-11-28 18:33:41 +09:00
Aergwyn
c058065a3a
remove unnecessary using
2017-11-27 20:24:01 +01:00
Aergwyn
d87235a289
prevent inserting duplicate metadata
2017-11-27 20:08:16 +01:00
Dean Herbert
7877f42763
Merge remote-tracking branch 'upstream/master' into new-sounds-and-more
2017-11-27 17:59:24 +09:00
Dean Herbert
2dcc3b9e74
Merge branch 'master' into fix-missing-metadata
2017-11-27 12:28:33 +09:00
Dean Herbert
f189de437a
Simplify blending assignment
2017-11-27 10:01:44 +09:00
Unknown
ae55d392de
only use == for comparion on primitive types
2017-11-26 19:37:46 +01:00
Dean Herbert
9c90d9ca45
Add panel hover effects
2017-11-26 17:21:23 +09:00
Dean Herbert
4067b6129b
Add visual highlighting on song select panel hover
...
Prerequisite for adding hover sound effects. Didn't feel right without this change.
2017-11-26 17:14:13 +09:00
Unknown
5da1466e28
requested changes
...
use IEquatable<T> instead of overriding Equals and `==` operator for primitive types.
2017-11-25 15:05:59 +01:00
jorolf
a1cc18f98c
Merge branch 'master' into most-played-beatmaps-section
2017-11-24 22:51:11 +01:00
jorolf
21d5d10738
replace BeatmapResponse with BeatmapInfo
2017-11-24 22:48:56 +01:00
Aergwyn
e3a230320a
compare metdata and remove duplicate from beatmap to prevent redundant storage
2017-11-23 19:46:58 +01:00
Dean Herbert
2f3e4a27c6
Merge branch 'master' into improve-user-ratings-calculations
2017-11-23 20:55:55 +09:00
Dean Herbert
4986ad73f7
Merge remote-tracking branch 'upstream/master' into load-optimization
2017-11-23 18:44:17 +09:00
Dean Herbert
d93911ae97
Improve user ratings calculations to make more sense
...
Closes #1552 .
2017-11-23 18:10:08 +09:00
FreezyLemon
2cc2323791
Style changes (removing newline from before second constructor parameter)
2017-11-23 09:12:23 +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
jorolf
22348a3d67
Merge branch 'master' of git://github.com/ppy/osu into most-played-beatmaps-section
2017-11-22 21:14:11 +01:00
FreezyLemon
7d428875b8
Changed LoadWrapper back to DelayedLoadWrapper and fixed the implementation (dependent on framework change, delay now in ctor)
2017-11-22 15:46:04 +01:00
smoogipoo
de7c571be3
Merge remote-tracking branch 'origin/master' into netstandard
2017-11-22 19:46:17 +09: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
517a9ec40f
Merge branch 'master' into async-beatmap-panels
2017-11-22 19:05:42 +09:00
FreezyLemon
870807c265
Switched over to the new LoadWrapper class for all delayed loading.
2017-11-21 16:17:33 +01:00
Dean Herbert
5e70b7a9f7
Add async load methods for WorkingBeatmap properties
2017-11-21 22:34:53 +09:00
Dean Herbert
2603219350
Load beatmap carousel panels asynchronously
2017-11-21 22:30:09 +09:00
smoogipoo
f9ad4b6acb
Make categoryDifficulties return doubles to improve decimal accuracy
2017-11-21 19:55:09 +09:00
smoogipoo
b3bf6e7bee
Merge master into netstandard
2017-11-21 16:39:21 +09:00
Dean Herbert
4f6263ef86
Make many internal classes and methods public
...
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
smoogipoo
aac41d2de6
Disable resharper inspections on case-by-case basis
2017-11-20 18:55:48 +09:00
Dean Herbert
8919e98d13
Fix CI issue
2017-11-20 11:32:20 +09:00
jorolf
fe7f9cccaa
BeatmapSetCover can display other types of covers now
2017-11-19 14:16:00 +01:00
smoogipoo
d2ab0621f3
Make osu.Game + rulesets compile with netstandard
2017-11-19 13:46:51 +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
smoogipoo
ddf402d948
Add nullchecks in Disposal where population methods return nulls
2017-11-17 22:14:28 +09:00
smoogipoo
4ced1b6490
Use more of the properties
2017-11-17 22:10:24 +09:00
Dean Herbert
6b591ac77f
Add missing initialisation
2017-11-17 19:17:00 +09:00
Dean Herbert
d75e3d8e81
Use lazy for WorkingBeatmap component loading
2017-11-17 18:37:46 +09:00
smoogipoo
95fd323c6b
Fix ManiaDifficultyCalculator possibly failing due to nullref
2017-11-17 14:37:06 +09:00
smoogipoo
ac6213d1fa
CI fixes
2017-11-17 14:26:33 +09:00
smoogipoo
7892eefd68
Fix up mod application + beatmap/hitobject references
2017-11-17 14:23:52 +09:00
smoogipoo
cc1720241e
Fix DifficultyCalculator using incorrect mods
2017-11-17 12:36:51 +09:00
smoogipoo
5781b45b39
Set TimeRate after mod application
2017-11-17 12:36:17 +09:00
smoogipoo
18f2e92a48
Rework mod applications to hitobject/rulesetcontainer for DifficultyCalculator
2017-11-17 12:36:13 +09:00
smoogipoo
62155e6dd5
Make DifficultyCalculator support mod applications
...
Fixes https://github.com/ppy/osu/issues/476 .
2017-11-17 12:36:07 +09:00
naoey
5aeeb9aac6
Merge remote-tracking branch 'upstream/master' into beatmap-overlay-download
2017-11-15 17:38:38 +05:30
Dean Herbert
6933a41b75
Add back high resolution cover regressions
2017-11-15 13:26:02 +09:00
Dean Herbert
6ef60d0b4e
Merge branch 'master' into beatmap-overlay-scores
2017-11-15 13:18:32 +09:00
smoogipoo
cd8d7af9db
Clean up a few warnings in preparation for net-standard
2017-11-14 13:06:25 +09:00
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
EVAST9919
7280f77a02
Trim whitespace
2017-11-10 03:06:21 +03:00
EVAST9919
c2f3971188
Extend Beatmap Set Response
2017-11-10 03:01:11 +03:00
Miterosan
567cd6316c
beatmap can not be null in DifficultyColouredContainer.cs
2017-11-07 23:17:45 +01:00
Miterosan
b2e49c1e71
line can not be null in OsuLegacyDecoder.cs
2017-11-07 23:17:26 +01:00
Miterosan
13e75780d7
beatmap and stream can not be null in OsuLegacyDecoder.cs
2017-11-07 23:17:07 +01:00
Miterosan
1e6f1d07d2
line can not be null in OsuLegacyDecoder.cs
2017-11-07 23:16:42 +01:00
Miterosan
a15ab785f2
palette can not be null in DifficultyColouredContainer.cs
2017-11-07 23:16:19 +01:00
Miterosan
36ce287b88
panels can not be null in BeatmapSetHeader.cs
2017-11-07 23:15:51 +01:00
Miterosan
0f539d24f0
Localisation can not be null in BeatmapSetHeader.cs
2017-11-07 23:15:21 +01:00
Miterosan
dc317139c9
beatmap can not be null in BeatmapSetHeader.cs
2017-11-07 23:15:02 +01:00
Miterosan
bc94179032
workingbeatmap can not be null in BeatmapBackgroundSprite.cs
2017-11-07 23:14:22 +01:00
Miterosan
d7dee57886
set can not be null in BeatmapSetCover.cs
2017-11-07 23:13:56 +01:00
Miterosan
dd3874daa8
beatmap can not be null in BeatmapPanel.cs
2017-11-07 23:13:32 +01:00
Miterosan
289a1346fc
beatmap can not be null in DifficultyIcon.cs
2017-11-07 23:13:09 +01:00
Miterosan
a8acea9cdb
stream can not be null in BeatmapDecoder.cs
2017-11-07 23:12:30 +01:00
Miterosan
8dc24a52a7
beatmap and line can not be null in OsuLegacyDecoder.cs
2017-11-07 23:11:33 +01:00
Miterosan
d27dced3af
beatmap and line can not be null in OsuLegacyDecoder.cs
2017-11-07 23:11:16 +01:00
Miterosan
34083baa4d
beatmap and line can not be null in OsuLegacyDecoder.cs
2017-11-07 23:11:04 +01:00
Miterosan
0287d3d7a0
beatmap and line can not be null in OsuLegacyDecoder.cs
2017-11-07 23:10:54 +01:00
Miterosan
cf296d4bb2
beatmap and line can not be null in OsuLegacyDecoder.cs
2017-11-07 23:10:41 +01:00
Miterosan
2f47b336e2
beatmap and line can not be null in OsuLegacyDecoder.cs
2017-11-07 23:10:30 +01:00
Miterosan
080c3fabba
BeatmapSet and manager can not be null in BeatmapGroup.cs
2017-11-07 23:10:06 +01:00
Miterosan
1f620886cb
beatmap and line can not be null in OsuLegacyDecoder.cs
2017-11-07 23:09:16 +01:00
Miterosan
840946d160
list can not be null in ControlPointInfo.cs
2017-11-07 23:08:24 +01:00
smoogipoo
04b271cce9
Migrate osu.Game project to VS2017 project structure
2017-10-30 22:24:11 +09:00
Dean Herbert
b89112c2a1
Fix incorrect alignment
2017-10-25 23:56:18 +09:00
Dean Herbert
4d4b505ef7
Add AsNoTracking to common read-only queries
2017-10-25 23:56:05 +09:00
Dean Herbert
e62928102c
Merge remote-tracking branch 'upstream/master' into user-iqueryable
2017-10-25 23:49:56 +09:00
Dan Balasescu
e2ee76332f
Merge branch 'master' into fix-threaded-context-issues
2017-10-25 23:30:28 +09:00
Dean Herbert
2d0f4d3859
Fix OnlineBeatmapSetID not being correctly populated
2017-10-25 22:14:16 +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
5001e9f264
Fix Hide/Restore/Delete etc.
2017-10-25 22:08:34 +09:00
Dan Balasescu
d927e57af6
Merge branch 'master' into fix-direct-import-stall
2017-10-25 21:48:27 +09:00
Dan Balasescu
946288ba2e
Merge branch 'master' into fix-direct-import-stall
2017-10-25 21:46:00 +09:00
Dan Balasescu
05e1a7a5f8
Merge branch 'master' into online-beatmap-id-sanity
2017-10-25 21:38:33 +09:00
TocoToucan
5107489cda
Remove DatabaseBackedStore Reset functions
2017-10-25 15:12:14 +03:00
TocoToucan
63fe569afa
Remove DatabaseBackedStore Prepare functions
2017-10-25 14:53:20 +03:00
Dean Herbert
66f1d2fb2e
Ensure all parsed "Online" IDs are above zero or null
...
Some .osu file sources (or database sources) may be in a bad state. We want to get these ones right as they cannot be enforced by the database itself (via FKs or constraints).
2017-10-25 14:34:39 +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
e7931ef4c7
Add a default icon when a ruleset isn't present
2017-10-23 17:32:28 +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
980a6c93b4
Merge branch 'master' into fix-ef-hiding
2017-10-20 14:24:46 +09:00
Dean Herbert
93b2fc6dc5
Fix issues with deletion
...
Main fix is avoiding nullrefs being thrown when metadata isn't present on a beatmap (quite a common scenario).
2017-10-20 11:18:08 +09:00
Dean Herbert
7f83cf6780
Fix hiding not always working
...
Because we are not sharing a single context, we need to use Update to attach the entity to the local context.
2017-10-20 11:16:45 +09:00
Dean Herbert
f7d0df1743
Fix beatmap difficulty and metadata deletion
2017-10-19 17:50:46 +09:00
Dean Herbert
12900a8b15
Remove unnecessary second call to AutoTransactionsEnabled
2017-10-19 15:53:11 +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
b73b4755eb
Ignore r# locked context inspection here
2017-10-18 18:41:04 +09:00
Dean Herbert
668f68dd63
Remove some unnecessary update calls
2017-10-18 18:27:57 +09:00
Dean Herbert
4841d4a937
Fix deletion and use single context for imports and deletions for now
2017-10-18 18:27:17 +09:00
Dean Herbert
cf5290fead
Remove unnecessary locking; operations are now thread-safe
2017-10-18 13:48:15 +09:00
Dean Herbert
4193004fbf
Improve performance of imports by keeping a context hot
2017-10-17 20:29:47 +09:00
Dean Herbert
e4a066dc5f
Run cleanup tasks only on startup via manual calls
2017-10-17 19:58:33 +09:00
Dean Herbert
b9d0fb96ed
Fix cascade deletions
2017-10-17 18:26:28 +09:00
Dean Herbert
7a18d373ec
Improve performance of beatmap imports (still needs revision)
2017-10-17 17:08:42 +09:00
Dean Herbert
cf3881b18c
Fix not being able to restore hidden beatmaps via context menu
2017-10-17 15:50:52 +09:00
Dean Herbert
e487b6f82a
Standardise context retrieval
2017-10-17 15:50:42 +09:00
Dean Herbert
cd41862e3b
Add back transaction support for beatmap importing
2017-10-17 15:00:27 +09:00
Dean Herbert
66894d11ea
Connection -> context
2017-10-17 12:46:29 +09:00
Dean Herbert
c92e0e2dc1
Fix username display on beatmap panels
2017-10-17 11:24:59 +09:00
Dean Herbert
31dc5c97f2
Fix intro and duplicate inserts
2017-10-17 11:22:42 +09:00
Dean Herbert
81476ebe75
Correct and simplify BeatmapStore and BeatmapManager
2017-10-17 10:17:21 +09:00
Dean Herbert
e378d0685d
Remove weird additions
2017-10-16 20:37:10 +09:00
Dean Herbert
acc299c7b9
Correct and simplify RulesetStore
2017-10-16 17:02:31 +09:00
Dean Herbert
7049a73490
Remove ValidTypes from databased stored; explicitly expose query methods instead
2017-10-16 14:47:33 +09:00
Dean Herbert
0a6dcdd405
Fix remaining warnings
2017-10-16 13:09:10 +09:00
Dean Herbert
8a0b184dd6
Revert "Return back DatabaseBackedStore's query and populate functions"
...
This reverts commit 7cf5d63cd3
2017-10-16 12:59:59 +09:00
Dean Herbert
04e5f764a3
Revert "Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects"
2017-10-16 12:59:59 +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
TocoToucan
db2750592d
Fix removal of FileInfo, BeatmapMetadata, BeatmapDifficulty objects
2017-10-15 14:01:35 +03:00
TocoToucan
7cf5d63cd3
Return back DatabaseBackedStore's query and populate functions
2017-10-15 00:40:41 +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
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
cd722e4abb
Fix beatmap author being stored in two different places
2017-10-14 11:39:55 +09:00
Dean Herbert
520b806305
Merge remote-tracking branch 'upstream/master' into ranks-section
2017-10-13 18:49:05 +09:00
Dean Herbert
8a5e25ce4b
Simplify waveform construction
2017-10-12 19:19:42 +09:00
smoogipoo
df6409308a
Merge remote-tracking branch 'origin/master' into editor-waveform-timeline
...
# Conflicts:
# osu-framework
2017-10-12 15:32:11 +09:00
Huo Yaoyuan
cf7f3411fc
Ignore filename case in BeatmapManager. Fixes #1295 .
2017-10-11 15:01:02 +08:00
TocoToucan
4653470779
Fix RulesetStore preparation
2017-10-10 22:29:16 +03:00
TocoToucan
8b01f8671f
Merge from ppy/master
2017-10-10 21:07:36 +03:00
smoogipoo
b8d2a04fe1
Only split beatmap lines twice
2017-10-10 19:24:24 +09:00
smoogipoo
ad344eb719
Use IsNullOrWhiteSpace instead of trimming
2017-10-10 19:21:38 +09:00
TocoToucan
cbae19b604
Fix BeatmapMetadata removing
2017-10-10 00:17:12 +03:00
TocoToucan
ef417c6388
Small DB-related refactoring
2017-10-09 23:30:32 +03:00
TocoToucan
41a90c8b11
Add missing eager loading
2017-10-09 23:28:28 +03:00
smoogipoo
29c2a29798
Fix trimming too early in OsuLegacyDecoder crashing storyboards
2017-10-09 18:47:12 +09:00
smoogipoo
b97b575b27
Merge remote-tracking branch 'origin/master' into editor-waveform
...
# Conflicts:
# osu-framework
2017-10-09 17:20:24 +09:00
smoogipoo
19b38983df
Update in-line with framework
2017-10-09 17:18:11 +09:00
TocoToucan
81b9e08fb6
Fix foreign key constraint failure
2017-10-09 00:30:52 +03:00
Bang Sunghwan
bd9f2db477
Trim line
2017-10-08 17:30:21 +09:00
Bang Sunghwan
6c5c734ff1
Trim end of line
...
Fix ArgumentOutOfRangeException when parsing http://osu.ppy.sh/osu/1004136
2017-10-08 09:42:09 +09:00
smoogipoo
d3109a5950
Hook up BeatmapPanel "Edit" item
2017-10-07 00:59:14 +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
EVAST9919
aafead5057
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-10-03 01:34:42 +03:00
Dean Herbert
12a9cbad56
Allow Beatmap to populate some metadata defaults if they aren't provided via BetamapInfo
2017-10-02 21:54:26 +08:00
EVAST9919
3cd6319ffa
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-27 00:32:38 +03:00
Dan Balasescu
b8b54e95a5
Merge branch 'master' into editor-timing-timeline
2017-09-26 15:54:01 +09:00
smoogipoo
d86e81f07c
Better expression to avoid invalid values
2017-09-25 18:00:52 +09:00
smoogipoo
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
Jorolf
72141935e8
make pagination work and remove duplication in RanksSection
2017-09-21 22:07:23 +02:00
DrabWeb
cb4818e84e
Merge https://github.com/ppy/osu into online-beatmap-set-overlay
2017-09-21 14:25:34 -03:00
smoogipooo
6a9572db6c
Merge branch 'master' into editor-timing-timeline
...
# Conflicts:
# osu-framework
2017-09-20 16:19:08 +09:00
EVAST9919
1b0ab414fa
Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three
2017-09-19 17:23:10 +03:00
smoogipooo
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
Dean Herbert
3000323727
Give WorkingBeatmap's Metadata a non-null default
2017-09-19 21:41:18 +09:00
Dean Herbert
4b0eee2bcc
Merge remote-tracking branch 'upstream/master' into merge-projects
2017-09-19 20:43:20 +09:00
Dean Herbert
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
Dean Herbert
6d3d485565
And then everything became one
2017-09-19 16:06:58 +09:00
Damnae
5a76ed4000
Fix LegacyFilesystemReader Filenames property.
2017-09-18 10:14:29 +02:00
ColdVolcano
8944d0f705
make it only look for files instead of directories
2017-09-16 18:44:32 -05:00
ColdVolcano
47b62803d8
Account for all files instead of just the main directory ones
2017-09-15 15:47:56 -05:00
EVAST9919
740e766201
BreakOverlay and LetterboxOverlay implementation
2017-09-15 19:39:55 +03:00
Dean Herbert
02fa9eeb3b
Merge branch 'master' into online-beatmap-set-overlay
2017-09-14 16:52:44 +09:00
Dean Herbert
33d33a49ae
Merge branch 'master' into storyboards
2017-09-14 16:06:19 +09:00
Dean Herbert
b1145272d1
Update code to support new inspectcode analysis rules
2017-09-14 12:58:32 +09:00
Dean Herbert
b78c516b74
Merge branch 'master' into scoring-revamp
2017-09-13 20:47:14 +09:00
Damnae
bab3ef0669
Rename storyboard classes.
2017-09-13 11:22:24 +02:00
smoogipooo
5e32d95ad2
Remove Ruleset's CreateScoreProcessor method
2017-09-13 16:37:05 +09:00
DrabWeb
ba90fc87d0
Merge https://github.com/ppy/osu into online-beatmap-set-overlay
2017-09-12 23:41:57 -03:00
DrabWeb
97e5a0d4a3
CI fixes.
2017-09-12 23:41:10 -03:00
Dean Herbert
1de1b882e3
Fix BeatmapInfo's comparator when not being sourced from database
2017-09-13 10:36:58 +09:00
DrabWeb
08b5d4e16c
Merge https://github.com/ppy/osu into online-beatmap-set-overlay
2017-09-12 21:26:06 -03:00
Damnae
58e65397b0
Add support for storyboards using numerical values.
2017-09-12 10:13:55 +02:00
Dean Herbert
5b9d906ad5
Improve beatmap track disposal logic
...
- [ ] Depends on https://github.com/ppy/osu-framework/pull/1035
2017-09-12 16:56:46 +09:00
Damnae
47cd1d486b
Merge branch 'master' into storyboards
2017-09-11 12:29:19 +02:00
Damnae
9eaa1cb5cd
Fix sprites not being visible when all their commands are inside loops.
2017-09-11 12:06:00 +02:00
Dean Herbert
18ad0956b4
Merge branch 'master' into maybefix
2017-09-11 18:23:00 +09:00
DrabWeb
4be8899fb2
Move Length to BeatmapOnlineInfo.
2017-09-11 02:55:32 -03:00
DrabWeb
43fa314fe0
Details and more data displaying.
2017-09-11 02:48:48 -03:00
