Dean Herbert
|
57d97ba2e9
|
Make triangles look better in many cases.
|
2017-02-04 22:09:44 +09:00 |
|
Dean Herbert
|
0fefa50b54
|
Add padding beneath sliders in options.
|
2017-02-04 20:57:08 +09:00 |
|
Thomas Müller
|
1913ec659a
|
Merge branch 'master' of github.com:ppy/osu into better-option-sliders
|
2017-02-04 12:07:21 +01:00 |
|
Thomas Müller
|
6db70f8850
|
Use MaskingSmoothness to make masked diagonal edges smoother.
|
2017-02-04 11:06:26 +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
|
fc9badf20f
|
Fix autosize issues.
|
2017-02-03 15:22:00 +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 |
|
Drew DeVault
|
52fb345e79
|
Merge branch 'master' into song-select-filtering
|
2017-02-02 09:25:27 -08:00 |
|
Dean Herbert
|
aec84ae725
|
Fix laggy animations, incorrect hiding logic.
|
2017-02-02 19:24:14 +09:00 |
|
Dean Herbert
|
90fd9d9132
|
Merge branch 'master' into options-refactor
|
2017-02-01 14:07:49 +09:00 |
|
Dean Herbert
|
e94c92b920
|
Merge branch 'master' into login-updates
|
2017-02-01 13:23:22 +09:00 |
|
DrabWeb
|
0d53d3c4ff
|
Fixed quitting not working
|
2017-01-31 22:33:28 -04:00 |
|
Dean Herbert
|
ea204ad606
|
Merge pull request #301 from DrabWeb/pause-overlay
Pause overlay
|
2017-02-01 10:07:12 +09:00 |
|
DrabWeb
|
91a5d0b3cf
|
Made requested changes
|
2017-01-31 09:17:47 -04:00 |
|
DrabWeb
|
bf54ae86ea
|
Added flash when clicking a PauseButton
|
2017-01-31 08:07:05 -04:00 |
|
Dean Herbert
|
6803b1a8db
|
Sidebar button style pass.
|
2017-01-31 19:58:38 +09:00 |
|
Dean Herbert
|
86b61cab8e
|
Pink -> Yellow.
|
2017-01-31 19:58:22 +09:00 |
|
Dean Herbert
|
a2cd829a2c
|
Colour conformity pass.
|
2017-01-31 19:40:02 +09:00 |
|
Dean Herbert
|
0d529cb636
|
General tidy-ups.
|
2017-01-31 19:23:52 +09:00 |
|
Dean Herbert
|
a723e6ee9c
|
Chevron size adjustment for dropdown items.
|
2017-01-31 19:19:11 +09:00 |
|
Dean Herbert
|
a2dd5f09d3
|
Fix subsection headers not being displayed in many cases. + spacing tweaks.
|
2017-01-31 19:19:01 +09:00 |
|
Dean Herbert
|
6b66ecc131
|
Global shadows and more sane font size setting.
|
2017-01-31 18:53:52 +09:00 |
|
Dean Herbert
|
9e5000d448
|
Remove (soon-to-be) redundant labels.
|
2017-01-31 18:40:18 +09:00 |
|
Dean Herbert
|
6ca974bf0c
|
Re-namespace options, adjust font sizes + more.
|
2017-01-31 18:37:11 +09:00 |
|
Dean Herbert
|
20ee1872b4
|
Broaden invalidation.
|
2017-01-31 17:15:46 +09:00 |
|
Dean Herbert
|
6cd9f93fb5
|
Adjust transitions slightly.
|
2017-01-31 17:05:42 +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
|
3476abc38b
|
Add proper masking support to the login overlay.
|
2017-01-31 16:42:46 +09:00 |
|
DrabWeb
|
fe09bab78f
|
Removed empty ctor in PauseProgressGraph
|
2017-01-30 16:18:34 -04:00 |
|
DrabWeb
|
9d4a14074f
|
Woops forgot to add PauseButton
|
2017-01-30 16:18:11 -04:00 |
|
Dean Herbert
|
4cf2993db1
|
Fix lack of visibility check causing weird hover regions.
|
2017-01-30 23:25:37 +09:00 |
|
Dean Herbert
|
2aa924c104
|
Fix global hover regression.
|
2017-01-30 23:24:30 +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 |
|
Dean Herbert
|
b2ec3508d5
|
Add shadow to opaque toolbar elements.
|
2017-01-30 22:54:36 +09:00 |
|
Dean Herbert
|
cbd6fe3f36
|
Move definition of MusicController's position out of itself.
|
2017-01-30 22:54:33 +09:00 |
|
DrabWeb
|
2f2f0ed9a3
|
Fixed an issue with PauseButton's glow not fading in
|
2017-01-30 09:26:24 -04:00 |
|
DrabWeb
|
740f6e5595
|
Moved delaying resuming to Player
|
2017-01-30 09:06:26 -04:00 |
|
Dean Herbert
|
bdbe8501d3
|
Merge branch 'master' into add-flash-effects
# Conflicts:
# osu.Game/Overlays/Options/General/LoginOptions.cs
|
2017-01-30 21:47:05 +09:00 |
|
DrabWeb
|
af8294f02c
|
Renamed/removed various private constants
|
2017-01-30 08:45:10 -04:00 |
|
DrabWeb
|
dbb9078e30
|
Fixed glow on PauseButton not updating
|
2017-01-30 08:19:44 -04: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
|
dcb02eff65
|
Cleared out PauseProgressGraph
|
2017-01-30 07:19:14 -04:00 |
|
DrabWeb
|
015832f242
|
Changed PauseOverlay to layout with FlowContainers and not positioning, made the retry counter in PauseOverlay have the number bolded, made it so if the player presses escape before the clock is started in Player then Exit is called instead of Pause
|
2017-01-30 06:14:28 -04:00 |
|
DrabWeb
|
62282076c7
|
Changes on PauseButton to match design closer
|
2017-01-30 05:04:57 -04:00 |
|
DrabWeb
|
f8cbc35f8e
|
Small cleanups
|
2017-01-30 04:43:06 -04: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 |
|
Dean Herbert
|
578b33dc64
|
Merge pull request #300 from peppy/more-beatmap-info
Beatmap details
|
2017-01-30 16:23:30 +09:00 |
|
Dean Herbert
|
2ed5cf7c91
|
Hook up icons better.
|
2017-01-30 13:35:40 +09:00 |
|
DrabWeb
|
28967cf77a
|
Renamed Player.isPaused to IsPaused, did a small patch suggested for how the player can click through the pause menu onto the Playfield(only partially works, upstream changes need to be made for full functionality), made Retry default to Resume until retrying is implemented, minor cleanups
|
2017-01-29 05:04:48 -04:00 |
|
DrabWeb
|
c75b234b1a
|
Adjusted the fade time of the pause overlay, put a fill behind the colour of PauseButton to fix an issue where the background gray is visible when the pause overlay is fading out
|
2017-01-28 21:50:06 -04:00 |
|
DrabWeb
|
d0a22bfdd4
|
Added PauseOverlay.SetRetries for updating the retry indicator
|
2017-01-28 20:56:23 -04:00 |
|
DrabWeb
|
d4216eb539
|
Made resume not call until double the time of the fade animation
|
2017-01-28 20:45:10 -04:00 |
|
DrabWeb
|
6b57456681
|
Removed depth setting from PauseOverlay, removed shadow offset on PauseButton color(why was that even there?), fixed the triangles on PauseButton not masking to the sheared container, made PauseButton call it's action on MouseUp instead of MouseDown to match stable
|
2017-01-28 20:30:37 -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 |
|
Andrey Zavadskiy
|
f12a8ace3f
|
Moved Config logic to OsuConfigManager
|
2017-01-28 13:10:05 +03:00 |
|
EVAST9919
|
ac7feafe9a
|
Merge branch 'master' into login_fix
|
2017-01-28 11:24:08 +02:00 |
|
DrabWeb
|
feba3f35ba
|
Changed the roles of PauseOverlay and player in pausing, PauseOverlay is now only the UI portion and doesn't do things like actually pause the game, and only calls actions and hides itself, whereas Player actually pauses the game and brings up the pause overlay in the first place
|
2017-01-27 15:28:39 -04:00 |
|
DrabWeb
|
490feac030
|
Working on design
|
2017-01-27 14:18:57 -04:00 |
|
DrabWeb
|
e115120543
|
Renamed pauseDisableTime to pauseCooldown
|
2017-01-27 08:13:39 -04:00 |
|
DrabWeb
|
8c6d9bdf2e
|
Added commas to the end of UI creation to match how the rest of the project does, moved PauseButton audio loading to PauseOverlay, much more reliable(still using placeholder assets), made it so the player can't spam pause, cools down to one second
|
2017-01-27 08:03:32 -04:00 |
|
DrabWeb
|
3ed88ea043
|
Added PauseOverlay.TogglePaused, renamed OnPlay and similar to OnResume, made Pause and Play public, added proper testing for the visual test(pause button instead of auto-pause, logging actions), made PauseOverlay's fade duration a constant instead of statically typed
|
2017-01-27 07:11:22 -04:00 |
|
DrabWeb
|
81de5a2097
|
Made the pause overlay be at -1 depth so it renders on top of everything(used to allow circles to draw on top)
|
2017-01-27 06:36:43 -04:00 |
|
DrabWeb
|
f35974021a
|
Set actions for retry/quit, moved setting paused to PopIn and PopOut, added null propogation for the sound samples for PauseButton(sometimes in the visual tests the audio doesn't load for whatever reason), added a gradient to the background of the PauseOverlay visual test(same as the one in the menu button system test), wired up the retry and quit actions in Player, made the quit action quit the map, retry still does nothing
|
2017-01-27 06:19:52 -04:00 |
|
DrabWeb
|
dedd6a4bcf
|
Small cleanups
|
2017-01-27 05:39:15 -04:00 |
|
DrabWeb
|
fe265c01cb
|
Added current work on pause overlay
|
2017-01-27 05:24:49 -04:00 |
|
Dean Herbert
|
7ee6a50404
|
Fix checkbox design regressions.
|
2017-01-27 00:16:02 +09:00 |
|
Dean Herbert
|
25da8a53dc
|
Fix incorrect configuration retrievals.
|
2017-01-26 23:08:39 +09:00 |
|
Dean Herbert
|
1853bbdda8
|
Move window/volume configuration to framework level.
|
2017-01-25 18:44:51 +09:00 |
|
Drew DeVault
|
f5f545df62
|
Refactor OsuColour into injected instance class
Which should allow you to change the color palette in the future for
skinning purposes.
|
2017-01-12 23:49:05 -05:00 |
|
Drew DeVault
|
fa007e632d
|
Refactor colors to palette based design
|
2017-01-12 16:38:27 -05:00 |
|
Andrey Zavadskiy
|
63fcfdbbde
|
Fixed checkboxes state and better code
|
2017-01-11 10:28:24 +03:00 |
|
Drew DeVault
|
c222be05c0
|
Add Color4.Opacity and OsuColor.Gray
|
2017-01-10 13:44:40 -05:00 |
|
Drew DeVault
|
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 |
|
Andrey Zavadskiy
|
c0980437a6
|
Removed unnecessary api reference
|
2017-01-07 00:55:04 +03:00 |
|
Drew DeVault
|
4899d88d19
|
Update framework
|
2017-01-05 02:10:05 -05:00 |
|
Drew DeVault
|
b27139c2bd
|
Simplify layout of dropdown menu item
|
2017-01-05 00:57:19 -05:00 |
|
Drew DeVault
|
af4aeeab09
|
Update following framework changes
|
2017-01-04 01:14:25 -05:00 |
|
Drew DeVault
|
a1f8c0df64
|
Style dropdown to match osu!stable
|
2017-01-03 23:00:28 -05:00 |
|
Huo Yaoyuan
|
6690d1bd72
|
Move logic into updateDisplay.
|
2017-01-04 02:12:18 +08:00 |
|
Huo Yaoyuan
|
794e4663d8
|
Fix PreferUnicode changing when nothing to play.
|
2017-01-04 01:00:08 +08:00 |
|
Andrey Zavadskiy
|
eabfa11614
|
Minor fix
|
2016-12-24 10:04:43 +03:00 |
|
Andrey Zavadskiy
|
ba1d0b3a84
|
Added Events for checkboxes
|
2016-12-24 09:09:01 +03:00 |
|
Andrey Zavadskiy
|
9f202ecba8
|
fix
|
2016-12-23 23:49:42 +03:00 |
|
Andrey Zavadskiy
|
70c8250021
|
Revert "Dependent checkboxes"
This reverts commit 70dc3bae4a.
|
2016-12-23 23:05:44 +03:00 |
|
Andrey Zavadskiy
|
70dc3bae4a
|
Dependent checkboxes
|
2016-12-23 20:24:28 +03:00 |
|
Andrey Zavadskiy
|
1c79ebff9f
|
Fix loggining on start even after logout and exit
|
2016-12-21 01:51:01 +03:00 |
|
Andrey Zavadskiy
|
bba4c46ae3
|
TODO comment and deleted repeating lines
|
2016-12-21 01:05:10 +03:00 |
|
Andrey Zavadskiy
|
d519e28dda
|
PasswordTextBox fix
|
2016-12-20 17:52:16 +03:00 |
|
Andrey Zavadskiy
|
21c6c23189
|
Login improvements
|
2016-12-20 17:28:27 +03:00 |
|
Andrey Zavadskiy
|
e23a1b8e92
|
Remove unnecessary items from OptionsOverlay
|
2016-12-19 19:17:04 +03:00 |
|
Drew DeVault
|
67d748f677
|
Adjust padding on sliders
|
2016-12-16 01:27:57 -05:00 |
|
Drew DeVault
|
796858f86f
|
Fix transparency issues
|
2016-12-16 00:37:37 -05:00 |
|
Drew DeVault
|
96a6e30a21
|
Drop complicated type constraints
|
2016-12-16 00:27:06 -05:00 |
|
Drew DeVault
|
80574423cb
|
Drop SliderBarEventSource
|
2016-12-16 00:27:06 -05:00 |
|
Drew DeVault
|
abc6db18b3
|
Add license header
|
2016-12-16 00:27:06 -05:00 |
|
Drew DeVault
|
a751cfcba3
|
Update SliderOption implementation
Per @Tom94's suggestion, the bars track the nub in Update instead of
animating seperately. Also only animates when the event source is the
keyboard.
|
2016-12-16 00:27:06 -05:00 |
|