smoogipoo
a88b69ec43
Notify of existing imports
2018-11-28 20:19:35 +09:00
Dean Herbert
ab2b2493a1
Move hashing functionality to ArchiveModelManager
2018-11-28 19:21:36 +09:00
Dean Herbert
ce660b6d67
Add skin de-duplication
2018-11-28 19:01:22 +09:00
smoogipoo
14ff4bc26a
Move primary key attribute to IHasPrimaryKey
2018-11-28 13:19:23 +09:00
Dean Herbert
7755242a43
Merge branch 'master' into osuTK
2018-11-21 18:53:11 +09:00
smoogipoo
5ad96afea0
Fix crashes when importing/deleting from model managers
2018-11-20 18:09:23 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
smoogipoo
e964a555d0
Fix DummyWorkingBeatmap having unrealistic defaults
2018-10-29 15:26:28 +09:00
smoogipoo
8703db5cc1
Rename HitObjectMask -> SelectionMask
2018-10-26 13:31:23 +09:00
smoogipoo
8a2a6a3ecb
Preserve the beatmap's version
2018-10-23 14:59:21 +09:00
smoogipoo
05d89180c8
Move brace on new line
2018-10-22 12:17:23 +09:00
Paul Teng
86b29064c6
Change DownloadState only when Download is possible
2018-10-18 08:51:05 -04:00
Dean Herbert
a2b8904b1e
Merge branch 'master' into database-standardize-paths
2018-10-18 16:21:45 +09:00
smoogipoo
1bebceada7
Unroll loop for the last control point
2018-10-17 11:55:34 +09:00
smoogipoo
336b6fa38e
Perform a custom binary search to remove thread-unsafeness
2018-10-17 11:23:18 +09:00
smoogipoo
d431dd59a8
Cleanups
2018-10-17 10:53:21 +09:00
smoogipoo
41391a6627
Fix beatmap conversion tests failing
2018-10-16 12:01:58 +09:00
smoogipoo
72aaaa4a74
PointSearch -> SearchPoint
2018-10-16 10:29:53 +09:00
HoLLy
710b0a4664
Remove unnecessary PathSanitise call
2018-10-12 15:30:24 +02:00
HoLLy
bb07630743
Merge branch 'master' into database-standardize-paths
2018-10-12 14:08:25 +02:00
smoogipoo
fb1760f580
Simplify linq from beatmap conversion
2018-10-11 20:29:37 +09:00
smoogipoo
ec9f23ab73
Make IBeatmap.HitObjects an IReadOnlyList
2018-10-11 19:53:07 +09:00
smoogipoo
7b2a30f5b4
Reduce some high-profile enumerator allocations
2018-10-11 19:52:03 +09:00
smoogipoo
10fb1d20d1
Remove allocation of control point with every binarysearch
2018-10-11 19:08:00 +09:00
smoogipoo
5b544a0c97
Remove allocation of string.IndexOf()
2018-10-11 18:37:48 +09:00
smoogipoo
bd99a87298
Use ordinal comparison in LegacyBeatmapDecoder
2018-10-11 17:48:47 +09:00
smoogipoo
0c4403ef16
Don't apply version offset during diff calc
2018-10-11 13:53:49 +09:00
HoLLy
b35f88b8ba
Standardize AudioFile and BackgroundImage paths
2018-10-09 17:49:18 +02:00
smoogipoo
9facf707be
Add diffcalc beatmap decoder
2018-10-09 11:49:24 +09:00
smoogipoo
b7499fa956
Allow TimingControlPoint to be overridden
2018-10-09 11:34:38 +09:00
smoogipoo
794501cc5a
Fix incorrect result of ternary
2018-10-05 12:06:24 +09:00
smoogipoo
40c17cfa5a
Remove ugly if-statement
2018-10-05 11:55:59 +09:00
smoogipoo
cb1703c6e2
Fix colours with alpha components not being parsed
2018-10-05 11:19:01 +09:00
smoogipoo
04cd68f970
Hide status pill when status is none
2018-09-20 12:53:45 +09:00
smoogipoo
7b8094d731
Move text size/padding out of constructor
2018-09-20 12:53:45 +09:00
Dan Balasescu
d3bb78d139
Merge branch 'master' into add-rank-status
2018-09-18 14:10:42 +09:00
smoogipoo
aba1de8b1a
Cleanup
2018-09-18 12:54:07 +09:00
Hanamuke
3e7006ec1f
Fix fonction name
2018-09-14 19:52:32 +02:00
Hanamuke
c8d3776c79
Remove uneeded brackets
2018-09-14 19:46:04 +02:00
Hanamuke
347cb0a1b5
Check for type conversion, mais the update recursive
2018-09-14 19:41:29 +02:00
Hanamuke
1c2cc3837a
Compute combo for nested Objects. Display fruit depending on Combo for
...
osu!catch
2018-09-13 21:52:15 +02:00
Unknown
638a2e5ba8
populate Status for Beatmap + BeatmapSet
...
also added Status to APIBeatmap + APIBeatmapSet
2018-09-13 11:57:40 +02:00
Unknown
13b988053a
add status column to BeatmapInfo + BeatmapSetInfo
2018-09-13 10:10:58 +02:00
Unknown
221a99d886
fix StatusPill not setting text when initially set with NONE
2018-09-13 10:07:26 +02:00
smoogipoo
9b0954ab81
Reference whether texture is available rather than disposed
2018-09-11 11:28:02 +09:00
Dean Herbert
7cca990be4
Merge remote-tracking branch 'upstream/master' into framework-image-changes
2018-09-07 18:56:00 +09:00
Dean Herbert
bb67f1a361
Merge remote-tracking branch 'upstream/master' into add-skin-import-delete
2018-09-07 18:18:03 +09:00
Dean Herbert
81da7ce298
Merge branch 'master' into add-skin-import-delete
2018-09-07 16:48:01 +09:00
Dean Herbert
2c0ba401d5
Add ability to click on imported complete notification to present last import
2018-09-07 16:30:11 +09:00
Dean Herbert
01389f0443
Merge remote-tracking branch 'upstream/master' into update-framework-with-everyrthing
2018-09-06 18:04:58 +09:00
Dean Herbert
4e012042ab
Fix renaming variables too eagerly
2018-09-06 17:57:09 +09:00
Dean Herbert
29b0d62f21
Changes in line with framework refcount changes
2018-09-06 13:29:57 +09:00
Dean Herbert
89a92ab7eb
Fix potential thread-safety issue
2018-09-06 13:27:53 +09:00
Dean Herbert
8d9e0ff1c3
Remove async WorkingBeatmap logic
2018-09-06 12:51:23 +09:00
Dean Herbert
9b753bb429
Merge pull request #3321 from peppy/fix-importing
...
Fix order of import set conflict checks
2018-09-05 18:51:15 +09:00
Dean Herbert
144e80dff6
Add "import all skins from stable" option (and mass delete)
2018-09-03 10:10:04 +09:00
Dean Herbert
03084aa04b
Revert async changes
2018-08-31 07:07:10 +09:00
Dean Herbert
b1a3dfedd1
Reduce async-await pairs
2018-08-30 14:41:16 +09:00
Dean Herbert
0d4aa37a91
Fix order of import set conflict checks
2018-08-28 02:53:32 +09:00
smoogipoo
1b279d383f
Use GetAsync on all textures
2018-08-27 17:26:44 +09:00
Dean Herbert
8204d3292e
Log to correct file
2018-08-25 14:50:46 +09:00
smoogipoo
aeb4d47c06
Remove skipping part of message
2018-08-24 18:07:39 +09:00
smoogipoo
99574ecad8
Softly handle errors when no beatmap file exists in archive
2018-08-24 17:57:39 +09:00
smoogipoo
55370165c0
Compare with invariant culture
2018-08-24 10:12:30 +09:00
smoogipoo
407968bb7e
Log the format line when a decoder isn't found
2018-08-24 10:03:56 +09:00
smoogipoo
8f261988f7
Log all files when no beatmap files in archive error occurs
2018-08-23 10:59:21 +09:00
Dean Herbert
985528d08b
Merge branch 'master' into more-import-logging
2018-08-22 16:30:55 +09:00
Dean Herbert
f1c6dfd735
Change grammar slightly
2018-08-22 16:22:29 +09:00
Dean Herbert
c6df93c438
Merge branch 'master' into invalid-obj-types
2018-08-22 16:21:17 +09:00
smoogipoo
551581e5cd
Skip invalid hitobject types, log error instead
2018-08-22 15:59:58 +09:00
smoogipoo
bdd618a99d
Log the archive when failing to create model
2018-08-22 15:42:43 +09:00
smoogipoo
df84889646
Handle invalid origins as Anchor.TopLeft
2018-08-22 14:50:03 +09:00
smoogipoo
541c4daa81
Use ordinal string comparison in hot paths
2018-08-21 11:10:54 +09:00
ekrctb
cf4cb934cf
Merge branch 'master' into fix-combo-colours
2018-08-16 10:45:54 +09:00
smoogipoo
4dfb63023f
Update with recent changes
2018-08-15 15:49:48 +09:00
smoogipoo
d0c9e2257b
Merge remote-tracking branch 'origin/master' into framework-storage-update
2018-08-15 14:54:09 +09:00
smoogipoo
539dd3134f
Fix beatmap processor not setting combo index on first object
2018-08-15 11:48:50 +09:00
smoogipoo
ce77473910
Simplify usage of ConvertHitObjectParser
2018-08-15 10:24:56 +09:00
smoogipoo
e360985d73
Replace variables into the entire line
2018-08-14 18:15:09 +09:00
smoogipoo
b8824a41b5
Fix certain control points not being replaced
2018-08-14 11:44:53 +09:00
jorolf
123f304cf1
update storage usages
2018-08-02 19:24:17 +02:00
Dean Herbert
b7de922896
Merge branch 'master' into open-downloaded-beatmas
2018-07-28 12:44:34 +09:00
Dean Herbert
95cca046fb
Merge branch 'master' into open-downloaded-beatmas
2018-07-25 12:38:49 +02:00
Dean Herbert
da8fc0ee5d
ToLower -> ToLowerInvariant
2018-07-25 07:37:05 +02:00
Dean Herbert
5364a6148a
Use ToUpperInvariant
2018-07-24 14:42:06 +02:00
Dean Herbert
ab9340f4be
Fix usage of culture local ToUpper causing incorrect display on Turkish machines
...
Closes #3098 .
2018-07-24 11:37:43 +02:00
Dean Herbert
d561f54282
Merge branch 'master' into per-object-css
2018-07-23 03:01:17 +09:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dean Herbert
a2f744b05e
Merge remote-tracking branch 'upstream/master' into open-downloaded-beatmas
2018-07-21 00:03:17 +09:00
Dean Herbert
7fea2b3a8b
Add ToList
2018-07-20 16:38:02 +09:00
smoogipoo
c087a73f40
Implement per-hitobject custom sample banks
2018-07-20 15:12:44 +09:00
smoogipoo
de8d05bb0c
Remove unnecessary setting of sample name to same value
2018-07-20 15:12:21 +09:00
Dean Herbert
693ba8e994
Add more ToString output
2018-07-19 18:43:11 +09:00
Dean Herbert
68614f1512
Ensure online IDs are validated for imports that don't have an associated archive too
2018-07-19 13:41:34 +09:00
Dean Herbert
e3fb781a5a
Fix ArchiveModelManager's model import method not running import logic
2018-07-18 12:59:22 +09:00
Dan Balasescu
7a2dc3c674
Merge branch 'master' into clickable-download-notifications
2018-07-17 13:29:16 +09:00
Dean Herbert
84c13174d9
Merge branch 'master' into use-has-flags
2018-07-17 03:50:40 +09:00
Dean Herbert
40a1f8313e
Merge branch 'master' into make-notifications-quieter
2018-07-17 03:24:47 +09:00
Dean Herbert
f4591c6d0b
Merge branch 'master' into fix_color_parsing
2018-07-17 00:25:32 +09:00
morguldir
fc77e01ba9
Fix formatting, make StripComments protected
...
Don't strip comments when calling ParseLine
2018-07-16 16:35:55 +02:00
Dean Herbert
98cddc0c04
Fix some legacy cases
2018-07-16 16:26:37 +09:00
Dean Herbert
dbc538abbe
Use Enum.HasFlag
...
With .NET core 2.0+ this is as efficient as the ugly code we've been using.
2018-07-16 16:18:46 +09:00
Dean Herbert
a117b323e2
Merge branch 'master' into make-notifications-quieter
2018-07-16 13:15:07 +09:00
Dean Herbert
a12c47536b
Change default to being important
2018-07-16 13:00:21 +09:00
morguldir
429306aa87
Fix casing, use ordinal string comparison when stripping comments
2018-07-16 01:54:20 +02:00
morguldir
87a4bf3d92
Remove using directive for regex in LegacyDecoder
2018-07-16 01:08:30 +02:00
morguldir
6c861a1638
Strip comments from everything except metadata
2018-07-16 01:04:41 +02:00
Dean Herbert
6698f320fb
Merge branch 'master' into download-button-state
2018-07-13 22:05:26 +09:00
Dean Herbert
a1a077398c
Merge remote-tracking branch 'upstream/master' into peppy-clickable-download-notifications
2018-07-13 21:04:17 +09:00
Dan Balasescu
69acb4f10e
Merge branch 'master' into improve-difficulty-icons
2018-07-13 18:27:43 +09:00
Dean Herbert
159b26509b
Improve visuals of difficulty icons
2018-07-13 17:15:06 +09:00
Dean Herbert
09be9c2ed2
Merge remote-tracking branch 'upstream/master' into naoey-download-button-state
2018-07-13 14:52:10 +09:00
Criminalllz
a9f8c2acb8
Use Regex to only care about colors and commas when parsing a color.
2018-07-12 20:36:57 +02:00
Dean Herbert
7157428882
Fix import failure of beatmap sets containing duplicate beatmap difficulties
2018-07-11 02:59:00 +09:00
Dean Herbert
1418d1369f
Add the ability to click completed download notifications to select beatmap
...
Closes #2731 .
2018-07-11 01:32:10 +09:00
Dan Balasescu
f5504914cc
Merge branch 'master' into fix-hitsound-fallback
2018-07-10 17:19:16 +09:00
Dan Balasescu
ce219cda53
Merge branch 'master' into fix-beatmap-links
2018-07-10 16:20:59 +09:00
Dean Herbert
ba258b8a05
Fix lack of fallback logic for custom bank samples
...
Closes #2966 .
---
Was causing some beatmaps to not play all of their hitsounds
2018-07-10 02:56:22 +09:00
Dean Herbert
e223074876
Fix import failures if single set has multiple conflicting OnlineBeatmapIDs
...
Resolves #2970 .
2018-07-09 00:24:55 +09:00
Dean Herbert
91777b04d8
Merge branch 'master' into download-button-state
2018-07-08 14:15:47 +09:00
Dean Herbert
625b9ead4c
Fix links from profile top scores to beatmaps not working correctly
2018-07-05 21:00:23 +09:00
Dean Herbert
44aecdc3a0
Rename method to EquivalentTo
2018-07-05 15:00:02 +09:00
Dean Herbert
d11ba2df0e
Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks
2018-07-05 14:53:31 +09:00
naoey
2a0b1f3615
Update direct panel download button for new design
...
- Add a download failed event to BeatmapManager
- Make DownloadButton aware of all 3 possible download states
- Change button appearance based on each state
2018-07-03 20:18:09 +05:30
smoogipoo
8b0c6a4c85
Make SampleControlPoint clone the existing SampleInfo
2018-07-02 14:17:19 +09:00
Dan Balasescu
37495c34fa
Fix possible nullreference
2018-07-02 13:51:47 +09:00
smoogipoo
b664d3ef81
Fix time being a part of controlpoint change comparisons
2018-07-02 13:34:25 +09:00
smoogipoo
aea50e770b
Use .Equals everywhere
2018-07-02 13:34:14 +09:00
Dean Herbert
812929fa05
Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess
2018-07-02 13:10:42 +09:00
Dean Herbert
b7893bc994
Remove unnecessary comments
2018-07-02 13:07:44 +09:00
smoogipoo
9f85c55915
Merge remote-tracking branch 'origin/master' into legacy-custom-banks
2018-07-02 12:34:51 +09:00
Dan Balasescu
8abcf68188
Merge branch 'master' into fix-negative-online-set-id
2018-06-29 18:29:36 +09:00
smoogipoo
99068debc4
Split out into separate interface + add xmldocs
2018-06-29 13:24:33 +09:00
smoogipoo
756cabd5d0
Add a preprocess method to BeatmapProcessor
2018-06-29 12:45:48 +09:00
tgi74000
b0739023ce
Add BeatmapInfo's stable defaults to fix compatibility with old maps
2018-06-28 19:02:38 +02:00
smoogipoo
94f1b2eeb8
Only custom sample banks > 1 modify the filename
2018-06-28 18:29:17 +09:00
smoogipoo
3a9a82c80c
Add back legacy custom sample banks
2018-06-28 18:29:12 +09:00
smoogipoo
781095b96b
Encapsulate the method to apply SampleControlPoints to SampleInfos
2018-06-28 18:29:07 +09:00
smoogipoo
2882981f9c
Implement and use equality comparers for ControlPoint
2018-06-28 18:28:59 +09:00
Dean Herbert
be2d3d6ad4
Merge branch 'master' into fix-supporter-naming
2018-06-28 17:34:21 +09:00
smoogipoo
2f2bd59844
Remove editor functionality from VirtualBeatmapTrack
...
/shrug
2018-06-28 11:47:41 +09:00
smoogipoo
87e8074cd2
Use a const for excess length
2018-06-28 11:46:56 +09:00
smoogipoo
c0c94e24b9
Use VirtualBeatmapTrack in testcases
2018-06-28 11:45:48 +09:00
Dean Herbert
5ad122bfec
Fix beatmaps importing with -1 as online set ID
2018-06-28 10:28:35 +09:00
Joehu
8518fce4a9
Fix osu!supporter naming
2018-06-27 17:57:55 -07:00
smoogipoo
5640385f48
Update the length once during construction
2018-06-27 16:12:49 +09:00
smoogipoo
b4b28f8ae8
Make GetWaveform() not hard bail if errors occur
2018-06-27 16:07:18 +09:00
smoogipoo
b88c4464cb
Make virtual beatmap tracks approximate beatmap length
2018-06-27 16:02:49 +09:00
Dean Herbert
f7f17bab78
Merge branch 'master' into catch-droplet-fix
2018-06-26 19:29:15 +09:00
Dean Herbert
5d3b51b8d4
Merge branch 'master' into api-offline-early-return
2018-06-22 13:16:30 +09:00
Dean Herbert
3819ecb2be
Update framework
2018-06-19 20:19:52 +09:00
Dean Herbert
5d105cd08d
Avoid errors being logged when importing beatmaps while logged out
2018-06-15 17:23:03 +09:00
smoogipoo
8f7334874c
Fix up performance calculators
2018-06-14 16:04:48 +09:00
Dan Balasescu
cbb883614a
Merge branch 'master' into catch-droplet-fix
2018-06-13 15:18:52 +09:00
Dan Balasescu
0a35a81c2d
Merge branch 'master' into populate-missing-online-ids
2018-06-12 13:11:21 +09:00
Dean Herbert
ecc0f5e575
Use Any() instead of Count()
2018-06-08 20:54:09 +09:00
Dean Herbert
064e8190be
Add basic documentation
2018-06-08 20:53:58 +09:00
Dean Herbert
66d28aa9fc
Merge branch 'master' into beatmap-set-downloader
2018-06-08 16:28:25 +09:00
Dean Herbert
a775d00bd8
Add online fetch support for online IDs
2018-06-08 15:59:45 +09:00
Dean Herbert
955a78e76d
Remove OnlineBeatmapSetID from BeatmapInfo
...
It should now be retrieved via the linked BeatmapSetInfo
2018-06-08 15:26:27 +09:00
Dean Herbert
8220e0c79a
Remove OnlineBeatmapSetID from BeatmapMetadata
2018-06-08 12:46:34 +09:00
Dean Herbert
f3c9049660
Merge branch 'master' into disallow-beatmap-change
2018-06-07 15:34:19 +09:00
smoogipoo
3745f9000b
Merge remote-tracking branch 'origin/master' into remove-decoder-offset
2018-06-07 13:37:19 +09:00
Dean Herbert
2e23da1dfa
Merge branch 'master' into beatmap-set-downloader
2018-06-06 20:32:58 +09:00
smoogipoo
72cc53aded
Rename GameBeatmap -> BindableBeatmap
2018-06-06 20:16:20 +09:00
smoogipoo
4086ff7313
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
DrabWeb
7819be7957
Remove unused using.
2018-06-06 03:28:07 -03:00
DrabWeb
188272e15d
Replace OnAlreadyDownloading with returning a bool from Download.
2018-06-06 03:18:42 -03:00
DrabWeb
80951eae68
Inherit BeatmapSetDownloader from Component.
2018-06-05 18:09:26 -03:00
DrabWeb
d8154f8cad
Fix BeatmapSetInfos with OnlineBeatmapSetID set to null being marked as downloaded.
2018-06-04 21:11:27 -03:00
DrabWeb
01c5060bcf
Move BeatmapSetDownloader to osu.Game.Beatmaps.Drawables
2018-06-04 20:30:54 -03:00
Dan Balasescu
0f7b23d765
Add param explanatory blurb to xmldoc
2018-06-04 11:11:07 +09:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change
2018-06-04 10:53:04 +09:00
Dean Herbert
645f6efce7
Fix web request failures not being correctly handled at an APIRequest level
2018-06-03 13:01:52 +09:00
Dean Herbert
ae6f603d16
Merge branch 'master' into match-panel-with-web
2018-06-01 21:31:18 +09:00
Joehu
1095669a55
Match panel with web
2018-05-31 08:09:19 -07:00
DrabWeb
6781b81336
Cleanup.
2018-05-31 05:48:42 -03:00
Dean Herbert
42bc6b6b2e
Merge branch 'master' into updateable-beatmap-set-cover
2018-05-31 17:33:31 +09:00
Dan Balasescu
cd3ca68f03
Merge branch 'master' into song-selet-enumerable
2018-05-31 14:38:04 +09:00
Dean Herbert
a28e71995d
Offload database query to task
...
Allows song select to load a touch faster, in theory.
2018-05-30 16:15:57 +09:00
Dean Herbert
0adc16f9bd
Handle online ID mismatches and clashes on beatmap import
2018-05-29 16:26:50 +09:00
Dean Herbert
47d88a48a2
Add logging on import processes
2018-05-29 16:26:42 +09:00
DrabWeb
e920b8d577
Add UpdateableBeatmapSetCover.
2018-05-28 19:11:26 -03:00
smoogipoo
3a5228af43
Make GameBeatmap late-bind its AudioManager for ctor Beatmap access
2018-05-28 17:55:41 +09:00
smoogipoo
8ae2a3696f
Apply platform universal offset at player level
2018-05-28 03:31:46 +09:00
ekrctb
9f2e09dae4
Move PostProcessing to after control points applied and nested hit objects created.
2018-05-25 18:57:06 +09:00
smoogipoo
542eb848b0
Fix GetBoundCopy on IGameBeatmap not working
2018-05-24 12:42:58 +09:00
smoogipoo
a25462e10f
Fix testcase audio + dependency overrides not working
2018-05-23 18:52:09 +09:00
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
smoogipoo
e6e3758304
Fix HR mod affecting original beatmap difficulty
...
Fixes #2575 .
2018-05-18 18:11:52 +09:00
smoogipoo
397d93660a
Don't deep-clone beatmapinfo/control points
2018-05-17 13:17:33 +09:00
smoogipoo
0f817d18d4
Add explanatory comment
2018-05-16 13:59:51 +09:00
smoogipoo
cf44357bdb
Use a stable sort for hitobjects
2018-05-16 13:30:48 +09:00
smoogipoo
995fda9b6f
Move base classes to osu.Game.Rulesets.Difficulty namespace
2018-05-15 17:38:08 +09:00
smoogipoo
e1b8a1589b
Fix TimeRate not being considered for performance calculation
2018-05-14 11:15:14 +09:00
smoogipoo
2bab08c437
Fix post-merge errors
2018-05-11 14:08:17 +09:00
smoogipoo
73465c35fa
Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics
...
# Conflicts:
# osu.Game/Beatmaps/Beatmap.cs
2018-05-11 14:05:40 +09:00
Dean Herbert
8a6ef0dabb
Merge branch 'master' into beatmap-conversion-rework
2018-05-10 19:10:07 +08:00
Dean Herbert
40c1b24b3d
Move IBeatmap to its own file
2018-05-10 19:51:40 +09:00
smoogipoo
5489976c20
Implement ruleset-specific beatmap statistics
2018-05-07 15:51:08 +09:00
smoogipoo
30a3f4f29f
Fix not being able to convert beatmaps with 0 hitobjects
2018-05-07 15:27:45 +09:00
smoogipoo
68441f1ef0
Output ruleset instantiation info
2018-05-07 14:28:30 +09:00
smoogipoo
ad2c2a5fe6
Restore star difficulty calculation
2018-05-07 12:25:21 +09:00
smoogipoo
794418432f
Fix incorrect method name
2018-05-07 11:22:25 +09:00
smoogipoo
db3e48c194
Rename GetBeatmap() to GetPlayableBeatmap()
2018-05-07 10:40:30 +09:00
smoogipoo
9128e64c9a
Rename OriginalBeatmap back to Beatmap
2018-05-07 10:29:38 +09:00
smoogipoo
7e83c75888
Add xmldoc
2018-05-07 10:23:32 +09:00
smoogipoo
b68ee39136
Reword beatmap conversion error
2018-05-07 10:18:47 +09:00
smoogipoo
4ecdea8b2e
Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
2018-05-07 10:17:54 +09:00
smoogipoo
77e661489d
Merge branch 'i-beatmap' into beatmap-conversion-rework
2018-05-07 10:00:24 +09:00
smoogipoo
1aefd71b65
Merge remote-tracking branch 'origin/master' into i-beatmap
2018-05-07 09:58:53 +09:00
Adonais Romero González
06c6f55995
Apply offset to end times on legacy converter
2018-04-30 00:43:32 -07:00
Dean Herbert
b16e25c3e9
Add error handling on a per-line level in LegacyDecoder
...
Resolves #2306 .
2018-04-20 18:32:24 +09:00
smoogipoo
03a5df84c6
Initial rework of beatmap conversion process
2018-04-19 22:04:12 +09:00
smoogipoo
66b3b295e7
Use IBeatmap wherever possible
2018-04-19 20:44:38 +09:00
smoogipoo
e666a82e1f
Fix cloning
2018-04-19 18:59:09 +09:00
smoogipoo
ac64f9d958
Remove LegacyBeatmap
2018-04-19 18:58:45 +09:00
smoogipoo
b5a55a0dce
Make an interface for beatmaps
2018-04-19 18:58:40 +09:00
smoogipoo
ffbe6f2e37
Merge remote-tracking branch 'origin/master' into fix-rank-status
...
# Conflicts:
# osu.Game/Beatmaps/RankStatus.cs
# osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
# osu.Game/Overlays/Direct/FilterControl.cs
# osu.Game/Overlays/DirectOverlay.cs
2018-04-18 14:16:58 +09:00
tgi74000
1feba556eb
CI: unused directive
2018-04-16 14:25:43 +02:00
tgi74000
9b36cf2066
Review changes
2018-04-16 14:14:40 +02:00
tgi74000
b23b0a445b
Add support for replay mods
2018-04-13 15:41:35 +02:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
Joehu
f18594887b
Move enum to SearchBeatmapSetsRequest
2018-04-12 07:49:23 -07:00
Joehu
461e063f19
Rename RankStatus to BeatmapSearchCategory
2018-04-11 22:50:39 -07:00
Joseph Madamba
767ecb4422
Fix rank status
2018-04-10 00:11:53 -07:00
Dean Herbert
ddba7254ca
Merge remote-tracking branch 'upstream/master' into linq
2018-04-03 13:05:08 +09:00
smoogipoo
fd9480cfb6
Handle timingpoint FormatException
2018-04-02 20:08:40 +09:00
smoogipoo
d24d81d8a9
De-pluralize some methods
2018-04-02 20:07:18 +09:00
Huo Yaoyuan
b842f682eb
Use Linq.Append and Prepend.
2018-04-02 12:06:34 +08:00
DrabWeb
19bc6b9168
Merge https://github.com/ppy/osu into beatmap-set-status
2018-03-27 18:13:58 -03:00
DrabWeb
506e27a30e
Cleanup.
2018-03-27 17:59:58 -03:00
DrabWeb
eb374c5774
Add beatmap set online status and display it in direct panels and the beatmap set overlay.
2018-03-26 21:04:45 -03:00
Dean Herbert
0e669c9a3f
Fix many warnings
2018-03-24 18:23:22 +09:00
smoogipoo
ffa712dccb
Fix post-merge issues
2018-03-24 15:19:45 +09:00
smoogipoo
c29f7a4333
Merge remote-tracking branch 'origin/master' into netstandard
2018-03-24 14:49:46 +09:00
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
