Dean Herbert
966121a438
Fix keyboard controls not respecting search filter.
2017-02-02 19:37:35 +09:00
Dean Herbert
0c887d3a46
Fix deselected group remaining visible after search.
2017-02-02 19:24:43 +09:00
Dean Herbert
aec84ae725
Fix laggy animations, incorrect hiding logic.
2017-02-02 19:24:14 +09:00
Drew DeVault
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
Drew DeVault
5003b3738a
Remove constant boolean expressions
2017-02-01 19:15:22 -05:00
Drew DeVault
3c7c3d1cb9
Tidy up GetEnumerable
2017-02-01 19:12:24 -05:00
Drew DeVault
2d691ca8d5
Use OnChange instead of OnCommit
...
OnCommit only gets fired when focus is lost
2017-02-01 19:12:24 -05:00
Dean Herbert
90fd9d9132
Merge branch 'master' into options-refactor
2017-02-01 14:07:49 +09:00
Dean Herbert
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
DrabWeb
0d53d3c4ff
Fixed quitting not working
2017-01-31 22:33:28 -04:00
Dean Herbert
046732b7e3
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-02-01 10:09:14 +09: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
Drew DeVault
b1a55f6b5e
Use OnCommit instead of OnChange simplifies things
2017-01-31 19:48:33 -05:00
Drew DeVault
f740707712
Initialize previousFilter to string.Empty
2017-01-31 19:45:42 -05: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
Drew DeVault
35a1479fc1
Fix extra click sound effect
2017-01-31 19:37:00 -05: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
Drew DeVault
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
Drew DeVault
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
Drew DeVault
637a99e8d0
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-01-31 19:00:50 -05:00
DrabWeb
91a5d0b3cf
Made requested changes
2017-01-31 09:17:47 -04:00
Dean Herbert
6b66ecc131
Global shadows and more sane font size setting.
2017-01-31 18:53:52 +09:00
Drew DeVault
acdf64e1f7
Remove code to check for other focused controls
2017-01-30 23:08:24 -05:00
Drew DeVault
5852657205
Refactor out Hidden
...
Also fixes a bug I didn't think about before
2017-01-30 22:35:09 -05:00
Drew DeVault
8d294a4eca
Only grab focus if nothing else has it
2017-01-30 14:03:05 -05:00
Drew DeVault
144a87a247
Fix focus interactions with search text box
2017-01-30 13:56:33 -05:00
Drew DeVault
09680196c9
SearchTextBox: Don't handle Key.{Enter,Left,Right}
2017-01-30 10:16:55 -05:00
Drew DeVault
b32cbdbec2
Relocate enums
2017-01-30 10:07:11 -05:00
Drew DeVault
fb431fd44e
&&=, unnecessary null check
2017-01-30 09:49:58 -05:00
Drew DeVault
9a2cba8520
Use null coalesce operator where appropriate
2017-01-30 09:48:21 -05:00
Drew DeVault
7f3cb381a9
Refactor FilterControl.Search
2017-01-30 09:48:12 -05:00
Drew DeVault
42a2285ef3
Make BeatmapGroup.Hidden more intelligent
2017-01-30 09:47:04 -05:00
Drew DeVault
0a81fdbd10
Update null background handling
2017-01-30 09:44:02 -05:00
Drew DeVault
c00a558cb7
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-01-30 09:35:14 -05: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
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
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
Dean Herbert
a315db68ab
Remove unused field.
2017-01-30 16:08:31 +09:00
Dean Herbert
9f90b57543
Move BPM calculations to Beatmap.
2017-01-30 16:03:45 +09:00
Dean Herbert
0272c4b559
Add StarDifficulty property and correct colouring of difficulty icons.
2017-01-30 15:26:28 +09:00
Dean Herbert
1f2f2fa144
Fix visualtests.
2017-01-30 15:15:56 +09:00
Dean Herbert
0c2152f3d0
Use beatmap's play mode.
2017-01-30 13:14:02 +09:00
Dean Herbert
e93f60396f
Add the ability for individual game modes to report statistics for display at song select.
2017-01-30 13:12:30 +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
Dean Herbert
3286713d11
avg -> mostly
2017-01-29 15:16:38 +09:00
Dean Herbert
6027cc7afa
Formatting fixes.
2017-01-29 15:15:04 +09:00
Dean Herbert
2e76874384
Simplify the lookup conditions for hitcircles/sliders (uses duration to discern).
2017-01-29 15:09:42 +09:00
Dean Herbert
3125fa89ee
Fix method which should be class.
2017-01-29 15:06:44 +09:00
Dean Herbert
77558abf58
Merge branch 'master' into more-beatmap-info
...
# Conflicts:
# osu.Game/Screens/Select/BeatmapInfoWedge.cs
2017-01-29 14:47:42 +09: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
Drew DeVault
10897486ba
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-01-27 15:41:46 -05: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
601a5ed39c
Reverted Player to upstream
2017-01-27 14:29:51 -04:00
Dean Herbert
3e7503e860
Make skip button work.
2017-01-27 21:57:22 +09:00
Dean Herbert
420e61fa97
TwoLayerButton
2017-01-27 21:08:36 +09: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
Dean Herbert
5787b43586
wip
2017-01-27 19:14:44 +09:00
DrabWeb
fe265c01cb
Added current work on pause overlay
2017-01-27 05:24:49 -04:00
Dean Herbert
6d44c5c8f1
Move logo colour definitions local to their usage.
2017-01-27 17:57:52 +09:00
Dean Herbert
9b2669e1ae
Add flash when activating the osu! logo.
2017-01-27 17:23:53 +09:00
Dean Herbert
50e4c39e32
Add flash when activating a menu button.
2017-01-27 17:23:53 +09:00
Dean Herbert
a238637990
Move osu! logo colour declarations to palette.
2017-01-27 17:23:53 +09:00
Dean Herbert
f3e9da609e
Merge pull request #295 from peppy/songselect-footer
...
Initial implementation of song select footer area.
2017-01-27 16:13:43 +09:00
Drew DeVault
f3c5c1f0b8
Fixes following recent updates upstream
2017-01-26 21:31:28 -05:00
Drew DeVault
417933b7ec
Merge remote-tracking branch 'upstream/master' into song-select-filtering
2017-01-26 13:57:55 -05:00
Dean Herbert
f07b9591cd
Add null check when popping backgrounds from the mode stack.
2017-01-27 00:41:34 +09:00
Dean Herbert
139cac5e57
Add fail dialog and flow.
2017-01-27 00:41:34 +09:00
Dean Herbert
8c7bb4990c
Add support for failing.
2017-01-27 00:38:21 +09:00
Dean Herbert
70271fee35
Move PlayerInputManager to own file.
2017-01-27 00:38:21 +09:00
Dean Herbert
4a7b3cf391
Initial implementation of song select footer area.
2017-01-27 00:36:12 +09:00
Dean Herbert
1853bbdda8
Move window/volume configuration to framework level.
2017-01-25 18:44:51 +09:00
Dean Herbert
3a27178bb1
Merge pull request #289 from UselessToucan/JudgementsCapacity
...
Specify ScoreProcessor.Judgements.Capacity
2017-01-23 21:40:00 +09:00
Dean Herbert
ae464fcace
Move Intro logic to OnEntering in line with framework changes.
2017-01-20 16:30:24 +08:00
Drew DeVault
678f0aaa16
Implement filtering with strings
2017-01-17 19:18:15 -05:00
Drew DeVault
75de03bd88
Use OsuColour for green text
2017-01-17 18:26:43 -05:00
Drew DeVault
46e7bcef8c
Improve beatmap import
2017-01-17 17:05:06 -05:00
Drew DeVault
7559fc593a
Use default background on empty song select screen
2017-01-17 16:43:53 -05:00
Drew DeVault
5eb1cda77b
Rename FilterSongSelect, use OsuColour
2017-01-17 16:43:40 -05:00
Drew DeVault
63031fbc3d
Move filter container z depth and add hover fx
2017-01-17 15:41:50 -05:00
Drew DeVault
73e46ee8c0
Initial layout of song select filtering UI
2017-01-17 15:41:50 -05:00
TocoToucan
259c0964fd
Specify ScoreProcessor.Judgements.Capacity in order to avoid List<T> internal auto reallocations
2017-01-16 23:14:35 +03:00
Dean Herbert
ee0b6be84b
Merge pull request #266 from kizayoi/master
...
Add support for old beatmaps
2017-01-16 16:02:22 +08:00
Dean Herbert
4030413291
Merge branch 'refs/heads/SirCmpwn/colors'
2017-01-14 06:52:30 +08:00
Drew DeVault
e81073695f
Implement disable mouse buttons
2017-01-13 17:17:04 -05: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
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
柯十六夜
ef11c3f389
Add default Beatmap ID
2016-12-21 14:47:56 +08:00
柯十六夜
02f6e46105
Add support for v9 beatmaps
2016-12-20 23:56:49 +08:00
n4b3l
aebe87fefc
better implementation
2016-12-19 16:09:29 +01:00
n4b3l
09f9f86b06
check if dimLevel is null on exit
2016-12-19 14:03:10 +01:00
n4b3l
c614d61b1a
getbpm takes Beatmap instead of WorkingBeatmap
2016-12-18 19:34:20 +01:00
