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

19823 Commits

Author SHA1 Message Date
Dean Herbert
a6acc1f99f Catch exception and return null for safety
.
2019-07-02 22:26:08 +09:00
Dean Herbert
0b66f13902 Add todo about beatmap load cancellation 2019-07-02 22:22:33 +09:00
Dean Herbert
a26b14a4f8 Move finaliser inside disposal region 2019-07-02 22:21:56 +09:00
Dean Herbert
31b1480263
Merge branch 'master' into async-beatmap-load 2019-07-02 20:44:53 +09:00
Dean Herbert
115dcc3147
Update framework (#5204)
Update framework
2019-07-02 00:50:57 +09:00
Dean Herbert
313648b869 Update framework 2019-07-02 00:34:43 +09:00
Dean Herbert
0a91931d39
Add support for legacy skins which use animation frames to hide… (#5202)
Add support for legacy skins which use animation frames to hide elements

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-01 23:50:38 +09:00
Dan Balasescu
8ef2ab8983
Merge branch 'master' into legacy-skin-hidden-hits-support 2019-07-02 00:04:27 +09:30
Dan Balasescu
5531810182
Merge pull request #5196 from peppy/reduce-db-contexts
Change song select initialisation to promote database context sharing
2019-07-02 00:04:12 +09:30
Dan Balasescu
3d4c5104b3
Merge branch 'master' into reduce-db-contexts 2019-07-01 23:40:58 +09:30
smoogipoo
fc8dee6123 Fix typo 2019-07-01 23:26:53 +09:30
Dean Herbert
9e5ba5c796
Merge pull request #5191 from iiSaLMaN/venera-900
Update resources with Venera-Medium
2019-07-01 22:07:42 +09:00
Dean Herbert
6e73941114 Update iOS resources 2019-07-01 22:06:54 +09:00
Dean Herbert
4e54bb3f72 Merge remote-tracking branch 'upstream/master' into venera-900 2019-07-01 22:06:33 +09:00
Dean Herbert
e5d3f06265
Fix screen dimming permanently when chat opened with no channel… (#5156)
Fix screen dimming permanently when chat opened with no channel joined

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-01 19:49:36 +09:00
Dean Herbert
b8a27bb6f5
Disable Hidden mod for osu!taiko (until it is implemented) (#5201)
Disable Hidden mod for osu!taiko (until it is implemented)
2019-07-01 19:48:49 +09:00
Dean Herbert
e25158f434 Rename move and fix tests 2019-07-01 19:35:04 +09:00
Dean Herbert
e6c1b059bc Disable dimming main content 2019-07-01 18:49:36 +09:00
Dean Herbert
5d94c67c76 Merge remote-tracking branch 'upstream/master' into selector-hiding 2019-07-01 18:49:18 +09:00
Dean Herbert
955e9b27d9
Fix Relax mod not working with osu! ruleset (#5185)
Fix Relax mod not working with osu! ruleset
2019-07-01 18:28:38 +09:00
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
0636df5660 Add support for legacy skins which use animation frames to hide elements 2019-07-01 18:13:14 +09:00
Unknown
665da09ed7 disable HD for taiko 2019-07-01 09:45:14 +02:00
Salman Ahmed
d11b799571 Add explaining comment 2019-06-30 18:28:20 +03:00
Salman Ahmed
f42ded3437 Move to DrawableOsuHitObject 2019-06-30 18:27:47 +03:00
Salman Ahmed
46625e827d
Merge branch 'master' into fix-relax-mod 2019-06-30 21:20:41 +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
8703f0ad40 Change song select initialisation to promote db context sharing 2019-06-30 22:23:48 +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
Salman Ahmed
4465e42b85
HandlePositionalInput must be true
To update IsHovered
2019-06-28 23:21:14 +03: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