1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-21 13:22:57 +08:00
Commit Graph

590 Commits

Author SHA1 Message Date
Joehu
ccc753a315 Make OverlayContainers with no blocking input VisibilityContainers 2019-10-14 16:27:59 -07:00
Dean Herbert
02c1f490f1
Merge branch 'master' into muted-notification 2019-09-28 20:33:32 +08:00
Dean Herbert
42fd323020 Move protected method 2019-09-25 22:13:49 +09:00
Craftplacer
08ab4e508f Use loadComponentSingleFile for caching 2019-09-15 17:15:52 +02:00
Craftplacer
72af640df7 Expose VolumeOverlay as available dependencies 2019-09-15 16:31:40 +02:00
Dean Herbert
53fe290ef3
Merge branch 'master' into back-button-part-2 2019-09-03 19:44:30 +09:00
Dean Herbert
40c1c6072e Add "osu!classic" as a bundled skin choice 2019-08-29 16:39:42 +09:00
Dean Herbert
5886420a5d
Merge branch 'master' into back-button-part-2 2019-08-13 21:38:31 +09:00
Dean Herbert
9aac5efa4e Move logic out of OsuGame 2019-08-13 14:42:59 +09:00
Dean Herbert
8d23cda51a Merge branch 'split-out-music-controller' into music-controller-hotkeys 2019-08-13 14:33:35 +09:00
Dean Herbert
ad24265730 Split visual component out of MusicController 2019-08-13 14:30:18 +09:00
David Zhao
4a28bdd384 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-08-13 12:26:12 +09:00
Dean Herbert
f3380c9372 Remove "jukebox" terminology 2019-08-13 12:06:57 +09:00
Lucas A
fdf76be967 Merge branch 'master' into music-controller-hotkeys 2019-08-10 16:29:02 +02:00
Lucas A
8c630b4f4c Merge branch 'refactor-osd' into music-controller-hotkeys 2019-08-10 16:25:59 +02:00
iiSaLMaN
d772bbaf8c Simplify disposing 2019-08-01 10:04:04 +03:00
David Zhao
d05b9b1734 Use dummyAPI and move load check into MusicController 2019-08-01 14:19:45 +09:00
iiSaLMaN
3af1aaeabe Unsubscribe from Completed event on old beatmap 2019-07-31 15:19:02 +03:00
David Zhao
351b6e6259 Add new options test 2019-07-31 19:47:41 +09:00
David Zhao
980686f6bf get tests running again 2019-07-31 19:30:35 +09:00
David Zhao
f81e691bf5 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-07-31 16:03:14 +09:00
David Zhao
5aece2d5f2 fix tests 2019-07-31 16:03:05 +09:00
David Zhao
82fcb88f5c update names 2019-07-30 12:11:08 +09:00
David Zhao
d70b99b4c0 Merge remote-tracking branch 'upstream/master' into back-button-part-2 2019-07-30 12:05:23 +09:00
David Zhao
6d1203a599 Move screen pushes into function, rename receptor 2019-07-30 12:00:04 +09:00
Dean Herbert
ece5a9622e Fix scores without an online ID not always presenting correctly 2019-07-30 06:32:05 +09:00
Dean Herbert
2d03c849bf
Improve testability of intro sequence (#5275)
Improve testability of intro sequence
2019-07-29 18:56:38 +09:00
David Zhao
e8c039bb8a Use a receptor model instead 2019-07-29 18:45:16 +09:00
David Zhao
2e242075b4 Remove and re-add backbutton instead and add tests 2019-07-29 16:42:23 +09:00
Dean Herbert
088c04a20f Revert "Fix BackButton handling escape before all other elements (#5440)"
This reverts commit 17a6563f4c.
2019-07-28 23:38:55 +09:00
David Zhao
bd2fce4bb7 don't use extra container 2019-07-28 13:45:54 +09:00
Dean Herbert
872822035a
Merge branch 'master' into back-button-priority 2019-07-28 12:50:18 +09:00
Dean Herbert
53ecb2ae82 Reduce notification span during beatmap imports 2019-07-26 13:48:29 +09:00
David Zhao
bbcc8f0721 Add new container level and unblock footer 2019-07-25 11:11:20 +09:00
David Zhao
263ccfcbcb Merge remote-tracking branch 'upstream/master' into back-button-priority 2019-07-24 12:50:16 +09:00
David Zhao
38559685a9 proxy backbutton instead 2019-07-24 12:47:41 +09:00
Dean Herbert
292bd22f92 Allow multiple instances of osu! when running under debug 2019-07-23 13:38:05 +09:00
Dean Herbert
ade661236a
Merge branch 'master' into intro-testing-improvements 2019-07-22 23:44:14 +09:00
Lucas A
2926932a1a Add MusicControllerToast used to display current music playback status on OSD 2019-07-20 21:10:17 +02:00
Dean Herbert
d4c1005c7e Fix incorrect comparison in line updating logic 2019-07-15 15:53:19 +09:00
Dean Herbert
0580c32263 Abstract intro screen logic to base class 2019-07-09 18:05:57 +09:00
David Zhao
fbd300e664 Move ruleset into ReplayPlayerLoader as well 2019-07-08 17:37:20 +09:00
David Zhao
6a86f62d17 Get mods from score info 2019-07-08 16:13:03 +09:00
David Zhao
5853a877c2 create base dependencies before caching, create player in playerloader 2019-07-08 15:40:10 +09:00
David Zhao
2747d7692b Create ReplayPlayerLoader for local mod caching 2019-07-08 14:55:05 +09:00
Lucas A
5f8bd6eca7 Fix CI issues + minor issues 2019-07-05 16:51:15 +02:00
Lucas A
89acd9da3e Add game-wide jukebox keybindings handling to OsuGame 2019-07-05 16:33:13 +02:00
Dean Herbert
7575047db8
Merge branch 'master' into import-stable-scores 2019-07-04 01:00:42 +09:00
Dean Herbert
466bc7f28a
Merge branch 'master' into watch-replays-4 2019-07-03 11:47:10 +09:00
Dean Herbert
f31d840c13 Dispose previous WorkingBeatmap on change 2019-07-02 22:26:08 +09:00