RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,916 Commits 3 Branches 651 Tags 355 MiB
Commit Graph

1092 Commits

Author SHA1 Message Date
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