|
|
0d8815bd37
|
Added back current work
|
2017-02-03 15:22:02 -04: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 |
|
|
|
4f89cc0784
|
Merge pull request #298 from peppy/skip-button
Make skip button work.
|
2017-02-03 12:47:53 +09:00 |
|
|
|
90fd9d9132
|
Merge branch 'master' into options-refactor
|
2017-02-01 14:07:49 +09:00 |
|
|
|
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 |
|
|
|
e94c92b920
|
Merge branch 'master' into login-updates
|
2017-02-01 13:23:22 +09:00 |
|
|
|
046732b7e3
|
Merge remote-tracking branch 'upstream/master' into song-select-filtering
|
2017-02-01 10:09:14 +09:00 |
|
|
|
ea204ad606
|
Merge pull request #301 from DrabWeb/pause-overlay
Pause overlay
|
2017-02-01 10:07:12 +09:00 |
|
|
|
637a99e8d0
|
Merge remote-tracking branch 'upstream/master' into song-select-filtering
|
2017-01-31 19:00:50 -05:00 |
|
|
|
6803b1a8db
|
Sidebar button style pass.
|
2017-01-31 19:58:38 +09:00 |
|
|
|
0d529cb636
|
General tidy-ups.
|
2017-01-31 19:23:52 +09:00 |
|
|
|
6b66ecc131
|
Global shadows and more sane font size setting.
|
2017-01-31 18:53:52 +09:00 |
|
|
|
6ca974bf0c
|
Re-namespace options, adjust font sizes + more.
|
2017-01-31 18:37:11 +09:00 |
|
|
|
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 |
|
|
|
22ef576c64
|
Make LoginOverlay mask better.
|
2017-01-31 16:59:38 +09:00 |
|
|
|
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 |
|
|
|
ed3ed8251f
|
Made styling PauseButtons public, Resume/Retry/Quit buttons changed to subclasses
|
2017-01-30 08:04:39 -04:00 |
|
|
|
26e9533ff0
|
Add custom implementation of TextBox.
|
2017-01-30 20:29:04 +09:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
10897486ba
|
Merge remote-tracking branch 'upstream/master' into song-select-filtering
|
2017-01-27 15:41:46 -05:00 |
|
|
|
3e7503e860
|
Make skip button work.
|
2017-01-27 21:57:22 +09:00 |
|
|
|
420e61fa97
|
TwoLayerButton
|
2017-01-27 21:08:36 +09:00 |
|
|
|
5787b43586
|
wip
|
2017-01-27 19:14:44 +09:00 |
|
|
|
dedd6a4bcf
|
Small cleanups
|
2017-01-27 05:39:15 -04:00 |
|
|
|
f3e9da609e
|
Merge pull request #295 from peppy/songselect-footer
Initial implementation of song select footer area.
|
2017-01-27 16:13:43 +09:00 |
|
|
|
417933b7ec
|
Merge remote-tracking branch 'upstream/master' into song-select-filtering
|
2017-01-26 13:57:55 -05:00 |
|
|
|
139cac5e57
|
Add fail dialog and flow.
|
2017-01-27 00:41:34 +09:00 |
|
|
|
70271fee35
|
Move PlayerInputManager to own file.
|
2017-01-27 00:38:21 +09:00 |
|
|
|
4a7b3cf391
|
Initial implementation of song select footer area.
|
2017-01-27 00:36:12 +09:00 |
|
|
|
1853bbdda8
|
Move window/volume configuration to framework level.
|
2017-01-25 18:44:51 +09:00 |
|
|
|
cd8c9393f3
|
HP -> Health
|
2017-01-18 11:08:16 +08:00 |
|
|
|
5eb1cda77b
|
Rename FilterSongSelect, use OsuColour
|
2017-01-17 16:43:40 -05:00 |
|
|
|
73e46ee8c0
|
Initial layout of song select filtering UI
|
2017-01-17 15:41:50 -05:00 |
|
|
|
a3770adbc5
|
Merge branch 'master' into hpdisplay
|
2017-01-16 11:23:54 +08:00 |
|
|
|
fa007e632d
|
Refactor colors to palette based design
|
2017-01-12 16:38:27 -05:00 |
|
|
|
7eab50b989
|
Add basic HP display support.
|
2017-01-10 16:08:01 +08:00 |
|
|
|
70ecf48ca7
|
Add central color class
I didn't move _every_ color here, but most of them. The ones I left
behind are mostly just shades of gray.
Closes #126
|
2017-01-09 17:20:31 -05:00 |
|
|
|
cf60c52f00
|
Switch to System.ComponentModel.Description
|
2016-12-07 09:42:53 -05:00 |
|
|
|
5456e0102c
|
s/OptionsDropdown/DropdownOption/g
|
2016-12-07 09:42:52 -05:00 |
|
|
|
4757a1c433
|
Wire up enum-backed dropdowns
|
2016-12-07 09:42:52 -05:00 |
|
|
|
0378de8346
|
Add DisplayName
|
2016-12-07 09:42:37 -05:00 |
|
|
|
9daf524120
|
Add OptionsDropdown<T> and wire up one example
|
2016-12-07 09:42:37 -05:00 |
|
|
|
ff7ec88e66
|
s/OptionsSlider/SliderOption/g
|
2016-12-07 09:42:37 -05:00 |
|
|
|
a350e95e40
|
Add OptionsSlider and wire up volume sliders
|
2016-12-07 09:41:28 -05:00 |
|
|
|
a80c28ca37
|
ToolbarOverlayToggleButton
|
2016-12-02 21:57:01 +09:00 |
|
|
|
9bf36418a0
|
Make toolbar buttons more independent logic-wise.
Also adds visual toggle state for toggleable buttons.
|
2016-12-02 18:43:01 +09:00 |
|
|
|
11f958030f
|
Make Triangles more flexible and more random.
|
2016-12-01 18:53:13 +09:00 |
|
