Commit Graph

351 Commits

Author SHA1 Message Date
0678274118 Rename OptionDropdown and OptionEnumDropdown files 2017-03-25 07:45:04 -03:00
2074812f46 Move ScoreProcessor and Score to Scoring/. 2017-03-24 09:51:52 +09: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
e9a061c709 Merge branch 'master' into beatmap-detail-tabs 2017-03-23 17:13:02 +09:00
c9fe9e681d Make judgement text generic to be used between game modes. 2017-03-23 12:49:28 +09:00
c173c4b7ee Tab control 2017-03-23 00:22:31 -03:00
9601e143d4 Merge branch 'master' into working-beatmap 2017-03-23 09:37:21 +09:00
ba32d50456 Consolidate nested classes. 2017-03-23 08:44:52 +09:00
0dbc232ebf Rename all DropDown -> Dropdown. 2017-03-22 22:32:32 +08:00
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
e217c67bcf Merge branch 'master' into controls 2017-03-22 08:54:03 +08:00
8983bbcaad Merge branch 'master' into leaderboards 2017-03-22 08:24:49 +09:00
f0edf5d3d3 Update to DropDown and Menu. 2017-03-22 07:18:53 +08:00
a272675705 Parse time signature from legacy beatmap control points. 2017-03-21 21:18:08 +09:00
5d0adc6454 Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards 2017-03-19 18:51:53 +09:00
6c12da54f1 Merge pull request #499 from smoogipooo/legacy_beatmap_flag
Add legacy beatmap flag.
2017-03-19 12:39:41 +09:00
b0e7296e25 -IHasDrawableRepresentation, User.Region -> Country 2017-03-19 00:09:58 -03:00
26b0bb02d8 Remove IIsLegacy, expose LegacyBeatmap without a public constructor. 2017-03-18 18:32:54 +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
e529f5e439 Merge branch 'master' into song-select-loading-reoptimisation 2017-03-18 02:12:56 +09:00
292de44a0b WIP menu cursor. 2017-03-17 20:45:27 +09:00
907236e475 Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria. 2017-03-17 19:54:51 +09:00
4b97304603 CarouselContainer -> BeatmapCarousel. 2017-03-17 19:12:54 +09:00
862c4c408f Add legacy beatmap flag. 2017-03-17 14:24:46 +09:00
60fc782e93 Merge branch 'master' into beatmap_timinginfo 2017-03-16 23:08:24 +09:00
271dddc9a7 Merge branch 'master' into generic_scoreprocessor 2017-03-16 23:04:19 +09:00
110bdbd0c1 Make everything share DropDown implementations again. Remove unnecessary files. 2017-03-16 21:17:14 +09:00
5137338c7c Replace List<ControlPoint> with TimingInfo in Beatmap. 2017-03-16 17:11:24 +09:00
334e389518 Tidy up OsuTabControl and FilterControl. 2017-03-16 16:35:44 +09:00
7b66faab9e Fix filename. 2017-03-16 12:59:09 +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
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
7572947214 Badge -> Team 2017-03-15 08:09:44 -03: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
bf66b84ff8 Move a few classes/enums into separate files. 2017-03-15 16:07:40 +09:00
e3e19a156c Rename incorrect class file. 2017-03-15 14:37:29 +09:00
8f5d262f30 Add GetScoresRequest API methods. 2017-03-15 14:06:05 +09:00
6a31219781 Add further abstraction to Sliders/IHasCurve. 2017-03-15 12:52:25 +09:00
253bcebf51 Merge remote-tracking branch 'upstream/master' into leaderboards
# Conflicts:
#	osu.Game/osu.Game.csproj
2017-03-15 12:23:34 +09:00
2629f78afc Add FilterControl and FilterTabControl 2017-03-14 19:49:40 -07:00
650fc7563d ScoreRank, Avatar to own files, +DrawableRank 2017-03-14 10:58:28 -03:00
2e8b1ad390 Woops 2017-03-14 10:09:58 -03:00
21a9996225 Merge branch 'master' into leaderboards 2017-03-14 10:07:33 -03:00
e1cc74bb40 Merge branch 'master' into more-songselect 2017-03-14 20:50:53 +08:00