Commit Graph

955 Commits

Author SHA1 Message Date
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
94bf1d65b6 Fix thread race conditions on pausing close to a fail. 2017-04-13 11:41:08 +09:00
6c6ef946bd Some more clean up 2017-04-12 04:01:52 -07:00
8cad09370d Fixed pause and fail screen overlap 2017-04-12 00:20:41 -07:00
bc98e53aff I helped. 2017-04-12 00:09:45 +09:00
1a1607aaaa Improve the look of the transition on hotkey retry (and retry in general). 2017-04-11 19:58:57 +09:00
1879a05c7b Removed using 2017-04-10 06:10:12 +03:00
e73f543c4f Applied suggestions 2017-04-10 06:06:10 +03:00
a7264aa84c Warning fix 2017-04-09 17:53:16 +03:00
425e96c45c Moved logic to it's own class 2017-04-09 17:44:19 +03:00
4ab4f65c83 Retry on Tilde key 2017-04-09 16:26:31 +03:00
0d4f457265 Improve transitions when exiting play mode. 2017-04-07 20:46:35 +09:00
54d1afb655 Fade in HitRenderer post entering animation. 2017-04-07 20:38:57 +09:00
39175905e4 Fix crashes on completing a taiko map (where a strong his is the last hit in the map). 2017-04-07 16:56:09 +09:00
7e99fc47e2 wip 2017-04-07 16:54:54 +09:00
12d2102a88 Merge remote-tracking branch 'upstream/master' into song-progress-graph
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Modes/UI/HudOverlay.cs
#	osu.Game/Screens/Play/PauseOverlay.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/osu.Game.csproj
2017-04-07 09:22:18 +09:00
7c63c8394b Remove unnecessary depth setting. 2017-04-06 15:36:03 +09:00
a18367454d InGameOverlay -> MenuOverlay. 2017-04-06 15:34:52 +09:00
6285f3eea8 Merge branch 'master' into pause_buttons_refactor 2017-04-06 15:00:48 +09:00
4aafc172ca Allow playfield to specify whether it has a cursor or not. 2017-04-05 17:38:57 +09:00
62655b70c9 Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor 2017-04-04 18:41:37 +03:00
7c74951454 Update bindables.
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseResults.cs
#	osu.Game/Screens/Ranking/ResultModeButton.cs
#	osu.Game/Screens/Ranking/Results.cs
2017-04-04 11:34:13 +09:00
27132958c8 Merge remote-tracking branch 'origin/master' into taiko-drawable-generation
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs
	osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs
	osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
2017-04-03 14:19:31 +09:00
6f1fff4ee7 Update async load usage to new style. 2017-04-02 15:56:12 +09:00
f70de7439b Moved title and description to each class 2017-04-01 21:42:12 +03:00
ebc814f06a Typos fix 2017-04-01 21:17:24 +03:00
3574dac780 Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor 2017-04-01 21:03:19 +03:00
fa7c72a099 Refactor ReplayInputHandler creation for more flexibility. 2017-03-31 15:59:53 +09:00
eed50784ba Make player work with TaikoHitRenderer. 2017-03-29 11:35:57 +09:00
f7dc7e9bb9 Update references. 2017-03-28 21:26:20 +09:00
687f71e410 Fixes 2017-03-28 11:45:48 +03:00
60be69d3b0 Fixes 2017-03-28 11:41:08 +03:00
62693a6a59 Again separate classes 2017-03-28 10:49:58 +03:00
9774f826ab Pause and fail overlays -> StopOverlay 2017-03-28 06:08:31 +03:00
5461c6516a Refactor PauseOverlay, FailDialog -> FailOverlay 2017-03-28 04:53:57 +03:00
f1f6f2041f Null track handling in player 2017-03-23 23:57:33 -03:00
2074812f46 Move ScoreProcessor and Score to Scoring/. 2017-03-24 09:51:52 +09:00
0a11d035fe Formatting 2017-03-23 09:07:13 -03:00
938f5eaf58 Dragging 2017-03-23 07:38:08 -03:00
546a3d0914 Merge branch 'song-progress-graph' of https://github.com/DrabWeb/osu into song-progress-graph 2017-03-23 07:15:53 -03:00
4d61424abd Merge branch 'master' into song-progress-graph 2017-03-23 17:44:22 +09:00
681ed38941 Use const whenever possible. 2017-03-23 13:52:38 +09:00
54e1b24fe9 Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
818bdd8e88 SongProgress in HudOverlay 2017-03-22 09:27:04 -03:00