Dean Herbert
|
90fd9d9132
|
Merge branch 'master' into options-refactor
|
2017-02-01 14:07:49 +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
|
c92418e000
|
Made Player.canPause one line
|
2017-01-31 21:02:58 -04:00 |
|
DrabWeb
|
13da75f149
|
Fixed a bug where the user can double press escape to exit the song
|
2017-01-31 20:44:59 -04:00 |
|
DrabWeb
|
bcd41a2c8f
|
Moved pause overlay action setting to the initialiser in Player, moved pause overlay displaying be handled in OnExiting instead of OnKeyDown, removed clockWasStarted and used sourceClock.IsRunning instead
|
2017-01-31 20:28:50 -04: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
|
7008e36167
|
Button hover and press effects.
|
2017-01-31 20:32:36 +09:00 |
|
Dean Herbert
|
9ff37e5ed9
|
Change textbox commit colour to match border.
|
2017-01-31 20:10:26 +09:00 |
|
Dean Herbert
|
1bb142d42a
|
Bold font for OsuButtons.
|
2017-01-31 19:58:45 +09: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
|
687b634fb3
|
Adjust button font size.
|
2017-01-31 18:40:04 +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
|
64f4098791
|
Move MusicController beneath Toolbar.
|
2017-01-31 17:05:54 +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
|
ad33ae9431
|
Removed unnecessary change
|
2017-01-30 06:24:44 -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 |
|
Dean Herbert
|
b4c01f104b
|
Make buttons look closer to the design.
|
2017-01-30 18:10:30 +09: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
|
2ad9377b37
|
Adjust carousel radius slightly (flyte wanted it).
|
2017-01-30 16:55:47 +09:00 |
|
Dean Herbert
|
f0d30cc873
|
Make triangles opaque.
|
2017-01-30 16:53:12 +09:00 |
|