1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-30 21:42:56 +08:00
Commit Graph

39931 Commits

Author SHA1 Message Date
Dean Herbert
a953f22de6 Merge pull request #329 from peppy/general-fixes
Update framework.
2017-02-07 23:44:00 +09:00
Dean Herbert
56265bf2d8 Update framework. 2017-02-07 23:38:19 +09:00
Thomas Müller
82b8b5af79 Merge pull request #328 from peppy/main-menu-onclick
Change main menu buttons to be activated OnClick.
2017-02-07 15:29:58 +01:00
Thomas Müller
267473c052 Merge pull request #327 from peppy/general-fixes
General fixes.
2017-02-07 14:52:11 +01:00
Dean Herbert
34a030e3be
Fix race conditions causing menu transitions to look wrong when executed in very fast succession. 2017-02-07 22:19:36 +09:00
Dean Herbert
d06f0cf870
Fix escape not always handling back action correctly at main menu (back button not yet visible). 2017-02-07 22:19:17 +09:00
Dean Herbert
dc5e9dde56
Fix escape key nonsense. 2017-02-07 21:46:13 +09:00
Dean Herbert
8a0887c3c3
Add sound effect to osu! logo clicking. 2017-02-07 21:45:59 +09:00
Dean Herbert
24ba21363e
Make intro->mainmenu work better by delaying interactiveness of osu! logo. 2017-02-07 21:37:34 +09:00
Dean Herbert
e2f680a65f
Change main menu buttons to be activate OnClick. 2017-02-07 20:30:40 +09:00
Dean Herbert
446b277972
Don't allow clicks/hover events to pass through the options overlay. 2017-02-07 20:29:40 +09:00
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
f060eb07dd Merge pull request #326 from peppy/general-fixes
Naming standardisation and enforcing.
2017-02-07 16:53:36 +09:00
Dean Herbert
416999a17e
Update framework. 2017-02-07 16:31:37 +09:00
Dean Herbert
6b011a50d2
Naming standardisation and enforcing. 2017-02-07 16:20:36 +09:00
DrabWeb
3d0feb4de9 Very basic implementation of the graph 2017-02-07 01:49:41 -04:00
Dean Herbert
9ef7df2c41 Merge pull request #325 from peppy/general-fixes
General fixes
2017-02-07 14:39:45 +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
DrabWeb
7c83dc8aed Merge https://github.com/ppy/osu into song-progress-graph 2017-02-06 20:40:49 -04:00
Thomas Müller
b334a310b0 Merge pull request #324 from TiberiumPY/patch-1
Fix name of file
2017-02-06 19:26:53 +01:00
Danil Yarancev
c222ce4403 Fix name 2017-02-06 21:19:27 +03:00
Thomas Müller
d50e9b0676 Merge pull request #322 from peppy/general-fixes
Goodbye @2x
2017-02-06 19:13:46 +01:00
Thomas Müller
ea384b5efc Bump framework. 2017-02-06 19:07:39 +01: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
Dean Herbert
a5e3586c48
Bump framework. 2017-02-06 20:46:36 +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
Dean Herbert
4c2c0b1d49 Merge pull request #318 from Tom94/minor-pause-visuals
Avoid triangle bleeding by masking the triangle container without smo…
2017-02-06 18:55:33 +09:00
Dean Herbert
8da9ef6911 Merge pull request #321 from peppy/general-fixes
Update framework.
2017-02-06 18:44:55 +09:00
Dean Herbert
26c051350c
Update framework. 2017-02-06 18:42:12 +09: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
Dean Herbert
65feda0505 Merge pull request #315 from Tom94/better-visibility
Better visibility
2017-02-05 23:39:02 +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
faf6461f30 Update framework. 2017-02-05 15:24:19 +01:00
Thomas Müller
f477b7d8a0 Update framework. 2017-02-05 15:22:57 +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
Dean Herbert
beddf5cd6d Merge pull request #316 from EVAST9919/overlay_buttons
Better look of PauseButton
2017-02-05 21:08:18 +09:00
Andrey Zavadskiy
43dcf0bbc1 PauseButton Triangles 2017-02-05 13:47:37 +03:00