h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 01:47:24 +08:00
Code Issues Releases Wiki Activity
1,934 Commits 3 Branches 653 Tags 367 MiB
3094c01a40
Commit Graph

1348 Commits

Author SHA1 Message Date
Dean Herbert
5757f844bf
Fix a potential crash due to API being too eager to declare online state. 2017-02-07 20:29:40 +09:00
Dean Herbert
6b011a50d2
Naming standardisation and enforcing. 2017-02-07 16:20:36 +09:00
Dean Herbert
50bd80cb0c
Update and standardise license headers. 2017-02-07 14:27:41 +09:00
Dean Herbert
756fd78a88
Fix incorrect line endings. 2017-02-07 13:52:19 +09:00
Dean Herbert
db8e44c715
Smooth triangles a bit (to avoid whole pixel jumps). 2017-02-07 11:15:37 +09:00
Danil Yarancev
c222ce4403 Fix name 2017-02-06 21:19:27 +03:00
Dean Herbert
9b9ed32245
Remove all @2x references, updates resource and framework. 2017-02-06 22:19:47 +09:00
Dean Herbert
86205c35a4
Fix weird state changes of footer buttons. 2017-02-06 20:46:53 +09:00
default0
6add77c30b Rename Standard device option to Default 
Changed the name of the option for using the default audio device
to "Default" for consistency with english windows. Also changed
the "" value to string.Empty for consistency with the Frameworks
treatment of this special value.
 2017-02-06 12:26:32 +01:00
default0
ae03ef0787 Allow audio device selection in settings 2017-02-06 01:22:37 +01:00
default0
b4f30dd417 Rework OptionDropdowns to be more versatile 
The existing OptionDropdown only supported enums and was thus renamed
to OptionEnumDropDown. A new OptionDropdown has been created in its
place to allow binding to arbitrary values, with a set of user-provided
items.
 2017-02-06 01:21:26 +01:00
default0
b230b5cfb9 Update OsuDropDownMenu for Framework-Changes 
Since the DropDownMenu in the framework has changed it was necessary
to update the GetDropDownItems override of OsuDropDownMenu to
accomodate the new structure of the framework.
 2017-02-06 01:17:50 +01:00
Thomas Müller
91f0951255 Handle OnMouseDown in PauseOverlay such that players can not click circles through the overlay while paused. 2017-02-05 20:17:29 +01:00
Thomas Müller
0f72ef7dc2 Make pause buttons OnClick and not OnMouseDown. 2017-02-05 20:17:02 +01:00
Thomas Müller
c56478e154 Add missing license header. 2017-02-05 20:16:40 +01:00
Thomas Müller
d291103d22 Avoid triangle bleeding by masking the triangle container without smoothness. 2017-02-05 16:34:47 +01:00
Dean Herbert
fe86a9e431 Merge pull request #317 from Tom94/fix-login-button 
Fix incorrect sizing of login button.
 2017-02-05 23:43:15 +09:00
Thomas Müller
a69c306334 Merge branch 'master' of github.com:ppy/osu into fix-login-button 2017-02-05 15:28:44 +01:00
Thomas Müller
6d59429c29 Merge branch 'master' of github.com:ppy/osu into better-visibility 2017-02-05 15:28:10 +01:00
Thomas Müller
ba38a27274 Fix incorrect sizing of login button. 
When logging in or out the size of the login button would not correctly update,
resulting in a messed-up flow of toolbar buttons. This branch fixes the problem
by avoiding an invalidation-chain-breaking override of Size. Instead, the loginOverlay
bypasses auto sizing by using a new framework feature.
 2017-02-05 15:17:54 +01:00
Dean Herbert
65471364a7 Merge pull request #313 from default0/default0/beatmap-import 
Implement Beatmap Import via drag&drop
 2017-02-05 22:37:42 +09:00
default0
299c4923c3 Implement Beatmap Import via drag&drop 2017-02-05 13:32:08 +01:00
Andrey Zavadskiy
43dcf0bbc1 PauseButton Triangles 2017-02-05 13:47:37 +03:00
Thomas Müller
8271b139e9 Use the framework's new AlwaysPresent switch instead of setting the alpha to 0.01. 2017-02-05 09:40:58 +01:00
Thomas Müller
aae5f4f9e2 Fix volume control not showing is mouse-wheel is turned during its fade-out animation. 2017-02-05 09:40:12 +01:00
Dean Herbert
d97f02a219 Cursor becomes vector. 2017-02-04 22:56:56 +09:00
Dean Herbert
714c94b7a8 Fix toolbar sizing hackiness. 2017-02-04 22:27:05 +09:00
Dean Herbert
57d97ba2e9 Make triangles look better in many cases. 2017-02-04 22:09:44 +09:00
Dean Herbert
0fefa50b54 Add padding beneath sliders in options. 2017-02-04 20:57:08 +09:00
Dean Herbert
97d52188b2 Make sliderbar lines smoother when scrolling. 2017-02-04 20:56:14 +09:00
Dean Herbert
1e3266a9d2 Fix sliderbar lines lagging behind nub. 2017-02-04 20:55:26 +09:00
Thomas Müller
1913ec659a Merge branch 'master' of github.com:ppy/osu into better-option-sliders 2017-02-04 12:07:21 +01:00
Thomas Müller
d6714324df OsuNub -> Nub. 2017-02-04 12:06:53 +01:00
Thomas Müller
6db70f8850 Use MaskingSmoothness to make masked diagonal edges smoother. 2017-02-04 11:06:26 +01:00
Thomas Müller
0edc64a08c Re-use checkbox nub for option sliders and slightly re-structure. 2017-02-04 09:50:58 +01:00
Dean Herbert
c24edb583f Uncomment corner radius post-fix. 2017-02-04 16:05:24 +09:00
Dean Herbert
9f9278c837 Fix background colour of dropdown menu item area. 2017-02-03 19:23:14 +09:00
Dean Herbert
4504440f80 Fix much dropdown shit. 2017-02-03 19:13:10 +09:00
Dean Herbert
ddea76927f Better SearchTextBox focus handling. 2017-02-03 19:12:57 +09:00
Dean Herbert
fc9badf20f Fix autosize issues. 2017-02-03 15:22:00 +09:00
Dean Herbert
36cfe54e59 Missing namespace. 2017-02-03 13:16:45 +09:00
Dean Herbert
16a01abc4d Merge remote-tracking branch 'upstream/master' into options-refactor 
# Conflicts:
#	osu.Game/Beatmaps/Drawables/BeatmapPanel.cs
#	osu.Game/Graphics/UserInterface/BackButton.cs
#	osu.Game/Screens/Play/KeyCounter.cs
 2017-02-03 13:16:07 +09:00
Dean Herbert
a6fd7f46c3 Merge remote-tracking branch 'upstream/master' into login-updates 2017-02-03 12:48:52 +09:00
Dean Herbert
4f89cc0784 Merge pull request #298 from peppy/skip-button 
Make skip button work.
 2017-02-03 12:47:53 +09:00
Drew DeVault
52fb345e79 Merge branch 'master' into song-select-filtering 2017-02-02 09:25:27 -08:00
Drew DeVault
437cc834eb @Tom94 pointed out this problem 2017-02-02 12:23:06 -05:00
Andrey Zavadskiy
16dc1460ad Cursor scale 2017-02-02 14:44:56 +03:00
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
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
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
Dean Herbert
e94c92b920 Merge branch 'master' into login-updates 2017-02-01 13:23:22 +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
Drew DeVault
3143e9d35e Fix poorly written BeatmapGroup logic 2017-01-31 20:04:17 -05:00
DrabWeb
c92418e000 Made Player.canPause one line 2017-01-31 21:02:58 -04:00
Drew DeVault
0861eb79e4 Minor cleanups 2017-01-31 19:55:36 -05: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
DrabWeb
bf54ae86ea Added flash when clicking a PauseButton 2017-01-31 08:07:05 -04:00
Dean Herbert
7008e36167 Button hover and press effects. 2017-01-31 20:32:36 +09:00
Dean Herbert
9ff37e5ed9 Change textbox commit colour to match border. 2017-01-31 20:10:26 +09:00
Dean Herbert
1bb142d42a Bold font for OsuButtons. 2017-01-31 19:58:45 +09:00
Dean Herbert
6803b1a8db Sidebar button style pass. 2017-01-31 19:58:38 +09:00
Dean Herbert
86b61cab8e Pink -> Yellow. 2017-01-31 19:58:22 +09:00
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
Dean Herbert
c01863dfa2 Add min/max constraints to HealthDisplay. 2017-01-27 00:39:00 +09:00
Dean Herbert
cd149f04fc Use bindable for HealthDisplay. 2017-01-27 00:38:21 +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
a2501cc81d Fix TestCaseHitObjects not working at all due to state being set before load is complete. 2017-01-27 00:16:02 +09:00
Dean Herbert
7ee6a50404 Fix checkbox design regressions. 2017-01-27 00:16:02 +09:00
Dean Herbert
162e183b36 Fix some nullrefs when running visualtests with no maps loaded. 2017-01-27 00:16:02 +09:00
Dean Herbert
25da8a53dc Fix incorrect configuration retrievals. 2017-01-26 23:08:39 +09:00
Dean Herbert
1853bbdda8 Move window/volume configuration to framework level. 2017-01-25 18:44:51 +09:00
Dean Herbert
23938a810b Merge pull request #292 from peppy/general-fixes 
Reset the beatmap database when it can't be read, rather than hard failing.
 2017-01-23 21:43:52 +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
373d2a0f35 Merge branch 'master' into general-fixes 2017-01-23 21:39:05 +09:00
Dean Herbert
56fe69852d Change beatmap database reset logic to only run a maximum of once. 2017-01-23 18:13:06 +09:00
Dean Herbert
ef8347fe53 Reset the beatmap database when it can't be read, rather than hard failing. 2017-01-23 13:02:03 +09:00
Dean Herbert
ae464fcace Move Intro logic to OnEntering in line with framework changes. 2017-01-20 16:30:24 +08:00
TocoToucan
badc8def9a hitObjectsNumber -> hitObjectCount 2017-01-18 18:51:38 +03:00
Dean Herbert
2025e8ef71 Merge pull request #288 from peppy/hpdisplay 
Simple HP display implementation.
 2017-01-18 11:18:45 +08:00
Dean Herbert
cd8c9393f3 HP -> Health 2017-01-18 11:08:16 +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
a3770adbc5 Merge branch 'master' into hpdisplay 2017-01-16 11:23:54 +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
Andrey Zavadskiy
63fcfdbbde Fixed checkboxes state and better code 2017-01-11 10:28:24 +03:00
Drew DeVault
c222be05c0 Add Color4.Opacity and OsuColor.Gray 2017-01-10 13:44:40 -05:00
Dean Herbert
1392cdfb9a Hook up naively. 2017-01-10 18:35:27 +08:00
Dean Herbert
7eab50b989 Add basic HP display support. 2017-01-10 16:08:01 +08: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
柯十六夜
acfbf2e32e Add prefix Online to BeatmapID and BeatmapSetID 2017-01-09 21:05:01 +08:00
Andrey Zavadskiy
c0980437a6 Removed unnecessary api reference 2017-01-07 00:55:04 +03:00
Drew DeVault
4899d88d19 Update framework 2017-01-05 02:10:05 -05:00
Drew DeVault
b27139c2bd Simplify layout of dropdown menu item 2017-01-05 00:57:19 -05:00
Drew DeVault
af4aeeab09 Update following framework changes 2017-01-04 01:14:25 -05:00
Drew DeVault
a1f8c0df64 Style dropdown to match osu!stable 2017-01-03 23:00:28 -05:00
Huo Yaoyuan
6690d1bd72 Move logic into updateDisplay. 2017-01-04 02:12:18 +08:00
Huo Yaoyuan
794e4663d8 Fix PreferUnicode changing when nothing to play. 2017-01-04 01:00:08 +08:00
Andrey Zavadskiy
acc50e3473 fixed wrong parameter for token 2016-12-24 10:16:22 +03:00
Andrey Zavadskiy
eabfa11614 Minor fix 2016-12-24 10:04:43 +03:00
Andrey Zavadskiy
5fbc0e408b Remove unnesessary Username field check 2016-12-24 09:16:17 +03:00
Andrey Zavadskiy
ba1d0b3a84 Added Events for checkboxes 2016-12-24 09:09:01 +03:00
Andrey Zavadskiy
9f202ecba8 fix 2016-12-23 23:49:42 +03:00
Andrey Zavadskiy
70c8250021 Revert "Dependent checkboxes" 
This reverts commit 70dc3bae4a.
 2016-12-23 23:05:44 +03:00
Andrey Zavadskiy
70dc3bae4a Dependent checkboxes 2016-12-23 20:24:28 +03:00
Andrey Zavadskiy
cd3ab33d08 Remove the password field from game.ini 2016-12-23 00:43:43 +03:00
Andrey Zavadskiy
7c96102229 When we have empty login, api.Token becames empty 
So we can't sign in having Token without login
 2016-12-22 16:09:42 +03:00
Andrey Zavadskiy
4817d4bf10 Stop using password field in .ini at all 2016-12-22 15:41:06 +03:00
Andrey Zavadskiy
b066a7d905 Stop saving password 2016-12-22 15:26:31 +03:00
柯十六夜
e578e50721 Add support for old beatmaps 2016-12-21 16:29:57 +08:00
柯十六夜
ef11c3f389 Add default Beatmap ID 2016-12-21 14:47:56 +08:00
Andrey Zavadskiy
1c79ebff9f Fix loggining on start even after logout and exit 2016-12-21 01:51:01 +03:00
Andrey Zavadskiy
bba4c46ae3 TODO comment and deleted repeating lines 2016-12-21 01:05:10 +03:00
Andrey Zavadskiy
c7de449713 Token fix 
If "Save Password" is checked, Token will be saved
 2016-12-21 00:37:54 +03:00
柯十六夜
02f6e46105 Add support for v9 beatmaps 2016-12-20 23:56:49 +08:00
Andrey Zavadskiy
d519e28dda PasswordTextBox fix 2016-12-20 17:52:16 +03:00
Andrey Zavadskiy
21c6c23189 Login improvements 2016-12-20 17:28:27 +03:00
Dean Herbert
561b0928bb Merge pull request #263 from EVAST9919/fixes 
Remove unnecessary items from OptionsOverlay
 2016-12-20 01:18:51 +09:00
Andrey Zavadskiy
e23a1b8e92 Remove unnecessary items from OptionsOverlay 2016-12-19 19:17:04 +03: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
n4b3l
ded6588d3b minor style fixed 2016-12-18 17:21:05 +01:00