1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 21:02:55 +08:00
Commit Graph

1216 Commits

Author SHA1 Message Date
chrisny286
f4ebab2d3a Fix backgrounds being transparent in some scaling modes
by replacing `.FadeTo` at the necessary places with `.FadeColour`.
restoring the `.FadeColour` in `fadeOut` of the Player Screen which is ran in every exit scenario.
2019-01-23 08:52:25 +01:00
Dean Herbert
c18ce2c23a Formatting fixes 2019-01-23 14:51:25 +09:00
Dean Herbert
f107a922b4 Add tests for key counter inside player heirarchy 2019-01-23 14:51:25 +09:00
chrisny286
13ba9d64d0 revert empty line 2019-01-23 02:56:00 +01:00
chrisny286
12503b4d07 revert and make VisibilityContainer not AlwaysPresent 2019-01-23 02:37:17 +01:00
chrisny286
f01ba17d1f add check if replay is loaded before allowseeking can be overwitten 2019-01-23 02:12:40 +01:00
chrisny286
cabcfffdeb Fix autoplay rewind/skip usable when UI hidden 2019-01-23 01:16:37 +01:00
Dean Herbert
c58fe4f4ff Fix nullref 2019-01-22 13:18:01 +09:00
Dean Herbert
cebeb0a219 Fix replay playback speed not being displayed initially 2019-01-22 11:40:57 +09:00
Dean Herbert
21317806c9 Merge remote-tracking branch 'upstream/master' into nwabear-master 2019-01-22 10:07:35 +09:00
Dean Herbert
7baff750de Consolidate layout, wording and ordering with VisualSettings 2019-01-22 10:06:30 +09:00
Dean Herbert
b373d78143 Add slight easing 2019-01-22 09:47:51 +09:00
Dean Herbert
25b5bbcd8f
Merge branch 'master' into score-panel-layout 2019-01-22 09:43:37 +09:00
Christian Kamphausen
86581feb4a
Merge branch 'master' into fix-playersettingsoverlay-not-coming-back-ctrl+H 2019-01-22 01:29:58 +01:00
chrisny286
d7d2e2fe44 trimmed whitespace 2019-01-21 19:22:19 +01:00
chrisny286
65fd69c817 Update HUDOverlay.cs
separate PlayerSettingsOverlay from the other HUD elements in the Visibility Container
2019-01-21 19:10:29 +01:00
chrisny286
fb51578df3 Update PlayerSettingsOverlay.cs
Framework renamed this variable so it needs to be renamed here too.
2019-01-21 17:19:40 +01:00
ekrctb
e74f0057bd Automatically layout based on score display width 2019-01-21 17:07:56 +09:00
ekrctb
f982b6da55 Don't hide 'hold for menu' even hud is hidden 2019-01-17 16:49:04 +09:00
Dean Herbert
e2dd025225 Fix scaling of SkipOverlay when UI scale is adjusted
Closes #4040.
2019-01-11 16:54:42 +09:00
Dean Herbert
958840fe17
Merge branch 'master' into fix-sliderbar 2019-01-08 21:23:34 +09:00
smoogipoo
38a3ccc817 Use value where applicable 2019-01-08 16:31:44 +09:00
smoogipoo
8692be9de3 Fix sliderbar not working correctly with TransferValueOnCommit = true 2019-01-08 16:07:54 +09:00
Dean Herbert
74539b5e5c Merge remote-tracking branch 'upstream/master' into letterboxing 2019-01-07 18:52:48 +09:00
Dean Herbert
7d1163a7d2 Remove unnecessary null check 2019-01-04 15:49:23 +09:00
Dean Herbert
c528a3896d Formatting and naming 2019-01-04 15:34:32 +09:00
Dean Herbert
3953f829c8 Add letterbox/screen scaling support 2019-01-04 13:36:02 +09:00
Dean Herbert
b6dc6c4a74
Merge branch 'master' into do_not_use_local_user_for_autoplay_score 2019-01-04 13:11:17 +09:00
smoogipoo
a62405d82d Fix plays with mods not submitting 2018-12-27 22:17:03 +09:00
Dean Herbert
67e200e1b2 Leaderboard design updates 2018-12-27 15:52:40 +09:00
Dean Herbert
8cf30bdb6a Play with delegate 2018-12-26 22:16:35 +09:00
smoogipoo
bb08bf10a0 Fix post-merge issues 2018-12-22 16:26:27 +09:00
smoogipoo
c2a00b84c7 Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip
# Conflicts:
#	osu.Game/Screens/Multi/IMultiplayerScreen.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/SoloResults.cs
#	osu.Game/Screens/Ranking/IResultPageInfo.cs
#	osu.Game/Screens/Ranking/ResultMode.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/ResultModeTabControl.cs
#	osu.Game/Screens/Ranking/Results.cs
2018-12-22 16:22:02 +09:00
Dean Herbert
a35d9178f0 Quick rename 2018-12-22 16:20:29 +09:00
Dean Herbert
e404a0bc20 Clean-ups and renames 2018-12-22 15:51:00 +09:00
smoogipoo
daa6292e08 Split results screen to allow for extensibility 2018-12-22 15:39:06 +09:00
smoogipoo
d93421b796 Merge remote-tracking branch 'Joehuu/master' into timeshift-wip
# Conflicts:
#	osu.Game/Screens/Play/HUD/ModDisplay.cs
2018-12-22 14:02:45 +09:00
smoogipoo
4149734f89 Add room leaderboard to results 2018-12-21 18:22:13 +09:00
smoogipoo
8a2cc64bfa Split results screen to allow for extensibility 2018-12-21 16:34:03 +09:00
smoogipoo
5d59a1ffca Merge remote-tracking branch 'origin/master' into timeshift-wip
# Conflicts:
#	osu.Game.Tests/Visual/TestCasePollingComponent.cs
#	osu.Game/Online/API/APIRequest.cs
#	osu.Game/osu.Game.csproj
2018-12-21 12:51:31 +09:00
Dean Herbert
aaac45ab8c Add ability to select chat tabs with alt-1-9 2018-12-20 21:50:47 +09:00
Dean Herbert
71e5ce59da Fix crash on exiting player during results transition 2018-12-13 16:23:51 +09:00
smoogipoo
170955110f Add mods to the match info 2018-12-12 14:38:03 +09:00
smoogipoo
ca91dfa091 Make hudoverlay always present 2018-12-04 19:20:32 +09:00
Roman Kapustin
c6c255718b Handle ModAutoplay during score construction in the Player 2018-12-03 22:37:26 +03:00
smoogipoo
795933d1a1 CreateScoreInfo -> CreateScore 2018-11-30 18:32:08 +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
4c1abdcd8c Save score upon map completion 2018-11-30 18:25:14 +09:00
smoogipoo
8eff49bccd Remove User from Replay 2018-11-30 18:25:14 +09:00
Dean Herbert
3727955911 Refactors/renames 2018-11-30 16:35:45 +09:00
smoogipoo
219929eb47 Score -> ScoreInfo 2018-11-28 18:33:01 +09:00
smoogipoo
ed02847752 Beatmap -> BeatmapInfo + add foreign key 2018-11-28 17:26:39 +09:00
smoogipoo
2ee181daf7 Re-namespace replay-related classes 2018-11-28 17:20:37 +09:00
smoogipoo
5fd6e6ca77 Re-namespacing 2018-11-28 16:12:57 +09:00
smoogipoo
f27bd3ef3e OpenTK -> osuTK 2018-11-20 17:14:59 +09:00
Dean Herbert
970ea928ae Fix hold for menu button occasionally disappearing 2018-11-19 12:06:47 +09:00
Roman Kapustin
ecf8a89f26 Set AccentColour and GlowColour in StandardHealthDisplay 2018-11-16 19:30:58 +03:00
Roman Kapustin
37b19f78ae Set AccentColour in concrete counters 2018-11-15 23:37:21 +03:00
Dean Herbert
30547ac064 Merge remote-tracking branch 'upstream/master' into dropdown-updates 2018-11-14 20:03:45 +09:00
smoogipoo
aff5fa6169 Update with osu!-side dropdown changes 2018-11-14 18:02:38 +09:00
Dean Herbert
7f73fc2d39 Require holding back button to quit gameplay
Avoids accidental presses and streamlines logic with on-screen element.
2018-11-07 01:49:21 +09:00
Dean Herbert
6f1ef3243d Proportionally adjust width in line with change 2018-10-31 02:56:25 +09:00
Paul Teng
4bc9161cd1 Leave bigger gap if replaying 2018-10-30 08:32:12 -04:00
Paul Teng
b351aae93f Reduce height of song progress handle 2018-10-18 07:02:18 -04:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format 2018-10-10 19:19:36 +09:00
ekrctb
68980fc477 Adjust usage of Handle(Non)PositionalInput to follow framework update 2018-10-02 14:45:33 +09:00
ekrctb
b7a2ad1aa5 Use UIEvent level getters for modifier keys. 2018-10-02 13:26:36 +09:00
ekrctb
50091252e2 Adapt signature change of event handlers 2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af Change signature to new event handler 2018-10-02 12:02:47 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Dean Herbert
ae4c371bec Merge branch 'update-framework-event-handling' into update-framework 2018-09-20 00:29:42 +09:00
smoogipoo
28f31540c4 Apply changes in-line with framework localisation changes 2018-09-19 14:07:46 +09:00
ekrctb
b790e16217 Use Click instead of now removed TriggerOnClick 2018-09-19 11:42:32 +09:00
ekrctb
a3e6973b41 Replace usage of now removed TriggerKeyPress and similar methods. 2018-09-19 11:36:55 +09:00
Joehu
f99eff1192 Use consistent terminology format 2018-09-15 07:30:11 -07:00
Dean Herbert
79b56cb35c Make saveState private 2018-09-15 16:34:08 +09:00
Dean Herbert
65b2bceef2 Simplify implementation 2018-09-15 14:51:04 +09:00
Roman Kapustin
125b569ccb Change AudioClock type to IFrameBasedClock and comment its usage 2018-09-07 21:39:41 +03:00
Roman Kapustin
dae54d252d Remove redundant checks in RestoreState 2018-09-07 21:35:32 +03:00
Roman Kapustin
7a1fdd9dc8 Reset KeyCounter if targetState was not found 2018-09-06 01:01:36 +03:00
Dean Herbert
5aff19eaea
Merge branch 'master' into replay_keycounter 2018-09-05 08:53:02 +09:00
Dean Herbert
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
smoogipoo
e7a5816d27 Use GetAsync for all samples 2018-08-27 17:30:16 +09:00
smoogipoo
1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
Dean Herbert
9cbead55d6 Add a second parallax layer to break overlay arrows 2018-08-22 17:41:13 +09:00
smoogipoo
2fb62827e2 Soft-handle errors when beatmap contains no objects 2018-08-22 16:01:58 +09:00
Dean Herbert
4a68b14447 Fix crash when selecting mods after entering play mode
Closes #3260.
2018-08-21 00:15:51 +09:00
Roman Kapustin
8a9b3f6459 Remove rewinded keycounter states 2018-08-15 22:18:48 +03:00
Dean Herbert
70ce9da321
Merge branch 'master' into judgement-rework 2018-08-07 18:09:06 +09:00
Dan Balasescu
12b99acb2b
Merge branch 'master' into add-loading-animation 2018-08-06 13:06:51 +09:00
Dan Balasescu
c1517e1521
Merge branch 'master' into judgement-rework 2018-08-06 12:30:46 +09:00
Dean Herbert
808754a191
Merge branch 'master' into fix-fade-discrepancies 2018-08-03 21:50:03 +09:00
Dean Herbert
042e4e3966
Merge branch 'master' into add-loading-animation 2018-08-03 21:50:02 +09:00
smoogipoo
3619290c34 Split out judgement definition from judgement result 2018-08-02 20:35:54 +09:00
Dean Herbert
b1afcf0e5d Add loading animation to player loader to make it more obvious when loading is complete 2018-08-02 19:47:50 +09:00
Dean Herbert
7097ecb740 Fix discrepancies in how elements of play mode fade when restarting/exiting 2018-08-02 19:08:23 +09:00
Dean Herbert
4a11f2ec2a Improve UX when adjusting visual settings at loading screen 2018-08-02 18:18:55 +09:00
ekrctb
ecc6d55380 Fix player loader not gets ready when multiple mouse button is down 2018-08-01 16:20:29 +09:00
Dan Balasescu
090bc592b5
Merge branch 'master' into add-skip-button-sound 2018-07-30 17:56:08 +09:00
Dean Herbert
8c3583ac54 Remove newline 2018-07-30 14:55:03 +09:00
Roman Kapustin
3134e14b37 Test KeyCounter.RestoreState 2018-07-28 23:24:03 +03:00
Roman Kapustin
8bb83a8fd9 Fix nullref in KeyCounterCollection 2018-07-28 22:16:14 +03:00
Roman Kapustin
1e6220e3c0 Call KeyCounter.RestoreState itself 2018-07-28 13:22:52 +03:00
phosphene47
d32a3ff052 Esc at the end of play should push to result screen
Closes #3060
2018-07-28 08:34:51 +10:00
Dan Balasescu
ceaa23fbbb
Merge branch 'master' into fix-turkish-i 2018-07-26 18:06:58 +09:00
Dean Herbert
5364a6148a Use ToUpperInvariant 2018-07-24 14:42:06 +02:00
Dean Herbert
ab9340f4be Fix usage of culture local ToUpper causing incorrect display on Turkish machines
Closes #3098.
2018-07-24 11:37:43 +02:00
Dean Herbert
44a2ae5f9a Fix incorrect variable usage 2018-07-23 08:33:47 +02:00
Roman Kapustin
332ad5bb67 Move states to KeyCounter 2018-07-22 23:58:21 +03:00
Dean Herbert
479fe98335 Add more prominent sound when skipping 2018-07-22 22:57:55 +02:00
Dean Herbert
3c59ccadd0 Fix gameplay always skipping to first hitobject time
Regresssed with previous build
2018-07-22 22:19:58 +02:00
Roman Kapustin
ecd51d70f9 Rename Memento class 2018-07-22 23:13:06 +03:00
Roman Kapustin
d387048057 Resolve KeyCounterCollection merge conflict 2018-07-22 21:15:53 +03:00
Roman Kapustin
7f3ad37ede Restore keycounter state on replay seek 2018-07-22 19:42:18 +03:00
Roman Kapustin
1d9bf42082 Fix clock assigning during KeyCounterCollection creation 2018-07-22 18:38:10 +03:00
Roman Kapustin
0632c59e60 Save KeyCounter state when keypress happens 2018-07-22 17:35:42 +03:00
Roman Kapustin
72959691e9 Introduce KeyCounterMemento 2018-07-22 17:16:17 +03:00
Dean Herbert
0f37758314 Update framework 2018-07-21 16:21:53 +09:00
Dean Herbert
241437c819 Remove unnecessary counting change logic 2018-07-20 17:08:25 +09:00
Dean Herbert
82ddbb3f5d Delay key count stop 2018-07-19 01:18:07 +09:00
Dean Herbert
8414fe9d05 Add key counter exceptions for paused state 2018-07-18 22:19:32 +09:00
Dean Herbert
a01361f833 Set restart count 2018-07-18 22:05:24 +09:00
Dean Herbert
c2cdf12986 Better pause logic 2018-07-18 19:59:04 +09:00
Dean Herbert
b967fe714b Fix lead-in time now being long enough in many cases 2018-07-17 14:29:22 +09:00
Dean Herbert
da300baff1 Update hide logic 2018-07-17 00:06:51 +09:00
Dean Herbert
ca7b61367f
Merge branch 'master' into correctQuickFade 2018-07-17 00:02:15 +09:00
HoutarouOreki
453d58bcbd Hide Content instead of particular overlays 2018-07-15 01:10:05 +02:00
Berkan Diler
c8697e1743
Fix KeyCounter counting clicks when game is paused 2018-07-14 03:08:28 +02:00
HoutarouOreki
1e48582dc2 Instantly hide pause menu for quick retry 2018-07-11 13:49:37 +02:00
Dean Herbert
8cf1553fd5 Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player 2018-06-29 20:30:42 +09:00
Dean Herbert
750f5a86c3 Fix catch test failing due to disabled bindable 2018-06-29 16:49:11 +09:00
Dean Herbert
0866dd11bd DefaultBackAction -> BackAction, defaults to last button
The last button is more commonly the escape condition.
2018-06-27 12:57:26 +09:00
Dean Herbert
d7ce4ab6fd Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player 2018-06-27 12:36:10 +09:00
ekrctb
d6084c0b30 Adapt to new input handling changes 2018-06-22 18:10:27 +09:00
Dean Herbert
a7ed3ea80b Rename alwaysVisible to explain where it comes from 2018-06-13 11:38:15 +09:00
Dean Herbert
d9e7a324c0 Revert HudOverlay to private field 2018-06-13 11:30:22 +09:00
smoogipoo
67aa52fb1d Use bindable binding 2018-06-12 19:34:49 +09:00
smoogipoo
c70c7a476b Always display the key counter during replay/autoplay 2018-06-12 17:59:59 +09:00
smoogipoo
b9391b3c6b Fix bindable not working under non-debug due to weak references 2018-06-11 18:18:24 +09:00
Aergwyn
b9b04c1b6e move back logic into GameplayMenuOverlay 2018-06-09 09:28:02 +02:00
Aergwyn
792d3b8215 allow "go back" keybind in play 2018-06-09 09:14:58 +02:00
Dean Herbert
0b4f5af52e Add setting to toggle standardised or exponential scoring display
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
2018-06-08 03:17:12 +09:00
Dean Herbert
f3c9049660
Merge branch 'master' into disallow-beatmap-change 2018-06-07 15:34:19 +09:00
smoogipoo
d516a0a05c Store platform offset clock in variable for visibility 2018-06-07 13:42:31 +09:00
smoogipoo
3745f9000b Merge remote-tracking branch 'origin/master' into remove-decoder-offset 2018-06-07 13:37:19 +09:00
Dan Balasescu
c30861186b
Merge branch 'master' into disallow-beatmap-change 2018-06-06 20:26:17 +09:00
smoogipoo
4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
Dean Herbert
55921efffb Rewrite much state logic 2018-06-06 16:17:51 +09:00
Dean Herbert
86be1bef6b Use UserTriggered in Player 2018-06-06 15:10:15 +09:00
Thomas Müller
88b23d4e66
Merge branch 'master' into netcoreapp2.1 2018-06-04 05:30:25 +02:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change 2018-06-04 10:53:04 +09:00
Dean Herbert
7ca437aa8e
Merge branch 'master' into fix-expand-button-colour 2018-06-04 02:16:27 +09:00
Joehu
0f13acf67e Use updateExpanded method 2018-06-02 12:52:31 -07:00
Dean Herbert
652e2ccaf5
Merge branch 'master' into netcoreapp2.1 2018-06-03 03:55:33 +09:00
Dean Herbert
64eda27547 Update framework 2018-06-03 03:05:53 +09:00
FreezyLemon
a0c643fae5 Fix SongProgressInfo timespan formatting 2018-06-02 11:25:49 +02:00
Joehu
8d3de3affb Use '?:' expression instead 2018-06-01 15:58:05 -07:00
Joehu
5d1421c0e9 Fix visual settings expand button colour 2018-06-01 15:31:25 -07:00
Dean Herbert
5872b61988 Fix potential double-disposal of player if PlayerLoader is finalised 2018-05-30 15:48:26 +09:00
smoogipoo
a3470f9ec3 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game/Overlays/Music/PlaylistOverlay.cs
#	osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
smoogipoo
3abfd4711d Fix wrong clock being seeked when unpausing 2018-05-28 03:42:53 +09:00
smoogipoo
8ae2a3696f Apply platform universal offset at player level 2018-05-28 03:31:46 +09:00
Dean Herbert
975ce82177 Ensure autoplay tests actually increase score above zero 2018-05-26 14:46:05 +09:00
Dean Herbert
28aa6faef9
Merge branch 'master' into player_loader_input_toggles 2018-05-25 18:38:12 +09:00
smoogipoo
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09:00
smoogipoo
0e122468db Fix progress easing to 0 if aborting after confirmation 2018-05-22 18:06:40 +09:00
Dean Herbert
d43e4af8ea Fix overlap between quit button at key input overlay 2018-05-22 16:45:42 +09:00
Dean Herbert
436067c01f Handle scale back in a nicer way 2018-05-22 16:44:37 +09:00
Dean Herbert
7b770d03c5 Use OnMouseMove instead of Update logic 2018-05-22 16:26:59 +09:00
Dean Herbert
babb7d5158 Fix white ring flash when holding button post-confirmation 2018-05-22 16:23:05 +09:00
Dean Herbert
5f8eb6d823 Fix class name 2018-05-22 16:04:36 +09:00
Dean Herbert
8fbda9d57e Improve comment 2018-05-22 16:04:07 +09:00
Dean Herbert
58ae545747 innerCircle -> overlayCircle 2018-05-22 15:59:53 +09:00
Dean Herbert
ef55c3c197 Fix icon scale not resetting due to no implicit triggering 2018-05-22 15:58:17 +09:00
Dean Herbert
2ce2bd9788 Add comment for pendingAnimation 2018-05-22 15:58:00 +09:00
Dean Herbert
5a892e4d08 This quit button don't quit 2018-05-22 02:09:52 +09:00
Dean Herbert
323aa189b6 Make on-confirmation animation more robust 2018-05-22 02:08:44 +09:00
Dean Herbert
156d7fb25a Change depth of HUD
Yes, this is intentional.
2018-05-22 02:08:21 +09:00
Dean Herbert
946a75ddb2 Block hover to use UI cursor instead of gameplay cursor 2018-05-22 02:05:08 +09:00
Dean Herbert
ebda287e81 Share code with HoldToConfirm implementations elsewhere 2018-05-22 01:44:06 +09:00
Roman Kapustin
30956b64aa Do not change Margin for player settings groups on the PlayerLoader screen 2018-05-21 18:57:01 +03:00
Dean Herbert
f9c162dee9 Adjust design and feel 2018-05-22 00:49:33 +09:00
Dean Herbert
d5afccd610 Make hint text display briefly at initial display, then on hover 2018-05-22 00:02:03 +09:00
Dean Herbert
3d9d40448d Fix incorrect syntax 2018-05-22 00:01:40 +09:00
Dean Herbert
841336a181
Merge branch 'master' into exit_replay_button 2018-05-21 23:45:06 +09: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
Dean Herbert
c48c62ea04
Merge branch 'master' into player_loader_input_toggles 2018-05-21 16:20:08 +09:00
Dean Herbert
e2389ad7a4 Allow using back button on PlayerLoader and Replay 2018-05-18 13:32:05 +09:00
Roman Kapustin
81d7e8a393 Resolve merge conflict 2018-05-18 00:25:47 +03:00
Roman Kapustin
f2f2fb8c73 Use both OnKeyDown and GlobalAction.Back 2018-05-14 22:09:09 +03:00
Roman Kapustin
e802b722f0 Revert "Handle mouse back button using OnMouseDown override instead of using GlobalAction"
This reverts commit 44bbb8700e.
2018-05-14 20:27:05 +03:00
Dean Herbert
28edf3bce7
Merge branch 'master' into hud-above-letterbox 2018-05-14 19:31:39 +09:00
Dean Herbert
0234bbc37f Move definition inline 2018-05-14 19:14:17 +09:00
Dean Herbert
f14948c022
Merge branch 'master' into exit-hold-confirmation 2018-05-14 18:13:40 +09:00
smoogipoo
115c2dc239 Move hud below the skip button 2018-05-14 18:02:18 +09:00
smoogipoo
64fba5f6d1 Proxy the ruleset cursor above the break overlay 2018-05-14 15:36:56 +09:00
smoogipoo
43409127b7 Place break overlay underneath the hud 2018-05-14 15:36:42 +09:00
Dean Herbert
cfa18bdf1f Fix song progress time counters wrapping after an hour
Resolves #2466.
Supersedes and closes #2487.
2018-05-11 22:10:26 +09:00
Roman Kapustin
86430da6d6 Update CircularProgress.FillTo calls 2018-05-10 21:08:02 +03:00
Roman Kapustin
93029fd548 Remove mouseWheelCheckbox from InputSettings player overlay 2018-05-10 20:38:55 +03:00
Dean Herbert
5df9f126d1 Implement a hold-to-confirm screen when exiting game using escape key 2018-05-10 17:07:19 +09:00
Roman Kapustin
ccf82cacb0 Show InputSettings on the PlayerLoader screen 2018-05-09 17:31:52 +03:00
Roman Kapustin
6676c55fe0 Introduce InputSettings 2018-05-09 17:22:37 +03:00
Roman Kapustin
44bbb8700e Handle mouse back button using OnMouseDown override instead of using GlobalAction 2018-05-08 00:22:11 +03:00
smoogipoo
9128e64c9a Rename OriginalBeatmap back to Beatmap 2018-05-07 10:29:38 +09:00
smoogipoo
4ecdea8b2e Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer 2018-05-07 10:17:54 +09:00
smoogipoo
77e661489d Merge branch 'i-beatmap' into beatmap-conversion-rework 2018-05-07 10:00:24 +09:00
smoogipoo
1aefd71b65 Merge remote-tracking branch 'origin/master' into i-beatmap 2018-05-07 09:58:53 +09:00
Roman Kapustin
b08b24b6da Introduce OsuScreen.AllowBackButton property 2018-05-04 21:18:48 +03:00
Roman Kapustin
39db1e8cbb Rename HoldToQuit to QuitButton 2018-05-03 23:50:30 +03:00
Roman Kapustin
f8630115d6 Do not expose HoldToQuit.HoldToQuitButton 2018-05-03 23:29:58 +03:00
UselessToucan
d18a8ec9f5
Merge branch 'master' into exit_replay_button 2018-04-28 20:48:16 +03:00
TocoToucan
c78c5195f3 HoldToQuitButton cleanup 2018-04-28 20:43:41 +03:00
Dean Herbert
4f53185d43 Invert logic to match existing toggles 2018-04-25 16:18:55 +09:00
Dean Herbert
45810e6220
Merge branch 'master' into ignore_beatmap_skin 2018-04-24 17:15:39 +09:00
TocoToucan
630980255e Convert HoldToQuit.text to local variable 2018-04-21 20:35:24 +03:00
TocoToucan
e6d7136a92 Fix HoldToQuit appearance and set HoldToQuitButton.ExitAction 2018-04-21 20:21:09 +03:00
TocoToucan
21454d1f10 Revert "Add 'End replay' button"
This reverts commit c34ef42f00.
2018-04-21 19:27:17 +03:00
TocoToucan
3b621db460 Implement CircularProgress filling 2018-04-21 19:25:21 +03:00
TocoToucan
633c775306 Initial HoldToQuit commit 2018-04-21 18:24:31 +03:00
TocoToucan
1ce38c7fc6 Visual settings: Ignore beatmap hitsounds 2018-04-20 18:30:41 +03:00
TocoToucan
606e088713 Visual settings: Ignore beatmap skin 2018-04-20 18:17:57 +03:00
TocoToucan
c34ef42f00 Add 'End replay' button 2018-04-20 12:50:19 +03:00
Dean Herbert
8bf25542cb Add PlayerLoader TestCase and fix dummy beatmap load procedure 2018-04-20 17:30:27 +09:00
Dean Herbert
de85436534 Merge remote-tracking branch 'upstream/master' into peppy-async-screens 2018-04-20 16:52:58 +09:00
smoogipoo
03a5df84c6 Initial rework of beatmap conversion process 2018-04-19 22:04:12 +09:00
smoogipoo
66b3b295e7 Use IBeatmap wherever possible 2018-04-19 20:44:38 +09:00
smoogipoo
7a550e3f07 Revert unnecessary change for now 2018-04-19 20:20:56 +09:00
smoogipoo
b5a55a0dce Make an interface for beatmaps 2018-04-19 18:58:40 +09:00
Dean Herbert
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
Joehu
128446e51d Remove composer from player loader 2018-04-12 16:46:46 -07:00
Dan Balasescu
32832304a7
Merge branch 'master' into fix-songselect-exit-notimplemented 2018-04-02 13:53:41 +09:00
Dean Herbert
31ade986a7 Scren async changes in line with framework changes
Makes editor not stutter on load, amongst other screens.
2018-03-30 14:58:11 +09:00
FreezyLemon
46d859a660 exit player earlier if a dummy map is loaded 2018-03-25 13:25:48 +02:00
Dean Herbert
e47aa0edc0
Merge branch 'master' into fix-background-fade 2018-03-24 03:40:13 +09:00
smoogipoo
afdab7895a Fix beatmap background fade not being updated on retry
Fixes #2287
2018-03-23 20:41:38 +09:00
Dean Herbert
b56eee1927 Fix background loaded player never being disposed if early exit occurs 2018-03-23 15:04:40 +09:00
FreezyLemon
a3d8048aca abort loading and exit player for dummy maps 2018-03-22 21:46:35 +01:00
smoogipoo
090c78bf10 Merge remote-tracking branch 'origin/master' into fix-player-loader 2018-03-22 20:00:21 +09:00
Dean Herbert
917334a39a Move cancel code to exit paths for screen 2018-03-22 13:01:40 +09:00
Dean Herbert
8f71d53c17 Fix retry not allowing continuing beyond PlayerLoader
Resolves #2265.
2018-03-22 02:10:31 +09:00
Dean Herbert
9ad4e9284a Add skin source fallback chain 2018-03-20 16:40:11 +09:00
smoogipoo
b27b6c7eb7 Merge branch 'master' into cursor-trail 2018-03-16 14:43:27 +09:00
Dean Herbert
ea649f9650 Avoid scheduling during non-current screen 2018-03-14 12:09:19 +09:00
Dean Herbert
ef8d595914 Apply formatting changes 2018-03-14 11:44:19 +09:00
Dean Herbert
c3a3d76b88 Merge remote-tracking branch 'upstream/master' into DoNotMoveToPlayerWhileDragging 2018-03-14 11:43:33 +09:00
Dean Herbert
13f64a1d12
Merge branch 'master' into cursor-trail 2018-03-14 11:42:40 +09:00
smoogipoo
33c721bcbb Fix post-merge errors 2018-03-12 09:51:32 +09:00