Dean Herbert
|
74b5e76c0e
|
Fix dependency initialisation ordering
|
2020-03-05 13:39:55 +09:00 |
|
Dean Herbert
|
6477a7b73e
|
Centralise creation of UpdateManagers
|
2020-03-05 13:34:04 +09:00 |
|
Dean Herbert
|
bac35b2a68
|
Handle beatmap track changing in a saner way
|
2020-03-04 19:11:35 +09:00 |
|
Dean Herbert
|
7464a486d9
|
Fix DummyWorkingBeatmap's track completion attempting to change game-wide beatmap
|
2020-03-04 16:35:45 +09:00 |
|
Dean Herbert
|
ed516f05c2
|
Forward any unhandled scroll events to volume overlay
|
2020-03-02 18:56:09 +09:00 |
|
Andrei Zavatski
|
5d813bf421
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame-rankings
|
2020-02-19 16:23:18 +03:00 |
|
recapitalverb
|
c753cb46c5
|
Use [Resolved] wherever possible
|
2020-02-14 20:14:00 +07:00 |
|
Andrei Zavatski
|
382cc1a91b
|
Fix incorrect overlays overlapping
|
2020-02-13 14:26:35 +03:00 |
|
Andrei Zavatski
|
a677aa6cfc
|
Add rankings overlay to the game
|
2020-02-13 13:39:33 +03: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
|
cef682aa03
|
Make WorkingBeatmap non-disposable
|
2020-02-10 17:02:01 +09:00 |
|
Dan Balasescu
|
098b3ac294
|
Merge branch 'master' into present-replay-from-ss
|
2020-02-03 16:28:38 +09:00 |
|
Dean Herbert
|
5312586351
|
Merge remote-tracking branch 'origin/perform-from-screen' into present-replay-from-ss
|
2020-02-01 02:14:17 +09:00 |
|
Dean Herbert
|
9a1907d8e0
|
Apply doc fixes from code review
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
|
2020-01-31 09:48:20 +09:00 |
|
Dean Herbert
|
14f88bb725
|
Merge branch 'perform-from-screen' into present-replay-from-ss
|
2020-01-30 23:45:51 +09:00 |
|
Dean Herbert
|
878250056c
|
Remove unused parameter
|
2020-01-30 23:34:04 +09:00 |
|
Dean Herbert
|
0975002ef5
|
Allow presenting scores from PlaySongSelect
|
2020-01-30 18:16:28 +09:00 |
|
Dean Herbert
|
f637e0e5a7
|
Remove unused bypassScreenAllowChecks argument
|
2020-01-30 18:10:05 +09:00 |
|
Dean Herbert
|
bc21e30b09
|
Allow specifying a valid list of types to performFromMenu
|
2020-01-30 18:10:05 +09:00 |
|
smoogipoo
|
7b2f58eb30
|
Apply OnRelease method signature refactorings
|
2020-01-22 13:22:34 +09:00 |
|
Joehu
|
f43602518a
|
Add global action for toggling now playing overlay
|
2020-01-11 11:43:51 -08:00 |
|
Dean Herbert
|
f603dd82bc
|
Fix difficulty adjust mod not correctly reading settings while leaderboard visible
|
2019-12-26 14:52:08 +09:00 |
|
Dean Herbert
|
6893ec22bb
|
Fix currenTrackCompleted not being run on main thread
|
2019-12-02 18:26:45 +09:00 |
|
Dean Herbert
|
ac2dfffb23
|
Merge remote-tracking branch 'upstream/master' into sharpraven-deprecation
|
2019-11-21 22:52:45 +09: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
|
6ae6603ded
|
Cleanup.
|
2019-11-12 22:08:16 +08:00 |
|
Huo Yaoyuan
|
de732c6c24
|
Change code to use Sentry client.
|
2019-11-12 21:12:38 +08:00 |
|
Dean Herbert
|
faa5997b48
|
Move scaling container to OsuGame so OsuGameBase doesn't apply… (#6804)
Move scaling container to OsuGame so OsuGameBase doesn't apply UI scale
|
2019-11-12 16:40:49 +09:00 |
|
Dean Herbert
|
35351d7f7c
|
Use variable instead of duplicated list
|
2019-11-12 15:04:51 +09:00 |
|
Dean Herbert
|
25eb964290
|
Simplify overlay adding logic
|
2019-11-12 15:03:58 +09:00 |
|
Dean Herbert
|
e28ddec8d6
|
Merge branch 'master' into fix-home-not-closing-all-overlays
|
2019-11-12 12:05:19 +09:00 |
|
Huo Yaoyuan
|
ccc8aa6fa4
|
Apply brace style.
|
2019-11-11 20:13:13 +08:00 |
|
Dean Herbert
|
8ac708ada5
|
Move scaling container to OsuGame so OsuGameBase doesn't apply UI scale
|
2019-11-11 13:58:35 +09:00 |
|
Joehu
|
ff225c3691
|
Remove toolbarElements
|
2019-11-08 06:04:18 -08:00 |
|
Joehu
|
5235d2b319
|
Fix home button not closing login and now playing overlays
|
2019-11-07 14:38:06 -08:00 |
|
Dean Herbert
|
fe3583b6ee
|
Move schedule call
|
2019-11-03 13:16:54 +09:00 |
|
Dean Herbert
|
f038c579f0
|
Protect against requests to show overlays before the target overlay is ready
|
2019-11-01 11:41:00 +09:00 |
|
Dean Herbert
|
898520935e
|
Move link handling code to OsuGame
This allows for future calls from arguments / associations
|
2019-11-01 11:40:51 +09:00 |
|
Joehu
|
ccc753a315
|
Make OverlayContainers with no blocking input VisibilityContainers
|
2019-10-14 16:27:59 -07:00 |
|
Dean Herbert
|
02c1f490f1
|
Merge branch 'master' into muted-notification
|
2019-09-28 20:33:32 +08:00 |
|
Dean Herbert
|
42fd323020
|
Move protected method
|
2019-09-25 22:13:49 +09:00 |
|
Craftplacer
|
08ab4e508f
|
Use loadComponentSingleFile for caching
|
2019-09-15 17:15:52 +02:00 |
|
Craftplacer
|
72af640df7
|
Expose VolumeOverlay as available dependencies
|
2019-09-15 16:31:40 +02:00 |
|
Dean Herbert
|
53fe290ef3
|
Merge branch 'master' into back-button-part-2
|
2019-09-03 19:44:30 +09:00 |
|
Dean Herbert
|
40c1c6072e
|
Add "osu!classic" as a bundled skin choice
|
2019-08-29 16:39:42 +09:00 |
|
Dean Herbert
|
5886420a5d
|
Merge branch 'master' into back-button-part-2
|
2019-08-13 21:38:31 +09:00 |
|
Dean Herbert
|
9aac5efa4e
|
Move logic out of OsuGame
|
2019-08-13 14:42:59 +09:00 |
|
Dean Herbert
|
8d23cda51a
|
Merge branch 'split-out-music-controller' into music-controller-hotkeys
|
2019-08-13 14:33:35 +09:00 |
|
Dean Herbert
|
ad24265730
|
Split visual component out of MusicController
|
2019-08-13 14:30:18 +09:00 |
|
David Zhao
|
4a28bdd384
|
Merge remote-tracking branch 'upstream/master' into back-button-part-2
|
2019-08-13 12:26:12 +09:00 |
|
Dean Herbert
|
f3380c9372
|
Remove "jukebox" terminology
|
2019-08-13 12:06:57 +09:00 |
|
Lucas A
|
fdf76be967
|
Merge branch 'master' into music-controller-hotkeys
|
2019-08-10 16:29:02 +02:00 |
|
Lucas A
|
8c630b4f4c
|
Merge branch 'refactor-osd' into music-controller-hotkeys
|
2019-08-10 16:25:59 +02:00 |
|
iiSaLMaN
|
d772bbaf8c
|
Simplify disposing
|
2019-08-01 10:04:04 +03:00 |
|
David Zhao
|
d05b9b1734
|
Use dummyAPI and move load check into MusicController
|
2019-08-01 14:19:45 +09:00 |
|
iiSaLMaN
|
3af1aaeabe
|
Unsubscribe from Completed event on old beatmap
|
2019-07-31 15:19:02 +03:00 |
|
David Zhao
|
351b6e6259
|
Add new options test
|
2019-07-31 19:47:41 +09:00 |
|
David Zhao
|
980686f6bf
|
get tests running again
|
2019-07-31 19:30:35 +09:00 |
|
David Zhao
|
f81e691bf5
|
Merge remote-tracking branch 'upstream/master' into back-button-part-2
|
2019-07-31 16:03:14 +09:00 |
|
David Zhao
|
5aece2d5f2
|
fix tests
|
2019-07-31 16:03:05 +09:00 |
|
David Zhao
|
82fcb88f5c
|
update names
|
2019-07-30 12:11:08 +09:00 |
|
David Zhao
|
d70b99b4c0
|
Merge remote-tracking branch 'upstream/master' into back-button-part-2
|
2019-07-30 12:05:23 +09:00 |
|
David Zhao
|
6d1203a599
|
Move screen pushes into function, rename receptor
|
2019-07-30 12:00:04 +09:00 |
|
Dean Herbert
|
ece5a9622e
|
Fix scores without an online ID not always presenting correctly
|
2019-07-30 06:32:05 +09:00 |
|
Dean Herbert
|
2d03c849bf
|
Improve testability of intro sequence (#5275)
Improve testability of intro sequence
|
2019-07-29 18:56:38 +09:00 |
|
David Zhao
|
e8c039bb8a
|
Use a receptor model instead
|
2019-07-29 18:45:16 +09:00 |
|
David Zhao
|
2e242075b4
|
Remove and re-add backbutton instead and add tests
|
2019-07-29 16:42:23 +09:00 |
|
Dean Herbert
|
088c04a20f
|
Revert "Fix BackButton handling escape before all other elements (#5440)"
This reverts commit 17a6563f4c.
|
2019-07-28 23:38:55 +09:00 |
|
David Zhao
|
bd2fce4bb7
|
don't use extra container
|
2019-07-28 13:45:54 +09:00 |
|
Dean Herbert
|
872822035a
|
Merge branch 'master' into back-button-priority
|
2019-07-28 12:50:18 +09:00 |
|
Dean Herbert
|
53ecb2ae82
|
Reduce notification span during beatmap imports
|
2019-07-26 13:48:29 +09:00 |
|
David Zhao
|
bbcc8f0721
|
Add new container level and unblock footer
|
2019-07-25 11:11:20 +09:00 |
|
David Zhao
|
263ccfcbcb
|
Merge remote-tracking branch 'upstream/master' into back-button-priority
|
2019-07-24 12:50:16 +09:00 |
|
David Zhao
|
38559685a9
|
proxy backbutton instead
|
2019-07-24 12:47:41 +09:00 |
|
Dean Herbert
|
292bd22f92
|
Allow multiple instances of osu! when running under debug
|
2019-07-23 13:38:05 +09:00 |
|
Dean Herbert
|
ade661236a
|
Merge branch 'master' into intro-testing-improvements
|
2019-07-22 23:44:14 +09:00 |
|
Lucas A
|
2926932a1a
|
Add MusicControllerToast used to display current music playback status on OSD
|
2019-07-20 21:10:17 +02:00 |
|
Dean Herbert
|
d4c1005c7e
|
Fix incorrect comparison in line updating logic
|
2019-07-15 15:53:19 +09:00 |
|
Dean Herbert
|
0580c32263
|
Abstract intro screen logic to base class
|
2019-07-09 18:05:57 +09:00 |
|
David Zhao
|
fbd300e664
|
Move ruleset into ReplayPlayerLoader as well
|
2019-07-08 17:37:20 +09:00 |
|
David Zhao
|
6a86f62d17
|
Get mods from score info
|
2019-07-08 16:13:03 +09:00 |
|
David Zhao
|
5853a877c2
|
create base dependencies before caching, create player in playerloader
|
2019-07-08 15:40:10 +09:00 |
|
David Zhao
|
2747d7692b
|
Create ReplayPlayerLoader for local mod caching
|
2019-07-08 14:55:05 +09:00 |
|
Lucas A
|
5f8bd6eca7
|
Fix CI issues + minor issues
|
2019-07-05 16:51:15 +02:00 |
|
Lucas A
|
89acd9da3e
|
Add game-wide jukebox keybindings handling to OsuGame
|
2019-07-05 16:33:13 +02:00 |
|
Dean Herbert
|
7575047db8
|
Merge branch 'master' into import-stable-scores
|
2019-07-04 01:00:42 +09:00 |
|
Dean Herbert
|
466bc7f28a
|
Merge branch 'master' into watch-replays-4
|
2019-07-03 11:47:10 +09:00 |
|
Dean Herbert
|
f31d840c13
|
Dispose previous WorkingBeatmap on change
|
2019-07-02 22:26:08 +09:00 |
|
naoey
|
04c467fd81
|
Add comment
|
2019-06-29 16:10:16 +05:30 |
|
naoey
|
6c81d57178
|
Remove hacks for updating model info
- Re-retrieve score from database when presenting scores
|
2019-06-29 16:08:48 +05:30 |
|
HoLLy
|
55216dffb7
|
Merge remote-tracking branch 'origin/master' into import-stable-scores
|
2019-06-27 14:07:17 +02:00 |
|
Dean Herbert
|
0bad86f6d9
|
Merge remote-tracking branch 'upstream/master' into async-beatmap-load
|
2019-06-27 13:58:59 +09:00 |
|
smoogipoo
|
aa81c95f30
|
Remove unnecessary extra property
|
2019-06-25 18:38:14 +09:00 |
|
smoogipoo
|
5b294ba419
|
Adjust backbutton animation
|
2019-06-25 18:33:35 +09:00 |
|
smoogipoo
|
d9927204f8
|
Relieve OsuScreen of back button input duties
|
2019-06-25 18:33:18 +09:00 |
|
smoogipoo
|
f53d2fbe76
|
Scale backbutton along with screens
|
2019-06-25 18:33:13 +09:00 |
|
smoogipoo
|
8c96e4c1fa
|
Move back button to OsuGame
|
2019-06-25 18:33:08 +09:00 |
|
Dean Herbert
|
1830362337
|
Move task out of ctor to avoid initialisation ordering issues
|
2019-06-24 17:10:50 +09:00 |
|
HoLLy
|
f072a53e93
|
Merge remote-tracking branch 'origin/master' into import-stable-scores
|
2019-06-21 17:42:59 +02:00 |
|
Dean Herbert
|
cff5ddb137
|
Merge branch 'master' into fix-inactive-audio-race
|
2019-06-21 21:09:12 +09:00 |
|
Dean Herbert
|
f2200594c9
|
Remove necessity for MusicController to be always visible
|
2019-06-20 23:40:25 +09:00 |
|
HoLLy
|
15c75b4442
|
Add basic score import from stable
|
2019-06-19 18:33:51 +02:00 |
|
Dean Herbert
|
c32d17d16a
|
Fix audio not dimming after race condition
Also adjusts transition slightly for smoother effect.
|
2019-06-18 01:32:52 +09:00 |
|
Lucas A
|
04dc1c1744
|
Fix typo in comment
Co-Authored-By: Joseph Madamba <madamba.joehu@outlook.com>
|
2019-06-17 16:44:53 +02:00 |
|
Dean Herbert
|
3a04684efb
|
Add region
|
2019-06-17 23:25:16 +09:00 |
|
Dean Herbert
|
ad4c9babe7
|
Adjust naming and transitions
|
2019-06-17 23:24:52 +09:00 |
|
Lucas A
|
d7d6feb001
|
Fade volume in / out when game window becomes active / inactive
|
2019-06-17 12:31:23 +02:00 |
|
Dean Herbert
|
609a82bc94
|
Update VisibilityContainer usage in line with framework
|
2019-06-11 15:13:58 +09:00 |
|
smoogipoo
|
4dc77d64a3
|
Fix overlay group + depth
|
2019-05-31 13:23:50 +09:00 |
|
Dean Herbert
|
40f7cbde3a
|
Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay
|
2019-05-21 14:00:50 +09:00 |
|
Dean Herbert
|
85a41cf6c3
|
Allow chaining of loadComponentSingleFile
|
2019-05-21 13:44:18 +09:00 |
|
Dean Herbert
|
d7098e2066
|
Hide other overlays when showing changelog
|
2019-05-15 17:38:19 +09:00 |
|
Dean Herbert
|
e46a61febf
|
Allow chaining of loadComponentSingleFile
|
2019-05-15 17:36:29 +09:00 |
|
Dean Herbert
|
88528e797f
|
Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay
|
2019-05-15 14:24:45 +09:00 |
|
Dean Herbert
|
1fd44d7945
|
Move OsuScreenDependencies to GameBase
|
2019-05-15 13:00:11 +09:00 |
|
Dean Herbert
|
ec5b024fa6
|
Define toolbarElements
|
2019-05-14 18:34:25 +09:00 |
|
Dan Balasescu
|
bffde7de08
|
Merge branch 'master' into exit-hide-music-controller
|
2019-05-14 17:36:38 +09:00 |
|
Dean Herbert
|
0fc43afd34
|
Merge branch 'master' into HoutarouOreki-changelog-overlay
|
2019-05-14 17:35:14 +09:00 |
|
Dean Herbert
|
7553e2da25
|
Fix incorrect DI reference and update naming of SettingsOverlay classes
|
2019-05-14 10:45:05 +09:00 |
|
Dean Herbert
|
4b508915f6
|
Centralise caching of components at OsuGame level
|
2019-05-13 17:10:25 +09:00 |
|
Dean Herbert
|
50c440de8d
|
Add toolbar button
|
2019-05-13 17:01:17 +09:00 |
|
Dean Herbert
|
65097fddc1
|
Hide music controller when exiting via Alt-F4
Closes #4764.
|
2019-05-12 22:34:58 +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 |
|
smoogipoo
|
0bd35ab7bb
|
Turn on warnings, resolve issues
|
2019-04-25 17:36:17 +09:00 |
|
smoogipoo
|
0222424aef
|
Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
|
2019-04-10 17:20:36 +09:00 |
|
smoogipoo
|
4310f07a5c
|
Rename SelectedMods -> Mods
|
2019-04-10 12:03:57 +09:00 |
|
smoogipoo
|
ad124bfeec
|
Reimplement select mod track adjustments
|
2019-04-09 12:59:32 +09:00 |
|
smoogipoo
|
c584967eb1
|
Remove mods from workingbeatmap
|
2019-04-09 12:59:32 +09:00 |
|
Lucas A
|
d5b7865ab8
|
Invert notification and loginOverlay depth order
|
2019-04-06 17:40:48 +02:00 |
|
Joehu
|
debda7ae7d
|
Fix volume overlay container reference
|
2019-04-05 00:05:42 -07:00 |
|
Joehu
|
53906e87ec
|
Split floatingOverlayContent
|
2019-04-05 00:00:21 -07:00 |
|
Dean Herbert
|
1709e22763
|
Merge branch 'master' into fix-blocked-volume-overlay
|
2019-04-04 17:28:46 +09:00 |
|
Samuel Van Allen
|
55a6e43778
|
Check against databasedSet instead of function param
|
2019-04-03 21:49:33 +08:00 |
|
Samuel Van Allen
|
e9269dc83b
|
Prevent unnecessary query in OsuGame::PresentBeatmap
This resolves issue #4575
|
2019-04-02 23:57:31 +08:00 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +09:00 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +09:00 |
|
Joehu
|
1ba608f01f
|
Remove line spacing on similar code
|
2019-03-29 00:26:17 -07:00 |
|
Joehu
|
eefc55f89b
|
Fix volume overlay being blocked by other floating overlays
- excluding settings
|
2019-03-29 00:20:16 -07:00 |
|
Dean Herbert
|
ccc0853f75
|
Change login overlay's depth and load order
|
2019-03-29 14:53:40 +09:00 |
|
Dean Herbert
|
90a4cb8e04
|
Fix unnecessary positioning
|
2019-03-29 14:49:15 +09:00 |
|
Joseph Madamba
|
9a32e12435
|
Merge branch 'master' into fix-login-overlay-behavior
|
2019-03-28 22:28:56 -07:00 |
|
Dean Herbert
|
95bf0b9ed6
|
Merge remote-tracking branch 'upstream/master' into fix-music-controller-offset
|
2019-03-29 13:57:02 +09:00 |
|
Dean Herbert
|
c4096fb628
|
Remove unused using
|
2019-03-29 13:56:56 +09:00 |
|
Dean Herbert
|
176b4ecc38
|
Merge branch 'master' into sprite-icon-compatibility
|
2019-03-28 23:47:44 +09:00 |
|
Joehu
|
9a3528ea9d
|
Fix field modifier
|
2019-03-27 22:31:40 -07:00 |
|
Joehu
|
53f3dacdfb
|
Fix login overlay behavior
|
2019-03-27 22:01:06 -07:00 |
|
Joehu
|
bdb39a79a9
|
Fix offset of music controller when toolbar is hidden
|
2019-03-27 20:27:26 -07:00 |
|
Joseph Madamba
|
cdf79ffe39
|
Merge branch 'master' into clean-overlays-code-1
|
2019-03-27 10:32:13 -07:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|