|
|
8f6a6143d6
|
Removed excess parenthesis
|
2017-01-30 08:07:37 -04:00 |
|
|
|
ed3ed8251f
|
Made styling PauseButtons public, Resume/Retry/Quit buttons changed to subclasses
|
2017-01-30 08:04:39 -04:00 |
|
|
|
26e9533ff0
|
Add custom implementation of TextBox.
|
2017-01-30 20:29:04 +09:00 |
|
|
|
dcb02eff65
|
Cleared out PauseProgressGraph
|
2017-01-30 07:19:14 -04: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 |
|
|
|
b4c01f104b
|
Make buttons look closer to the design.
|
2017-01-30 18:10:30 +09:00 |
|
|
|
62282076c7
|
Changes on PauseButton to match design closer
|
2017-01-30 05:04:57 -04:00 |
|
|
|
f8cbc35f8e
|
Small cleanups
|
2017-01-30 04:43:06 -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 |
|
|
|
578b33dc64
|
Merge pull request #300 from peppy/more-beatmap-info
Beatmap details
|
2017-01-30 16:23:30 +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 |
|
|
|
8f1e7ef19a
|
Fix non-matching shear angles.
|
2017-01-30 15:28:47 +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 |
|
|
|
2ed5cf7c91
|
Hook up icons better.
|
2017-01-30 13:35:40 +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 |
|
|
|
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 |
|
|
|
d0a22bfdd4
|
Added PauseOverlay.SetRetries for updating the retry indicator
|
2017-01-28 20:56:23 -04:00 |
|
|
|
d4216eb539
|
Made resume not call until double the time of the fade animation
|
2017-01-28 20:45:10 -04:00 |
|
|
|
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 |
|
|
|
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 |
|
|
|
800e35b637
|
Merge pull request #268 from EVAST9919/login_fix
Login improvements
|
2017-01-28 23:20:32 +09:00 |
|
|
|
72bc7f8786
|
Simplify checking
|
2017-01-28 17:01:11 +03:00 |
|
|
|
e25b8bb298
|
Removed explicit methods
|
2017-01-28 16:56:05 +03:00 |
|
|
|
f12a8ace3f
|
Moved Config logic to OsuConfigManager
|
2017-01-28 13:10:05 +03:00 |
|
|
|
ac7feafe9a
|
Merge branch 'master' into login_fix
|
2017-01-28 11:24:08 +02: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 |
|
|
|
490feac030
|
Working on design
|
2017-01-27 14:18:57 -04:00 |
|
|
|
3e7503e860
|
Make skip button work.
|
2017-01-27 21:57:22 +09:00 |
|
|
|
e115120543
|
Renamed pauseDisableTime to pauseCooldown
|
2017-01-27 08:13:39 -04:00 |
|
|
|
420e61fa97
|
TwoLayerButton
|
2017-01-27 21:08:36 +09:00 |
|
|
|
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 |
|
|
|
811cf4b04e
|
Added newline, thanks Xamarin
|
2017-01-27 07:12:20 -04: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 |
|
