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

13226 Commits

Author SHA1 Message Date
iiSaLMaN
729f0901f7 Move Length out of OnlineInfo 2019-07-07 20:25:36 +03:00
iiSaLMaN
3ea9629daf Move BPM out of OnlineInfo 2019-07-07 20:11:44 +03:00
iiSaLMaN
6ee10640e3 Remove unnecessary migration + Fix CI issues 2019-07-07 19:26:41 +03:00
iiSaLMaN
28cc797fb6 Add migrations 2019-07-07 18:29:25 +03:00
iiSaLMaN
b4ef64fa61 Add sorting by Length 2019-07-07 18:26:56 +03:00
iiSaLMaN
65c8249c94 Add beatmap extension for calculating length 2019-07-07 18:25:52 +03:00
iiSaLMaN
188c80374e Add sorting by BPM 2019-07-07 18:14:23 +03:00
Desconocidosmh
84cadc688a Change method name 2019-07-07 17:11:54 +02:00
Desconocidosmh
1a117d1511 Closes #5277 2019-07-07 17:05:53 +02:00
Dean Herbert
ebc0e50295 Simplify conditions 2019-07-07 13:21:41 +09:00
Dean Herbert
1eec69c6b6 Merge remote-tracking branch 'Joehuu/master' into fix-unranked-map-lb-placeholder 2019-07-07 13:06:34 +09:00
Salman Ahmed
b10c35b6ab
Update label text
Co-Authored-By: Aergwyn <aergwyn@t-online.de>
2019-07-07 06:13:27 +03:00
Dean Herbert
8f2ec73626 Move logic inside of HUDOverlay
Add vertical offset adjust.
2019-07-07 05:30:53 +09:00
Dean Herbert
84919d70bb Health bar -> Health display
Also inverts logic
2019-07-07 05:30:30 +09:00
Joseph Madamba
7c0e3a50b6
Merge branch 'master' into fix-unranked-map-lb-placeholder 2019-07-06 12:09:28 -07:00
Dean Herbert
3f332cca2f
Merge branch 'master' into applicable-to-hud 2019-07-07 01:03:50 +09:00
Salman Ahmed
1f13b94c72
Fix build error 2019-07-06 18:44:55 +03:00
Salman Ahmed
a42c79895d
Remove unnecessary private field 2019-07-06 18:38:41 +03:00
Dean Herbert
be2d0048db
Merge branch 'master' into buttonsystem-entermode 2019-07-07 00:01:41 +09:00
Salman Ahmed
dfabed3d85
Merge branch 'master' into applicable-to-hud 2019-07-06 16:30:02 +03:00
Salman Ahmed
040dbfd2c1
Merge branch 'master' into remove-unnecessary-fading 2019-07-06 15:59:44 +03:00
Dean Herbert
ea911b2fd2 Ensure intro restarts track 2019-07-06 19:05:42 +09:00
iiSaLMaN
6fd3ad5c1d Remove unnecessary fading 2019-07-06 12:10:30 +03:00
Dean Herbert
2149d639de
Merge branch 'master' into leaderboard-mod-filter 2019-07-06 13:27:49 +09:00
iiSaLMaN
530e07110f Use a descriptive name for the setting 2019-07-06 06:32:25 +03:00
Dean Herbert
71e40b4684 Force SQLite to multithreading mode 2019-07-06 12:32:16 +09:00
Dan Balasescu
3a9f16ccf2
Merge branch 'master' into idle-still-starts 2019-07-06 00:08:59 +09:30
Dan Balasescu
f32796db5c
Merge branch 'master' into changelog-comments 2019-07-05 23:42:46 +09:30
David Zhao
a259247a98 use const 2019-07-05 16:07:17 +09:00
Dean Herbert
598b0d668b
Merge branch 'master' into import-stable-scores 2019-07-05 15:54:33 +09:00
Dean Herbert
b54c0176eb
Merge branch 'master' into disable-own-replays 2019-07-05 15:41:43 +09:00
Dean Herbert
b902457f8d Allow PlayerLoader to proceed even if the mouse is hovering an overlay panel 2019-07-05 15:32:07 +09:00
smoogipoo
5862eb172a Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders
# Conflicts:
#	osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs
#	osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs
2019-07-05 15:48:04 +09:30
Dean Herbert
49eb8b0b53
Merge branch 'master' into lock-working-cache 2019-07-05 15:14:07 +09:00
Dean Herbert
04c0ce1ea3
Merge branch 'master' into import-stable-scores 2019-07-05 14:48:55 +09:00
Dean Herbert
df7d31350c Stop import failures from being added to the imported model list 2019-07-05 14:47:55 +09:00
Dean Herbert
d5a9542743
Fix incorrect xmldoc in DownloadTrackingComposite (#5261)
Fix incorrect xmldoc in DownloadTrackingComposite
2019-07-05 14:43:28 +09:00
Dean Herbert
adf6d6c942 Update initial run import process to include scores 2019-07-05 14:25:52 +09:00
Dean Herbert
80d8ce8392 Fix GetStableImportPaths xmldoc 2019-07-05 14:21:56 +09:00
Dean Herbert
87c8fd0035 Fix path specification not being cross-platform compliant 2019-07-05 14:15:29 +09:00
Dean Herbert
99da04527d Replays -> scores 2019-07-05 14:07:14 +09:00
Dean Herbert
ba8df3ba92 Clean up stable lookup and mutate logic 2019-07-05 13:59:31 +09:00
Dean Herbert
8346c50ce1 Rename delete method and improve xmldoc 2019-07-05 13:55:25 +09:00
Joehu
1534b75d27 Fix ci errors 2019-07-04 21:39:21 -07:00
Dean Herbert
fcdba6b3f5
Merge branch 'master' into import-stable-scores 2019-07-05 13:34:03 +09:00
Joehu
e8168037f9 Fix unranked beatmap leaderboards showing "no records" placeholder 2019-07-04 21:19:51 -07:00
Dean Herbert
d77d49f595
Merge branch 'master' into fade-music-on-exit 2019-07-05 13:13:07 +09:00
David Zhao
9eeafa0861 Merge branch 'buttonsystem-entermode' of https://github.com/nyquillerium/osu into buttonsystem-entermode 2019-07-05 13:08:48 +09:00
David Zhao
79d6670dc5 Expose durations from MainMenu and reorder 2019-07-05 13:08:45 +09:00
naoey
f1dab946ff Remove need to trim query string 2019-07-05 08:46:17 +05:30
naoey
1dab363be3 Require supporter for filtering mods on online leaderboards 2019-07-05 08:42:44 +05:30
naoey
98a242cc37 Merge remote-tracking branch 'ppy/master' into leaderboard-mod-filter 2019-07-05 08:38:33 +05:30
iiSaLMaN
a30f0c03bb Fix incorrect xmldoc 2019-07-05 05:32:30 +03:00
Dean Herbert
f4dcbbbfef Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode 2019-07-05 11:29:29 +09:00
iiSaLMaN
d624157c45 Remove unnecessary fading 2019-07-05 05:17:36 +03:00
iiSaLMaN
bff5ad22f4 Check if the locally available score has files 2019-07-05 05:16:40 +03:00
Dean Herbert
91d461eba7
Merge pull request #5251 from Joehuu/remove-edit-song-select-file
Remove unused EditSongSelect file
2019-07-05 10:30:37 +09:00
Dean Herbert
38dceddc27 Fix file ordering 2019-07-05 10:07:45 +09:00
Dean Herbert
037ea7b708
Merge branch 'master' into fix-colour-mod-filter 2019-07-05 10:04:31 +09:00
Joehu
ae7da2557e Fix initial colour of leaderboard mod filter 2019-07-04 13:24:13 -07:00
Joehu
5f6544eebf Fix beatmap leaderboards requiring supporter when signed out 2019-07-04 12:05:07 -07:00
naoey
f04adb7192
Apply mods filter to local scores too 2019-07-04 22:38:33 +05:30
Joehu
9b2ebed669 Remove unused EditSongSelect file 2019-07-04 08:36:34 -07:00
David Zhao
be4e7d0f50 remove comment 2019-07-04 17:08:21 +09:00
Dean Herbert
db24ac28ec Add tests 2019-07-04 16:53:08 +09:00
Dean Herbert
a20d5baa57 Fix skip button not being clickable after fade out 2019-07-04 16:21:01 +09:00
Dean Herbert
2b9f7d551f
Fix incorrect type specification 2019-07-04 16:16:17 +09:00
Dean Herbert
4885f0f0c7 Add messaging telling users how to leave changelog comments 2019-07-04 15:47:06 +09:00
Dean Herbert
32bb963393 Lock WorkingBeatmap cache to avoid threading issues 2019-07-04 14:33:00 +09:00
iiSaLMaN
b53aeec90d Move audio adjustment inside OnResuming 2019-07-04 05:18:29 +03:00
iiSaLMaN
99603ca0b6 Fade out game volume on exiting
Invokes 'this.Exit()' on completion (simplify lines)
2019-07-04 04:50:49 +03:00
Dean Herbert
f41c89c3be
Fix replays of converted beatmaps failing to download (#5225)
Fix replays of converted beatmaps failing to download
2019-07-04 01:50:47 +09:00
Dean Herbert
f358b69b8e
Refactor Ruleset Selector in osu!direct (#5214)
Refactor Ruleset Selector in osu!direct

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-07-04 01:24:58 +09:00
Dean Herbert
7575047db8
Merge branch 'master' into import-stable-scores 2019-07-04 01:00:42 +09:00
Dean Herbert
e55d6232d1
Merge branch 'master' into direct-ruleset-selector 2019-07-04 00:56:36 +09:00
Dean Herbert
4ecc690164
Merge branch 'master' into fix-logo-vis-catchup 2019-07-04 00:47:42 +09:00
Dean Herbert
ead961004a
Update framework (#5231)
Update framework
2019-07-04 00:47:27 +09:00
Dean Herbert
db3e9c7e60
Fix WaveOverlayContainer being always present (#5210)
Fix WaveOverlayContainer being always present
2019-07-04 00:35:22 +09:00
Dean Herbert
1824d29996 Update framework 2019-07-04 00:34:39 +09:00
naoey
99606a018b
Merge remote-tracking branch 'upstream/master' into leaderboard-mod-filter 2019-07-03 19:35:08 +05:30
Dean Herbert
127b0b33c2
Fix local beatmap leaderboard displaying scores from all game m… (#5226)
Fix local beatmap leaderboard displaying scores from all game modes
2019-07-03 21:52:44 +09:00
Andrei Zavatski
cfac90b228 Use ConstrainedIconContainer instead of SpriteIcon 2019-07-03 14:34:24 +03:00
naoey
4ba60ed089
Apply currently selected mods to filter leaderboard scores
Modifies GetScoresRequest to build query string locally instead of using WebRequest.AddParameter since it doesn't support array parameters
2019-07-03 17:04:20 +05:30
Andrei Zavatski
d6740d9688 Merge remote-tracking branch 'refs/remotes/ppy/master' into direct-ruleset-selector 2019-07-03 14:19:41 +03:00
Dean Herbert
3b5ffdc2cb
Merge branch 'master' into android 2019-07-03 19:05:58 +09:00
Dean Herbert
8120bb36bc More methods 2019-07-03 18:42:10 +09:00
Dean Herbert
06ef8f71e9 Fix typo 2019-07-03 18:41:01 +09:00
Dean Herbert
d723998389 Merge remote-tracking branch 'upstream/master' into discoverRulesets 2019-07-03 18:36:37 +09:00
Dean Herbert
62dd89197c Refactor comment slightly 2019-07-03 18:36:04 +09:00
naoey
ccae4ce95e
Fix local beatmap leaderboard displaying scores from all game modes 2019-07-03 14:39:11 +05:30
miterosan
5ecb764cdc Remove whitespaces and lowercase the comments 2019-07-03 10:57:09 +02:00
naoey
9805adc61d
Fix online ScoreInfo having the wrong ruleset 2019-07-03 14:25:59 +05:30
miterosan
43d7f66c5b Add comment about the android ruleset situation. 2019-07-03 10:54:10 +02:00
Dean Herbert
1219bea077
Fix layout of profile top header to match web (#5218)
Fix layout of profile top header to match web
2019-07-03 17:48:18 +09:00
miterosan
ab244d1b7f Only log that the rulesets could not be loaded from a directory. 2019-07-03 10:21:18 +02:00
miterosan
d9e646d9ef Use addRuleset inside loadRulesetFromFile 2019-07-03 09:51:09 +02:00
David Zhao
b2185cd3a2
Merge branch 'master' into buttonsystem-entermode 2019-07-03 15:54:34 +09:00
Dean Herbert
6e308945b1 Fix logo visualisation trying to catch up after being off-screen 2019-07-03 15:22:17 +09:00
Dean Herbert
1189092e20 Remove redundant scale specification 2019-07-03 12:49:16 +09:00
Salman Ahmed
98daaf634a Simplify changes 2019-07-03 06:44:17 +03:00
Dean Herbert
be904512d9
Merge branch 'master' into animated-rank-grades 2019-07-03 12:44:08 +09:00
Dean Herbert
d22a1229cb Remove unnecessary disposal 2019-07-03 12:06:20 +09:00
Dean Herbert
23acddcb56 Rename download buttons to avoid ambiguity 2019-07-03 12:02:35 +09:00
Dean Herbert
466bc7f28a
Merge branch 'master' into watch-replays-4 2019-07-03 11:47:10 +09:00
Salman Ahmed
3f39541cc2 Fade health bar on value change 2019-07-03 05:11:11 +03:00
Salman Ahmed
8b4ef52c13
Revert unnecessary changes 2019-07-03 07:27:24 +03:00
Salman Ahmed
30ec8e031e
Merge branch 'master' into animated-rank-grades 2019-07-03 02:34:08 +03:00
Joehu
a1fb41ea66 Use FillFlowContainer on flag and country 2019-07-02 10:53:52 -07:00
Joehu
d387629e53 Fix layout of profile top header to match web 2019-07-02 10:52:24 -07:00
Dean Herbert
a155cdf5fd
Merge branch 'master' into fix-overlay-presence 2019-07-03 00:51:22 +09:00
Dean Herbert
f9c24f2281 Update framework 2019-07-03 00:35:55 +09:00
miterosan
f1ceea8361 style fixes 2019-07-02 17:25:12 +02:00
Dean Herbert
e1d0d26669 Add a note about local optimisation that may not be required in the future 2019-07-03 00:21:16 +09:00
miterosan
778c36c7d7 Allow discover of rulesets that are already loaded. 2019-07-02 17:05:04 +02:00
Dean Herbert
2fcd428d73
Merge branch 'master' into fix-overlay-presence 2019-07-02 23:40:49 +09:00
Dean Herbert
8e0b5f1622 Fix weird merge conflict 2019-07-02 23:21:13 +09:00
Dan Balasescu
2fafe9a651
Merge branch 'master' into async-beatmap-load 2019-07-02 23:19:10 +09:30
Dean Herbert
7caa6eaed5
Remove all non-transform LogoVisualisation per-frame allocations (#5200)
Remove all non-transform LogoVisualisation per-frame allocations

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-02 22:42:18 +09:00
Dean Herbert
51fe8c3ab6
Add database statistics to GlobalStatistics (#5208)
Add database statistics to GlobalStatistics
2019-07-02 22:42:03 +09:00
Dean Herbert
df12090721
Centralise SocialOverlay's scheduling logic (#5209)
Centralise SocialOverlay's scheduling logic
2019-07-02 22:41:49 +09:00
Dean Herbert
73474826f6
Avoid Intro screen holding references to the intro beatmap (#5211)
Avoid Intro screen holding references to the intro beatmap
2019-07-02 22:41:34 +09:00
Dean Herbert
8d2cb51b8c
Merge branch 'master' into buffer-on-demand 2019-07-02 22:41:17 +09:00
Dean Herbert
089eadb008
Add weak WorkingBeatmap cache (#5163)
Add weak WorkingBeatmap cache

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-02 22:40:47 +09:00
Dean Herbert
e7a7f2f660 Add statistic for count of alive WorkingBeatmaps 2019-07-02 22:39:49 +09:00
Dean Herbert
256a1a4309 Merge remote-tracking branch 'upstream/master' into fix-overlay-presence 2019-07-02 22:33:38 +09:00
Dean Herbert
93511266e5 Fix waves not displaying at all 2019-07-02 22:33:33 +09:00
Dean Herbert
f31d840c13 Dispose previous WorkingBeatmap on change 2019-07-02 22:26:08 +09:00
Dean Herbert
9e33fb35e9 Fix typo 2019-07-02 22:26:08 +09:00
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
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
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
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
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
Roman Kapustin
9037fb59de Make BeatmapOptionsButton insertion cleaner 2019-07-01 18:42:18 +03:00
Roman Kapustin
7bdf737956 Make notification insertion cleaner 2019-07-01 18:41:40 +03:00
Roman Kapustin
0c95dff3d6 Make FlowContainer insertion cleaner 2019-07-01 18:41:08 +03:00
Dean Herbert
313648b869 Update framework 2019-07-02 00:34:43 +09:00
Dan Balasescu
8ef2ab8983
Merge branch 'master' into legacy-skin-hidden-hits-support 2019-07-02 00:04:27 +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
4e54bb3f72 Merge remote-tracking branch 'upstream/master' into venera-900 2019-07-01 22:06:33 +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
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
Dean Herbert
9de4bb3423 Remove all non-transform LogoVisualisation per-frame allocations 2019-07-01 16:12:20 +09:00
HoLLy
79fc143422 Only remove .osk files when importing skin archives 2019-06-30 16:52:39 +02: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
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
naoey
bfcbb47b77
Clean up some more leftover code 2019-06-30 10:56:20 +05:30
iiSaLMaN
c5b3572c28 Add missing details 2019-06-30 08:05:45 +03:00
iiSaLMaN
9498fc2426 Use proper colours for rank background and text 2019-06-30 05:47:52 +03:00
iiSaLMaN
20ad486d53 Scale adjustments 2019-06-30 04:59:33 +03:00
iiSaLMaN
372d90de6a Remove unnecessary assigns 2019-06-30 04:25:47 +03:00
iiSaLMaN
8c5397709b Use drawables instead of textures 2019-06-30 04:20:42 +03: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
naoey
04c467fd81
Add comment 2019-06-29 16:10:16 +05:30
naoey
6c81d57178
Remove hacks for updating model info
- Re-retrieve score from database when presenting scores
2019-06-29 16:08:48 +05:30
naoey
d8f6bbc90e
Disable replay button when replay is unavailable 2019-06-29 12:49:03 +05:30
naoey
7d9e215744
Code quality fixes 2019-06-29 12:29:12 +05:30
naoey
424711d24b
Fix replay button shake container
- Add license headers
- Slightly reduce bottom margin of button in score screen
2019-06-29 12:26:37 +05:30
naoey
f9316bc038
Hack fix for models not updating correctly when added in DB 2019-06-29 11:09:39 +05:30
naoey
bc52f76556
Move replay button to score card 2019-06-29 10:55:30 +05:30
Welsar55
a57218e50e Move to LocalSkinOverride 2019-06-28 20:45:11 -05:00
iiSaLMaN
41597efdf7 Hide health bar in no fail 2019-06-29 04:25:52 +03:00
iiSaLMaN
d37cefbad8 Implement IApplicableToHUD 2019-06-29 04:23:59 +03: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
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
naoey
53d6d74537
Update to match upstream changes 2019-06-28 09:33:13 +05:30
naoey
ab0bb8b678
Implement replay downloading with ArchiveDownloadModelManager 2019-06-28 09:33:13 +05:30
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
HoLLy
12350d18b5 Don't remove imported archives by default 2019-06-27 14:41:11 +02:00
HoLLy
55216dffb7 Merge remote-tracking branch 'origin/master' into import-stable-scores 2019-06-27 14:07:17 +02:00
Dean Herbert
4952fb3716
Merge branch 'master' into fix-toolbar-bar 2019-06-27 19:58:13 +09:00
smoogipoo
a6ee83eac2 Merge remote-tracking branch 'origin/master' into fix-zero-length-sliders 2019-06-27 19:57:21 +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
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
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
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
ef384b8667 Add simple (weak) WorkingBeatmap cache 2019-06-27 14:09:09 +09:00
Dean Herbert
1072431fbb Fix test StackOverflows 2019-06-27 14:08:58 +09:00
Dean Herbert
0bad86f6d9 Merge remote-tracking branch 'upstream/master' into async-beatmap-load 2019-06-27 13:58:59 +09:00
Dean Herbert
8b0aaccfe6 Add finaliser to WorkingBeatmap 2019-06-27 13:56:36 +09:00
smoogipoo
9e2e393ab7 DownloadAllowed -> DownloadEnabled 2019-06-27 13:38:21 +09:00
smoogipoo
c1277b5db2 Test the download button directly for safety 2019-06-27 13:35:14 +09:00
Dean Herbert
f3aab143aa Fix settings subpanels dimming main content 2019-06-27 13:16:16 +09:00
Dean Herbert
3294464bc6 Fix typo in variable 2019-06-27 12:47:05 +09:00
Dean Herbert
a5ccfeb18e Remove unnecessary fill flow 2019-06-27 12:34:22 +09:00
Dean Herbert
be901294f7 Simplify text layout 2019-06-27 12:33:14 +09:00
Dean Herbert
cd6f452bfa Remove weird download button exposure 2019-06-27 12:22:38 +09:00
Dean Herbert
c49b8b1883 Remove accidental change 2019-06-27 12:19:49 +09:00
Dean Herbert
a4929f19e5 Adjust background colour of non-loaded beatmap set cover to play better with black foreground elements 2019-06-27 12:17:28 +09:00
Dean Herbert
32c3bee71b Avoid public exposure 2019-06-27 12:11:04 +09:00
Dean Herbert
cc9a7839c9 Fix layout regression 2019-06-27 12:04:01 +09:00
Dean Herbert
d6da21b0f0 Tidy up fetch methods
Anonymise some test data further
2019-06-27 12:00:31 +09:00
Dean Herbert
375a6f406d Merge remote-tracking branch 'upstream/master' into not-available-to-download 2019-06-27 11:44:41 +09:00
Dean Herbert
322d92d3e0 Rename class to BeatmapAvailability 2019-06-27 11:40:22 +09:00
iiSaLMaN
9ada4d68b1 Make fields protected and expose them in tests 2019-06-26 22:42:34 +03:00
Welsar55
826699a7e7 Remove unneeded bindable 2019-06-26 12:16:44 -05:00
Andrei Zavatski
2e49b4ffcd Update the component with an abstract RulesetSelector class 2019-06-26 18:56:40 +03:00
Andrei Zavatski
e9f3a1ba63 Merge remote-tracking branch 'refs/remotes/ppy/master' into user_profile_modes 2019-06-26 18:31:36 +03:00
Dean Herbert
9edd98efdc Move disposal to end of class 2019-06-27 00:29:38 +09:00
Dean Herbert
768d6c2fb3 ModelInfo -> Model 2019-06-27 00:29:09 +09:00
naoey
8efc504817
Post merge fixes 2019-06-26 18:22:37 +05:30
naoey
f3a84de7b5
Merge remote-tracking branch 'upstream/master' into generic-download-tracking-composite 2019-06-26 18:17:53 +05:30
Dean Herbert
c34f6180e6
Merge branch 'master' into generic-download-model-manager 2019-06-26 20:37:56 +09:00
Dean Herbert
da65658bc3 Fix comments 2019-06-26 20:07:01 +09:00
David Zhao
4510c868f4 Remove selector toggling logic for now 2019-06-26 19:39:47 +09:00
Dean Herbert
6812eccdd1
Fix MusicController holding references to beatmaps while inacti… (#5158)
Fix MusicController holding references to beatmaps while inactive
2019-06-26 19:30:16 +09:00
David Zhao
e92c1ca009 Fix styling, private tabClosed, remove type check 2019-06-26 19:25:54 +09:00
Dan Balasescu
f06aabad5f
Merge branch 'master' into toolbar-rulesets-refactor 2019-06-26 18:33:45 +09:00
smoogipoo
6ce86e6083 General refactoring 2019-06-26 17:52:25 +09:00
David Zhao
a1a0a9ee6b
Merge branch 'master' into selector-hiding 2019-06-26 17:45:05 +09:00
smoogipoo
cb65fc6317 Don't throw exception for non-existent files 2019-06-26 17:23:12 +09:00
smoogipoo
15b140b2ee Shortcut checking for whether directories are files 2019-06-26 17:10:22 +09:00
Welsar55
7dd1479050 Add combobreak sound 2019-06-26 00:20:33 -05:00
Dean Herbert
2707a7179e Fix MusiController holding references to beatmaps while inactive 2019-06-26 13:18:03 +09:00
Dean Herbert
1eda4e0dd4 Merge remote-tracking branch 'upstream/master' into generic-download-model-manager 2019-06-26 12:21:04 +09:00
David Zhao
6c8cc9728f fix channel selector not being closed 2019-06-26 12:00:58 +09:00
Dean Herbert
9e1cb90dd8 Remove existing argument for ItemAdded event
For all usages, it looks like this was unnecessary.
2019-06-26 11:40:41 +09:00
Dan Balasescu
6063e7a69f
Merge branch 'master' into one-hit-screen 2019-06-26 11:34:54 +09:00
Salman Ahmed
eaf6f6891d
Rename to DownloadButtonsContainer 2019-06-26 05:22:08 +03:00
Salman Ahmed
f4e765cf99
Merge branch 'master' into not-available-to-download 2019-06-26 05:13:58 +03:00
Albert Tang
3cf2ffc1a7
Merge branch 'master' into android 2019-06-25 17:54:23 -05:00
Dean Herbert
446fbce81c Add base class for startup screens
Avoids missing adding changes to screens like Disclaimer, which may not be shown in debug builds.
2019-06-26 01:36:17 +09:00
naoey
c476e46a8e
Remove unnecessary private methods and inline used-once code 2019-06-25 21:16:30 +05:30
Dean Herbert
40cf573368 Fix pause not correctly showing pause screen 2019-06-25 23:15:58 +09:00
Dean Herbert
983cabdb98 Disallow back button on disclaimer screen 2019-06-25 22:27:50 +09:00
naoey
6f5fbd7ea1
Remove unnecessary try-catch block 2019-06-25 18:28:59 +05:30
naoey
9d88295ece
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager 2019-06-25 18:27:16 +05:30
Dean Herbert
7d5554c2ac
Re-use the back button game-wide (#5149)
Re-use the back button game-wide

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-25 20:50:28 +09:00
Dean Herbert
f9dad0f640 Merge remote-tracking branch 'upstream/master' into gamewide-backbutton 2019-06-25 20:23:49 +09:00
Dean Herbert
f51be4c4fe Adjust transitions a tad 2019-06-25 20:23:34 +09:00
Andrei Zavatski
bae0258d8d Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-25 14:16:05 +03:00
Dean Herbert
75b78d5e27
Reduce size of dropdown chevron (#5150)
Reduce size of dropdown chevron

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-06-25 20:05:52 +09:00
Dean Herbert
28cfccbd64
Use OsuScrollContainer for osu menus (#5094)
Use OsuScrollContainer for osu menus

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-25 20:05:09 +09:00
Dan Balasescu
7794fab7c9
Merge branch 'master' into reduce-dropdown-chevron-size 2019-06-25 19:58:37 +09:00
Dan Balasescu
0f31d17129
Merge branch 'master' into reduce-background-brightness 2019-06-25 19:45:15 +09:00
Dean Herbert
a3de369c20 Reduce size of dropdown chevron 2019-06-25 19:32:00 +09:00
Dean Herbert
8c02709d74
Merge branch 'master' into fix-dropdown-styling 2019-06-25 19:28:37 +09:00
Dean Herbert
445660d066
Merge pull request #5148 from peppy/update-framework
Update framework
2019-06-25 19:28:17 +09:00
Dan Balasescu
c6965a40dc
Merge branch 'master' into reduce-background-brightness 2019-06-25 19:18:28 +09:00
Dan Balasescu
47974ca854
Merge branch 'master' into beatmap-overlay-load 2019-06-25 19:05:17 +09:00
Dan Balasescu
ffcd3529a6
Merge branch 'master' into cancel-api-callback 2019-06-25 18:43:33 +09:00
smoogipoo
aa81c95f30 Remove unnecessary extra property 2019-06-25 18:38:14 +09:00
Dean Herbert
fe290ead63 Update framework 2019-06-25 18:38:11 +09:00
smoogipoo
5b294ba419 Adjust backbutton animation 2019-06-25 18:33:35 +09:00
smoogipoo
531b107a98 Exit match before exiting multiplayer 2019-06-25 18:33:26 +09:00
smoogipoo
1a26608ba9 Close mod select before exiting song selection 2019-06-25 18:33:21 +09:00
smoogipoo
d9927204f8 Relieve OsuScreen of back button input duties 2019-06-25 18:33:18 +09:00
smoogipoo
f53d2fbe76 Scale backbutton along with screens 2019-06-25 18:33:13 +09:00
smoogipoo
8c96e4c1fa Move back button to OsuGame 2019-06-25 18:33:08 +09:00
Dean Herbert
7bc7df2249 Reduce background brightness at PlayerLoader 2019-06-25 17:22:10 +09:00
Dean Herbert
93b6d5b7e3 Fix keybindings being offset 2019-06-25 17:16:19 +09:00
Dean Herbert
ba2f22be47 Improve loading state of BeatmapSet header 2019-06-25 14:47:29 +09:00
Dean Herbert
90acc9b6ca Avoid calling api request callback after user cancel 2019-06-25 13:52:43 +09:00
smoogipoo
fb94cd43a4 Remove unnecessary local item storage in SettingsDropdown 2019-06-25 12:00:05 +09:00
Dean Herbert
cc1e67dc6c
Merge branch 'master' into fix-avatar-display-update-2 2019-06-25 10:18:46 +09:00
jorolf
4d8f49b9bc update code to work with https://github.com/ppy/osu-framework/pull/2568 2019-06-24 23:17:07 +02:00
Andrei Zavatski
b7d15982d7 Remove useless parentheses 2019-06-24 23:30:35 +03:00
Andrei Zavatski
4a05c560cf Remove unwanted class and move the bind logic outside the RulesetSelector 2019-06-24 23:13:28 +03:00
Andrei Zavatski
9dedd62d9a Revert a hotfix in multi screen
since it's been fixed in a framework
2019-06-24 22:57:18 +03:00
Andrei Zavatski
35516e7304 Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-24 22:52:24 +03:00
HoLLy
236d5a9abc Remove leftover TransformDuration overrides 2019-06-24 18:26:25 +02:00
HoLLy
739077ef4f Only hide UpdateableAvatar/Flag immediately 2019-06-24 18:24:31 +02:00
HoLLy
7734c4b41a Fix code style 2019-06-24 18:09:42 +02:00
Dean Herbert
6a541d9a10
Merge branch 'master' into user_profile_modes 2019-06-25 00:59:51 +09:00
Dean Herbert
c0b5153094
Merge branch 'master' into music-effect-arrow-keys-hover 2019-06-24 21:49:45 +09:00
Dean Herbert
88b182ab3f
Merge branch 'master' into generic-download-model-manager 2019-06-24 18:35:58 +09:00
Dean Herbert
f91467eddc Fix licence header 2019-06-24 18:34:23 +09:00
Dean Herbert
bd2f34a102
Merge branch 'master' into quickEscape 2019-06-24 18:21:39 +09:00
Dean Herbert
2ea5165803 Change case to match; change hotkey to be more globally usable (previous has conflict on macOS) 2019-06-24 18:19:17 +09:00
Dean Herbert
fad1ced1b5 Add correct conditionals to allow exit 2019-06-24 18:15:27 +09:00
Dean Herbert
d70248338d Merge remote-tracking branch 'upstream/master' into quickEscape 2019-06-24 18:14:48 +09:00
HoLLy
aed83471f4 Replace Reset with overridden TransformImmediately/TransformDuration 2019-06-24 10:51:45 +02:00
Dean Herbert
2473a9487a Add missing using 2019-06-24 17:38:11 +09:00
Dean Herbert
6e2138491b
Merge branch 'master' into useroverlay-tabs 2019-06-24 17:27:47 +09:00
Dean Herbert
1830362337 Move task out of ctor to avoid initialisation ordering issues 2019-06-24 17:10:50 +09:00
Dean Herbert
36d54fdbfc
Merge branch 'master' into skinnable-sprite 2019-06-24 16:33:17 +09:00
Dean Herbert
06eaba766b Move method below ctor 2019-06-24 15:27:46 +09:00
Dean Herbert
9593e66a96 Add some more xmldoc 2019-06-24 15:25:01 +09:00
Dan Balasescu
18d64df0c4
Merge branch 'master' into add-numberbox 2019-06-24 15:22:30 +09:00
Dean Herbert
3f22c0a311 Add SkinnableSprite implementation 2019-06-24 15:17:35 +09:00
Joehu
7ac6558f59 Allow controlling music and effect volume by arrow keys when hovering 2019-06-23 22:53:02 -07:00
Dan Balasescu
5f05b9ac0b
Merge branch 'master' into async-beatmap-load 2019-06-24 14:24:07 +09:00
Dean Herbert
6d864cb47e Load beatmap content asynchronously in the background 2019-06-24 13:38:30 +09:00
Dan Balasescu
00a2aa7881
Merge branch 'master' into useroverlay-overall-improvements 2019-06-24 13:28:17 +09:00
smoogipoo
5272b3a929 Use .Darken() instead of hex-based colour 2019-06-24 13:27:58 +09:00
Dean Herbert
1057301322
Fix multiplayer create button appearing in match song selection (#5132)
Fix multiplayer create button appearing in match song selection
2019-06-24 12:31:39 +09:00
smoogipoo
8d6fc3edf0 Fix multiplayer create button appearing in match song selection 2019-06-24 11:54:41 +09:00
Dean Herbert
c988dfbdaa Make things a bit more sensible 2019-06-24 11:43:34 +09:00
Andrei Zavatski
bbdb114f04 Add missing blank line 2019-06-24 02:09:00 +03:00
Andrei Zavatski
35db20a337 Remove useless bindable check 2019-06-24 02:01:00 +03:00
Andrei Zavatski
94e819578e Finally fix the problem when we can't apply a ruleset in the multi screen
because it's disabled
2019-06-24 01:55:35 +03:00
Andrei Zavatski
60ff497add Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor 2019-06-24 01:06:54 +03:00
mulraf
dfb791ed3e Update PopupDialog.cs
Changed Spacings
2019-06-23 22:59:14 +02:00
mulraf
7bbd6b810f Update PopupDialog.cs
New here, i never really programmed on a big project like this. It looks kinda makeshift and i hope it doesn't cause any other issues but i've seen nothing and it fixed the issue for me. It was all dialog boxes that got cut off at the top (so also deleting all beatmaps etc.)
2019-06-23 20:33:43 +02:00
Andrei Zavatski
8430ac6d1c remove unused using 2019-06-23 19:19:36 +03:00
Andrei Zavatski
1c20df780a Adjust triangles colour 2019-06-23 17:08:18 +03:00
Andrei Zavatski
4963d4e8df CI fixes 2019-06-22 03:08:18 +03:00
Andrei Zavatski
3723ea05de Adjust Title style 2019-06-22 02:52:07 +03:00
Andrei Zavatski
4cd3b15f6e Add triangles 2019-06-22 02:40:33 +03:00
Andrei Zavatski
dbf53e9bda Use correct background colour for sections 2019-06-22 02:06:30 +03:00
Andrei Zavatski
132cb8f473 Add spacing between sections 2019-06-22 01:11:04 +03:00
HoLLy
f072a53e93 Merge remote-tracking branch 'origin/master' into import-stable-scores 2019-06-21 17:42:59 +02:00
HoLLy
d99f4d1a87 Change import button to mention replays instead of scores 2019-06-21 17:42:54 +02:00
HoLLy
802da225d4 Move responsibility for selecting paths to model managers 2019-06-21 17:32:47 +02:00
Joehu
36f59ec86d Remove unused using 2019-06-21 08:29:45 -07:00
Joehu
74e99b2915 Remove unused parameter 2019-06-21 08:11:10 -07:00
Joehu
1d6b6a7828 Fix audio being dimmed on preview tracks 2019-06-21 08:06:57 -07:00
HoLLy
f1f03dd541 Remove async from Import method 2019-06-21 17:01:11 +02:00
HoLLy
fafec00667 Reset top score avatar before updating it 2019-06-21 16:47:19 +02:00
iiSaLMaN
bd842f2a8c
Update tooltip text 2019-06-21 16:38:16 +03:00
Dean Herbert
3ad74e2ff3
Merge branch 'master' into update-framework 2019-06-21 22:24:57 +09:00
Dean Herbert
ca2a3937ea
Fix audio not dimming after race condition (#5049)
Fix audio not dimming after race condition
2019-06-21 22:24:36 +09:00
Dean Herbert
859afefb79
Prevent non-combo affecting judgements from triggering sudden death (#5095)
Prevent non-combo affecting judgements from triggering sudden death
2019-06-21 22:24:00 +09:00
Unknown
1bc1e2459e add SettingsNumberBox and use it in tournament tools 2019-06-21 15:04:52 +02:00
Unknown
16a4805f1f add OsuNumberBox with basic tests 2019-06-21 15:04:52 +02:00
KingLuigi4932
13f6c6a87e Update framework 2019-06-21 15:23:35 +03:00
Dean Herbert
cff5ddb137
Merge branch 'master' into fix-inactive-audio-race 2019-06-21 21:09:12 +09:00
Dean Herbert
f766068e17
Remove local implementation of bindable in OsuCheckbox (#5046)
Remove local implementation of bindable in OsuCheckbox
2019-06-21 21:08:09 +09:00
Dean Herbert
763e000bf1
Merge branch 'master' into not-available-to-download 2019-06-21 20:54:35 +09:00
Dean Herbert
abd0c2bb1a
Move NotificationSection strings to constructor (#5078)
Move NotificationSection strings to constructor
2019-06-21 20:47:31 +09:00
iiSaLMaN
0cc7a604ed
Update font sizes 2019-06-21 14:18:20 +03:00
iiSaLMaN
a1c58b164c
Merge branch 'master' into not-available-to-download 2019-06-21 14:16:31 +03:00
Andrei Zavatski
29305ca0eb fix broken layout 2019-06-21 13:24:12 +03:00
Andrei Zavatski
7680f6cbf4 Merge remote-tracking branch 'refs/remotes/ppy/master' into useroverlay-tabs 2019-06-21 13:06:44 +03:00
Dan Balasescu
67246eddd4
Merge branch 'master' into fix-chat-test-scene 2019-06-21 16:34:35 +09:00
Dan Balasescu
681a123560
Merge branch 'master' into add-spacing-user-profile-ranks 2019-06-21 16:06:49 +09:00
Dean Herbert
ae084157e4
Add tournament streaming and management toolchain (#3491)
Add tournament streaming and management toolchain
2019-06-21 16:02:35 +09:00
Dean Herbert
6627cdefd2
Merge branch 'master' into tournament-tools 2019-06-21 15:52:47 +09:00
Dean Herbert
540b61da0a Add some spacing between user profile ranks 2019-06-21 15:27:19 +09:00
Dean Herbert
5ed6c09aa9
Merge branch 'master' into key-binding-fixes 2019-06-21 15:12:37 +09:00
Dean Herbert
6c5599f874 Fix chat being dismissed in test scene when it shouldn't 2019-06-21 15:09:54 +09:00
Dean Herbert
666d5744cd Fix unbinding not working correctly 2019-06-21 14:43:00 +09:00
David Zhao
de59e038ac Prevent non-combo affecting judgements from triggering sudden death 2019-06-21 14:29:16 +09:00
Dan Balasescu
c79c4641f3
Merge branch 'master' into use-modelbackeddrawable 2019-06-21 14:26:07 +09:00
Dean Herbert
a6e5c6a62a Add cancel/clear buttons in place of instructional text 2019-06-21 13:50:05 +09:00
Dan Balasescu
73d307114f
Merge branch 'master' into notification-overlay-always-present 2019-06-21 13:12:04 +09:00
Dan Balasescu
cbc1eff8f1
Merge branch 'master' into chat-async-improvements 2019-06-21 12:59:58 +09:00
Dan Balasescu
8ab7a8641b
Add comment for why it's not a fill flow 2019-06-21 12:42:35 +09:00
Dan Balasescu
0571bbd555
Merge branch 'master' into carousel-gradient 2019-06-21 12:40:24 +09:00
smoogipoo
7054f54a64 Use OsuScrollContainer for osu menus 2019-06-21 12:33:49 +09:00
Dan Balasescu
61d8cb628a
Merge branch 'master' into music-controller-always-present 2019-06-21 11:57:36 +09:00
Dan Balasescu
6deee968ac
Merge branch 'master' into modselect-async-improvements 2019-06-21 11:42:25 +09:00
Dan Balasescu
4d02e17539
Merge branch 'master' into remove-debug-utils 2019-06-21 11:10:59 +09:00
KingLuigi4932
13578e5c21 Add the null conditional operator back 2019-06-20 19:43:31 +03:00
KingLuigi4932
d754819453 Small changes 2019-06-20 19:09:40 +03:00
Dean Herbert
fa263b91a7 Attempt to fix tests 2019-06-21 00:12:39 +09:00
Dean Herbert
f2200594c9 Remove necessity for MusicController to be always visible 2019-06-20 23:40:25 +09:00
Dean Herbert
52ca5f9c00 Fix mod icons in ModSelect being loaded in a blocking fashion 2019-06-20 23:06:07 +09:00
Dean Herbert
74fabf8db4 Improve ChatOverlay load behaviour 2019-06-20 23:02:02 +09:00
Dean Herbert
4a25a84975 Fix DrawableChannel async flow 2019-06-20 23:01:39 +09:00
Dean Herbert
4ef165fdac Fix ChatLine not being correctly loaded asynchronously 2019-06-20 23:01:02 +09:00
Dean Herbert
21a1fd738b Remove the necessity for NotificationOverlay to always be present
Now it will only become present when there is a pending notification.
2019-06-20 19:06:21 +09:00
Dean Herbert
9a663715cd Make get methods of ProgressNotification return correct values immediately
Previously they were only updated after the resultant schedule ran. This would not bode well when the overlay containing them is not present.
2019-06-20 19:05:33 +09:00
Dean Herbert
6bc2cf85d1 Move NotificationSection strings to constructor 2019-06-20 17:41:12 +09:00
David Zhao
65c84428cc Fix position of gradient in beatmap carousel 2019-06-20 15:05:15 +09:00
Joehu
ca919f02e6 Remove bad words on code comments 2019-06-19 21:33:58 -07:00
Dean Herbert
97d65783db Remove osu!-side DebugUtils 2019-06-20 12:48:45 +09:00
Dean Herbert
133c1fc0f1
Merge branch 'master' into remove-osu-checkbox-bindable 2019-06-20 11:33:39 +09:00
Dean Herbert
7482ecb8e7
Fix beatmap set cover goes out of its container (#5073)
Fix beatmap set cover goes out of its container
2019-06-20 11:21:22 +09:00
Andrei Zavatski
0da8a483c5 Fix scores header is visible even if no scores are loaded 2019-06-19 23:14:53 +03:00
HoLLy
99f1a94797 Fix notification progress bar 2019-06-19 20:50:50 +02:00
HoLLy
c1c19243cd Change FirstOrDefault back to First 2019-06-19 20:40:30 +02:00
HoLLy
8d62ce8967 Remove now unneeded check against file extension 2019-06-19 20:38:43 +02:00
HoLLy
0cb66d522a Check if path can be imported before trying 2019-06-19 20:36:00 +02:00
iiSaLMaN
ee2268caba
Enable masking for the beatmap set cover 2019-06-19 21:20:00 +03:00
HoLLy
ef2e93d5c7 Improve handling of null models when importing 2019-06-19 19:29:47 +02:00
KingLuigi4932
5f5441c692 Add ShowPlaceholderOnNull in updateable flag + do not show placeholders in some overlays 2019-06-19 20:17:02 +03:00
iiSaLMaN
865af00ab6
Merge branch 'master' into header-improvements 2019-06-19 20:00:28 +03:00
Dean Herbert
08cf8dd299 Adjust for readability 2019-06-20 01:39:54 +09:00
Dean Herbert
2773cfba42
Merge branch 'master' into andy840119/_20190614_hidden_nod_label_when_empty 2019-06-20 01:35:24 +09:00
HoLLy
15c75b4442 Add basic score import from stable 2019-06-19 18:33:51 +02:00
Dean Herbert
6f3cb80076
Merge branch 'master' into fix-inactive-audio-race 2019-06-20 01:33:47 +09:00
KingLuigi4932
9f25d3cd72 More changes and improvements 2019-06-19 17:55:36 +03:00
iiSaLMaN
3e285e5dde
Separate beatmap info container from details (avoid overlapping) 2019-06-19 17:47:47 +03:00
iiSaLMaN
15229f3a23
Make header expandable 2019-06-19 17:45:39 +03:00
iiSaLMaN
5fb4f2fadf
Add TOP_PADDING 2019-06-19 17:38:43 +03:00
naoey
4b46601eae
Remove redundant variable, handle all request failures 2019-06-19 19:43:09 +05:30
KingLuigi4932
a6c268ef5c Move the horizontal margin into the sprite text itself 2019-06-19 15:05:53 +03:00
KingLuigi4932
475b40cc02 Remove empty line 2019-06-19 14:47:29 +03:00
KingLuigi4932
4600336581 Use TextFlowContainer + small changes 2019-06-19 14:43:18 +03:00
Andrei Zavatski
17749e84f9 Merge remote-tracking branch 'refs/remotes/ppy/master' into user-online-fix 2019-06-19 12:17:31 +03:00
Andrei Zavatski
1c44fa84fb Fix colour issues 2019-06-19 12:15:32 +03:00
Andrei Zavatski
c8604b2c17 Merge remote-tracking branch 'refs/remotes/ppy/master' into useroverlay-tabs 2019-06-19 12:08:34 +03:00
Dean Herbert
dd926f55bd Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-19 14:55:34 +09:00
Dean Herbert
3043f42eb5
Merge branch 'master' into fix-multiplayer-audio 2019-06-19 14:36:05 +09:00
Dean Herbert
b51aad7433
Merge branch 'master' into fix-multiplayer-audio 2019-06-19 13:36:25 +09:00
Dean Herbert
f26fe53feb Fix startup crash if main menu does not load fast enough 2019-06-19 13:16:19 +09:00
Dean Herbert
6426983de0 Move logic out of update (and simplify, hopefully) 2019-06-19 13:15:58 +09:00
Dean Herbert
fbd9ebf02d
Merge pull request #5054 from peppy/settings-item-unbind-previous-bindable
Unbind from previous bindable when rebinding a SettingsItem
2019-06-19 13:09:19 +09:00
Dean Herbert
26c32ceeb1
Merge branch 'master' into generic-download-model-manager 2019-06-19 12:50:54 +09:00
Dan Balasescu
aef29e2767
Merge branch 'master' into remote-unused-property 2019-06-19 11:18:12 +09:00
KingLuigi4932
6e28294182 Fix another test 2019-06-19 04:27:31 +03:00
KingLuigi4932
97dd34e26c Seperate updateable from drawable 2019-06-19 03:50:16 +03:00
KingLuigi4932
3876442143 More simplifies + fix test 2019-06-19 03:37:08 +03:00
KingLuigi4932
a0609f28d7 Revert some changes + simplify BeatmapNotAvailable 2019-06-19 01:43:28 +03:00
iiSaLMaN
5278c5f365
Merge branch 'master' into not-available-to-download 2019-06-19 01:14:32 +03:00
Dean Herbert
bc8ce5d188
Merge branch 'master' into use-modelbackeddrawable 2019-06-19 06:27:36 +09:00
Andrei Zavatski
2fb1052a1e Add missing space 2019-06-18 21:04:36 +03:00
KingLuigi4932
a5adc89839 Update framework 2019-06-18 20:37:56 +03:00
Dean Herbert
1bcff8a3e2 Make generic covariant 2019-06-19 01:57:38 +09:00
Dean Herbert
341dc74834 Simplify download method 2019-06-19 01:41:19 +09:00
Dean Herbert
f2e0ced052 Move private event handling logic to bottom of class 2019-06-19 01:32:37 +09:00
Dean Herbert
d65c20bbdc
Merge branch 'master' into generic-download-model-manager 2019-06-19 01:29:06 +09:00
Andrei Zavatski
03d560ed41 Initial implementation 2019-06-18 19:13:21 +03:00
Andrei Zavatski
3c3757f12e Make ProfileTabControl based on OverlayTabControl 2019-06-18 16:23:57 +03:00
Andrei Zavatski
a7306248d1 Implement OverlayTabControl class
An abstraction for OverlayHeaderTabControl
2019-06-18 16:20:35 +03:00
Shane Woolcock
17d103181c Merge branch 'master' into android 2019-06-18 20:05:14 +09:30
Dean Herbert
4911bf1157 Revert unnecessary changes to APIBeatmap 2019-06-18 18:03:16 +09:00
Dean Herbert
6823ba1ab0 Unbind from previous bindable when rebinding a SettingsItem 2019-06-18 14:24:44 +09:00
Dean Herbert
5bb8649f3b Remove unused property from chat message 2019-06-18 14:22:59 +09:00
Dean Herbert
07ea0f9755 Make OsuButton non-abstract again 2019-06-18 14:16:54 +09:00
Dean Herbert
40eb6f4986 Undo ordering change to OsuFont 2019-06-18 14:15:22 +09:00
Dean Herbert
584113997a Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-18 14:15:06 +09:00
Andrei Zavatski
413c2158e2 Simplify bindables usage 2019-06-18 01:11:05 +03:00
Andrei Zavatski
c95e3da3ec Implement a BindableRulesetSelector 2019-06-18 00:23:00 +03:00
Andrei Zavatski
cecbcd21b2 Merge remote-tracking branch 'upstream/master' into toolbar-rulesets-refactor 2019-06-17 23:12:55 +03:00
KingLuigi4932
d6a39b8a2a Fix CI issues + slight change 2019-06-17 22:33:27 +03:00
KingLuigi4932
fec0db8fe1 Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar 2019-06-17 21:55:07 +03:00
KingLuigi4932
d665f1fe4b Seperate drawable and updateable flag from Country + Use UpdateableFlag 2019-06-17 20:57:57 +03:00
KingLuigi4932
794ba17a2f Seperate UpdateableRank from DrawableRank and use it 2019-06-17 20:04:09 +03:00
Dean Herbert
c32d17d16a Fix audio not dimming after race condition
Also adjusts transition slightly for smoother effect.
2019-06-18 01:32:52 +09:00
Lucas A
04dc1c1744
Fix typo in comment
Co-Authored-By: Joseph Madamba <madamba.joehu@outlook.com>
2019-06-17 16:44:53 +02:00
Dean Herbert
3a04684efb Add region 2019-06-17 23:25:16 +09:00
Dean Herbert
ad4c9babe7 Adjust naming and transitions 2019-06-17 23:24:52 +09:00
iiSaLMaN
0c299d651f
Merge branch 'master' into use-modelbackeddrawable 2019-06-17 17:06:10 +03:00
Dean Herbert
26d5c2d85a Remove local implementation of bindable in OsuCheckbox 2019-06-17 19:37:24 +09:00
Lucas A
d7d6feb001 Fade volume in / out when game window becomes active / inactive 2019-06-17 12:31:23 +02:00
Dean Herbert
b259710a62 Merge remote-tracking branch 'upstream/master' into tournament-tools 2019-06-17 19:30:17 +09:00
Dean Herbert
84a0b948e1 Fix typo in VersionNavigation class name 2019-06-17 16:32:38 +09:00
iiSaLMaN
3087099b32
Use ModelBackedDrawable in DrawableRank 2019-06-17 07:34:35 +03:00
iiSaLMaN
4cb9563af2
Use ModelBackedDrawable in UpdateableAvatar 2019-06-17 07:16:38 +03:00
iiSaLMaN
98f8b1d59a
Use ModelBackedDrawable in DrawableFlag 2019-06-17 06:44:24 +03:00
smoogipoo
c1d2fff651 Use RestartPoint 2019-06-17 12:44:19 +09:00
smoogipoo
bc35a30a25 Fix audio being dimmed during multiplayer 2019-06-17 12:27:53 +09:00
andy840119
4e85481fd4 Merge branch 'master' of https://github.com/ppy/osu into andy840119/_20190614_hidden_nod_label_when_empty 2019-06-16 13:27:15 +09:00
andy840119
84b4e877f8 using FadeTo instead of show/hide
headerLabel.FadeTo() is still remain because effect can be visible when expand== true
2019-06-16 13:27:01 +09:00
Joehu
1a9efb3d7a Fix editor play button 2019-06-15 11:05:58 -07:00
smoogipoo
d693b2a329 Fix multiplayer score submission failing silently 2019-06-16 00:31:14 +09:00
smoogipoo
2e7922c3f9 Fix 0-length sliders not getting correct lengths 2019-06-15 23:53:28 +09:00
Dean Herbert
d7bea3aa18 Update framework 2019-06-15 19:38:05 +09:00
Dean Herbert
38616a2bb5
Merge branch 'master' into fix-beatmapoverlay-graphs 2019-06-15 18:37:01 +09:00
naoey
4a16ac53ba
Remove extra newline 2019-06-15 12:28:23 +05:30
Dean Herbert
7d49028a60
Merge branch 'master' into change-download-extension 2019-06-15 15:37:19 +09:00
Dean Herbert
4882283084
Merge branch 'master' into generic-download-model-manager 2019-06-15 15:35:08 +09:00
Dean Herbert
2b48f5d3e0 Tidy up updateMetrics flow 2019-06-15 14:45:51 +09:00
andy840119
1a73178260 using FadeTo() instead of FadeIn()/FadeOut() 2019-06-15 13:28:03 +08:00
Dean Herbert
587edcb716
Merge branch 'master' into fix-beatmapoverlay-graphs 2019-06-15 13:42:13 +09:00
Dean Herbert
0ca33e16dd Update framework 2019-06-14 23:25:29 +09:00
Dean Herbert
1b75fbed9a Merge remote-tracking branch 'upstream/master' into update-scrollcontainer 2019-06-14 23:25:17 +09:00
Dean Herbert
cf713fbacc
Merge branch 'master' into fix-stacking-shaking 2019-06-14 22:16:35 +09:00
Dean Herbert
bc574520bf Update ScrollContainer usages in line with framework changes 2019-06-14 15:55:32 +09:00
Dean Herbert
15b9b53d35 Fix IconButtons not being scaled correctly 2019-06-14 13:40:32 +09:00
為什麼
9114c8dee7 remve unnecessary effect. 2019-06-14 11:44:03 +08:00
為什麼
0db9816321 expanded -> expand 2019-06-14 11:23:41 +08:00
為什麼
c30e467717 oops 2019-06-14 11:12:30 +08:00
andy840119
3a14794c43 use show/hide instead because FillFlowContainer's spacing 2019-06-14 01:43:20 +09:00
andy840119
4f0aff3d9c hide label when mod is empty 2019-06-14 01:12:56 +09:00
naoey
3c2a2b2390
Move doc to interface 2019-06-13 21:28:32 +05:30