1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 15:02:55 +08:00
Commit Graph

1158 Commits

Author SHA1 Message Date
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