1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-24 12:07:27 +08:00
Commit Graph

14191 Commits

Author SHA1 Message Date
Dean Herbert
78ca36c910
Merge pull request #3371 from peppy/update-framework-with-everyrthing
Update framework with everyrthing
2018-09-06 19:32:33 +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
9f67119ba9 Fix potential nullref in IsPresent override 2018-09-06 18:01:32 +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
b05526b47f
Merge pull request #3354 from peppy/fix-web-request-schedules
Fix some web requests being run after disposal of their owner
2018-09-06 17:35:09 +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
7d2acfac51
Merge branch 'master' into unload-carousel-panels 2018-09-06 16:10:31 +09:00
Dean Herbert
75c7f521ea
Merge branch 'master' into framework-refcount-changes 2018-09-06 16:10:30 +09:00
Dan Balasescu
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
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
65018705f4
Restore IsLoaded check 2018-09-06 13:09:57 +09:00
Dean Herbert
8d9e0ff1c3 Remove async WorkingBeatmap logic 2018-09-06 12:51:23 +09:00
Dean Herbert
c03d1d9566 Attempt to fix CI failures on CatcherArea.Explode 2018-09-06 10:14:23 +09: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
Dean Herbert
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
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
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
02437d9bbf
Merge branch 'master' into api-ref-reduction 2018-09-03 21:57:30 +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
b0f9c0f6f0
Merge pull request #3334 from agnimurus/master
Refactor some variable names for improved code readability
2018-09-01 17:38:47 +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
442c10db73
Merge pull request #3345 from peppy/update-framework
Update framework
2018-09-01 12:42:33 +09:00
Dean Herbert
62a8245f11 Update framework 2018-09-01 10:59:04 +09:00
Dean Herbert
174c52decf
Merge pull request #3341 from peppy/rip-async
Remove async logic in line with framework
2018-08-31 23:49:12 +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
247e1ee714
Merge pull request #3331 from smoogipoo/update-framework
Update with framework async changes
2018-08-30 15:10:28 +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
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