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

639 Commits

Author SHA1 Message Date
Huo Yaoyuan
87d40cf8d0 Resolve equals usages. 2019-11-13 22:35:50 +08:00
Huo Yaoyuan
f3f5094c26 Convert delegate to local function. 2019-11-12 20:14:22 +08:00
Dean Herbert
a4a57eec54 Fix game-wide performance drop when triangles intro is used 2019-10-29 01:09:49 +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
Dean Herbert
393683f8f1
Merge branch 'master' into cleanup-intros 2019-10-08 11:29:13 +09:00
HDragonHR
faf8fe132e Change bindable int to float 2019-10-02 12:26:46 +08:00
Dean Herbert
a45f8c968b Rename and add simple xmldoc 2019-09-28 20:21:51 +08:00
Salman Ahmed
3aa9a172d8
Merge branch 'master' into introduce-session-statics 2019-09-25 16:14:39 +03:00
iiSaLMaN
8844d567cb Use bindable setting instead 2019-09-25 15:56:47 +03:00
iiSaLMaN
cde7f49db1 Use direct get and set instead 2019-09-25 01:26:02 +03:00
LeNitrous
afa043aa7d always use default samples 2019-09-24 18:17:27 +08:00
smoogipoo
4555ecc5e0 Check for exact key 2019-09-24 15:09:08 +09:00
iiSaLMaN
267e12ce3c Add sample usage to the session statics 2019-09-24 05:45:47 +03:00
LeNitrous
ec78889e94 remove unused dependencies 2019-09-24 08:14:20 +08:00
LeNitrous
5024770544 move common logic to IntroScreen 2019-09-23 20:52:44 +08:00
Dean Herbert
e5b14ce74d
Add null check for safety
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
2019-09-22 21:42:32 +09:00
Dean Herbert
fc1d49631a Allow top-level menu key pressed to progress the osu! logo 2019-09-22 20:31:53 +09:00
Dean Herbert
636582e089 Always show exit confirmation when closing via alt-f4 or window control 2019-09-20 02:22:49 +09:00
Dean Herbert
67796e0982 Apply code styling suggestions 2019-09-19 22:46:21 +09:00
Dean Herbert
50d4206c45 Fix exit scenarios 2019-09-19 20:17:58 +09:00
Dean Herbert
fa54a0bfd3 Fix test failures 2019-09-19 17:40:46 +09:00
Dean Herbert
929f05884b Always confirm exit when button is clicked 2019-09-19 16:28:06 +09:00
Dean Herbert
a214e7e72f Add confirmation dialog when exiting game 2019-09-19 16:26:22 +09:00
smoogipoo
efedfefe63 Fix disclaimer potentially pushing a null screen 2019-09-17 15:54:11 +09:00
Dean Herbert
98e384129c Remove redundant initialisation 2019-09-10 01:34:48 +09:00
Dean Herbert
7eb20da820 Add back local bool (required due to action limitations) 2019-09-10 01:18:02 +09:00
Dean Herbert
f398f134e1 Remove unnecessary bool storage
Also delay show slightly for better user experience.
2019-09-10 01:12:30 +09:00
Dean Herbert
0ec642d826 Show instead of toggle 2019-09-10 01:06:37 +09:00
LeNitrous
ff49c4ae98 remove redundancies 2019-09-09 13:50:14 +08:00
LeNitrous
c2353cbdfa move logic to logo action 2019-09-09 13:30:48 +08:00
LeNitrous
04a4f9c9a3 use IsLoggedIn and remove useless clause 2019-09-09 11:26:51 +08:00
LeNitrous
be4f0cc2dd remove null conditional 2019-09-09 06:14:49 +08:00
LeNitrous
a67a2899a9 move api state check to it's own clause 2019-09-08 16:18:15 +08:00
LeNitrous
3435e2a8d3 open login on enter main menu 2019-09-08 13:36:58 +08:00
Dean Herbert
bebc3309ce Refactor skin configuration to be infinitely extensible 2019-09-03 17:57:34 +09:00
pi1024e
5695bb670e change back to queuing 2019-08-31 10:55:05 -04:00
pi1024e
1b4ae5a4a4 Spelling fixes 2019-08-31 10:55:05 -04:00
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
Dean Herbert
e93fea7dc3 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-18 19:20:44 +09:00
David Zhao
b7aed0a014 Interpolate to tracking position on from Initial button state 2019-05-17 12:21:34 +09:00
David Zhao
fcffad6553 Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode 2019-05-17 11:35:35 +09:00
David Zhao
5bf513eba8 Don't track immediately when entering mode 2019-05-17 11:24:34 +09:00
Dean Herbert
958598d13b Fix crash on switching from main menu to gameplay too fast 2019-05-15 19:39:36 +09:00