Commit Graph

368 Commits

Author SHA1 Message Date
cc2b4c5c5b Refactor WorkingBeatmap
Gets ArchiveReader out of WorkingBeatmap and delegates extracting stuff
from it to subclasses. Should enable us to make an OnlineWorkingBeatmap
or so.
2017-03-22 05:57:08 -04:00
8983bbcaad Merge branch 'master' into leaderboards 2017-03-22 08:24:49 +09:00
090e8bbb79 Remove hit object types solution-wide. 2017-03-20 13:10:24 +09:00
5d0adc6454 Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards 2017-03-19 18:51:53 +09:00
44f71b3975 Merge branch 'master' into fix-beatmap-options 2017-03-19 09:34:53 +01:00
b0e7296e25 -IHasDrawableRepresentation, User.Region -> Country 2017-03-19 00:09:58 -03:00
af82a49127 Fix test case not containing any buttons. 2017-03-19 02:33:28 +09:00
f56b84a1ca Fix mouse cursor in VisualTestGame. 2017-03-19 02:32:21 +09:00
4aea06be22 Merge branch 'master' into leaderboards 2017-03-17 18:23:01 -03:00
0834b5b794 Made requested changes 2017-03-17 18:16:59 -03:00
e78bcf8739 Update TabControl in line with framework changes. 2017-03-17 00:39:40 +09:00
e0a8c3b1e5 Rename BaseDifficulty -> Difficulty / BeatmapDifficulty. 2017-03-16 23:18:02 +09:00
64825c32c5 Add margin to testcase to better see edges. 2017-03-16 21:16:30 +09:00
bd5493fb25 Add back correct defaults. 2017-03-16 16:44:14 +09:00
95757ac420 Merge remote-tracking branch 'refs/remotes/2yangk23/master'
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs
2017-03-16 16:38:42 +09:00
334e389518 Tidy up OsuTabControl and FilterControl. 2017-03-16 16:35:44 +09:00
58fc0a2622 Make TabControl test label more clear 2017-03-15 22:49:23 -07:00
da6b98db10 fixup! Filter doesn't need to be public, nor have a property. 2017-03-16 14:23:48 +09:00
a22b34817c Merge branch 'master' into leaderboards 2017-03-16 11:12:53 +09:00
3aecbf5739 Rearrange things somewhat 2017-03-15 20:15:40 -04:00
cac6c42aac Merge remote-tracking branch 'upstream/master' into tab-control 2017-03-15 20:15:28 -04:00
0a24a30b1d Use DrawableOsuHitObject instead. 2017-03-15 21:48:01 +09:00
42da0f1a72 Merge remote-tracking branch 'origin/master' into generic_judgements_2
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
	osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
	osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
	osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
	osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
	osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
	osu.Game/Modes/UI/HitRenderer.cs
	osu.Game/osu.Game.csproj
2017-03-15 21:36:43 +09:00
e0e0a2726d Move OsuJudgementInfo to its own class, remove PositionalJudgementInfo. 2017-03-15 19:23:42 +09:00
36e8618370 Make DrawableHitObjects have generic JudgementInfos. 2017-03-15 18:55:38 +09:00
d96a78459d Rename ScoreRanks to be in line with current API. 2017-03-15 13:55:29 +09:00
6a31219781 Add further abstraction to Sliders/IHasCurve. 2017-03-15 12:52:25 +09:00
18afd8eabe Fixed license headers 2017-03-14 20:30:42 -07:00
755fb260db Updated TabControl Usage 2017-03-14 19:52:21 -07:00
40bcc63a90 Added and styled FilterTabControls 2017-03-14 19:49:40 -07:00
2629f78afc Add FilterControl and FilterTabControl 2017-03-14 19:49:40 -07:00
55187a8380 Warnings, accuracy formatting 2017-03-14 11:55:19 -03:00
78aedb4518 Test case usings 2017-03-14 11:17:06 -03:00
ebe48b7c24 Removed D rank 2017-03-14 11:14:27 -03:00
8176b4ef77 Fix merge errors. 2017-03-14 22:11:38 +09:00
21a9996225 Merge branch 'master' into leaderboards 2017-03-14 10:07:33 -03:00
4c7f0fcb73 Fix unit tests. 2017-03-14 18:46:34 +09:00
d6ccc66b23 Attempt to fix nullref warning. 2017-03-14 17:46:35 +09:00
6cddd95734 Cleanup. 2017-03-14 17:02:20 +09:00
e52d5181f7 Fix a few visual tests failing. 2017-03-14 17:01:46 +09:00
7141bc86d3 Rework beatmap post-processing into HitRenderer. 2017-03-14 17:01:21 +09:00
854212a7aa Merge branch 'master' into beatmap_parsing
Conflicts:
	osu.Desktop.VisualTests/app.config
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Mania/app.config
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Osu/app.config
	osu.Game.Modes.Taiko/TaikoRuleset.cs
	osu.Game/Modes/Ruleset.cs
	osu.Game/app.config
	osu.Game/osu.Game.csproj
2017-03-14 13:39:19 +09:00
bbd81dbc47 Add license headers. 2017-03-14 13:02:42 +09:00
a502ff2c87 Fix post-merge issues. 2017-03-14 12:47:29 +09:00
879a78156d Merge branch 'master' into mod_application 2017-03-14 12:38:55 +09:00
ba10c3a8db Revert "Merge pull request #441 from tacchinotacchi/archive-reader"
This reverts commit 6f20473e65, reversing
changes made to c76a495d3d.
2017-03-14 11:46:34 +09:00
6bd9e3cac1 +Score ranks 2017-03-13 18:34:43 -03:00
db104d04d3 Use AutoGenerateBindingRedirects instead of explicit app.config. 2017-03-14 03:20:33 +08:00
8e90e05f23 Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static 2017-03-13 12:31:46 -03:00
980807d91e Fix post-merge issues. 2017-03-13 22:33:41 +09:00