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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Dean Herbert
|
578b33dc64
|
Merge pull request #300 from peppy/more-beatmap-info
Beatmap details
|
2017-01-30 16:23:30 +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
|
8f1e7ef19a
|
Fix non-matching shear angles.
|
2017-01-30 15:28:47 +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
|
2ed5cf7c91
|
Hook up icons better.
|
2017-01-30 13:35:40 +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
|
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
|
72bc7f8786
|
Simplify checking
|
2017-01-28 17:01:11 +03:00 |
|
Andrey Zavadskiy
|
e25b8bb298
|
Removed explicit methods
|
2017-01-28 16:56:05 +03: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 |
|
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 |
|
DrabWeb
|
490feac030
|
Working on design
|
2017-01-27 14:18:57 -04:00 |
|
Dean Herbert
|
3e7503e860
|
Make skip button work.
|
2017-01-27 21:57:22 +09:00 |
|
DrabWeb
|
e115120543
|
Renamed pauseDisableTime to pauseCooldown
|
2017-01-27 08:13:39 -04:00 |
|
Dean Herbert
|
420e61fa97
|
TwoLayerButton
|
2017-01-27 21:08:36 +09: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 |
|
Dean Herbert
|
5787b43586
|
wip
|
2017-01-27 19:14:44 +09: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
|
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 |
|
Dean Herbert
|
8987a09741
|
Merge pull request #293 from peppy/general-fixes
Fix some nullrefs when running visualtests with no maps loaded.
|
2017-01-27 16:12:46 +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
|
629605c6b4
|
Make HasFailed's set private.
|
2017-01-27 00:41:34 +09:00 |
|
Dean Herbert
|
4efedd942d
|
Use null propagation.
|
2017-01-27 00:41:34 +09: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
|
c3699c1395
|
Remove unused prevCount variable.
|
2017-01-27 00:39:00 +09:00 |
|