Commit Graph

175 Commits

Author SHA1 Message Date
ef5d50e7d8 mode -> ruleset. 2017-04-18 11:29:27 +09:00
0e1ce333e3 Make IBeatmapProcessor a class with virtual methods. 2017-04-18 09:43:43 +09:00
efc050a95a Make IBeatmapConverter an abstract class instead of an interface. 2017-04-18 09:38:52 +09:00
456aee63ca Mode IBeatmapConverter and IBeatmapProcessor to osu.Game.Modes.Beatmaps namespace. 2017-04-18 09:36:08 +09:00
2767fbd81a Implement Beatmap conversion testing. 2017-04-18 08:57:09 +09:00
31ce66bfdc Trim whitespace. 2017-04-15 01:31:42 +09:00
3de3b94978 Merge branch 'master' into song-progress-graph 2017-04-15 01:29:02 +09:00
52ddc414d5 Fix errors. 2017-04-14 20:17:17 +09:00
ac3b435f00 Merge remote-tracking branch 'upstream/master' into hud-improvements
# Conflicts:
#	osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs
2017-04-14 19:29:59 +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
3054697f98 Expose AccentColour/GlowColour from hud elements, and set from HudOverlay. 2017-04-13 10:04:12 +09:00
6ab274abc0 Trim whitespace 2017-04-12 15:06:46 +09:00
f8076ec792 Better comment. 2017-04-12 15:04:11 +09:00
0c90ef79fa Make TestCaseTaikoPlayfield work again. 2017-04-12 12:37:02 +09:00
a922e67754 Because Ruleset only exposes HitRenderer, we need to have AspectAdjust in the base class. 2017-04-12 12:06:56 +09:00
c615762da6 wip 2017-04-11 18:56:25 +09:00
b9ce98efd6 Add AspectAdjust to HitRenderer to allow playfield to consume ful HitRenderer size when needed. 2017-04-10 19:22:27 +09:00
960ea27684 Make all Playfields completely relative. 2017-04-10 19:22:27 +09:00
06a655af5d Move initial position of KeyCounter upwards. 2017-04-07 20:51:37 +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
411988f038 Remove all trailing whitespaces in this repo. 2017-04-06 16:21:18 +08:00
2bb99eac72 fix typo 2017-04-06 14:27:23 +09:00
efe82ef88c Merge branch 'master' into hud_visibility 2017-04-06 13:40:10 +09:00
4aafc172ca Allow playfield to specify whether it has a cursor or not. 2017-04-05 17:38:57 +09:00
bec4bf36ac hud->content and style fixes 2017-04-04 17:47:41 +03:00
009909dd4b Merge remote-tracking branch 'refs/remotes/ppy/master' into hud_visibility 2017-04-04 17:39:53 +03:00
c6216dbde1 Remove outdated todo. 2017-04-04 11:34:45 +09: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
5baa887f55 Fixes 2017-04-03 14:58:38 +03:00
c1b48c6cbf FadeIn/Out 2017-04-03 12:17:53 +03:00
e1d3befaed Added bool to ensure the notification is only displayed once per game execution 2017-04-03 12:03:21 +03:00
63a1eef6e4 Removed unnecessary line 2017-04-03 11:54:50 +03:00
e51fdd3c86 Added container whose visibility will be changable 2017-04-03 11:41:17 +03:00
ed476a79f8 Move posting notification in HudOverlay 2017-04-02 16:18:01 +03:00
9d027a61cd Move input to HudOverlay 2017-04-01 14:46:45 +03:00
d7c39a00b4 Hud Visibility 2017-03-31 16:43:31 +03:00
50c328f1b4 Merge remote-tracking branch 'upstream/master' into partial-judgements
# Conflicts:
#	osu.Game/osu.Game.csproj
2017-03-31 16:46:40 +09:00
3f080ab424 Add some commenting. 2017-03-31 16:01:48 +09:00
cf87330f80 Allow SetReplay to receive null. 2017-03-31 16:00:40 +09:00
fa7c72a099 Refactor ReplayInputHandler creation for more flexibility. 2017-03-31 15:59:53 +09:00
79031b9e74 Update framework. 2017-03-31 12:58:54 +09:00
3050039972 Implement partial judgements + make Result non-nullable. 2017-03-29 18:35:28 +09:00
f7dc7e9bb9 Update references. 2017-03-28 21:26:20 +09:00
befbc63c35 Merge https://github.com/ppy/osu into song-progress-graph 2017-03-23 23:42:06 -03:00
2074812f46 Move ScoreProcessor and Score to Scoring/. 2017-03-24 09:51:52 +09:00
ca2816f9c8 Formatting 2017-03-23 07:24:43 -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
2cb801317d JudgementInfo -> Judgement.
There is no case where we use the term "Judgement" without the suffix, so deemed it unnecessary.
2017-03-23 19:00:18 +09:00
0337f18fb9 Cleaning 2017-03-23 06:37:12 -03:00