Commit Graph

2739 Commits

Author SHA1 Message Date
2783f49267 Fix incorrect EndTimes when processing has not been run on HitObjects before the SongProgressGraph is displayed. 2017-04-19 16:05:14 +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
b0f1851e88 Adjust visuals slightly. 2017-04-18 20:52:57 +09:00
1071645dca Flexible cube count (and thus graph height).
This also scaled the graph to the height of the maximum value. And much tidying.
2017-04-18 19:25:52 +09:00
3b21340e1b Split SquareGraph out and make SongProgressGraph also able to take a list of Objects. 2017-04-18 18:40:02 +09:00
417a5ca713 A bit of renaming. 2017-04-18 18:29:24 +09:00
66865c50ad Remove explicit RelativeSize setting. 2017-04-18 18:10:13 +09:00
784ca2300b Add safety check for when no objects have been assigned. 2017-04-18 18:09:37 +09:00
5ba85818db Combine push logic and adjust transitions a bit more. 2017-04-18 17:07:02 +09:00
ddff26d167 Show metadata when loading between retries.
Also speeds up the display a bit.
2017-04-18 17:00:58 +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
64a8992153 Merge branch 'master' into general-fixes 2017-04-18 16:19:52 +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
2bd89e922f Removed unneeded newPlayer 2017-04-17 23:48:21 -07:00
c0f4cbcba6 Added back PlayerLoader overlays 2017-04-17 23:36:11 -07:00
727086c0b2 Updates in-line with framework. 2017-04-18 15:34:53 +09: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
78273d76e3 Added basic loading screen and test case 2017-04-16 20:18:41 -07: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
6421f040dd Fix SongProgress handling escape. 2017-04-14 15:27:24 +09:00
8c41707ac7 Fix incorrect default state. Handle input better. 2017-04-14 14:40:52 +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
9bf861d0a4 Merge remote-tracking branch 'upstream/master' into peppy/pause-clean-up
# Conflicts:
#	osu.Game/Screens/Play/FailOverlay.cs
#	osu.Game/Screens/Play/PauseOverlay.cs
2017-04-14 01:07:34 +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
1f4e0b0251 Fix MosueUp and HighResolution events not being handled by MenuOverlays. 2017-04-13 13:03:07 +09:00
359fea7e25 Improve "escape" pressing logic in pause/fail menus. 2017-04-13 12:40:00 +09:00
94bf1d65b6 Fix thread race conditions on pausing close to a fail. 2017-04-13 11:41:08 +09:00
32b87d12b5 Removed unneeded using 2017-04-12 04:54:24 -07:00
6c6ef946bd Some more clean up 2017-04-12 04:01:52 -07:00
d250dde537 Fixed repeat keys working for retrying 2017-04-12 02:50:03 -07:00
348dd71406 Fixed repeat keys working for resuming 2017-04-12 02:43:42 -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