1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 02:27:25 +08:00
Commit Graph

19776 Commits

Author SHA1 Message Date
Salman Ahmed
3e2fcc95ed
Merge branch 'master' into venera-900 2019-07-01 12:16:48 +03:00
Salman Ahmed
b875ab2f58
Update resources 2019-07-01 12:15:53 +03:00
Dean Herbert
43d83b35d0
Add combo break sound (#5159)
Add combo break sound

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-30 22:36:10 +09:00
Dean Herbert
489ca7b457 Update resources in ios props 2019-06-30 22:26:49 +09:00
Dean Herbert
60ea3d4e1a Fix skinning support for combobreak 2019-06-30 21:58:30 +09:00
Dean Herbert
bd54b34538 Merge remote-tracking branch 'upstream/master' into combobreak 2019-06-30 21:27:53 +09:00
Dean Herbert
f765ad1a6a
Allow exiting Editor again (#5194)
Allow exiting Editor again

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-30 21:08:05 +09:00
Dean Herbert
fa879b4b60 Add a note explaining why manual handling is required 2019-06-30 20:47:09 +09:00
Unknown
5b26ef75b1 allow exiting editor again 2019-06-30 12:31:31 +02:00
Salman Ahmed
9a617dd143
Add Venera Medium in Store 2019-06-30 03:16:58 +03:00
welsar55
d6561531a3
Merge branch 'master' into combobreak 2019-06-29 11:55:10 -05:00
Welsar55
dbb1369eaf Use resources build 627 2019-06-29 11:54:02 -05:00
Welsar55
a22c166575 Make ComboEffects its own class 2019-06-29 11:28:40 -05:00
Welsar55
a57218e50e Move to LocalSkinOverride 2019-06-28 20:45:11 -05:00
Dean Herbert
addc4ef968
Fix windows updater (#5178)
Fix windows updater
2019-06-28 21:36:57 +09:00
Dean Herbert
c9104e9176 Fix remaining issues 2019-06-28 21:26:31 +09:00
Dean Herbert
1289b7f5fe Commit missing piece of puzzle 2019-06-28 21:03:35 +09:00
Dean Herbert
1898a6750d Fix stutter during update process 2019-06-28 20:45:25 +09:00
Dean Herbert
d557737143 Fix windows updater showing false failures 2019-06-28 20:37:53 +09:00
Dean Herbert
02541ee6e5 Add missing info.plist identifier 2019-06-28 19:57:23 +09:00
Dean Herbert
fa14141bd4
Update code in line with framework menu changes (#5140)
Update code in line with framework menu changes

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-28 18:29:43 +09:00
Dean Herbert
c2f82f86d6 Update framework 2019-06-28 18:14:08 +09:00
Dean Herbert
3902da9135 Merge remote-tracking branch 'upstream/master' into abstract-menu 2019-06-28 18:13:44 +09:00
Dean Herbert
85a4c4fb43
Remove GC debug setting (#5175)
Remove GC debug setting
2019-06-28 18:13:08 +09:00
Dean Herbert
6d0cc1f770 Remove GC debug setting 2019-06-28 15:59:19 +09:00
smoogipoo
23df1a5d42 Merge remote-tracking branch 'HollyHacker/master' into abstract-menu 2019-06-28 13:42:56 +09:00
Dean Herbert
e8ea0594b4
Fix ruleset selector line not moving on first display (#5168)
Fix ruleset selector line not moving on first display

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-28 00:52:11 +09:00
Dean Herbert
e0fb547bb3
Fix download buttons not finding existing downloads and already… (#5171)
Fix download buttons not finding existing downloads and already downloaded maps

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-28 00:40:52 +09:00
Dean Herbert
542d2cd01a
Merge pull request #5170 from nyquillerium/hyper-dash-fix
Fix TestSceneHyperDash in test browser
2019-06-28 00:27:36 +09:00
naoey
3cfa5a767f
Add test for download button states 2019-06-27 17:31:21 +05:30
Dean Herbert
4952fb3716
Merge branch 'master' into fix-toolbar-bar 2019-06-27 19:58:13 +09:00
David Zhao
e7419f382e Fix TestSceneHyperDash in test browser 2019-06-27 19:20:19 +09:00
naoey
61260cf599
Hand off comparison logic for database query to implementors
Equals overrides are not used in EF queries without running the comaprison locally instead of on the database, so to preserve that the comparison logic is instead implemented on a per manager basis.
2019-06-27 15:32:27 +05:30
Dan Balasescu
04c1e0a2f3
Merge pull request #5167 from peppy/remove-handle-input-overrides
Remove no longer necessary HandleInput overrides
2019-06-27 18:58:55 +09:00
Dean Herbert
72bb6f8c12
Fix download buttons not correctly finding existing downloads 2019-06-27 15:24:08 +05:30
Dan Balasescu
3570605255
Merge branch 'master' into remove-handle-input-overrides 2019-06-27 18:44:55 +09:00
Dan Balasescu
22067cd807
Merge pull request #5162 from peppy/fix-settings-subpanel-dim
Fix settings subpanels dimming main content
2019-06-27 18:44:39 +09:00
Dean Herbert
ba48331fcb Remove no longer necessary HandleInput overrides 2019-06-27 18:34:59 +09:00
Dan Balasescu
2ee4fde5f0
Merge branch 'master' into fix-settings-subpanel-dim 2019-06-27 18:30:36 +09:00
smoogipoo
f6f547a91b Fix ruleset selector line not moving on first display 2019-06-27 18:25:38 +09:00
Dan Balasescu
7762b67ecb
Merge pull request #4910 from EVAST9919/user_profile_modes
Implement Ruleset Selector component for profile overlay
2019-06-27 15:47:56 +09:00
Dean Herbert
98ba38d421
Merge branch 'master' into user_profile_modes 2019-06-27 15:34:21 +09:00
Dean Herbert
d6c28dc6d7 Simplify and fix state management 2019-06-27 15:31:47 +09:00
Dean Herbert
25499f74a7 Remove redundant font set 2019-06-27 15:31:36 +09:00
smoogipoo
b397652af4 Remove ability to set arbitrary accent colours 2019-06-27 15:02:26 +09:00
smoogipoo
7f5587d894 RulesetTabItem -> ProfileRulesetTabItem 2019-06-27 14:54:31 +09:00
smoogipoo
803198ff20 Gamemode -> Ruleset 2019-06-27 14:53:18 +09:00
Dean Herbert
98ee2d660a
Handle beatmaps with disabled download or missing content (#4986)
Handle beatmaps with disabled download or missing content

Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-06-27 13:59:54 +09:00
KingLuigi4932
04f5ee21e1 Merge remote-tracking branch 'origin/not-available-to-download' into not-available-to-download 2019-06-27 07:49:35 +03:00
iiSaLMaN
e78ecb9757 More anonymising in tests 2019-06-27 07:48:57 +03:00