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
smoogipoo
356a60b561
Fix hitobjects in scrolling rulesets getting masked away
2018-09-12 15:14:51 +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
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
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
ccd7c1a17d
Cancel request on disposal for safety
2018-09-06 17:04:33 +09:00
Dean Herbert
2356588508
Merge branch 'master' into replay_keycounter
2018-09-06 16:10:38 +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
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
