Commit Graph

672 Commits

Author SHA1 Message Date
ebe48b7c24 Removed D rank 2017-03-14 11:14:27 -03:00
322446effe -Unused usings 2017-03-14 11:11:23 -03:00
650fc7563d ScoreRank, Avatar to own files, +DrawableRank 2017-03-14 10:58:28 -03:00
f068f7c4bd No footer in EditSongSelect. 2017-03-14 21:51:26 +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
8176b4ef77 Fix merge errors. 2017-03-14 22:11:38 +09:00
12326f610e Adjust transition to flyte's liking. 2017-03-14 22:11:29 +09:00
21a9996225 Merge branch 'master' into leaderboards 2017-03-14 10:07:33 -03:00
d53f219051 Adjusted score rank size 2017-03-14 10:04:42 -03: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
9a4247f67e Make Footer handles hotkey. 2017-03-14 18:16:04 +08:00
c3a0549cdd Move player specific stuff to derived PlaySongSelect. 2017-03-14 16:58:34 +08:00
fae6afa9e3 Create basic SongSelect class. 2017-03-14 16:44:35 +08:00
0198593697 Make BeatmapInfoWedge:OverlayContainer and unify transforms. 2017-03-14 16:29:20 +08: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
3913a0a9ee Fix removal of the last one beatmap. 2017-03-14 05:35:58 +08:00
6bd9e3cac1 +Score ranks 2017-03-13 18:34:43 -03:00
14a22f032f Fix beatmap panel removal. 2017-03-14 04:35:43 +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
442a2c97db Merge conflicts 2017-03-13 09:44:22 -03:00
dbc8d513f9 Merge https://github.com/ppy/osu into leaderboards 2017-03-13 09:36:16 -03:00
9912f5f9e1 Team -> Region, +IHasDrawableRepresentation, +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay -> LeaderboardScore 2017-03-13 09:33:25 -03:00
f50e0bbf3c Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use. 2017-03-13 19:15:25 +09:00
da751804b6 Reduce error count. 2017-03-09 14:24:16 +09:00
01c379da19 User invariant culture sorting. 2017-03-09 14:02:20 +09:00
4430255ec4 Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
#	osu.Desktop/OsuGameDesktop.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
#	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
#	osu.Game/Database/BeatmapDatabase.cs
#	osu.Game/Graphics/Cursor/OsuCursorContainer.cs
#	osu.Game/IPC/BeatmapImporter.cs
#	osu.Game/Modes/Mod.cs
#	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
#	osu.Game/Modes/UI/Playfield.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/Screens/Play/PlayerInputManager.cs
2017-03-07 13:50:08 +09:00
0cad5d7d41 Fix most warnings. 2017-03-07 13:05:57 +09:00
bc74f453aa Merge branch 'master' into replay 2017-03-07 11:41:16 +09:00
9908c1905d Add keyboard shortcuts at song select for mod/random/options. 2017-03-06 17:32:12 +09:00
e356758a7d Don't expicitly set origin of TextAwesome. 2017-03-06 17:06:48 +09:00
76ef8c1a6c Add bindable mods and autoplay support. 2017-03-06 14:52:37 +09:00
81cc27e104 Fix typo. 2017-03-06 10:06:25 +09:00
7afcac3660 Move PreferredPlayMode to WorkingBeatmap. 2017-03-05 17:45:40 +09:00
5719c6656a Update to work with latest framework 2017-03-04 22:38:01 -04:00
9cde20ffc7 Merge https://github.com/ppy/osu into leaderboards 2017-03-04 22:33:05 -04:00
b02e413e56 Removed LeaderboardFade fully 2017-03-04 22:30:48 -04:00
269c139d2a Flags(redoing later), glowing text, proper Score and User usage 2017-03-04 22:29:52 -04:00
73fef85b12 Remove unnecessary usings 2017-03-04 19:43:59 +01:00
a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
7eebee36ab Merge branch 'master' into moarOptions 2017-03-04 16:11:27 +01:00
5c5066e1ae renamed local groups 2017-03-04 15:30:14 +01:00
e12d89529c Merge remote-tracking branch 'upstream/master' into update-flow 2017-03-04 23:28:39 +09:00
00fdffe9c8 Update framework (and fix non-conforming anchors in FillFlowContainers). 2017-03-04 23:24:13 +09:00
389635c7ed Avoid panel state changes when performing a sort. 2017-03-04 22:05:16 +09:00