Commit Graph

1797 Commits

Author SHA1 Message Date
01cca1a4d2 Refactor color handling
colour*
2017-03-15 20:52:31 -04:00
db5a1e241a Don't crash on unimplemented sorts 2017-03-15 20:18:20 -04: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
418189effd Adjust/improve a few comments. 2017-03-15 21:58:00 +09:00
4de3dde44d Fix post-merge error. 2017-03-15 21:40:19 +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
3a8d1d3619 Add license headers. 2017-03-15 21:32:47 +09:00
0f4df0566b HasSpecial -> HasHold. 2017-03-15 19:43:38 +09:00
c24d98cd11 Merge branch 'beatmap_parsing' of https://github.com/smoogipooo/osu into beatmap_parsing 2017-03-15 19:40:12 +09:00
76c0a4d836 HitObjectType -> LegacyHitObjectType, move to Legacy namespace. 2017-03-15 19:39:40 +09:00
a3906820ec Merge branch 'master' into beatmap_parsing 2017-03-15 19:29:45 +09:00
e0e0a2726d Move OsuJudgementInfo to its own class, remove PositionalJudgementInfo. 2017-03-15 19:23:42 +09:00
a9bc253b8c General refactoring (no more casts :D). 2017-03-15 19:18:23 +09:00
36e8618370 Make DrawableHitObjects have generic JudgementInfos. 2017-03-15 18:55:38 +09:00
1c87d998a6 Rename HitObjectType -> TObject. 2017-03-15 16:29:14 +09:00
bf66b84ff8 Move a few classes/enums into separate files. 2017-03-15 16:07:40 +09:00
ae7547bbda Fix up distance -> positional length comments. 2017-03-15 12:59:19 +09:00
41f912836a Refactorings. 2017-03-15 12:57:17 +09:00
6a31219781 Add further abstraction to Sliders/IHasCurve. 2017-03-15 12:52:25 +09:00
4353c9dc3d Fixed Warnings 2017-03-14 20:42:02 -07:00
18afd8eabe Fixed license headers 2017-03-14 20:30:42 -07:00
9fdeff3f9e Make interfaces inherit other interfaces for now. 2017-03-15 12:30:31 +09:00
808f9fccca Add comment to IHasSpecial. 2017-03-15 12:29:54 +09:00
20e2e7a8c8 Sort on SortTabs ValueChanged 2017-03-14 20:19:41 -07:00
755fb260db Updated TabControl Usage 2017-03-14 19:52:21 -07:00
ee3d3b682f Updated usage for DropDownHeader of FilterTabControl 2017-03-14 19:49:40 -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
2e71869951 Merge branch 'master' into beatmap_parsing 2017-03-15 11:26:47 +09:00
e008574697 Merge branch 'master' into more-songselect 2017-03-15 11:24:14 +09:00
37ff1f3971 Control footer by virtual property. 2017-03-15 10:10:59 +08:00
b5a8ef07fe Update framework. 2017-03-15 09:46:03 +09:00
8c991eae01 Fix CI issues. 2017-03-14 22:27:24 +08:00
a8d15e616b Remove parameter of OnSelected. 2017-03-14 22:22:23 +08:00
b2dd9afcf3 Update editor workflow and make edit button works. 2017-03-14 22:18:40 +08:00
f068f7c4bd No footer in EditSongSelect. 2017-03-14 21:51:26 +08:00
259d39c6ad Stop playing the track in editor
to avoid unused member warning
2017-03-14 21:28:33 +08:00
f97e8ae97f Fix typo and warnings. 2017-03-14 21:20:38 +08:00
c939897a8a Revert "Auto assign hotkeys for BeatmapOptionsButton."
This reverts commit beb0a8ff03.
2017-03-14 21:13:57 +08:00
e1cc74bb40 Merge branch 'master' into more-songselect 2017-03-14 20:50:53 +08:00
beb0a8ff03 Auto assign hotkeys for BeatmapOptionsButton. 2017-03-14 20:50:43 +08:00
35a60a8f7d Use depth to arrange buttons. 2017-03-14 20:19:05 +08:00
618e8e822b Implement EditSongSelect and MatchSongSelect. 2017-03-14 19:53:20 +08:00
3871a350f8 Move BeatmapOptions buttons to derived class and simplify. 2017-03-14 19:38:21 +08:00
72e1612f32 Null-safety in the case where there are no HitObjects. 2017-03-14 19:44:14 +09:00
c4e5eac35b Move footer stuff to derived. 2017-03-14 18:38:06 +08:00
c2d80936cf More closely replicate osu!'s parsing code. 2017-03-14 19:25:04 +09:00
c315c8690b Fix incorrect hit object type. 2017-03-14 19:24:47 +09:00
9a4247f67e Make Footer handles hotkey. 2017-03-14 18:16:04 +08:00