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

12446 Commits

Author SHA1 Message Date
Dean Herbert
1b5bb79fe9 Merge remote-tracking branch 'upstream/master' into jorolf-open-external 2018-05-25 18:50:30 +09:00
Dean Herbert
28aa6faef9
Merge branch 'master' into player_loader_input_toggles 2018-05-25 18:38:12 +09:00
Dean Herbert
7d06a08c3a Fix quit button test occasionally failing 2018-05-25 17:44:56 +09:00
Dean Herbert
f5ab93a712 Make all drawable fruit absolute values easily scalable 2018-05-25 17:37:52 +09:00
Dean Herbert
bf25e81c94 Make drawable bananas testable 2018-05-25 17:37:52 +09:00
Dean Herbert
3fe25fe67d Fix catcher sizing to (roughly) match stable 2018-05-25 17:33:53 +09:00
Dean Herbert
5e4f83b80b Add more correct catch playfield sizing 2018-05-25 17:33:27 +09:00
Dean Herbert
e62718f251
Merge pull request #2587 from smoogipoo/diffcalc-double-hr
Fix double-HR application in OsuDifficultyCalculator
2018-05-25 14:17:25 +09:00
Dean Herbert
67447ef560
Merge branch 'master' into diffcalc-double-hr 2018-05-25 14:03:10 +09:00
Dean Herbert
1c947fd3a7
Merge pull request #2618 from smoogipoo/musiccontroller-nullref
Fix possible MusicController nullref
2018-05-25 11:25:05 +09:00
Dean Herbert
385c2c5c86
Merge branch 'master' into musiccontroller-nullref 2018-05-25 11:01:09 +09:00
Dean Herbert
568d4882c6
Remove unnecessary null coalesce 2018-05-25 11:00:56 +09:00
Dean Herbert
6d6cea19ec
Merge pull request #2624 from Aergwyn/hide-toolbar-after-play
Fix incorrect default values keeping overlays in wrong state
2018-05-24 09:43:52 +09:00
Aergwyn
0c0f86fe26 fix incorrect default values keeping overlays in wrong state 2018-05-23 16:25:10 +02:00
smoogipoo
fb78854485 Fix audio playback getting paused if playlist changes beatmap 2018-05-23 19:41:13 +09:00
frankhjwx
fda7025ac3 Re-order positionData judgement for correct banana creation 2018-05-23 13:47:33 +08:00
frankhjwx
28ad5398cc Remove the changes in convert spinner 2018-05-23 13:46:12 +08:00
smoogipoo
f894d73501 Fix possible MusicController nullref 2018-05-23 14:36:09 +09:00
Dean Herbert
194710eae4
Merge pull request #2613 from Aergwyn/fix-disclaimer-allowing-notifications
Fix disclaimer allowing notifications
2018-05-23 11:22:49 +09:00
frankhjwx
6ee96c758f
Merge branch 'master' into catch_spinner 2018-05-23 10:02:11 +08:00
Aergwyn
76fbc656a1 fix disclaimer allowing notifications 2018-05-22 17:53:36 +02:00
jorolf
8fbda5bc59 add license header 2018-05-22 15:41:10 +02:00
jorolf
b324337fa1 Add icon next to beatmap title/username to open in browser 2018-05-22 15:29:52 +02:00
frankhjwx
be0fc24ad4 Fixed banana generation on catch specific maps 2018-05-22 20:51:37 +08:00
Dean Herbert
088deee70a
Merge pull request #2601 from Aergwyn/respect-showoverlay-bindable
FIx overlays from not hiding when returning to initial main menu state
2018-05-22 19:19:00 +09:00
Dean Herbert
ef40ca8805
Merge branch 'master' into respect-showoverlay-bindable 2018-05-22 19:00:42 +09:00
Dean Herbert
52230d6279
Merge pull request #2600 from peppy/fix-main-menu-escape
Fix escape not working to go backwards in menus before finally exiting the game
2018-05-22 18:58:48 +09:00
Dan Balasescu
99163ca8ba
Merge branch 'master' into fix-main-menu-escape 2018-05-22 18:17:51 +09:00
Dan Balasescu
c0802b5646
Merge pull request #2430 from UselessToucan/exit_replay_button
Add hold-to-quit button for gameplay/replays
2018-05-22 18:17:40 +09:00
smoogipoo
0e122468db Fix progress easing to 0 if aborting after confirmation 2018-05-22 18:06:40 +09:00
Dean Herbert
39de807445 Update framework 2018-05-22 16:46:55 +09:00
Dean Herbert
d43e4af8ea Fix overlap between quit button at key input overlay 2018-05-22 16:45:42 +09:00
Dean Herbert
436067c01f Handle scale back in a nicer way 2018-05-22 16:44:37 +09:00
Dean Herbert
7b770d03c5 Use OnMouseMove instead of Update logic 2018-05-22 16:26:59 +09:00
Dean Herbert
babb7d5158 Fix white ring flash when holding button post-confirmation 2018-05-22 16:23:05 +09:00
Dean Herbert
5f8eb6d823 Fix class name 2018-05-22 16:04:36 +09:00
Dean Herbert
8fbda9d57e Improve comment 2018-05-22 16:04:07 +09:00
Dean Herbert
58ae545747 innerCircle -> overlayCircle 2018-05-22 15:59:53 +09:00
Dean Herbert
ef55c3c197 Fix icon scale not resetting due to no implicit triggering 2018-05-22 15:58:17 +09:00
Dean Herbert
2ce2bd9788 Add comment for pendingAnimation 2018-05-22 15:58:00 +09:00
DrabWeb
0b19b7d9e5 Fix test case. 2018-05-22 02:08:50 -03:00
DrabWeb
349b0a3322 Remove empty ctor. 2018-05-22 01:46:08 -03:00
DrabWeb
3cc5bb516e Remove unused Match ctor param. 2018-05-22 01:39:25 -03:00
DrabWeb
fba79a4de6 Test typo. 2018-05-22 01:31:01 -03:00
DrabWeb
662559d3c9 More test steps. 2018-05-22 01:22:23 -03:00
DrabWeb
6aac4269e6 Add filtering. 2018-05-22 00:33:41 -03:00
DrabWeb
f7a4a4eeef Add Lounge FilterControl. 2018-05-22 00:24:39 -03:00
DrabWeb
cae09492c3 Basic Lounge functionality. 2018-05-22 00:07:04 -03:00
DrabWeb
1210368e29 Add MultiplayerScreen base class. 2018-05-21 23:00:02 -03:00
Dean Herbert
5a892e4d08 This quit button don't quit 2018-05-22 02:09:52 +09:00