Commit Graph

1938 Commits

Author SHA1 Message Date
aec84ae725 Fix laggy animations, incorrect hiding logic. 2017-02-02 19:24:14 +09:00
c88a2fbf8a Replace incorrectly removed background logic
I had earlier thought that removing this would solve the weirdness with
starting the beatmap on any but the first difficulty, and forgot to
replace it when I found the actual cause.
2017-02-01 19:32:30 -05:00
9f9245cee3 Fix use of previous value in Alpha check
Frustratingly, this does not fix the problem of ghost groups
2017-02-01 19:28:08 -05:00
5003b3738a Remove constant boolean expressions 2017-02-01 19:15:22 -05:00
3c7c3d1cb9 Tidy up GetEnumerable 2017-02-01 19:12:24 -05:00
2d691ca8d5 Use OnChange instead of OnCommit
OnCommit only gets fired when focus is lost
2017-02-01 19:12:24 -05: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
42eef9c19a Merge pull request #304 from DrabWeb/master
Fixed quitting not working
2017-02-01 11:47:11 +09:00
0d53d3c4ff Fixed quitting not working 2017-01-31 22:33:28 -04: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
3143e9d35e Fix poorly written BeatmapGroup logic 2017-01-31 20:04:17 -05:00
c92418e000 Made Player.canPause one line 2017-01-31 21:02:58 -04:00
0861eb79e4 Minor cleanups 2017-01-31 19:55:36 -05:00
2c12568a0d Moved TestCasePauseOverlay's PauseOverlay action setting to the initialiser 2017-01-31 20:51:26 -04:00
b1a55f6b5e Use OnCommit instead of OnChange simplifies things 2017-01-31 19:48:33 -05:00
f740707712 Initialize previousFilter to string.Empty 2017-01-31 19:45:42 -05:00
13da75f149 Fixed a bug where the user can double press escape to exit the song 2017-01-31 20:44:59 -04:00
35a1479fc1 Fix extra click sound effect 2017-01-31 19:37:00 -05:00
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
624d51204f Fix issue with background on player
Not sure why this only happens on my branch, I didn't touch this code.
2017-01-31 19:14:54 -05:00
4597a765b8 Fix escape key to exit PlaySongSelect
This is less than ideal but is the least disruptive solution. The
InputManager itself holds Escape keypresses from getting to anything
else if something is focused.
2017-01-31 19:00:54 -05:00
637a99e8d0 Merge remote-tracking branch 'upstream/master' into song-select-filtering 2017-01-31 19:00:50 -05:00
91a5d0b3cf Made requested changes 2017-01-31 09:17:47 -04:00
ecaa88a0d2 Changed TestCasePauseOverlay to use AddButton and removed background gradient(not needed) 2017-01-31 08:42:14 -04:00
bf54ae86ea Added flash when clicking a PauseButton 2017-01-31 08:07:05 -04:00
7008e36167 Button hover and press effects. 2017-01-31 20:32:36 +09:00
9ff37e5ed9 Change textbox commit colour to match border. 2017-01-31 20:10:26 +09:00
1bb142d42a Bold font for OsuButtons. 2017-01-31 19:58:45 +09:00
6803b1a8db Sidebar button style pass. 2017-01-31 19:58:38 +09:00
86b61cab8e Pink -> Yellow. 2017-01-31 19:58:22 +09:00
a2cd829a2c Colour conformity pass. 2017-01-31 19:40:02 +09:00
0d529cb636 General tidy-ups. 2017-01-31 19:23:52 +09:00
a723e6ee9c Chevron size adjustment for dropdown items. 2017-01-31 19:19:11 +09:00
a2dd5f09d3 Fix subsection headers not being displayed in many cases. + spacing tweaks. 2017-01-31 19:19:01 +09:00
6b66ecc131 Global shadows and more sane font size setting. 2017-01-31 18:53:52 +09:00
9e5000d448 Remove (soon-to-be) redundant labels. 2017-01-31 18:40:18 +09:00
687b634fb3 Adjust button font size. 2017-01-31 18:40:04 +09:00
6ca974bf0c Re-namespace options, adjust font sizes + more. 2017-01-31 18:37:11 +09:00
20ee1872b4 Broaden invalidation. 2017-01-31 17:15:46 +09:00
64f4098791 Move MusicController beneath Toolbar. 2017-01-31 17:05:54 +09:00
6cd9f93fb5 Adjust transitions slightly. 2017-01-31 17:05:42 +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
3476abc38b Add proper masking support to the login overlay. 2017-01-31 16:42:46 +09:00
1b0914089e Merge pull request #296 from peppy/add-flash-effects
Add flash when activating the osu! logo (and other UI improvements)
2017-01-31 16:22:00 +09:00
aa80989bdf Update framework. 2017-01-31 15:58:33 +09:00
acdf64e1f7 Remove code to check for other focused controls 2017-01-30 23:08:24 -05:00