Dean Herbert
468f7fd1ea
Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework
2018-10-12 19:25:08 +09:00
Dean Herbert
ad42f2244d
Add fallback logic in case a ruleset consumer forgets to add the HitObjectContainer
2018-10-12 19:15:11 +09:00
Dean Herbert
15dae9b2e4
Update nuget dependencies (version mismatches)
2018-10-12 18:51:51 +09:00
Jan Jurzitza
460c943958
Merge branch 'master' into mod-fl2
2018-10-12 11:44:55 +02:00
Dean Herbert
1de770e093
Merge branch 'master' into fix-sv
2018-10-12 18:13:50 +09:00
Dean Herbert
f7c887cf79
Merge branch 'master' into debounce-seeks
2018-10-12 17:50:39 +09:00
Dean Herbert
8e66f9a85d
Merge branch 'master' into tighten-diffcalc-tolerances
2018-10-12 17:35:33 +09:00
Dean Herbert
182aa63cc8
Update nuget dependencies
2018-10-12 17:08:59 +09:00
Dean Herbert
c52a292935
Update framework
2018-10-12 16:10:32 +09:00
Dean Herbert
d6043a6cd3
Merge remote-tracking branch 'upstream/master' into smooth-path
2018-10-12 16:03:36 +09:00
smoogipoo
e130204a3b
Merge remote-tracking branch 'origin/master' into optimise-diffcalc
2018-10-12 12:26:15 +09:00
Dean Herbert
5d26c1b771
Merge pull request #3574 from smoogipoo/hitobject-perf-improvements
...
Various performance improvements around hitobjects
2018-10-11 22:16:48 +09:00
smoogipoo
d282d16e1c
Use SortedList again
2018-10-11 20:49:12 +09: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
83fd251c7b
Pass sub-controlpoints as span slices
2018-10-11 17:44:25 +09:00
smoogipoo
0c4403ef16
Don't apply version offset during diff calc
2018-10-11 13:53:49 +09:00
Dean Herbert
aac95523ec
Merge branch 'master' into skinnable-spritetext
2018-10-10 20:26:27 +09:00
Dean Herbert
7137c01352
Merge pull request #3549 from plankp/result-no-gamemode-switch
...
Stop ruleset selector from propagating positional input
2018-10-10 20:15:30 +09:00
Dean Herbert
2babdc079c
Merge pull request #3568 from smoogipoo/fix-beatmap-details
...
Fix beatmap details not displaying
2018-10-10 20:14:58 +09:00
Dean Herbert
3fad1c42bb
Merge branch 'master' into result-no-gamemode-switch
2018-10-10 20:03:58 +09:00
Dean Herbert
e0a8157d92
Merge branch 'master' into mod-fl2
2018-10-10 19:48:46 +09:00
Paul Teng
2181f34f74
Merge branch 'master' into result-no-gamemode-switch
2018-10-10 06:43:01 -04:00
Dean Herbert
1b6f37f3eb
Merge branch 'master' into wiggle-repeat-points
2018-10-10 19:42:10 +09:00
Dean Herbert
ed0dcb2e73
Add comment explaining why
2018-10-10 19:41:40 +09:00
Dean Herbert
d28b9860ff
Don't use "beatmapset" terminology
2018-10-10 19:26:35 +09:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format
2018-10-10 19:19:36 +09:00
smoogipoo
b56d09c83b
Set hitobject placement time manually
2018-10-10 15:32:59 +09:00
smoogipoo
f53bb81723
Remove unnecessary lambda allocation
2018-10-10 14:58:54 +09:00
smoogipoo
417ebaeb85
Reduce hitobject size by removing lazy
2018-10-10 13:03:18 +09:00
smoogipoo
1125075b37
Use list with post-sort for nested hitobjects
2018-10-10 13:02:27 +09:00
Paul Teng
a91dda1a89
Merge branch 'master' into result-no-gamemode-switch
2018-10-09 13:04:53 -04:00
HoLLy
4bd1416a89
Merge branch 'master' into database-standardize-paths
2018-10-09 18:28:44 +02:00
HoLLy
b35f88b8ba
Standardize AudioFile and BackgroundImage paths
2018-10-09 17:49:18 +02:00
Paul Teng
ae79c3832e
Add base. for safety
2018-10-09 11:05:15 -04:00
Dean Herbert
3be50c2941
Merge branch 'master' into return_to_large_logo_after_idle
2018-10-09 18:02:36 +09:00
Dean Herbert
06ea174f34
Merge branch 'master' into fix-sv
2018-10-09 18:00:34 +09:00
smoogipoo
6d24bde72b
Fix beatmap details not displaying
2018-10-09 17:39:27 +09:00
smoogipoo
ccb6723711
Debounce music controller seeks
2018-10-09 16:50:29 +09:00
Dan Balasescu
a2838d32bf
Merge branch 'master' into skinnable-spritetext
2018-10-09 16:23:43 +09:00
Dean Herbert
a171ed3500
Fix joined channels not appearing as joined in the channel list
2018-10-09 16:12:20 +09: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
Paul Teng
8873fa3fca
Merge branch 'master' into result-no-gamemode-switch
2018-10-08 14:10:51 -04:00
HoLLy
97f8619301
Add database migration for standardizing paths
2018-10-07 21:07:30 +02:00
HoLLy
db443babb6
Fix database entries using platform-specific path separator
2018-10-07 19:15:42 +02:00
Paul Teng
aedb6e3bb7
Remove dedundant this qualifier
2018-10-06 08:12:29 -04:00
Paul Teng
6b236e3f2a
Handle non positional input only when opened
2018-10-06 08:06:26 -04:00
Paul Teng
ca9cbf1aea
Fix rulsets being completed unselectable
2018-10-06 07:51:56 -04:00
Paul Teng
8b27741cb0
Do not propagate positional input to subtree
2018-10-05 11:37:44 -04:00
Paul Teng
8264dd49de
Update bindable only if enabled
2018-10-05 07:13:18 -04:00
smoogipoo
f7ebd063c3
Make user profile graph use a smooth path
2018-10-05 15:45:53 +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
ff559a3a1b
Merge remote-tracking branch 'origin/master' into playfield-scaling-rework
...
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-10-05 10:40:16 +09:00
Dean Herbert
716eee9a5c
Fix last visit not supporting null values
...
Can now be null if a user chooses to hide their online status
2018-10-05 00:25:40 +09:00
ekrctb
b9d0fc927b
Remove duplicated code
2018-10-04 18:03:34 +09:00
Dan Balasescu
20391fd28c
Merge branch 'master' into fix-button-disable-regression
2018-10-04 15:43:50 +09:00
Dean Herbert
d801ce7afb
Merge pull request #3318 from cl8n/update-user-api
...
Update LastVisit JSON property name
2018-10-04 13:56:37 +09:00
smoogipoo
e931aa3d9e
Move positional modifications to HitCirclePlacementMask
2018-10-04 13:43:50 +09:00
Dean Herbert
593dee202c
Fix gameplay mouse button disable setting no longer having any effect
...
Regressed at 50091252e2 (diff-20562da8cde558aacafa9540b97b7975)
2018-10-04 03:07:00 +09:00
Dean Herbert
88bcc48204
Merge branch 'master' into fix-screenshot-cursor
2018-10-04 02:34:19 +09:00
smoogipoo
7809ce9361
Fix 1-frame position discrepancy
2018-10-03 17:05:22 +09:00
smoogipoo
934b687965
Fix selection masks not being added for new objects
2018-10-03 16:49:59 +09:00
smoogipoo
34ed60830c
Keep the placement hitobject time up-to-date
2018-10-03 16:44:37 +09:00
smoogipoo
3420e0c7eb
Re-implement composition tools + implement placement masks
2018-10-03 16:27:26 +09:00
smoogipoo
540a010fbb
Implement an intermediary EditRulesetContainer
2018-10-03 15:36:24 +09:00
smoogipoo
4cdb6dcea5
Rename HitObjectMask -> SelectionMask
2018-10-03 13:28:00 +09:00
ekrctb
68980fc477
Adjust usage of Handle(Non)PositionalInput to follow framework update
2018-10-02 14:45:33 +09:00
ekrctb
b7a2ad1aa5
Use UIEvent level getters for modifier keys.
2018-10-02 13:26:36 +09:00
ekrctb
50091252e2
Adapt signature change of event handlers
2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af
Change signature to new event handler
2018-10-02 12:02:47 +09:00
smoogipoo
97c585c54c
Fix cursor not hiding in screenshots
2018-10-02 10:12:07 +09:00
Dan Balasescu
0f51007867
Merge branch 'master' into judgement-cleanup
2018-10-02 09:37:04 +09:00
Dan Balasescu
87d8945af9
Give the body a size
2018-10-02 09:33:31 +09:00
Dan Balasescu
b1450b1f1a
Merge branch 'master' into fix-3514
2018-10-02 09:24:58 +09:00
AtomCrafty
6c55efdf20
Add true to BindValueChanged call to hide resolution dropdown when starting in windowed mode
2018-10-01 13:12:34 +02:00
smoogipoo
b68eeae777
Fix scrolling rulesets not accounting for slider multiplier
2018-10-01 18:12:30 +09:00
Hanamuke
6c1b3cf1a5
Merge remote-tracking branch 'origin/AR_Catch' into AR_Catch
2018-09-30 16:09:27 +02:00
Hanamuke
b983e20067
Merge branch 'master' into AR_Catch
2018-09-30 16:01:55 +02:00
Kyle Chang
88b0c234cc
Move judgement text to internal container
2018-09-30 04:01:33 -04:00
Dean Herbert
862d3c4a69
Add back autojoins
2018-09-28 19:33:35 +09:00
Dean Herbert
3cacc11af1
Fix outdated API variable
2018-09-28 19:33:30 +09:00
Dean Herbert
6841d5c2ec
Merge remote-tracking branch 'smoogipoo/fix-beatmapinfowedge' into update-framework
2018-09-28 18:32:59 +09:00
Dean Herbert
d3eb24e70a
Fix score retrieval no longer working
2018-09-28 18:29:49 +09:00
Dean Herbert
9baf587246
Bump framework again
2018-09-28 18:25:40 +09:00
Dean Herbert
e1c187b641
Merge remote-tracking branch 'origin/update-chat-api' into update-framework
2018-09-28 18:23:09 +09:00
smoogipoo
3539874262
Add missing scale
...
Makes about a 1px difference.
2018-09-28 11:40:13 +09:00
Dean Herbert
d5d8a28b53
Add explanatory comment about startup channel joins
2018-09-28 10:01:25 +09:00
Dean Herbert
6a763334a1
Exit early as safety when no messages are received
2018-09-28 10:00:40 +09:00
Dean Herbert
f0b1aa7edf
Fix unnecessary messages retrieval
2018-09-27 20:04:22 +09:00
smoogipoo
1c242556ca
Add comments + cleanup
2018-09-27 17:40:28 +09:00
smoogipoo
8191f03503
Implement HitCircleFont skin configuration
2018-09-27 17:40:28 +09:00
smoogipoo
0d8276c5f8
Implement skinnable sprite text
2018-09-27 17:40:28 +09:00
smoogipoo
b84994e643
Make GetTexture return the post-scaled texture
2018-09-27 17:40:28 +09:00
Roman Kapustin
baf9e028c3
Fix possible idleTracker nullref
2018-09-26 19:44:01 +03:00
Dean Herbert
a4bf21268b
Merge remote-tracking branch 'upstream/master' into update-framework
2018-09-26 19:59:18 +09:00
Dean Herbert
6f3c8e9f8b
Add explicit usage via attribute
2018-09-26 19:58:58 +09:00
Dean Herbert
16d74a5983
Merge pull request #3465 from plankp/patch-1
...
Check if object to be deleted actually exists
2018-09-26 19:53:51 +09:00
Dean Herbert
2ed7785cfc
Merge remote-tracking branch 'upstream/master' into update-framework
2018-09-26 19:50:48 +09:00
Dean Herbert
1b77d9fd05
Merge branch 'update-chat-api' into update-framework
2018-09-26 19:50:23 +09:00
Dean Herbert
a77a55d71d
Merge remote-tracking branch 'smoogipoo/update-framework' into update-framework
2018-09-26 19:49:41 +09:00
Dean Herbert
b8f19f8640
Merge branch 'master' into judgement-size-fix
2018-09-26 19:42:09 +09:00
Dean Herbert
5197bf77e4
Merge pull request #3478 from peppy/fix-case-sensitivity-import-extensions
...
Fix files with upper-case extensions failing to import correctly
2018-09-26 19:40:00 +09:00
Dean Herbert
1fd2782dd4
Fix loading spinner not disappearing on empty channels
2018-09-26 19:15:02 +09:00
Dean Herbert
2436ee589d
Remove incorrect API response
2018-09-26 19:13:38 +09:00
smoogipoo
e259911875
Use invariant tolower
2018-09-26 18:44:03 +09:00
Dan Balasescu
e71e871d1f
Remove unnecessary comment
2018-09-26 18:41:55 +09:00
Dan Balasescu
3a5e380e46
Merge branch 'master' into judgement-size-fix
2018-09-26 18:36:12 +09:00
smoogipoo
a8f156584b
Update framework with positional/non-positional changes
2018-09-26 14:01:15 +09:00
Roman Kapustin
bdba22a576
Override Handle(UIEvent e) in IdleTracker
2018-09-25 20:11:10 +03:00
Roman Kapustin
c7b3fa51d5
Inject IdleTracker into ButtonSystem
2018-09-25 19:58:50 +03:00
UselessToucan
3c0b77658c
Merge branch 'master' into return_to_large_logo_after_idle
2018-09-25 19:48:38 +03:00
Dean Herbert
7cd547a760
Update chat to work with new API version
2018-09-25 20:53:24 +09:00
smoogipoo
cb500e80e4
Make BeatmapInfoWedge present until info is not null
2018-09-25 14:45:26 +09:00
Paul Teng
319ed1bf0f
Reorder if statement
2018-09-24 21:35:13 -04:00
Paul Teng
dd36b6a381
Remove unused field storage
2018-09-24 21:08:58 -04:00
Paul Teng
b95cc798b2
Remove unused fallback
2018-09-24 20:56:18 -04:00
Paul Teng
62df0ec7d4
Handle external files with File instead
2018-09-24 07:16:19 -04:00
Kyle Chang
7a43677849
Make judgements scale with cs
2018-09-22 22:54:38 -04:00
Dean Herbert
6efecc4b35
Fix files with upper-case extensions failing to import correctly
2018-09-23 05:23:49 +09:00
Roman Kapustin
5c741eaa89
Fix possible game nullref
2018-09-21 17:07:46 +03:00
Dean Herbert
dafbabec31
Fix import buttons having incorrect mappings when setting disabled states
2018-09-21 21:08:21 +09:00
Paul Teng
ed0ea3ad41
Merge branch 'master' into patch-1
2018-09-21 06:31:15 -04:00
smoogipoo
4380ef15bf
Fix potential exception during async load callback
2018-09-21 16:31:09 +09:00
Dan Balasescu
c1604145df
Merge branch 'master' into background-brightness
2018-09-21 16:20:32 +09:00
smoogipoo
0bc2bcaf14
Remove GetAspectAdjustedSize() and PlayfieldArea
2018-09-21 15:14:49 +09:00
smoogipoo
368ceec47c
Simplify creation of a playfield
2018-09-21 14:35:50 +09:00
smoogipoo
826dc6ceb7
Make Playfield not a ScalableContainer
2018-09-21 14:02:32 +09:00
Paul Teng
f01dfc2860
Merge branch 'master' into patch-1
2018-09-20 23:45:44 -04:00
Paul Teng
eaf7697b85
Add boolean return value
2018-09-20 23:21:27 -04:00
Dean Herbert
293a5dd099
Use string interpolation
2018-09-21 11:50:36 +09:00
Paul Teng
654345f380
Remove duplicate condition test
2018-09-20 22:32:24 -04:00
Paul Teng
1644719893
Update SongSelect.cs
2018-09-20 22:29:37 -04:00
Paul Teng
49fbe8443a
Test if there are beatmaps when click on delete btn
2018-09-20 22:00:20 -04:00
Paul Teng
52877eca83
Update ArchiveModelManager.cs
2018-09-20 20:01:04 -04:00
Dean Herbert
83bf38f4bc
Make menu background blurrable
...
Not actually blurring yet, needs further testing.
2018-09-21 03:13:34 +09:00
Dean Herbert
78d78b5510
Fade menu background a bit when menu is active
2018-09-21 03:13:15 +09:00
Dean Herbert
07a1c39fe5
Use random default background on starting the game
2018-09-21 03:12:20 +09:00
Dean Herbert
fa33e0bd6b
Fix background brightness being adjusted globally
2018-09-21 02:51:14 +09:00
Paul Teng
199d76217e
Merge branch 'master' into patch-2
2018-09-20 06:47:42 -04:00
Dean Herbert
aa453f8ff8
Merge remote-tracking branch 'smoogipoo/fix-fullscreen-crash' into update-framework
2018-09-20 19:03:49 +09:00
Dean Herbert
1861547c86
Apply review
2018-09-20 19:01:04 +09:00
Dean Herbert
37f3035437
Merge remote-tracking branch 'upstream/master' into update-framework
2018-09-20 18:39:48 +09:00
Dean Herbert
5ee4130351
Update framework reference
2018-09-20 18:39:44 +09:00
Dan Balasescu
4b907336c5
Move readonly field above ctor
2018-09-20 13:17:17 +09:00
smoogipoo
62135c39aa
Cleanup
2018-09-20 12:56:39 +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
Hanamuke
309d8c8cb4
CI
2018-09-19 18:43:39 +02:00
Hanamuke
e7d78b94ae
Remove ScrollingVisualisation from settings
2018-09-19 18:30:25 +02:00
Dean Herbert
ae4c371bec
Merge branch 'update-framework-event-handling' into update-framework
2018-09-20 00:29:42 +09:00
Dean Herbert
b2cf636ab5
Merge branch 'localisation-changes' into update-framework
2018-09-20 00:29:31 +09:00
smoogipoo
73fb3fa3a4
Fix macOS crashing in fullscreen mode
2018-09-19 17:52:35 +09:00
smoogipoo
38a3c2a820
Fix song select wedge sometimes not updating when localisation changes
2018-09-19 14:57:32 +09:00
smoogipoo
28f31540c4
Apply changes in-line with framework localisation changes
2018-09-19 14:07:46 +09:00
ekrctb
b790e16217
Use Click instead of now removed TriggerOnClick
2018-09-19 11:42:32 +09:00
ekrctb
a3e6973b41
Replace usage of now removed TriggerKeyPress and similar methods.
2018-09-19 11:36:55 +09:00
ekrctb
c8e9d9375f
Use new InputStateChangeEvent for RulesetInputManager
2018-09-19 11:36:55 +09:00
Hanamuke
6d229716e7
Remove unused using directives
2018-09-18 20:42:55 +02:00
Hanamuke
2afcdb1451
Add the file
2018-09-18 20:23:25 +02:00
Hanamuke
e3cc25a96a
Implement ConstantScrollingSpeedVisualiser
2018-09-18 20:21:10 +02:00
Dan Balasescu
ad31962643
Cleanup, use similar code to everywhere else
2018-09-18 15:27:21 +09:00
LastExceed
27ea6102bc
only return true on Mclick
2018-09-18 08:07:19 +02:00
Dan Balasescu
af6618a239
Merge branch 'master' into close-chattabs-with-Mclick
2018-09-18 14:52:56 +09:00
Dan Balasescu
d3bb78d139
Merge branch 'master' into add-rank-status
2018-09-18 14:10:42 +09:00
Dan Balasescu
9f1f879f3d
Merge branch 'master' into music-controller-topmost
2018-09-18 13:56:13 +09:00
Dan Balasescu
29e023b252
Merge branch 'master' into fix_combo
2018-09-18 12:54:51 +09:00
smoogipoo
aba1de8b1a
Cleanup
2018-09-18 12:54:07 +09:00
Paul Teng
8bfd981a50
Handle directory checking before entering task
2018-09-17 21:05:28 -04:00
Paul Teng
000beea01b
Merge branch 'master' into patch-2
2018-09-17 15:20:54 -04:00
WebFreak001
c9ea5ce817
Made blinds open during breaks and start
2018-09-16 16:51:18 +02:00
WebFreak001
5f3c0549c9
Sprites in blinds mod & gameplay improvements
...
There are now skinnable actual blinds (shoji screen panels)
The black overlay is still behind them to avoid cheating with skins
The blinds don't open linearly anymore, they are health squared now
When easy mod is on, there is always a little gap open
2018-09-15 23:44:22 +02:00
WebFreak001
040a44d42c
Merge branch 'master' of github.com:WebFreak001/osu into mod-fl2
2018-09-15 20:12:06 +02:00
LastExceed
ed01f3067f
Merge branch 'master' into close-chattabs-with-Mclick
2018-09-15 18:05:01 +02:00
LastExceed
fce9740f28
return true since we are handling the action
2018-09-15 18:00:47 +02:00
Dean Herbert
00d0613053
Fix new resharper redundant parenthesis inspections
2018-09-16 00:09:17 +09:00
Joehu
f99eff1192
Use consistent terminology format
2018-09-15 07:30:11 -07:00
Paul Teng
d469748612
Reformat code
2018-09-15 09:53:59 -04:00
Paul Teng
42b2c32222
Catch directory not found exception
2018-09-15 09:47:50 -04:00
Dean Herbert
6a1e2c6fa5
Update efcore packages
2018-09-15 18:49:01 +09:00
Dean Herbert
41be757a11
Merge branch 'master' into fix-logo-overhead
2018-09-15 18:33:22 +09:00
Dean Herbert
79b56cb35c
Make saveState private
2018-09-15 16:34:08 +09:00
Dean Herbert
65b2bceef2
Simplify implementation
2018-09-15 14:51:04 +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
a17200a66a
Merge branch 'master' into fix_combo
2018-09-14 18:48:13 +02:00
LastExceed
9f546bd484
close tab on Mclick
2018-09-14 13:50:35 +02:00
Dean Herbert
1662575f88
Merge branch 'master' into replay_keycounter
2018-09-14 19:08:54 +09:00
Dean Herbert
a1328fb4e5
Merge branch 'master' into fix-system-user
2018-09-14 17:19:17 +09:00
Dean Herbert
3c8c7a0459
Move ChannelManager to OsuGame
...
There's no reason for it to exist at OsuGameBase
2018-09-14 13:31:25 +09:00
Dean Herbert
be1365fb18
Improve exception text
2018-09-14 11:58:23 +09:00
Dean Herbert
24e0a984f0
Merge branch 'master' into Private_Messages
2018-09-14 11:52:04 +09:00
Hanamuke
b8afd01950
Merge branch 'master' into fix_combo
2018-09-13 21:55:19 +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
Dean Herbert
c6b909e4a5
Merge branch 'master' into judgement-fixes
2018-09-14 04:03:54 +09:00
Unknown
04853b8c83
don't show StatusPill without a difficulty
2018-09-13 13:49:57 +02:00
Unknown
638a2e5ba8
populate Status for Beatmap + BeatmapSet
...
also added Status to APIBeatmap + APIBeatmapSet
2018-09-13 11:57:40 +02:00
Unknown
5414ce9932
add StatusPill to BeatmapInfoWedge and DrawabelCarouselBeatmapSet
2018-09-13 10:18:20 +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
Dean Herbert
4341d258af
Make readonly instead
2018-09-13 14:03:21 +09:00
Dean Herbert
0be3ba946f
Fix system user attempting to show in profile overlay
2018-09-13 13:40:46 +09:00
smoogipoo
067bc39185
Update nuget package
2018-09-13 12:47:26 +09:00
Dan Balasescu
96b4cb7821
Merge branch 'master' into texture-dispose-fix
2018-09-13 11:54:23 +09:00
Dan Balasescu
04f49200e2
Merge branch 'master' into fix-collection-modified
2018-09-13 11:43:48 +09:00
Roman Kapustin
60c0428979
Remove redundant empty argument list
2018-09-12 20:54:40 +03:00
Roman Kapustin
749e89bd25
Introduce IdleTracker
2018-09-12 20:34:52 +03:00
Roman Kapustin
761d7629cd
Return to large logo after idle period
2018-09-12 18:09:19 +03:00
smoogipoo
356a60b561
Fix hitobjects in scrolling rulesets getting masked away
2018-09-12 15:14:51 +09:00
Dean Herbert
5d264fdbdd
Merge remote-tracking branch 'upstream/master' into Private_Messages
2018-09-11 13:56:57 +09:00
Dean Herbert
02313c6d6e
Wait longer before confirming test players are cleaned up
2018-09-11 13:21:05 +09:00
smoogipoo
9b0954ab81
Reference whether texture is available rather than disposed
2018-09-11 11:28:02 +09:00
Dean Herbert
7c7f0e11e3
Merge branch 'master' into fix-logo-overhead
2018-09-11 01:22:44 +09:00
Dean Herbert
144779c698
Update framework
2018-09-11 00:30:13 +09:00
smoogipoo
92386edb32
Scale the results screen score to keep it in view
2018-09-10 18:13:44 +09:00
Dean Herbert
e6d5bbd886
Merge branch 'master' into multiplayer-room-settings
2018-09-09 22:40:08 +09:00
Dean Herbert
55372496d1
Fix thread-safety of queued events list in ArchiveModelManager
2018-09-09 22:37:15 +09:00
Dean Herbert
27ac7685e1
Bring music controller in front of notification overlay
2018-09-09 22:12:37 +09:00
Dean Herbert
f149a66a4d
Use LargeTextureStore for all online texture retrieval
...
Until now, many online textures were retrieved via the default texture store, which causes them to never be removed from GPU memory. It also has a performance overhead due to mipmap generation (which will be avoided via ppy/osu-framework#1885 .
2018-09-09 02:45:37 +09:00
Dean Herbert
0f9aa834e5
Fix osu! logo being present throughout the whole game
2018-09-08 16:31:59 +09:00
Roman Kapustin
125b569ccb
Change AudioClock type to IFrameBasedClock and comment its usage
2018-09-07 21:39:41 +03:00
Roman Kapustin
dae54d252d
Remove redundant checks in RestoreState
2018-09-07 21:35:32 +03:00
Dean Herbert
6c150c9ed7
Remove unnecessary override
2018-09-08 03:21:42 +09:00
Dean Herbert
c1cdff8505
Add default resolution to avoid crashing
2018-09-07 19:29:51 +09:00
Dean Herbert
cc533a05c5
Update framework
2018-09-07 19:00:43 +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
75d2cb199c
Fix formatting
2018-09-07 18:14:27 +09:00
Dean Herbert
168dbe9329
Fix error notification
2018-09-07 18:14:23 +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
bf0ad723f5
Add default fallback for headless operation
2018-09-07 14:35:38 +09:00
Dean Herbert
f76d00e8ae
Simplify null checks
2018-09-07 14:31:38 +09:00
Dean Herbert
8b217ad803
Merge branch 'master' into select_resolution_in_fullscreen_mode
2018-09-07 14:25:10 +09:00
Dean Herbert
1327aed164
Update framework again
2018-09-06 19:23:19 +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
da906c0ddf
Update framework
2018-09-06 18:03:27 +09:00
Dean Herbert
a1780fddc9
DrawInfo -> DrawColourInfo
2018-09-06 18:02:04 +09:00
Dean Herbert
ab7c0ccd18
Merge remote-tracking branch 'smoogipoo/spritetext-rewrite' into update-framework-with-everyrthing
2018-09-06 18:00:54 +09:00
Dean Herbert
966101e50e
Merge branch 'framework-refcount-changes' into update-framework-with-everyrthing
2018-09-06 18:00:36 +09:00
Dean Herbert
2ba7885e58
Merge branch 'unload-carousel-panels' into update-framework-with-everyrthing
2018-09-06 18:00:25 +09:00
Dean Herbert
6a783f7521
Merge pull request #3347 from peppy/load-fonts-earlier
...
Begin loading fonts earlier in startup
2018-09-06 17:58:24 +09:00
Dean Herbert
58063faee3
Merge pull request #3367 from peppy/remove-async-working-baetmap-logic
...
Remove async WorkingBeatmap logic
2018-09-06 17:57:45 +09:00
Dean Herbert
4e012042ab
Fix renaming variables too eagerly
2018-09-06 17:57:09 +09:00
Dean Herbert
80bab8e898
Merge pull request #3346 from peppy/api-ref-reduction
...
Don't use ConcurrentQueue for API
2018-09-06 17:55:40 +09:00
Dean Herbert
d05cd52d9a
Run the queue faster if multiple requests are pending
2018-09-06 17:38:15 +09:00
Dean Herbert
1f47714786
Merge pull request #3355 from peppy/fix-toolbar-blip
...
Fix the toolbar being visible during startup causing a weird offset
2018-09-06 17:35:24 +09:00
Dean Herbert
c23b9b61a8
Simplify implementation in line with framework improvements
2018-09-06 17:28:08 +09:00
Dean Herbert
0cefd89ef7
Change transition to match, looks better
2018-09-06 17:22:51 +09:00
Dean Herbert
5848c16f5d
Merge branch 'master' into api-ref-reduction
2018-09-06 17:18:35 +09:00
Dean Herbert
a9d4b56aeb
Merge branch 'master' into fix-web-request-schedules
2018-09-06 17:18:09 +09:00
Dean Herbert
016e395787
Fix disposal logic
2018-09-06 17:11:23 +09:00
Dean Herbert
ccd7c1a17d
Cancel request on disposal for safety
2018-09-06 17:04:33 +09:00
Dean Herbert
6a668ffe33
Allow PrivateChannelTab to derive from ChannelTab
2018-09-06 17:00:07 +09:00
Dean Herbert
2356588508
Merge branch 'master' into replay_keycounter
2018-09-06 16:10:38 +09:00
Dean Herbert
119f81b86e
Fix disposal issues in ChatOverlay testcase
2018-09-06 15:56:04 +09:00
Dean Herbert
91aada8be5
Fix ScaleAdjust going missing
2018-09-06 14:20:55 +09:00
Dean Herbert
e63f60231a
Optimise carousel memory usage by unloading off-screen panels
2018-09-06 13:31:37 +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
Roman Kapustin
7a1fdd9dc8
Reset KeyCounter if targetState was not found
2018-09-06 01:01:36 +03: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
smoogipoo
d5acc96efa
Apply changes in line with osu!framework changes
2018-09-05 14:59:37 +09:00
Joehu
77455e4463
Fix direct list play button disappearing after preview/switch
2018-09-04 19:44:49 -07:00
Dean Herbert
581da108fc
Rewrite to not suck
2018-09-05 11:32:38 +09:00
Dean Herbert
46b6601cbf
Merge remote-tracking branch 'upstream/master' into select_resolution_in_fullscreen_mode
2018-09-05 10:47:34 +09:00
Dean Herbert
da3eb18784
Fix the toolbar being visible during startup causing a weird offset
2018-09-05 10:46:19 +09:00
Dean Herbert
923acfbeaf
Fix some web requests being run after disposal of their owner
2018-09-05 10:26:54 +09:00
Dean Herbert
5aff19eaea
Merge branch 'master' into replay_keycounter
2018-09-05 08:53:02 +09:00
Dean Herbert
ce92c8d2eb
Merge branch 'master' into Private_Messages
2018-09-05 02:40:02 +09:00
Dean Herbert
02437d9bbf
Merge branch 'master' into api-ref-reduction
2018-09-03 21:57:30 +09:00
Dean Herbert
5efa9c7652
Fix items in skin settings not always being removed corrrectly
2018-09-03 11:51:03 +09:00
Dean Herbert
43824c2a94
Switch back to default skin when the user selected skin is deleted
2018-09-03 11:50:50 +09:00
Dean Herbert
fb1e8fbdcf
Remove migration code
2018-09-03 10:23:56 +09:00
Dean Herbert
fa569e5ae4
Offer to import skins on first startup
2018-09-03 10:10:39 +09:00
Dean Herbert
e67f63eab6
Improve import progress messaging
2018-09-03 10:10:04 +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
d9e9c61731
Begin loading fonts earlier in startup
...
Should result in a considerably faster font load, as they can be concurrently loaded alongside EF.
2018-09-01 17:48:03 +09:00
Dean Herbert
e503878956
Merge branch 'master' into master
2018-09-01 17:31:04 +09:00
Dean Herbert
562a792a99
Use thread instead of LongRunning for API
2018-09-01 13:19:22 +09:00
Dean Herbert
bf6fb1c380
Don't use ConcurrentQueue for API
...
This queue type can hold several references to already dequeued requests. In our usage, this can cause old api calls to hold references to already-disposed screens (and in turn, very large memory portions).
2018-09-01 12:56:09 +09:00
Dean Herbert
62a8245f11
Update framework
2018-09-01 10:59:04 +09:00
Dean Herbert
4c72565936
Update framework
2018-08-31 19:20:10 +09:00
Dean Herbert
03084aa04b
Revert async changes
2018-08-31 07:07:10 +09:00
Dean Herbert
37bae8c840
Merge remote-tracking branch 'upstream/master' into smoogipoo-update-framework
2018-08-30 14:58:25 +09:00
Dean Herbert
3276f0f54d
Update ef/sqlite version
2018-08-30 14:58:00 +09:00
Dean Herbert
9fb78852de
Update framework
2018-08-30 14:58:00 +09:00
Dean Herbert
68a79f895a
Fix mania throwing an exception on start of map
2018-08-30 14:58:00 +09:00
Dean Herbert
2ff48da5af
Merge branch 'master' into fix-startup-webrequests
2018-08-30 14:43:29 +09:00
Dean Herbert
b1a3dfedd1
Reduce async-await pairs
2018-08-30 14:41:16 +09:00
smoogipoo
327bc708d7
Fix DirectOverlay performing webrequests on startup
2018-08-30 14:41:09 +09:00
Dean Herbert
20817fdf1d
Avoid using symbol windows can't diplay
2018-08-30 14:34:45 +09:00
unknown
499c5d28ff
Refactored variable names in OsuGame.cs for improved code readability.
2018-08-29 18:04:51 -04:00
Dean Herbert
4b54c65d3f
Fix single file component loading not actually working correctly
2018-08-29 15:11:02 +09:00
Dean Herbert
73c764d983
Update SpriteIcon
2018-08-29 03:36:01 +09:00
Dean Herbert
919e78a89a
Attempt to fix cross-thread database usage
2018-08-29 01:42:25 +09:00
smoogipoo
da2f04c79c
Update framework once more
2018-08-28 21:06:32 +09:00
Dean Herbert
0d4aa37a91
Fix order of import set conflict checks
2018-08-28 02:53:32 +09:00
smoogipoo
e7a5816d27
Use GetAsync for all samples
2018-08-27 17:30:16 +09:00
smoogipoo
1b279d383f
Use GetAsync on all textures
2018-08-27 17:26:44 +09:00
smoogipoo
21d5322899
Update with async changes
2018-08-27 17:05:58 +09:00
clayton
e1f01d6f73
Update LastVisit JSON property name
2018-08-25 20:31:33 -07:00
Dean Herbert
5c7ff31675
Add note about null return
2018-08-25 14:51:42 +09:00
Dean Herbert
8204d3292e
Log to correct file
2018-08-25 14:50:46 +09:00
DrabWeb
c72281d0f2
Change local bindings instead of room bindings.
2018-08-24 19:27:16 -03:00
DrabWeb
90e178821a
Limit max participants field to only numbers.
2018-08-24 19:19:16 -03:00
DrabWeb
c5f0b27544
Speedup transition.
2018-08-24 19:11:52 -03: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
Dean Herbert
4376ad107e
Merge branch 'master' into Private_Messages
2018-08-24 17:26:33 +09:00
Dean Herbert
59d6ccbaab
Update framework
2018-08-24 15:27:13 +09:00
Dean Herbert
196fc03180
Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
2018-08-24 15:26:46 +09:00
Dean Herbert
ffcad6e0f1
Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
...
# Conflicts:
# osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
# osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
2018-08-24 15:26:36 +09:00
Dan Balasescu
83ca3053c5
Merge branch 'master' into break-overlay-double-parallax
2018-08-24 15:10:28 +09:00
Dan Balasescu
2fee90dbd8
Merge branch 'master' into fix-notifications-too-early
2018-08-24 15:02:17 +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
90ebabd2db
Fix nullref
2018-08-23 15:21:36 +09:00
smoogipoo
c7db407832
Fix operation cancelled exception when changing visual settings
2018-08-23 14:53:16 +09:00
Dean Herbert
9f3f07df2e
Fix notifications appearing too early in load process
2018-08-23 11:21: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
9cbead55d6
Add a second parallax layer to break overlay arrows
2018-08-22 17:41:13 +09:00
Dean Herbert
1c3614d6e8
Merge branch 'master' into no-objects-logging
2018-08-22 16:42: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
2fb62827e2
Soft-handle errors when beatmap contains no objects
2018-08-22 16:01:58 +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
50b8daf939
Fix threads being cross-disposed from DatabaseContextFactory
2018-08-22 14:07:52 +09:00
smoogipoo
ce367bcc42
Fix invalid GC latency mode being set
2018-08-22 12:02:14 +09:00
Dean Herbert
859e2504c0
Merge pull request #3268 from peppy/update-framework
...
Update framework
2018-08-21 21:13:08 +09:00
Dean Herbert
4cd21fabf3
Remove extra newlines
2018-08-21 19:16:07 +09:00
Dean Herbert
22dce64d6d
Merge branch 'master' into circular-button
2018-08-21 19:15:20 +09:00
Dean Herbert
c97548804e
Update framework
2018-08-21 18:46:44 +09:00
Dan Balasescu
c4264794e0
Merge branch 'master' into relax
2018-08-21 12:11:10 +09:00
smoogipoo
fcf98390f5
Cleanup
2018-08-21 12:10:00 +09:00
smoogipoo
541c4daa81
Use ordinal string comparison in hot paths
2018-08-21 11:10:54 +09:00
Dan Balasescu
1d50dacacd
Merge branch 'master' into catch-cancelled
2018-08-21 10:24:11 +09:00
Dan Balasescu
9d2c679f12
Merge branch 'master' into fix-logo-flying
2018-08-21 10:16:03 +09:00
Dean Herbert
4a68b14447
Fix crash when selecting mods after entering play mode
...
Closes #3260 .
2018-08-21 00:15:51 +09:00
Dean Herbert
7add4a8cc7
Update framework
2018-08-20 18:26:34 +09:00
Dean Herbert
295ccabf64
Expand out on to multiple lines
2018-08-20 16:06:12 +09:00
Dean Herbert
39aa98d12d
Fix logo flying off-screen when exiting game
2018-08-20 14:58:02 +09:00
Dean Herbert
65dc9f44e5
Catch OperationCanceledException in single file load sequence
2018-08-20 14:42:37 +09:00
Dean Herbert
18aa30fcb0
Unbind song select's ruleset to avoid test failures
2018-08-20 14:27:32 +09:00
Dean Herbert
e982901205
Merge remote-tracking branch 'smoogipoo/screenshot-fix' into update-framework
2018-08-20 13:38:07 +09:00
Dean Herbert
6b0ed4a68d
Update framework
2018-08-20 13:37:59 +09:00
Dean Herbert
6a4ff19c90
Merge branch 'master' into relax
2018-08-17 23:17:07 +09:00
smoogipoo
9a1e92800b
Adjust with framework-side screenchanges
2018-08-17 14:30:44 +09:00
Dan Balasescu
e7e14cc76c
Merge branch 'master' into log-display-fix
2018-08-17 14:15:14 +09:00
Dean Herbert
5ddef1afed
Merge pull request #3245 from smoogipoo/import-output
...
Output the currently importing model
2018-08-17 13:57:57 +09:00
smoogipoo
83bda313d1
Output the currently importing model
2018-08-17 13:50:27 +09:00
smoogipoo
16d30f6756
Add explanatory comments
2018-08-17 13:31:12 +09:00
Dean Herbert
7a8aabc402
Fix notifications suggesting automatic reporting in non-deployed builds
2018-08-17 13:18:48 +09:00
Dean Herbert
49f455e55d
Merge branch 'master' into spinner-combo-fix
2018-08-17 12:59:36 +09:00
Dean Herbert
0ae487b9c9
Add back missing statement
2018-08-17 12:27:36 +09:00
Dean Herbert
4aedd252fb
Merge branch 'master' into spinner-combo-fix
2018-08-17 12:07:37 +09:00
Dean Herbert
83dc01d07c
Fix multiple sentry reports arriving for similar exceptions
2018-08-17 12:05:21 +09:00
smoogipoo
eb6f1ae72c
Fix spinners providing one extra combo
2018-08-17 09:16:28 +09:00
Dean Herbert
9f5a6457f2
Don't forward errors to sentry for local builds
2018-08-17 09:08:58 +09:00
Dean Herbert
12b81df2f3
Fix unhandled exception on startup when arguments are present
2018-08-16 22:01:04 +09:00
Dean Herbert
ff0dfa7acf
Merge branch 'master' into relax
2018-08-16 17:36:24 +09:00
Dean Herbert
6297ad95aa
Remove test exception
2018-08-16 16:49:06 +09:00
Dean Herbert
9f55afe569
Let user know automatic reporting happened
2018-08-16 16:44:12 +09:00
Dean Herbert
9fc0a75b71
Merge branch 'master' into sentry-logging
2018-08-16 13:33:24 +09:00
ekrctb
cf4cb934cf
Merge branch 'master' into fix-combo-colours
2018-08-16 10:45:54 +09:00
Roman Kapustin
8a9b3f6459
Remove rewinded keycounter states
2018-08-15 22:18:48 +03:00
smoogipoo
85dc42d47a
Re-namespace/rename CircularButton
2018-08-15 16:49:53 +09:00
smoogipoo
add78508e0
Update framework
2018-08-15 15:54:26 +09:00
smoogipoo
767c284793
Fix import not working
2018-08-15 15:49:55 +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
4c3e551295
Fix first object not receiving new combo
...
Note: If a normal catch fruit is the first object, it does not receive a new combo...
2018-08-15 11:48:28 +09:00
smoogipoo
31f324945e
Implement combo offsets
2018-08-15 11:47:31 +09:00
smoogipoo
da3e2cfee2
Catch/osu! spinners should have combo
2018-08-15 11:13:23 +09:00
smoogipoo
4f0305ffeb
Taiko convert hitobjects should not have combo
2018-08-15 10:58:59 +09:00
smoogipoo
83f75ac896
Mania convert hitobjects should not have combo
2018-08-15 10:57:11 +09:00
smoogipoo
8faf12579a
Fix field not being set correctly
2018-08-15 10:53:25 +09:00
smoogipoo
d2709613bc
Add combo offset to ConvertHitObjectParser
2018-08-15 10:49:45 +09:00
smoogipoo
ce77473910
Simplify usage of ConvertHitObjectParser
2018-08-15 10:24:56 +09:00
Dean Herbert
9cdaefb64b
Merge branch 'master' into extend-modoverlay
2018-08-15 09:23:44 +09:00
smoogipoo
aa3f6337a2
Add comment
2018-08-15 09:14:07 +09:00
Dean Herbert
607769c9ce
Merge branch 'master' into fix-rewinding
2018-08-15 08:45:34 +09:00
DrabWeb
e65bb5b54b
Remove unused usings, remove unused icon variable.
2018-08-14 12:34:05 -03:00
DrabWeb
7d8c0aca72
Order usings, use inline out variable declaration.
2018-08-14 12:25:35 -03:00
DrabWeb
3d0b1b6009
Cleanup.
2018-08-14 12:08:00 -03:00
DrabWeb
ea523baa4a
Add hover animations to GameTypePicker and RoomAvailabilityPicker.
2018-08-14 11:54:35 -03:00
DrabWeb
c66578ba5b
Allow tabbing between text fields.
2018-08-14 11:36:46 -03:00
DrabWeb
af31845c83
Fix naming conflicts in RoomSettingsOverlay.
2018-08-14 11:31:20 -03:00
DrabWeb
52b157d072
Merge https://github.com/ppy/osu into multiplayer-room-settings
2018-08-14 11:16:25 -03:00
smoogipoo
e04b2f4fa9
Fix hitobject results not rewinding
2018-08-14 18:31:32 +09:00
smoogipoo
e360985d73
Replace variables into the entire line
2018-08-14 18:15:09 +09:00
smoogipoo
f69bc23ab8
Overflow mod select to account for parallax
2018-08-14 17:26:25 +09:00
Dean Herbert
5112f9b69f
Merge branch 'master' into fix-ruleset-change
2018-08-14 14:48:09 +09:00
smoogipoo
970aa811bd
Fix mods not being reset prior to ruleset changing
2018-08-14 13:19:50 +09:00
Dean Herbert
270dc2d1be
Merge branch 'master' into judgement-rework
2018-08-14 13:16:16 +09:00
smoogipoo
b8824a41b5
Fix certain control points not being replaced
2018-08-14 11:44:53 +09:00
smoogipoo
2a5b9f79ff
Indent
2018-08-08 15:49:27 +09:00
smoogipoo
ee0cefdd5b
Merge remote-tracking branch 'origin/master' into direct-list-view
2018-08-08 15:48:34 +09:00
smoogipoo
bfbe00e6ec
Remove multiple caching
2018-08-08 15:38:09 +09:00
Dean Herbert
4453b5faca
Cache mods at PlaySongSelect
2018-08-08 12:43:08 +09:00
Dean Herbert
70ce9da321
Merge branch 'master' into judgement-rework
2018-08-07 18:09:06 +09:00
Dean Herbert
4cb7063801
Add automated testing of mod preservation/removal
2018-08-07 16:45:18 +09:00
Dean Herbert
7b8bd7f21c
Fix mod selection not restoring when re-entering song select
2018-08-07 14:49:44 +09:00
Dean Herbert
7233e863db
Update framework
2018-08-07 01:07:50 +09:00
Dan Balasescu
12b99acb2b
Merge branch 'master' into add-loading-animation
2018-08-06 13:06:51 +09:00
smoogipoo
60c94a8ea3
Fix ScoreProcessor.ApplyBeatmap never being called
2018-08-06 12:42:54 +09:00
Dan Balasescu
c1517e1521
Merge branch 'master' into judgement-rework
2018-08-06 12:30:46 +09:00
smoogipoo
2a54b5b78d
ResetResult -> RevertResult
2018-08-06 12:29:22 +09:00
smoogipoo
c48a4d9993
Add exception
2018-08-06 12:29:12 +09:00
smoogipoo
3a7488767c
Make HitObject not store the judgement
2018-08-06 11:50:18 +09:00
smoogipoo
0d6a8a2bf5
More xmldocs
2018-08-06 11:31:54 +09:00
smoogipoo
741ec0021e
Rename more judgement-related methods to "result"
2018-08-06 11:31:46 +09:00
smoogipoo
ab642b563f
CreateJudgementResult -> CreateResult
2018-08-06 11:07:41 +09:00
smoogipoo
754f3c8621
Move result creation to load(), add exceptions
2018-08-06 11:07:05 +09:00
smoogipoo
b35817c877
More xmldocs to hitobject/drawablehitobject
2018-08-06 10:55:38 +09:00
smoogipoo
5fd4ed2f4e
Rename judgement-related methods/events + commenting
2018-08-06 10:55:25 +09:00
Dean Herbert
0c920fe486
Merge branch 'master' into mania-mask-container
2018-08-06 04:22:21 +09:00
WebFreak001
b33954d9db
Implement blinds mod
2018-08-05 14:20:56 +02:00
WebFreak001
b011edd85d
added Overlays container to RulesetContainer
...
this is required for mods such as flashlight which always want to draw
objects above hitcircles. If just adding children to a RulesetContainer
the hit circles would always be above the added children (no matter
the Depth).
2018-08-05 13:12:31 +02:00
tgi74000
b1d1a2400b
Remove IUpdatableByHitObject completely
2018-08-05 09:52:19 +02:00
Dean Herbert
6d6fea47ab
Reduce animations of osu!direct list mode
...
The panels' content was flying around and felt really shocking. This fixes elements in place to provide a better experience.
2018-08-05 14:36:09 +09:00
miterosan
cc640893c2
Merge branch 'master' into Private_Messages
2018-08-04 00:33:46 +02:00
tgi74000
07d6a75e23
Rename variables to be human readable
2018-08-04 00:18:09 +02:00
Dan Balasescu
1981b94e32
Merge branch 'master' into fix-fade-discrepancies
2018-08-04 00:21:48 +09:00
Dean Herbert
808754a191
Merge branch 'master' into fix-fade-discrepancies
2018-08-03 21:50:03 +09:00
Dean Herbert
042e4e3966
Merge branch 'master' into add-loading-animation
2018-08-03 21:50:02 +09:00
Dean Herbert
46b3ba9edb
Merge branch 'master' into scroll-chat-on-message
2018-08-03 21:50:00 +09:00
Dean Herbert
8d98826f69
Update framework
2018-08-03 21:17:17 +09:00
tgi74000
7310c38df9
Add relax mod
2018-08-03 14:03:11 +02:00
Dean Herbert
fc8526d8ba
Merge branch 'master' into scroll-chat-on-message
2018-08-03 20:09:54 +09:00
Dean Herbert
b4ef3dd4dd
Add LocalMessage
2018-08-03 20:03:43 +09:00
Dean Herbert
4c57e629ff
Use private implementation
2018-08-03 19:32:34 +09:00
Dan Balasescu
e3490b1270
Merge branch 'master' into improve-visual-settings-preview
2018-08-03 19:29:12 +09:00
Dean Herbert
2ea90ef98a
Add sentry logging
2018-08-03 19:25:55 +09:00
Dan Balasescu
3460fd6e71
Merge branch 'master' into split-mod-sections
2018-08-03 18:48:31 +09:00
smoogipoo
482526135f
Make IsHit not consider nested hitobjects
2018-08-03 16:07:20 +09:00
smoogipoo
2a4994e5ce
Make hitobjects only have one judgement + result
2018-08-03 15:38:48 +09:00
jorolf
123f304cf1
update storage usages
2018-08-02 19:24:17 +02:00
smoogipoo
35b4ab5456
Introduce the concept of a "MainResult"
2018-08-02 21:07:40 +09:00
smoogipoo
8d81e66f88
Fix osu score processor crashing
2018-08-02 21:07:11 +09:00
Dean Herbert
6ee06602b8
Merge branch 'master' into mania-mask-container
2018-08-02 20:41:27 +09:00
smoogipoo
3619290c34
Split out judgement definition from judgement result
2018-08-02 20:35:54 +09:00
Dean Herbert
4bd811bd2d
Merge branch 'master' into circular-button
2018-08-02 20:25:45 +09:00
Dean Herbert
b1afcf0e5d
Add loading animation to player loader to make it more obvious when loading is complete
2018-08-02 19:47:50 +09:00
Dean Herbert
7097ecb740
Fix discrepancies in how elements of play mode fade when restarting/exiting
2018-08-02 19:08:23 +09:00
Dean Herbert
4a11f2ec2a
Improve UX when adjusting visual settings at loading screen
2018-08-02 18:18:55 +09:00
Dean Herbert
9fdba887e4
Merge branch 'master' into fix-playerloader-ready-check
2018-08-02 11:37:45 +09:00
Dean Herbert
70ee7e4afd
Scroll chat to end of buffer when posting a new message
2018-08-02 08:00:14 +09:00
smoogipoo
d51d0e8547
Initial structure for new hitobject judgement system
2018-08-01 21:45:59 +09:00
smoogipoo
41512667a8
Require all judgements to be present for map completion
2018-08-01 19:51:24 +09:00
Dean Herbert
6ce32bd431
Update remaining nuget deps
2018-08-01 19:17:16 +09:00
smoogipoo
10b8708d4e
Make SetupCircularButton adjust corner radius by height
2018-08-01 17:47:32 +09:00
smoogipoo
9eb47ae691
Make SetupCircularButton inherit OsuButton
2018-08-01 17:02:52 +09:00
smoogipoo
b9814b64ed
Move default button implementation from TriangleButton to OsuButton
2018-08-01 17:02:38 +09:00
Dean Herbert
4224d35a75
Use forked squirrel
...
Allows for updating SharpCompress, too.
2018-08-01 16:56:36 +09:00
ekrctb
ecc6d55380
Fix player loader not gets ready when multiple mouse button is down
2018-08-01 16:20:29 +09:00
Dean Herbert
3d136bf207
Remove unused nuspec
2018-08-01 03:37:59 +09:00
Shane Woolcock
4fdca2b198
Update framework
2018-07-31 21:21:26 +09:30
Shane Woolcock
47533f83c3
Update TabControl subclasses to use AddInternal
2018-07-31 20:52:11 +09:30
Dean Herbert
582bc58715
Remove unused colour propagation
2018-07-31 18:05:14 +09:00
Dean Herbert
3c06655672
Split out Special mods into Automation and Conversion
2018-07-31 18:00:42 +09:00
Dean Herbert
bcc23f10c5
Merge branch 'master' into disable-download-button
2018-07-31 17:03:41 +09:00
smoogipoo
c9d4332846
size_x, size_y -> width, height
2018-07-31 16:44:20 +09:00
Dean Herbert
9ab56bc4ef
Make Ruleset non-public
2018-07-31 16:35:51 +09:00
smoogipoo
c5a772bbc8
Completely reuse TriangleButton
2018-07-31 15:49:04 +09:00
smoogipoo
ec31028f14
Add tooltip
2018-07-31 14:50:57 +09:00
smoogipoo
70338e087a
Disable beatmap download button if not supporter
2018-07-31 14:41:31 +09:00
Dean Herbert
ddecf59cfd
Merge branch 'master' into open-downloaded-beatmas
2018-07-31 13:21:14 +09:00
Dean Herbert
6bb7f9ce9c
Merge branch 'master' into Private_Messages
2018-07-31 11:45:06 +09:00
Dan Balasescu
090bc592b5
Merge branch 'master' into add-skip-button-sound
2018-07-30 17:56:08 +09:00
Dean Herbert
4abdca92e1
Merge remote-tracking branch 'upstream/master' into phosphene47-player-esc-result
2018-07-30 14:57:04 +09:00
Dean Herbert
8c3583ac54
Remove newline
2018-07-30 14:55:03 +09:00
Dean Herbert
f57ba4ffb1
Update framework
2018-07-30 14:14:16 +09:00
miterosan
b1e9a4fd24
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
2018-07-29 23:28:34 +02:00
miterosan
8c0bcb8e3c
Fix drawable crash and lload the inital messages of newly joined channels
2018-07-29 21:40:43 +02:00
miterosan
95cb21299a
Remove chatTabControl and transfer the logic into ChannelTabControl.
2018-07-29 21:18:37 +02:00
Roman Kapustin
3134e14b37
Test KeyCounter.RestoreState
2018-07-28 23:24:03 +03:00
Roman Kapustin
8bb83a8fd9
Fix nullref in KeyCounterCollection
2018-07-28 22:16:14 +03:00
Roman Kapustin
1e6220e3c0
Call KeyCounter.RestoreState itself
2018-07-28 13:22:52 +03:00
Dean Herbert
b7de922896
Merge branch 'master' into open-downloaded-beatmas
2018-07-28 12:44:34 +09:00
phosphene47
d32a3ff052
Esc at the end of play should push to result screen
...
Closes #3060
2018-07-28 08:34:51 +10:00
AlFasGD
93cf063c97
Remove useless things
2018-07-27 12:52:33 +03:00
AlFasGD
1962797e20
Remove unnecessary using directive
2018-07-27 12:40:38 +03:00
AlFasGD
78cde95132
Privatise constants
2018-07-27 12:34:11 +03:00
AlFasGD
3ee1353976
Remove whitespace
2018-07-27 12:28:47 +03:00
AlFasGD
2a819a53c0
Prefer inheriting TriangleButton instead of Container
2018-07-27 12:26:37 +03:00
smoogipoo
464333cf0b
Merge remote-tracking branch 'origin/master'
2018-07-26 21:28:31 +09:00
Dan Balasescu
ceaa23fbbb
Merge branch 'master' into fix-turkish-i
2018-07-26 18:06:58 +09:00
Dan Balasescu
6c290702a3
Merge branch 'master' into labelled-text-box-fixes
2018-07-25 21:21:06 +09:00
AlFasGD
c4b1ba2979
Remove padding, fix corner radiuses
2018-07-25 15:14:40 +03:00
Dean Herbert
95cca046fb
Merge branch 'master' into open-downloaded-beatmas
2018-07-25 12:38:49 +02:00
Dean Herbert
ff04527c6d
Merge branch 'master' into fix-always-skipping
2018-07-25 12:30:39 +02:00
smoogipoo
206e3686f2
Add back blue border
2018-07-25 18:38:50 +09:00
smoogipoo
127084ba74
Merge remote-tracking branch 'origin/master' into labelled-text-box
2018-07-25 18:35:04 +09:00
smoogipoo
b60e4b0728
Cleanup
2018-07-25 18:34:47 +09:00
Dan Balasescu
53e55c2f14
Merge branch 'master' into fix-always-skipping
2018-07-25 15:30:24 +09:00
Dean Herbert
38f221cd60
Merge branch 'master' into fix-turkish-i
2018-07-25 08:15:20 +02:00
Dean Herbert
da8fc0ee5d
ToLower -> ToLowerInvariant
2018-07-25 07:37:05 +02:00
Dean Herbert
425b5e4119
Merge remote-tracking branch 'upstream/master' into peppy-fix-turkish-i
2018-07-25 07:36:24 +02:00
Dan Balasescu
affecccabc
Merge branch 'master' into fix-invalid-operation
2018-07-25 14:35:36 +09:00
AlFasGD
6675c455f3
Trim whitespace that magically appeared
2018-07-24 22:33:19 +03:00
AlFasGD
3ca112aef0
Clean code and apply requested changes
2018-07-24 22:04:02 +03:00
Dean Herbert
7b653fab17
Pass in lastMessageId instead of self referencing
2018-07-24 18:01:28 +02:00
Dean Herbert
6937cf27a7
Tidy up channel join logic
2018-07-24 17:51:20 +02:00
Dean Herbert
090d197b21
Remove unnecessary using
2018-07-24 17:35:08 +02:00
Dean Herbert
2d861f5897
Remove unnecessary inject
2018-07-24 15:26:02 +02:00
Dean Herbert
da730269a9
Formatting and ctor usage for required parameters
2018-07-24 15:25:47 +02:00
Dean Herbert
53f556de9a
Trim whitespace
2018-07-24 15:10:55 +02:00
Dean Herbert
5364a6148a
Use ToUpperInvariant
2018-07-24 14:42:06 +02:00
Dean Herbert
e7591a9214
Merge branch 'master' into replay_keycounter
2018-07-24 12:21:51 +02:00
Dean Herbert
1d86083981
Hide unnecessary log output
2018-07-24 12:13:48 +02:00
Dean Herbert
b38da34da9
Fix resetting database failing due to incorrect disposal logic
2018-07-24 12:13:48 +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
AlFasGD
ebf14c9c93
Update framework from current master
2018-07-24 11:32:24 +03:00
AlFasGD
d304aca08f
Merge branch 'master' into circular-button
2018-07-24 11:30:56 +03:00
AlFasGD
4d0d4523ca
Add test case, rename component
2018-07-24 11:23:38 +03:00
AlFasGD
0e50e4ee34
Clean code
2018-07-24 10:10:17 +03:00
AlFasGD
765c6e4ecc
Remove custom text box
2018-07-24 09:46:24 +03:00
AlFasGD
2f452c162c
Make text colour white
2018-07-24 09:21:01 +03:00
AlFasGD
a833fa3d92
Update framework and apply suggested changes
2018-07-24 09:19:45 +03:00
AlFasGD
cd37b0df23
Merge branch 'master' into labelled-text-box
2018-07-24 09:19:22 +03:00
miterosan
42df0c974f
Rename UserChannel to private channel.
2018-07-24 05:17:57 +02:00
miterosan
9bc225e14b
rename user to private
2018-07-24 05:14:47 +02:00
miterosan
e769c15d28
Provide XML doc in Channel.cs and ChannelManager.cs and ChatTabControl.cs
2018-07-24 05:14:33 +02:00
miterosan
3df1842e1c
Fix that in some timing specific cases the fetched channels are not getting an visual representation.
...
Sadly there is not a nice way of fixing this.
2018-07-24 04:58:40 +02:00
miterosan
55f0cbf63e
Finding peace with the UI thread.
...
There is the issue that in some cases that the ui thread blocked.
2018-07-24 04:56:34 +02:00
miterosan
16db81e9b5
Extract the message hadling logic into IncomingMessagesHandler
2018-07-24 04:54:11 +02:00
miterosan
9a6d92bb22
Rename fetchMsgReq to fetchMessageReq in ChannelManager.cs
2018-07-23 22:09:05 +02:00
miterosan
2ae890366a
Nicefy the errormessage in the constructor of GetMessagesRequest
2018-07-23 22:08:37 +02:00
miterosan
d9611dcffb
Instead of Doing nothing at LinkFlowContainer if no link was found, we log it as an error.
2018-07-23 22:06:40 +02:00
Dean Herbert
1ab75529a1
Simplify user channel message population code
2018-07-23 21:15:52 +02:00
Dean Herbert
0aacde836a
Move private channel constructor to own class
2018-07-23 20:46:44 +02:00
miterosan
2726d91594
Remove unessary usings
2018-07-23 16:05:39 +02:00
miterosan
344ec40a27
Readd usings I removed with my merge
2018-07-23 15:48:48 +02:00
miterosan
9f43e0c900
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
...
# Conflicts:
# osu.Game/Overlays/Chat/ChatTabControl.cs
# osu.Game/Overlays/ChatOverlay.cs
2018-07-23 15:45:54 +02:00
AlFasGD
dd56a2d95f
Apply proposed changes (untested)
2018-07-23 15:44:10 +03:00
Dean Herbert
1b456fd716
Fix a potential InvalidOperationException when entering song select
...
Closes #3052 .
2018-07-23 13:11:06 +02:00
Dean Herbert
2169a47325
Prevent fatal failures on delete failures
2018-07-23 10:39:43 +02:00
Dean Herbert
44a2ae5f9a
Fix incorrect variable usage
2018-07-23 08:33:47 +02:00
Dean Herbert
aead4be134
Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container
2018-07-23 06:36:10 +02:00
Roman Kapustin
332ad5bb67
Move states to KeyCounter
2018-07-22 23:58:21 +03:00
Dean Herbert
479fe98335
Add more prominent sound when skipping
2018-07-22 22:57:55 +02:00
Dean Herbert
6fa70ed696
Merge branch 'master' into centralise-judgement-display
2018-07-23 05:23:52 +09:00
Dean Herbert
3c59ccadd0
Fix gameplay always skipping to first hitobject time
...
Regresssed with previous build
2018-07-22 22:19:58 +02:00
Roman Kapustin
ecd51d70f9
Rename Memento class
2018-07-22 23:13:06 +03:00
Roman Kapustin
d387048057
Resolve KeyCounterCollection merge conflict
2018-07-22 21:15:53 +03:00
Dean Herbert
d561f54282
Merge branch 'master' into per-object-css
2018-07-23 03:01:17 +09:00
Dean Herbert
d868d81b59
Merge branch 'master' into centralise-judgement-display
2018-07-23 02:58:49 +09:00
Roman Kapustin
7f3ad37ede
Restore keycounter state on replay seek
2018-07-22 19:42:18 +03:00
Roman Kapustin
1d9bf42082
Fix clock assigning during KeyCounterCollection creation
2018-07-22 18:38:10 +03:00
Roman Kapustin
0632c59e60
Save KeyCounter state when keypress happens
2018-07-22 17:35:42 +03:00
Roman Kapustin
72959691e9
Introduce KeyCounterMemento
2018-07-22 17:16:17 +03: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
77da100c0f
Merge branch 'master' into fix-model-import
2018-07-20 23:30:41 +09:00
AlFasGD
7b4616c6c1
Add circular button file
2018-07-20 14:02:02 +03:00
AlFasGD
f200cfe40d
Add labelled text box files
2018-07-20 13:05:19 +03:00
Dean Herbert
3fc7f33e90
Merge branch 'master' into centralise-judgement-display
2018-07-20 17:29:15 +09:00
Dean Herbert
7cc999027d
Merge branch 'master' into pause-input-fixes
2018-07-20 17:20:19 +09:00
Dean Herbert
241437c819
Remove unnecessary counting change logic
2018-07-20 17:08:25 +09:00
smoogipoo
1139f0dbf2
Centralise method of disabling playfield judgements
2018-07-20 17:04:33 +09:00
Dean Herbert
fc6deb6ab5
Merge remote-tracking branch 'upstream/master' into peppy-fix-model-import
2018-07-20 16:42:46 +09:00
Dean Herbert
7fea2b3a8b
Add ToList
2018-07-20 16:38:02 +09:00
Dean Herbert
92fe996a8b
Merge branch 'master' into fix-model-import
2018-07-20 16:17:39 +09:00
Dean Herbert
0e7bb3b548
Merge branch 'master' into no-more-memory-sqlite
2018-07-20 16:17:36 +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
64ead0fdf7
Add more tests and fix one remaining issue case
2018-07-20 11:55:17 +09:00
David V
9eb69a1e76
Restructure + corrects converting to support all systems
2018-07-19 17:47:55 +02:00
David V
4e72794101
Converts float to int.
2018-07-19 15:55:38 +02:00
Dan Balasescu
5dba048c46
Merge branch 'master' into mania-mask-container
2018-07-19 19:38:43 +09:00
Dean Herbert
d7f1766ee2
wip
2018-07-19 18:51:08 +09:00
Dean Herbert
c31676f8f1
Rework update methods to separate out ruleset and beatmap changes
...
Combining them was causing complexity and logic errors.
2018-07-19 18:48:40 +09:00
Dean Herbert
693ba8e994
Add more ToString output
2018-07-19 18:43:11 +09:00
smoogipoo
b7721edc80
Remove more unnecessary changes
2018-07-19 18:25:28 +09:00
Dean Herbert
332c62f110
Merge branch 'fix-model-import' into open-downloaded-beatmas
...
# Conflicts:
# osu.Game/Beatmaps/BeatmapManager.cs
# osu.Game/Database/SingletonContextFactory.cs
2018-07-19 14:11:31 +09:00
Dean Herbert
7be3a5d466
Centralise test storage logic
2018-07-19 14:07:55 +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
82ddbb3f5d
Delay key count stop
2018-07-19 01:18:07 +09:00
Dean Herbert
41441771ae
Remove unnecessary cast
2018-07-18 22:22:28 +09:00
Dean Herbert
8414fe9d05
Add key counter exceptions for paused state
2018-07-18 22:19:32 +09:00
Dean Herbert
a01361f833
Set restart count
2018-07-18 22:05:24 +09:00
Dean Herbert
c2cdf12986
Better pause logic
2018-07-18 19:59:04 +09:00
Dean Herbert
0c24244340
Remove SingletonContextFactory
...
It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.
# Conflicts:
# osu.Game/Database/SingletonContextFactory.cs
2018-07-18 16:50:56 +09:00
Dean Herbert
1d52231d4f
Remove SingletonContextFactory
...
It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.
2018-07-18 16:44:47 +09:00
Dean Herbert
90840c9384
Fix ArchiveModelManager's model import method not running import logic
2018-07-18 13:18:50 +09:00
Dean Herbert
9611292f4e
FilterTask -> PendingFilter
2018-07-18 13:18:50 +09:00
Dean Herbert
f1c3fbe644
Improve integrity of song select bind/change logic
2018-07-18 13:18:50 +09:00