Commit Graph

14338 Commits

Author SHA1 Message Date
75c7f521ea Merge branch 'master' into framework-refcount-changes 2018-09-06 16:10:30 +09:00
5351f802cd Merge pull request #3357 from peppy/fix-ci-explode-failure
Fix CI failures on CatcherArea.Explode
2018-09-06 16:06:18 +09:00
91aada8be5 Fix ScaleAdjust going missing 2018-09-06 14:20:55 +09:00
e63f60231a Optimise carousel memory usage by unloading off-screen panels 2018-09-06 13:31:37 +09:00
29b0d62f21 Changes in line with framework refcount changes 2018-09-06 13:29:57 +09:00
4ff66bf531 Update in line with framework Image changes 2018-09-06 13:28:44 +09:00
89a92ab7eb Fix potential thread-safety issue 2018-09-06 13:27:53 +09:00
65018705f4 Restore IsLoaded check 2018-09-06 13:09:57 +09:00
8d9e0ff1c3 Remove async WorkingBeatmap logic 2018-09-06 12:51:23 +09:00
c03d1d9566 Attempt to fix CI failures on CatcherArea.Explode 2018-09-06 10:14:23 +09:00
7a1fdd9dc8 Reset KeyCounter if targetState was not found 2018-09-06 01:01:36 +03:00
214fa4700d Merge branch 'master' into ArrangeMod 2018-09-05 21:29:54 +02:00
4c42d40314 Correct the comment from explosion to object 2018-09-05 21:09:09 +02:00
9b753bb429 Merge pull request #3321 from peppy/fix-importing
Fix order of import set conflict checks
2018-09-05 18:51:15 +09:00
a7de2bda39 Merge pull request #3356 from Joehuu/fix-direct-list-play-button
Fix direct list play button disappearing after preview/switch
2018-09-05 16:08:30 +09:00
d5acc96efa Apply changes in line with osu!framework changes 2018-09-05 14:59:37 +09:00
77455e4463 Fix direct list play button disappearing after preview/switch 2018-09-04 19:44:49 -07:00
581da108fc Rewrite to not suck 2018-09-05 11:32:38 +09:00
46b6601cbf Merge remote-tracking branch 'upstream/master' into select_resolution_in_fullscreen_mode 2018-09-05 10:47:34 +09:00
da3eb18784 Fix the toolbar being visible during startup causing a weird offset 2018-09-05 10:46:19 +09:00
923acfbeaf Fix some web requests being run after disposal of their owner 2018-09-05 10:26:54 +09:00
5aff19eaea Merge branch 'master' into replay_keycounter 2018-09-05 08:53:02 +09:00
34c42aed89 Merge branch 'master' into ArrangeMod 2018-09-05 02:33:00 +09:00
02437d9bbf Merge branch 'master' into api-ref-reduction 2018-09-03 21:57:30 +09:00
5efa9c7652 Fix items in skin settings not always being removed corrrectly 2018-09-03 11:51:03 +09:00
43824c2a94 Switch back to default skin when the user selected skin is deleted 2018-09-03 11:50:50 +09:00
fb1e8fbdcf Remove migration code 2018-09-03 10:23:56 +09:00
fa569e5ae4 Offer to import skins on first startup 2018-09-03 10:10:39 +09:00
e67f63eab6 Improve import progress messaging 2018-09-03 10:10:04 +09:00
144e80dff6 Add "import all skins from stable" option (and mass delete) 2018-09-03 10:10:04 +09:00
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
b0f9c0f6f0 Merge pull request #3334 from agnimurus/master
Refactor some variable names for improved code readability
2018-09-01 17:38:47 +09:00
e503878956 Merge branch 'master' into master 2018-09-01 17:31:04 +09:00
562a792a99 Use thread instead of LongRunning for API 2018-09-01 13:19:22 +09:00
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
442c10db73 Merge pull request #3345 from peppy/update-framework
Update framework
2018-09-01 12:42:33 +09:00
62a8245f11 Update framework 2018-09-01 10:59:04 +09:00
174c52decf Merge pull request #3341 from peppy/rip-async
Remove async logic in line with framework
2018-08-31 23:49:12 +09:00
4c72565936 Update framework 2018-08-31 19:20:10 +09:00
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
247e1ee714 Merge pull request #3331 from smoogipoo/update-framework
Update with framework async changes
2018-08-30 15:10:28 +09:00
37bae8c840 Merge remote-tracking branch 'upstream/master' into smoogipoo-update-framework 2018-08-30 14:58:25 +09:00
46099fcbef Merge pull request #3332 from smoogipoo/fix-startup-webrequests
Fix DirectOverlay performing web requests on startup
2018-08-30 14:58:17 +09:00
3276f0f54d Update ef/sqlite version 2018-08-30 14:58:00 +09:00
9fb78852de Update framework 2018-08-30 14:58:00 +09:00
68a79f895a Fix mania throwing an exception on start of map 2018-08-30 14:58:00 +09:00
2ff48da5af Merge branch 'master' into fix-startup-webrequests 2018-08-30 14:43:29 +09:00
91a8039829 Merge pull request #3330 from peppy/fix-single-file-loading
Fix single file component loading not actually working correctly
2018-08-30 14:42:39 +09:00
b1a3dfedd1 Reduce async-await pairs 2018-08-30 14:41:16 +09:00
327bc708d7 Fix DirectOverlay performing webrequests on startup 2018-08-30 14:41:09 +09:00