Dean Herbert
|
e4bad93b66
|
Use variable for web request concurrency for clarity
|
2019-06-10 13:52:09 +09:00 |
|
Dean Herbert
|
b79fdfc12f
|
Fix one more instance of improperly handled cancellation
|
2019-06-10 13:50:22 +09:00 |
|
Dean Herbert
|
b4d2d0bd0b
|
Simplify and combine concurrency of ArchiveModelManager
|
2019-06-10 13:42:33 +09:00 |
|
smoogipoo
|
f090e292c9
|
Move ArchiveModelManager import process to async flow
|
2019-06-10 13:42:22 +09:00 |
|
smoogipoo
|
a6dc5606bc
|
Allow beatmapsets to be sorted by date added
|
2019-06-05 18:17:43 +09:00 |
|
smoogipoo
|
4763a41c7e
|
Cleanups
|
2019-06-04 11:25:18 +09:00 |
|
smoogipoo
|
cea353975f
|
Update with further framework-side changes
|
2019-06-04 11:04:28 +09:00 |
|
Dean Herbert
|
b52276c489
|
Pass individual components to DummyWorkingBeatmap, not game
|
2019-05-31 14:51:12 +09:00 |
|
Dean Herbert
|
f33a5bc54c
|
Centralise and update WorkingBeatmap creation in test cases
|
2019-05-31 14:40:53 +09:00 |
|
Dean Herbert
|
a1cc8c448f
|
Update TrackVirtual consumption
|
2019-05-29 16:43:27 +09:00 |
|
Dean Herbert
|
a20eda7b5f
|
Fix remaining cases to work without things
|
2019-05-28 23:54:42 +09:00 |
|
Dean Herbert
|
4ca34bd5e8
|
Update osu! in line with audio subsystem refactor
|
2019-05-28 17:06:01 +09:00 |
|
smoogipoo
|
f0d7728e81
|
Fix failures with a null-model
|
2019-05-23 17:01:22 +09:00 |
|
smoogipoo
|
7971261fbc
|
Don't create a new drawable for the first background
|
2019-05-23 15:59:22 +09:00 |
|
Dean Herbert
|
58efa7a177
|
Merge pull request #4729 from peppy/fix-control-point-ordering
Fix control points with same timestamp potentially being parsed incorrectly
|
2019-05-21 15:33:27 +09:00 |
|
smoogipoo
|
7a56fe84f2
|
Remove ControlPoint.EquivalentTo
|
2019-05-21 14:27:57 +09:00 |
|
smoogipoo
|
7e38aabe75
|
Remove equivalence check from controlpoint parsing
|
2019-05-21 14:27:41 +09:00 |
|
smoogipoo
|
f1c9073338
|
Fix commented line check not working with whitespace
|
2019-05-14 16:16:55 +09:00 |
|
Dean Herbert
|
92f6f4d21a
|
Apply same fix to other methods which were missed
|
2019-05-13 19:04:12 +09:00 |
|
Dean Herbert
|
aca77a7ae2
|
Merge remote-tracking branch 'upstream/master' into fix-control-point-ordering
|
2019-05-13 18:47:05 +09:00 |
|
Dean Herbert
|
038e49701e
|
Move conditional to within BreakPeriod
|
2019-05-12 16:25:25 +09:00 |
|
Dean Herbert
|
c8f9354327
|
Remove incorrect deletion include
This was causing deletions of scores without considering that scores are now managed by a ScoreManager (and have their own data dependencies).
|
2019-05-09 15:13:35 +09:00 |
|
Dean Herbert
|
66ebdbbe4c
|
Fix control points with same timestamp potentially being parsed incorrectly
|
2019-05-08 18:13:07 +09:00 |
|
smoogipoo
|
a00e2b18a9
|
Fix background unloading/reloading sometimes crashing
|
2019-05-07 17:24:05 +09:00 |
|
smoogipoo
|
d7c09e7dbd
|
Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
|
2019-05-07 13:20:17 +09:00 |
|
Dean Herbert
|
d40177f97c
|
Merge branch 'master' into drawnode-composability
|
2019-04-27 18:41:19 +09:00 |
|
smoogipoo
|
0bd35ab7bb
|
Turn on warnings, resolve issues
|
2019-04-25 17:36:17 +09:00 |
|
smoogipoo
|
0222424aef
|
Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
|
2019-04-10 17:20:36 +09:00 |
|
smoogipoo
|
ad124bfeec
|
Reimplement select mod track adjustments
|
2019-04-09 12:59:32 +09:00 |
|
smoogipoo
|
c584967eb1
|
Remove mods from workingbeatmap
|
2019-04-09 12:59:32 +09:00 |
|
smoogipoo
|
772bef91fa
|
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
|
2019-04-08 23:01:12 +09:00 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +09:00 |
|
smoogipoo
|
a56e29347f
|
Adjust namespaces
|
2019-04-02 14:51:28 +09:00 |
|
Dean Herbert
|
c39c37a18d
|
Apply more missed cases
|
2019-04-01 12:44:46 +09:00 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +09:00 |
|
Dan Balasescu
|
e45c08ad23
|
Adjust comment
|
2019-03-29 14:02:19 +09:00 |
|
Dean Herbert
|
0439216f7e
|
Merge branch 'master' into stable-storyboard-ordering
|
2019-03-29 12:44:09 +09:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|
Dean Herbert
|
92184adef5
|
Add stable sorting of storyboard elements
|
2019-03-26 16:37:52 +09:00 |
|
Dean Herbert
|
6f1610be79
|
Merge branch 'master' into ruleset-container-refactor
|
2019-03-20 14:55:58 +09:00 |
|
Dean Herbert
|
461a0a5038
|
Merge branch 'master' into remove-unnecessary-code
|
2019-03-20 10:22:24 +09:00 |
|
Dean Herbert
|
baea7230bc
|
Rename RulesetContainer to DrawableRuleset
|
2019-03-19 23:47:31 +09:00 |
|
Dean Herbert
|
392a0a1d74
|
Merge branch 'master' into update-framework
|
2019-03-18 11:34:59 +09:00 |
|
Dan Balasescu
|
e0b3149e32
|
Merge branch 'master' into api-testability
|
2019-03-18 10:59:06 +09:00 |
|
Dean Herbert
|
c496f6e56b
|
Fix usages of OnLoadComplete
|
2019-03-17 13:44:20 +09:00 |
|
Dean Herbert
|
36e5c09710
|
Merge pull request #4433 from nekodex/prevent-null-lookup
Don't perform lookup of beatmap stats unless an online id is present
|
2019-03-15 10:39:39 +09:00 |
|
Dean Herbert
|
8f00f2290a
|
Log issues
|
2019-03-13 14:56:41 +09:00 |
|
Dean Herbert
|
241e336c21
|
Fix break parsing
|
2019-03-13 14:22:16 +09:00 |
|
Jamie Taylor
|
7a2af5634c
|
Merge remote-tracking branch 'upstream/master' into prevent-null-lookup
|
2019-03-13 14:13:50 +09:00 |
|
Dean Herbert
|
f4c505709a
|
Use parsing methods in more places
Limiting scope to beatmap decoding for this pass. Can expand to skin/storyboard in the future.
|
2019-03-13 13:56:31 +09:00 |
|
Dean Herbert
|
f0114d776d
|
Use interface to access API
Allows for better testability.
|
2019-03-13 12:58:18 +09:00 |
|
Dean Herbert
|
93b774104a
|
Fix NaN handling
|
2019-03-13 11:30:33 +09:00 |
|
Dean Herbert
|
73d9aef5bd
|
Fix filename
|
2019-03-12 20:38:04 +09:00 |
|
Dean Herbert
|
cc09ecbfcf
|
Increase validation performed on .osu files to avoid hard crashes
|
2019-03-12 20:31:15 +09:00 |
|
smoogipoo
|
059397ac50
|
Remove unnecessary early return for maching beatmap IDs
|
2019-03-12 14:40:13 +09:00 |
|
Dan Balasescu
|
05358fa458
|
Merge branch 'master' into ensure-import-sanity
|
2019-03-12 14:24:07 +09:00 |
|
Dean Herbert
|
59897bbeb5
|
Refactor UpdateableBeatmapBackground lookup logic for clarity
Closes #4401. Alternative to #4439.
|
2019-03-11 19:00:39 +09:00 |
|
Dean Herbert
|
d0ae75af6e
|
Add tests and fix scenario where all matching are contained by duplicate candidate
|
2019-03-11 18:13:33 +09:00 |
|
Dean Herbert
|
3a8c32d41b
|
Add the ability for ArchiveModelManager to re-import even when existing entry is present
|
2019-03-11 17:04:18 +09:00 |
|
Dean Herbert
|
9df27f3a5f
|
Merge branch 'master' into prevent-null-lookup
|
2019-03-09 11:14:54 +09:00 |
|
Jamie Taylor
|
800007c378
|
Set DummyWorkingBeatmap difficulties to 0 for better fallback display
|
2019-03-08 18:17:50 +09:00 |
|
Jamie Taylor
|
ab0ac7a82a
|
Pass through timeBeforeLoad instead of hardcoding
|
2019-03-06 19:12:37 +09:00 |
|
Jamie Taylor
|
06b65e00c4
|
Prevent null beatmap from creating an extra drawable
|
2019-03-06 19:12:28 +09:00 |
|
Jamie Taylor
|
eb80549782
|
Fix UpdateableBeatmapBackgroundSprite not disposing of previously loaded sprites
|
2019-03-06 19:12:22 +09:00 |
|
Dean Herbert
|
9441f88033
|
Use actual reference to default beatmap for fallback
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
|
2019-03-06 13:01:37 +09:00 |
|
David Zhao
|
89987210c3
|
Merge remote-tracking branch 'upstream/master' into LobbyList
|
2019-03-05 18:59:38 +09:00 |
|
David Zhao
|
34b2553b95
|
Remove redundant boolean
|
2019-03-05 18:59:25 +09:00 |
|
Dan Balasescu
|
fd147dae21
|
Merge branch 'master' into fix-disabled-set-crash
|
2019-03-05 17:25:13 +09:00 |
|
David Zhao
|
52558c5cf6
|
Fix metadata potentially being null
|
2019-03-05 16:59:02 +09:00 |
|
David Zhao
|
166a8c8bbb
|
Add back fallback behavior for match creation
|
2019-03-05 16:41:59 +09:00 |
|
David Zhao
|
fc62877fdc
|
Fall back to default background
|
2019-03-05 15:51:43 +09:00 |
|
David Zhao
|
7c53c7b602
|
Remove local background logic
|
2019-03-05 15:33:39 +09:00 |
|
David Zhao
|
aecbc31ffa
|
Use BeatmapSetCoverType.List for lobby listing
|
2019-03-05 12:08:14 +09:00 |
|
Dean Herbert
|
0ff17103e8
|
Merge branch 'master' into update-difficulty-brackets
|
2019-03-05 10:16:18 +09:00 |
|
Dean Herbert
|
d4041d5d42
|
Automate includes of files in ArchiveModelManager use cases
|
2019-03-01 10:25:21 +09:00 |
|
Dean Herbert
|
0788a7e9f1
|
Merge branch 'master' into more-inspections
|
2019-02-28 14:32:57 +09:00 |
|
Dean Herbert
|
42be7857d1
|
Use expression body for property get/set where possible
|
2019-02-28 13:58:19 +09:00 |
|
Dean Herbert
|
26d53d06a9
|
Fix remaining issues
|
2019-02-28 13:31:40 +09:00 |
|
Dean Herbert
|
56697339b3
|
Merge branch 'master' into fix-disabled-set-crash
|
2019-02-27 11:14:42 +09:00 |
|
Dean Herbert
|
314f35b0c5
|
Further simplify import messaging
|
2019-02-25 18:42:08 +09:00 |
|
Dean Herbert
|
80737b9ef8
|
Remove "silent" parameter; consolidate import logic
|
2019-02-25 18:24:06 +09:00 |
|
Dean Herbert
|
4e06d5c7cd
|
Avoid fatal exceptions being thrown on download failure
Closes #4313.
|
2019-02-24 00:33:11 +09:00 |
|
Dean Herbert
|
367bc53a06
|
Revert some more instances of 'e' variable names
|
2019-02-22 20:15:25 +09:00 |
|
Dean Herbert
|
3015d40f8f
|
Merge branch 'master' into osu-fontusage
|
2019-02-22 18:09:23 +09:00 |
|
Dean Herbert
|
3fe4b8fd1c
|
Update variable names
Also cleans up some weird code
|
2019-02-22 17:51:39 +09:00 |
|
Dean Herbert
|
452caabd40
|
Apply suggestions from code review
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
|
2019-02-22 17:06:49 +09:00 |
|
smoogipoo
|
d8c55bc729
|
Adjust namespaces
|
2019-02-21 19:05:52 +09:00 |
|
smoogipoo
|
bca347427f
|
Update with framework bindable changes
|
2019-02-21 18:56:34 +09:00 |
|
smoogipoo
|
7e41fbc29b
|
Remove LegacyDifficultyCalculator
|
2019-02-21 13:12:37 +09:00 |
|
smoogipoo
|
4db5531e4b
|
Replace copy-constructor/method with extension method
|
2019-02-20 19:32:30 +09:00 |
|
smoogipoo
|
0693ab8e7d
|
Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
|
2019-02-20 15:04:08 +09:00 |
|
smoogipoo
|
a2aa3ec5cb
|
Adjust sprite texts in-line with framework changes
|
2019-02-20 15:03:20 +09:00 |
|
smoogipoo
|
a8faa942a6
|
Implement new difficulty calculator structure
|
2019-02-18 14:49:43 +09:00 |
|
Poyo
|
66de451b53
|
Update difficulty color bracket thresholds
|
2019-02-14 02:19:41 -08:00 |
|
Dean Herbert
|
88ffc78103
|
Restructure
|
2019-02-11 19:11:34 +09:00 |
|
Dean Herbert
|
ca5c8d37d1
|
Use leased bindables
|
2019-02-01 16:44:06 +09:00 |
|
Dean Herbert
|
327a34f12a
|
Merge remote-tracking branch 'upstream/master' into download-tracking-component
# Conflicts:
# osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs
|
2019-01-31 18:45:09 +09:00 |
|
Dean Herbert
|
baea9691cc
|
Fix baetmap downloads using too much memory
|
2019-01-29 18:34:10 +09:00 |
|
Dean Herbert
|
28f529ca19
|
Rename to host
|
2019-01-25 20:24:32 +09:00 |
|
Dean Herbert
|
c3b73d2d53
|
ALlow null host
|
2019-01-25 12:08:31 +09:00 |
|
Dean Herbert
|
bda5a90252
|
Readonly variable
|
2019-01-25 11:50:52 +09:00 |
|
Dean Herbert
|
6b3d53750c
|
Fix remaining cases of not using host-created TextureLoaderStore
|
2019-01-25 11:48:28 +09:00 |
|
Dean Herbert
|
8617aaa2a7
|
Update licence header (and remove year)
|
2019-01-24 17:43:03 +09:00 |
|
Dean Herbert
|
7d6d7cf457
|
Merge remote-tracking branch 'upstream/master' into download-tracking-component
# Conflicts:
# osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs
|
2019-01-23 11:06:29 +09:00 |
|
Dean Herbert
|
5ea6e8e247
|
Allow full osu!direct usage regardless of supporter status for now
|
2019-01-22 14:22:38 +09:00 |
|
Dean Herbert
|
21e79f51b1
|
Remove necessity of BeatmapSetDownloader
|
2019-01-18 14:28:06 +09:00 |
|
smoogipoo
|
cf8bcb7ba2
|
Add explicit beatmap -> scores relationship rather than relying on cascades
|
2019-01-08 17:53:43 +09:00 |
|
Dean Herbert
|
49ba4e5a14
|
Merge branch 'master' into update-framework
|
2019-01-07 18:51:54 +09:00 |
|
Dean Herbert
|
f6018294b5
|
Update framework
|
2019-01-07 18:50:27 +09:00 |
|
Roman Kapustin
|
4b5fc85875
|
Use Find instead of FirstOrDefault
|
2019-01-05 19:35:33 +03:00 |
|
Dean Herbert
|
55607634b4
|
Fix covers being loaded even when off-screen
|
2018-12-28 13:30:05 +09:00 |
|
Dean Herbert
|
cf079690e5
|
Use LargeTextureStore for online retrievals
|
2018-12-27 22:13:51 +09:00 |
|
smoogipoo
|
eaba9e1378
|
Fix mode icon not being updated for correct ruleset
|
2018-12-27 18:16:30 +09:00 |
|
Dean Herbert
|
26834abd33
|
Fade and no schedule
|
2018-12-26 21:18:55 +09:00 |
|
Dean Herbert
|
c902c1587a
|
Add tests and modify fallback logic
|
2018-12-25 19:17:32 +09:00 |
|
smoogipoo
|
96c9e5f209
|
Make DefaultBeatmap readonly
|
2018-12-25 18:34:45 +09:00 |
|
Dean Herbert
|
9542e3e24a
|
Add Updateable beatmap sprite
|
2018-12-25 18:04:13 +09:00 |
|
Dean Herbert
|
b5ba74a628
|
Add more specific checks
|
2018-12-05 02:12:15 +09:00 |
|
Dean Herbert
|
c7c5837ec1
|
Fix GetWorkingBeatmap potentially loading same beatmap twice
This could be seen when using the previous/next buttons in the MusicController while at song select.
|
2018-12-05 01:45:32 +09:00 |
|
smoogipoo
|
a8ad7d4670
|
Add silent import parameter
|
2018-11-30 18:27:13 +09:00 |
|
Dean Herbert
|
059e9e180b
|
Apply review
|
2018-11-30 18:07:15 +09:00 |
|
Dean Herbert
|
aa7a665317
|
Merge remote-tracking branch 'upstream/master' into scoredatabase
|
2018-11-30 17:20:23 +09:00 |
|
Dean Herbert
|
e82ad3539b
|
Move JsonIgnore specification to interface
|
2018-11-30 16:39:25 +09:00 |
|
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 |
|