Dean Herbert
b8022070e8
Merge remote-tracking branch 'upstream/master' into beatmap-as-a-skin
2018-03-22 16:24:56 +09:00
Dean Herbert
7bdca0ff39
Merge remote-tracking branch 'upstream/master' into accent-colour-properties
2018-03-22 15:07:28 +09:00
Dean Herbert
e39b7b8d35
Don't hard-crash when an unknown section is encountered in a legacy file
2018-03-22 12:58:02 +09:00
Dean Herbert
504c3ff0ba
BeatmapSkin -> LegacyBeatmapSkin
2018-03-22 12:50:48 +09:00
Dean Herbert
78a8f60b39
IHasComboIndex -> IHasComboInformation
2018-03-22 12:35:17 +09:00
Dean Herbert
d1c2aa71d0
Add beatmap sample override support
2018-03-20 16:24:06 +09:00
Dean Herbert
9a0fc9e29a
Move combo colours completely out of beatmap
2018-03-20 16:24:06 +09:00
Dean Herbert
dbcf755618
Make Beatmaps parsable as skins
2018-03-20 16:05:29 +09:00
Dean Herbert
c38c26eacb
Move combo index processing to BeatmapProcessor
2018-03-20 15:57:43 +09:00
Dean Herbert
62e908e22c
Add default separator character
2018-03-19 20:06:44 +09:00
Dean Herbert
1d7be2ad0b
Fix incorrect variable name
2018-03-14 10:14:42 +09:00
Dean Herbert
16eab2eebf
Fix combo colours not working until now
2018-03-13 19:19:08 +09:00
Dean Herbert
e43de68ad3
Move colour parsing to LegacyDecoder
2018-03-13 19:13:50 +09:00
Dean Herbert
d6fa7d69d7
Add missing fonts section
2018-03-13 16:13:07 +09:00
Dean Herbert
8cbcdeb665
Merge branch 'master' into mania-difficulty
2018-03-12 14:07:14 +09:00
Dean Herbert
9f644571ea
Merge branch 'master' into mania-difficulty
2018-03-12 13:31:48 +09:00
smoogipoo
81186f8423
Apply beatmap converter mods in DifficultyCalculator
2018-03-12 13:06:42 +09:00
Dean Herbert
1bcda4930e
Add back beatmap version set
2018-03-12 11:33:12 +09:00
Dean Herbert
217dd2ecdc
Initial push for better decoders
2018-03-09 21:24:15 +09:00
Dean Herbert
70a16667b6
Fix difficulty calculator regression when applying mods
2018-03-08 12:57:36 +09:00
Dean Herbert
7b18e8a5ca
Merge branch 'master' into fix-taiko-conversion
2018-03-06 01:16:47 +09:00
smoogipoo
d44dc1a4f9
Fix SliderMultiplier/SliderTickRate parsing inaccuracy
2018-03-05 16:01:05 +09:00
Dean Herbert
e46f363fdc
Fix failing unit test
2018-03-04 22:46:50 +09:00
Dean Herbert
bc0bc8d459
Add legacy timing offsets
...
These have been in release builds since January, but implemented in a hacky way.
This brings them with a sane implementation.
2018-03-04 21:57:50 +09:00
smoogipoo
a2c239d5e3
Rename to IBeatmapConverter, move to separate file
2018-03-02 20:19:47 +09:00
smoogipoo
797d03a65f
Implement basic structure for beatmap conversion testing
2018-03-02 13:13:00 +09:00
Dean Herbert
b8ea4b11ab
Adjust range further
...
This is not a great idea.
2018-03-01 00:39:59 +09:00
Dean Herbert
572d3b1316
Move bpm clamping to TimingControlPoint, adjust range to 1-10000bpm
...
In line with stable editor restrictions
2018-02-28 22:53:28 +09:00
Dean Herbert
5b4fef0180
Add bare minimum sanity checking of beatmap input values to make broken maps load
...
Resolves ppy/osu#1988 .
2018-02-28 18:12:24 +09:00
Dean Herbert
968291c61e
Sort hitobjects imported from legacy beatmps
...
Apaprently some ranked maps contain unordered hitobjects. We probably never want to allow for this.
2018-02-28 18:11:28 +09:00
Dean Herbert
6f44db6de0
Clamp at DifficultyControlPoint
...
This is what stable did.
2018-02-28 18:10:38 +09:00
Dan Balasescu
34f76a4136
Merge branch 'master' into storyboard-improvements
2018-02-19 15:40:09 +09:00
Dean Herbert
a7915e7041
Fix typo
2018-02-19 14:00:48 +09:00
Dean Herbert
21b641b302
Give storyboards a BeatmapInfo to reduce weird method calls
...
Also removes unnecessary background texture (the actual storyboard background spec wasn't implemented correctly anyway).
2018-02-16 12:09:23 +09:00
Dean Herbert
1b13be1372
Cleanups and xmldoc additions
2018-02-15 16:24:14 +09:00
Dean Herbert
8c1d581fb3
Fix hiding beatmaps not refreshing correctly
2018-02-15 16:15:40 +09:00
Dean Herbert
89cf794f98
Add a lower level ConsumableItems implementation
2018-02-15 16:15:40 +09:00
Dean Herbert
d3dd31dadb
Make deletion and purging logic even more global
2018-02-15 14:22:39 +09:00
Dean Herbert
d340509b1d
Move ArchiveReaders to a more global namespace
...
Also moves delete and action logic to a shared implementation
2018-02-15 14:22:39 +09:00
Dean Herbert
6ff63c2f0c
Move deletion to ArchiveModelImportManager
2018-02-15 14:22:39 +09:00
Dean Herbert
d8f84fcca3
Give ArchiveReader a filename
2018-02-15 14:22:39 +09:00
Dean Herbert
e0d28564d0
Move import logic to shared implementation
2018-02-15 14:22:39 +09:00
Dean Herbert
86acc84988
Apply formatting
2018-02-13 20:23:51 +09:00
Dean Herbert
5ecb77fda7
Merge remote-tracking branch 'upstream/master' into default-approachrate
2018-02-13 20:23:01 +09:00
Dean Herbert
8c42225646
Fix outdated xmldoc
2018-02-13 15:08:51 +09:00
Dean Herbert
3561326306
Remove fixed issue
2018-02-13 14:54:46 +09:00
Dean Herbert
e8e093d6f2
Fix incorrect xmldoc
2018-02-13 14:54:01 +09:00
Dean Herbert
a738664167
Add interface for database context factory
2018-02-12 23:10:05 +09:00
Dean Herbert
8b37fde15b
Only write when writes occur
...
Also add finaliser logic for safety. Also better threading. Also more cleanup.
2018-02-12 19:57:21 +09:00
Dean Herbert
edc3638175
DatabaseWriteUsage
2018-02-12 17:55:11 +09:00
Dean Herbert
721bb7e4dd
Add proper handling for OnlineBeatmapSetID conflicts
...
Not yet working
2018-02-09 21:31:33 +09:00
Dean Herbert
a1513351c0
Add missing licence header
2018-02-09 20:35:54 +09:00
Dean Herbert
d547caa04e
Further improve xmldoc
2018-02-09 19:44:17 +09:00
Dean Herbert
867b1b5f65
Move public methods up
2018-02-09 19:39:02 +09:00
Dean Herbert
c84cb0b33c
Fix/add some xmldoc
2018-02-09 19:32:28 +09:00
Dean Herbert
db654004b7
Move BeatmapManagerWorkingBeatmap to its own file
2018-02-09 19:32:18 +09:00
Dean Herbert
fb6dc922c6
Reorder file
2018-02-09 19:25:55 +09:00
Dean Herbert
c7de79caf6
Remove storage class variable
2018-02-09 19:24:17 +09:00
Dean Herbert
5e0cb9d4b9
Simplify beatmap store retrieval
2018-02-09 19:12:29 +09:00
Dean Herbert
a166932468
Add deletion test
2018-02-09 17:51:29 +09:00
Dean Herbert
3b7018fcd6
Simplify beatmap import process
2018-02-09 17:22:48 +09:00
Bang Sunghwan
3894622ddc
Remove redundant initializing field by default
2018-02-09 09:55:02 +09:00
Bang Sunghwan
f20e3ff31d
Fix ApproachRate setting only DEFAULT_DIFFICULTY
2018-02-09 09:45:43 +09:00
Bang Sunghwan
cc6114b344
Fix ApproachRate not inheriting OverallDifficulty when it is undefined
2018-02-09 09:31:19 +09:00
smoogipoo
b500b76407
Merge branch 'master' into update-branch
2018-02-08 23:35:48 +09:00
smoogipoo
17aa915c77
Rename DifficultyRange parameters
2018-02-08 13:57:45 +09:00
smoogipoo
e45b26c742
Cleanup/minify HitWindows
2018-02-02 19:35:44 +09:00
james58899
fa800f0977
fix storyboard path
2018-01-23 18:18:54 +08:00
Dean Herbert
a931d6e381
Merge branch 'master' into fix-user-download-cancel
2018-01-22 16:27:26 +09:00
Dean Herbert
53e40a77dc
Don't show error messages when a download is user-cancelled
...
Resolves #1941 .
2018-01-22 13:25:49 +09:00
Dean Herbert
88beee2d1f
Keep downloads active until their associated import operation finishes
...
This avoids race conditions where a second download can potentially be started while the first is still active.
2018-01-22 13:20:04 +09:00
smoogipoo
d8275c4f9b
Fix beatmap query not including beatmap files
2018-01-16 18:20:46 +09:00
Aergwyn
ae1adfd2f2
remove unnecessary empty lines
...
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
Dan Balasescu
86581b6451
Remove extra braces
2018-01-11 17:02:09 +09:00
james58899
4fa038aa27
if not storyboard file
2018-01-11 13:53:41 +08:00
james58899
fbffc8bb89
fix load storyboard in osu file
2018-01-10 18:55:04 +08:00
Dean Herbert
58626e3b30
Allow rulesets to create their own instantiation info
2018-01-10 17:04:07 +09:00
Dean Herbert
4c0259a040
Merge branch 'master' into fix-storyboard-variables
2018-01-09 11:50:03 +09:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
smoogipoo
af86220dcc
Merge remote-tracking branch 'origin/master' into update-branch
2018-01-05 12:08:50 +09:00
Dean Herbert
01038bd9bb
Merge branch 'master' into mania-rc-cleanup
2018-01-05 10:18:15 +09:00
smoogipoo
5eb2dc3d64
Cleanup some possible CI errors
...
Not sure why these aren't being detected on master right now - they should be...
2018-01-05 01:20:24 +09:00
smoogipoo
36e9232472
Merge master into netstandard
2018-01-05 00:42:48 +09:00
james58899
0158246ba1
AppVeyor
2018-01-04 19:23:00 +08:00
james58899
dcc4e863ab
move variables to StoryboardDecoder
2018-01-04 19:04:52 +08:00
james58899
89fe567496
use FileSafety.PathSanitise
2018-01-03 17:57:24 +08:00
smoogipoo
bd171926d6
Remove AvailableColumns from ManiaRulesetContainer
...
Also restructures with the addition of a ManiaBeatmap which holds definitions for "groups" of columns. At the moment these are empty save for a "Column" property, but can be expanded in the future, maybe.
2018-01-03 18:44:25 +09:00
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
smoogipoo
7a793eaded
Merge master into netstandard
2017-12-27 20:48:53 +09:00
smoogipoo
ddee9e992a
Merge remote-tracking branch 'origin/master' into proper-taiko-hitsounds
2017-12-27 13:04:10 +09:00
smoogipoo
b95d7fc2cd
Revert "Make ControlPointInfo return a set default control point"
...
This reverts commit 3113a55a98
.
2017-12-27 12:41:59 +09:00
Dean Herbert
3182c22c7d
Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info
2017-12-26 20:36:22 +09:00
smoogipoo
d479955e20
Fix spelling error
2017-12-26 20:01:02 +09:00
smoogipoo
3113a55a98
Make ControlPointInfo return a set default control point
2017-12-26 19:33:01 +09:00
smoogipoo
836d807f4f
Give SampleControlPoint a 100% volume by default
2017-12-26 19:32:20 +09:00
Dean Herbert
3c8d30f8e6
Add a dialog offering to import beatmaps from stable
2017-12-26 00:52:11 +09:00
Dean Herbert
9ca03c0209
Simplify and tidy sample retrieval
...
Less static weirdness
2017-12-23 16:46:02 +09:00
Dean Herbert
5026c7a95e
SoundControlPoint -> SampleControlPoint
2017-12-23 16:34:34 +09:00
Aergwyn
ed827d5424
more visual tests for BeatmapInfoWedge
...
also fix Author showing when not wanted
2017-12-22 12:33:52 +01:00
Dan Balasescu
a3d947301b
Merge branch 'master' into beatmap-serialization
2017-12-22 07:38:05 +09:00
Dean Herbert
620e9737c3
Avoid many many unnecessary enumerations
2017-12-21 22:33:16 +09:00
smoogipoo
866d1c6e0f
Remove now unused references
2017-12-21 22:13:18 +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
smoogipoo
b2c0b013aa
Remove migration setting in favour of export option in the editor
2017-12-21 19:56:12 +09:00
smoogipoo
a3fcc0b60c
Back to using SortedLists
2017-12-21 19:40:41 +09:00
smoogipoo
cb7e192aff
Determine SampleInfo defaults in DrawableHitObject
2017-12-21 16:02:33 +09:00
smoogipoo
58859f2ffb
Rework registration/instantiation of decoders to not rely on reflection
2017-12-21 15:34:00 +09:00
smoogipoo
22f8853f49
Serialize star difficulty for now
2017-12-21 14:44:51 +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
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
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
DrabWeb
e61ab72c0d
Merge https://github.com/ppy/osu into online-beatmap-set-overlay
2017-09-11 01:24:52 -03:00
Damnae
bc01d9a1b0
Animate Additive / FlipH and FlipV.
2017-09-09 15:41:56 +02:00
naoey
0c2bad1de4
Get rid of some properties and todos.
2017-09-09 12:44:27 +05:30
naoey
d12a5e927a
Rename property.
2017-09-09 11:03:25 +05:30
naoey
e67606e203
Return existing download if it exists.
2017-09-09 10:25:28 +05:30
naoey
5f5dd54f9d
Use a List instead of a Dictionary.
2017-09-09 09:56:01 +05:30
DrabWeb
ecd6994d74
Added favourite/download buttons and author info.
2017-09-08 19:17:39 -03:00
Damnae
12de737084
Merge branch 'master' into storyboards
...
# Conflicts:
# osu.Game/Beatmaps/Beatmap.cs
2017-09-08 21:46:34 +02:00
Damnae
57e53ff03a
Fix diff-specific storyboard content being lost after loading.
2017-09-08 21:36:30 +02:00
naoey
5a3814b02e
XMLdoc fixes and a cautionary check.
2017-09-09 01:04:55 +05:30
naoey
00306b6e38
Maintain download progress between switching result views.
...
- Check for existing download requests on creating DirectPanel
- Actually remove downloaded beatmap from results
2017-09-09 00:57:48 +05:30
naoey
20f93c83d6
Make downloads happen in BeatmapManager.
2017-09-09 00:57:40 +05:30
Dean Herbert
9b790157d8
Merge branch 'master' into non-null-beatmap
2017-09-08 23:33:03 +09:00
Damnae
6cde687d87
Fix V commands parsing.
2017-09-08 12:36:13 +02:00
Damnae
13322b4293
Improve compatibility with older storyboards.
2017-09-08 12:09:45 +02:00
Dean Herbert
a528173943
Ensure that WorkingBeatmap's Beatmap is never null
...
Also ensures some extra fields inside Beatmap have non-null defaults.
2017-09-08 19:05:14 +09:00
Damnae
e547416193
Storyboards implementation.
2017-09-08 09:08:52 +02:00
MrTheMake
a7f874e5b6
Merge branch 'master' into leaderboard-scores
2017-09-07 18:25:33 +02:00
Dean Herbert
af0eaab78c
maybe fix
2017-09-07 01:46:07 +09:00
Dean Herbert
968c61902a
Merge branch 'master' into new-menus
2017-09-05 23:42:33 +09:00
Tom
05f5dfba81
Change difficulty colors and add ExpertPlus
...
ExpertPlus is for beatmaps above 6.75*
2017-09-05 13:57:30 +02:00
smoogipooo
b871323ed8
Fix BeatmapGroup initialization not correctly setting panels to Hidden.
2017-09-05 19:26:28 +09:00
smoogipooo
57678a13d9
Update in-line with framework changes.
2017-09-04 09:32:35 +09:00
Dean Herbert
dd26c80837
Delete -> Hide
2017-09-04 07:59:32 +09:00
Dean Herbert
1f646e6d54
Add hiding support for beatmap difficulties
2017-09-01 17:57:12 +09:00
Dean Herbert
5a58489adf
Hook up play and edit (kinda)
2017-08-30 21:12:58 +09:00
Dean Herbert
3b4b4b669b
Add framework for deleting difficulties
2017-08-30 21:12:46 +09:00
Dean Herbert
2fb4126ffc
Use BeatmapSetInfo instead of WorkingBeatmap
2017-08-30 20:53:33 +09:00
Dean Herbert
8619f28ced
Add context menu to beatmap difficulty (wip)
2017-08-30 20:41:53 +09:00
Dean Herbert
07da29ea1c
Add context menu to beatmap set header
2017-08-30 20:41:41 +09:00
smoogipooo
88151eff3f
Fix dofficulty calculators not working and make mania set the correct key count for non-mania specific maps.
2017-08-22 14:07:39 +09:00
Dean Herbert
31bb1ebe0e
Add comment and index on column
2017-08-22 12:42:35 +09:00
Dean Herbert
881eecb528
Merge branch 'master' into master
2017-08-22 12:35:36 +09:00
Dean Herbert
ea450fecf5
Merge branch 'master' into action-key-counter
2017-08-21 16:25:44 +09:00
Dean Herbert
16e96888ab
Update KeyCounterCollection to support action-based buttons
2017-08-21 12:39:22 +09:00
smoogipooo
6a7b410bc3
Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147
2017-08-21 11:58:54 +09:00
MrTheMake
6d401b5f21
Merge branch 'master' into leaderboard-scores
2017-08-19 00:00:40 +02:00
Dan Balasescu
243a6ca774
Update OsuLegacyDecoder.cs
2017-08-18 13:27:16 +09:00
Shane Woolcock
df683d9114
Fix multiple difficulty control points sharing the same time and thus confusing slider velocity calculations
2017-08-17 23:28:26 +09:30
tgi74000
dc31a0f0ac
Merged ppy/master
2017-08-17 13:01:42 +02:00
MrTheMake
81289db33b
CI fix, fixed nullref and removed abstraction of GetAutoplayMod
2017-08-13 20:12:01 +02:00
MrTheMake
d9c26f98c7
Suggested changes
2017-08-13 19:54:07 +02:00
MrTheMake
4c2d7bf343
Parse the mods of a leaderboard's score
2017-08-13 17:41:13 +02:00
MillhioreF
e216bfcf10
Recommended fixes (obsolete try/catch, fix infinite loop during variable parsing in a better way)
2017-08-13 00:40:05 -05:00
MillhioreF
2e5a7374a8
Actually use mapName whoops
2017-08-10 01:49:34 -05:00
MillhioreF
f819ffce2b
Make the legacy decoder more resilient against leading linebreaks
2017-08-10 00:08:39 -05:00
MillhioreF
64d92c1557
Fix infinite loop when importing maps that have storyboard elements with '$' in the filename
2017-08-09 23:31:18 -05:00
MillhioreF
a8cf7ff93a
Add a better error message for corrupt maps with no .osu files
2017-08-09 23:27:13 -05:00
MillhioreF
10321497ca
Add decoder entries for v3/4
2017-08-09 21:21:43 -05:00
tgi74000
8dd4f513e7
Symplified migration using MigrateTable<> instead of commands
2017-08-09 11:55:36 +02:00
tgi74000
c0642ad6d3
Added database migration
2017-08-09 10:54:03 +02:00
tgi74000
b00d1cd077
Merged ppy:master
2017-08-09 08:49:29 +02:00
tgi74000
a751c19cf7
Moved JsonProperty file_md5 and added file_sha2
2017-08-09 08:36:15 +02:00
Dean Herbert
723e27353c
HitRenderer -> RulesetContainer
2017-08-09 13:28:29 +09:00
Dean Herbert
7c0e7ebcd0
Give HitRenderer a reference to Ruleset
...
Used to get correct bindings for a mode (ActionMappingInputManager).
2017-08-09 13:05:52 +09:00
tgi74000
3d4db427ff
Pass RuleSet to ScoreStore, compute and store MD5 for legacy replays compatibility
2017-08-08 17:17:53 +02:00
Dean Herbert
de3b65e1fa
Fix StoredBookmarks not being serialized
2017-08-07 09:45:44 +09:00
Dean Herbert
e75f438c29
Add difficulty application mods
...
Also fixes circular references when using IJsonSerializable.
2017-08-07 08:54:54 +09:00
Huo Yaoyuan
62b3540fd6
Merge branch 'master' into fixes
2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e
Provide Autoplay mod in Ruleset.
2017-08-04 00:25:24 +08:00
Dean Herbert
248486f8f9
Merge branch 'master' into osulegacydecoder-parser
2017-08-03 16:30:37 +09:00
Dean Herbert
0d9ea97828
Allow Rulesets to create a non-FontAwesome icon
...
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
MrTheMake
be3c7ec5f8
Added missing space
2017-08-02 16:17:33 +02:00
MrTheMake
79724e8018
Fix OsuLegacyDecoder's parser being NULL if no ruleset was specified
2017-08-02 16:05:09 +02:00
Dean Herbert
7cb87c7145
Run each import in a single transaction
...
Improves performance substantially.
2017-08-02 14:18:35 +09:00
Dean Herbert
6eb960010f
Speed up startup cleanup operations.
2017-08-01 17:58:21 +09:00
Dean Herbert
3b1166d1e6
Optimise file lookups and other database operations
...
FirstOrDefault when called on a TableQuery with a predicate doesn't use table indices
2017-08-01 17:37:21 +09:00
Dean Herbert
941f3f0934
Tidy up osu-stable import process
...
Now can locate any osu-stable installation using registry lookup (with ample fallbacks). Also uses a much more controlled access method via StableStorage.
2017-08-01 15:12:38 +09:00
Dean Herbert
b4acdd5f90
Merge remote-tracking branch 'upstream/master' into fix-file-references
2017-08-01 11:05:38 +09:00
Dean Herbert
c73e139954
Add "migration"
...
Also simplify initial migration for BeatmapStore by just nuking everything.
2017-08-01 10:24:04 +09:00
Dean Herbert
c060d32765
Separate out startup tasks to ensure they run after migrations
2017-08-01 10:24:00 +09:00
Dean Herbert
ed3e78452e
Lock beatmaps for good measure
2017-08-01 09:38:43 +09:00
Dean Herbert
6af0629cc0
Remove unnecessary newline
2017-08-01 09:37:33 +09:00
Dean Herbert
404497fa10
Allow a single beatmap to reference the same file multiple times
...
This fixes incorrect reference counts causing database desync.
2017-07-31 21:49:57 +09:00
Dean Herbert
f67822a59b
Add progress for deleting all maps
2017-07-31 18:52:59 +09:00
Dean Herbert
92b3c7ac08
Fix the whole database being retrieved when importing each beatmap
2017-07-31 18:38:42 +09:00
Dean Herbert
df5094c0d4
Rework how notifications are distributed
2017-07-31 18:03:55 +09:00
Dean Herbert
57d45b180c
Merge remote-tracking branch 'upstream/master' into import-from-stable
2017-07-31 17:31:10 +09:00
Dean Herbert
b45f1e5381
Merge branch 'master' into transaction-on-import
2017-07-28 17:43:18 +09:00
Dean Herbert
6807caa752
Use a transaction when adding a beatmap
...
Fixes flakey unit test.
2017-07-28 17:31:50 +09:00
Dean Herbert
c48bf3940e
Add a progress notification when importing beatmaps
2017-07-28 16:57:33 +09:00
Dean Herbert
f5b0253e82
Apply CI fixes
2017-07-28 15:36:23 +09:00
Dean Herbert
d93d9e6190
Tidy up file deletion after import
2017-07-28 15:08:56 +09:00
Dean Herbert
6616721e37
Don't block imports and BeatmapStore operations using the same lock
2017-07-28 15:05:12 +09:00
Dean Herbert
d51ce896f9
Add locking to all BeatmapManager operations
2017-07-28 12:58:35 +09:00
Dean Herbert
7d4218ea6c
Add option to import from osu-stable
...
Also adds an option to delete all beatmaps for testing purposes.
2017-07-28 12:58:35 +09:00
Dean Herbert
9ee59dd637
Add the ability to create migrations on a per-store level
...
Now stores store versions to the database itself.
2017-07-28 12:58:35 +09:00
Dean Herbert
3a6f3cdd8a
Add the ability to create migrations on a per-store level
...
Now stores store versions to the database itself.
2017-07-27 20:38:40 +09:00
Dean Herbert
996e5e8b4a
Use SHA2 for hashing
2017-07-27 17:40:08 +09:00
Dean Herbert
5f53426a9a
*Database -> *Store
...
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
fdc6666c71
Simplify hashing method
...
Also exit the import process before importing files to the file store to avoid incorrect reference count increments.
2017-07-27 15:55:55 +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
a90eff69db
Simplify BeatmapSetInfo deletion by relying on cascading deletes
2017-07-27 12:51:49 +09:00
Dean Herbert
c7a6343985
Never cascade-delete rulesets
2017-07-27 12:51:21 +09:00
Dean Herbert
aa81397df4
Recursively retrieve files
2017-07-27 12:41:34 +09:00
Dean Herbert
690b41b1e9
Fix join rows not being deleted when a beatmap is cleaned up
2017-07-27 12:37:37 +09:00
Dean Herbert
4e742959f2
CI fixes
2017-07-27 00:21:57 +09:00
Dean Herbert
87add0765e
Initial documentation pass on BeatmapDatabase
...
Also a bit of tidying up.
2017-07-27 00:08:19 +09:00
Dean Herbert
07d4d2dbe4
Secondary documentation pass on BeatmapStore
2017-07-26 23:13:02 +09:00
Dean Herbert
99e53b5109
Initial documentation pass on BeatmapStore
2017-07-26 22:48:16 +09:00
Dean Herbert
898a601098
Introduce a reference counting file store
2017-07-26 20:22:02 +09:00
Dean Herbert
5fc68aabbf
Fix reset function not running in correct order
2017-07-26 17:14:38 +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
Dean Herbert
64f2e2dc32
Use Colour instead of ColourInfo
2017-07-23 13:06:16 +02:00
Thomas Müller
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
Thomas Müller
2cd8f6b30c
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-21 11:15:26 +02:00
Dean Herbert
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
Dean Herbert
d69470f2ae
Fix TestWorkingBeatmap broken by attempting to load storyboard
2017-07-20 09:22:39 +09:00
Thomas Müller
c4619f614a
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-19 19:15:51 +02:00
Dean Herbert
da92fccdb0
Merge branch 'master' into non-null-beatmap
2017-07-19 18:32:42 +09:00
Dean Herbert
d7dddec328
Set zero-difficulty values local to the dummy beatmap
2017-07-19 18:32:11 +09:00
Dean Herbert
0b53f1a7e3
Reference system
2017-07-19 18:09:59 +09:00
Dean Herbert
a01209cfe0
Simplify comparator
2017-07-19 18:09:59 +09:00
Dean Herbert
d0dea33faa
Make Beatmap (bindable) non-nullable.
2017-07-19 15:16:53 +09:00
Dean Herbert
632d2e8ba5
Dummy beatmap has dummy ruleset
2017-07-19 15:16:48 +09:00
Dean Herbert
3289d93f22
Give the dummy beatmap a background
2017-07-19 15:16:42 +09:00
Dean Herbert
007b343854
Fix incorrect equality check when TimingPointAt returns a default T
2017-07-19 15:16:40 +09:00
Dean Herbert
21984ba764
Move DummyWorkingBeatmap to a more global level (OsuScreen)
2017-07-19 15:16:39 +09:00
Dean Herbert
e47faf4e85
Add a dummy beatmap provider for use in BeatmapInfoWedge
2017-07-19 15:16:33 +09:00
Dean Herbert
6f59e5feec
Add null check on stream
2017-07-19 14:56:27 +09:00
Thomas Müller
a5e610a7ba
Update framework and fix compilation
...
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Dean Herbert
3aeed86392
Merge branch 'master' into drawable-room-update
2017-07-14 15:29:27 +09:00
Dean Herbert
de46f3ab07
Remove all unnecessary parenthesis where object initialisers are used
...
Enforces at CI.
2017-07-13 15:11:33 +09:00
DrabWeb
b196b1d3c6
CI fixes, switch RoomInspector to use BeatmapSetCover.
2017-07-13 01:24:59 -03:00
DrabWeb
fea40ccc1a
Share BeatmapSet cover sprite code.
2017-07-13 01:17:47 -03:00
Thomas Müller
9d523ea012
Update framework
2017-07-12 11:06:13 +09:00
Thomas Müller
40225238d9
Set RelativeSizeAxes for updated FillMode behavior
2017-06-28 12:24:23 +03:00
paparony03
62dee59672
Shapes namespace
...
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
Dean Herbert
f439237bd7
Set a more sane default for TimingControlPoint's BeatLength
2017-06-15 14:19:06 +09:00
smoogipooo
ffbb46f668
Update in line with framework.
2017-06-12 12:48:47 +09:00
John Neijzen
4abad17b92
Fix Black Space after } and Symbol Spacing
2017-06-08 14:48:42 +08:00
smoogipooo
223c75327f
Remove key/val in favor of local variables + method call.
2017-05-30 20:59:53 +09:00
smoogipooo
5b5c2e4717
Back to using val...
2017-05-30 20:37:30 +09:00
smoogipooo
0728aea6a4
Fixes + cleanup.
2017-05-30 20:26:39 +09:00
smoogipooo
93a33be596
val -> value, val -> line (in cases where a key is not used).
2017-05-30 19:52:43 +09:00
smoogipooo
0175b91927
Cleanups.
2017-05-30 19:52:21 +09:00
Dan Balasescu
94ae730a20
Merge branch 'master' into storyboards
2017-05-29 17:49:51 +09:00
smoogipooo
6101fe98e1
Always ApplyDefaults after parsing beatmaps to make sure hit objects are in their most loaded state.
2017-05-29 12:10:29 +09:00
ColdVolcano
e46e1d96a7
Move logic to handleEvent
2017-05-27 00:20:19 -05:00
ColdVolcano
a523dfc388
Allow variables of variables
...
Some storyboards like to do tricky stuff
2017-05-27 00:13:46 -05:00
ColdVolcano
0b770d1225
Allow for variables in storyboards
2017-05-26 23:55:34 -05:00
Dean Herbert
4ee11764b8
Merge branch 'master' into osu-direct
2017-05-24 12:16:34 +09:00
Dean Herbert
53f489b447
Remove using
2017-05-24 11:50:12 +09:00
smoogipooo
0a385055dc
Remove Func<T>'d-ness.
2017-05-24 02:53:08 +09:00
smoogipooo
41824e0179
Add comment.
2017-05-24 02:24:10 +09:00
smoogipooo
2d1df8fd8a
xmldoc fixes.
2017-05-24 02:22:28 +09:00
smoogipooo
9e7f384203
Fix returning incorrect control points for non-timing points.
2017-05-24 02:19:22 +09:00
smoogipooo
462bbd02ba
Simplify expression.
2017-05-24 01:38:28 +09:00
smoogipooo
7628cdf522
Return first control point in the list if the time is before it.
2017-05-24 01:38:04 +09:00
Dean Herbert
0842e00f13
Merge branch 'master' into controlpoint-rework
2017-05-24 00:20:15 +09:00
Dean Herbert
0634a3a5c5
Merge branch 'master' into osu-direct
2017-05-23 17:33:20 +09:00
Dean Herbert
fe7ac20e29
Read menu music from osz resource
2017-05-23 16:38:43 +09:00
smoogipooo
836bf930a0
More cleanups.
2017-05-23 15:29:38 +09:00
smoogipooo
2344f37a3c
Always add TimingChange control points.
2017-05-23 15:26:07 +09:00
smoogipooo
002a0e99a2
Use SortedList + BinarySearch to find control points at time values.
2017-05-23 15:20:32 +09:00
smoogipooo
6bfd7e0fb0
xmldocs.
2017-05-23 14:11:37 +09:00
smoogipooo
3cdfd2eef5
Split ControlPoint into different types.
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/Column.cs
2017-05-23 14:03:40 +09:00
smoogipooo
0a0139aded
Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod.
2017-05-22 10:12:33 +09:00
Dean Herbert
0b987be600
Merge branch 'master' into osu-direct
2017-05-20 16:17:59 +09:00
DrabWeb
c6320c0f11
BeatmapBackgroundSprite public -> internal
2017-05-19 16:02:42 -03:00
DrabWeb
3b8cadd4df
Clean up DirectPanel and it's subclasses
2017-05-19 12:52:23 -03:00
smoogipooo
67cf64062a
Add flag to determine whether the beatmap requested for conversion is for the current ruleset.
2017-05-19 16:02:40 +09:00
smoogipooo
afd3eb4b8d
Implement things a bit more to remove warnings.
2017-05-18 18:04:32 +09:00
smoogipooo
74c23ff6d8
Add base for event parsing code.
2017-05-17 20:46:23 +09:00
smoogipooo
6231a19b8c
Merge remote-tracking branch 'origin/master' into mania-timing-sections
2017-05-16 18:35:32 +09:00
Dean Herbert
efab186384
Update namespaces in line with framework
2017-05-16 12:50:30 +09:00
smoogipooo
0739a76497
Make the playfield work in TestCaseGamefield.
2017-05-11 20:04:45 +09:00
Dean Herbert
70ef503403
Merge branch 'master' into metadata
2017-05-11 12:23:00 +09:00
Huo Yaoyuan
01616cc27c
Avoid extra MemoryStream in ArchiveReader.
2017-05-08 19:41:22 +08:00
Huo Yaoyuan
dff05bec79
Use readonly fields.
2017-05-08 18:56:04 +08:00
Huo Yaoyuan
4c26a02e99
Remove unnecessary arguments in WorkingBeatmap's constructor.
2017-05-08 16:42:53 +08:00
Huo Yaoyuan
146d57953d
Use metadata field of WorkingBeatmap.
2017-05-06 14:57:11 +08:00
Huo Yaoyuan
4f49151984
Make metadata a member of WorkingBeatmap.
2017-05-06 14:52:28 +08:00
Dean Herbert
003cf53441
Streamline panel selection event logic.
...
Was previously firing multiple times where it was completely unnecessary. Also had bidirection firing going on.
2017-04-28 20:43:42 +09:00
Dean Herbert
28375ed1fc
Allow transfer of previously loaded background between WorkingBeatmaps
2017-04-28 15:03:07 +09:00
smoogipooo
c95a6fbd09
Use single line for GetUnicodePreference.
2017-04-28 14:14:14 +09:00
Huo Yaoyuan
4cb18361c1
Use localisation engine for unicode text.
2017-04-26 19:50:38 +08:00
smoogipooo
d9dec9d444
Implement Taiko difficulty calculation.
2017-04-26 15:50:08 +09:00
Dean Herbert
43d09a9734
CI fixes
2017-04-24 20:31:25 +09:00
Dean Herbert
c7b789424b
Update BeatmapInfoWedge design
...
- Adds colour difficulty strip.
- Adjusts paddings.
- Fixes source/artist confusion.
- Double dash to em-dash.
2017-04-24 20:19:44 +09:00