1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-14 21:17:33 +08:00
Commit Graph

20156 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
Dan Balasescu
15321ee0e8
Merge branch 'master' into reduce-logovis-allocs 2019-07-02 22:44:39 +09:30
Dan Balasescu
ec7495e59d
Merge pull request #5213 from peppy/update-resources
Update menu backgrounds
2019-07-02 22:40:44 +09:30
Dean Herbert
31b1480263
Merge branch 'master' into async-beatmap-load 2019-07-02 20:44:53 +09:00
naoey
1ff6a9d085
Remove unused using 2019-07-02 16:25:40 +05:30
Dean Herbert
f45b42021f Change app label to just "osu!" 2019-07-02 19:55:32 +09:00
Dean Herbert
7dbba87e4c Update dependencies
oops
2019-07-02 19:55:32 +09:00
Dean Herbert
486e7e4e1e Remove unnecessary file 2019-07-02 19:44:04 +09:00
naoey
eaa19d5a49
Remove unused/unnecessary fields 2019-07-02 16:13:47 +05:30
Dean Herbert
9bed0094de Merge remote-tracking branch 'upstream/master' into android 2019-07-02 19:40:50 +09:00
Dean Herbert
1a3cc25d6c Update in accordance with visual studio changes
Adds x86 emulator deployment target
2019-07-02 19:40:42 +09:00
miterosan
bc821fcc5d Add native bass libs for x86 Android 2019-07-02 19:39:25 +09:00
Andrei Zavatski
082fa0d808 simplify updateState logic 2019-07-02 13:35:02 +03:00
naoey
ee516d2515
Make direct panel download and replay buttons share UI 2019-07-02 15:55:30 +05:30
Andrei Zavatski
2971bd8cbc Add disable trigger to a testcase 2019-07-02 13:22:38 +03:00
Andrei Zavatski
08dfe413c1 Refactor Ruleset Selector in Direct 2019-07-02 13:07:36 +03:00
Dean Herbert
79b0deb353 Update resources reference 2019-07-02 17:59:25 +09:00
Dean Herbert
587be955c3 Increase number of backgrounds in line with resources 2019-07-02 17:57:23 +09:00
Dean Herbert
7b2227c505 Fix xmldoc 2019-07-02 17:47:19 +09:00
Dean Herbert
6c7b97931e Avoid using a BufferedContainer for backgrounds unless required 2019-07-02 17:45:46 +09:00
Dean Herbert
29bb227de2 Avoid Intro screen holding references to the intro beatmap 2019-07-02 16:28:06 +09:00
Dean Herbert
451765784a Centralise SocialOverlay's scheduling logic
Just some clean-ups to make it easier to confirm correct logic
2019-07-02 15:25:40 +09:00
Dean Herbert
d27a0db45c Enforce StartHidden on relevant overlays 2019-07-02 15:23:47 +09:00
Dean Herbert
2645967dc4 Fix wave-based overlays always being present before initial display 2019-07-02 15:17:35 +09:00
Dean Herbert
8e54990f62 Add database statistics to GlobalStatistics 2019-07-02 13:43:43 +09:00
Dean Herbert
6539c6da17
Merge branch 'master' into watch-replays-4 2019-07-02 13:24:16 +09:00
Salman Ahmed
744e651a37
Merge branch 'master' into applicable-to-hud 2019-07-02 05:24:56 +03:00
Salman Ahmed
7c1fc075e0 Remove mistaken change 2019-07-02 02:24:04 +03:00
Salman Ahmed
6a79349f4a Move health display out of the visibility container 2019-07-02 02:19:59 +03:00
Salman Ahmed
a8e8650ddd Move blocking fail logic into a base class 2019-07-02 01:47:39 +03:00
Salman Ahmed
72e5cbb07f Add checkbox for hiding health bar 2019-07-02 01:45:09 +03:00
Dean Herbert
115dcc3147
Update framework (#5204)
Update framework
2019-07-02 00:50:57 +09:00
MaxOhn
48a828b746 Removed redundant imports and fixed indentation 2019-07-01 17:49:37 +02: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
MaxOhnh
02b9e89f43 Removed old unnecessary change, updated license header and apply deflating onto first object regardless 2019-07-01 14:46:17 +02:00
MaxOhnh
cd5e1bc4b1 Replace deflate progress with modified copy-paste of grow mod 2019-07-01 13:55:09 +02:00
MaxOhnh
93b780c9a8 Resolved merge 2019-07-01 13:53:40 +02: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