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
