Commit Graph

2146 Commits

Author SHA1 Message Date
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
8f3621ca24 Make selectGroup a private method. 2017-03-04 22:05:02 +09:00
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
d1bad34434 Enter animation, remove testing mod icons 2017-03-04 05:01:55 -04:00
a2b79de672 Add comments to CarouselContainer 2017-03-04 09:34:39 +01:00
aaa1f766af Fix beatmap removal 2017-03-04 09:34:28 +01:00
9bddd1ed4b Fix broken CarouselContainer animations
The previous commit broke animations of difficulty panels when
selecting beatmaps. This commit fixes these.
2017-03-04 09:33:24 +01:00
d6f53c8b77 Moved test data to visual test 2017-03-04 04:05:31 -04:00
a97a7f1024 No more custom lifetimelist in CarouselContainer 2017-03-04 08:54:14 +01:00
a112b354f0 Basic implementation of score UI 2017-03-04 03:37:34 -04:00
b9e4c920c5 SelectRandom doesnt select hidden groups now 2017-03-03 21:11:38 +01:00
9d75ab85e9 Put mod select over beatmap options 2017-03-03 04:19:03 -04:00
fde509ab1d Merge branch 'master' into mod-overlay 2017-03-03 04:12:42 -04:00
bdb130fabc Avoid using right-to-left fill direction for now. 2017-03-03 16:54:59 +09:00
47845a7fbd Fix button input handling. 2017-03-03 16:54:43 +09:00
b0ee728528 Remove full-screen background layer and add half-height holder.
Doesn't interact well with dialog popups. May add back later with complementing logic.
2017-03-03 16:11:23 +09:00
1891bdf51e Merge branch 'master' into mod-overlay 2017-03-03 01:11:15 -04:00
fb6c25edf8 Fix more silly hacks. 2017-03-03 13:58:46 +09:00
2e01857782 Better constants. 2017-03-03 13:58:46 +09:00
00b139b3df Remove hack (fixed at framework level). 2017-03-03 13:58:46 +09:00
2e74b4be60 Merge branch 'master' into beatmap-options 2017-03-03 00:52:45 -04:00
f872330902 Fix BeatmapDeleteDialog namespace 2017-03-02 21:28:05 -04:00
7a4b9c5571 osu.Game.Overlays.BeatmapOptions -> osu.Game.Screens.Select.Options 2017-03-02 21:20:30 -04:00
ecd3453774 Fix potential nullref. 2017-03-02 22:17:14 +09:00
f9b87ad08c Fix selection on entry to song select.
Also only shows sets with beatmaps for current play mode.
2017-03-02 22:02:32 +09:00
9ea83230aa Formatting fixes. 2017-03-02 22:01:53 +09:00
b856fb5991 Implemented beatmap options overlay 2017-03-02 08:40:55 -04:00