Commit Graph

9098 Commits

Author SHA1 Message Date
b8afd01950 Merge branch 'master' into fix_combo 2018-09-13 21:55:19 +02:00
1c2cc3837a Compute combo for nested Objects. Display fruit depending on Combo for
osu!catch
2018-09-13 21:52:15 +02:00
c6b909e4a5 Merge branch 'master' into judgement-fixes 2018-09-14 04:03:54 +09:00
04853b8c83 don't show StatusPill without a difficulty 2018-09-13 13:49:57 +02:00
638a2e5ba8 populate Status for Beatmap + BeatmapSet
also added Status to APIBeatmap + APIBeatmapSet
2018-09-13 11:57:40 +02:00
5414ce9932 add StatusPill to BeatmapInfoWedge and DrawabelCarouselBeatmapSet 2018-09-13 10:18:20 +02:00
13b988053a add status column to BeatmapInfo + BeatmapSetInfo 2018-09-13 10:10:58 +02:00
221a99d886 fix StatusPill not setting text when initially set with NONE 2018-09-13 10:07:26 +02:00
4341d258af Make readonly instead 2018-09-13 14:03:21 +09:00
0be3ba946f Fix system user attempting to show in profile overlay 2018-09-13 13:40:46 +09:00
067bc39185 Update nuget package 2018-09-13 12:47:26 +09:00
96b4cb7821 Merge branch 'master' into texture-dispose-fix 2018-09-13 11:54:23 +09:00
04f49200e2 Merge branch 'master' into fix-collection-modified 2018-09-13 11:43:48 +09:00
356a60b561 Fix hitobjects in scrolling rulesets getting masked away 2018-09-12 15:14:51 +09:00
02313c6d6e Wait longer before confirming test players are cleaned up 2018-09-11 13:21:05 +09:00
9b0954ab81 Reference whether texture is available rather than disposed 2018-09-11 11:28:02 +09:00
7c7f0e11e3 Merge branch 'master' into fix-logo-overhead 2018-09-11 01:22:44 +09:00
144779c698 Update framework 2018-09-11 00:30:13 +09:00
92386edb32 Scale the results screen score to keep it in view 2018-09-10 18:13:44 +09:00
55372496d1 Fix thread-safety of queued events list in ArchiveModelManager 2018-09-09 22:37:15 +09:00
27ac7685e1 Bring music controller in front of notification overlay 2018-09-09 22:12:37 +09:00
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
0f9aa834e5 Fix osu! logo being present throughout the whole game 2018-09-08 16:31:59 +09:00
125b569ccb Change AudioClock type to IFrameBasedClock and comment its usage 2018-09-07 21:39:41 +03:00
dae54d252d Remove redundant checks in RestoreState 2018-09-07 21:35:32 +03:00
6c150c9ed7 Remove unnecessary override 2018-09-08 03:21:42 +09:00
c1cdff8505 Add default resolution to avoid crashing 2018-09-07 19:29:51 +09:00
cc533a05c5 Update framework 2018-09-07 19:00:43 +09:00
7cca990be4 Merge remote-tracking branch 'upstream/master' into framework-image-changes 2018-09-07 18:56:00 +09:00
bb67f1a361 Merge remote-tracking branch 'upstream/master' into add-skin-import-delete 2018-09-07 18:18:03 +09:00
75d2cb199c Fix formatting 2018-09-07 18:14:27 +09:00
168dbe9329 Fix error notification 2018-09-07 18:14:23 +09:00
81da7ce298 Merge branch 'master' into add-skin-import-delete 2018-09-07 16:48:01 +09:00
2c0ba401d5 Add ability to click on imported complete notification to present last import 2018-09-07 16:30:11 +09:00
bf0ad723f5 Add default fallback for headless operation 2018-09-07 14:35:38 +09:00
f76d00e8ae Simplify null checks 2018-09-07 14:31:38 +09:00
8b217ad803 Merge branch 'master' into select_resolution_in_fullscreen_mode 2018-09-07 14:25:10 +09:00
1327aed164 Update framework again 2018-09-06 19:23:19 +09:00
01389f0443 Merge remote-tracking branch 'upstream/master' into update-framework-with-everyrthing 2018-09-06 18:04:58 +09:00
da906c0ddf Update framework 2018-09-06 18:03:27 +09:00
a1780fddc9 DrawInfo -> DrawColourInfo 2018-09-06 18:02:04 +09:00
ab7c0ccd18 Merge remote-tracking branch 'smoogipoo/spritetext-rewrite' into update-framework-with-everyrthing 2018-09-06 18:00:54 +09:00
966101e50e Merge branch 'framework-refcount-changes' into update-framework-with-everyrthing 2018-09-06 18:00:36 +09:00
2ba7885e58 Merge branch 'unload-carousel-panels' into update-framework-with-everyrthing 2018-09-06 18:00:25 +09:00
6a783f7521 Merge pull request #3347 from peppy/load-fonts-earlier
Begin loading fonts earlier in startup
2018-09-06 17:58:24 +09:00
58063faee3 Merge pull request #3367 from peppy/remove-async-working-baetmap-logic
Remove async WorkingBeatmap logic
2018-09-06 17:57:45 +09:00
4e012042ab Fix renaming variables too eagerly 2018-09-06 17:57:09 +09:00
80bab8e898 Merge pull request #3346 from peppy/api-ref-reduction
Don't use ConcurrentQueue for API
2018-09-06 17:55:40 +09:00
d05cd52d9a Run the queue faster if multiple requests are pending 2018-09-06 17:38:15 +09:00
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