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 |
|