1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 04:49:40 +08:00
Commit Graph

225 Commits

Author SHA1 Message Date
DrabWeb
b856fb5991 Implemented beatmap options overlay 2017-03-02 08:40:55 -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
DrabWeb
3094c01a40 Merge https://github.com/ppy/osu into popup-dialog 2017-02-27 16:40:04 -04:00
Dean Herbert
a22216d0b0
Update nuget packages. 2017-02-27 20:38:30 +09:00
DrabWeb
d78dca3d85 New design 2017-02-26 23:35:13 -04:00
Dean Herbert
79993a576f
Add basic GC options. 2017-02-26 18:06:59 +09:00
DrabWeb
c94da4fcf0 Added popup dialog 2017-02-24 00:05:37 -04:00
Dean Herbert
aef0eb49a1
Add loading screen. 2017-02-22 21:53:59 +09:00
Dean Herbert
afba4fbfad
Merge remote-tracking branch 'upstream/master' into chat-improvement 2017-02-21 15:46:28 +09:00
Thomas Müller
417f146386 Add difficulty calculation
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
2017-02-19 17:41:51 +01:00
Dean Herbert
520e040396 Add FocusedTextBox abstraction. 2017-02-19 17:59:22 +09:00
Dean Herbert
0da0ef5a1b Fix padding, fonts and alignment of chat display. 2017-02-19 17:06:41 +09:00
Dean Herbert
fe3a6248ec
Add better screen hierarchy and placeholder for dev build disclaimer. 2017-02-17 20:07:16 +09:00
Dean Herbert
e6ef9f67aa
GameMode -> Screen. 2017-02-17 19:23:58 +09:00
Dean Herbert
580584a015
Don't use osu! mode parser for other game modes for now (convert still works). 2017-02-15 12:36:47 +09:00
Dean Herbert
fc192906ea Handle proxied approach layer better and add slider's approach circle (previously missing). 2017-02-15 01:23:19 +09:00
John Leuenhagen
7ad9cd6b6e
add explicit false values to prevent warnings as errors 2017-02-12 02:32:11 -05:00
Dean Herbert
8ec927899f
Implement notifications. 2017-02-10 16:30:23 +09:00
Dean Herbert
d05b544d0d
Merge branch 'master' into audio-device-selection
# Conflicts:
#	osu-framework
#	osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs
2017-02-09 16:21:28 +09:00
Dean Herbert
2e119cd74f
Handle toolbar offsets better. 2017-02-08 20:30:45 +09:00
Dean Herbert
84096b146e
Make password mask characters look better. 2017-02-08 12:49:20 +09:00
default0
b4f30dd417 Rework OptionDropdowns to be more versatile
The existing OptionDropdown only supported enums and was thus renamed
to OptionEnumDropDown. A new OptionDropdown has been created in its
place to allow binding to arbitrary values, with a set of user-provided
items.
2017-02-06 01:21:26 +01:00
Thomas Müller
d6714324df OsuNub -> Nub. 2017-02-04 12:06:53 +01:00
Thomas Müller
0edc64a08c Re-use checkbox nub for option sliders and slightly re-structure. 2017-02-04 09:50:58 +01:00
Dean Herbert
4504440f80 Fix much dropdown shit. 2017-02-03 19:13:10 +09:00
Dean Herbert
16a01abc4d Merge remote-tracking branch 'upstream/master' into options-refactor
# Conflicts:
#	osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
#	osu.Game/Graphics/UserInterface/BackButton.cs
#	osu.Game/Screens/Play/KeyCounter.cs
2017-02-03 13:16:07 +09:00
Dean Herbert
a6fd7f46c3 Merge remote-tracking branch 'upstream/master' into login-updates 2017-02-03 12:48:52 +09:00
Dean Herbert
4f89cc0784 Merge pull request #298 from peppy/skip-button
Make skip button work.
2017-02-03 12:47:53 +09:00
Dean Herbert
90fd9d9132 Merge branch 'master' into options-refactor 2017-02-01 14:07:49 +09:00
Dean Herbert
7ce5fc08ee Merge branch 'master' into skip-button
# Conflicts:
#	osu.Game/Graphics/UserInterface/BackButton.cs
#	osu.Game/Screens/Play/Player.cs
#	osu.Game/osu.Game.csproj
2017-02-01 14:05:58 +09:00
Dean Herbert
e94c92b920 Merge branch 'master' into login-updates 2017-02-01 13:23:22 +09:00
Dean Herbert
046732b7e3 Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-02-01 10:09:14 +09:00
Dean Herbert
ea204ad606 Merge pull request #301 from DrabWeb/pause-overlay
Pause overlay
2017-02-01 10:07:12 +09:00
Drew DeVault
637a99e8d0 Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-31 19:00:50 -05:00
Dean Herbert
6803b1a8db Sidebar button style pass. 2017-01-31 19:58:38 +09:00
Dean Herbert
0d529cb636 General tidy-ups. 2017-01-31 19:23:52 +09:00
Dean Herbert
6b66ecc131 Global shadows and more sane font size setting. 2017-01-31 18:53:52 +09:00
Dean Herbert
6ca974bf0c Re-namespace options, adjust font sizes + more. 2017-01-31 18:37:11 +09:00
Dean Herbert
62c5ad907a Merge remote-tracking branch 'upstream/master' into login-updates
# Conflicts:
#	osu.Game/Overlays/Options/General/LoginOptions.cs
2017-01-31 17:05:33 +09:00
Dean Herbert
22ef576c64 Make LoginOverlay mask better. 2017-01-31 16:59:38 +09:00
Dean Herbert
74366c620b Move login screen to toolbar and update design (still not fully implemented).
# Conflicts:
#	osu.Game/Overlays/Options/General/LoginOptions.cs
#	osu.Game/Overlays/Toolbar/Toolbar.cs
2017-01-30 22:55:35 +09:00
DrabWeb
ed3ed8251f Made styling PauseButtons public, Resume/Retry/Quit buttons changed to subclasses 2017-01-30 08:04:39 -04:00
Dean Herbert
26e9533ff0 Add custom implementation of TextBox. 2017-01-30 20:29:04 +09:00
DrabWeb
d70cbd37dd Made the pause progress graph it's own class, to be implemented, made it so the user couldn't double click the pause buttons and made it so the action wasn't called a second time when the mouse button was released, made PopIn and PopOut in PauseOverlay one line each, made Player.IsPaused a public getter with a private getter/setter, implemented restarting in Player 2017-01-30 04:08:14 -04:00
DrabWeb
582599a8de Made PauseButton more visually responsive, added force option to Player.Pause, added very basic implementation of the progress bar 2017-01-28 16:55:42 -04:00
Drew DeVault
10897486ba Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-27 15:41:46 -05:00
Dean Herbert
3e7503e860 Make skip button work. 2017-01-27 21:57:22 +09:00
Dean Herbert
420e61fa97 TwoLayerButton 2017-01-27 21:08:36 +09:00