Commit Graph

748 Commits

Author SHA1 Message Date
6487bf45cf Eagerly attempt to pause the game when the window is not focused 2017-05-16 17:59:14 +09:00
622b155fda OsuConfig -> OsuSetting 2017-05-15 10:56:27 +09:00
ab1768ef80 Merge branch 'master' into tidy-up 2017-05-09 10:27:29 +09:00
48368779ab Avoid polluting Player with HUD-specific code. 2017-05-08 11:48:40 +09:00
4f8549f220 Standardise usages of exceptions. 2017-05-07 00:38:17 +08:00
9c4f813da1 Remove unnecessary hide/show logic.
Also change the way the overlay appears when actually playing.
2017-05-05 13:14:44 +09:00
c9ba1ac4f6 Adjust namespaces.
Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.
2017-05-05 13:00:05 +09:00
475eb6fe5f Cleanup 2017-05-04 17:29:52 +03:00
7e1efcc20b Added ModsContainer 2017-05-02 22:34:07 +03:00
f261a077d2 General fixes/cleanup in Player. 2017-04-26 20:37:47 +09:00
c2108b7706 Use object initialiser. 2017-04-26 18:32:47 +09:00
b6f838f536 Fix potential nullref. 2017-04-26 18:32:40 +09:00
4656a7170a Add very basic lead-in support. 2017-04-26 18:17:25 +09:00
9d14b6e1e9 Make SongProgress return the actual time value via OnSeek. 2017-04-26 18:17:17 +09:00
01caaf44f3 Add a decoupled clock to allow for lead-in and lead-out time. 2017-04-26 18:16:55 +09:00
d476482493 Add basic seeking support when a replay is loaded. 2017-04-25 22:59:51 +09:00
1d2f19b5a2 change background dim from integer to double 2017-04-22 18:34:03 +02:00
caf3d311cd Merge remote-tracking branch 'upstream/master' into speed-adjust-mods 2017-04-21 20:55:20 +09:00
d94035e9da Merge branch 'master' into general-fixes 2017-04-21 20:42:46 +09:00
3f832731c9 Add DoubleTime, HalfTime and Nightcore support. 2017-04-21 17:33:37 +09:00
5fdc9819cf Add basic UO support (now called Audio Offset). 2017-04-21 16:20:05 +09:00
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
1707c2458e Update exception name. 2017-04-20 12:11:03 +09:00
873599b359 Fix conversion regression. 2017-04-20 11:36:50 +09:00
a47870b376 Apply Ruleset to Scores. Reduce complexity of score creation. 2017-04-20 11:16:08 +09:00
3b95fbab7d Add score statistic tracking (osu!). 2017-04-19 16:29:27 +09:00
49f4981f1c Fix CI issues. 2017-04-18 22:28:16 +09:00
a0d9c14526 Add temporary means of getting the user which is responsible for a resulting play. 2017-04-18 22:22:14 +09:00
d51b37cb44 Add a basic implementation of the new design results screen. 2017-04-18 22:22:14 +09:00
edd71c0560 Tidy up and comment PlayerLoader logic. 2017-04-18 16:56:01 +09:00
2ccb8b154f Change conditional ordering to allow player to always run its fadeOut sequence. 2017-04-18 16:47:30 +09:00
24deaf05b6 Merge branch 'master' into player-loader-restart 2017-04-18 16:36:25 +09:00
fbd26a1d5e Mode -> Ruleset. 2017-04-18 16:05:58 +09:00
1f7373db8f Removed unneeded restarting variable 2017-04-17 23:52:38 -07:00
be8d32688b Fixed HotkeyRetryOverlay just going to a black screen 2017-04-17 22:36:03 -07:00
5c48fa6cb1 Removed testing line 2017-04-17 21:35:48 -07:00
aa466d0e84 PlayerLoader creates a new instance of the Player class on Restart 2017-04-17 21:32:38 -07:00
786446354e Fix post-rebase errors. 2017-04-18 09:00:53 +09:00
2767fbd81a Implement Beatmap conversion testing. 2017-04-18 08:57:09 +09:00
a4e2f34ee7 Make a RulesetDatabase. 2017-04-17 17:43:48 +09:00
3845ab2a72 Add comment. 2017-04-15 05:55:38 +09:00
0a1376c2db Remove PlayMode game-wide. 2017-04-15 05:22:41 +09:00
a89af273be Make BeatmapInfo expose Ruleset instead of PlayMode. 2017-04-15 05:01:36 +09:00
59bfc7abad Move statics to RulesetCollection to avoid conflicts later on. 2017-04-15 04:53:37 +09:00
9d753a7798 Merge branch 'master' into song-progress-graph 2017-04-14 19:24:13 +09:00
ea0631ede8 Encapsulate progress update logic better. 2017-04-14 18:23:34 +09:00
acd7a5b254 Hook up beatmap object density to progress display. 2017-04-14 17:58:37 +09:00
09195a03a2 Merge remote-tracking branch 'upstream/master' into song-progress-graph
# Conflicts:
#	osu.Game/Overlays/DragBar.cs
2017-04-14 11:25:00 +09:00
262a2c9f0e Add exception for failing. 2017-04-13 19:13:09 +09:00
5f8baf874d Use interpolatedSourceClock's IsRunning value for consistency. 2017-04-13 18:31:23 +09:00