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
6b66ecc131
Global shadows and more sane font size setting.
2017-01-31 18:53:52 +09:00
acdf64e1f7
Remove code to check for other focused controls
2017-01-30 23:08:24 -05:00
5852657205
Refactor out Hidden
...
Also fixes a bug I didn't think about before
2017-01-30 22:35:09 -05:00
8d294a4eca
Only grab focus if nothing else has it
2017-01-30 14:03:05 -05:00
144a87a247
Fix focus interactions with search text box
2017-01-30 13:56:33 -05:00
09680196c9
SearchTextBox: Don't handle Key.{Enter,Left,Right}
2017-01-30 10:16:55 -05:00
b32cbdbec2
Relocate enums
2017-01-30 10:07:11 -05:00
fb431fd44e
&&=, unnecessary null check
2017-01-30 09:49:58 -05:00
9a2cba8520
Use null coalesce operator where appropriate
2017-01-30 09:48:21 -05:00
7f3cb381a9
Refactor FilterControl.Search
2017-01-30 09:48:12 -05:00
42a2285ef3
Make BeatmapGroup.Hidden more intelligent
2017-01-30 09:47:04 -05:00
0a81fdbd10
Update null background handling
2017-01-30 09:44:02 -05:00
c00a558cb7
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-01-30 09:35:14 -05:00
740f6e5595
Moved delaying resuming to Player
2017-01-30 09:06:26 -04:00
bdbe8501d3
Merge branch 'master' into add-flash-effects
...
# Conflicts:
# osu.Game/Overlays/Options/General/LoginOptions.cs
2017-01-30 21:47:05 +09:00
ad33ae9431
Removed unnecessary change
2017-01-30 06:24:44 -04:00
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
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
2ad9377b37
Adjust carousel radius slightly (flyte wanted it).
2017-01-30 16:55:47 +09:00
f0d30cc873
Make triangles opaque.
2017-01-30 16:53:12 +09:00
a315db68ab
Remove unused field.
2017-01-30 16:08:31 +09:00
9f90b57543
Move BPM calculations to Beatmap.
2017-01-30 16:03:45 +09:00
0272c4b559
Add StarDifficulty property and correct colouring of difficulty icons.
2017-01-30 15:26:28 +09:00
1f2f2fa144
Fix visualtests.
2017-01-30 15:15:56 +09:00
0c2152f3d0
Use beatmap's play mode.
2017-01-30 13:14:02 +09:00
e93f60396f
Add the ability for individual game modes to report statistics for display at song select.
2017-01-30 13:12:30 +09:00
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
3286713d11
avg -> mostly
2017-01-29 15:16:38 +09:00
6027cc7afa
Formatting fixes.
2017-01-29 15:15:04 +09:00
2e76874384
Simplify the lookup conditions for hitcircles/sliders (uses duration to discern).
2017-01-29 15:09:42 +09:00
3125fa89ee
Fix method which should be class.
2017-01-29 15:06:44 +09:00
77558abf58
Merge branch 'master' into more-beatmap-info
...
# Conflicts:
# osu.Game/Screens/Select/BeatmapInfoWedge.cs
2017-01-29 14:47:42 +09: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
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
601a5ed39c
Reverted Player to upstream
2017-01-27 14:29:51 -04:00
3e7503e860
Make skip button work.
2017-01-27 21:57:22 +09:00
420e61fa97
TwoLayerButton
2017-01-27 21:08:36 +09:00
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
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
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
5787b43586
wip
2017-01-27 19:14:44 +09:00
fe265c01cb
Added current work on pause overlay
2017-01-27 05:24:49 -04:00
6d44c5c8f1
Move logo colour definitions local to their usage.
2017-01-27 17:57:52 +09:00
9b2669e1ae
Add flash when activating the osu! logo.
2017-01-27 17:23:53 +09:00
50e4c39e32
Add flash when activating a menu button.
2017-01-27 17:23:53 +09:00
