02cab41d34
Move InputManager to a higher and more implicit level.
...
Also makes KeyCounterCollection work with replays.
2017-03-07 19:30:48 +09:00
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
0cad5d7d41
Fix most warnings.
2017-03-07 13:05:57 +09:00
57cbecba83
Required changes for framework merge ( https://github.com/ppy/osu-framework/pull/554 ).
2017-03-06 22:08:02 +09:00
76ef8c1a6c
Add bindable mods and autoplay support.
2017-03-06 14:52:37 +09:00
faf07ab51a
Use generics everywhere.
2017-03-06 13:59:11 +09:00
7afcac3660
Move PreferredPlayMode to WorkingBeatmap.
2017-03-05 17:45:40 +09:00
7a6a614358
Don't show pause menu when watching replays.
2017-03-04 21:35:26 +09:00
adb6f01e39
Create class hierarchy for Score/Replay storage.
2017-03-04 15:32:41 +09:00
9e1383fa48
Merge remote-tracking branch 'upstream/master' into replay
...
# Conflicts:
# osu.Game.Modes.Catch/CatchRuleset.cs
# osu.Game.Modes.Mania/ManiaRuleset.cs
# osu.Game.Modes.Taiko/TaikoRuleset.cs
# osu.Game/Screens/Play/Player.cs
2017-03-04 13:17:01 +09:00
3a8246f56d
Move PauseOverlay to correct namespace.
2017-03-03 10:17:39 +09:00
c4ca18eeba
Remove references to PassThrough.
2017-03-02 16:28:51 +09:00
b6e7e054c3
wankoz
2017-03-01 22:56:20 +09:00
58ae9e888d
Basic partial replay support.
2017-03-01 22:04:20 +09:00
522034020e
Moved Bindable init
2017-02-28 11:44:12 +01:00
8b3477820f
Disable mousewheel while playing
2017-02-28 00:08:34 +01:00
1585ae842a
Update framework
2017-02-26 11:22:58 +09:00
7483b69477
Remove unnecessary Dispose logic.
2017-02-25 10:44:19 +09:00
5096f6b83d
Fix memory leak from Player's InputManager.
2017-02-24 21:01:05 +09:00
c5552dfb27
Merge remote-tracking branch 'upstream/master' into remove-usings
2017-02-24 11:29:34 +09:00
2689de0c0c
Update framework and add "Async" suffix to asynchronous methods
2017-02-23 22:32:10 +01:00
a5dfa7ab06
Remove unnecessary using statements
2017-02-23 21:38:10 +01:00
aef0eb49a1
Add loading screen.
2017-02-22 21:53:59 +09:00
2d2660c1c5
Improve transition when retrying a beatmap.
2017-02-22 14:14:37 +09:00
32ce8cf723
Audio class renames in line with framework changes.
2017-02-18 17:35:04 +09:00
e6ef9f67aa
GameMode -> Screen.
2017-02-17 19:23:58 +09:00
d570a6d308
Handle cases where HitObjects were not parsed.
2017-02-15 12:38:10 +09:00
343e48c195
Merge branch 'master' into followpoints
2017-02-13 22:23:57 +09:00
2d155f6a5c
Bring back the delay to what it was before.
2017-02-10 10:48:25 +01:00
6f37c02868
Fix followpoints needing a DelayReset.
2017-02-10 10:07:52 +01:00
a504c73f33
Load beatmap data from an optional osb file.
2017-02-09 15:19:09 +01:00
38b25a7df3
Add hit object stacking.
2017-02-09 07:28:40 +01:00
50bd80cb0c
Update and standardise license headers.
2017-02-07 14:27:41 +09:00
4f89cc0784
Merge pull request #298 from peppy/skip-button
...
Make skip button work.
2017-02-03 12:47:53 +09:00
52fb345e79
Merge branch 'master' into song-select-filtering
2017-02-02 09:25:27 -08:00
c88a2fbf8a
Replace incorrectly removed background logic
...
I had earlier thought that removing this would solve the weirdness with
starting the beatmap on any but the first difficulty, and forgot to
replace it when I found the actual cause.
2017-02-01 19:32:30 -05:00
7ce5fc08ee
Merge branch 'master' into skip-button
...
# Conflicts:
# osu.Game/Graphics/UserInterface/BackButton.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/osu.Game.csproj
2017-02-01 14:05:58 +09:00
0d53d3c4ff
Fixed quitting not working
2017-01-31 22:33:28 -04:00
046732b7e3
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-02-01 10:09:14 +09:00
c92418e000
Made Player.canPause one line
2017-01-31 21:02:58 -04:00
13da75f149
Fixed a bug where the user can double press escape to exit the song
2017-01-31 20:44:59 -04:00
bcd41a2c8f
Moved pause overlay action setting to the initialiser in Player, moved pause overlay displaying be handled in OnExiting instead of OnKeyDown, removed clockWasStarted and used sourceClock.IsRunning instead
2017-01-31 20:28:50 -04:00
624d51204f
Fix issue with background on player
...
Not sure why this only happens on my branch, I didn't touch this code.
2017-01-31 19:14:54 -05:00
91a5d0b3cf
Made requested changes
2017-01-31 09:17:47 -04:00
740f6e5595
Moved delaying resuming to Player
2017-01-30 09:06:26 -04:00
ad33ae9431
Removed unnecessary change
2017-01-30 06:24:44 -04:00
015832f242
Changed PauseOverlay to layout with FlowContainers and not positioning, made the retry counter in PauseOverlay have the number bolded, made it so if the player presses escape before the clock is started in Player then Exit is called instead of Pause
2017-01-30 06:14:28 -04:00
d70cbd37dd
Made the pause progress graph it's own class, to be implemented, made it so the user couldn't double click the pause buttons and made it so the action wasn't called a second time when the mouse button was released, made PopIn and PopOut in PauseOverlay one line each, made Player.IsPaused a public getter with a private getter/setter, implemented restarting in Player
2017-01-30 04:08:14 -04:00
28967cf77a
Renamed Player.isPaused to IsPaused, did a small patch suggested for how the player can click through the pause menu onto the Playfield(only partially works, upstream changes need to be made for full functionality), made Retry default to Resume until retrying is implemented, minor cleanups
2017-01-29 05:04:48 -04:00
582599a8de
Made PauseButton more visually responsive, added force option to Player.Pause, added very basic implementation of the progress bar
2017-01-28 16:55:42 -04:00
