1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 21:02:55 +08:00
Commit Graph

544 Commits

Author SHA1 Message Date
Dean Herbert
900df5d72f Fix crash on closing game 2019-08-23 13:02:50 +09:00
Dean Herbert
db1ff6d211 Fix video decoding loop running permanently in the background 2019-08-22 13:48:27 +09:00
Dean Herbert
6a48819055 Merge branch 'master' into update-framework-blending 2019-08-21 14:27:57 +09:00
Dean Herbert
724365c6d1 Minor tidying 2019-08-21 14:01:07 +09:00
Dean Herbert
48716f8f2b Update framework 2019-08-21 13:29:50 +09:00
Lucas A
33946f0458 Fix CI issues and update comments. 2019-08-20 11:18:41 +02:00
Lucas A
3fcd786198 Take lease on WorkingBeatmap during intro screens to prevent weird interactions with Playback control. 2019-08-18 19:32:56 +02:00
Dean Herbert
359261d4a4 Fix game not starting if intro music is disabled 2019-08-12 02:04:06 +09:00
Dean Herbert
cb0cd7ed58 Add triangles intro 2019-08-09 20:05:28 +09:00
Joehu
77df6a0cb7 Remove unused direct placeholder screen 2019-08-07 21:16:36 -07:00
Dean Herbert
a1e64106d4
Merge branch 'master' into intro-testing-improvements 2019-07-11 23:46:02 +09:00
Dean Herbert
6819c528db Use canBeNull instead of needlessly caching MusicController for tests 2019-07-11 00:20:01 +09:00
Dean Herbert
b225b2eb39 Rename to IsUserPaused 2019-07-11 00:18:19 +09:00
Desconocidosmh
100d15e651 Move reseting tempo to Editor 2019-07-10 10:43:02 +02:00
Desconocidosmh
8b8e67fd72 Add accidentally deleted code 2019-07-10 10:41:52 +02:00
Desconocidosmh
2546f647be Completely change the way we fix the bug 2019-07-09 11:32:49 +02:00
Dean Herbert
e835cd0f6f Improve information flow to Disclaimer 2019-07-09 18:08:44 +09:00
Dean Herbert
0580c32263 Abstract intro screen logic to base class 2019-07-09 18:05:57 +09:00
Dean Herbert
32fb811bc9 Merge branch 'master' into intro-testing-improvements 2019-07-09 18:05:52 +09:00
Desconocidosmh
338371c3fc Fix music playing while exiting from editor 2019-07-09 00:08:18 +02:00
Dean Herbert
be2d0048db
Merge branch 'master' into buttonsystem-entermode 2019-07-07 00:01:41 +09:00
Dean Herbert
ea911b2fd2 Ensure intro restarts track 2019-07-06 19:05:42 +09:00
David Zhao
a259247a98 use const 2019-07-05 16:07:17 +09:00
David Zhao
9eeafa0861 Merge branch 'buttonsystem-entermode' of https://github.com/nyquillerium/osu into buttonsystem-entermode 2019-07-05 13:08:48 +09:00
David Zhao
79d6670dc5 Expose durations from MainMenu and reorder 2019-07-05 13:08:45 +09:00
Dean Herbert
f4dcbbbfef Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode 2019-07-05 11:29:29 +09:00
David Zhao
be4e7d0f50 remove comment 2019-07-04 17:08:21 +09:00
iiSaLMaN
b53aeec90d Move audio adjustment inside OnResuming 2019-07-04 05:18:29 +03:00
iiSaLMaN
99603ca0b6 Fade out game volume on exiting
Invokes 'this.Exit()' on completion (simplify lines)
2019-07-04 04:50:49 +03:00
David Zhao
b2185cd3a2
Merge branch 'master' into buttonsystem-entermode 2019-07-03 15:54:34 +09:00
Dean Herbert
6e308945b1 Fix logo visualisation trying to catch up after being off-screen 2019-07-03 15:22:17 +09:00
Dean Herbert
7caa6eaed5
Remove all non-transform LogoVisualisation per-frame allocations (#5200)
Remove all non-transform LogoVisualisation per-frame allocations

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-02 22:42:18 +09:00
Dean Herbert
29bb227de2 Avoid Intro screen holding references to the intro beatmap 2019-07-02 16:28:06 +09:00
Dean Herbert
9de4bb3423 Remove all non-transform LogoVisualisation per-frame allocations 2019-07-01 16:12:20 +09:00
Dean Herbert
446fbce81c Add base class for startup screens
Avoids missing adding changes to screens like Disclaimer, which may not be shown in debug builds.
2019-06-26 01:36:17 +09:00
Dean Herbert
983cabdb98 Disallow back button on disclaimer screen 2019-06-25 22:27:50 +09:00
smoogipoo
aa81c95f30 Remove unnecessary extra property 2019-06-25 18:38:14 +09:00
smoogipoo
8c96e4c1fa Move back button to OsuGame 2019-06-25 18:33:08 +09:00
Dean Herbert
6627cdefd2
Merge branch 'master' into tournament-tools 2019-06-21 15:52:47 +09:00
Joehu
ca919f02e6 Remove bad words on code comments 2019-06-19 21:33:58 -07:00
Dean Herbert
dd926f55bd Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-19 14:55:34 +09:00
Dean Herbert
f26fe53feb Fix startup crash if main menu does not load fast enough 2019-06-19 13:16:19 +09:00
Dean Herbert
830ddbc2de Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-13 12:49:52 +09:00
Dean Herbert
606be3d7ce
Merge branch 'master' into backgrounded-beatmap-status-lookups 2019-06-12 00:22:47 +09:00
Dean Herbert
609a82bc94 Update VisibilityContainer usage in line with framework 2019-06-11 15:13:58 +09:00
smoogipoo
f090e292c9 Move ArchiveModelManager import process to async flow 2019-06-10 13:42:22 +09:00
smoogipoo
c7d0fcd42a Update drawnodes 2019-06-06 16:49:35 +09:00
smoogipoo
53a39e9142 Merge remote-tracking branch 'origin/master' into audio-refactor-update 2019-06-04 10:50:33 +09:00
David Zhao
465aa4e0f6 Prevent idle state from being updated incorrectly 2019-05-31 14:06:18 +09:00
Dean Herbert
4ca34bd5e8 Update osu! in line with audio subsystem refactor 2019-05-28 17:06:01 +09:00