1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-18 05:06:14 +08:00
Commit Graph

41 Commits

Author SHA1 Message Date
Dean Herbert
2f42c57f4b Add safeties to ensure the current track doesn't loop or change 2020-09-03 13:15:23 +09:00
Dean Herbert
547c8090e5 Improve game exit music fade 2020-09-03 13:15:23 +09:00
Dean Herbert
6a765d2d76 Add smooth fading between audio tracks on transition 2020-09-02 20:04:56 +09:00
Dean Herbert
f63d1ba612 Remove stray call to LoadTrack that was forgotten 2020-08-21 18:52:53 +09:00
Dean Herbert
0ae460fb8f Avoid beatmap load call in IntroScreen 2020-08-21 15:50:14 +09:00
Dean Herbert
d9debef156 Add explicit LoadTrack method 2020-08-17 15:38:16 +09:00
smoogipoo
070d71ec27 More cleanups 2020-08-12 00:48:38 +09:00
smoogipoo
e87f50f74f Rename method 2020-08-07 22:31:41 +09:00
smoogipoo
ef689d943a Fix intros playing incorrectly 2020-08-06 18:54:08 +09:00
smoogipoo
5c05fe3988 Expose track from MusicController 2020-08-06 16:24:14 +09:00
smoogipoo
6e42b8219c Move track to MusicController, compiles 2020-08-06 16:24:14 +09:00
Shivam
24dceb9f84 Make only "Welcome" loop 2020-06-29 01:41:47 +02:00
Shivam
270384e71e Remove redundant get set 2020-06-29 00:59:44 +02:00
Shivam
5689f27987 Make sure it only loops for themed intros if true 2020-06-29 00:54:06 +02:00
Shivam
ffbce61ca8 Add the option to loop the intro in the main menu 2020-06-29 00:42:47 +02:00
Shivam
4bfc16b4ce Implement changes from review
Moves seeya back to the introscreen and uses a virtual string to change whenever it's needed and removed remainingTime()
2020-06-13 17:48:15 +02:00
Shivam
81c392b841 Change hash to be lowercase and change sample directories 2020-06-12 15:57:23 +02:00
Dean Herbert
c0afe4c880
Merge branch 'master' into fallback-intro 2020-06-12 17:19:11 +09:00
Dean Herbert
dd61d6ed04 Attempt to reimport intro if a bad state is detected 2020-06-08 14:48:42 +09:00
Shivam
888b90b426 Rename IntroFallback classes to IntroLegacy
This commit also renames files accordingly with https://github.com/ppy/osu-resources/pull/103
2020-06-02 13:14:50 +02:00
Shivam
19d73af90d Implement basic intro sequence 2020-06-02 12:51:42 +02:00
Shivam
2aadb9deba Implement welcome and seeya samples 2020-06-02 11:05:18 +02:00
alex
0e2ccac33b Add spaces to comments 2020-05-04 18:36:24 -07:00
Dean Herbert
21c6ac8c43 Allow closing the game during intro 2020-04-30 12:12:28 +09:00
Dean Herbert
119000f1ab Reduce database includes where possible 2020-04-28 21:43:35 +09:00
smoogipoo
91735ff367 Update MathUtils namespace usages 2020-01-09 13:43:44 +09:00
Dean Herbert
52770f803d Fix incorrect beatmap usage 2019-10-08 12:15:32 +09:00
Dean Herbert
cbb120cd38 Switch beatmap to private 2019-10-08 12:09:42 +09:00
Dean Herbert
c280bee894 Protect configuration bindables 2019-10-08 12:08:47 +09:00
Dean Herbert
b8b2ff2674 Move welcome to local usages 2019-10-08 12:07:59 +09:00
Dean Herbert
4ba2dccde3 Reorder file contents 2019-10-08 12:05:52 +09:00
Dean Herbert
a0bb193342 Remove unnecessary beatmap storage 2019-10-08 12:04:13 +09:00
Dean Herbert
449e53ee6d Centralise track handling 2019-10-08 12:03:42 +09:00
Dean Herbert
c3d56088d8 Make constant private 2019-10-08 11:54:39 +09:00
Dean Herbert
3c0b1be7f4 Add xmldoc where applicable 2019-10-08 11:52:16 +09:00
LeNitrous
afa043aa7d always use default samples 2019-09-24 18:17:27 +08:00
LeNitrous
5024770544 move common logic to IntroScreen 2019-09-23 20:52:44 +08:00
Dean Herbert
724365c6d1 Minor tidying 2019-08-21 14:01:07 +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
0580c32263 Abstract intro screen logic to base class 2019-07-09 18:05:57 +09:00