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
David Zhao
5169f7a43c
Change default for null screen parallax, apply reviews
2019-03-24 16:21:43 +09:00
David Zhao
dcae86e39a
Add a new test for OsuScreenStack, fix parallax
2019-03-22 14:10:38 +09:00
Joseph Madamba
d5272a83cf
Rename "urgent" to "topMost"
2019-03-21 11:16:10 -07:00
Joehu
1f95abf7c7
Fix regressions caused by removing specified depths
...
- urgentOverlayContent is added so toolbar can be loaded first
2019-03-19 21:30:24 -07:00
Joehu
a39648edbc
Normalize format of single line curly brackets
2019-03-19 20:51:43 -07:00
Joehu
44e0291737
Remove specified depths of overlays
2019-03-19 20:47:12 -07:00
David Zhao
9368081b99
Fix TestCasePlayer
2019-03-12 17:33:16 +09:00
David Zhao
e3567a5507
Make OsuGame use OsuScreenStack too
2019-03-12 16:03:25 +09:00
Dan Balasescu
fd147dae21
Merge branch 'master' into fix-disabled-set-crash
2019-03-05 17:25:13 +09:00
smoogipoo
7583279e08
Remove unnecessary precondition
2019-03-01 13:29:02 +09:00
Shane Woolcock
5d1eacf1c1
Ensure all OsuFocusedOverlayContainers contribute to screen fading
2019-03-01 12:20:31 +09:00
smoogipoo
951b95ff78
Fix potential race condition
2019-02-28 17:17:57 +09:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching
2019-02-28 14:53:07 +09:00
Dean Herbert
e2c6a8bc07
Use pattern matching wherever possible
2019-02-28 14:35:00 +09:00
Dean Herbert
26d53d06a9
Fix remaining issues
2019-02-28 13:31:40 +09:00
Dean Herbert
43b02212ce
Add disposal check in single file load path
2019-02-28 12:24:56 +09:00
Dan Balasescu
32b8bb2ccc
Fix broken grammar
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-02-26 12:28:49 +09:00
Dean Herbert
314f35b0c5
Further simplify import messaging
2019-02-25 18:42:08 +09:00
Dean Herbert
80737b9ef8
Remove "silent" parameter; consolidate import logic
2019-02-25 18:24:06 +09:00
Dean Herbert
706da017d7
Add target screen support and user bypass
2019-02-25 14:01:51 +09:00
Dean Herbert
caef58675d
Tidy up and standardise present logic
2019-02-25 12:58:58 +09:00
Dean Herbert
56397dbea6
Ensure beatmap is not disabled before continuing with present
2019-02-24 12:08:27 +09:00
Dean Herbert
367bc53a06
Revert some more instances of 'e' variable names
2019-02-22 20:15:25 +09:00
Dean Herbert
3fe4b8fd1c
Update variable names
...
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
smoogipoo
d8c55bc729
Adjust namespaces
2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f
Update with framework bindable changes
2019-02-21 18:56:34 +09:00
smoogipoo
49eadcb575
Update active state immediately + fix potential nullref
2019-02-19 19:44:09 +09:00
smoogipoo
703df77000
Update in-line with framework IsActive changes
2019-02-19 19:16:03 +09:00
Jamie Taylor
3ea13b1ade
Fix mouse cursor appearing prematurely during startup
2019-02-15 16:55:39 +09:00
Dean Herbert
5318de29b4
Fix import logic again
2019-02-13 19:57:54 +09:00
Dean Herbert
e604806398
Fix regression in screen change allowance logic
2019-02-13 19:43:01 +09:00
Dean Herbert
ca5c8d37d1
Use leased bindables
2019-02-01 16:44:06 +09:00
Dean Herbert
d1c8ee65a5
Fix osu! logo potentially appearing during game load in a weird place
2019-01-31 19:22:29 +09:00
Dean Herbert
ba6176fd03
Fix major regression in scaling behaviour
2019-01-31 18:28:46 +09:00
Dean Herbert
b48bb5b792
Move parallax logic out of BackgroundScreenStack
2019-01-31 18:10:33 +09:00
smoogipoo
91302ea0bc
Merge remote-tracking branch 'origin/master' into iscreen
...
# Conflicts:
# osu.Game/Screens/Multi/Match/MatchSubScreen.cs
# osu.Game/Screens/Multi/Multiplayer.cs
# osu.Game/Screens/Multi/MultiplayerSubScreen.cs
# osu.Game/Screens/OsuScreen.cs
# osu.Game/osu.Game.csproj
# osu.sln
2019-01-29 21:21:36 +09:00
smoogipoo
7b1c1f3728
Move toolbar showing and overlay activation to OsuGame
...
Now exposed through IOsuScreen.
2019-01-28 15:42:06 +09:00
Dean Herbert
4a59ccb81d
Merge branch 'master' into fix-idle-weirdness
2019-01-25 17:52:59 +09:00
smoogipoo
f0e0088f43
Create a custom background stack to fix various background issues
2019-01-25 15:36:22 +09:00
smoogipoo
a7e281469b
Fix game exiting instantly on pressing close button
2019-01-24 20:13:29 +09:00
smoogipoo
8ea7ec6445
Convert everything to use IScreen
2019-01-24 19:47:44 +09:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
Dean Herbert
7415a6e764
Cache input manager
2019-01-23 20:37:56 +09:00
Dean Herbert
4c8e7a26dc
Merge branch 'master' into fix-idle-weirdness
2019-01-23 18:53:52 +09:00
Dan Balasescu
e35b0093f3
Merge branch 'master' into fix-toolbar-padding-regression
2019-01-22 19:18:02 +09:00
ekrctb
fe2b83279e
Correct wrong logic
...
`OnlineBeatmapSetID == null` was the problem
2019-01-22 16:40:32 +09:00
ekrctb
0095521fc2
Use both OnlineBeatmapSetID and Hash
2019-01-22 16:10:04 +09:00
ekrctb
1d5f5865aa
Fix PresentBeatmap not working for unsubmitted beatmap set
2019-01-22 15:19:42 +09:00
Dean Herbert
4eb5e67075
Fix overlays not being correctly offset by toolbar padding
2019-01-21 19:34:35 +09:00
Dean Herbert
1ff9203f9e
Merge branch 'master' into fix-idle-weirdness
2019-01-10 18:38:48 +09:00
Dean Herbert
4f5c208672
Add UI scale
...
Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.
2019-01-09 19:01:33 +09:00
Dean Herbert
440f4703cb
Fix toolbar offset not being applied
2019-01-08 12:57:31 +09:00
Dean Herbert
74539b5e5c
Merge remote-tracking branch 'upstream/master' into letterboxing
2019-01-07 18:52:48 +09:00
Roman Kapustin
4b5fc85875
Use Find instead of FirstOrDefault
2019-01-05 19:35:33 +03:00
Dean Herbert
4c2c7bd937
Fix global idle state being entered when overlays are visible
2019-01-04 16:26:10 +09:00
Dean Herbert
3953f829c8
Add letterbox/screen scaling support
2019-01-04 13:36:02 +09:00
Dean Herbert
ab5f6e149c
Remvoe extra newline
2018-12-27 19:25:56 +09:00
Dean Herbert
31db768bdc
Hide version overlay when not in main menu
2018-12-27 19:21:07 +09:00
Dean Herbert
8cf30bdb6a
Play with delegate
2018-12-26 22:16:35 +09:00
smoogipoo
02365ee5ba
Merge remote-tracking branch 'origin/master' into timeshift-wip
2018-12-22 23:23:21 +09:00
smoogipoo
3cdeeb7ac5
Add forceful set helper methods in OsuGame
2018-12-18 18:09:46 +09:00
Dean Herbert
fc5d5a7752
Merge branch 'master' into user-registration
2018-12-14 19:45:27 +09:00
Dean Herbert
ea4dce8454
Add a polling component model
2018-12-10 21:08:14 +09:00
Dean Herbert
2a2561e5c8
Update framework and otehr nuget packages
2018-12-07 19:39:54 +09:00
Dean Herbert
d3f5111fa1
Use relative URL
2018-12-06 12:18:21 +09:00
Dean Herbert
669a17529a
Move external link opened to top most level
2018-12-06 11:55:58 +09:00
Dean Herbert
1a974f64de
Initial design for user registration dialog
2018-12-05 12:57:26 +09:00
smoogipoo
a6b0e35b2d
Fix post-rebase issues
2018-11-30 18:31:54 +09:00
smoogipoo
a8ad7d4670
Add silent import parameter
2018-11-30 18:27:13 +09:00
smoogipoo
d07a724970
Only allow replay screen changes in menu + songselect
2018-11-30 18:25:54 +09:00
smoogipoo
8eff49bccd
Remove User from Replay
2018-11-30 18:25:14 +09:00
smoogipoo
ed67984638
Don't load player if score has no replay data
2018-11-30 18:24:35 +09:00
Dean Herbert
3727955911
Refactors/renames
2018-11-30 16:35:45 +09:00
Dean Herbert
831cd3ed59
ScoreInfo scoreInfo -> ScoreInfo score
2018-11-30 15:18:52 +09:00
smoogipoo
d2f0a921ca
Fix lookups by beatmapinfo failing for imports of existing sores
2018-11-28 20:41:48 +09:00
smoogipoo
a88b69ec43
Notify of existing imports
2018-11-28 20:19:35 +09:00
smoogipoo
b8e60afa69
Move replays to an wrapping Score class
2018-11-28 18:45:17 +09:00
smoogipoo
219929eb47
Score -> ScoreInfo
2018-11-28 18:33:01 +09:00
smoogipoo
5b409a5ae5
Fix missed renames
2018-11-28 17:27:22 +09:00
smoogipoo
4ba7690e04
Initial scoremanager/scorestore structure
2018-11-28 16:50:16 +09:00
smoogipoo
09b79d736b
Remove unused usings
2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77
Re-namespacing
2018-11-28 16:12:57 +09:00
Dean Herbert
87da7b05a6
Remove unnecessarily specified RelativeSizeAxes
2018-11-26 16:39:11 +09:00
Dean Herbert
8d65d49126
Use bindable flow for checking idle time
2018-11-26 16:32:59 +09:00
Dean Herbert
fe5b043a59
Merge branch 'master' into fix_idle_tracker
2018-11-26 15:24:44 +09:00
smoogipoo
cadfe41f83
Merge remote-tracking branch 'origin/master' into external_link_warning
2018-11-23 15:19:52 +09:00
Dean Herbert
afa547af84
Fix order of ChannelManager dependency caching
2018-11-23 11:00:17 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
Roman Kapustin
3c0ce2b615
Revert "Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle""
...
This reverts commit bcdaee7d39
2018-11-19 20:48:59 +03:00
smoogipoo
bcdaee7d39
Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"
...
This reverts commit 3e2e2a7000d94801b6c6
2018-11-19 17:52:31 +09:00
Roman Kapustin
376e76e00d
Resolve merge conflicts
2018-11-18 16:10:36 +03:00
Dan Balasescu
e8f34ddff0
Merge branch 'master' into return_to_large_logo_after_idle
2018-11-15 15:16:10 +09:00
Dean Herbert
4b1282235a
Merge remote-tracking branch 'upstream/master' into Private_Messages
2018-11-12 20:41:10 +09:00
Roman Kapustin
b4809f4417
External link warning code cleanup
2018-11-01 23:52:07 +03:00
Roman Kapustin
7401fabb5d
Extract external link opening to the ExternalLinkOpener class
2018-10-23 23:03:00 +03:00
Dean Herbert
3be50c2941
Merge branch 'master' into return_to_large_logo_after_idle
2018-10-09 18:02:36 +09:00
smoogipoo
97c585c54c
Fix cursor not hiding in screenshots
2018-10-02 10:12:07 +09:00
Roman Kapustin
baf9e028c3
Fix possible idleTracker nullref
2018-09-26 19:44:01 +03:00
Roman Kapustin
c7b3fa51d5
Inject IdleTracker into ButtonSystem
2018-09-25 19:58:50 +03:00
UselessToucan
3c0b77658c
Merge branch 'master' into return_to_large_logo_after_idle
2018-09-25 19:48:38 +03:00
Dean Herbert
3c8c7a0459
Move ChannelManager to OsuGame
...
There's no reason for it to exist at OsuGameBase
2018-09-14 13:31:25 +09:00
Roman Kapustin
60c0428979
Remove redundant empty argument list
2018-09-12 20:54:40 +03:00
Roman Kapustin
749e89bd25
Introduce IdleTracker
2018-09-12 20:34:52 +03:00
Roman Kapustin
761d7629cd
Return to large logo after idle period
2018-09-12 18:09:19 +03:00
Dean Herbert
5d264fdbdd
Merge remote-tracking branch 'upstream/master' into Private_Messages
2018-09-11 13:56:57 +09:00
Dean Herbert
27ac7685e1
Bring music controller in front of notification overlay
2018-09-09 22:12:37 +09:00
Dean Herbert
ce92c8d2eb
Merge branch 'master' into Private_Messages
2018-09-05 02:40:02 +09:00
Dean Herbert
144e80dff6
Add "import all skins from stable" option (and mass delete)
2018-09-03 10:10:04 +09:00
Dean Herbert
e503878956
Merge branch 'master' into master
2018-09-01 17:31:04 +09:00
Dean Herbert
20817fdf1d
Avoid using symbol windows can't diplay
2018-08-30 14:34:45 +09:00
unknown
499c5d28ff
Refactored variable names in OsuGame.cs for improved code readability.
2018-08-29 18:04:51 -04:00
Dean Herbert
4b54c65d3f
Fix single file component loading not actually working correctly
2018-08-29 15:11:02 +09:00
Dean Herbert
4376ad107e
Merge branch 'master' into Private_Messages
2018-08-24 17:26:33 +09:00
Dean Herbert
295ccabf64
Expand out on to multiple lines
2018-08-20 16:06:12 +09:00
Dean Herbert
65dc9f44e5
Catch OperationCanceledException in single file load sequence
2018-08-20 14:42:37 +09:00
Dean Herbert
7a8aabc402
Fix notifications suggesting automatic reporting in non-deployed builds
2018-08-17 13:18:48 +09:00
Dean Herbert
12b81df2f3
Fix unhandled exception on startup when arguments are present
2018-08-16 22:01:04 +09:00
Dean Herbert
9f55afe569
Let user know automatic reporting happened
2018-08-16 16:44:12 +09:00
Dean Herbert
9fc0a75b71
Merge branch 'master' into sentry-logging
2018-08-16 13:33:24 +09:00
smoogipoo
bfbe00e6ec
Remove multiple caching
2018-08-08 15:38:09 +09:00
Dean Herbert
4453b5faca
Cache mods at PlaySongSelect
2018-08-08 12:43:08 +09:00
Dean Herbert
4cb7063801
Add automated testing of mod preservation/removal
2018-08-07 16:45:18 +09:00
Dean Herbert
7b8bd7f21c
Fix mod selection not restoring when re-entering song select
2018-08-07 14:49:44 +09:00
miterosan
cc640893c2
Merge branch 'master' into Private_Messages
2018-08-04 00:33:46 +02:00
Dean Herbert
2ea90ef98a
Add sentry logging
2018-08-03 19:25:55 +09:00
miterosan
b1e9a4fd24
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
2018-07-29 23:28:34 +02:00
Dean Herbert
b7de922896
Merge branch 'master' into open-downloaded-beatmas
2018-07-28 12:44:34 +09:00
smoogipoo
464333cf0b
Merge remote-tracking branch 'origin/master'
2018-07-26 21:28:31 +09:00
miterosan
9f43e0c900
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
...
# Conflicts:
# osu.Game/Overlays/Chat/ChatTabControl.cs
# osu.Game/Overlays/ChatOverlay.cs
2018-07-23 15:45:54 +02:00
Dean Herbert
f1c3fbe644
Improve integrity of song select bind/change logic
2018-07-18 13:18:50 +09:00
Dean Herbert
ac35e8bd99
Remove redundant empty statement
2018-07-13 21:27:09 +09:00
Dean Herbert
6d8923a37c
Use better logic
2018-07-13 21:08:41 +09:00
Dean Herbert
a1a077398c
Merge remote-tracking branch 'upstream/master' into peppy-clickable-download-notifications
2018-07-13 21:04:17 +09:00
Dean Herbert
95f314d949
Fix crash when clicking notification from player
2018-07-13 21:04:10 +09:00
Dean Herbert
b33a0f772e
Don't close toolbar
2018-07-13 21:00:52 +09:00
Dean Herbert
96eb44425b
Fix informational overlays not hiding when user toggles other overlay views
...
Closes #3014 .
2018-07-13 20:34:41 +09:00
Dean Herbert
fbc5250bf1
Update framework
2018-07-11 17:12:01 +09:00
Dean Herbert
1418d1369f
Add the ability to click completed download notifications to select beatmap
...
Closes #2731 .
2018-07-11 01:32:10 +09:00
miterosan
c56a4ea893
Merge branch 'master' into Private_Messages
2018-07-08 19:29:33 +02:00
Dean Herbert
e5001b84bd
Merge remote-tracking branch 'upstream/master' into ekrctb-fix-volme-meter
2018-07-05 21:04:19 +09:00
ekrctb
bbceac6cda
Apply renaming of wheel -> scroll
2018-07-05 16:50:04 +09:00
Jacob Odgård Tørring
9248340df8
Merge branch 'master' into master
2018-07-04 20:51:05 +02:00
miterosan
621f4218a3
Merge branch 'master' into Private_Messages
2018-06-30 16:17:56 +02:00
Dean Herbert
182ac80881
Cache also as IBindable
2018-06-29 19:25:28 +09:00
ekrctb
1ed6a672f2
Update volme control
...
Use IMouseWheelBindingHandler for volume VolumeControlReceptor.
VolumeMeter is no longer an IKeyBindingHandler because it is unused.
2018-06-27 18:43:29 +09:00
Dean Herbert
b0a1b25983
Privatise game ruleset and access via DI
...
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
2018-06-26 16:32:32 +09:00
miterosan
6049303c40
Merge branch 'master' into Private_Messages
2018-06-23 20:44:43 +02:00
Dean Herbert
6ec0aaee91
Split out logic for subsequent log message and apply action to only itself
2018-06-21 14:50:42 +09:00
Dean Herbert
87d94591e4
Start displaying notifications earlier
...
Also show important notifications and more in total.
2018-06-21 14:43:38 +09:00
Dean Herbert
285062d93e
Merge branch 'master' into master
2018-06-21 11:40:37 +09:00
miterosan
cd0fe6a09e
Merge branch 'master' of https://github.com/ppy/osu into Private_Messages
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseChatLink.cs
2018-06-17 14:15:14 +02:00
Dean Herbert
55921efffb
Rewrite much state logic
2018-06-06 16:17:51 +09:00
Dean Herbert
9e25e02696
Ensure notifications don't appear during UserTriggered mode
...
Closes #2640 .
2018-06-06 15:50:24 +09:00
Dean Herbert
d1fd09ed47
Rename variables
2018-06-06 15:49:27 +09:00
Dean Herbert
49a683e386
Merge remote-tracking branch 'upstream/master' into miterosan-Private_Messages
2018-05-31 14:50:20 +09:00
Aergwyn
2b3a630270
add OverlayActivation enum
...
+ fix Toolbar being toggleable when it shouldn't be able to
+ allow opening overlays in MenuState.Initial again
2018-05-28 13:43:47 +02:00
HoutarouOreki
e2d840c2de
Rename CursorOverrideContainer to MenuCursorContainer
2018-05-25 21:13:40 +02:00
Aergwyn
b7e3ea348b
expose two Bindables with split logic instead of one with mixed logic
2018-05-21 15:53:55 +02:00
Aergwyn
1482bca147
Rename for better understanding
...
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
2018-05-21 09:42:29 +02:00
Jacob Odgård Tørring
5e0bbe7d0a
Merge branch 'master' into master
2018-05-18 10:19:16 +02:00
Jacob Odgård Tørring
a7e7c3a74a
Enables/Disables seek and Play/Resume on call to beatmapDisabledChanged
2018-05-12 11:55:52 +02:00
Jacob Odgård Tørring
d54a7295f6
Adds DisableSeek property to MusicController
2018-05-10 13:20:04 +02:00
miterosan
ba5861b527
Merge remote-tracking branch 'origin/master' into Private_Messages
...
# Conflicts:
# osu.Game/Online/API/Requests/GetMessagesRequest.cs
# osu.Game/Overlays/Chat/ChatTabControl.cs
2018-05-06 19:45:33 +02:00
smoogipoo
482ae2db87
Unify naming
2018-05-02 19:42:03 +09:00
smoogipoo
d4ada3000c
Add keybind to disable mouse buttons
2018-05-02 19:37:47 +09:00
tgi74000
f41006def7
Set game ruleset to the score ruleset
2018-04-24 21:17:04 +02:00
miterosan
3b68dda23e
Merge remote-tracking branch 'origin/master' into Private_Messages
2018-04-18 20:55:12 +02:00
Dean Herbert
1728dd6502
Make BeatmapSetOverlay accept nulls everywhere
2018-04-18 16:42:09 +09:00
Dean Herbert
7e5d5a197b
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
2018-04-18 16:41:01 +09:00
Dean Herbert
f62677222c
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
2018-04-18 13:08:53 +09:00
tgi74000
3454ec1ca3
Set Value instead of BindTo
2018-04-15 20:23:57 +02:00
tgi74000
4c08aa3dfb
Merge remote-tracking branch 'upstream/master'
2018-04-15 20:22:16 +02:00
Dean Herbert
2eefe722f3
Move cache to a slightly more familiar place and add comment
2018-04-16 00:38:32 +09:00
Dean Herbert
c9615f837a
Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot
2018-04-16 00:20:06 +09:00
miterosan
5bfb386226
Merge remote-tracking branch 'origin/master' into Private_Messages
2018-04-14 13:31:03 +02:00
tgi74000
b23b0a445b
Add support for replay mods
2018-04-13 15:41:35 +02:00
Dean Herbert
a0f9f8d512
Update frramework again
2018-04-13 21:47:50 +09:00
smoogipoo
733f70cbd5
Merge remote-tracking branch 'origin/master' into instant-hide-screenshot
2018-04-13 21:13:09 +09:00
smoogipoo
cd594ce12b
BDL cache screenshot manager
2018-04-13 20:46:01 +09:00
Dean Herbert
9f5a52b641
Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler
2018-04-13 19:54:15 +09:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
smoogipoo
2e5bbe7074
Don't expose CursorOverrideContainer via DI + internalise access
2018-04-13 17:36:38 +09:00
TocoToucan
7c3441e2d0
ActiveInputHandlers -> IgnoredInputHandler
2018-04-12 17:06:35 +03:00
miterosan
a48ccb5603
Implement Private chat
2018-04-08 22:12:57 +02:00
miterosan
a70b329155
Split drawing and business logic of ChatOverlay
2018-04-08 18:21:48 +02:00
Dean Herbert
421e9e0641
Add xmldoc to some high-level classes to explain their separation
2018-04-08 12:58:34 +09:00
naoey
c304c1eecf
Make LinkFlowContainer handle beatmap id lookup in game.
2018-04-04 21:23:51 +05:30
Dean Herbert
1d3c9098b8
Load component asynchronously
2018-03-22 21:42:57 +09:00
Dean Herbert
74191e1b73
Merge remote-tracking branch 'upstream/master' into take_screenshot
2018-03-22 20:49:17 +09:00
Dean Herbert
e5f83530b8
Only allow settings or notifications to be visible at once
...
Resolves #2273 .
2018-03-22 19:49:31 +09:00
TocoToucan
245200d3ee
Add simple screenshot notification
2018-03-16 21:25:00 +03:00
TocoToucan
604e725f3f
Remove redundant code
2018-03-16 20:42:05 +03:00
TocoToucan
5a1af062d3
Handle GlobalAction.TakeScreenshot in ScreenshotManager
2018-03-14 22:55:24 +03:00
TocoToucan
0e69ab1615
Introduce ScreenshotManager class
2018-03-14 00:17:12 +03:00
TocoToucan
e6c22e2287
Taking screenshot support initial commit
2018-03-10 21:59:20 +03:00
Dean Herbert
f78538fea8
Merge branch 'master' into user-profile-recent
2018-03-07 19:41:52 +09:00
Dean Herbert
fac4cd6a32
Move to overlayContent
2018-03-07 14:20:47 +09:00
jorolf
3a420ba826
add the volume overlay
2018-03-03 19:08:35 +01:00
Dean Herbert
eacb9ba743
Merge branch 'master' into user-profile-recent
2018-02-28 23:49:33 +09:00
naoey
2e535afb84
Remove redundant subsection title.
...
- Also handle opening UserProfile in LinkFlowContainer similar to how
beatmaps and channels are handled
2018-02-28 15:25:29 +05:30
Dean Herbert
d2f98642a1
Merge branch 'master' into confine-mode-reset
2018-02-26 20:59:53 +09:00
Dean Herbert
e9c5834387
Add query method for now
2018-02-23 13:26:01 +09:00
Dean Herbert
402d71a8d9
Add user skin setting storage
2018-02-22 16:29:05 +09:00
Dean Herbert
4c14b32783
Add basic skin database model layout and importing
2018-02-22 15:46:11 +09:00
Dean Herbert
c84ded258f
Reset mouse confine mode on input setting reset hotkey
2018-02-22 10:08:56 +09:00
Dean Herbert
a0a65abcac
Crentalise all import logic
2018-02-15 14:22:39 +09:00
Dan Balasescu
0589708da5
Merge branch 'master' into inactive-volume-duck
2018-02-01 16:21:33 +09:00
Dean Herbert
cdf4d9b033
Remove empty line
2018-01-31 18:33:18 +09:00
Dean Herbert
335f0d577c
Add the ability to duck volume when the game is inactive
2018-01-31 18:16:55 +09:00
Dean Herbert
28b67e3d77
Merge branch 'master' into url-parsing-support
2018-01-30 17:47:55 +09:00
Dan Balasescu
2bae22999d
Merge branch 'master' into global-mod-binding
2018-01-29 15:18:11 +09:00
Dean Herbert
6e0cb1adb3
Remove redundant arguments
2018-01-29 15:05:07 +09:00
Dean Herbert
a5b0d51205
Merge remote-tracking branch 'upstream/master' into url-parsing-support
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-01-27 14:06:58 +09:00
Dean Herbert
7852015db3
Remember mod selection when re-entering song select
...
Removes mod application when exiting back to main menu.
Alternative to #1968 .
Closes #1961 .
2018-01-26 19:32:57 +09:00
smoogipoo
9ac035f3d5
Merge branch 'bdl-cache-changes' into ruleset-configs
2018-01-22 13:11:45 +09:00
smoogipoo
b4e1872322
osu!-side changes in-line with framework BDL cache changes
2018-01-22 12:56:30 +09:00
smoogipoo
7910b47868
Move ConfigManager registration/dependency injection to RulesetContainer
2018-01-18 17:00:23 +09:00
Dean Herbert
73d69e2fd9
Add more xmldoc
2018-01-17 20:32:26 +09:00
Dean Herbert
38c5434b82
Remove placeholder methods in OsuGame
...
Let's add these when they can actually be implemented.
2018-01-17 20:32:20 +09:00
Dean Herbert
3892965894
Remove unnecessary region and make methods public
2018-01-17 19:45:10 +09:00
Dean Herbert
54b0f4b912
Merge branch 'master' into url-parsing-support
2018-01-17 16:16:55 +09:00
smoogipoo
0459f0a069
Invert CanShowCursor conditional to fix cursor not showing in VisualTests
2018-01-16 13:40:02 +09:00
smoogipoo
43f8a8e8c5
Rename OsuCursorVisualiser -> CursorOverrideContainer
2018-01-15 14:00:13 +09:00
smoogipoo
78441c05cb
OsuCursorContainer -> OsuCursorVisualiser
2018-01-12 19:45:09 +09:00
smoogipoo
620e125fad
Fix cursor being displayed on intro/disclaimer
2018-01-12 19:34:55 +09:00
smoogipoo
512e4d2c9f
Rewrite the way that cursor overrides are done game-wide
2018-01-12 18:13:17 +09:00
FreezyLemon
3bf9901dd2
Fixed bugs and added tests
2018-01-09 16:11:45 +01:00
Dean Herbert
b035a92bda
Merge branch 'master' into url-parsing-support
2018-01-09 14:28:20 +09:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
Dean Herbert
faf1181fc3
Merge branch 'master' into url-parsing-support
2018-01-02 17:51:50 +09:00
FreezyLemon
e7721d71f3
Changed chat link implementation according to review
2017-12-31 00:51:47 +01:00
Dean Herbert
58b0c9d56c
Dim screen when overlay has focus
2017-12-30 20:45:45 +09:00
Dean Herbert
7a0662da4b
Fix regression during merges
2017-12-28 00:38:50 +09:00
Dan Balasescu
3bfa6bd9fd
Merge branch 'master' into better-notification-delays
2017-12-27 23:26:57 +09:00
Dean Herbert
ab6c93fba4
Merge branch 'master' into notification-verbosity
2017-12-26 16:14:24 +09:00
Dean Herbert
3524ad3dc2
Merge remote-tracking branch 'upstream/master' into better-notification-delays
2017-12-26 16:10:57 +09:00
Dean Herbert
f737a64189
Remove ScreenChanged
2017-12-26 16:09:40 +09:00
Dean Herbert
c15b2382a2
Remove unused variable
2017-12-26 15:56:32 +09:00
FreezyLemon
025d3941a2
Fixed problems introduced by the merge
2017-12-25 19:43:35 +01:00
FreezyLemon
a30448095e
Merge branch 'master' into url-parsing-support
2017-12-25 19:12:23 +01:00
Dean Herbert
d8f0844742
Fix null reference in release builds
...
Intro may not be initialised yet
2017-12-26 02:51:53 +09:00
Dean Herbert
71a94d6b44
Add a bindable Enabled flag to NotificationManager
...
Also better handles delays before notifications are displayed.
2017-12-25 20:53:23 +09:00
Dean Herbert
96e4518e60
Add thread safety
2017-12-25 18:22:58 +09:00
Dean Herbert
320a6b0480
Reduce notification output when exceptions are encountered
2017-12-25 18:20:52 +09:00
Aergwyn
68a00235b9
simplify offset calculation for background
2017-12-24 14:32:56 +01:00
Dean Herbert
7cbf271645
Merge branch 'master' into add-nofitication-overlay-push-bg
2017-12-24 21:52:14 +09:00
Aergwyn
5b22c5a453
reduce code duplication to move intro background
2017-12-24 10:28:37 +01:00
Aergwyn
2ffc479411
let NotificationOverlay move the background
2017-12-23 14:56:23 +01:00
Aergwyn
9bb0cda525
fix NotificationOverlay going out of bounds at the bottom
...
also fixes the overlap with the Toolbar at the top
2017-12-23 14:33:43 +01:00
FreezyLemon
908553ffaf
Added parameter for LoadMultiplayerLobby (CI warning for unused int)
2017-12-07 19:38:03 +01:00
FreezyLemon
94eb853d3d
Added centralised handling for some chat links
2017-12-06 16:41:57 +01:00
Miterosan
b3b1f2018e
Fix osu crashing if a invalid gamerule is given in the game.ini
2017-11-21 15:13:00 +01:00
Dean Herbert
8a407a68b3
Ensure only one information overlay is open at once
2017-11-15 18:49:06 +09:00
Dean Herbert
542c6501a7
Fix VolumeControl and OnScreenDisplay being added to the wrong container
2017-10-24 13:10:17 +09:00
Dean Herbert
635f26badc
Remove unnecessary using
2017-10-24 11:59:57 +09:00
Dean Herbert
9ec870a821
Add comment pertaining to why Schedule() is required
2017-10-24 11:50:18 +09:00
Dean Herbert
e98bfec644
Remove Thread.Sleep and tidy up new method
2017-10-24 11:40:38 +09:00
Dean Herbert
777cdcbdc1
Load even more components async
2017-10-24 10:08:42 +09:00
Dean Herbert
9b7d569a65
Add a single-file loading sequence for main components
...
This stops aync loading from getting overloaded with tasks, which was happening previously.
2017-10-24 10:08:42 +09:00
Dean Herbert
15373c71b6
Allow scores to open beatmap overlay
...
Reshuffles depth of beatmap and profile overlays for now.
2017-10-13 20:09:03 +09:00
EVAST9919
92c3d722b4
Show mapper's profile when clicking on avatar in BeatmapSetOverlay
2017-09-30 05:41:32 +03:00
Dean Herbert
c2bb3ea7bc
Add minimal viable implementation of BeatmapSetOver in game
2017-09-25 17:58:03 +08:00
Dean Herbert
80c35801a6
Hide all overlays when home button is pressed
2017-09-08 16:18:57 +09:00
smoogipooo
57678a13d9
Update in-line with framework changes.
2017-09-04 09:32:35 +09:00
Dean Herbert
72a16e31dd
Remove unnecessary old code
2017-08-25 13:07:10 +09:00
Dean Herbert
2dd3e51373
Ensure other full-screen overlays are closed when direct is open (and vice-versa)
2017-08-25 10:51:28 +09:00
Dean Herbert
9adff5f697
Add osu!direct toggle to toolbar
2017-08-24 20:18:47 +09:00
Dean Herbert
9e96ee989d
Merge branch 'master' into volume-control-fixes
2017-08-22 18:59:02 +09:00
Dean Herbert
8f32fd28c9
Fix backwards conditional
2017-08-22 17:21:19 +09:00
Dean Herbert
09dd0cabd6
Move beatmap/ruleset change restrictions to OsuGame
...
Allows test cases to more freely exist
2017-08-22 15:59:32 +09:00
Dean Herbert
18645fcf29
Update volume control logic to use key bindings
...
Fixes them not working at all, too.
2017-08-22 14:48:04 +09:00
Dean Herbert
a19fc28cff
Visually improve settings transitions and back button
2017-08-17 17:31:14 +09:00
Dean Herbert
66fa84a451
Make settings more modular
2017-08-14 13:09:59 +09:00
Dean Herbert
99458aab48
Propagate framework updates
2017-08-12 19:54:07 +09:00
Dean Herbert
48d4ed55e9
Move a lot of code to framework
2017-08-11 16:11:46 +09:00
Dean Herbert
a93a92a2bb
Remove GlobalHotkeys
2017-08-10 19:52:45 +09:00
Dean Herbert
798fff00b2
Remove shortcomings, remove InputState.Data usage, make everything amazing
...
No more casting!
2017-08-10 19:28:24 +09:00
Dean Herbert
c82db54fb5
Rename OsuAction to GlobalAction
2017-08-10 17:22:08 +09:00
Dean Herbert
d9e36237c7
Move all OsuGame events to OsuAction
2017-08-10 16:45:10 +09:00
Dean Herbert
720bd38d8e
Fix CI issues
2017-08-09 17:30:37 +09:00
Dean Herbert
34b12fbfa4
Add global actions; improve default assignment
2017-08-09 17:10:32 +09:00
Dean Herbert
941f3f0934
Tidy up osu-stable import process
...
Now can locate any osu-stable installation using registry lookup (with ample fallbacks). Also uses a much more controlled access method via StableStorage.
2017-08-01 15:12:38 +09:00
Alex Park (박상희)
bb3a8a29ea
Hide Notification when playing osu
...
Hide Notification Overlay when playing osu
2017-08-01 11:31:11 +09:00
Dean Herbert
df5094c0d4
Rework how notifications are distributed
2017-07-31 18:03:55 +09:00
Dean Herbert
f705589bf2
Rename NotificationManager to NotificationOverlay
2017-07-28 15:03:42 +09:00
Dean Herbert
5f53426a9a
*Database -> *Store
...
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
9e20a02c0a
Split out BeatmapDatabase into BeatmapStore
...
Hide database functionality at a lower level in preparation from eventually making it private.
2017-07-26 16:31:34 +09:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
Thomas Müller
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
Thomas Müller
750fc0db0e
Merge branch 'prevent-dependency-pollution' of github.com:Tom94/osu into better-transforms
2017-07-22 11:34:27 +02:00
Thomas Müller
e469a114a6
Update dependency caching according to framework
2017-07-21 19:03:43 +02:00
Thomas Müller
2cd8f6b30c
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-21 11:15:26 +02:00
Thomas Müller
4d8261fe0b
Merge branch 'master' of https://github.com/ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
# osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
# osu.Game/Overlays/DragBar.cs
2017-07-18 15:16:02 +03:00
Dean Herbert
ae58e18178
Reorder code based on depth (and avoid possible conflicts)
2017-07-18 10:41:52 +09:00
Jorolf
689866f5dd
minor improvements
2017-07-17 20:25:57 +02:00
Thomas Müller
87bcd526f3
Get rid of raw AddDelay calls within osu.Game
2017-07-17 16:51:21 +03:00
Thomas Müller
032e9df67b
ApplyDelay -> AddDelay
2017-07-16 17:47:29 +03:00
Thomas Müller
71105bb9ee
Delay -> ApplyDelay; DelayReset -> ResetDelay
2017-07-16 14:06:46 +03:00
Huo Yaoyuan
6cf36da389
Merge branch 'master' into profile
2017-07-14 22:52:19 +08:00
Dean Herbert
939e167d6a
Correct offset settings vertically based on toolbar visibility
2017-07-13 17:09:12 +09:00
Dean Herbert
3a4150c6c3
Merge remote-tracking branch 'upstream/master' into profile
...
# Conflicts:
# osu.Game/Graphics/Containers/SectionsContainer.cs
2017-07-13 13:44:21 +09:00
Thomas Müller
9d523ea012
Update framework
2017-07-12 11:06:13 +09:00
Huo Yaoyuan
35bec7ddc0
Hide profile when not showing overlays.
2017-06-22 21:43:58 +08:00
Huo Yaoyuan
3883f4a746
Show profile when click on user panel.
2017-06-16 16:23:20 +08:00
Huo Yaoyuan
13d9f3b9bb
Move namespace and setup for DI.
2017-06-15 17:53:12 +08:00
Dean Herbert
1b0e96f411
Fix some discrepancies when changing settings
2017-06-08 20:57:21 +09:00
Dean Herbert
028364b2d9
Add on-screen display support for RawInput and CursorSensitivity
...
Also allows resetting both at once using Ctrl+Alt+R.
- Depends on https://github.com/ppy/osu-framework/pull/807
2017-06-08 17:58:57 +09:00
Dean Herbert
bf45155ed5
Merge branch 'master' into master
2017-06-08 12:55:25 +09:00
John Neijzen
9b0e1c26a3
Clean Up Code
2017-06-07 19:53:37 +08:00
Dean Herbert
97db4856fc
Add toolbar toggle button
...
Also ensure chat is hidden when social is displayed and vice-versa.
2017-06-07 20:15:58 +09:00
Seth
0e087994a1
Merge branch 'master' into social-browser
2017-05-28 15:11:00 -03:00
smoogipooo
330bd4e11d
Fix osu!direct hotkey overriding drawings hotkey (for now).
2017-05-27 20:24:23 +09:00
DrabWeb
5831da6978
Autohide social when entering a screen that doesn't allow overlays, fix potential nullrefs in DirectOverlay, CreateControls -> CreateSupplementaryControls
2017-05-26 02:32:01 -03:00
DrabWeb
63313045d9
Add SocialOverlay to OsuGame
2017-05-26 00:58:18 -03:00
Dean Herbert
15ee2b802e
Hide direct overlay when requested
2017-05-24 13:41:07 +09:00
Dean Herbert
4ee11764b8
Merge branch 'master' into osu-direct
2017-05-24 12:16:34 +09:00
Dean Herbert
fe7ac20e29
Read menu music from osz resource
2017-05-23 16:38:43 +09:00
DrabWeb
8c77f85667
Fix DirectOverlay expanding under the Toolbar
2017-05-21 18:52:30 -03:00
DrabWeb
9ba356f2c6
Added osu!direct header and filter control
2017-05-17 05:58:34 -03:00
Dean Herbert
0feaa407f2
Merge branch 'margin-padding-namespace' into on-screen-display
2017-05-16 16:40:06 +09:00
Dean Herbert
5e5ad9a899
Add basic on-screen display
2017-05-16 15:03:03 +09:00
Dean Herbert
efab186384
Update namespaces in line with framework
2017-05-16 12:50:30 +09:00
Dean Herbert
622b155fda
OsuConfig -> OsuSetting
2017-05-15 10:56:27 +09:00
Dean Herbert
eaaba11586
Change all instances of options to settings where applicable
2017-05-15 10:55:29 +09:00
Dean Herbert
cf239f4d9c
Move chat into main content
...
Also changes the way parallax is applied to OsuScreens game-wide.
2017-05-12 19:03:21 +09:00
Dean Herbert
9a1c662d1f
Update framework
2017-05-11 21:25:43 +09:00
Dean Herbert
5aa90df819
Allow OsuScreens to decide whether ruleset switching should be allowed.
...
Tidies up ToolbarModeSelector a lot by using DI.
2017-04-21 16:03:59 +09:00
Dean Herbert
093abd6872
Add chat toggle button.
2017-04-19 19:54:03 +09:00
Dean Herbert
fbd26a1d5e
Mode -> Ruleset.
2017-04-18 16:05:58 +09:00
Dean Herbert
af13f97435
Fix regressions and test cases.
2017-04-17 19:44:03 +09:00
Dean Herbert
a4e2f34ee7
Make a RulesetDatabase.
2017-04-17 17:43:48 +09:00
smoogipooo
6dbc75283c
Re-implement config value.
2017-04-15 05:52:58 +09:00
smoogipooo
0a1376c2db
Remove PlayMode game-wide.
2017-04-15 05:22:41 +09:00
Dean Herbert
7d7bea7198
Fix crash on restart after update.
...
Also make update process more graceful.
2017-04-11 18:40:39 +09:00
Dean Herbert
4aafc172ca
Allow playfield to specify whether it has a cursor or not.
2017-04-05 17:38:57 +09:00
Dean Herbert
6f1fff4ee7
Update async load usage to new style.
2017-04-02 15:56:12 +09:00
Dean Herbert
fa7c72a099
Refactor ReplayInputHandler creation for more flexibility.
2017-03-31 15:59:53 +09:00
Dean Herbert
fa7fd6efe3
Fix mode selector not invoking a re-filter.
2017-03-29 19:48:13 +09:00
Dean Herbert
f7dc7e9bb9
Update references.
2017-03-28 21:26:20 +09:00
smoogipooo
b225ae82be
GetInputHandler -> CreateInputHandler.
2017-03-24 13:59:05 +09:00
smoogipooo
2074812f46
Move ScoreProcessor and Score to Scoring/.
2017-03-24 09:51:52 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible.
2017-03-23 13:50:08 +09:00
Andrey Zavadskiy
4fa6db6cfa
Hide options when entering the game
2017-03-21 18:20:15 +03:00
smoogipooo
77067b7e64
Re-style.
2017-03-18 02:04:23 +09:00
Dean Herbert
f9f31ca092
Add statefulness to MenuCursor.
2017-03-17 20:45:27 +09:00
Huo Yaoyuan
e1bd168c16
Remaining GameMode -> Screen.
2017-03-14 07:22:46 +08:00
Dean Herbert
4430255ec4
Merge remote-tracking branch 'upstream/master' into replay
...
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Desktop/OsuGameDesktop.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game/Database/BeatmapDatabase.cs
# osu.Game/Graphics/Cursor/OsuCursorContainer.cs
# osu.Game/IPC/BeatmapImporter.cs
# osu.Game/Modes/Mod.cs
# osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
# osu.Game/Modes/UI/Playfield.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/PlayerInputManager.cs
2017-03-07 13:50:08 +09:00
Dean Herbert
0cad5d7d41
Fix most warnings.
2017-03-07 13:05:57 +09:00
Dan Balasescu
bc74f453aa
Merge branch 'master' into replay
2017-03-07 11:41:16 +09:00
Thomas Müller
9b92e99ce9
Merge branch 'master' into increase-ci-strictness
2017-03-06 21:44:39 +01:00
Thomas Müller
6e9c4a4251
Merge branch 'master' into options-footer
2017-03-06 20:01:51 +01:00
Dean Herbert
c24a4f57d9
Raise errors on unnecessary using statements.
2017-03-06 19:15:47 +09:00
Dean Herbert
5ec2db6558
Fix crash on opening options before intro has played.
2017-03-06 17:32:10 +09:00
Dean Herbert
0ee38571a6
Move version-related properties to OsuGameBase.
2017-03-06 17:30:44 +09:00
Dean Herbert
a5d044067c
Cancel previous load attempts before starting a new score load.
2017-03-04 21:35:12 +09:00
Dean Herbert
95e2e2b027
Replay loading via drag-drop huzzah!
2017-03-04 19:02:43 +09:00
Dean Herbert
b294386077
Remove misleading beatmap import method.
2017-03-04 16:47:37 +09:00
Dean Herbert
ff5f0af2d3
Merge branch 'master' into popup-dialog
2017-03-02 16:42:20 +09:00
DrabWeb
ce1798b8bc
DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay
2017-02-28 02:09:36 -04:00
Andrey Zavadskiy
e06b3ecf2d
Input fix
2017-02-27 18:18:12 +03:00
Andrey Zavadskiy
9444ffd849
Removed redundant qualifiers
2017-02-27 17:37:38 +03:00
Dean Herbert
27d31d1d30
Merge remote-tracking branch 'upstream/master' into better-container
2017-02-26 11:23:06 +09:00
Thomas Müller
1585ae842a
Update framework
2017-02-26 11:22:58 +09:00
Dean Herbert
5ff4028c29
Make beatmap importing async.
2017-02-24 18:12:50 +09:00
Thomas Müller
2689de0c0c
Update framework and add "Async" suffix to asynchronous methods
2017-02-23 22:32:10 +01:00
Dean Herbert
bf33cc6f53
Make disclaimer actually be a thing.
2017-02-18 14:16:46 +09:00
Dean Herbert
fe3a6248ec
Add better screen hierarchy and placeholder for dev build disclaimer.
2017-02-17 20:07:16 +09:00
Dean Herbert
e6ef9f67aa
GameMode -> Screen.
2017-02-17 19:23:58 +09:00
Dean Herbert
366e95dd4f
Remove outdated comment.
2017-02-17 17:33:41 +09:00
Dean Herbert
9e8b4d43dd
Improve exit procedure.
2017-02-17 17:25:28 +09:00
Dean Herbert
753232533a
Display Important/Error logging in notifications for now.
2017-02-15 12:37:57 +09:00
Dean Herbert
870aa2750f
Don't attempt to import command line arguments as beatmaps.
2017-02-12 14:53:33 +09:00
Dean Herbert
8ec927899f
Implement notifications.
2017-02-10 16:30:23 +09:00
Dean Herbert
2e119cd74f
Handle toolbar offsets better.
2017-02-08 20:30:45 +09:00
Dean Herbert
3cee23fc00
Toggle toolbar with Ctrl-T.
2017-02-08 20:30:45 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers.
2017-02-07 14:27:41 +09:00
default0
299c4923c3
Implement Beatmap Import via drag&drop
2017-02-05 13:32:08 +01:00
Dean Herbert
64f4098791
Move MusicController beneath Toolbar.
2017-01-31 17:05:54 +09:00
Dean Herbert
74366c620b
Move login screen to toolbar and update design (still not fully implemented).
...
# Conflicts:
# osu.Game/Overlays/Options/General/LoginOptions.cs
# osu.Game/Overlays/Toolbar/Toolbar.cs
2017-01-30 22:55:35 +09:00
Dean Herbert
cbd6fe3f36
Move definition of MusicController's position out of itself.
2017-01-30 22:54:33 +09:00
Dean Herbert
1853bbdda8
Move window/volume configuration to framework level.
2017-01-25 18:44:51 +09:00
Dean Herbert
ae464fcace
Move Intro logic to OnEntering in line with framework changes.
2017-01-20 16:30:24 +08:00
Dean Herbert
4d27101aca
Add ability to adjust game clock's speed (pgup/pgdn).
...
A bit hacky, probably need to expose rate better.
2016-12-05 19:33:38 +09:00
Dean Herbert
9bf36418a0
Make toolbar buttons more independent logic-wise.
...
Also adds visual toggle state for toggleable buttons.
2016-12-02 18:43:01 +09:00
Dean Herbert
167b559a95
Move toolbar to own namespace.
2016-12-01 14:22:29 +09:00
Dean Herbert
c6b7e90739
Merge branch 'refs/heads/master' into online-improvements
2016-12-01 12:51:45 +09:00
Dean Herbert
18509e6a60
ChatConsole -> ChatOverlay. Namespace tidying.
2016-11-30 18:30:06 +09:00
Dean Herbert
481b9d3208
Make opening options shift the rest of the screen as per design.
2016-11-30 18:28:18 +09:00
Thomas Müller
b12b82fdd3
Fix depth values.
2016-11-29 20:50:12 +01:00
Drew DeVault
69cb9cf4de
Fix up volume encapsulation
2016-11-25 00:21:42 -05:00
Dean Herbert
d846246ef2
ShowToolbar -> ShowOverlays; include MusicController.
2016-11-15 20:55:57 +09:00
Dean Herbert
2af839cdbd
Render musicController above toolbar.
2016-11-15 20:55:55 +09:00
Dean Herbert
867797a089
Change volume control mouse wheel behaviour to not gain full-screen focus.
2016-11-15 15:22:14 +09:00
Dean Herbert
06f4f93918
Move play modes to Modes namespace.
2016-11-14 18:03:20 +09:00
Dean Herbert
0f4538f69f
Rename GameModes namespace to Screens.
2016-11-14 17:23:33 +09:00
Dean Herbert
1d51e6af2a
Merge pull request #168 from huoyaoyuan/fixes
...
Fixes for music controller
2016-11-14 16:11:31 +09:00
Huo Yaoyuan
33a35ca711
Do not set WorkingBeatmap explicitly in mode stack.
2016-11-14 04:01:48 +08:00
Thomas Müller
ac99e2d488
Avoid using load to construct the drawable hierarchy whereever possible.
2016-11-12 18:34:36 +01:00
Dean Herbert
cc0f61f545
Merge branch 'refs/heads/master' into dependency-injection
...
# Conflicts:
# osu-framework
# osu.Game/GameModes/OsuGameMode.cs
# osu.Game/GameModes/Play/Player.cs
# osu.Game/OsuGame.cs
# osu.Game/Overlays/MusicController.cs
# osu.Game/Overlays/Options/EditorSection.cs
# osu.Game/Overlays/Options/Input/MouseOptions.cs
# osu.Game/Overlays/Options/Online/InGameChatOptions.cs
# osu.Game/Overlays/Options/SkinSection.cs
2016-11-12 20:18:26 +09:00
Dean Herbert
a0e1513df6
Merge branch 'refs/heads/master' into sidebar-toolbar-coexistence
...
# Conflicts:
# osu.Game/OsuGame.cs
2016-11-11 13:30:57 +09:00
Drew DeVault
0d4560a054
Update to latest DI stuff
2016-11-10 17:40:42 -05:00
Drew DeVault
ee24cd310c
Convert everything to DI pattern
2016-11-10 16:41:18 -05:00
Drew DeVault
19fd6fe249
Introduce dependency injection
2016-11-10 16:38:25 -05:00
Dean Herbert
788c11de10
Merge pull request #103 from huoyaoyuan/music-controller
...
Music controller
2016-11-10 12:54:56 +09:00
Dean Herbert
d9bd3717d0
Re-organise overlay-level elements in OsuGame.
2016-11-09 15:24:24 +09:00
Dean Herbert
fdb83bed79
Make OsuGameModes self-aware of if they want a toolbar or not.
2016-11-09 15:24:22 +09:00
Dean Herbert
97f3023cd9
Ctrl+O for options.
2016-11-08 19:27:37 +09:00
Dean Herbert
4426a683ed
Move OptionsOverlay to OsuGame.
2016-11-08 19:26:12 +09:00
Huo Yaoyuan
2d86cb1e81
Merge branch 'master'
2016-11-05 16:21:59 +08:00
Drew DeVault
89d3f4c2be
Import enum from old osu
2016-11-03 19:06:22 -04:00
Huo Yaoyuan
9e0fbed748
Use PreLoad on music controller.
2016-11-03 22:38:10 +08:00
Huo Yaoyuan
f2a8cc0c29
Merge branch 'master'
2016-11-03 20:38:34 +08:00
Dean Herbert
b86f308af6
Add async workflow.
2016-11-01 23:24:14 +09:00
Huo Yaoyuan
7543d491ae
Add music controller into game.
2016-10-28 21:21:47 +08:00
Dean Herbert
74f1a9622f
Add initial game-wide beatmap flow.
2016-10-28 19:55:48 +09:00
Dean Herbert
debea59bab
Merge pull request #61 from SirCmpwn/song-select
...
Song select
2016-10-27 13:54:34 +09:00
Dean Herbert
ee8b678989
Fix volume controls handling mouse wheel at a higher level than anything else game-wide.
2016-10-26 18:45:48 +09:00
Dean Herbert
d3a857edb9
Make importing work properly.
...
Moves import code to BeatmapDatabase.
2016-10-24 11:39:53 -04:00
Drew DeVault
8e31965fb4
Refactor beatmap import secondary process
...
Doesn't launch a new game window and now supports several files at once.
2016-10-24 11:39:18 -04:00
Dean Herbert
bd1a1644fd
Fix window size saving to config incorrectly.
2016-10-23 01:35:11 +09:00
Drew DeVault
768dd38fa0
s/AddBeatmap/ImportBeatmap/g
2016-10-18 15:42:07 -04:00
autismpp
7276038ca7
Replace Console.WriteLine with Logger.Log.
2016-10-15 06:13:50 +03:00
Dean Herbert
8c7ff58310
Fix regressions caused by overlay class.
2016-10-14 12:50:03 +09:00
Dean Herbert
b425d14ea1
Merge pull request #73 from huoyaoyuan/overlay
...
Overlay proposals
2016-10-14 10:49:13 +09:00
Huo Yaoyuan
254cc87578
Use name ToggleVisibility.
2016-10-14 05:02:13 +08:00
