1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 17:42:54 +08:00
Commit Graph

376 Commits

Author SHA1 Message Date
Dean Herbert
e77229b34b Merge branch 'master' into beatmap-detail-tabs 2017-03-23 14:26:00 +09:00
Dean Herbert
681ed38941
Use const whenever possible. 2017-03-23 13:52:38 +09:00
Dean Herbert
54e1b24fe9
Enforce readonly private members where possible. 2017-03-23 13:50:08 +09:00
DrabWeb
67421cdf1c Even though it was 5 minutes ago what was I thinking 2017-03-23 01:34:06 -03:00
DrabWeb
8c99a8b103 Remove visual test(pretty useless) 2017-03-23 01:25:30 -03:00
DrabWeb
c173c4b7ee Tab control 2017-03-23 00:22:31 -03:00
Drew DeVault
2b1d31e69c Address linting issues 2017-03-22 06:25:49 -04:00
Drew DeVault
267238dc27 Simplify derived classes of WorkingBeatmap 2017-03-22 06:15:32 -04:00
Drew DeVault
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
Dean Herbert
8983bbcaad Merge branch 'master' into leaderboards 2017-03-22 08:24:49 +09:00
smoogipooo
090e8bbb79 Remove hit object types solution-wide. 2017-03-20 13:10:24 +09:00
Dean Herbert
5d0adc6454 Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards 2017-03-19 18:51:53 +09:00
Thomas Müller
44f71b3975 Merge branch 'master' into fix-beatmap-options 2017-03-19 09:34:53 +01:00
DrabWeb
b0e7296e25 -IHasDrawableRepresentation, User.Region -> Country 2017-03-19 00:09:58 -03:00
Dean Herbert
af82a49127 Fix test case not containing any buttons. 2017-03-19 02:33:28 +09:00
Dean Herbert
f56b84a1ca Fix mouse cursor in VisualTestGame. 2017-03-19 02:32:21 +09:00
Seth
4aea06be22 Merge branch 'master' into leaderboards 2017-03-17 18:23:01 -03:00
DrabWeb
0834b5b794 Made requested changes 2017-03-17 18:16:59 -03:00
Dean Herbert
e78bcf8739
Update TabControl in line with framework changes. 2017-03-17 00:39:40 +09:00
smoogipooo
e0a8c3b1e5 Rename BaseDifficulty -> Difficulty / BeatmapDifficulty. 2017-03-16 23:18:02 +09:00
Dean Herbert
64825c32c5
Add margin to testcase to better see edges. 2017-03-16 21:16:30 +09:00
Dean Herbert
bd5493fb25
Add back correct defaults. 2017-03-16 16:44:14 +09:00
Dean Herbert
95757ac420
Merge remote-tracking branch 'refs/remotes/2yangk23/master'
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs
2017-03-16 16:38:42 +09:00
Dean Herbert
334e389518
Tidy up OsuTabControl and FilterControl. 2017-03-16 16:35:44 +09:00
Kelvin
58fc0a2622 Make TabControl test label more clear 2017-03-15 22:49:23 -07:00
Dean Herbert
da6b98db10
fixup! Filter doesn't need to be public, nor have a property. 2017-03-16 14:23:48 +09:00
Dean Herbert
a22b34817c Merge branch 'master' into leaderboards 2017-03-16 11:12:53 +09:00
Drew DeVault
3aecbf5739 Rearrange things somewhat 2017-03-15 20:15:40 -04:00
Drew DeVault
cac6c42aac Merge remote-tracking branch 'upstream/master' into tab-control 2017-03-15 20:15:28 -04:00
smoogipooo
0a24a30b1d Use DrawableOsuHitObject instead. 2017-03-15 21:48:01 +09:00
smoogipooo
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
smoogipooo
e0e0a2726d Move OsuJudgementInfo to its own class, remove PositionalJudgementInfo. 2017-03-15 19:23:42 +09:00
smoogipooo
36e8618370 Make DrawableHitObjects have generic JudgementInfos. 2017-03-15 18:55:38 +09:00
Dean Herbert
d96a78459d
Rename ScoreRanks to be in line with current API. 2017-03-15 13:55:29 +09:00
smoogipooo
6a31219781 Add further abstraction to Sliders/IHasCurve. 2017-03-15 12:52:25 +09:00
Kelvin
18afd8eabe Fixed license headers 2017-03-14 20:30:42 -07:00
Kelvin
755fb260db Updated TabControl Usage 2017-03-14 19:52:21 -07:00
Kelvin
40bcc63a90 Added and styled FilterTabControls 2017-03-14 19:49:40 -07:00
Kelvin
2629f78afc Add FilterControl and FilterTabControl 2017-03-14 19:49:40 -07:00
DrabWeb
55187a8380 Warnings, accuracy formatting 2017-03-14 11:55:19 -03:00
DrabWeb
78aedb4518 Test case usings 2017-03-14 11:17:06 -03:00
DrabWeb
ebe48b7c24 Removed D rank 2017-03-14 11:14:27 -03:00
Dean Herbert
8176b4ef77
Fix merge errors. 2017-03-14 22:11:38 +09:00
Seth
21a9996225 Merge branch 'master' into leaderboards 2017-03-14 10:07:33 -03:00
smoogipooo
4c7f0fcb73 Fix unit tests. 2017-03-14 18:46:34 +09:00
smoogipooo
d6ccc66b23 Attempt to fix nullref warning. 2017-03-14 17:46:35 +09:00
smoogipooo
6cddd95734 Cleanup. 2017-03-14 17:02:20 +09:00
smoogipooo
e52d5181f7 Fix a few visual tests failing. 2017-03-14 17:01:46 +09:00
smoogipooo
7141bc86d3 Rework beatmap post-processing into HitRenderer. 2017-03-14 17:01:21 +09:00
smoogipooo
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