1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 10:13:21 +08:00
Commit Graph

14271 Commits

Author SHA1 Message Date
miterosan
79c3c826ba Merge branch 'master' of https://github.com/ppy/osu into Cakefy_osu! 2018-09-11 21:49:21 +02:00
miterosan
399d456edb Pin the addin and tool versions down. 2018-09-11 21:49:10 +02:00
Dean Herbert
5e5a74293e
Merge pull request #3405 from peppy/update-framework
Update framework
2018-09-11 00:45:05 +09:00
Dean Herbert
144779c698 Update framework 2018-09-11 00:30:13 +09:00
Dean Herbert
591ce67e24
Merge pull request #3403 from smoogipoo/results-auto-scaling
Scale the results screen score to keep it in view
2018-09-10 18:40:49 +09:00
smoogipoo
92386edb32 Scale the results screen score to keep it in view 2018-09-10 18:13:44 +09:00
Dan Balasescu
f0a9801944
Merge pull request #3392 from peppy/online-texture-improvements
Use LargeTextureStore for all online texture retrieval
2018-09-10 12:02:16 +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
6c150c9ed7 Remove unnecessary override 2018-09-08 03:21:42 +09:00
Dean Herbert
b14d5e9fdc
Merge pull request #3368 from peppy/framework-image-changes
Update in line with framework Image changes
2018-09-07 20:05:46 +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
20719439c6
Merge pull request #3339 from peppy/add-skin-import-delete
Add skin import and mass delete options
2018-09-07 18:27:47 +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
0537875665
Merge pull request #3381 from peppy/click-to-view-import
Add ability to click on imported complete notification to present last import
2018-09-07 17:58:21 +09:00
Dean Herbert
8bdc700776
Merge branch 'master' into click-to-view-import 2018-09-07 17:39:46 +09:00
Dean Herbert
e5cad89dd6
Merge pull request #3374 from peppy/visible-long-notes
Increase visibility of osu!mania long notes
2018-09-07 17:39:21 +09:00
Dean Herbert
f34e3d70d2
Merge branch 'master' into visible-long-notes 2018-09-07 17:27:30 +09:00
Dean Herbert
ced6e5efd0 Synchronise animation; reduce flashiness 2018-09-07 17:17:03 +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
d48e11dbcd
Merge pull request #2715 from UselessToucan/select_resolution_in_fullscreen_mode
Add dropdown for selecting fullscreen resolution
2018-09-07 16:28:14 +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
a2ba68d147
Mention LD_LIBRARY_PATH requirement for linux building in README
Closes #3257.
2018-09-07 03:18:39 +09:00
Dean Herbert
1e39b84089 Increase visibility of osu!mania long notes 2018-09-06 23:49:54 +09:00
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