Joehu
1342556894
Allow ctrl tabbing navigation to chat and song select leaderboards
2019-12-21 10:48:11 -08:00
Andrei Zavatski
14a77a8f16
Improve animations
2019-12-21 16:08:28 +03:00
Andrei Zavatski
b61aa660c6
Move colours to HitErrorMeter class
2019-12-21 14:52:53 +03:00
Andrei Zavatski
5e3c3f2a90
Make judgements work
2019-12-21 14:30:41 +03:00
Andrei Zavatski
5b115d8d8a
Implement basic logic
2019-12-21 13:41:50 +03:00
Andrei Zavatski
c69e88eb97
Add more types to dropdown
2019-12-21 13:32:25 +03:00
Salman Ahmed
ff5e6c0dcf
Make DefaultComboColours a property
2019-12-21 12:36:34 +03:00
Salman Ahmed
55be4478aa
Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours
2019-12-21 12:36:09 +03:00
Willy Tu
8e60ae7039
Removed directive is not required
2019-12-20 15:45:20 -08:00
Willy Tu
8353c893c0
Update BodyText of LocalScoreDeleteDialog
2019-12-20 12:00:10 -08:00
unknown
1bd44529dd
add full-stop to mod description for consistency
2019-12-20 18:31:16 +08:00
unknown
08b477ed52
make ModDifficultyAdjust abstract
2019-12-20 18:30:23 +08:00
Willy Tu
ad41a5cc57
Merge branch 'master' of github.com:ppy/osu into #7146
2019-12-20 02:14:01 -08:00
Dean Herbert
a6bdf04f6b
Remove unused using
2019-12-20 18:36:39 +09:00
Dean Herbert
822903d5db
Update song select statistics when mod changes settings
2019-12-20 18:01:35 +09:00
smoogipoo
1802e0ff11
Fix storyboard incorrectly re-ordering elements
2019-12-20 16:04:05 +09:00
Willy Tu
2769ddb3bb
Merge branch 'master' of github.com:ppy/osu into #7146
2019-12-19 22:23:13 -08:00
Dean Herbert
1451f06739
Fix key overlay appearing regardless of the setting ( #7289 )
...
Fix key overlay appearing regardless of the setting
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-12-20 15:09:02 +09:00
Willy Tu
6ccacab0bc
Merge branch 'master' into #7146
2019-12-19 22:05:16 -08:00
Dean Herbert
f66c12a1f3
Add post-update notification for iOS users ( #7300 )
...
Add post-update notification for iOS users
2019-12-20 15:00:19 +09:00
Willy Tu
6abbd33b51
Fixed CI issues
2019-12-19 21:57:14 -08:00
Dan Balasescu
aa2fcbb660
Merge branch 'master' into fix-key-overlay-always-shown
2019-12-20 14:47:20 +09:00
Willy Tu
f9dbebc96c
Merge branch 'master' of github.com:ppy/osu into #7146
2019-12-19 21:30:12 -08:00
Willy Tu
8ab26e8889
Update Tests with dependencies on LeaderboardScore. Added its dependency on DialogOverlay for the tests. Added test for deleting individual local score
2019-12-19 21:29:54 -08:00
Dean Herbert
11214628ad
Add post-update notification for iOS users
2019-12-20 14:02:01 +09:00
Dean Herbert
656c584503
Update RestoreDefaultValueButton when default value changes
2019-12-20 13:59:01 +09:00
Salman Ahmed
7d090d6cd9
Fix key overlay appearing regardless of the setting
2019-12-19 17:52:58 +03:00
Dean Herbert
a3154f2f7b
Update framework
2019-12-19 20:30:58 +09:00
smoogipoo
50fa6c5f77
Update score on reverts
2019-12-19 20:18:23 +09:00
smoogipoo
04c3a6f8a4
Move more properties to the base class
2019-12-19 20:18:17 +09:00
smoogipoo
76f2fb378f
Separate score and health parts of ScoreProcessor
2019-12-19 20:03:14 +09:00
smoogipoo
1da8cc8690
Encapsulate common logic of ScoreProcessor
2019-12-19 19:03:27 +09:00
Willy Tu
d4d4ddc624
Remove new line for CodeFactor
2019-12-18 22:42:26 -08:00
Willy Tu
643911ada9
Fix code format for CI
2019-12-18 22:41:07 -08:00
Willy Tu
1617a9ce80
Merge branch 'master' of github.com:ppy/osu into #7146
2019-12-18 22:39:22 -08:00
Dean Herbert
b1533ae2a9
Fix score serialisation failing for unknown mod properties
2019-12-19 14:58:56 +09:00
Willy Tu
ed07b779b1
Update to use score.ID identify local scores
2019-12-18 21:54:02 -08:00
Willy Tu
27163a5133
Removed unnecessary code for deleting individual local score.
2019-12-18 21:04:10 -08:00
Willy Tu
9ed2dbce8c
Merge branch 'master' of github.com:ppy/osu into #7146
2019-12-18 20:59:29 -08:00
Dean Herbert
c94c803562
Implement local sorting by name and country in SocialOverlay ( #5847 )
...
Implement local sorting by name and country in SocialOverlay
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-19 12:54:02 +09:00
Willy Tu
b67f986058
Fix CodeFactor issues
2019-12-18 19:26:35 -08:00
Willy Tu
531ac16743
Update Scoreboard Refresh Method for deleting individual scores
2019-12-18 19:22:42 -08:00
Willy Tu
d1fcadc700
Merge branch 'master' of github.com:ppy/osu into #7146
2019-12-18 19:16:54 -08:00
Dean Herbert
ada8efb4ab
Merge branch 'master' into fix-storyboard-crash
2019-12-19 11:44:20 +09:00
Dean Herbert
a46602f705
Move cancellation token construction closer to usage
2019-12-19 11:26:22 +09:00
smoogipoo
dd68106d90
Recreate panels only while loading/loaded
2019-12-19 02:21:33 +09:00
smoogipoo
007e2e80c1
Refactor to fix sorting issues
2019-12-19 02:02:57 +09:00
Dan Balasescu
37d7c984bc
Merge branch 'master' into friends-sorting
2019-12-19 01:33:03 +09:00
smoogipoo
f38853d229
Improve performance of storyboard loading
2019-12-19 00:52:50 +09:00
smoogipoo
8d6987c870
Refactor storyboard timeline to reduce GC / fix crashes
2019-12-18 23:59:48 +09:00
smoogipoo
2905a4418d
Fix potential nullref
2019-12-18 21:30:57 +09:00
smoogipoo
cb5a35f8f9
Fix incorrect bindable valuechanged usage
2019-12-18 21:08:49 +09:00
smoogipoo
4e11fb0fd7
Merge remote-tracking branch 'refs/remotes/origin/master' into multiplier-text
2019-12-18 19:36:16 +09:00
smoogipoo
39489e2901
Merge remote-tracking branch 'refs/remotes/origin/master' into fix-editor-movement-crash
2019-12-18 18:51:56 +09:00
smoogipoo
5664ce3109
Add hitobject container regression test
2019-12-18 18:51:12 +09:00
Dean Herbert
ea661fce21
Merge branch 'master' into adjustable-map-settings
2019-12-18 18:44:11 +09:00
Dean Herbert
36172cf2bd
Merge pull request #7175 from LeNitrous/update-beatmap-settings
...
Display current difficulty statistics with mods applied
2019-12-18 18:43:49 +09:00
Dean Herbert
5cdc7d3b18
Merge pull request #7183 from smoogipoo/legacy-beatmap-saving
...
Add initial implementation of a legacy beatmap encoder
2019-12-18 18:43:14 +09:00
Dean Herbert
51a01c7006
Merge pull request #7256 from peppy/remove-ruleset-ctor-param
...
Remove RulesetInfo parameter from Ruleset constructor
2019-12-18 18:42:42 +09:00
Dean Herbert
06287f72f3
Merge pull request #7221 from LeNitrous/nightcore-beats
...
Implement backing beats for Nightcore mods
2019-12-18 18:28:16 +09:00
Dan Balasescu
6683460240
Merge branch 'master' into update-beatmap-settings
2019-12-18 17:59:27 +09:00
Dean Herbert
1f3e1b3085
Remove unused using
2019-12-18 17:59:07 +09:00
smoogipoo
2a128340d0
Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats
2019-12-18 17:58:37 +09:00
smoogipoo
d65e37d795
Fix typo
2019-12-18 17:58:29 +09:00
Dean Herbert
bf85f4affb
Fix editor crashing when loading a beatmap for an unsupported ruleset
2019-12-18 17:53:26 +09:00
Dean Herbert
69f888fc49
Fix storyboard flipping potentially not having an effect ( #7260 )
...
Fix storyboard flipping potentially not having an effect
2019-12-18 17:48:41 +09:00
smoogipoo
8e651962c7
Fix incorrectly binding inside BDL load()
2019-12-18 17:41:30 +09:00
Dean Herbert
4befabc257
Split out complex method
2019-12-18 17:35:51 +09:00
smoogipoo
5aca523d35
Fix storyboard flipping potentially not having an effect
2019-12-18 17:27:13 +09:00
smoogipoo
602ce698d5
Fix storyboard vectorscale and scale cross-pollution
2019-12-18 17:21:38 +09:00
Dean Herbert
fa067b8799
Merge branch 'master' into legacy-beatmap-saving
2019-12-18 17:17:03 +09:00
Dean Herbert
ada2ae2b2c
Use tuple to avoid potential for incorrect display
2019-12-18 17:12:41 +09:00
Dean Herbert
e87aa281bf
Don't clone beatmap unnecessarily
2019-12-18 17:00:35 +09:00
Dean Herbert
7831e6ed33
Implement NewsArticleCover class ( #7192 )
...
Implement NewsArticleCover class
2019-12-18 16:15:23 +09:00
Dean Herbert
6e0802e50c
Remove RulesetInfo parameter from Ruleset constructor
2019-12-18 14:49:09 +09:00
Dean Herbert
f53fd6e4bc
Fix status capitalisation
2019-12-18 14:07:21 +09:00
Dean Herbert
2f5b27e97c
Make user bindables readonly
2019-12-18 14:07:12 +09:00
Dean Herbert
756d847ad8
Fix user not getting an initial status
2019-12-18 14:07:03 +09:00
smoogipoo
df8f8ffd0d
Fix potential exception during removal
2019-12-18 12:03:15 +09:00
wltu
4646524bf9
Remove unnecessary library
2019-12-17 13:18:20 -08:00
wltu
8aeef3f59a
Added refresh scoreboard upon deleting local score and formatted the code
2019-12-17 12:56:30 -08:00
wltu
bb2b1475cd
Merge branch 'master' of https://github.com/ppy/osu into #7146
2019-12-17 12:54:47 -08:00
Lucas A
0a278ef943
Apply review suggestions
2019-12-17 19:23:30 +01:00
smoogipoo
bcc19e29f2
Fix editor crashing after re-ordering objects
2019-12-18 02:56:29 +09:00
Dean Herbert
036efb9947
Merge branch 'master' into fix-effect-points
2019-12-18 01:43:15 +09:00
Dean Herbert
886db8eb22
Merge branch 'master' into fix-local-score-availability
2019-12-18 01:15:20 +09:00
Dean Herbert
4443d2196b
Merge branch 'master' into legacy-slider-body
2019-12-17 23:42:31 +09:00
Dean Herbert
e0ce87adca
Move CreateScoreProcessor() to Ruleset ( #7244 )
...
Move CreateScoreProcessor() to Ruleset
2019-12-17 22:15:42 +09:00
Dan Balasescu
3d13fe485d
Merge pull request #7238 from huoyaoyuan/fxcop
...
Apply FxCop at game side
2019-12-17 21:29:52 +09:00
Dan Balasescu
fd2785bab3
Merge branch 'master' into fxcop
2019-12-17 20:14:45 +09:00
smoogipoo
49bf8d27d1
Move CreateScoreProcessor() to Ruleset
2019-12-17 20:08:13 +09:00
smoogipoo
527ab1a72f
Fix traceable mod not working on skin change
2019-12-17 19:49:13 +09:00
Andrei Zavatski
f6cde911e2
Use switch expressions
2019-12-17 13:41:28 +03:00
Andrei Zavatski
bc9177983a
Fix possible null
2019-12-17 12:50:50 +03:00
Andrei Zavatski
023892738a
Integration into overlay
2019-12-17 12:36:44 +03:00
Andrei Zavatski
8cd96acffc
CounterPill implementation
2019-12-17 12:05:35 +03:00
smoogipoo
946a202ee5
Fix online replays not being available locally
2019-12-17 15:47:08 +09:00
Dean Herbert
c92332d2e4
Merge pull request #7214 from Joehuu/default-placeholder-channel-search
...
Use default placeholder text on chat channel search box
2019-12-17 14:38:56 +09:00
Dean Herbert
735b7a8455
Merge pull request #6940 from aspriddell/cinema-mod
...
Add "Cinema" mod
2019-12-17 14:33:12 +09:00
Huo Yaoyuan
40b43b85f1
CA1715: use prefix for generic parameters.
2019-12-17 13:00:25 +08:00
Huo Yaoyuan
61a6106e52
CA2200: don't explictly throw caught exception.
2019-12-17 13:00:23 +08:00
Huo Yaoyuan
caf3f774ba
CA1309: compare strings correctly.
2019-12-17 13:00:15 +08:00
Huo Yaoyuan
e46f6627e4
CA1052: make type static.
2019-12-17 13:00:13 +08:00
Huo Yaoyuan
d5994ed484
CA2208: create exceptions correctly.
2019-12-17 13:00:10 +08:00
Huo Yaoyuan
09257b0c6d
CA1820: use IsNullOrEmpty.
2019-12-17 13:00:08 +08:00
Huo Yaoyuan
3c39fde7ff
CA1065: throw NotSupportedException in properties.
2019-12-17 13:00:05 +08:00
Huo Yaoyuan
d7b3578cc6
CA2201: throw correct exception type.
2019-12-17 13:00:02 +08:00
Huo Yaoyuan
ecfc6dfa3d
CA1825: use Array.Empty.
2019-12-17 12:59:48 +08:00
Dean Herbert
f8ffa67693
Add test and isolate ignore bindable from EnableUserDim
2019-12-17 13:21:23 +09:00
Dean Herbert
5761d763ec
Allow changing volume using alt when hovering scroll containers ( #7213 )
...
Allow changing volume using alt when hovering scroll containers
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-17 13:20:31 +09:00
Dean Herbert
b5db927d93
Merge branch 'master' into cinema-mod
2019-12-17 12:56:06 +09:00
Dean Herbert
272d7d0ca9
Merge branch 'master' into fallback-to-skin-combo-colours
2019-12-17 12:36:20 +09:00
Willy Tu
bef9637fdf
Implemented delete local score individually. Currently does not refresh the score screen after the delete is compelete.
2019-12-16 19:25:28 -08:00
Dean Herbert
a85653ebec
Add comment
2019-12-17 12:24:59 +09:00
Dean Herbert
87035f8251
Simplify complex method
2019-12-17 12:12:15 +09:00
Dean Herbert
795416c066
Move first beat offset to BeatSyncedContainer
2019-12-17 12:06:09 +09:00
Dean Herbert
eed2984bef
Update sdk and InspectCode version ( #7208 )
...
Update sdk and InspectCode version
2019-12-16 19:46:12 +09:00
Dean Herbert
438d97f4f5
Rename variable for clarity
2019-12-16 19:42:28 +09:00
Dean Herbert
cfd8111120
Better initial beat handling
2019-12-16 19:41:02 +09:00
Dean Herbert
72404bff9a
Add support for simple triple time
2019-12-16 19:16:54 +09:00
Dean Herbert
210fecc951
Fix incorrect hat logic; add support for first barline omission
2019-12-16 18:57:11 +09:00
Dean Herbert
0f9ff32cdc
Fix beat playing while paused
2019-12-16 18:51:22 +09:00
Dean Herbert
c883c97bab
Fix off-by-one starting bar
2019-12-16 18:50:58 +09:00
Dean Herbert
3e0fda58ea
Play finish in addition to kick, not isolated
2019-12-16 18:47:06 +09:00
smoogipoo
6cf318c34b
Merge remote-tracking branch 'refs/remotes/origin/master' into improve-hud-hiding
2019-12-16 18:41:21 +09:00
smoogipoo
a276643a4b
Reorder health display and score elements
2019-12-16 18:41:14 +09:00
smoogipoo
83f77d9c35
Make the layout faster
2019-12-16 18:41:02 +09:00
Dean Herbert
9de6b62fb1
Fix nightcore beat not playing if song doesn't hit beat index 0
2019-12-16 18:24:29 +09:00
Dean Herbert
3f3ba603c1
Merge remote-tracking branch 'upstream/master' into nightcore-beats
2019-12-16 18:03:32 +09:00
smoogipoo
be7b00cc34
Fix potentially incorrect custom sample bank
2019-12-16 17:12:31 +09:00
smoogipoo
8beb6b534f
Merge remote-tracking branch 'refs/remotes/origin/master' into legacy-beatmap-saving
2019-12-16 17:09:03 +09:00
smoogipoo
3c9884456f
Use writeline
2019-12-16 17:08:46 +09:00
smoogipoo
5278236458
Use invariant ToLower()
2019-12-16 17:07:30 +09:00
smoogipoo
27150d6bbc
Use char concatenation for performance
2019-12-16 17:06:52 +09:00
smoogipoo
9fa6954ac2
Refactor getSampleBank a bit
2019-12-16 17:05:24 +09:00
smoogipoo
98dd1c2590
Use SingleOrDefault() where possible
2019-12-16 17:03:58 +09:00
smoogipoo
d56e99865c
Throw not implemented exceptions
2019-12-16 16:57:49 +09:00
smoogipoo
596fda3c1f
Refactor switch
2019-12-16 16:57:40 +09:00
smoogipoo
58e3fb0d0f
Coalesce to -1
2019-12-16 16:43:20 +09:00
dependabot-preview[bot]
fef1877095
Bump ppy.osu.Game.Resources from 2019.1010.0 to 2019.1215.0
...
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources ) from 2019.1010.0 to 2019.1215.0.
- [Release notes](https://github.com/ppy/osu-resources/releases )
- [Commits](https://github.com/ppy/osu-resources/compare/2019.1010.0...2019.1215.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-16 07:36:30 +00:00
Dean Herbert
d7eb4f73f4
Merge branch 'master' into update-beatmap-settings
2019-12-16 14:57:57 +09:00
Dean Herbert
befb78f83b
Simplify LegacySkinResourceStore by deriving from ResourceStore
2019-12-16 14:01:08 +09:00
Dean Herbert
9062fe1935
Fix crashes on custom skins due to extension-less file lookups
2019-12-16 13:32:53 +09:00
unknown
88d3a1707d
ensure beatIndex is 0 before starting beats
2019-12-16 06:35:18 +08:00
Huo Yaoyuan
c457571da6
Use index and range expressions
2019-12-15 20:17:35 +08:00
Huo Yaoyuan
ab70abe8bd
Turn off unexpected new warnings.
2019-12-15 20:07:56 +08:00
Willy Tu
ad077042ba
Created ContextMenu for scores by adding OsuContextMenuContainer as a child of LeaderboardScore and a Drawable that extended the IHasContextMenu interface to the MenuContainer. Tried to the LeaderboardScore extend IHASContextMenu itself, but it is not working yet.
2019-12-15 02:18:12 -08:00
unknown
c06e558f87
add setting to start fully wounded
2019-12-15 18:12:37 +08:00
unknown
154bc57c6e
remove unused dependency
2019-12-15 17:46:44 +08:00
unknown
6da168118e
remove unused usings
2019-12-15 17:02:29 +08:00
unknown
01c036b0b0
implement backing beats for nightcore mods
2019-12-15 16:56:02 +08:00
Joehu
5af363c920
Use default placeholder text on chat channel search box
2019-12-14 12:58:13 -08:00
Joehu
a04f4b76bb
Allow changing volume using alt when hovering scroll containers
2019-12-14 11:39:59 -08:00
Dean Herbert
91bb851a7d
Update framework
2019-12-15 03:32:50 +09:00
Dean Herbert
41d4609c92
Fix crash on trying to retrieve mods from unavailable ruleset
2019-12-15 02:37:30 +09:00
Huo Yaoyuan
ddb2cfc46d
Use GetEndTime in Taiko and Mania
2019-12-14 18:16:13 +08:00
Lucas A
43720fbf45
Fix CI issues
2019-12-13 18:59:40 +01:00
Lucas A
e05c9426ed
Initial implementation of NewsArticleCover class
2019-12-13 18:50:49 +01:00
Dean Herbert
b94d5bf82e
Fix error when entering multiplayer game in different ruleset
2019-12-14 00:42:54 +09:00
Dean Herbert
bc397a4f1d
Merge branch 'master' into adjustable-rate-mods
2019-12-13 22:23:30 +09:00
Dean Herbert
59538bfd32
Merge branch 'global-available-mods' into adjustable-rate-mods
2019-12-13 21:57:27 +09:00
Dan Balasescu
ef94df917c
Add whitespace
2019-12-13 21:56:03 +09:00
smoogipoo
72ea871bff
Make constructor protected
2019-12-13 21:55:20 +09:00
Dean Herbert
af15662856
Fix WindUp applying too much change
2019-12-13 21:55:07 +09:00
Dean Herbert
bc31146560
Mods -> SelectedMods
2019-12-13 21:45:38 +09:00
Dean Herbert
8052aeb238
Fix potential nullref in disposal logic
2019-12-13 21:36:50 +09:00
Dean Herbert
440a8470e1
Move available mods to global context
...
This also tidies up ModSelectOverlay and setting creation flow in general.
2019-12-13 21:36:50 +09:00
smoogipoo
ea4eb6b204
CI cleanups
2019-12-13 21:29:10 +09:00
Dean Herbert
fa7520d177
Merge pull request #7185 from peppy/update-framework
...
Update framework
2019-12-13 20:59:22 +09:00
Dean Herbert
34f67b9cad
Update framework
2019-12-13 20:31:20 +09:00
Dean Herbert
a1f8ab1735
Fix unrequired type keyword
2019-12-13 20:13:53 +09:00
Dean Herbert
3dc2b59d2a
Move variable above common bindables
2019-12-13 20:06:12 +09:00
Dean Herbert
395b058ff8
Fix OsuScreenDependencies not caching non-leased versions
2019-12-13 20:05:54 +09:00
Dean Herbert
952bc96bbf
Use GameBase data sources for Beatmap/Mods/Ruleset
...
Sourced in via OsuScreenDependencies for management
2019-12-13 20:05:38 +09:00
smoogipoo
9bc02f489e
Add missing headers
2019-12-13 19:14:49 +09:00
smoogipoo
0ad28a9400
Start at version 128
2019-12-13 19:11:45 +09:00
smoogipoo
abf3f341b7
Merge remote-tracking branch 'refs/remotes/origin/master' into legacy-beatmap-saving
2019-12-13 19:01:25 +09:00
smoogipoo
87a7f340e3
Fix first sample point being treated as redundant
2019-12-13 18:14:01 +09:00
smoogipoo
654499d8b0
Remove whitespace
2019-12-13 17:33:18 +09:00
smoogipoo
97158fce7d
Always attach a new combo to spinners
2019-12-13 17:02:10 +09:00
smoogipoo
0b7c4f252c
Fix artist being written in place of version
2019-12-13 17:01:59 +09:00
smoogipoo
53a665a034
Fix sound types and banks not being written correctly
2019-12-13 17:01:44 +09:00
unknown
ab5aa8594d
remove whitespace
2019-12-13 15:46:58 +08:00
unknown
0311cc83ad
add whitespace
2019-12-13 15:27:34 +08:00
unknown
ababe7b6c9
refactor mod to make use of #7175
2019-12-13 15:22:07 +08:00
unknown
7f659cd057
Merge branch 'update-beatmap-settings' into adjustable-map-settings
2019-12-13 09:45:10 +08:00
unknown
3945e7403a
improve tests and refactor AdvancedStats
2019-12-13 09:39:54 +08:00
unknown
ec5b506960
apply mod difficulty settings during song select
2019-12-12 23:41:46 +08:00
unknown
002a125b4a
make ModDifficultyAdjust generic
2019-12-12 21:14:26 +08:00
Dean Herbert
5e634c1183
Move test values to constants
2019-12-12 20:51:58 +09:00
Salman Ahmed
bf8caee53f
Inherit SkinConfiguration directly
2019-12-12 14:05:24 +03:00
Dean Herbert
7559012fb7
Merge remote-tracking branch 'upstream/master' into lighten-playfield-during-breaks
2019-12-12 19:55:09 +09:00
smoogipoo
ac984423bb
Fix only single sound type being written
2019-12-12 19:53:30 +09:00
smoogipoo
dedae69db8
Prefer legacy curve format if possible
2019-12-12 19:52:15 +09:00
smoogipoo
d35d34c01b
Fix hanging semicolon for per-node bank output
2019-12-12 19:01:43 +09:00
smoogipoo
4760307bbb
Don't output the first slider control point
2019-12-12 19:01:15 +09:00
smoogipoo
60063eefd2
Fix up background/video events
2019-12-12 18:51:05 +09:00
smoogipoo
51bdb73b91
Don't write empty file names
2019-12-12 18:49:47 +09:00
smoogipoo
f89042cd0a
Add missing section header
2019-12-12 18:48:22 +09:00
smoogipoo
e09bbf0315
Implement background/video/break encoding
2019-12-12 18:47:28 +09:00
smoogipoo
d1dc3456d1
Fix incorrect repeat point count
2019-12-12 18:42:48 +09:00
smoogipoo
c3475a2dde
Write control points in absolute coordinates
2019-12-12 18:41:13 +09:00
smoogipoo
8f03599a62
Write default sampleset by name
2019-12-12 18:40:33 +09:00
Salman Ahmed
a9125f6544
Merge remote-tracking branch 'upstream/master' into fallback-to-skin-combo-colours
2019-12-12 12:37:51 +03:00
smoogipoo
be000e13e4
Implement initial legacy beatmap encoding support
2019-12-12 18:34:40 +09:00
Dean Herbert
623ab1ef3b
Update time ramp preview on setting change
2019-12-12 17:38:18 +09:00
Dean Herbert
bd3fe23cee
Merge branch 'fix-mod-retention' into adjustable-rate-mods
2019-12-12 17:21:15 +09:00
Dean Herbert
a0792f82e8
Re-jig mod select logic to reduce event fires
2019-12-12 17:05:47 +09:00
Dean Herbert
d15f49f60f
Also hide the break overlay
2019-12-12 16:13:02 +09:00
Dean Herbert
99280db694
Add note about AlwaysPresent requirement
2019-12-12 16:12:40 +09:00
Dean Herbert
e4297ffead
Hide HUD in a better way
2019-12-12 16:12:32 +09:00
Dean Herbert
37a94988a3
Merge branch 'improve-hud-hiding' into cinema-mod
2019-12-12 16:12:19 +09:00
Dean Herbert
94f3dbb2f6
Adjust transitions slightly
2019-12-12 16:09:50 +09:00
Dean Herbert
3ccfee64f6
Add HUDOverlay tests
2019-12-12 16:09:42 +09:00
smoogipoo
59345c97e4
Remove now unnecessary editor working beatmap
2019-12-12 15:58:31 +09:00
smoogipoo
5861eca80d
Make DrawableRuleset take a converted beatmap
2019-12-12 15:58:11 +09:00
Dean Herbert
4c4199269c
Use protected constructors
2019-12-12 15:25:37 +09:00
Dean Herbert
ffb5cdc6ae
Hide settings overlay along with other HUD-hidden content
2019-12-12 15:20:42 +09:00
Dean Herbert
ad2528d4d2
Hide key counter along with other hud elements
...
Also tidies up HUD hide logic and protects against incorrect hiding.
2019-12-12 15:19:45 +09:00
Dean Herbert
9961fa7385
Merge branch 'master' into adjustable-rate-mods
2019-12-12 15:10:23 +09:00
Dean Herbert
76a7e9cde8
Catch file exception in test reset
2019-12-12 14:04:57 +09:00
Dean Herbert
b6c86d512a
Update framework
2019-12-12 13:28:27 +09:00
Dean Herbert
8168872952
Merge remote-tracking branch 'upstream/master' into filesafety
2019-12-12 13:28:21 +09:00
Dean Herbert
606bd33aa6
Use beatmap background in editor
2019-12-12 13:04:32 +09:00
Dean Herbert
a93d57b77e
Merge branch 'master' into lighten-playfield-during-breaks
2019-12-12 11:57:21 +09:00
Dean Herbert
d2ada90434
Merge branch 'master' into single-scoreprocessor
2019-12-12 11:36:45 +09:00
unknown
472fa9822c
make ModDifficultyAdjust incompatible with ModEasy and ModHardRock
2019-12-12 08:25:51 +08:00
Salman Ahmed
4f6b85e5ea
Add test ensuring correct break lightening behaviour
2019-12-12 00:32:39 +03:00
Albie
6b048a03a6
Merge branch 'cinema-mod' of https://github.com/aspriddell/osu into cinema-mod
2019-12-11 19:01:28 +00:00
Albie
2ca722423b
remove uneccesary using statement
2019-12-11 18:58:14 +00:00
Albie
4a1c6db3ed
Merge branch 'master' into cinema-mod
2019-12-11 18:00:17 +00:00
Albie
caa9286a90
update tests, change binding and reduce lines in cinema mod
2019-12-11 17:39:40 +00:00
Dean Herbert
e6102200a8
Merge remote-tracking branch 'upstream/master' into filesafety
2019-12-12 01:59:57 +09:00
unknown
b0cf44c3be
fix appveyor issues
2019-12-11 20:12:29 +08:00
unknown
b795532aa5
add difficulty adjustment mods
2019-12-11 19:43:16 +08:00
smoogipoo
40f918dce6
Remove unused using
2019-12-11 19:49:32 +09:00
smoogipoo
c34b6b59ed
Remove time ramp and rate adjust mod incompatibility
2019-12-11 19:48:57 +09:00
smoogipoo
404d3207ff
Refactor ModNightcore/ModDaycore
2019-12-11 19:43:32 +09:00
Dan Balasescu
b77f9504d0
Merge branch 'master' into adjustable-rate-mods
2019-12-11 19:28:59 +09:00
Dan Balasescu
9963d18d17
Add whitespace
2019-12-11 19:13:04 +09:00
Dan Balasescu
e288706802
Merge branch 'master' into rankings-overlay-refactor
2019-12-11 19:09:29 +09:00
Dan Balasescu
166e957104
Merge pull request #6432 from LeNitrous/customized-mods
...
Add per-mod settings
2019-12-11 19:07:29 +09:00
Dean Herbert
a106e2a53f
Refactor distance snap grid to not require hitobjects ( #7138 )
...
Refactor distance snap grid to not require hitobjects
2019-12-11 19:02:29 +09:00
Dan Balasescu
900cbd7af3
Merge branch 'master' into customized-mods
2019-12-11 18:52:00 +09:00
smoogipoo
48f1dad4aa
Remove abstract ScoreProcessor class
2019-12-11 17:25:06 +09:00
Huo Yaoyuan
cffeceb229
Remove unnecessary comment.
2019-12-11 16:24:22 +08:00
Huo Yaoyuan
b86a3dbfab
PathStandardise -> ToStandardisedPath
2019-12-11 16:06:56 +08:00
Huo Yaoyuan
6b3c7c8421
Remove usages of FileSafety class.
2019-12-11 16:05:35 +08:00
Albie
83b2e0525e
further fixes, not perfect yet
2019-12-11 07:02:51 +00:00
Dean Herbert
75f9250645
Don't automatically pause when window is inactive if in break time
2019-12-11 15:46:07 +09:00
Dean Herbert
6c8f325063
Add failing test
2019-12-11 15:46:07 +09:00
Dean Herbert
9ebad16436
Fix logic regression
2019-12-11 14:37:10 +09:00
Dean Herbert
77b9989e11
Fix some weird private field names
2019-12-11 14:10:35 +09:00
Dean Herbert
9eed64997f
Merge branch 'customized-mods' into adjustable-rate-mods
2019-12-11 13:26:05 +09:00
Dean Herbert
5624b9fd3f
Fix US english
2019-12-11 13:19:13 +09:00
Dean Herbert
a37af311d0
Simplify settings update logic
2019-12-11 13:19:02 +09:00
Salman Ahmed
53daa37eaa
Fix failing tests
2019-12-10 23:06:13 +03:00
Albie
a61f8cc2c3
Merge branch 'master' into cinema-mod
2019-12-10 17:06:53 +00:00
Albie
6c1ae3bc8a
add tests
2019-12-10 16:59:31 +00:00
Salman Ahmed
38f1a8bc17
Bind UserDimContainer.IsBreakTime from Player
2019-12-10 15:14:47 +03:00
Salman Ahmed
bb078c2afc
Lighten user-dim container if on break time
2019-12-10 15:13:44 +03:00
Salman Ahmed
b93bbf81aa
Add lighten background during breaks setting
2019-12-10 15:10:35 +03:00
smoogipoo
c378e525da
Extract the rest of legacy enums
2019-12-10 20:23:15 +09:00
smoogipoo
3c18872a16
Extract legacy effect flags enum
2019-12-10 20:19:31 +09:00
smoogipoo
e3f925f69a
Extract legacy hitobject type enum
2019-12-10 20:19:16 +09:00
smoogipoo
8012b21ffa
Extract legacy sound type enum
2019-12-10 20:18:44 +09:00
Dean Herbert
138b83c9ea
Merge branch 'master' into customized-mods
2019-12-10 19:13:32 +09:00
Dean Herbert
f6c0b5c44a
Merge branch 'master' into settings-source
2019-12-10 18:49:41 +09:00
Dean Herbert
efc3b7fc9f
Merge branch 'master' into fix-settings-bindable-logic
2019-12-10 18:30:27 +09:00
Dean Herbert
55c938e5da
Fix bindable usage
2019-12-10 18:08:24 +09:00
Dean Herbert
65f2d1f875
Update framework
2019-12-10 17:49:42 +09:00
Dean Herbert
f7f4a57c5f
Update bindable types in line with framework
2019-12-10 16:48:24 +09:00
Dean Herbert
609c511309
Update framework
2019-12-10 16:43:58 +09:00
Dan Balasescu
bd6a08a21b
Merge branch 'master' into apply-to-track
2019-12-10 16:15:24 +09:00
smoogipoo
94a298a82d
Refactor distance snap grid to not require hitobjects
2019-12-10 16:00:09 +09:00
Dean Herbert
5f3d163772
Merge branch 'master' into segmented-slider-paths-3
2019-12-10 14:28:20 +09:00
smoogipoo
ab0f2e7c6a
Apply suggested refactorings
2019-12-10 13:12:54 +09:00
Dean Herbert
cdde5d1d69
Fix song select filters not reapplied if in a child screen
...
Closes https://github.com/ppy/osu/issues/6980 .
2019-12-10 02:30:23 +09:00
Dean Herbert
dc9775742c
Fix incorrect code migration
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2019-12-10 02:23:17 +09:00
Dean Herbert
12bdb1dafd
Pin DC/NC pitch
2019-12-09 20:40:38 +09:00
smoogipoo
47f3c4a596
Don't serialise path version
2019-12-09 20:18:18 +09:00
Dean Herbert
edc8220554
Add time ramp settings
2019-12-09 19:58:51 +09:00
Dean Herbert
7fd52c21f5
Update mods and user adjust to use adjustments
2019-12-09 19:41:31 +09:00
Dean Herbert
6b667daf09
Update bindable types in line with framework
2019-12-09 19:41:18 +09:00
Huo Yaoyuan
ad1fb3bda2
Remove IComparable in constraint.
2019-12-09 17:48:41 +08:00
Huo Yaoyuan
c3518a2b94
Enum constraint for enum dropdown.
2019-12-09 17:45:26 +08:00
Huo Yaoyuan
40a5c1fd96
Constrain transformable with class.
2019-12-09 17:45:26 +08:00
Huo Yaoyuan
04b3297a05
Constrain configuration lookup as enum.
2019-12-09 17:45:26 +08:00
smoogipoo
cd61893814
Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3
2019-12-09 18:25:27 +09:00
smoogipoo
6d9cd0fafe
Split out complex method
2019-12-09 18:25:13 +09:00
smoogipoo
b6e2738236
Remove unused using
2019-12-09 18:15:00 +09:00
Dean Herbert
9fa745aecc
Merge branch 'apply-to-track' into adjustable-rate-mods
2019-12-09 18:12:01 +09:00
Dean Herbert
d650bfb6d6
Remove unnecessary cast
2019-12-09 18:05:14 +09:00
smoogipoo
a1798fd38d
Fix bad ctor implementation
2019-12-09 18:01:13 +09:00
smoogipoo
bfbb9aa18e
Remove outdated assert
2019-12-09 18:01:02 +09:00
Dean Herbert
c39d2f006c
Merge branch 'master' into fix-settings-bindable-logic
2019-12-09 17:55:17 +09:00
smoogipoo
883d5bc11d
Remove automatic slider path offsetting
2019-12-09 17:54:22 +09:00
smoogipoo
9cb649436c
Default to linear control point type
2019-12-09 17:47:05 +09:00
smoogipoo
5a093c039c
Simplify path/point construction
2019-12-09 17:46:40 +09:00
Dean Herbert
ba538cf09b
Merge branch 'apply-to-track' into adjustable-double-time
2019-12-09 17:45:19 +09:00
Dean Herbert
eb074b7058
Allow mods to apply to track, not clock
2019-12-09 17:44:45 +09:00
Dean Herbert
0c7e5a2e3b
Add bindable adjustments for DT/HT rate
2019-12-09 16:54:00 +09:00
Dean Herbert
e37526888c
Merge remote-tracking branch 'upstream/master' into adjustable-double-time
2019-12-09 16:43:17 +09:00
dependabot-preview[bot]
12cfb7dedb
Bump System.ComponentModel.Annotations from 4.6.0 to 4.7.0
...
Bumps [System.ComponentModel.Annotations](https://github.com/dotnet/corefx ) from 4.6.0 to 4.7.0.
- [Release notes](https://github.com/dotnet/corefx/releases )
- [Commits](https://github.com/dotnet/corefx/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-09 07:28:11 +00:00
smoogipoo
c18f2e6436
Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3
2019-12-09 15:34:49 +09:00
Dan Balasescu
0c9f7a64f1
Merge branch 'master' into improve-dialog-button-visuals
2019-12-09 15:31:48 +09:00
Dan Balasescu
07efd66287
Merge pull request #7075 from peppy/editor-timeline-hitobject-display
...
Editor timeline hitobject display
2019-12-09 14:53:25 +09:00
Dan Balasescu
5738ef5fab
Merge branch 'master' into editor-timeline-hitobject-display
2019-12-09 14:34:55 +09:00
Dean Herbert
58db745121
Merge remote-tracking branch 'upstream/master' into improve-dialog-button-visuals
2019-12-09 14:11:52 +09:00
Dean Herbert
03d18186c2
Fix broken merge
2019-12-09 14:11:44 +09:00
Andrei Zavatski
69deb0ca96
Fix unavailable replays can be accessed via leaderboard
2019-12-09 07:19:55 +03:00
smoogipoo
4905709ea4
Remove unused usings
2019-12-09 13:19:21 +09:00
Dean Herbert
003eef8595
Fix mod buttons being selected when drag scrolling overlay ( #7099 )
...
Fix mod buttons being selected when drag scrolling overlay
2019-12-09 12:24:48 +09:00
Dean Herbert
ad2ecf4dff
Fix key config search not clearing after pressing escape ( #7105 )
...
Fix key config search not clearing after pressing escape
2019-12-09 12:22:30 +09:00
Dean Herbert
4fbe5b7002
Merge branch 'master' into rankings-overlay-refactor
2019-12-09 11:34:32 +09:00
Joehu
9974fff5cc
Make sub panel back button inherit osu button
2019-12-08 10:51:25 -08:00
Joehu
5cf35869e9
Fix key config search not clearing after pressing escape
2019-12-08 10:40:39 -08:00
Lucas A
88ec0c1486
Add missing async content loading logic to NewsOverlay
2019-12-08 18:49:58 +01:00
Dean Herbert
fd38e56435
Merge branch 'master' into fix-settings-bindable-logic
2019-12-09 02:18:51 +09:00
Dean Herbert
c2a40c574d
Split out if statement for readability
2019-12-09 02:13:47 +09:00
Joehu
e394b28799
Remove redundant transform
2019-12-08 09:12:32 -08:00
Joehu
463b6c0030
Remove whitespace
2019-12-08 09:04:34 -08:00
Joehu
8956768fe0
Fix mod buttons being selected when drag scrolling overlay
2019-12-08 08:55:45 -08:00
Andrei Zavatski
929be3e9e7
Highlight own score in BeatmapSetOverlay
2019-12-08 12:34:07 +03:00
Dan Balasescu
52a0d98012
Merge pull request #7077 from peppy/fix-player-loader-speed
...
Fix mod speed adjustments unapplying if exiting the player loading screen early
2019-12-08 03:53:55 +09:00
Dan Balasescu
54798b134e
Add accessibility modifiers
2019-12-08 03:16:41 +09:00
Dan Balasescu
299daa26da
Merge branch 'master' into dont-confine-skins
2019-12-08 03:14:24 +09:00
Dean Herbert
5347e7c4a2
Apply code quality improvements
2019-12-06 20:14:06 +09:00
Dean Herbert
347373a3ba
Fix test failures
2019-12-06 19:04:55 +09:00
Dean Herbert
46d055604a
Customize -> Customise
2019-12-06 18:59:45 +09:00
Dean Herbert
680b2653ae
Improve animation of popup dialog buttons
2019-12-06 18:51:30 +09:00
smoogipoo
16f8341a02
Handle control point positional updates within SliderPath
2019-12-06 18:49:01 +09:00
Dean Herbert
cf0413663d
Merge branch 'settings-source' into customized-mods
2019-12-06 18:05:39 +09:00
Dean Herbert
2fa0b30fa2
Add textbox and dropdown support
2019-12-06 18:04:46 +09:00
Dean Herbert
ed6d1ccd95
Add a method for getting settings UI components automatically from a target class
2019-12-06 18:04:46 +09:00
Dean Herbert
901eb5d996
Fix incorrect trigger logic
2019-12-06 18:03:50 +09:00
Dean Herbert
9de032e35f
Fix SettingsItem bindable logic
2019-12-06 17:10:06 +09:00
Dean Herbert
a5d5099868
Use SettingsSource for mod cusomisation
2019-12-06 17:09:48 +09:00
Dean Herbert
23e47530c5
Add a method for getting settings UI components automatically from a target class
2019-12-06 17:09:24 +09:00
smoogipoo
b4e1b5fa98
Explose + use the full calculated length of the path
2019-12-06 15:53:19 +09:00
Dean Herbert
af35df4077
Add multiple mod testing and update test code style
2019-12-06 15:42:11 +09:00
smoogipoo
2654710d91
Add tests and fix negative expected distances
2019-12-06 15:37:06 +09:00
Dean Herbert
170954bc6e
Merge remote-tracking branch 'upstream/master' into customized-mods
2019-12-06 15:31:20 +09:00
Dean Herbert
f4bc9f087e
Merge remote-tracking branch 'upstream/master' into fix-player-loader-speed
2019-12-06 15:29:06 +09:00
smoogipoo
27dd12a66d
Rewrite slider length calculation for readability
2019-12-06 15:06:31 +09:00
Dean Herbert
21ceb7f85d
Always display skins at native sizes for now
2019-12-06 14:40:45 +09:00
Dean Herbert
04b89c8242
Merge branch 'master' into expertplus-tooltip-colour
2019-12-06 13:54:13 +09:00
Dean Herbert
48c6279e8b
Only undo adjustments in GameplayClockContainer if applied at least once
2019-12-06 13:49:22 +09:00
Dean Herbert
de23364608
Add failing test
2019-12-06 13:47:34 +09:00
Dean Herbert
b1426d1b22
Full impossible nullref
2019-12-06 12:51:43 +09:00
Dean Herbert
9248fbe881
Remove extra checkboxes for now
2019-12-06 12:22:44 +09:00
Dean Herbert
9f4c8db395
Add xmldoc
2019-12-06 12:17:41 +09:00
Ganendra Afrasya
8be6abf607
Add param to let function return lighter colour for some diff
2019-12-06 10:07:16 +07:00
smoogipoo
23c7132c4f
Add missing license header
2019-12-06 11:53:22 +09:00
Dean Herbert
28400aa865
Update test scene
2019-12-06 11:27:24 +09:00
Dean Herbert
12a9843835
Move thickness to a constant
2019-12-06 10:48:18 +09:00
Dean Herbert
e76f8bdd64
Fix warnings
2019-12-05 23:31:21 +09:00
Dean Herbert
d8620a70fb
Make work in editor
2019-12-05 20:12:25 +09:00
smoogipoo
3ebbf62b2a
Initial game-wide update with the new SliderPath
2019-12-05 19:53:36 +09:00
Dean Herbert
e225b0032a
Add basic hitobject display to timeline
2019-12-05 19:31:40 +09:00
smoogipoo
c9a66c0d07
Expose a version to indicate path changes
2019-12-05 18:31:28 +09:00
Dean Herbert
2419077c07
Update framework
2019-12-05 18:31:13 +09:00
smoogipoo
1585d83b96
Add legacy constructor
2019-12-05 18:19:42 +09:00
smoogipoo
986ac1cee4
Make expected distance a bindable
2019-12-05 17:51:29 +09:00
smoogipoo
2702edfa55
Rename new path, replace existing one
2019-12-05 17:49:32 +09:00
Ganendra Afrasya
0e97871461
Change colour if difficulty is ExpertPlus
2019-12-05 14:53:01 +07:00
smoogipoo
5e9b739b67
Re-implement slider paths to support multiple segments
2019-12-05 16:45:02 +09:00
Andrei Zavatski
33737d3d89
Move tests to TestSceneRankingsOverlay due to refactoring
2019-12-05 09:53:25 +03:00
Andrei Zavatski
22863da360
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-refactor
2019-12-05 09:29:37 +03:00
Dean Herbert
de413418c7
Remove redundant prefix
2019-12-05 14:50:12 +09:00
smoogipoo
0149e47673
Expose general control point change event
2019-12-05 14:38:32 +09:00
smoogipoo
3e0f499e72
Add xmldocs
2019-12-05 14:38:21 +09:00
Dean Herbert
6e9157d59c
Standardise request/response handling
2019-12-05 14:29:48 +09:00
Dean Herbert
cd473f207a
Use child set, not Clear/Add
2019-12-05 14:09:33 +09:00
Dean Herbert
5f9b9631ef
Move scope/country restrictions into RankingsOverlay
2019-12-05 14:07:39 +09:00
Dean Herbert
753715f7db
Merge branch 'master' into rankings-overlay-refactor
2019-12-05 13:46:21 +09:00
smoogipoo
40d0700fa5
Add structure for path control points
2019-12-05 13:43:38 +09:00
Dan Balasescu
36c734c4c2
Merge branch 'master' into decouple-api-room-scoreinfo
2019-12-05 12:43:43 +09:00
Dan Balasescu
f18519965c
Merge branch 'master' into eager-skip-filters
2019-12-05 12:27:42 +09:00
Andrei Zavatski
f8f144b6c0
Remove pointless ScheduledDelegate
2019-12-05 05:20:22 +03:00
Andrei Zavatski
48732e49b9
Improve async logic
2019-12-05 04:20:13 +03:00
Andrei Zavatski
0560a6637c
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-refactor
2019-12-05 04:11:45 +03:00
Dean Herbert
48287459a0
Optimise filters to avoid property retrieval
...
Also reduces number of instantiations of SearchableTerms array in the case of multiple criteria terms.
2019-12-05 01:52:22 +09:00
Dean Herbert
36224dca13
Fix multiplayer aggregate score inheriting from ScoreInfo
2019-12-05 01:45:28 +09:00
Dean Herbert
9ac0ac0944
Merge branch 'master' into fix-pause-testcase
2019-12-05 01:00:27 +09:00
Dean Herbert
0734b52483
Update framework
2019-12-04 23:33:26 +09:00
Dean Herbert
ca1f3417a3
Merge pull request #7046 from smoogipoo/fix-replay-button
...
Fix replay download button not working
2019-12-04 23:00:40 +09:00
Dan Balasescu
19c5848e73
Merge branch 'master' into decouple-legacy-score-info
2019-12-04 11:47:27 +09:00
Dan Balasescu
242e1b0b2e
Merge branch 'master' into add-missing-long-running
2019-12-04 11:29:25 +09:00
Huo Yaoyuan
46c9bdcf62
Replace Convert.ChangeType with IConvertible.
2019-12-03 20:49:41 +08:00
Huo Yaoyuan
5375af7820
Remove other Equals(object) calls.
2019-12-03 20:23:27 +08:00
Huo Yaoyuan
05cfef92f9
Don't compare spans with null.
2019-12-03 20:09:58 +08:00
Huo Yaoyuan
a42f9447e6
Don't use Equals(object) on T?.
2019-12-03 20:07:22 +08:00
Dean Herbert
e2591f154b
Only parse statistics when not null
2019-12-03 16:16:46 +09:00
Dean Herbert
1ce6a5ceb3
Rename class
2019-12-03 15:38:57 +09:00
Dean Herbert
f0d49d0cdf
Decouple APILegacyScoreInfo from ScoreInfo
2019-12-03 15:31:11 +09:00
smoogipoo
aadbbb1af3
Fix replay download button not working
2019-12-03 13:33:42 +09:00
recapitalverb
1ec11946c6
Fix spelling in comment on SearchTextBox.OnPressed
2019-12-02 18:45:57 +07:00
Dean Herbert
6893ec22bb
Fix currenTrackCompleted not being run on main thread
2019-12-02 18:26:45 +09:00
Dan Balasescu
700fe5162d
Merge branch 'master' into fix-overlays-drag-closing
2019-12-02 14:12:37 +09:00
Dan Balasescu
133c25f4c1
Merge branch 'master' into hide-mouse-in-playfield
2019-12-02 13:29:32 +09:00
Joehu
74176a6954
Remove redundant ternary expression
2019-12-01 12:54:37 -08:00
Joehu
3b88afd069
Fix overlays closing when dragging from in/out or out/in
2019-12-01 12:02:47 -08:00
Andrei Zavatski
62daea195c
Fix possible null
2019-12-01 04:09:45 +03:00
Andrei Zavatski
f375db368f
Remove useless null check
2019-12-01 03:56:03 +03:00
Andrei Zavatski
0ac4675546
Implement IEquatable<Country>
2019-12-01 03:52:41 +03:00
Andrei Zavatski
c451542915
Rankings overlay basic implementation
2019-11-30 03:01:07 +03:00
Dean Herbert
c49aeb08c4
Add API methods to perform requests out-of-queue
2019-11-29 20:03:14 +09:00
Dean Herbert
f181ee1843
Hide the menu cursor while inside the playfield by default
2019-11-29 17:35:11 +09:00
Dean Herbert
5dbc32f49b
Fix MedalIcon usage
2019-11-29 16:19:57 +09:00
Dean Herbert
b51ebe4431
Fix ScoreResultsPage usage
2019-11-29 15:50:50 +09:00
Dean Herbert
7efbf9f38f
Merge remote-tracking branch 'upstream/master' into rankings-tables
2019-11-29 15:37:08 +09:00
Dean Herbert
e678fe7a77
Move potentially expensive load to BDL
2019-11-29 15:35:33 +09:00
Dean Herbert
2663e5d756
Add some more missing LongRunningLoad flags
2019-11-29 13:52:23 +09:00
Dean Herbert
f4f54bc46b
Fix social browser calling game-wide load stalls
2019-11-29 13:03:17 +09:00
Andrei Zavatski
36d694ad2d
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables
2019-11-28 20:43:17 +03:00
Dean Herbert
9a941c4f94
Update font loading to use new method
2019-11-29 02:15:13 +09:00
Andrei Zavatski
83e3ad9e69
Make Rankings a ctor variable
2019-11-28 20:09:05 +03:00
Andrei Zavatski
da01f0ee5a
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables
2019-11-28 20:08:41 +03:00
Dean Herbert
b20e62096d
Merge remote-tracking branch 'upstream/master' into reduce-background-blur-scale
2019-11-29 01:49:25 +09:00
Albie
7864899249
Merge branch 'master' into cinema-mod
2019-11-28 16:42:01 +00:00
Dean Herbert
bb0a4db847
Fix failing tests
2019-11-29 01:17:58 +09:00
Dean Herbert
b9a8a36e60
Update framework
2019-11-29 00:44:32 +09:00
Ganendra Afrasya
71a871d7d1
Add loved enum on BeatmapApproval
2019-11-28 21:59:57 +07:00
Dean Herbert
56e8a1fdd5
Merge remote-tracking branch 'upstream/master' into reduce-background-blur-scale
2019-11-28 22:02:31 +09:00
Dean Herbert
a4f584c6a4
Update framework
2019-11-28 22:00:01 +09:00
Ganendra Afrasya
ada8dabf7e
Add right margin on score multiplier text
2019-11-28 18:48:43 +07:00
Dean Herbert
46379902be
Merge branch 'master' into hover-debounce
2019-11-28 20:44:32 +09:00
Dean Herbert
aa9776d51a
seal and compact rows
2019-11-28 19:07:43 +09:00
smoogipoo
f504370867
Make player block exit if pausable
2019-11-28 15:58:26 +09:00
Min
92ab8026a0
Completely remove click sound debounce
2019-11-28 16:03:59 +11:00
Ganendra Afrasya
944835da23
Add multiplier score text on mods footer button
2019-11-28 12:01:40 +07:00
Andrei Zavatski
8077c86d13
CI fixes
2019-11-27 23:58:31 +03:00
Andrei Zavatski
800bda7e81
Refactor tables to avoid code duplication
2019-11-27 23:35:02 +03:00
Andrei Zavatski
c546df8a80
Refactor API logic
2019-11-27 21:56:22 +03:00
Andrei Zavatski
2135a7fd7b
Don't use repetitive headers in each class
2019-11-27 21:46:41 +03:00
Andrei Zavatski
4cf5968026
Simplify place calculation
2019-11-27 21:39:38 +03:00
Andrei Zavatski
14c471fe5d
Move Rankings property below ctor
2019-11-27 21:37:34 +03:00
Andrei Zavatski
bb3152ac8b
Use string.empty for empty headers
2019-11-27 21:35:03 +03:00
Dean Herbert
e1302d84dd
Use string.Empty
2019-11-28 00:26:10 +09:00
Dean Herbert
2865f32052
Fix nullref on clicking links in tests
2019-11-28 00:13:44 +09:00
Dean Herbert
4221a0126c
Merge branch 'master' into rankings-tables
2019-11-27 23:26:54 +09:00
phosphene47
786fb9ede3
Split click and hover and disable click debounce
2019-11-28 00:44:01 +11:00
phosphene47
d4afea0b5e
Use double instead of TimeSpan
2019-11-27 23:06:07 +11:00
phosphene47
037d927e45
TimeSpans can be negative!
2019-11-27 22:51:27 +11:00
phosphene47
b126700f01
Debounce hover sounds
2019-11-27 22:47:00 +11:00
Huo Yaoyuan
ffb5b6c82b
Merge branch 'master' into ci
2019-11-27 19:38:24 +08:00
Dean Herbert
01a37771bc
Merge branch 'master' into customized-mods
2019-11-27 19:44:32 +09:00
Dan Balasescu
c6a85a11bd
Merge branch 'master' into sharpen
2019-11-27 17:09:11 +09:00
Dean Herbert
9494a477b6
Consider intro and outro time as "break" time ( #6960 )
...
Consider intro and outro time as "break" time
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-27 17:09:01 +09:00
smoogipoo
d1e3718038
Reduce the scale of background blurs
2019-11-27 15:04:09 +09:00
Huo Yaoyuan
eba8657d38
Remove newly introduced redundant this.
2019-11-26 18:41:19 +08:00
Huo Yaoyuan
c0fe91a84c
Merge branch 'master' into sharpen
2019-11-26 18:21:50 +08:00
Huo Yaoyuan
deaeda7348
Change packing to be runned by AppVeyor.
2019-11-26 17:17:10 +08:00
Huo Yaoyuan
ffb2f21f50
Merge branch 'master' into ci
2019-11-26 15:41:34 +08:00
Albie
09158b6b08
Merge branch 'master' into cinema-mod
2019-11-26 06:57:47 +00:00
Dean Herbert
ab017ee648
Update framework
2019-11-26 15:37:13 +09:00
Dean Herbert
77ce9642ba
Add test coverage and simplify break time updating
2019-11-26 15:32:48 +09:00
Dean Herbert
a453129d44
Fix nullref in tests
2019-11-26 15:13:50 +09:00
Dan Balasescu
8a8e863c0e
Merge branch 'master' into intro-outro-break
2019-11-26 12:47:42 +09:00
Dan Balasescu
7c5a49c4d8
Merge branch 'master' into username-login
2019-11-26 12:28:57 +09:00
Dan Balasescu
b21de98296
Merge branch 'master' into get-end-time
2019-11-26 11:47:01 +09:00
Dean Herbert
fbebbab5db
Remove excess parenthesis
2019-11-25 22:37:07 +09:00
Albie
87ee3f1083
Merge branch 'master' into cinema-mod
2019-11-25 13:35:14 +00:00
Dean Herbert
1fd5ed3c0f
Change login placeholder text to ask for username
2019-11-25 21:35:25 +09:00
Huo Yaoyuan
d2f6439d5f
Merge branch 'master' into ci
2019-11-25 19:48:26 +08:00
Dean Herbert
709ec1404f
Centralise End/StartTime retrieval to extension method
2019-11-25 19:09:14 +09:00
Dean Herbert
6b8983b489
Consider intro and outro time as "break" time
2019-11-25 19:02:11 +09:00
smoogipoo
719f0d5947
Fix stutters when changing beatmap difficulties
2019-11-25 18:28:43 +09:00
Huo Yaoyuan
575b4db186
Patch csproj version.
2019-11-25 16:42:20 +08:00
Huo Yaoyuan
3a62406c58
Update deploy script.
2019-11-25 16:42:20 +08:00
Albie
0a70ec0b11
Merge branch 'master' into cinema-mod
2019-11-25 07:25:30 +00:00
Albie
9fdbb2a58e
change name of interface and expose method instead of seperate values
2019-11-25 07:24:29 +00:00
Dan Balasescu
dd7e4b2340
Merge branch 'master' into dimmed-load-input-blocking
2019-11-25 13:49:10 +09:00
Dan Balasescu
51eff3d49c
Merge branch 'master' into add-access-to-skin-legacy-version
2019-11-25 12:40:01 +09:00
Dan Balasescu
92c4e8e4f6
Merge pull request #6911 from peppy/fix-spritetext-usage
...
Fix usage of SpriteText instead of OsuSpriteText
2019-11-25 12:30:45 +09:00
Dean Herbert
22bdc8435d
Increase padding on mod section title ( #6916 )
...
Increase padding on mod section title
2019-11-25 12:28:38 +09:00
Dan Balasescu
9f93727a80
Merge branch 'master' into fix-spritetext-usage
2019-11-25 12:15:05 +09:00
Dan Balasescu
ffd2ba5d7d
Merge branch 'master' into beatmap-overlay-no-supporter-filter
2019-11-25 11:51:10 +09:00
Dean Herbert
36cabe72cf
Make DimmedLoadingLayer block input when active
2019-11-25 11:49:54 +09:00
Dean Herbert
b85189f855
Merge remote-tracking branch 'upstream/master' into fix-spritetext-usage
2019-11-25 11:31:12 +09:00
Dean Herbert
45514ff660
Apply fixes
2019-11-25 11:30:55 +09:00
Dan Balasescu
19339326e2
Merge branch 'master' into andy840119/_20191124_fix_ApplyToDrawableHitObjects
2019-11-25 11:30:44 +09:00
Berkan Diler
fccdbffa93
Use MathF instead of Math- functions when possible
...
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
2019-11-25 00:45:42 +01:00
Albie
9a8e3fe1da
add brackets
2019-11-24 07:44:35 +00:00
Albie
1d6665fe57
improve code quality using resharper and codefactor advice
2019-11-24 07:42:39 +00:00
Albie
8294b9ebe7
Merge branch 'cinema-mod' of https://github.com/aspriddell/osu into cinema-mod
2019-11-24 07:37:47 +00:00
Albie
b8e5796af5
add forced video/storyboard and disabled dim for mod inside new interface
2019-11-24 07:37:06 +00:00
andy840119
6126fd9a6b
ApplyToDrawableHitObjects should be able to get all the hitobject in nasted Playfield
2019-11-24 10:42:05 +09:00
iiSaLMaN
b58afa3eb6
Remove unnecessary mentioning in xmldoc
2019-11-24 04:36:34 +03:00
iiSaLMaN
20a8a653c2
Change LegacySkin.Configuration accessibility
2019-11-24 04:10:04 +03:00
iiSaLMaN
5bf6e57eb0
Remove unnecessary usage
2019-11-24 02:16:43 +03:00
iiSaLMaN
0f9978b34a
Use AddRange instead
2019-11-24 02:08:36 +03:00
iiSaLMaN
1e24ee7956
Remove ClearComboColours()
2019-11-24 02:07:56 +03:00
Andrei Zavatski
96533631fc
Simplify if/else statement
2019-11-24 01:29:11 +03:00
Andrei Zavatski
29b05e2939
Fix getScores can be fired twice on user change
2019-11-24 00:01:49 +03:00
Andrei Zavatski
ced78dc900
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-no-supporter-filter
2019-11-23 23:54:46 +03:00
Albie
aa00909ef7
Merge branch 'master' into cinema-mod
2019-11-23 18:38:41 +00:00
Albie Spriddell
20edaf4ba6
add cinema mod support
2019-11-23 17:32:16 +00:00
Albie
5c55060173
Merge branch 'master' into master
2019-11-23 16:54:23 +00:00
Dean Herbert
65d71b9442
Fix beatmap lookups failing for beatmaps with no local path
...
Turns out the underlying EscapeUriString doesn't like nulls
2019-11-23 20:55:42 +09:00
Andrei Zavatski
2e161f7e99
Hook up the rest of the logic
2019-11-22 22:25:58 +03:00
Andrei Zavatski
aede1b183a
Make ScopeSelector always visible
2019-11-22 22:04:58 +03:00
Andrei Zavatski
d6c9387beb
Implement NotSupporterPlaceholder
2019-11-22 21:55:21 +03:00
Albie Spriddell
4cb09df754
increase padding
2019-11-22 18:23:48 +00:00
Dean Herbert
4063135a3a
Fix result mode button's corner exponent
2019-11-22 20:45:05 +09:00
Dean Herbert
d0002cc1c2
Update performance logging setting
2019-11-22 19:50:30 +09:00
Dean Herbert
c2e85a2057
Apply CornerExponent fixes
2019-11-22 19:49:20 +09:00
Dean Herbert
6469199f0d
Update framework
2019-11-22 19:47:21 +09:00
Dean Herbert
2796a135bf
Add mod selector to beatmap overlay ( #6812 )
...
Add mod selector to beatmap overlay
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-22 18:46:25 +09:00
Dean Herbert
b026197859
Add spacing
2019-11-22 18:23:48 +09:00
Dean Herbert
dad2e5c678
Improve legibility of NoScroesPlaceholder
2019-11-22 18:10:44 +09:00
Dean Herbert
16bdf4e6bd
Update english to be more readable
2019-11-22 18:07:56 +09:00
Dean Herbert
0cc1698b6d
Rename incorrectly named container
2019-11-22 18:05:12 +09:00
Dean Herbert
880f7ddca7
Merge remote-tracking branch 'upstream/master' into beatmap-overlay-mod-selector-new
2019-11-22 18:00:58 +09:00
Dean Herbert
f079ebe857
Simplify beatmap lookup to use a single endpoint
2019-11-22 16:13:48 +09:00
Dean Herbert
83080c3b5f
Fix merge regression
2019-11-22 14:14:18 +09:00
Dan Balasescu
5d2a608be0
Merge branch 'master' into lead-in-fixes
2019-11-22 13:48:55 +09:00
Dan Balasescu
7c19f7cd7b
Merge branch 'master' into improve-skip-button-feel
2019-11-22 13:36:27 +09:00
Dan Balasescu
ba0ac93f70
Merge branch 'master' into skip-multiple-times
2019-11-22 13:23:50 +09:00
Andrei Zavatski
745047fd19
Remove useless line from ModIcon
2019-11-22 05:10:47 +03:00
Andrei Zavatski
da425c93fa
Fix beatmap switch doesn't trigger scores update
2019-11-22 05:08:50 +03:00
Andrei Zavatski
dee9ffc694
Merge master with conflicts resolved
2019-11-22 04:59:46 +03:00
Dean Herbert
d8260f4a65
Reduce carousel scroll motion on initial display
2019-11-22 10:51:49 +09:00
Dean Herbert
e170cd2892
Move private methods below
2019-11-22 10:29:16 +09:00
Dean Herbert
ced0ad404e
Merge branch 'master' into beatmap-mod-selector
2019-11-22 10:17:40 +09:00
Dean Herbert
5da5abdb05
Merge branch 'master' into prev-button-revamp
2019-11-22 02:57:22 +09:00
Dean Herbert
57d38c5c74
Add final newline
2019-11-22 02:39:54 +09:00
Dean Herbert
ab42fac43a
Improve naming
2019-11-22 02:38:31 +09:00
Andrei Zavatski
eb2f7c1d0a
Rename forgotten variable
2019-11-21 20:37:02 +03:00
Andrei Zavatski
0f1a3d97c8
Naming adjustments
2019-11-21 20:34:19 +03:00
Dean Herbert
f390e558c7
Combine and simplify beatmap change logic
2019-11-22 02:32:02 +09:00
Dean Herbert
a97d760afa
Merge remote-tracking branch 'upstream/master' into menu-background-modes
2019-11-22 02:23:02 +09:00
Andrei Zavatski
c7c8527f5f
Remove OnHighlightedChanged function
2019-11-21 20:22:15 +03:00
Andrei Zavatski
e22a71c6b8
Add visual difference between hovered and selected states
2019-11-21 19:42:07 +03:00
Andrei Zavatski
23fc7b1987
Implement updateHighlighted method
2019-11-21 19:02:24 +03:00
Andrei Zavatski
984ec11a78
Make Ruleset a bindable
2019-11-21 18:56:48 +03:00
Andrei Zavatski
737c2bd1c8
Remove pointless const
2019-11-21 18:50:29 +03:00
Andrei Zavatski
458496206c
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-11-21 18:49:37 +03:00
Huo Yaoyuan
818553027b
Merge branch 'master' into sharpen
2019-11-21 23:42:46 +08:00
Dean Herbert
0d4854ac09
Add News Overlay skeleton and header ( #5726 )
...
Add News Overlay skeleton and header
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-22 00:14:31 +09:00
Dean Herbert
1a6b5e8714
Implement TotalCommentsCounter component for CommentsContainer ( #6867 )
...
Implement TotalCommentsCounter component for CommentsContainer
2019-11-21 23:45:23 +09:00
Dean Herbert
76722534ec
Fix cancel button animating when entering a dialog ( #6825 )
...
Fix cancel button animating when entering a dialog
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-21 23:22:17 +09:00
Dean Herbert
4475307707
Fix spacing
2019-11-21 22:55:31 +09:00
Dean Herbert
ac2dfffb23
Merge remote-tracking branch 'upstream/master' into sharpraven-deprecation
2019-11-21 22:52:45 +09:00
Dean Herbert
f173961def
Add some extra search keywords to settings ( #6893 )
...
Add some extra search keywords to settings
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-21 22:51:20 +09:00
Dean Herbert
d7cb23a909
Remove redundant keyword
2019-11-21 22:51:00 +09:00
Dean Herbert
8b1fb2d5a1
Standardise keyword specifications
2019-11-21 22:35:15 +09:00
Dean Herbert
201f32859a
Merge branch 'master' into slider-control-point-removal
2019-11-21 22:10:52 +09:00
Dean Herbert
bd6831624a
Decouple skip button animations from gameplay clock
2019-11-21 19:51:22 +09:00
Dean Herbert
ffd0e17826
Merge branch 'skip-multiple-times' into lead-in-fixes
2019-11-21 19:01:28 +09:00
Dean Herbert
46a94821d4
Add support for consecutive skips
2019-11-21 18:59:55 +09:00
Dean Herbert
8d1b11d4bd
Add storyboard lead-in tests
2019-11-21 18:50:54 +09:00
Dean Herbert
4e53bca8dd
Simplify tests
2019-11-21 18:50:38 +09:00
Dean Herbert
29d2374928
Add back skip button actuation count tests
2019-11-21 17:23:52 +09:00
Dean Herbert
2dd2e3d861
Add correct AudioLeadIn support
2019-11-21 16:55:18 +09:00
Dean Herbert
8369be90f2
Allow skip button to actuate more than once
2019-11-21 15:19:06 +09:00
Dean Herbert
c0b9bb5a12
Merge remote-tracking branch 'upstream/master' into lead-in-fixes
2019-11-21 14:22:17 +09:00
Dean Herbert
2325f0382c
Cancel a potentially pending filter update when an update occurs
2019-11-21 13:46:45 +09:00
Dean Herbert
4d6904468d
Merge remote-tracking branch 'upstream/master' into multi-searching
2019-11-21 13:44:04 +09:00
Dean Herbert
0804d8d7a4
Replace all MathHelper.Clamp usages with Math.Clamp ( #6891 )
...
Replace all MathHelper.Clamp usages with Math.Clamp
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-21 11:14:34 +09:00
Dean Herbert
94009a22b8
Fix osu!direct previews muting game audio permanently ( #6838 )
...
Fix osu!direct previews muting game audio permanently
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-21 11:13:11 +09:00
Dan Balasescu
a7c074ff37
Merge branch 'master' into math_clamp
2019-11-21 11:08:56 +09:00
smoogipoo
0cbe29dbec
Refactor / cleanup debouncing
2019-11-21 11:05:18 +09:00
Dean Herbert
19dfbb0a45
Update obsolete usages
2019-11-21 10:55:31 +09:00
Dean Herbert
cf0f0f8a1b
Reword comment
2019-11-21 10:37:50 +09:00
Dean Herbert
7637e680d7
Merge remote-tracking branch 'upstream/master' into fix-preview-track-never-stopping
2019-11-21 10:27:32 +09:00
Dean Herbert
76e63722cc
Update framework
2019-11-21 10:26:10 +09:00
Dan Balasescu
ec35d92ec0
Merge branch 'master' into fix-song-select-scroll
2019-11-21 10:22:52 +09:00
iiSaLMaN
5391c752b4
Implement IAggregateAudioAdjustments properties for FallbackSampleStore
2019-11-21 03:20:08 +03:00
iiSaLMaN
ebae92db7b
Revert "Implement IAggregateAudioAdjustments properties for FallbackSampleStore"
...
This reverts commit 4a4f5ccbb2
2019-11-21 03:18:31 +03:00
iiSaLMaN
4a4f5ccbb2
Implement IAggregateAudioAdjustments properties for FallbackSampleStore
2019-11-21 02:35:58 +03:00
Andrei Zavatski
f066d8434c
Apply suggestions
2019-11-21 00:26:39 +03:00
Andrei Zavatski
6b3010535f
Simplify Keywords usage for SettingsSubsection
2019-11-20 21:03:31 +03:00
Andrei Zavatski
f3d9abc84a
Capitalize Bar for consistency
2019-11-20 19:57:02 +03:00
Andrei Zavatski
7d8252183e
CI fix
2019-11-20 19:42:57 +03:00
Andrei Zavatski
e820ddd3e8
Implement settings keywords
2019-11-20 19:27:34 +03:00
Berkan Diler
66a3837ff4
Fix CI
2019-11-20 14:25:44 +01:00
Berkan Diler
6cab517b2d
.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.
2019-11-20 13:37:47 +01:00
Dean Herbert
3ba9f840fd
Fix song select not always scrolling to the correct location
2019-11-20 19:39:13 +09:00
Dean Herbert
a81c26577d
Fix carousel filtering twice on startup due to unpopulated rule… ( #6833 )
...
Fix carousel filtering twice on startup due to unpopulated ruleset
2019-11-20 19:39:00 +09:00
Huo Yaoyuan
374ef6ff83
Merge branch 'master' into sharpen
2019-11-20 17:30:58 +08:00
Dean Herbert
8d7be98b8b
Move to .NET Standard 2.1 ( #6837 )
...
Move to .NET Standard 2.1
Co-authored-by: Shane Woolcock <samahnub@gmail.com>
2019-11-20 17:57:00 +09:00
Dean Herbert
8c9ed99b1b
Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter
2019-11-20 17:24:54 +09:00
Dean Herbert
5b416eb7ba
Move initial filter to run on entering
2019-11-20 17:24:43 +09:00
Dean Herbert
e0f59d8e24
Move method
2019-11-20 15:43:00 +09:00
Dean Herbert
bcb1504110
Fix naming
2019-11-20 15:40:35 +09:00
smoogipoo
6288e6da56
Add null check
2019-11-20 13:42:54 +09:00
smoogipoo
76ed573c56
Fix crash when loading results after gameplay
2019-11-20 12:21:49 +09:00
iiSaLMaN
08b8cedfdf
Add setter to legacy skin configuration access
2019-11-20 01:15:40 +03:00
iiSaLMaN
0407d2248c
Merge remote-tracking branch 'refs/remotes/upstream/master' into add-access-to-skin-legacy-version
2019-11-20 01:10:32 +03:00
Huo Yaoyuan
b5c20fecee
Merge branch 'master' into netstandard2.1
2019-11-19 21:40:12 +08:00
Huo Yaoyuan
608785b99a
Update .Net Standard projects to 2.1
2019-11-18 18:35:58 +08:00
Huo Yaoyuan
53bc2dcab7
Use costum displaying text for inherited references.
2019-11-18 15:29:18 +08:00
Huo Yaoyuan
4d1513cef6
Sadly, xmldoc doesn't support tuple elements.
2019-11-17 21:01:56 +08:00
Huo Yaoyuan
b04bca7db6
Reference elements in origin definition.
2019-11-17 20:55:40 +08:00
Huo Yaoyuan
b1b234c6fb
Use paramref.
2019-11-17 20:49:36 +08:00
Huo Yaoyuan
f05b83d7d4
Use typeparamref.
2019-11-17 20:48:23 +08:00
Andrei Zavatski
509440ea14
TotalCommentsCounter implementation
2019-11-16 18:02:34 +03:00
Dean Herbert
e9e37fc821
Add private setter for FilterControl
2019-11-15 18:23:35 +09:00
Dean Herbert
296fff9243
Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter
2019-11-15 18:20:36 +09:00
Andrei Zavatski
f2862e95e0
CI fix
2019-11-15 12:15:51 +03:00
Andrei Zavatski
e51fd00d58
CI fix
2019-11-15 12:09:31 +03:00
Andrei Zavatski
18f77008db
Update dependency
2019-11-15 12:04:01 +03:00
smoogipoo
10287eb66d
Add debounce logic in several places
2019-11-15 17:58:47 +09:00
Andrei Zavatski
9fd225bda7
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-mod-selector-new
2019-11-15 11:58:05 +03:00
Andrei Zavatski
2592a0489b
Use existing ModNoMod
2019-11-15 11:57:40 +03:00
Andrei Zavatski
1218d41b50
Make Ruleset a property
2019-11-15 11:52:49 +03:00
smoogipoo
1b4bcb81c8
Fix filtering breaking on secondary filters
2019-11-15 17:49:02 +09:00
Andrei Zavatski
b7efc276f1
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-11-15 11:42:32 +03:00
Dean Herbert
813aebca1d
Remove unintentional dependency
2019-11-15 14:51:01 +09:00
Dean Herbert
eee5902851
Merge remote-tracking branch 'upstream/master' into lead-in-fixes
2019-11-15 14:05:31 +09:00
Dean Herbert
2c3109980a
Fix broken merge
2019-11-15 13:51:39 +09:00
Dean Herbert
6d06b444ba
Allow screen to specify whether to apply audio rate adjustments from mods
2019-11-15 13:47:14 +09:00
Dean Herbert
b8bb97607b
Merge remote-tracking branch 'upstream/master' into fix-mod-retention
2019-11-15 13:46:44 +09:00
Dan Balasescu
644c581c92
Merge branch 'master' into fix-duplicate-online-ids
2019-11-15 11:12:06 +09:00
smoogipoo
f0b7b2e1c4
Fix broken test case
2019-11-15 11:07:16 +09:00
Dean Herbert
0e587cb9f5
Merge branch 'master' into fix-duplicate-online-ids
2019-11-15 10:18:53 +09:00
Dean Herbert
6d54846462
Null online id on lookup failure
2019-11-15 10:18:47 +09:00
Dan Balasescu
cd9902cc9f
Merge branch 'master' into commit-on-focus-lost
2019-11-15 08:58:59 +09:00
Dan Balasescu
22e46c560c
Merge branch 'master' into dedupe-same-hash
2019-11-15 08:31:46 +09:00
smoogipoo
956fb9912d
Hook up multiplayer search filter
2019-11-15 08:23:56 +09:00
Huo Yaoyuan
0998afdbdb
Use ReferenceEquals instead of SequenceEqual.
2019-11-14 19:38:08 +08:00
iiSaLMaN
d2ce0878bc
Change 'current' accessibility to protected
2019-11-14 14:20:29 +03:00
iiSaLMaN
4e79bbad6b
Add inline comment
2019-11-14 14:19:42 +03:00
Dean Herbert
12243aaa9a
Dedupe .osu files with same hash in same set
2019-11-14 19:38:20 +09:00
Dean Herbert
fbf81207d4
Don't assign server-fetched online id if it was assigned elsewhere
2019-11-14 18:55:12 +09:00
Dean Herbert
1bc0eae2a6
Fix beatmap online retrieval response running incorrectly scheduled
2019-11-14 18:53:45 +09:00
Dean Herbert
81033e1fdf
Add extra logging
2019-11-14 18:52:07 +09:00
Huo Yaoyuan
677717875e
Change a case to EqualityComparer.Default to handle null properly.
2019-11-14 17:35:02 +08:00
Huo Yaoyuan
f25b1ba06f
Merge branch 'master' into equals
2019-11-14 17:33:44 +08:00
Dean Herbert
bf567e6df5
Make settings textboxes commit on focus lost
2019-11-14 14:19:55 +09:00
Dean Herbert
c15f909d83
Remove local bindable at song select, along with misplaced reset logic
2019-11-14 13:29:06 +09:00
Dean Herbert
d8a5750e5d
Fix typo
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2019-11-14 08:38:01 +09:00
Dean Herbert
a580b9079a
Reword comment
2019-11-14 08:28:41 +09:00
Andrei Zavatski
2d3fadc1a8
Don't update mod filter visibility on every beatmap change
2019-11-14 00:38:37 +03:00
Andrei Zavatski
633c497602
Hide content if beatmap has no leaderboard
2019-11-13 17:36:08 +03:00
Huo Yaoyuan
87d40cf8d0
Resolve equals usages.
2019-11-13 22:35:50 +08:00
Andrei Zavatski
d1853ea55b
Fix incorrect formatting for switch/case
2019-11-13 17:29:50 +03:00
Andrei Zavatski
8005ee73af
Trim whitespace
2019-11-13 17:23:46 +03:00
Andrei Zavatski
3f6140db6d
Improve loading animation
2019-11-13 17:18:58 +03:00
Andrei Zavatski
4e90daf212
Implement NoScoresPlaceholder
2019-11-13 16:39:33 +03:00
iiSaLMaN
172e777416
Fix preview track manager permanently muting game tracks
2019-11-13 16:16:06 +03:00
iiSaLMaN
47cbd516f3
Revert "Fix preview track manager potentially not updating"
...
This reverts commit 8f7fd9993d
2019-11-13 16:11:13 +03:00
Andrei Zavatski
2dbee5da79
Update dependency
2019-11-13 16:06:37 +03:00
Andrei Zavatski
6715b25ddd
Apply suggestions
2019-11-13 16:04:15 +03:00
iiSaLMaN
8f7fd9993d
Fix preview track manager potentially not updating
2019-11-13 14:24:22 +03:00
Dean Herbert
110c155fa0
Fix background loading twice when entering song select
2019-11-13 19:42:05 +09:00
Dean Herbert
280c1a0eb4
Fix carousel filtering twice on startup due to unpopulated ruleset
2019-11-13 19:04:52 +09:00
Dean Herbert
bca1be0bfa
Add failing test
2019-11-13 18:54:33 +09:00
smoogipoo
76ab0ecd3c
Disallow deselections with right clicks
2019-11-13 17:21:55 +09:00
Dean Herbert
f11ad7535d
Merge branch 'master' into rankings-tables
2019-11-13 15:39:13 +09:00
Dean Herbert
dfc6973d70
Merge branch 'master' into fallback-to-skin-combo-colours
2019-11-13 15:39:12 +09:00
Dean Herbert
c8e06dd1f0
Merge branch 'master' into sharpraven-deprecation
2019-11-13 15:39:10 +09:00
Dean Herbert
230de261c8
Merge branch 'master' into fix-popup-dialog-button
2019-11-13 15:39:08 +09:00
Dean Herbert
0292cea2c4
Merge branch 'master' into beatmap-mod-selector
2019-11-13 15:39:08 +09:00
Dean Herbert
367d12aef9
Merge branch 'master' into beatmap-overlay-mod-selector-new
2019-11-13 15:39:06 +09:00
Dean Herbert
ce60f8262c
Merge branch 'master' into sharpen
2019-11-13 15:38:59 +09:00
Dean Herbert
c751328665
Disable button when not logged in
2019-11-13 12:13:33 +09:00
Andrei Zavatski
5f609b48da
Use local bindable for api.LocalUser
2019-11-13 00:29:28 +03:00
Andrei Zavatski
99ec84ed38
Update dependency
2019-11-13 00:26:19 +03:00
Andrei Zavatski
2719be7769
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-mod-selector-new
2019-11-13 00:24:40 +03:00
Andrei Zavatski
27f721eec2
Use = instead of += for OnSelectionChanged Action
2019-11-13 00:24:13 +03:00
Andrei Zavatski
aca3690d77
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-11-13 00:20:51 +03:00
Andrei Zavatski
3903e59f2f
Add null check for notification overlay
2019-11-13 00:01:13 +03:00
Andrei Zavatski
dfd5c88075
Typo fix
2019-11-13 00:00:08 +03:00
Huo Yaoyuan
8a1276db3a
Change to use instance API of sentry.
2019-11-12 22:16:48 +08:00
Huo Yaoyuan
6ae6603ded
Cleanup.
2019-11-12 22:08:16 +08:00
Ganendra Afrasya
8276428efc
Add IsPresent check when dialog popping out
2019-11-12 20:48:26 +07:00
Huo Yaoyuan
e01a50e4b3
Correct disposal.
2019-11-12 21:39:38 +08:00
Huo Yaoyuan
de732c6c24
Change code to use Sentry client.
2019-11-12 21:12:38 +08:00
Dean Herbert
da819261e0
Shrink and darken loading layer to better suit button
2019-11-12 21:38:16 +09:00
Dean Herbert
5110ae82a1
Tidy up implementation
2019-11-12 21:38:08 +09:00
Huo Yaoyuan
1349289c0e
Remove SharpRaven package and install Sentry.
2019-11-12 20:32:41 +08:00
Dean Herbert
61464c5c89
Fix potential nullref in unrelated test
2019-11-12 21:27:15 +09:00
Huo Yaoyuan
f3f5094c26
Convert delegate to local function.
2019-11-12 20:14:22 +08:00
Huo Yaoyuan
42a98c5d87
Use constants.
2019-11-12 20:07:01 +08:00
Huo Yaoyuan
d60493a961
Use discards.
2019-11-12 20:03:21 +08:00
Huo Yaoyuan
144812669d
Use static local functions.
2019-11-12 19:56:54 +08:00
Huo Yaoyuan
dcfa98414f
Use ??=.
2019-11-12 19:56:51 +08:00
Huo Yaoyuan
64fc5007fc
Use language primitive types.
2019-11-12 19:56:45 +08:00
Huo Yaoyuan
ca52d09e81
Enforce expression body for typical simple ones.
2019-11-12 19:56:37 +08:00
Huo Yaoyuan
8a1b70513c
No this. qualification.
2019-11-12 19:55:29 +08:00
Huo Yaoyuan
31cc0d13da
Use 'out var'.
2019-11-12 19:55:26 +08:00
Huo Yaoyuan
0d81b96c5f
Use deconstruction declaration.
2019-11-12 19:55:22 +08:00
Huo Yaoyuan
e5e8e70704
Use pattern matching.
2019-11-12 19:55:19 +08:00
Huo Yaoyuan
7d7b9e36b2
Use compound assignment.
2019-11-12 19:53:50 +08:00
Huo Yaoyuan
bbeab6fa76
Use auto property.
2019-11-12 19:53:25 +08:00
Dean Herbert
58df6930b2
Get error message from server
2019-11-12 19:34:20 +09:00
Dean Herbert
f04d7f733f
Merge remote-tracking branch 'upstream/master' into favourite-beatmap
2019-11-12 19:19:29 +09:00
Dean Herbert
758c304d92
Merge branch 'master' into fallback-to-skin-combo-colours
2019-11-12 19:00:05 +09:00
Dean Herbert
a83c3523ae
Merge branch 'master' into rankings-tables
2019-11-12 18:59:43 +09:00
Dean Herbert
4b66ce0c52
Merge branch 'master' into slider-controlpoint-addition
2019-11-12 18:13:27 +09:00
Dean Herbert
dd196385cb
Add Ctrl+A to select all and Escape to deselect all ( #6803 )
...
Add Ctrl+A to select all and Escape to deselect all
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-12 18:10:45 +09:00
Dean Herbert
cdd87a6903
Merge branch 'master' into delete-selection
2019-11-12 17:59:43 +09:00
Dean Herbert
2066da6c3c
Lookup tournament player statistics for the correct ruleset ( #6807 )
...
Lookup tournament player statistics for the correct ruleset
2019-11-12 17:53:39 +09:00
Dean Herbert
46d02d9077
Update framework
2019-11-12 17:37:01 +09:00
Dean Herbert
faa5997b48
Move scaling container to OsuGame so OsuGameBase doesn't apply… ( #6804 )
...
Move scaling container to OsuGame so OsuGameBase doesn't apply UI scale
2019-11-12 16:40:49 +09:00
Dean Herbert
0113ab5e56
Add local preserving container to OsuTestScene to ensure correc… ( #6805 )
...
Add local preserving container to OsuTestScene to ensure correct test dimensions
2019-11-12 16:40:40 +09:00
Dean Herbert
3ab332e60b
Implement hitobject sound adjustment ( #6762 )
...
Implement hitobject sound adjustment
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-12 16:40:15 +09:00
Dean Herbert
e32f88c770
Fix home button not closing login and now playing overlays ( #6758 )
...
Fix home button not closing login and now playing overlays
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-12 15:40:28 +09:00
Dean Herbert
47be20fa37
Private set on track for safety
2019-11-12 15:13:47 +09:00
Dean Herbert
712a2f6918
Merge remote-tracking branch 'upstream/master' into fix-playing-multiple-beatmap-preview-tracks
2019-11-12 15:10:42 +09:00
Dean Herbert
35351d7f7c
Use variable instead of duplicated list
2019-11-12 15:04:51 +09:00
Dean Herbert
25eb964290
Simplify overlay adding logic
2019-11-12 15:03:58 +09:00
smoogipoo
10fd5ef5a7
Merge context menus
2019-11-12 15:02:27 +09:00
Andrei Zavatski
a69a4643c9
Simplify LINQ expressions
2019-11-12 08:45:21 +03:00
Dean Herbert
b4525c1f6e
Fix right clicking to select not showing context menu
2019-11-12 14:42:30 +09:00
Andrei Zavatski
fa01e11a6e
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-11-12 08:25:42 +03:00
smoogipoo
3f8928ca25
Suppress warnings
2019-11-12 13:41:54 +09:00
smoogipoo
ed11c72d0b
Merge remote-tracking branch 'origin/master' into selection-hitsound-addition
2019-11-12 13:40:25 +09:00
smoogipoo
9f1d490ac9
Only handle selection input on blueprints
2019-11-12 12:18:24 +09:00
Dean Herbert
e28ddec8d6
Merge branch 'master' into fix-home-not-closing-all-overlays
2019-11-12 12:05:19 +09:00
Dean Herbert
4516da223d
Merge branch 'master' into fix-mod-section-overflow
2019-11-12 11:35:01 +09:00
Dean Herbert
2f8768a4b1
Move LabelledDropdown local to usage
2019-11-12 11:04:49 +09:00
Dean Herbert
bedd136c81
Merge remote-tracking branch 'upstream/master' into lookup-players-for-ruleset
2019-11-12 11:02:36 +09:00
Dean Herbert
a43b0ee01b
Apply naming and styling changes
2019-11-12 10:45:46 +09:00
Dean Herbert
b37bf4ea01
Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition
2019-11-12 10:44:53 +09:00
Dean Herbert
52ab309295
Merge branch 'master' into stateful-menu-items
2019-11-12 10:31:50 +09:00
Dean Herbert
5bb65d0716
Rename button class
2019-11-12 10:21:06 +09:00
Dean Herbert
0f23844c5d
Merge remote-tracking branch 'upstream/master' into lookup-players-for-ruleset
2019-11-12 09:47:12 +09:00
Andrei Zavatski
0578f91a76
Small logic adjustments
2019-11-11 19:06:46 +03:00
Andrei Zavatski
32cc7b3d4d
CI fix
2019-11-11 19:04:50 +03:00
Andrei Zavatski
c5b64e26a3
Layout adjustment
2019-11-11 18:51:29 +03:00
Andrei Zavatski
5f5d130d1a
Update mod filter visibility on user change
2019-11-11 18:40:57 +03:00
Andrei Zavatski
31191dadf1
Handle mods change
2019-11-11 18:31:42 +03:00
Andrei Zavatski
2cfd54ca0d
Handle scope changing
2019-11-11 18:27:48 +03:00
Andrei Zavatski
00b9229737
Add mod filter to beatmap overlay
2019-11-11 18:21:07 +03:00
Andrei Zavatski
32b2f5e330
Use Bindable for ScoresContainer
2019-11-11 18:10:25 +03:00
Andrei Zavatski
3655f88180
Merge dependency
2019-11-11 17:56:57 +03:00
Andrei Zavatski
4145e25f7b
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-11-11 17:55:10 +03:00
Huo Yaoyuan
e9b8cbb516
Apply other styles.
2019-11-11 20:27:04 +08:00
Huo Yaoyuan
ccc8aa6fa4
Apply brace style.
2019-11-11 20:13:13 +08:00
Dean Herbert
bed62e0d2f
Rename ThreeState -> TernaryState and add basic tests
2019-11-11 18:56:18 +09:00
Dean Herbert
c0f6e4687a
Merge branch 'master' into stateful-menu-items
2019-11-11 18:33:50 +09:00
dependabot-preview[bot]
a345fd8a86
Bump Newtonsoft.Json from 12.0.2 to 12.0.3
...
Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json ) from 12.0.2 to 12.0.3.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases )
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/12.0.2...12.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 09:26:56 +00:00
iiSaLMaN
6d3d7c5d95
Remove unnecessary use of local
2019-11-11 11:57:14 +03:00
Dean Herbert
fced262c41
Add labelled dropdown component
2019-11-11 17:39:24 +09:00
Dan Balasescu
f27398e899
Merge branch 'master' into infrastructure
2019-11-11 16:02:05 +09:00
Dean Herbert
df51f138c0
Merge branch 'master' into edit-select-all
2019-11-11 15:44:26 +09:00
Dean Herbert
13fd95d513
Remove misplaced usings
2019-11-11 14:03:29 +09:00
Dean Herbert
8ac708ada5
Move scaling container to OsuGame so OsuGameBase doesn't apply UI scale
2019-11-11 13:58:35 +09:00
Dean Herbert
dc88bd3d61
Add local preserving container to OsuTestScene to ensure correct test dimensions
2019-11-11 13:52:04 +09:00
smoogipoo
f3dc38e342
Add Ctrl+A to select all (esc to deselect all)
2019-11-11 13:41:10 +09:00
smoogipoo
e924a5d51e
Disable ruleset input in the editor
2019-11-11 13:04:43 +09:00
Dean Herbert
fd7bdc03ab
Merge remote-tracking branch 'upstream/master' into infrastructure
2019-11-11 11:11:59 +09:00
Dean Herbert
9db73d33cc
Remove horizontal padding on toolbar ruleset selector ( #6780 )
...
Remove horizontal padding on toolbar ruleset selector
2019-11-11 10:02:30 +09:00
Andrei Zavatski
93954c8da0
Use BindableList for selected mods
2019-11-10 23:58:07 +03:00
iiSaLMaN
8f4916ad2d
Add inline comment
2019-11-10 23:53:31 +03:00
Andrei Zavatski
e3d8e29cdd
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-11-10 23:38:41 +03:00
iiSaLMaN
9d61d73ced
Change Track and TrackManagerPreviewTrack accessibilities
2019-11-10 23:09:04 +03:00
iiSaLMaN
20ed6c4d52
Use track check solution for this
2019-11-10 23:07:51 +03:00
Dean Herbert
45e1501c02
Merge branch 'master' into infrastructure
2019-11-09 16:23:58 +09:00
Dean Herbert
5c47641608
Reorder conditional
2019-11-09 16:23:22 +09:00
Joehu
b675024161
Remove horizontal padding on toolbar ruleset selector
2019-11-08 20:28:24 -08:00
Dean Herbert
683916967c
Merge branch 'master' into vote-pill-fix
2019-11-09 12:15:48 +09:00
Dean Herbert
2dd514012a
Update framework
2019-11-08 23:28:22 +09:00
Joehu
ff225c3691
Remove toolbarElements
2019-11-08 06:04:18 -08:00
Huo Yaoyuan
6ebe02f409
Merge branch 'master' into infrastructure
2019-11-08 21:19:59 +08:00
smoogipoo
97ea07db0e
Add delete option to the right-click menu
2019-11-08 19:44:47 +09:00
iiSaLMaN
8ef9ccc39e
Schedule new track assignment after stopping current track
2019-11-08 13:19:06 +03:00
Dean Herbert
c70c05c896
Less sickening parallax ( #6743 )
...
Less sickening parallax
2019-11-08 19:15:25 +09:00
Dean Herbert
5699f3e22b
Seek to the first hitobject when entering the editor ( #6766 )
...
Seek to the first hitobject when entering the editor
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-08 19:15:08 +09:00
Dan Balasescu
1c1a49011b
Merge branch 'master' into infrastructure
2019-11-08 19:10:49 +09:00
Dean Herbert
ac0ec0d66e
Read initial beat divisor value from the beatmap ( #6765 )
...
Read initial beat divisor value from the beatmap
2019-11-08 19:06:25 +09:00
Dean Herbert
a849bc0746
Move implementation into resetTrack for safety
2019-11-08 18:51:01 +09:00
smoogipoo
e904928314
Seek to first hitobject when entering editor
2019-11-08 17:42:19 +09:00
smoogipoo
36cc79f04f
Softly handle invalid beat divisors instead of throwing
2019-11-08 17:28:11 +09:00
smoogipoo
998e1dfe47
Fix non-1/1 initial beat divisor control display
2019-11-08 17:23:47 +09:00
smoogipoo
eb9fff96ba
Read default beat divisor from beatmap
2019-11-08 17:22:58 +09:00
Dean Herbert
8bcbc93501
Fix tournament buttons playing sound effects
2019-11-08 17:00:47 +09:00
smoogipoo
df08a95734
Separate addition/removal into separate methods
2019-11-08 16:46:58 +09:00
smoogipoo
b4cb4c1243
Remove previous samples on change
2019-11-08 16:19:55 +09:00
smoogipoo
a9b4106075
Remove unnecessary (for now) scheduling
2019-11-08 16:19:43 +09:00
smoogipoo
53e6186b6d
Fix drawable hitobject samples not updating
2019-11-08 14:59:47 +09:00
smoogipoo
6fc1be64c2
Make hitobject samples a bindable list
2019-11-08 14:04:57 +09:00
smoogipoo
864b8db638
Use three states for the hitsound menu items
2019-11-08 13:52:36 +09:00
smoogipoo
046f0b0fe5
Allow right-clicks to trigger selection
2019-11-08 13:40:47 +09:00
smoogipoo
573d11503e
Remove unused using
2019-11-08 13:36:17 +09:00
smoogipoo
abb3a6ca5b
Initial right click context menu implementation
2019-11-08 13:36:17 +09:00
smoogipoo
a2c265c147
Separate ThreeStates into its own file
2019-11-08 13:23:13 +09:00
smoogipoo
011bf09516
Add xmldocs and cleanup
2019-11-08 13:23:13 +09:00
smoogipoo
0a15a13fab
Reorder parameters
2019-11-08 13:23:13 +09:00
smoogipoo
30f877c4ab
Implement a three-state menu item
2019-11-08 13:23:13 +09:00
smoogipoo
ce08d664a5
Abstract statefulness of new menu item type
2019-11-08 13:23:13 +09:00
smoogipoo
4fe69dbc89
Fix context menu sub-menu display
2019-11-08 13:23:13 +09:00
Joehu
5235d2b319
Fix home button not closing login and now playing overlays
2019-11-07 14:38:06 -08:00
iiSaLMaN
cee16e9419
Merge remote-tracking branch 'refs/remotes/upstream/master' into fallback-to-skin-combo-colours
2019-11-07 19:11:29 +03:00
smoogipoo
c3a3b4091b
Add basic implementation of a toggleable menu item
2019-11-07 22:26:35 +09:00
iiSaLMaN
9874ce49ce
Move fallback allowance to the skin configuration only.
2019-11-07 15:55:34 +03:00
iiSaLMaN
808543885f
Change ComboColours type to IReadOnlyList<Color4>
...
Also exposes functions to modify the internal list (AddComboColours, ClearComboColours)
2019-11-07 15:54:30 +03:00
smoogipoo
29672c48e1
Make simple OsuMenuItem ctor invoke the complex one
2019-11-07 16:04:13 +09:00
smoogipoo
20d6eceecf
Move DrawableOsuMenuItem out of OsuMenu
2019-11-07 16:03:35 +09:00
Andrei Zavatski
446e2894f7
Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix
2019-11-07 08:48:35 +03:00
smoogipoo
f3ddc4c00b
Advance editor clock after a snapped placement
2019-11-07 14:08:02 +09:00
Dean Herbert
d400e4a5f6
Add shared constant for parallax amount
2019-11-07 09:30:50 +09:00
Bartłomiej Dach
70feab8316
Merge branch 'master' into prev-button-revamp
2019-11-06 22:41:33 +01:00
iiSaLMaN
61778232d8
Rewrite inline comment
2019-11-06 23:24:54 +03:00
iiSaLMaN
cef6e2a26b
Move colours fallback logic to SkinConfiguration.ComboColours getter
2019-11-06 23:20:36 +03:00
iiSaLMaN
198a1750c3
Use is pattern matching
2019-11-06 20:46:02 +03:00
iiSaLMaN
69d9a0ae1a
Use null check and pattern matching
2019-11-06 20:30:26 +03:00
iiSaLMaN
ba14345107
Specify culture and number style
2019-11-06 20:27:55 +03:00
iiSaLMaN
947602f70a
Specify why legacy version is nullable
2019-11-06 20:24:19 +03:00
iiSaLMaN
502dcc5669
Fix incorrect skin version case
2019-11-06 20:23:22 +03:00
iiSaLMaN
55230a36dd
Set correct legacy version
2019-11-06 19:58:07 +03:00
iiSaLMaN
6ecea0e4c1
Fix DummyAPIAccess being potentially incorrect
2019-11-06 18:15:49 +03:00
Andrei Zavatski
c01f3a58cb
Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix
2019-11-06 18:15:49 +03:00
Dean Herbert
3bc4685a46
Merge pull request #6692 from peppy/fix-network-stalls
...
Use LongRunningLoad on network load components
2019-11-06 19:54:30 +09:00
Dean Herbert
70cf91fb40
Seek editor when hit objects are double clicked ( #6745 )
...
Seek editor when hit objects are double clicked
2019-11-06 19:22:41 +09:00
Andrei Zavatski
423e26a4d1
Fix header text could be sticked together
2019-11-06 13:07:25 +03:00
Dean Herbert
91bcb5d4a7
Merge remote-tracking branch 'upstream/master' into fix-network-stalls
2019-11-06 19:06:28 +09:00
Andrei Zavatski
0f53725005
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables
2019-11-06 13:03:34 +03:00
Andrei Zavatski
b35b3484ca
Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix
2019-11-06 12:46:28 +03:00
Andrei Zavatski
4330507da8
Use api.IsLoggedIn
2019-11-06 12:46:25 +03:00
Dean Herbert
46a0fbe561
Share framework file-exclusion function ( #6668 )
...
Share framework file-exclusion function
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-06 18:40:22 +09:00
Dean Herbert
a6d000baa2
Fix audio preview muting game audio indefinitely when beatmap p… ( #6738 )
...
Fix audio preview muting game audio indefinitely when beatmap panel is off-screen
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-06 18:34:17 +09:00
Dean Herbert
0df0260dd9
Disallow selections to be moved outside of the playfield ( #6742 )
...
Disallow selections to be moved outside of the playfield
2019-11-06 18:29:06 +09:00
Andrei Zavatski
1f3b209a6c
Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix
2019-11-06 12:26:41 +03:00
smoogipoo
3680e7c704
Seek editor when hit objects are double clicked
2019-11-06 18:15:57 +09:00
Dean Herbert
aaa06396f0
Reduce editor parallax
2019-11-06 18:11:56 +09:00
Dean Herbert
ee4839b7e7
Reduce delay on parallax
2019-11-06 18:09:36 +09:00
Dean Herbert
813d3a0bfa
Fix adjustments not being removed correctly on retry from pause ( #6728 )
...
Fix adjustments not being removed correctly on retry from pause
2019-11-06 17:54:20 +09:00
Dean Herbert
143f316cbe
Merge branch 'master' into fix-network-stalls
2019-11-06 17:54:08 +09:00
Dan Balasescu
402eedce03
Merge branch 'master' into reuse-framework-exclusuion-function
2019-11-06 17:48:26 +09:00
Dan Balasescu
1e52c83804
Merge branch 'master' into fix-preview-not-stopping
2019-11-06 17:47:54 +09:00
Dean Herbert
09e9ef0e4b
Add background colour to music player ProgressBar ( #6741 )
...
Add background colour to music player ProgressBar
2019-11-06 17:44:08 +09:00
smoogipoo
2c1bfd62ef
Disallow selections to be moved outside of the playfield
2019-11-06 17:28:04 +09:00
Dean Herbert
c631a05a44
Add ability to edit individual ControlPoint attributes from tim… ( #6638 )
...
Add ability to edit individual ControlPoint attributes from timing screen
2019-11-06 17:24:51 +09:00
Dean Herbert
a2963b66f6
Limit distance snap between two adjacent hit objects ( #6740 )
...
Limit distance snap between two adjacent hit objects
2019-11-06 17:18:00 +09:00
Dan Balasescu
ff6bfc453b
Merge pull request #6718 from peppy/update-framework
...
Update framework
2019-11-06 16:38:15 +09:00
Dean Herbert
23eab68c72
Merge remote-tracking branch 'upstream/master' into editor-timing-screen-2
2019-11-06 16:22:55 +09:00
Ganendra Afrasya
02c21a1379
Make progress bar hoverable
2019-11-06 14:11:47 +07:00
Ganendra Afrasya
d985d04857
Add background colour to music player ProgressBar
2019-11-06 14:07:34 +07:00
Dean Herbert
c1a6cb1def
Fix audio preview muting game audio indefinitely when beatmap panel is off-screen
2019-11-06 15:58:47 +09:00
smoogipoo
020b08b450
Initial implementation of limited distance snap
2019-11-06 15:27:48 +09:00
smoogipoo
0b09fb293e
Fix background being coloured
2019-11-06 15:16:00 +09:00
Dean Herbert
a3d8738cab
Merge branch 'master' into vote-pill-fix
2019-11-06 14:52:06 +09:00
Dean Herbert
ebfb5d050d
Move section update code to abstract method to avoid incorrect BindValue usage
2019-11-06 14:36:43 +09:00
Dean Herbert
4ce3450cfc
Move button implementation to OsuButton
2019-11-06 14:08:52 +09:00
smoogipoo
322a1f0a86
Fix potential nullref
2019-11-06 12:45:35 +09:00
smoogipoo
7cd4cb8a93
Rename selectedPoints to selectedGroup
2019-11-06 12:32:12 +09:00
smoogipoo
9dd7f997d2
Reoder SampleSection to match others
2019-11-06 12:17:18 +09:00
smoogipoo
f20bfe7a55
Fix extra semicolon
2019-11-06 12:16:48 +09:00
Dean Herbert
8cf349c1ee
Update once more
2019-11-06 12:10:53 +09:00
Dean Herbert
b4ae02cc69
Merge remote-tracking branch 'upstream/master' into update-framework
2019-11-06 12:09:51 +09:00
Dan Balasescu
b5a8bbaa60
Merge branch 'master' into editor-timing-screen
2019-11-06 12:02:00 +09:00
Dean Herbert
cd1dd0f898
Fix adjustments not being removed correctly on retry from pause
2019-11-06 10:38:04 +09:00
Dean Herbert
52dba69a64
Implement slider control point deletion ( #6679 )
...
Implement slider control point deletion
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-05 19:15:15 +09:00
Dean Herbert
f0a6fbdeb0
Fix selecting underneath selected blueprints ( #6719 )
...
Fix selecting underneath selected blueprints
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-05 18:48:46 +09:00
Dean Herbert
3b8dc57ad3
Disable input for non-selected blueprints ( #6717 )
...
Disable input for non-selected blueprints
2019-11-05 18:34:43 +09:00
Dean Herbert
f4b93ec943
Add exception when holding control
2019-11-05 18:29:08 +09:00
Dean Herbert
f77de7d880
Simplify implementation
2019-11-05 18:25:38 +09:00
smoogipoo
0db34a47f8
Fix selecting underneath selected blueprints
2019-11-05 17:28:42 +09:00
Dean Herbert
44d0791676
Update button usage
2019-11-05 16:26:31 +09:00
Dan Balasescu
0758025b6b
Merge branch 'master' into reuse-framework-exclusuion-function
2019-11-05 16:18:16 +09:00
Dean Herbert
fe374eabe0
Update framework
2019-11-05 15:47:01 +09:00
smoogipoo
7c20a589f2
Remove unused usings
2019-11-05 13:56:21 +09:00
smoogipoo
c8beb5296f
Use PlatformAction.Delete instead of Delete key
2019-11-05 13:26:44 +09:00
Dan Balasescu
23ad516348
Merge branch 'master' into game-handles-links
2019-11-05 12:33:32 +09:00
smoogipoo
64d900b387
Disable input for non-selected blueprints
2019-11-05 11:33:37 +09:00
unknown
a92b32f6dc
add basic tests
2019-11-05 00:56:09 +08:00
unknown
2bc6932567
make interface mod applicable
2019-11-05 00:55:55 +08:00
unknown
1216d66a4c
Merge remote-tracking branch 'origin/customized-mods' into customized-mods
2019-11-04 23:21:45 +08:00
Dean Herbert
eb1ec78b33
Disable retry hotkey overlay when viewing results from leaderbo… ( #6702 )
...
Disable retry hotkey overlay when viewing results from leaderboard
2019-11-04 12:34:18 +09:00
Bartłomiej Dach
539f8ad6dd
Remove overlay when viewing leaderboard scores
...
Do not add the hold-to-retry hotkey overlay if the user has navigated
to the results screen from the leaderboard and not from gameplay.
2019-11-04 01:57:31 +01:00
Dean Herbert
1a7b803d4d
Change colour to green to match web implementation
2019-11-04 08:39:51 +09:00
Dean Herbert
c71a082ffe
Merge branch 'master' into user-score-highlight
2019-11-04 08:18:18 +09:00
Joehu
fe23b9a262
Fix mod section overflowing mod select overlay at higher ui scale
2019-11-03 07:32:47 -08:00
Andrei Zavatski
48385dbdfe
Layout adjustments
2019-11-03 14:31:23 +03:00
Andrei Zavatski
daefabf271
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables
2019-11-03 14:16:33 +03:00
Dean Herbert
1155aacd90
Update sliders when control points change ( #6680 )
...
Update sliders when control points change
2019-11-03 19:05:48 +09:00
Dean Herbert
6bc62385b6
Merge branch 'master' into slider-controlpoint-selection
2019-11-03 15:28:50 +09:00
Dean Herbert
fe3583b6ee
Move schedule call
2019-11-03 13:16:54 +09:00
Dean Herbert
5127b52c25
Merge remote-tracking branch 'upstream/master' into game-handles-links
2019-11-03 13:04:18 +09:00
Dean Herbert
6dde755ef2
Merge branch 'master' into add-retry-button
2019-11-02 21:23:16 +09:00
Dean Herbert
fd13f0bc55
Move ReplayDownloadButton to correct namespace ( #6689 )
...
Move ReplayDownloadButton to correct namespace
2019-11-02 21:22:23 +09:00
Dean Herbert
551032803d
Fix GameplayClockContainer operating on beatmap's track after s… ( #6688 )
...
Fix GameplayClockContainer operating on beatmap's track after screen exited
2019-11-02 21:22:13 +09:00
Dan Balasescu
8a5d3ab40a
Merge branch 'master' into add-retry-button
2019-11-02 10:51:14 +09:00
Dan Balasescu
5be7d439ae
Add null check for nullable dependency
2019-11-02 10:32:23 +09:00
Andrei Zavatski
2f703090ef
Update API with latest web changes
2019-11-01 21:49:50 +03:00
Andrei Zavatski
1e73cf1025
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables
2019-11-01 21:14:09 +03:00
Ganendra Afrasya
8da15f6897
Fix all score are highlighted on local scope
2019-11-01 23:19:15 +07:00
Ganendra Afrasya
ce3b34a768
Fix UserTopScoreContainer is also tinted
2019-11-01 23:00:55 +07:00
Ganendra Afrasya
d9a91100fb
Add tint to user's score container background
2019-11-01 22:47:23 +07:00
Dean Herbert
ddd58ea3da
Use LongRunningLoad on network load components
2019-11-01 19:40:45 +09:00
Dan Balasescu
036e67bbc2
Merge pull request #6676 from peppy/fix-multi-logout-crash
...
Fix multi logout crash
2019-11-01 17:13:16 +09:00
Dean Herbert
156d0ae9b9
Remove braces
...
Co-Authored-By: Salman Ahmed <email@iisalman.me>
2019-11-01 16:08:44 +09:00
Dean Herbert
daa0ebe2b5
Add xmldoc
2019-11-01 15:51:45 +09:00
Dean Herbert
14453da1d2
Centralise MakeCurrent call
2019-11-01 15:51:10 +09:00
Dean Herbert
c532f77657
Add hold-to-retry support to results
2019-11-01 15:49:42 +09:00
Dean Herbert
84d17f3702
Add retry button
2019-11-01 15:41:51 +09:00
Dean Herbert
14fec6f1f3
Move ReplayDownloadButton to correct namespace
2019-11-01 15:06:36 +09:00
Dean Herbert
dcc8f6e827
Better group cancel conditional
2019-11-01 14:43:52 +09:00
Dean Herbert
d089e47a56
Merge branch 'master' into master
2019-11-01 14:15:57 +09:00
Dean Herbert
ac02bb005d
Fix GameplayClockContainer operating on beatmap's track after scren exited
2019-11-01 14:11:18 +09:00
Dan Balasescu
9b9366e2d7
Merge branch 'master' into fix-multi-logout-crash
2019-11-01 13:55:28 +09:00
Dean Herbert
7c3dd36add
Fix scrolling hitobjects expiring too soon ( #6687 )
...
Fix scrolling hitobjects expiring too soon
2019-11-01 13:03:51 +09:00
Dan Balasescu
770726cc95
Merge branch 'master' into fix-multi-logout-crash
2019-11-01 12:46:26 +09:00
smoogipoo
0171b2ae7c
Fix scrolling hitobjects expiring too soon
2019-11-01 12:10:03 +09:00
Dean Herbert
f038c579f0
Protect against requests to show overlays before the target overlay is ready
2019-11-01 11:41:00 +09:00
Dean Herbert
898520935e
Move link handling code to OsuGame
...
This allows for future calls from arguments / associations
2019-11-01 11:40:51 +09:00
Dan Balasescu
54681a6206
Merge branch 'master' into catch-api-request-exceptions
2019-11-01 11:33:23 +09:00
smoogipoo
41ae66d517
Update slider when control points change
2019-10-31 18:24:38 +09:00
smoogipoo
9f28b1905b
Expose composer method to update hitobject
2019-10-31 18:15:19 +09:00
Dean Herbert
ce19b2ed36
Avoid using CreateChildDependencies with a *child* bindable
...
Don't do this.
2019-10-31 17:16:26 +09:00
Dean Herbert
3e3ff81229
Reorder methods
2019-10-31 17:13:00 +09:00
Dean Herbert
4f04abf282
Fix tabs to match design (should not show pinhair line)
2019-10-31 16:54:28 +09:00
smoogipoo
cfdf710676
Add test
2019-10-31 16:51:58 +09:00
Dean Herbert
5d47a2e557
Merge branch 'master' into add-beatmap-ruleset-selector
2019-10-31 16:42:32 +09:00
Dean Herbert
bf45fa6309
Use lambda function expression
2019-10-31 16:24:03 +09:00
Dean Herbert
f8187fa301
Don't rely on masking for bar display
2019-10-31 16:23:10 +09:00
Dean Herbert
923041c3f9
Merge branch 'master' into beatmap-overlay-ruleset-selector
2019-10-31 15:15:52 +09:00
Dean Herbert
0cd912fcd3
Cover all non-APIAccess APIRequest calls with exception handling
2019-10-31 15:04:13 +09:00
Dean Herbert
5b405abc52
Schedule forcefullyExit call for safety
...
Screen state may have changed at an inopportune moment. Run on local scheduler, not API scheduler to avoid any weirdness.
2019-10-31 13:43:25 +09:00
Dean Herbert
32dabf80a6
Ensure forceful exit completely exits from mutliplayer
...
Previously it may have gotten blocked by being in a sub screen.
2019-10-31 13:42:28 +09:00
Dean Herbert
5b5703544b
Fix crash when quickly exiting multiplayer after joining a room ( #6666 )
...
Fix crash when quickly exiting multiplayer after joining a room
2019-10-31 13:15:46 +09:00
Andrei Zavatski
4730453083
Apply suggestions
2019-10-31 02:10:00 +03:00
Andrei Zavatski
d90545227c
Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix
2019-10-30 23:49:56 +03:00
Huo Yaoyuan
9d4f80c2a2
Add icon and use licence expression for NuGet.
...
Unlike framework, if other components are packed, they are likely to use different icons.
2019-10-30 23:37:58 +08:00
Huo Yaoyuan
3ad0369d7b
Resolve new diagnostics in C# 7.3
2019-10-30 23:13:11 +08:00
Huo Yaoyuan
bcf8e3a9d4
Remove redundant properties from desktop projects.
...
While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.
2019-10-30 22:56:33 +08:00
Huo Yaoyuan
31595159be
Normalize .props
2019-10-30 21:54:14 +08:00
Huo Yaoyuan
93fae7ad4d
Remove meanless properties.
2019-10-30 21:46:30 +08:00
Dean Herbert
35be8f9dfb
Share framework file-exclusion function
2019-10-30 19:34:17 +09:00
Dean Herbert
7b67701e57
Merge branch 'master' into editor-timing-screen
2019-10-30 19:27:24 +09:00
Dean Herbert
7f2916454d
Simplify EditorClock.Seek method
2019-10-30 19:09:46 +09:00
Dean Herbert
5899bbd8a6
Fix merge regressions
2019-10-30 18:45:50 +09:00
Dean Herbert
93076ad6a1
Merge branch 'master' into editor-timing-screen
2019-10-30 18:42:20 +09:00
smoogipoo
cf2d885099
Fix control points being flushed too late
2019-10-30 18:02:18 +09:00
smoogipoo
45af796943
Remove usages of EF internals
2019-10-30 17:05:15 +09:00
Dan Balasescu
514c9f1eef
Merge branch 'master' into bindable-control-points
2019-10-30 16:20:54 +09:00
Dan Balasescu
3045ba4bf4
Merge branch 'master' into bindable-control-point-properties
2019-10-30 16:02:39 +09:00
Dan Balasescu
ced6042b3e
Use internal type name
2019-10-30 15:51:09 +09:00
smoogipoo
f56d9fe50c
Forcefully part room when multiplayer exits
2019-10-30 14:42:14 +09:00
smoogipoo
b6457f0ce9
Cancel room joins on part
2019-10-30 14:41:54 +09:00
smoogipoo
95ff48c123
Don't log cancelled join requests
2019-10-30 14:38:06 +09:00
Dean Herbert
dbee63c1a6
Make OsuButton correctly block hover events ( #6636 )
...
Make OsuButton correctly block hover events
2019-10-30 12:38:16 +09:00
Dan Balasescu
4322933470
Merge branch 'master' into signin-ux-improvement
2019-10-30 12:10:52 +09:00
Andrei Zavatski
8ad5ccda68
Test steps rearrangement and condition fix
2019-10-30 04:16:14 +03:00
Andrei Zavatski
2c31492bbe
Fix comment can be voted if user is null
2019-10-30 03:27:06 +03:00
Andrei Zavatski
1502a6c631
Cleanups
2019-10-30 03:09:14 +03:00
Andrei Zavatski
092d16bb64
Dont use binding to set disabled value
2019-10-29 23:43:16 +03:00
Andrei Zavatski
30d9b21b86
Condition simplification
2019-10-29 21:57:20 +03:00
Andrei Zavatski
e287dae64b
Fix VotePill can be activated by the comment sender
2019-10-29 21:25:48 +03:00
Ganendra Afrasya
5c2917d303
Place sign in button inside ShakeContainer
2019-10-30 00:50:04 +07:00
Dean Herbert
04b0916196
Merge branch 'master' into fix-day-separator-purging
2019-10-29 18:44:39 +09:00
Dean Herbert
f4c4523034
Merge branch 'update-framework' into fix-chat-scroll-to-bottom
2019-10-29 18:17:41 +09:00
Dean Herbert
342dfc26d2
Merge remote-tracking branch 'upstream/master' into fix-chat-scroll-to-bottom
2019-10-29 18:17:38 +09:00
Dean Herbert
3f192ca915
Fix song progress not displaying correctly ( #6640 )
...
Fix song progress not displaying correctly
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-10-29 18:16:54 +09:00
Dean Herbert
e3a1613d2a
Fix PlayerSettingsOverlay being shown by default ( #6641 )
...
Fix PlayerSettingsOverlay being shown by default
2019-10-29 18:16:33 +09:00
