Commit Graph

346 Commits

Author SHA1 Message Date
fde509ab1d Merge branch 'master' into mod-overlay 2017-03-03 04:12:42 -04:00
777996d884 Rewrite VisualiserLine + add VisualiserContainer. 2017-03-03 15:43:16 +09:00
1891bdf51e Merge branch 'master' into mod-overlay 2017-03-03 01:11:15 -04:00
2e74b4be60 Merge branch 'master' into beatmap-options 2017-03-03 00:52:45 -04:00
09a2d39e3e Merge branch 'master' into tournament_drawings 2017-03-03 13:06:18 +09:00
efb13b29d1 General cleanups. 2017-03-03 13:01:57 +09:00
7a4b9c5571 osu.Game.Overlays.BeatmapOptions -> osu.Game.Screens.Select.Options 2017-03-02 21:20:30 -04:00
3a8246f56d Move PauseOverlay to correct namespace. 2017-03-03 10:17:39 +09:00
b856fb5991 Implemented beatmap options overlay 2017-03-02 08:40:55 -04:00
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
58ae9e888d Basic partial replay support. 2017-03-01 22:04:20 +09:00
35d246b59d Merge remote-tracking branch 'origin/master' into tournament_drawings 2017-03-01 19:32:33 +09:00
570c95cb98 Merge https://github.com/ppy/osu into mod-overlay 2017-02-28 02:22:59 -04:00
ce1798b8bc DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay 2017-02-28 02:09:36 -04:00
50d172be39 Added DialogManager(not wired up for desktop project yet) 2017-02-28 00:59:36 -04:00
fbd9523596 Added beatmap delete dialog 2017-02-27 23:19:28 -04:00
3094c01a40 Merge https://github.com/ppy/osu into popup-dialog 2017-02-27 16:40:04 -04:00
fc33bf4761 Add drawings config. 2017-02-27 23:29:18 +09:00
5f3e484353 Add scrolling teams container. 2017-02-27 23:29:06 +09:00
a22216d0b0 Update nuget packages. 2017-02-27 20:38:30 +09:00
25a1c7a8ad Initial groups implementation. 2017-02-27 14:19:07 +09:00
d78dca3d85 New design 2017-02-26 23:35:13 -04:00
79993a576f Add basic GC options. 2017-02-26 18:06:59 +09:00
c94da4fcf0 Added popup dialog 2017-02-24 00:05:37 -04:00
b4b88712ad Merge branch 'master' into mod-overlay 2017-02-23 08:00:24 -04:00
7e7bf07d03 Remove unused whitebox. 2017-02-23 11:11:46 +09:00
99f1f88c75 Merge https://github.com/ppy/osu into mod-overlay 2017-02-22 12:35:55 -04:00
aef0eb49a1 Add loading screen. 2017-02-22 21:53:59 +09:00
afba4fbfad Merge remote-tracking branch 'upstream/master' into chat-improvement 2017-02-21 15:46:28 +09:00
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
520e040396 Add FocusedTextBox abstraction. 2017-02-19 17:59:22 +09:00
0da0ef5a1b Fix padding, fonts and alignment of chat display. 2017-02-19 17:06:41 +09:00
006fb5502d ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select 2017-02-18 07:28:22 -04:00
fe3a6248ec Add better screen hierarchy and placeholder for dev build disclaimer. 2017-02-17 20:07:16 +09:00
e6ef9f67aa GameMode -> Screen. 2017-02-17 19:23:58 +09:00
9fc3726925 ModSelector -> ModSelect, added mod descriptions, added per-mode mod selection, changed animations and made the wave mask properly 2017-02-16 18:32:27 -04:00
0a58fc62db Added mod selection overlay 2017-02-16 16:05:03 -04:00
580584a015 Don't use osu! mode parser for other game modes for now (convert still works). 2017-02-15 12:36:47 +09:00
fc192906ea Handle proxied approach layer better and add slider's approach circle (previously missing). 2017-02-15 01:23:19 +09:00
7ad9cd6b6e add explicit false values to prevent warnings as errors 2017-02-12 02:32:11 -05:00
8ec927899f Implement notifications. 2017-02-10 16:30:23 +09:00
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
2e119cd74f Handle toolbar offsets better. 2017-02-08 20:30:45 +09:00
84096b146e Make password mask characters look better. 2017-02-08 12:49:20 +09:00
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
d6714324df OsuNub -> Nub. 2017-02-04 12:06:53 +01:00
0edc64a08c Re-use checkbox nub for option sliders and slightly re-structure. 2017-02-04 09:50:58 +01:00
4504440f80 Fix much dropdown shit. 2017-02-03 19:13:10 +09:00
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
a6fd7f46c3 Merge remote-tracking branch 'upstream/master' into login-updates 2017-02-03 12:48:52 +09:00