Commit Graph

19739 Commits

Author SHA1 Message Date
360340c61d Fix linter issues 2017-03-15 22:39:09 -04:00
a22b34817c Merge branch 'master' into leaderboards 2017-03-16 11:12:53 +09:00
0000cf1bee Update framework 2017-03-15 21:44:27 -04:00
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
cf81467e13 Move fade start out of loop 2017-03-15 14:00:31 -03:00
cd37ebdff2 Fading 2017-03-15 13:57:41 -03:00
a7ba6bbcfe Merge pull request #489 from smoogipooo/generic_judgements_2
Generic judgements part 1/?
2017-03-15 22:13:38 +09:00
2e8ffd9cb7 Merge branch 'master' into generic_judgements_2 2017-03-15 22:09:33 +09:00
418189effd Adjust/improve a few comments. 2017-03-15 21:58:00 +09:00
afefde7ecf Remove old comments. 2017-03-15 21:53:01 +09:00
0ec166f701 Remove broken dependency. 2017-03-15 21:50:28 +09:00
0a24a30b1d Use DrawableOsuHitObject instead. 2017-03-15 21:48:01 +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
b5edcf864b Update framework. 2017-03-15 21:10:00 +09:00
ae645f85d6 Merge pull request #473 from smoogipooo/beatmap_parsing
Rework/rewrite beatmap parsing to parse to base hit objects, which mo…
2017-03-15 21:08:50 +09:00
efd617dd34 Formatting 2017-03-15 08:53:36 -03:00
20685d51cd Adjust delays to start at 0 2017-03-15 08:51:07 -03:00
847d485d5f Remove schedules 2017-03-15 08:49:17 -03:00
aea9a7b795 LeaderboardScore state, initial delay handled by leaderboard 2017-03-15 08:44:29 -03:00
e286356c4a Merge branch 'leaderboards' of https://github.com/DrabWeb/osu into leaderboards 2017-03-15 08:09:52 -03:00
7572947214 Badge -> Team 2017-03-15 08:09:44 -03:00
2b82f256d2 More resilient API cancel/fail logic. 2017-03-15 20:08:12 +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
56868e3c06 Make a few more strings literals. 2017-03-15 19:21:55 +09:00
a9bc253b8c General refactoring (no more casts :D). 2017-03-15 19:18:23 +09:00
f2cfcdb2ca Force an OnBeatmapChanged event to invoke when entering a screen. 2017-03-15 19:09:30 +09:00
d208614495 Add local off-screen avatar optimisation. 2017-03-15 19:07:26 +09:00
36e8618370 Make DrawableHitObjects have generic JudgementInfos. 2017-03-15 18:55:38 +09:00
1855f48997 Add cancellation support for API requests. 2017-03-15 18:07:26 +09:00
08e93275fa Styling fixes. 2017-03-15 17:50:52 +09:00
295f821025 Add leaderboard to song select. 2017-03-15 17:11:08 +09:00
4f95378f27 Add fade out of previously displayed scores. 2017-03-15 17:10:54 +09:00
78efecb89d Remove Alpha 0.001 hack. 2017-03-15 17:07:56 +09:00
9d0c687453 Refactor avatar to handle better. 2017-03-15 17:04:50 +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
775a86e798 Add null-checks and fallbacks to make display work with current API version. 2017-03-15 15:22:46 +09:00
1ae4c2dfbb Remove a lot of customisation from Avatar (and add it in individual usages). 2017-03-15 15:22:28 +09:00
7bc0a1fdfe Use fixed-width for score display. 2017-03-15 15:21:07 +09:00
dfc4bccbe0 Add some padding to leaderboard. 2017-03-15 14:42:56 +09:00
c1f56c7c0e Scores should be enumerable. 2017-03-15 14:38:38 +09:00