h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 10:27:35 +08:00
Code Issues Releases Wiki Activity
65,474 Commits 3 Branches 654 Tags 364 MiB
f06642c315
Commit Graph

1032 Commits

Author SHA1 Message Date
Dean Herbert
71182347d6 Also add a notifiation when trying to enter the multiplayer screen 
Turns out the only check required to get into this screen was that the
API was online, which it always is even if the multiplayer component
isn't.

This provides a better end-user experience.
 2021-02-24 11:30:14 +09:00
Dean Herbert
8a97e2e28d Update LocalisedString usages to RomanisedString 2021-02-22 19:01:42 +09:00
Dean Herbert
1fd76ea3fb Apply changes to UI components overriding functions with changing signatures 2021-02-22 19:01:42 +09:00
Dean Herbert
421cdb6650 Consume new method in existing usages (and remove some unnecessary set/unset code) 2021-02-18 15:01:11 +09:00
Dean Herbert
49589b64c3 Intro track should not restart from preview point 2021-02-18 14:55:15 +09:00
Dean Herbert
c1620ce21b Fix intro beatmap always being imported even if already in a good state 2021-02-17 19:19:49 +09:00
smoogipoo
c6ed3efa4a Merge branch 'master' into non-concurrent-sample-playback 2021-02-15 14:47:32 +09:00
smoogipoo
d3f0c0730d Merge branch 'master' into non-concurrent-sample-playback 2021-02-12 17:22:15 +09:00
Dean Herbert
4ab16694d1 Fix classic "welcome" intro not looping as expected 2021-02-12 16:22:19 +09:00
Dean Herbert
3344e9f27f
Merge pull request #11720 from nekodex/new-buttonsystem-edit-sound 
Use unique sample for edit button click (ButtonSystem)
 2021-02-11 15:10:35 +09:00
Jamie Taylor
996f1098f6 Use alternate sample on the downbeat while hovering OsuLogo 2021-02-10 18:17:48 +09:00
Jamie Taylor
22995c216d Use unique sample for edit button click (ButtonSystem) 2021-02-10 17:23:55 +09:00
smoogipoo
de9d075f94 Initial sample + samplechannel rework 2021-01-19 17:11:40 +09:00
Dean Herbert
0560eb4120 Reduce final fill alpha of main menu confirm-to-exit 2021-01-18 18:22:21 +09:00
Dean Herbert
35be7ec0e1 Add back button but rename to "browse" 2021-01-06 23:28:14 +09:00
Dean Herbert
cfbfb8d58b Revert "Remove related events" 
This reverts commit 59025e9d50.
 2021-01-06 23:21:46 +09:00
Dean Herbert
59025e9d50 Remove related events 2021-01-06 23:09:58 +09:00
Dean Herbert
32accc8eab Remove "osu!direct" button 2021-01-06 22:56:10 +09:00
Dean Herbert
b3f08b29ca Ensure that all changes to screen backgrounds are on the correct thread 2021-01-05 15:22:50 +09:00
Bartłomiej Dach
361d215ab4 Reword notification messages to match new logic 2020-12-29 10:56:59 +01:00
Bartłomiej Dach
5d23199233 Trim redundant IsLoggedIn checks 2020-12-29 10:56:29 +01:00
Dean Herbert
4d04e0dee7 Disallow entering the playlists/multiplayer screens if API is failing 2020-12-29 16:25:51 +09:00
Bartłomiej Dach
83fb7c7a1a Re-namespace all files in OnlinePlay directory 2020-12-25 16:50:09 +01:00
Dean Herbert
836d1491d0 PlaylistsMultiplayer -> Playlists 2020-12-25 23:47:18 +09:00
Dean Herbert
5d4b73baa5 RealtimeMultiplayer -> Multiplayer 2020-12-25 14:10:59 +09:00
Dean Herbert
a1384942b1 Timeshift -> Playlists at a code level 2020-12-25 13:11:21 +09:00
Dean Herbert
60c7c8b63b
Pluralise playlists in tip 2020-12-25 00:44:42 +09:00
Dean Herbert
aec25e2d73 Rename "timeshift" to "playlists" 
This only covers the user-facing instances. Code and class name changes
will happen once things have calmed down.
 2020-12-24 21:53:20 +09:00
Dean Herbert
85e93c5dde Fix main menu multiplayer icons being back to front 2020-12-22 15:22:27 +09:00
smoogipoo
3bf670510a Split into two actions 2020-12-22 14:55:25 +09:00
smoogipoo
0566ed1a9b Add button to main menu 2020-12-21 18:38:44 +09:00
smoogipoo
4494bb1eb5 Abstract RoomManager and Multiplayer 2020-12-19 00:52:27 +09:00
Dean Herbert
206bf3713e Make IAPIProvider read-only bindables into IBindables 2020-12-18 15:16:36 +09:00
Dean Herbert
898e2dae27 Restore kiai time flashing behaviour 2020-11-23 14:27:02 +09:00
Dean Herbert
ae609b9d48 Remove unnecessary local variable 2020-11-23 13:35:13 +09:00
Dean Herbert
2ae5a95d77 Change opacity value to match master implementation 2020-11-23 13:35:02 +09:00
Derrick Timmermans
61078e9ae1
Use 0.2f instead of .2f 2020-11-22 18:59:16 +01:00
Derrick Timmermans
ba7ce4c933
Make colour readonly 2020-11-22 18:37:49 +01:00
Derrick Timmermans
458016d17d
Remove AccentColour member variable from LogoVisualisation 2020-11-22 17:36:59 +01:00
Derrick Timmermans
1551402a8d
Change IntroWelcome visualiser to use Colour instead of AccentColour 2020-11-22 17:33:40 +01:00
Derrick Timmermans
b468f061f1
Remove unused using 2020-11-22 17:20:00 +01:00
Derrick Timmermans
cc33b0f2c6
Apply MenuGlow to Visualisation Colour instead of AccentColour 2020-11-22 16:53:53 +01:00
Dean Herbert
46f6e84a33 Fix disclaimer potentially running same code from two different threads 2020-10-06 12:33:57 +09:00
Dean Herbert
4792b44911 Merge branch 'master' into editor-new-beatmap 2020-09-07 18:42:51 +09:00
Dean Herbert
1f2f21e07a Merge branch 'master' into editor-new-beatmap 2020-09-04 13:11:59 +09:00
Lucas A
82e314da59 Fix merge conflicts. 2020-09-03 21:56:47 +02:00
Dan Balasescu
cf89a6e1a4
Merge pull request #10043 from peppy/better-outro-music-fade 
Improve music fade on game exit
 2020-09-03 14:24:46 +09:00
Dan Balasescu
84b3604192
Merge branch 'master' into game-overlay-activation-mode 2020-09-03 13:34:22 +09:00
Dean Herbert
e032844570 Start with a fresh beatmap when entering editor from main menu 2020-09-03 13:20:23 +09:00
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
Dan Balasescu
f08e7828da
Merge branch 'master' into beatmap-track-rework 2020-09-01 16:06:38 +09:00
Lucas A
8de7744b52 Add back disabling of overlays on exiting game. 2020-08-29 19:34:53 +02:00
Lucas A
ad223bc460 Make game bindable immutable. 2020-08-29 19:34:53 +02:00
Poliwrath
edc15c965c
Update osu.Game/Screens/Menu/IntroSequence.cs 
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
 2020-08-26 12:52:39 -04:00
Dean Herbert
f65991f31f Revert some usages based on review feedback 2020-08-26 23:28:58 +09:00
Poliwrath
c50e495e03 fix lingering small ring in circles! intro 2020-08-26 02:49:55 -04:00
Dean Herbert
f63d1ba612 Remove stray call to LoadTrack that was forgotten 2020-08-21 18:52:53 +09:00
Dean Herbert
1edafc39ba Fix intro welcome playing double due to missing conditional 2020-08-21 18:33:24 +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
Dean Herbert
0c4aefb15e Merge branch 'master' into beatmap-track-rework 2020-08-17 15:00:29 +09:00
Dean Herbert
5d433c0b05 Fix a couple of new Resharper inspections 2020-08-16 23:11:29 +09:00
Dean Herbert
a6708c4286 Rename resolved variable in MainMenu 2020-08-16 23:04:54 +09:00
smoogipoo
c0031955c9 Update with further framework changes 2020-08-12 01:50:18 +09:00
smoogipoo
070d71ec27 More cleanups 2020-08-12 00:48:38 +09:00
smoogipoo
7d35893ecd Make MusicController non-nullable 2020-08-11 12:40:58 +09:00
smoogipoo
e87f50f74f Rename method 2020-08-07 22:31:41 +09:00
smoogipoo
5002d69f69 Update inspections 2020-08-07 20:51:56 +09:00
smoogipoo
61b632516e Ensure CurrentTrack is never null 2020-08-07 19:43:16 +09:00
smoogipoo
f8279dab32 Refactor MainMenu 2020-08-06 18:54:14 +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
Lucas A
71895964f4 Refactor overlay activation logic and reword tip. 2020-08-05 11:21:09 +02:00
Dan Balasescu
33330701e1
Merge branch 'master' into osu-logo-no-update-transforms 2020-07-28 15:36:37 +09:00
Dean Herbert
5b724d9659 Adjust damp base component to provide ample tweening 2020-07-27 15:10:32 +09:00
jorolf
50f72ac9cb rename classes 2020-07-22 22:10:59 +02:00
Dean Herbert
20096f9aea Remove remaining per-Update transform in OsuLogo to reduce allocations 2020-07-18 11:44:18 +09:00
jorolf
87f7d8744d simplify transform 2020-07-15 12:40:46 +02:00
Dean Herbert
fe68e8276d Merge branch 'master' into logo-shader 2020-07-15 19:06:35 +09:00
Dean Herbert
675544ec2f Tidy up colour and variable usage 2020-07-15 19:03:59 +09:00
Dean Herbert
1760cc2427 Fix behavioural regression by splitting methods out 2020-07-10 18:03:56 +09:00
Dean Herbert
44fdb5b82e Ensure music starts when returning to lounge or main menu 2020-07-10 17:20:27 +09:00
Dean Herbert
efdf179906 Replace poo icon at disclaimer screen 2020-07-09 12:31:20 +09:00
Dean Herbert
3f3bfb1ffb Minor reshuffling / recolouring 2020-07-06 23:51:16 +09:00
Dean Herbert
a650a5ec83 Move dialog classes to own file 2020-07-06 23:44:26 +09:00
smoogipoo
ddac511c8c Move start fresh button above 2020-07-06 22:41:51 +09:00
Dan Balasescu
8f792603ee
Apply suggestions from code review 
Co-authored-by: Dean Herbert <pe@ppy.sh>
 2020-07-06 22:40:45 +09:00
smoogipoo
1effe71ec2 Add dialog for storage options 2020-07-06 22:03:09 +09:00
jorolf
52b313f290 change textures 2020-07-04 19:06:26 +02:00
Shivam
444504f2b9 Expose MainMenu Track as internal get private set 2020-06-29 02:10:40 +02: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
jorolf
820056cc4e update colours/transformations 2020-06-28 17:53:53 +02:00
jorolf
1409ace282 apply suggestions 2020-06-25 00:59:12 +02:00
jorolf
6f0ec36407 remove size from hue animation 2020-06-24 16:27:00 +02:00
jorolf
768e28faba generalize and simplify animation 2020-06-24 14:11:38 +02:00
Sebastian Krajewski
68f078c9e6 Replace logo-triangles.mp4 with shadered logo-triangles.png 2020-06-24 10:30:33 +02:00
Dean Herbert
ccb27082d5 Fix background appearing too late 2020-06-24 11:08:32 +09:00
Dean Herbert
4244024fc3 Merge branch 'master' into fallback-intro 2020-06-24 10:49:45 +09:00
Dean Herbert
9d753a4fc2 Update intro resource locations 2020-06-23 21:34:57 +09:00
Dean Herbert
5cdabbc8bb Update access to FrequencyAmplitudes via span 2020-06-23 21:33:03 +09:00
Dean Herbert
14ad3835ff Update naming 2020-06-23 21:27:01 +09:00
Dean Herbert
49d3511063 Read amplitudes from piano reverb source 2020-06-23 13:55:44 +09:00
Dean Herbert
4554a7db33 Update naming 2020-06-23 13:49:18 +09:00
Dean Herbert
b289beca53 Fix samples being played too early 2020-06-23 13:33:33 +09:00
Dean Herbert
f60a80b263 Fix animations and general code quality 2020-06-22 21:35:52 +09:00
Dean Herbert
8d3ed05848 Update welcome text sprite location 2020-06-22 17:42:54 +09:00
Shivam
693a760a19 Use RelativeSizeAxes for width 2020-06-16 15:44:59 +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
Dan Balasescu
527577d7c3
Merge pull request #9236 from MiraiSubject/logovisualisation-subclass 
Move user and skin specific settings for LogoVisualisation to a subclass
 2020-06-09 19:16:24 +09:00
Shivam
a60bb5feac Rename baseclass, add xmldoc & change access to internal 2020-06-08 23:45:40 +02:00
Shivam
0b6ae08c93 Removed unneeded properties 2020-06-08 21:31:03 +02:00
Shivam
d52e3f9386 Removed logovisualisation changes 
Now depends on https://github.com/ppy/osu/pull/9236 for accent color changes to apply
 2020-06-08 21:26:48 +02:00
Shivam
2a5e960025 Move user and skin specific settings to a subclass 2020-06-08 21:15:51 +02:00
Shivam
e821d787b4 Implement suggested changes 
Note: LogoVisualisation is likely going to be needed in a separate PR to conform to the review.
 2020-06-08 20:13:02 +02:00
Shivam
229a40e6e3 Code formatting fixed 
Somehow slipped through after pushing
 2020-06-08 15:39:15 +02:00
Shivam
f80cdeac5c Change transforms to roughly match fallback visually 2020-06-08 15:31:30 +02:00
Dean Herbert
dd61d6ed04 Attempt to reimport intro if a bad state is detected 2020-06-08 14:48:42 +09:00
Dean Herbert
72ada020a2 Don't attempt to use virtual track for intro sequence clock 2020-06-08 13:42:16 +09:00
Shivam
d002c0c03f Revert piano reverb to a separate sample 2020-06-03 11:39:08 +02:00
Shivam
9cd66dcdef Fix styling error 2020-06-02 21:54:39 +02:00
Shivam
b79773cdb1 Modify LogoVisualisation to allow color changes 
Also change the color from blue to dark blue
 2020-06-02 21:50:50 +02:00
Shivam
4ebc1d3721 Add original sprite and visualiser 
Notes: This is using a modified version of welcome.osz to facilitate the visualiser and the animation of the sprite is not accurate.
 2020-06-02 21:06:41 +02:00
Shivam
3d78ec90ac Rename legacy to welcome to match osu-resources 2020-06-02 13:26:37 +02: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
Shivam
578c955658 Add fallback intro screen 2020-06-02 03:48:23 +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
Dean Herbert
1cec0575b7 Remove unused classes and replace overlay in game 2020-04-21 16:38:47 +09:00
Dean Herbert
61d8cfd224 Fix triangle intro video being out of time 2020-04-08 19:51:55 +09:00
Alchyr
737a3b608a Correct spelling 2020-04-07 17:34:18 -07:00
Dean Herbert
51db361c32 Update usages of Animation and Video in line with framework changes 2020-04-03 16:00:06 +09:00
Dean Herbert
880d138a47 Fix intro tests not asserting pass or working at all 2020-03-25 15:12:19 +09:00
Dean Herbert
288470c313 Remove exo specification completely 2020-03-13 13:43:48 +09:00
smoogipoo
8eb8572c73 Apply osu!-side video sprite changes 2020-03-11 18:00:39 +09:00
Dan Balasescu
c3fd8e294a
Merge pull request #8211 from peppy/new-disclaimer 
Update text on disclaimer screen (and add tips)
 2020-03-11 14:24:58 +09:00
Dean Herbert
93aec4e692
Improve english 
Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
 2020-03-11 13:23:26 +09:00
Dean Herbert
638a9a24aa Initial disclaimer updates 2020-03-11 13:03:27 +09:00
Dean Herbert
ed837d3115 Use framework extension method for FromHex 2020-03-11 10:18:41 +09:00
Dean Herbert
dc79c11b6a Merge branch 'master' into layout-rework 2020-03-02 16:36:48 +09:00
smoogipoo
101a587641 Disable triangles in triangles intro 2020-02-27 15:51:55 +09:00
smoogipoo
da89798765 Merge remote-tracking branch 'origin/master' into layout-rework 2020-02-26 15:06:40 +09:00
Lucas A
535a7989d6 Open rankings overlay on spotlights page. 2020-02-25 20:57:15 +01:00
smoogipoo
f71c45cb1b Remove shallPropagate 2020-02-25 11:30:33 +09:00
Lucas A
c9d600b69c Show RankingsOverlay when clicking on charts button 2020-02-22 11:55:34 +01:00
Dan Balasescu
268f3333bd
Merge pull request #7841 from peppy/update-inspectcode 
Update inspectcode version and fix new issues
 2020-02-16 00:53:04 +09:00
Dean Herbert
bb541f5ae4 Update inspectcode version and fix new issues 2020-02-15 11:54:29 +09:00
recapitalverb
c753cb46c5 Use [Resolved] wherever possible 2020-02-14 20:14:00 +07:00
recapitalverb
6d87d22a84 Remove duplicated dependency on AudioManager 2020-02-14 18:40:58 +07:00
Dean Herbert
e022352812
Merge pull request #7784 from smoogipoo/fix-beatmap-disposal 
Fix disposal-related errors by making WorkingBeatmap non-disposable
 2020-02-13 18:52:47 +09:00
Dean Herbert
2a67246b21 Ensure game is at main menu before performing exit on screen 2020-02-11 22:37:38 +09:00
smoogipoo
51e2a934bd Fix possible beatmap nullref in logo visualisation 2020-02-10 17:02:00 +09:00
Dean Herbert
7460018cd3 Move combo colours to GlobalSkinColours 2020-02-07 14:58:07 +09:00
Salman Ahmed
8aec9e4500 Fix NullReferenceException on main menu for mobile game hsots 2020-01-25 11:41:26 +03:00
Dean Herbert
f9e93e2a6a Fix regressed input handling order 2020-01-24 17:15:05 +09:00
Dean Herbert
827f48c29b Adjust fade 2020-01-24 16:32:39 +09:00
Dean Herbert
6f44f8a1ad Ensure only run once when not current screen 2020-01-24 16:27:49 +09:00
Dean Herbert
f9a54dfb1d Tidy up implementation and show on returning with new song 2020-01-24 16:27:37 +09:00
Dean Herbert
3f6fa93365 Merge remote-tracking branch 'upstream/master' into main-menu-song-ticker 2020-01-24 16:08:34 +09:00
Dean Herbert
7c62cc3ac3 Merge remote-tracking branch 'smoogipoo/void-mouse-up-returns' into update-framework 2020-01-22 22:57:52 +09:00
smoogipoo
7b2f58eb30 Apply OnRelease method signature refactorings 2020-01-22 13:22:34 +09:00
smoogipoo
bfb056c612 Apply input method signature refactorings 2020-01-20 18:17:21 +09:00
Andrei Zavatski
730cc92bf3 Fade out instead of insta hiding on menu suspending 2020-01-11 22:43:07 +03:00
Andrei Zavatski
bd33687f53 Add AllowUpdates flag to SongTicker 2020-01-11 18:27:22 +03:00
Andrei Zavatski
81948744d0 remove unnecessary null checks 2020-01-11 17:50:13 +03:00
Andrei Zavatski
d25ef1966d Remove unnecessary local bindable 2020-01-11 17:48:09 +03:00
Andrei Zavatski
e6210f10b7 Add unicode metadata support 2020-01-11 07:32:40 +03:00
Andrei Zavatski
d59cae33d3 Some animation adjustments 2020-01-11 07:17:13 +03:00
Andrei Zavatski
7716a555ec Move only ButtonSystem on screen changes rather than everything 2020-01-11 07:08:00 +03:00
Andrei Zavatski
6500cc967f Implement SongTicker component 2020-01-11 06:58:35 +03:00
Dean Herbert
3be2fc27f3
Merge branch 'master' into Remove_osuTK.MathHelper 2020-01-10 00:28:46 +08:00
smoogipoo
91735ff367 Update MathUtils namespace usages 2020-01-09 13:43:44 +09:00
Berkan Diler
34d8740ec4 Remove remaining usage of osuTK.MathHelper 2020-01-08 20:21:13 +01:00
mcendu
796223d3e0 Invert if 2019-12-22 21:39:25 +08:00
mcendu
1f41acc5b9 Integrate auto click into exit confirmed check 2019-12-22 21:20:55 +08:00
mcendu
5d29ff29cb Animate "Good bye" instead on exit 2019-12-22 20:52:00 +08:00
Huo Yaoyuan
c0fe91a84c Merge branch 'master' into sharpen 2019-11-26 18:21:50 +08:00
Berkan Diler
fccdbffa93 Use MathF instead of Math- functions when possible 
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
 2019-11-25 00:45:42 +01:00
Dean Herbert
f390e558c7 Combine and simplify beatmap change logic 2019-11-22 02:32:02 +09:00
Huo Yaoyuan
818553027b Merge branch 'master' into sharpen 2019-11-21 23:42:46 +08:00
Berkan Diler
6cab517b2d .NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK. 2019-11-20 13:37:47 +01:00
Huo Yaoyuan
374ef6ff83 Merge branch 'master' into sharpen 2019-11-20 17:30:58 +08:00
Dean Herbert
6d06b444ba Allow screen to specify whether to apply audio rate adjustments from mods 2019-11-15 13:47:14 +09:00
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
Dean Herbert
7b56180b8b Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-05-15 12:08:23 +09:00
Dean Herbert
4b508915f6 Centralise caching of components at OsuGame level 2019-05-13 17:10:25 +09:00
smoogipoo
d7c09e7dbd Merge remote-tracking branch 'origin/master' into fix-new-inspections 
# Conflicts:
#	osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
#	osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
#	osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
#	osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
#	osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
#	osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
#	osu.Game/Graphics/OsuFont.cs
#	osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
#	osu.Game/Overlays/Profile/Header/BadgeContainer.cs
#	osu.Game/Overlays/Profile/ProfileHeader.cs
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/Skinning/LegacySkinDecoder.cs
 2019-05-07 13:20:17 +09:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability 2019-04-27 18:41:19 +09:00
smoogipoo
12b6bc48bd Use .With() wherever possible 2019-04-17 17:24:09 +09:00
smoogipoo
09568be270 Merge remote-tracking branch 'origin/master' into facade-container 
# Conflicts:
#	osu.Game/Screens/Play/PlayerLoader.cs
 2019-04-17 17:17:33 +09:00
smoogipoo
897bfa60db Fix tracking position during 150ms state change delay 2019-04-17 17:05:35 +09:00