1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-23 00:07:24 +08:00
Commit Graph

142 Commits

Author SHA1 Message Date
DrabWeb
677b8afc1f Integration 2017-03-23 01:19:29 -03:00
Dean Herbert
8e5d83b857
Isolate leaderboard retrieval code into its own method. 2017-03-16 12:56:59 +09:00
Dean Herbert
1855f48997
Add cancellation support for API requests. 2017-03-15 18:07:26 +09:00
Dean Herbert
295f821025
Add leaderboard to song select. 2017-03-15 17:11:08 +09:00
Huo Yaoyuan
37ff1f3971 Control footer by virtual property. 2017-03-15 10:10:59 +08:00
Huo Yaoyuan
a8d15e616b Remove parameter of OnSelected. 2017-03-14 22:22:23 +08:00
Huo Yaoyuan
b2dd9afcf3 Update editor workflow and make edit button works. 2017-03-14 22:18:40 +08:00
Huo Yaoyuan
f068f7c4bd No footer in EditSongSelect. 2017-03-14 21:51:26 +08:00
Huo Yaoyuan
c939897a8a Revert "Auto assign hotkeys for BeatmapOptionsButton."
This reverts commit beb0a8ff03.
2017-03-14 21:13:57 +08:00
Huo Yaoyuan
beb0a8ff03 Auto assign hotkeys for BeatmapOptionsButton. 2017-03-14 20:50:43 +08:00
Huo Yaoyuan
35a60a8f7d Use depth to arrange buttons. 2017-03-14 20:19:05 +08:00
Huo Yaoyuan
3871a350f8 Move BeatmapOptions buttons to derived class and simplify. 2017-03-14 19:38:21 +08:00
Huo Yaoyuan
c4e5eac35b Move footer stuff to derived. 2017-03-14 18:38:06 +08:00
Huo Yaoyuan
c3a0549cdd Move player specific stuff to derived PlaySongSelect. 2017-03-14 16:58:34 +08:00
Huo Yaoyuan
fae6afa9e3 Create basic SongSelect class. 2017-03-14 16:44:35 +08:00
Huo Yaoyuan
0198593697 Make BeatmapInfoWedge:OverlayContainer and unify transforms. 2017-03-14 16:29:20 +08:00
Huo Yaoyuan
3913a0a9ee Fix removal of the last one beatmap. 2017-03-14 05:35:58 +08:00
Dean Herbert
da751804b6
Reduce error count. 2017-03-09 14:24:16 +09:00
Dean Herbert
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
Dean Herbert
0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Dan Balasescu
bc74f453aa Merge branch 'master' into replay 2017-03-07 11:41:16 +09:00
Dean Herbert
9908c1905d
Add keyboard shortcuts at song select for mod/random/options. 2017-03-06 17:32:12 +09:00
Dean Herbert
76ef8c1a6c
Add bindable mods and autoplay support. 2017-03-06 14:52:37 +09:00
Dean Herbert
81cc27e104
Fix typo. 2017-03-06 10:06:25 +09:00
Dean Herbert
7afcac3660 Move PreferredPlayMode to WorkingBeatmap. 2017-03-05 17:45:40 +09:00
Dean Herbert
389635c7ed
Avoid panel state changes when performing a sort. 2017-03-04 22:05:16 +09:00
Dean Herbert
8f3621ca24
Make selectGroup a private method. 2017-03-04 22:05:02 +09:00
DrabWeb
9d75ab85e9 Put mod select over beatmap options 2017-03-03 04:19:03 -04:00
Seth
fde509ab1d Merge branch 'master' into mod-overlay 2017-03-03 04:12:42 -04:00
Dean Herbert
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
Seth
1891bdf51e Merge branch 'master' into mod-overlay 2017-03-03 01:11:15 -04:00
Seth
2e74b4be60 Merge branch 'master' into beatmap-options 2017-03-03 00:52:45 -04:00
DrabWeb
7a4b9c5571 osu.Game.Overlays.BeatmapOptions -> osu.Game.Screens.Select.Options 2017-03-02 21:20:30 -04:00
Dean Herbert
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
DrabWeb
b856fb5991 Implemented beatmap options overlay 2017-03-02 08:40:55 -04:00
Dean Herbert
e399d6c6d1
Use bindable for PlayMode. 2017-03-02 21:16:58 +09:00
Dean Herbert
471b9daa93
Merge branch 'master' into mod-overlay
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/osu.Game.csproj
2017-03-02 20:27:04 +09:00
Dean Herbert
51950eef43 Merge branch 'master' into master 2017-03-02 18:06:31 +09:00
DrabWeb
6c680825ed ModSections in Ruleset, fixed toolbar play mode changed not firing 2017-03-01 22:05:52 -04:00
DrabWeb
befdf68abe Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once 2017-03-01 18:41:00 -04:00
DrabWeb
d5d8352b62 Testing build 2017-02-28 17:09:31 -04:00
DrabWeb
570c95cb98 Merge https://github.com/ppy/osu into mod-overlay 2017-02-28 02:22:59 -04:00
DrabWeb
ce1798b8bc DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay 2017-02-28 02:09:36 -04:00
DrabWeb
50d172be39 Added DialogManager(not wired up for desktop project yet) 2017-02-28 00:59:36 -04:00
DrabWeb
fbd9523596 Added beatmap delete dialog 2017-02-27 23:19:28 -04:00
Alex Amadori
8b336156f0 Merge remote-tracking branch 'upstream/master' 2017-02-27 14:55:44 +01:00
Thomas Müller
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
Thomas Müller
f7d985fe18 Fix and refactor star difficulty calculation boilerplate
Moves star difficulty calculation entry-point to Beatmap, and sets
star difficulty at the correct place for song select to display.
2017-02-24 19:36:17 +01:00
Alex Amadori
51b6075210 Merge remote-tracking branch 'upstream/master' 2017-02-24 16:54:37 +01:00
Alex Amadori
e2ae03e798 Merge with upstream/master 2017-02-24 16:54:27 +01:00