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
Dean Herbert
89d3f461e0
Fix download tracking components getting stuck on import failur… ( #6639 )
...
Fix download tracking components getting stuck on import failures
2019-10-29 18:16:23 +09:00
Dan Balasescu
f4ae65c3e8
Merge branch 'master' into fix-song-progress-display
2019-10-29 18:06:58 +09:00
Dean Herbert
97c1a6e86b
Update framework
2019-10-29 18:05:32 +09:00
Dan Balasescu
f0f58c22d3
Merge branch 'master' into labelled-component-bindables
2019-10-29 16:32:57 +09:00
Dean Herbert
54befb6f8f
Remove adjacent day separators
2019-10-29 15:45:41 +09:00
Dean Herbert
b06e70e546
Add failing test showing issue with day separator logic
2019-10-29 15:27:08 +09:00
Dean Herbert
09a6d1184a
Tidy up order of scroll changes
2019-10-29 14:33:05 +09:00
Dean Herbert
d1c6e3f620
Add test for scroll to end when max history is exceeded
2019-10-29 14:32:52 +09:00
Dan Balasescu
c25a243d5b
Merge branch 'master' into fix-triangles-performance
2019-10-29 13:31:33 +09:00
Dean Herbert
e93e9067a1
Fix beatmap carousel sorting instability ( #6630 )
...
Fix beatmap carousel sorting instability
2019-10-29 01:19:42 +09:00
Dean Herbert
a4a57eec54
Fix game-wide performance drop when triangles intro is used
2019-10-29 01:09:49 +09:00
Bartłomiej Dach
c181edaedf
Replace manual comparer implementation
...
Replace manually-implemented CriteriaComparer with a call to
Comparer<T>.Create() to decrease verbosity.
2019-10-28 15:07:36 +01:00
nwabear
21f59ac73a
Merge branch 'master' into master
2019-10-28 08:57:35 -05:00
Dean Herbert
1a4817879e
Fix precision changes in legacy control point types
2019-10-28 19:10:39 +09:00
Dean Herbert
46b44f4f99
Fix PlayerSettingsOverlay being shown by default
2019-10-28 18:37:58 +09:00
Dean Herbert
16e33e8bc7
Fix song progress not displaying correctly
2019-10-28 18:34:58 +09:00
Dean Herbert
cf3ed42bfc
Fix download tracking components getting stuck on import failures
2019-10-28 17:41:42 +09:00
Dean Herbert
f4668b0d59
Merge branch 'bindable-control-point-properties' into editor-timing-screen-2
2019-10-28 16:25:15 +09:00
Dean Herbert
08040adfad
Expose Current bindable in LabelledComponents
...
Adds a `LabelledDrawable` class for usages where bindables are not present.
2019-10-28 16:24:28 +09:00
Dean Herbert
6980f488dc
Make OsuButton correctly block hover events
2019-10-28 16:24:07 +09:00
Dean Herbert
090881cf6f
Add default bindable values
2019-10-28 16:23:43 +09:00
Dean Herbert
8f87957c70
Make all control point attributes bindable
...
Properties are left intact for compatibility reasons.
2019-10-28 16:23:43 +09:00
Dean Herbert
522572eace
Add ability to adjust all control point attributes
2019-10-28 16:21:31 +09:00
Dean Herbert
f761eddec7
Add default bindable values
2019-10-28 16:21:14 +09:00
Dean Herbert
9c3e54909c
Ensure tooltips of RowAttributes are up-to-date
2019-10-28 16:20:54 +09:00
Dean Herbert
0a11cbf656
Make OsuButton correctly block hover events
2019-10-28 16:20:33 +09:00
Dean Herbert
d33b31f0c5
Expose Current bindable in LabelledComponents
...
Adds a `LabelledDrawable` class for usages where bindables are not present.
2019-10-28 15:33:08 +09:00
Dean Herbert
490f87cad3
Merge branch 'bindable-control-point-properties' into editor-timing-screen-2
2019-10-28 14:46:38 +09:00
Dean Herbert
9acdcc9129
Make all control point attributes bindable
...
Properties are left intact for compatibility reasons.
2019-10-28 14:44:45 +09:00
Dean Herbert
ee5591d7d5
Add missing license headers
2019-10-28 12:42:17 +09:00
Dean Herbert
43ad4a3a3c
Tidy up string output
2019-10-28 12:31:38 +09:00
Dean Herbert
66b0004448
Remove unused logger provider class
2019-10-28 12:02:58 +09:00
Dean Herbert
1953aa64b6
Merge branch 'bindable-control-points' into editor-timing-screen
2019-10-28 12:00:51 +09:00
Dean Herbert
8069674824
Merge remote-tracking branch 'upstream/master' into bindable-control-points
2019-10-28 11:52:04 +09:00
Dean Herbert
45da22afe9
Add xmldoc and combine GroupAt / CreateGroup
2019-10-28 11:40:33 +09:00
Dean Herbert
2a6b3fd67c
Disallow inserting a group if one already exists with the current time value
2019-10-28 11:40:10 +09:00
Dean Herbert
59d983b66e
Allow binding to ControlPointInfo's Groups
2019-10-28 11:39:53 +09:00
Dean Herbert
10033239c7
Allow binding to ControlPointGroup's ControlPoints
2019-10-28 11:39:17 +09:00
Dean Herbert
29e20bc8d2
Add xmldoc and combine GroupAt / CreateGroup
2019-10-28 10:45:11 +09:00
Bartłomiej Dach
c8d3dd0e5a
Make carousel item sorting stable
...
Migrate beatmap carousel item sorting from List<T>.Sort()
to IEnumerable<T>.OrderBy(), as the second variant is documented to be
a stable sorting algorithm. This allows for eliminating unnecessary
movement of carousel items occurring whenever any set of items is tied
when changing sorting criteria.
2019-10-27 23:14:14 +01:00
Dean Herbert
0179586f78
Disallow inserting a group if one already exists with the current time value
2019-10-27 16:31:23 +09:00
Dean Herbert
81b5d7b79f
Select another group after deleting selected
2019-10-27 16:30:05 +09:00
Dean Herbert
73369ae613
Add the ability to add/remove groups
2019-10-27 16:13:24 +09:00
Dean Herbert
0fba272e78
Add the ability to add new ControlPoint types to existing groups
2019-10-27 15:19:36 +09:00
Dean Herbert
de69665a46
Reduce horizontal spacing of attributes
2019-10-27 14:17:59 +09:00
Dean Herbert
93b003eb5a
Add selected row state
2019-10-27 13:31:23 +09:00
Dean Herbert
acc0251124
Merge branch 'no-auto-gen' into editor-timing-screen
2019-10-27 12:36:21 +09:00
nwabear
dc672b2b4c
Merge branch 'master' into master
2019-10-26 22:19:47 -05:00
Dan Balasescu
676460019d
Merge branch 'master' into equivalent-to
2019-10-27 11:51:05 +09:00
Dean Herbert
814b520e5e
Avoid potential mis-cast in comparison
2019-10-27 11:35:45 +09:00
nwabear
e35931fdfc
removed blank line
2019-10-26 14:33:59 -05:00
nwabear
349a2745c5
Merge remote-tracking branch 'origin/master'
2019-10-26 14:30:17 -05:00
nwabear
9e2e87c8d1
added visual tests
...
added small commenting
added xmldoc for CancelResume();
2019-10-26 14:29:52 -05:00
Dean Herbert
194e501f86
Merge branch 'master' into snapping-refactor
2019-10-26 14:20:08 +09:00
Dean Herbert
4290a71f44
Add special case for timing points
...
Timing points can't fallback to defaults and must be added at least once.
2019-10-26 11:38:05 +09:00
Dean Herbert
51008cd215
Merge branch 'no-auto-gen' into editor-timing-screen
2019-10-26 11:20:17 +09:00
Dean Herbert
8ccff0e9cf
temp
2019-10-26 11:20:07 +09:00
Dean Herbert
7502b64541
Merge branch 'control-point-grouping' into no-auto-gen
2019-10-26 10:35:34 +09:00
Dean Herbert
d6a49b9e93
Add back autogeneration rules
...
Will be removed in https://github.com/ppy/osu/pull/6604
2019-10-26 10:25:37 +09:00
Dean Herbert
7100319858
Fix incorrect control point retrieval in non-lookup cases
2019-10-26 08:31:41 +09:00
nwabear
f8354eefc4
Added null check in the CancelResume method
2019-10-25 16:49:18 -05:00
nwabear
b0e21c2749
Fixed Issue #6442
2019-10-25 14:57:49 -05:00
Dean Herbert
b52be3d639
Merge branch 'control-point-grouping' into no-auto-gen
2019-10-26 01:20:08 +09:00
Dean Herbert
d25f7f4c27
Correctly clear other lists
2019-10-26 01:19:23 +09:00
Dean Herbert
c031aeb14c
Fix inspection
2019-10-26 00:06:05 +09:00
Dean Herbert
5e553cb96d
Merge branch 'no-auto-gen' into editor-timing-screen
2019-10-25 23:15:43 +09:00
Dean Herbert
eefa411182
Merge branch 'control-point-grouping' into no-auto-gen
2019-10-25 23:15:25 +09:00
Dean Herbert
d4fed43be7
Merge branch 'equivalent-to' into control-point-grouping
2019-10-25 23:15:15 +09:00
Dean Herbert
b8efc59cdc
Update UI components to use new grouping
2019-10-25 20:13:22 +09:00
Dean Herbert
e39016bf01
Fix known non-nulls
2019-10-25 20:04:27 +09:00
Dean Herbert
32242f22de
Merge branch 'no-auto-gen' into editor-timing-screen
2019-10-25 20:02:40 +09:00
Dean Herbert
8baf569f59
Remove necessity of AutoGenerated flag
2019-10-25 19:58:42 +09:00
Dean Herbert
e987db37ec
Add grouping of ControlPoints
2019-10-25 19:52:02 +09:00
Dean Herbert
e2f2638212
Replace local Equatable implementations with abstract EquivalentTo
2019-10-25 19:44:28 +09:00
Dean Herbert
da6769f0fc
Remove necessity of AutoGenerated flag
2019-10-25 19:43:38 +09:00
Dean Herbert
94ffe03e6e
Group timing points
2019-10-25 19:36:12 +09:00
Dean Herbert
e38b7cb169
Replace local Equatable implementations with abstract EquivalentTo
2019-10-25 19:34:38 +09:00
Dan Balasescu
c2f6cd9c24
Merge branch 'master' into comments-vote-pill
2019-10-25 19:19:44 +09:00
Dan Balasescu
c9505f89dd
Merge branch 'master' into markdown-inline-links
2019-10-25 18:52:11 +09:00
Dan Balasescu
3692846367
Merge branch 'master' into snapping-refactor
2019-10-25 18:26:14 +09:00
smoogipoo
ae011e8ee8
Fix distance snap grid test scenes
2019-10-25 17:25:46 +09:00
smoogipoo
4ca6a5a0cc
Interface the distance snap provider
2019-10-25 16:50:21 +09:00
smoogipoo
607b4d874a
Refactor flow of snapping through HitObjectComposer
2019-10-25 16:40:30 +09:00
Dean Herbert
351f8d3dd1
Merge branch 'master' into editor-timing-screen
2019-10-25 13:21:56 +09:00
Dean Herbert
e5b5d286fd
Increase spacing to closer match the design
2019-10-25 12:48:34 +09:00
Dean Herbert
07f7944fc6
Fix DateTime display sizing on results screen
2019-10-25 12:22:19 +09:00
Bartłomiej Dach
661dfbefaf
Change containment check to overlap
...
Due to scenarios wherein a formatted link ended up as part of a larger
raw link after parsing, change the containment check to an overlap check
and add appropriate tests for these edge cases.
2019-10-25 00:42:58 +02:00
Andrei Zavatski
85769982a0
Refactor LoadingButton
2019-10-24 17:49:34 +03:00
Andrei Zavatski
4f79ac8095
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-vote-pill
2019-10-24 17:38:50 +03:00
Dean Herbert
0b3c7f28af
Merge branch 'master' into fix-dragbox-first-frame
2019-10-24 23:01:32 +09:00
Dean Herbert
fa3350ce2d
Refactor blueprint movement and selection events ( #6588 )
...
Refactor blueprint movement and selection events
2019-10-24 22:58:03 +09:00
Bartłomiej Dach
cbd99cc767
Resolve link-in-link edge case
...
Testing with #6542 surfaced a crash scenario, caused by formatted links
that had URLs in the display text, for example
[mean example - https://osu.ppy.sh ](https://osu.ppy.sh )
In that case the outer Markdown link would get picked up once, and then
reduced to the link text when looking for other links, leading to it
being picked up again the second time when the raw link is found.
Add a check in the raw link parsing path that ensures that the found
URL is not a part of a bigger, pre-existing link.
2019-10-24 15:52:55 +02:00
Bartłomiej Dach
24b7160522
Add support for parsing Markdown inline links
...
Extend the Markdown parsing regex to allow parsing so-called inline
links. Within the parenthesis () part of the Markdown URL syntax,
introduce a new capturing group:
(
\s+ // whitespace between actual URL and inline title
(?<title> // start of "title" named group
"" // opening double quote (doubled inside @ string)
(
[^""] // any character but a double quote
| // or
(?<=\\) // the next character should be preceded by a \
"" // a double quote
)* // zero or more times
"" // closing double quote
)
)? // the whole group is optional
This allows for parsing the inline links as-provided by web. Correctness
is displayed by the passing tests.
2019-10-24 15:52:55 +02:00
smoogipoo
a969914d6e
Mention coordinate space
2019-10-24 18:24:22 +09:00
smoogipoo
d83b9ef0e4
Rename grid snapping methods
2019-10-24 18:18:04 +09:00
smoogipoo
f45f17339c
Implement slider path distance snapping
2019-10-24 18:17:30 +09:00
smoogipoo
7a71352684
Fix drag box being positioned incorrectly for 1 frame
2019-10-24 17:22:14 +09:00
smoogipoo
fb88001c0e
Reorder blueprint addition/removal + add regions
2019-10-24 16:53:34 +09:00
smoogipoo
45bd91f63f
Add special cases for click-selection
2019-10-24 16:14:29 +09:00
smoogipoo
8e4a21bee7
Separate out mouse down/click/up handling
2019-10-24 15:58:22 +09:00
smoogipoo
a07e5a269b
Extract drag events into multiple methods
2019-10-24 15:33:08 +09:00
smoogipoo
f128e99fb2
Remove unused methods
2019-10-24 15:07:04 +09:00
smoogipoo
e04c77178c
Move selection events to BlueprintContainer
2019-10-24 14:58:02 +09:00
smoogipoo
714c89faa4
Move selection drag events to BlueprintContainer
2019-10-24 14:57:58 +09:00
Dean Herbert
967551fec0
Renames and xmldoc
2019-10-24 13:10:17 +09:00
Ganendra Afrasya
d22e12d104
Update doc
2019-10-24 10:28:23 +07:00
Ganendra Afrasya
c6d4fc8b24
Apply review
2019-10-24 08:00:45 +07:00
Ganendra Afrasya
224a887773
Merge remote-tracking branch 'origin/master' into prev-button-revamp
2019-10-24 07:44:18 +07:00
Andrei Zavatski
b310fd9d44
Adjust naming inside the LoadingButton
2019-10-23 13:39:42 +03:00
Andrei Zavatski
a6d5a2024a
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-vote-pill
2019-10-23 13:27:45 +03:00
smoogipoo
cef2318cf5
Move drag box drag handling to BlueprintContainer
2019-10-23 18:38:06 +09:00
Dean Herbert
fa9690d16c
Merge pull request #6582 from smoogipoo/grid-centre
...
Show centre point of distance snap grid
2019-10-23 18:28:05 +09:00
Dean Herbert
f61d7e4fbe
Add smoothing and tidy code a touch
2019-10-23 17:56:09 +09:00
smoogipoo
c03fa01fd9
Remove unnecessary set
2019-10-23 17:51:16 +09:00
smoogipoo
2c9b11cdfd
Move variable outside of if block
2019-10-23 17:49:21 +09:00
smoogipoo
c9fec50f63
Remove unnecessary whitespace
2019-10-23 17:00:17 +09:00
smoogipoo
97383b4a37
Show centre point of distance snap grid
2019-10-23 16:58:56 +09:00
smoogipoo
64682611bb
Fix distance snapping grid not updating on scroll
2019-10-23 16:39:14 +09:00
Dean Herbert
40c202c394
Merge branch 'master' into comments-vote-pill
2019-10-23 15:41:54 +09:00
Dean Herbert
e836364add
Update framework
2019-10-23 15:13:52 +09:00
Dean Herbert
21e0bd2a5a
Merge branch 'fix-wave-container' into apply-framework-fixes
2019-10-23 15:13:41 +09:00
smoogipoo
851773a842
Apply adjustments for framework changes
2019-10-23 14:04:06 +09:00
Joehu
7b7a87afa8
Put back mobile conditional
2019-10-22 19:51:29 -07:00
Dean Herbert
c06f142433
Fix some spacing and references
2019-10-23 11:22:55 +09:00
Dean Herbert
6866d27634
Merge remote-tracking branch 'upstream/master' into editor-timing-screen
2019-10-23 11:18:42 +09:00
Joehu
8154cc1b16
Fix registration textboxes always focusing after pressing escape
2019-10-22 14:40:56 -07:00
Dean Herbert
c3375071ad
Fix formatting issue
2019-10-23 00:26:47 +09:00
Dean Herbert
e9aa7f3218
Subclass and use yellow for stand-alone chat display
2019-10-23 00:24:19 +09:00
Dean Herbert
3b4823abe7
Use foreach
2019-10-23 00:17:37 +09:00
Dean Herbert
0ba287a7fd
Rename variable
2019-10-23 00:14:22 +09:00
Dean Herbert
5e22eed131
Add add/remove buttons
2019-10-22 21:50:21 +09:00
Dean Herbert
4883844c4c
Add basic information display for all types of control points
2019-10-22 20:57:56 +09:00
Dean Herbert
81e8b678d3
Update editor time when a new timing point is selected
2019-10-22 20:17:19 +09:00
Dean Herbert
25601ac17c
Merge branch 'master' into editor-timing-screen
2019-10-22 18:01:53 +09:00
Dean Herbert
7084aa7b81
Merge branch 'master' into chat-day-separator
2019-10-22 15:48:42 +09:00
Dean Herbert
001eae2c02
Merge remote-tracking branch 'upstream/master' into make-most-textbox-carets-movable
2019-10-22 15:04:16 +09:00
Dean Herbert
5d0d83b6bf
Add basic xmldoc
2019-10-22 15:04:10 +09:00
Andrei Zavatski
09b2f11bd5
Remove unused variable
2019-10-22 03:14:20 +03:00
Andrei Zavatski
b1eac6b400
Apply suggested changes
2019-10-22 03:11:19 +03:00
Andrei Zavatski
e9ae838f46
CI fixes
2019-10-22 02:16:52 +03:00
Joehu
f7924d3bad
Rename "FixedSearchTextBox" to "SeekLimitedSearchTextBox"
2019-10-21 16:00:09 -07:00
Andrei Zavatski
2896ed90e2
Fix incorrect date comparison
2019-10-22 01:55:26 +03:00
Andrei Zavatski
bb7af1e39c
Fix some margin/padding issues
2019-10-22 01:45:04 +03:00
Andrei Zavatski
d19041fa53
Implement DaySeparator class
2019-10-22 01:30:37 +03:00
Andrei Zavatski
75f444e431
Basic implementation
2019-10-22 00:44:58 +03:00
Dean Herbert
0bf35faae8
Update incorrect reference
2019-10-21 19:25:56 +09:00
Dean Herbert
e3fa5f1da3
Merge branch 'master' into beatsnap-grid-integration
2019-10-21 18:44:34 +09:00
Dean Herbert
ed8b8e3ad0
Merge pull request #6557 from smoogipoo/fix-hitcircle-selection-size
...
Fix hitcircle selection area being too large
2019-10-21 18:43:48 +09:00
Dean Herbert
9f004186d5
Ensure DrawableHitObject's HitObject is not null
2019-10-21 17:56:39 +09:00
Dean Herbert
fa95422755
Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration
2019-10-21 17:53:25 +09:00
Dean Herbert
c8f4e8b52c
Update framework
2019-10-21 17:24:32 +09:00
Dean Herbert
b157aaead1
Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration
2019-10-21 17:09:43 +09:00
smoogipoo
38c2c328ff
Rename HitObject -> DrawableObject in selection blueprints
2019-10-21 17:04:56 +09:00
smoogipoo
fc7e4680a7
Split on multiple lines
2019-10-21 14:08:28 +09:00
smoogipoo
74b6e691d8
Remove unnecessary schedule
2019-10-21 14:01:52 +09:00
smoogipoo
dc222b5e4d
Add common path for duplicated code
2019-10-21 13:52:55 +09:00
Dean Herbert
80bf68c108
Add control sections and hook up bindable control groups
2019-10-21 00:06:38 +09:00
Dean Herbert
0fbba9a5e5
Split out more classes
2019-10-20 23:42:13 +09:00
Salman Ahmed
eed6f708a2
Merge branch 'master' into beatmap-overlay-ruleset-selector
2019-10-19 04:06:43 +03:00
Andrei Zavatski
266f9a065f
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments-vote-pill
2019-10-18 19:25:05 +03:00
Dean Herbert
d0eaf629af
Merge branch 'master' into dho-apply
2019-10-18 19:45:10 +09:00
smoogipoo
190a83da6e
Refresh the grid after a placement
2019-10-18 19:04:08 +09:00
Dean Herbert
07286c0cfc
Fix editor's clock not being processed unless composer is loaded
2019-10-18 18:21:53 +09:00
Dean Herbert
ffec960b77
Split out classes
2019-10-18 17:59:54 +09:00
Dean Herbert
71d45d41d1
Add basic visualisation of different control point types
2019-10-18 17:57:37 +09:00
smoogipoo
31313ec9e1
Fix potential nullref
2019-10-18 17:56:31 +09:00
Dean Herbert
b391b8542d
Merge pull request #6537 from smoogipoo/fix-hitcircle-accent
...
Fix hitobject combo colour potentially not getting adjusted
2019-10-18 17:55:59 +09:00
smoogipoo
89f50b26f7
Fix hitobject combo colour potentially not getting adjusted
2019-10-18 17:32:11 +09:00
Dean Herbert
f22ec6f5bd
Merge branch 'master' into editor-timing-screen
2019-10-18 16:57:46 +09:00
Dean Herbert
6b0976ff1e
Remove a weird unicode charcter from file
2019-10-18 16:55:42 +09:00
Dean Herbert
99ea45da41
Merge pull request #6474 from smoogipoo/osu-beatsnapping-grid
...
Implement osu!'s beat snapping grid
2019-10-18 16:27:03 +09:00
Dean Herbert
50d4a9d726
Merge pull request #6534 from smoogipoo/placement-blueprint-starttime
...
Make BeginPlacement() set the hitobject start time
2019-10-18 16:25:38 +09:00
Dean Herbert
b30c84778f
Update WaveContainer to support framework changes
2019-10-18 16:13:01 +09:00
smoogipoo
f1d7e7e7f6
Merge branch 'placement-blueprint-starttime' into beatsnap-grid-integration
2019-10-18 13:49:09 +09:00
smoogipoo
463079e148
Implement placement snapping
2019-10-18 13:48:59 +09:00
smoogipoo
5d3d25d3b6
Make method private for now
2019-10-18 13:24:28 +09:00
smoogipoo
cb301a4661
Improve performance of intra-frame updates/deletions
2019-10-18 13:18:57 +09:00
smoogipoo
9a896d52bf
Fix nested hitobjects not updating
2019-10-18 13:18:41 +09:00
smoogipoo
b047e05d86
Fix bad variable names
2019-10-18 13:18:16 +09:00
smoogipoo
ba4402207a
Implement selection time snapping
2019-10-18 12:53:38 +09:00
smoogipoo
1dc7c59853
Implement selection position snapping
2019-10-18 12:53:27 +09:00
smoogipoo
c4704f6a29
Add beat snap grid to the composer
2019-10-18 12:47:52 +09:00
smoogipoo
d3e38f5e5a
Make the editor beatmap protected
2019-10-18 12:40:31 +09:00
smoogipoo
bc76a9cb8c
Expose selection changed event from BlueprintContainer
2019-10-18 12:40:27 +09:00
smoogipoo
c5ee533524
Merge branch 'dho-apply' into beatsnap-grid-integration
2019-10-18 12:38:29 +09:00
smoogipoo
4ae465d782
Merge remote-tracking branch 'smoogipoo/osu-beatsnapping-grid' into beatsnap-grid-integration
2019-10-18 12:38:24 +09:00
Andrei Zavatski
9daafb4636
Simplify hover/unhover logic
2019-10-18 03:06:01 +03:00
Joehu
e5b50b5e1f
Fix slider bar regression when using arrows
2019-10-17 13:54:36 -07:00
Andrei Zavatski
22511e41e2
Use received data to set isVoted bindable
2019-10-17 23:20:01 +03:00
Andrei Zavatski
9ee63a8c1a
Apply suggested changes
2019-10-17 16:28:32 +03:00
Andrei Zavatski
a858e713f8
Fix multiple spaces
2019-10-17 15:40:09 +03:00
Andrei Zavatski
6b196a6ce7
CI fixes
2019-10-17 15:24:51 +03:00
Andrei Zavatski
42cd4107a0
Implement CommentVoteRequest and adjust UI
2019-10-17 15:04:30 +03:00
Andrei Zavatski
a437ff74cc
Move VotePill to it's own file
2019-10-17 14:18:31 +03:00
Andrei Zavatski
d3a8dfd5ff
Implement LoadingButton component
2019-10-17 13:57:17 +03:00
Dan Balasescu
bd57c0b58e
Merge branch 'master' into fix-incorrect-beatmap-set-info-equality
2019-10-17 19:51:03 +09:00
Andrei Zavatski
1f28c00594
UI implementation
2019-10-17 13:10:28 +03:00
Andrei Zavatski
38dcd42d08
Parse voted comments
2019-10-17 12:35:12 +03:00
smoogipoo
510ce9345f
Fix potential blueprint nullrefs with the new structure
2019-10-17 16:14:28 +09:00
Dean Herbert
f92331531c
Rename grid to DistanceSnap to be more in line with its purpose
2019-10-17 15:32:02 +09:00
Dean Herbert
3a6a25ffe8
Merge branch 'master' into non-static-rulesetstore
2019-10-17 14:25:06 +09:00
smoogipoo
f429a8f7c2
Add back/obsolete old AddNested() method
2019-10-17 14:02:08 +09:00
smoogipoo
d8f3678c3c
Rename parameter
2019-10-17 12:53:54 +09:00
smoogipoo
9b9138253c
Remove finalizer
2019-10-17 11:27:23 +09:00
iiSaLMaN
405ab07800
Check equality by ID -> OnlineBeatmapSetID -> Hash -> ReferenceEquals
2019-10-17 01:18:29 +03:00
Ganendra Afrasya
326abc1a55
Apply reviews
2019-10-16 20:11:25 +07:00
smoogipoo
8d7453c251
Rework construction of nested hitobjects
2019-10-16 22:10:50 +09:00
Dan Balasescu
05c6d1a66d
Merge branch 'master' into osu-beatsnapping-grid
2019-10-16 20:12:31 +09:00
smoogipoo
79b2c7b480
Make BeginPlacement() set the hitobject start time
2019-10-16 20:04:15 +09:00
Andrei Zavatski
2dac3a6efe
Handle hitting the maximum allowed number of favourited beatmaps
2019-10-16 13:58:29 +03:00
smoogipoo
b6b8098b98
Add an arbitrary offset to prevent div-by-0
2019-10-16 19:44:53 +09:00
smoogipoo
2d4b7dc361
Remove redundant code
2019-10-16 19:33:18 +09:00
smoogipoo
5ac5e34f85
Use a cleaner distance function
2019-10-16 19:32:45 +09:00
Dean Herbert
4f356f3aeb
Merge branch 'master' into favourite-beatmap
2019-10-16 18:22:09 +09:00
smoogipoo
350d139cbf
Make chevron icon colour protected
2019-10-16 15:54:00 +09:00
Joehu
649951198e
Make most textbox carets movable
2019-10-15 14:47:48 -07:00
iiSaLMaN
14c72f85fa
Fix incorrect beatmap set info equality check on non-online set info
2019-10-15 23:40:48 +03:00
iiSaLMaN
60133ba0c3
Propagate BeatmapSetInfo to tab items with bindable
2019-10-15 23:33:50 +03:00
Andrei Zavatski
2543de22bd
Simplify DeletedChildrenPlaceholder behavior
2019-10-15 12:47:35 +03:00
Andrei Zavatski
7ba15df0c0
Convert to method group
2019-10-15 12:27:32 +03:00
Andrei Zavatski
d321794ef5
Make loadedTopLevelComments a local filed
2019-10-15 12:26:16 +03:00
Andrei Zavatski
96e31b9cca
Add support for deleted comments with message
2019-10-15 12:07:01 +03:00
Andrei Zavatski
213f00556d
Remove onShowDeletedChanged function
2019-10-15 11:30:50 +03:00
Andrei Zavatski
b2885e7b13
Move load() under the ctor
2019-10-15 11:26:58 +03:00
Andrei Zavatski
eb5dad08aa
Remove initial filed
2019-10-15 11:25:58 +03:00
Andrei Zavatski
3c714dc013
APICommentsController -> CommentBundle
2019-10-15 11:20:06 +03:00
Andrei Zavatski
75a2e383f2
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api
2019-10-15 11:19:45 +03:00
smoogipoo
96c6aeefe9
Remove out-of-date todo
2019-10-15 16:16:33 +09:00
smoogipoo
12cd57744b
Make RulestStore initialise at construction time
2019-10-15 16:14:06 +09:00
Joehu
efc201ec85
Make PlaylistOverlay a VisibilityContainer
2019-10-14 16:40:53 -07:00
Joehu
ccc753a315
Make OverlayContainers with no blocking input VisibilityContainers
2019-10-14 16:27:59 -07:00
Andrei Zavatski
ad32d66365
CI fix
2019-10-15 01:10:23 +03:00
Andrei Zavatski
0fd6b0c852
Use linq expression to count deleted comments
2019-10-15 00:55:33 +03:00
Andrei Zavatski
b84c9dfd84
Use Humanizer.ToQuantity instead of manual parsing
2019-10-15 00:35:44 +03:00
Andrei Zavatski
09621f066e
Childs -> Children
2019-10-15 00:32:21 +03:00
Andrei Zavatski
0676c880b5
Simplify IsTopLevel and IsDeleted properties
2019-10-15 00:26:31 +03:00
Andrei Zavatski
b1f7a673e7
Simplify chevron icon coloring
2019-10-15 00:10:02 +03:00
Andrei Zavatski
d4843285db
CI fixes
2019-10-14 17:33:14 +03:00
Andrei Zavatski
139170cdc8
Fix incorrect padding for nested comments
2019-10-14 17:26:12 +03:00
Andrei Zavatski
b53fb0d228
Remove empty line
2019-10-14 17:07:50 +03:00
Andrei Zavatski
a4ffd4798d
Fix escaped html strings not being unescaped
2019-10-14 17:02:48 +03:00
Andrei Zavatski
a81d5cd819
Handle links in message
2019-10-14 16:56:07 +03:00
Andrei Zavatski
7cd3f5656d
Cleanups
2019-10-14 16:43:43 +03:00
Andrei Zavatski
7ac87494e0
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api
2019-10-14 16:21:34 +03:00
Dean Herbert
f0e9700349
Inline delegate event
2019-10-14 21:49:02 +09:00
Dean Herbert
b7ddf160b4
OnClick should actually handle the event
2019-10-14 21:48:12 +09:00
Dean Herbert
4e6ab1dad3
Tidy up state management via bindable usage
2019-10-14 21:42:07 +09:00
Dean Herbert
7794457550
Remove more constants
2019-10-14 21:36:10 +09:00
Dean Herbert
4822496c13
Fix more naming
2019-10-14 21:34:16 +09:00
Dean Herbert
89f270a19a
SortSelector -> SortTabControl
2019-10-14 21:32:41 +09:00
Dean Herbert
e191c2c50e
Tidy up constants and method naming
2019-10-14 21:32:16 +09:00
Dean Herbert
ae1a361f9f
Merge branch 'master' into commenst_header
2019-10-14 21:20:05 +09:00
Andrei Zavatski
328b4d6863
Cancel request on dispose
2019-10-13 16:22:10 +03:00
Andrei Zavatski
2f209d1dfa
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api
2019-10-13 14:53:41 +03:00
Andrei Zavatski
a44cc2e70b
Implement CommentsShowMoreButton
2019-10-13 14:43:30 +03:00
Dean Herbert
f3c38ae089
Merge branch 'master' into osu-beatsnapping-grid
2019-10-13 18:38:57 +09:00
Andrei Zavatski
60954f969d
DeletedChildsPlaceholder refactor
2019-10-13 12:38:50 +03:00
Andrei Zavatski
795ce81468
Use async loading for comment pages
2019-10-13 12:10:01 +03:00
Andrei Zavatski
4d971e49ff
Colours update
2019-10-13 11:50:27 +03:00
Andrei Zavatski
27e3ffd293
Update dependencies
2019-10-13 11:23:49 +03:00
Andrei Zavatski
7f867562ca
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api
2019-10-13 11:15:43 +03:00
Dean Herbert
00f0957cc3
Merge branch 'master' into editor-grids-2
2019-10-12 23:28:51 +09:00
Andrei Zavatski
f6b138fe6e
Remove useless ItemGroup
2019-10-12 15:03:24 +03:00
Andrei Zavatski
7ffe5ac539
Merge remote-tracking branch 'refs/remotes/ppy/master' into commenst_header
2019-10-12 15:02:12 +03:00
Dan Balasescu
bb7de50697
Merge pull request #6451 from peppy/fix-resume-from-player-audio
...
Fix audio playback position being reset after resuming to song select
2019-10-11 19:44:00 +09:00
Dean Herbert
00d4d976b7
Move editor selections relative to hitobject start positions ( #6431 )
...
Move editor selections relative to hitobject start positions
2019-10-11 19:35:11 +09:00
Dan Balasescu
26a33bfa4e
Merge branch 'master' into fix-resume-from-player-audio
2019-10-11 19:21:14 +09:00
Dan Balasescu
171105e3ea
Merge branch 'master' into fix-ranking-display
2019-10-11 19:15:10 +09:00
Dean Herbert
de13320a2d
Add initial table display
2019-10-11 18:46:05 +09:00
Ganendra Afrasya
3008ade8a2
Using enum to determine the action
2019-10-11 16:41:54 +07:00
smoogipoo
45835f97a1
Split out grids into separate files
2019-10-11 18:41:17 +09:00
smoogipoo
050d86a741
Always use the local coordinate space
2019-10-11 18:24:33 +09:00
smoogipoo
9ecec806c2
Rename grid creation method + parameter
2019-10-11 18:24:33 +09:00
smoogipoo
5f0cd356d7
Rename startPosition to centrePosition
2019-10-11 18:24:33 +09:00
smoogipoo
8fb2628f9e
Improve xmldocs
2019-10-11 18:24:33 +09:00
smoogipoo
66e0fef85b
Expose StartPosition for derived grids to use
2019-10-11 18:24:33 +09:00
smoogipoo
97d4a8e59e
Remove unnecessary dependency
2019-10-11 18:24:33 +09:00
smoogipoo
2df519ddfa
Simplify colour retrieval function
2019-10-11 18:24:33 +09:00
smoogipoo
2aa3d0bb39
Implement base class for beat snapping grids
2019-10-11 18:24:33 +09:00
Dan Balasescu
0634f17503
Merge branch 'master' into ignore-macosx-folder-in-archives
2019-10-11 17:39:41 +09:00
Dan Balasescu
d4282473c6
Merge branch 'master' into fix-background-disposal
2019-10-11 17:15:30 +09:00
Bartłomiej Dach
4b84564f47
Switch casing comparison mode to ordinal
...
Switch from InvariantCultureIgnoreCase to OrdinalIgnoreCase when
checking file paths in archives for substrings indicating the file can
be ignored for performance gains.
Co-Authored-By: Dan Balasescu <smoogipoo@smgi.me>
2019-10-11 09:24:41 +02:00
Dean Herbert
937dbb7bf6
Initial layout for timing screen
2019-10-11 16:22:24 +09:00
Dean Herbert
c7eb0b401b
Merge branch 'master' into ignore-macosx-folder-in-archives
2019-10-11 14:36:52 +09:00
dependabot-preview[bot]
9fb5c85a18
Bump ppy.osu.Game.Resources from 2019.913.0 to 2019.1010.0
...
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources ) from 2019.913.0 to 2019.1010.0.
- [Release notes](https://github.com/ppy/osu-resources/releases )
- [Commits](https://github.com/ppy/osu-resources/compare/2019.913.0...2019.1010.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-11 05:15:14 +00:00
Dean Herbert
6776f31933
Merge branch 'master' into fix-ranking-display
2019-10-11 14:13:12 +09:00
Dean Herbert
44853c262c
Update framework
2019-10-11 13:55:58 +09:00
Dean Herbert
475815df04
Update ranking display to handle new osu-web request format
2019-10-11 13:09:21 +09:00
Bartłomiej Dach
57bfa18359
Filter out OS-generated files from archives
...
Add a filename ignore list to ZipArchiveReader to filter out superfluous
OS-generated files from archives during the import process. In addition
to decreasing the size of files imported this allows imports of some
incorrectly-constructed archives. An example is the case of having
a __MACOSX directory next to a single directory with the actual files -
filtering out the former at ZipArchiveReader allows the fallback added
in #6170 to work.
2019-10-10 23:54:23 +02:00
Ganendra Afrasya
d7fc904381
Make prev button can do restart track
2019-10-11 00:12:36 +07:00
Dan Balasescu
d2f1f54078
Merge branch 'master' into netcore-30
2019-10-10 23:38:24 +09:00
Dean Herbert
8255a94cd4
Merge branch 'master' into fix-resume-from-player-audio
2019-10-10 22:08:20 +09:00
Dan Balasescu
356c0fdca0
Merge branch 'master' into cleanup-intros
2019-10-10 21:58:54 +09:00
Andrei Zavatski
b45e7246b8
Rename SortCommentsBy to CommentsSortCriteria
2019-10-10 15:56:08 +03:00
Dean Herbert
5eba33e876
Simplify logic and add test coverage for remaining case
2019-10-10 20:12:47 +09:00
Andrei Zavatski
fe7b4037f7
CI fix
2019-10-10 13:24:22 +03:00
Dean Herbert
a819a64036
Update resources
2019-10-10 19:16:14 +09:00
Andrei Zavatski
64f62bd2bf
Implement CommentsHeader component
2019-10-10 12:06:25 +03:00
Andrei Zavatski
f6b78ad661
Overall cleanups
2019-10-10 11:43:45 +03:00
Andrei Zavatski
371b7841d0
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api
2019-10-10 11:27:44 +03:00
dependabot-preview[bot]
bc4c1a2371
Bump ppy.osu.Framework from 2019.930.0 to 2019.1010.0
...
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework ) from 2019.930.0 to 2019.1010.0.
- [Release notes](https://github.com/ppy/osu-framework/releases )
- [Commits](https://github.com/ppy/osu-framework/compare/2019.930.0...2019.1010.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-10-10 08:16:28 +00:00
Dean Herbert
e66f9adb86
Fix user pause not being cancelled when playing audio
2019-10-10 16:53:03 +09:00
smoogipoo
2e2768870f
Merge remote-tracking branch 'origin/master' into editor-selection-movement-params
2019-10-10 16:38:41 +09:00
Dan Balasescu
5497d210b6
Merge branch 'master' into fix-editor-slider-display
2019-10-10 16:22:30 +09:00
Dean Herbert
f74c79c2b8
Fix audio playback position being reset after resuming to song select
2019-10-10 11:58:43 +09:00
iiSaLMaN
2cf17e0bf3
Use decimal data type instead
2019-10-09 23:33:25 +03:00
iiSaLMaN
01ac19fdbb
Set legacy version of osu!classic skin to 2.0
2019-10-09 23:06:32 +03:00
iiSaLMaN
7f6541672c
Parse legacy version of decoded skin to numerical
2019-10-09 23:05:50 +03:00
iiSaLMaN
003af19e3f
Introduce legacy skin configuration
2019-10-09 23:04:34 +03:00
iiSaLMaN
5e3f0f6c95
Return default combo colours if none provided
2019-10-09 21:08:07 +03:00
iiSaLMaN
281671a213
Remove default combo colours usage from skins
2019-10-09 21:04:26 +03:00
Andrei Zavatski
107d39c3e9
Add DeletedChildsPlaceholder to the bottom of the comments container
2019-10-09 14:10:05 +03:00
Dean Herbert
4e273fc628
Return correct allowed value for Perfect
...
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
2019-10-09 19:50:05 +09:00
Andrei Zavatski
c9d5bea0f1
Remove animations
2019-10-09 13:45:14 +03:00
Andrei Zavatski
7e3c97f496
Implement DeletedChildsPlaceholder component
2019-10-09 13:37:07 +03:00
Dean Herbert
9f2a648432
Add full asserts
2019-10-09 19:23:37 +09:00
Dean Herbert
ad6b8d3e04
Add result offset bounding to result itself, rather than just transforms
2019-10-09 19:08:55 +09:00
Dean Herbert
51bf600ea7
Use empty hitwindows instead of null
2019-10-09 19:08:31 +09:00
Andrei Zavatski
b2bd78308d
Handle deleted comments
2019-10-09 12:18:49 +03:00
Andrei Zavatski
ad99a3236f
Handle edited comments
2019-10-09 11:32:17 +03:00
Andrei Zavatski
a0dfbfe148
Handle parent usernames for legacy comments
2019-10-09 11:18:26 +03:00
Andrei Zavatski
0a56b041fd
Implement ShowChildsButton
2019-10-09 11:07:56 +03:00
Dean Herbert
0681bb9a2b
Fix potential nullref
2019-10-09 16:49:10 +09:00
Andrei Zavatski
4462d454e8
Message padding improvements
2019-10-09 10:34:17 +03:00
Andrei Zavatski
faef4d932d
Improve message parsing
2019-10-09 10:17:14 +03:00
Dean Herbert
2d8e5615e4
Extract timeline and layout logic from ComposeScreen
2019-10-09 16:05:55 +09:00
Dean Herbert
3dd2b18ff0
Make EditorScreen abstract
2019-10-09 16:04:58 +09:00
Andrei Zavatski
6deafc04bf
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api
2019-10-09 10:00:20 +03:00
Dan Balasescu
69b9e359bf
Merge branch 'master' into fix-ss-track-playback
2019-10-09 12:26:07 +09:00
Dan Balasescu
ed41429fc1
Merge branch 'master' into editor-wip-screens
2019-10-09 12:04:12 +09:00
Andrei Zavatski
29b0eacc82
Implement SortSelector component
2019-10-08 22:46:42 +03:00
Andrei Zavatski
574170124c
Implement HeaderButton component
2019-10-08 21:38:19 +03:00
Andrei Zavatski
b9ad079bf8
Move CommentsHeader to it's own file
2019-10-08 20:57:55 +03:00
Andrei Zavatski
9ab309fc0e
Use bold font for replies button
2019-10-08 20:44:01 +03:00
Andrei Zavatski
35cfb16c8d
Implement VotePill component
2019-10-08 19:56:43 +03:00
Andrei Zavatski
4230b00110
Rename APIComments to APICommentsController
2019-10-08 19:22:23 +03:00
Andrei Zavatski
341702b91d
Use Bindable for expansion logic
2019-10-08 19:18:46 +03:00
Andrei Zavatski
000e4a563c
Parse parent comments
2019-10-08 19:09:02 +03:00
Andrei Zavatski
3f8fecbc50
Adjust spacing
2019-10-08 16:04:52 +03:00
Andrei Zavatski
9c7e403cf8
Implement replies button
2019-10-08 16:00:34 +03:00
Andrei Zavatski
451a7342ce
Parse child comments
2019-10-08 15:39:03 +03:00
Andrei Zavatski
2564214a72
Fix some padding issues with the big comments
2019-10-08 15:01:18 +03:00
Andrei Zavatski
1c89841949
Move all the logic to it's own namespace
2019-10-08 14:51:12 +03:00
LeNitrous
9375ef5eea
clear settings controls when changing rulesets
2019-10-08 19:42:15 +08:00
Andrei Zavatski
801b5b474e
Add a User property to the comment for easy access
2019-10-08 13:45:13 +03:00
LeNitrous
59b2f02828
initial implementation of customizable mods
2019-10-08 18:34:09 +08:00
Andrei Zavatski
4b1a40daba
Implement temp fix to get the actual message
2019-10-08 13:31:49 +03:00
smoogipoo
179656788d
Remove unnecessary method
2019-10-08 19:27:59 +09:00
smoogipoo
c1db11fa06
More removal of "drag"
2019-10-08 19:24:58 +09:00
smoogipoo
8b661e624d
Remove drag from class/method namings + refactor
2019-10-08 19:08:31 +09:00
smoogipoo
08d043f447
Move selection relative to the hitobject start positions
2019-10-08 18:57:03 +09:00
Andrei Zavatski
70e1d731ad
Merge remote-tracking branch 'refs/remotes/ppy/master' into comments_api
2019-10-08 12:42:59 +03:00
Dean Herbert
47768b7063
Rework osu! selection blueprint updates ( #6291 )
...
Rework osu! selection blueprint updates
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-08 17:43:13 +09:00
Dean Herbert
4e026b163c
Don't resume playback when user has paused and track hasn't changed
2019-10-08 15:04:38 +09:00
Dean Herbert
3e904b4838
Fix naming of file
2019-10-08 14:37:56 +09:00
Dean Herbert
63bf8ff832
Better signify under construction screens in editor
2019-10-08 14:32:48 +09:00
Dean Herbert
7e4f0c01b8
Avoid excess background updates in playlist overlay ( #6424 )
...
Avoid excess background updates in playlist overlay
2019-10-08 14:11:02 +09:00
Dan Balasescu
73e3dac64b
Merge branch 'master' into fix-editor-skinning
2019-10-08 13:28:10 +09:00
Dean Herbert
24269c0384
Fix skins not being displayed correctly in the editor
2019-10-08 12:52:34 +09:00
Dean Herbert
5472029ffe
Fix editor defaulting to 0.5x playback speed
2019-10-08 12:27:51 +09:00
Dean Herbert
52770f803d
Fix incorrect beatmap usage
2019-10-08 12:15:32 +09:00
Dean Herbert
cbb120cd38
Switch beatmap to private
2019-10-08 12:09:42 +09:00
Dean Herbert
c280bee894
Protect configuration bindables
2019-10-08 12:08:47 +09:00
Dean Herbert
b8b2ff2674
Move welcome to local usages
2019-10-08 12:07:59 +09:00
Dean Herbert
4ba2dccde3
Reorder file contents
2019-10-08 12:05:52 +09:00
Dean Herbert
a0bb193342
Remove unnecessary beatmap storage
2019-10-08 12:04:13 +09:00
Dean Herbert
449e53ee6d
Centralise track handling
2019-10-08 12:03:42 +09:00
Dean Herbert
c3d56088d8
Make constant private
2019-10-08 11:54:39 +09:00
Dean Herbert
3c0b1be7f4
Add xmldoc where applicable
2019-10-08 11:52:16 +09:00
Dean Herbert
393683f8f1
Merge branch 'master' into cleanup-intros
2019-10-08 11:29:13 +09:00
Dean Herbert
438408161c
Fix tab controls overflowing right content at max ui scale ( #6411 )
...
Fix tab controls overflowing right content at max ui scale
2019-10-08 11:16:41 +09:00
Dean Herbert
0d0321674e
Merge pull request #6407 from UselessToucan/playlist_follow_playback
...
Autoscroll playlist on song change
2019-10-08 11:07:45 +09:00
Dean Herbert
e7fc5e556c
Fix song select not correctly playing tracks in some cases
2019-10-08 11:06:07 +09:00
Dean Herbert
3ec78388e8
Avoid excess background updates in playlist overlay
2019-10-08 11:03:23 +09:00
Dean Herbert
bb161222ef
Merge branch 'master' into fix-tab-controls-overflowing
2019-10-08 10:12:03 +09:00
Joehu
9fdbe58326
Fix dropdown header padding when selected mod filter is hidden
2019-10-07 16:17:58 -07:00
Joehu
8e6e90eaec
Use fixed numbers for padding instead
2019-10-07 16:11:40 -07:00
Roman Kapustin
e00992dfd8
Remove FollowPlayback setting
2019-10-07 19:44:22 +03:00
Andrei Zavatski
cc6bf2f173
Add IsDeleted property
2019-10-07 18:45:22 +03:00
Andrei Zavatski
aa8df0fa20
Hook up api and implement some visual comments representation
2019-10-07 18:26:07 +03:00
Andrei Zavatski
e772822bd5
Basic implementation
2019-10-07 17:49:20 +03:00
Andrei Zavatski
738580ec61
Add IsTopLevel property
2019-10-07 16:58:24 +03:00
Andrei Zavatski
76db200bd3
Implement GetCommentsRequest
2019-10-07 16:48:05 +03:00
Andrei Zavatski
a7dc9bb582
Add tooltip and remove pink layer
2019-10-07 15:41:05 +03:00
Andrei Zavatski
2d707b2b65
Implement PostBeatmapFavouriteRequest
2019-10-07 15:36:23 +03:00
Dean Herbert
f15953d65c
Fix carousel including filtered difficulties in sort comparisons
2019-10-07 15:17:03 +09:00
Joehu
11d937beab
Fix beatmap detail area tab dropdown being blocked by content
2019-10-06 10:24:33 -07:00
Joehu
38c1cee5fd
Fix tab controls overflowing
2019-10-06 10:22:55 -07:00
Roman Kapustin
eda4a27b45
Move FollowPlayback setting to User Interface subsection
2019-10-06 15:06:25 +03:00
Dean Herbert
179cde917b
Merge branch 'master' into rework-selection-updates
2019-10-06 15:00:56 +08:00
Dean Herbert
2e20380d07
Merge branch 'master' into placement-blueprint-movement
2019-10-06 13:52:22 +08:00
Roman Kapustin
bdea75b995
Autoscroll playlist on song change
2019-10-05 23:53:05 +03:00
Joehu
e257f4ca04
Resume music to same position when exiting gameplay
2019-10-05 10:31:44 -07:00
iiSaLMaN
ba1a854701
Use IEnumerable.Where<>() rather than List.FindAll()
...
Saves a whole list allocation
2019-10-05 10:30:32 +03:00
Dean Herbert
93c0cf14c1
Merge branch 'master' into allow-fallback-decoder-overwrite
2019-10-05 10:56:57 +08:00
Joehu
a71db11ea5
Remove depth parameter description
2019-10-04 18:38:44 -07:00
Joehu
5d460eaf6b
Remove depth specification and button order regression
2019-10-04 17:14:19 -07:00
Joehu
e7ba6ef5c4
Fix keybinding order of beatmap options
2019-10-04 14:32:43 -07:00
iiSaLMaN
6985249d90
Simplify properties
2019-10-04 21:18:03 +03:00
Bartłomiej Dach
7c2c537bc9
Allow fallback decoder overwrite
...
To fix the runtime crashes in difficulty calculation components, remove
the check for pre-existing fallback registration along with
the exception. The xmldoc for the registration function has been
extended to make users aware of possible consequences of calling it.
2019-10-04 18:20:20 +02:00
iiSaLMaN
0c4f248259
Fix CI issues
2019-10-04 18:02:13 +03:00
iiSaLMaN
555c82e9c9
Filter beatmap difficulties by current ruleset
2019-10-04 17:56:42 +03:00
iiSaLMaN
7d5f5d2fd9
Add ruleset selector to the beatmap overlay header
2019-10-04 17:55:33 +03:00
iiSaLMaN
7b414092af
Implement beatmap ruleset selector
2019-10-04 17:35:41 +03:00
Dean Herbert
6fce646369
Merge branch 'master' into placement-blueprint-movement
2019-10-04 19:05:56 +08:00
Dean Herbert
9eab56e2fc
Merge branch 'master' into editor-beatmap-changed-event
2019-10-04 17:58:58 +08:00
Dan Balasescu
456def70c8
Merge branch 'master' into fix-negative-key-counter
2019-10-04 15:26:18 +09:00
Dan Balasescu
457e0c4d7b
Merge pull request #6117 from bdach/beatmap-parsing-fallback-v2
...
Add fallback decoder option for badly-headered files
2019-10-04 15:03:10 +09:00
Dean Herbert
aeb62825cd
Move out requireMoreUpdateLoops for better consistency
2019-10-04 13:42:06 +08:00
Dean Herbert
49fdb4b731
Fix Alt-F4 being blocked during gameplay ( #6369 )
...
Fix Alt-F4 being blocked during gameplay
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-04 13:33:00 +08:00
Dean Herbert
ddef7fa3ba
Repair behavioural change
2019-10-04 13:32:47 +08:00
Dean Herbert
bcdc22087a
Merge remote-tracking branch 'upstream/master' into fix-negative-key-counter
2019-10-04 13:24:59 +08:00
Dan Balasescu
2b61bb709e
Merge branch 'master' into beatmap-parsing-fallback-v2
2019-10-04 14:08:27 +09:00
Dean Herbert
f1772d01d2
Add the new switch button + labelled switch button ( #6257 )
...
Add the new switch button + labelled switch button
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-04 13:01:57 +08:00
Dan Balasescu
dc984d0d81
Merge branch 'master' into beatmap-parsing-fallback-v2
2019-10-04 13:51:56 +09:00
smoogipoo
ffde389641
Add difficulty calculator beatmap decoder fallback
2019-10-04 13:28:32 +09:00
Dean Herbert
47c1f36f9d
Add ValidForResume check
2019-10-04 11:41:53 +08:00
Dean Herbert
71985c7ef1
Update fail logic to match
2019-10-04 11:23:42 +08:00
Dean Herbert
a7b58cad99
Merge branch 'master' into labelled-switch-button
2019-10-04 11:15:54 +08:00
Dan Balasescu
e9cb06a5e2
Merge branch 'master' into truncate-metadata-on-wedge
2019-10-04 12:08:06 +09:00
Dean Herbert
a7d7a28d34
Merge branch 'master' into fix-alt-f4-being-blocked-by-overlays
2019-10-04 11:05:28 +08:00
Dean Herbert
925615320e
Update lazer default combo colours to match stable
2019-10-04 10:46:48 +08:00
Dean Herbert
d2c9a29c0d
Remove unnecessary local assign
2019-10-04 10:45:18 +08:00
smoogipoo
a5e1cb8feb
Merge remote-tracking branch 'Game4all/master' into truncate-metadata-on-wedge
2019-10-04 11:21:33 +09:00
Joseph Madamba
d87f6d270b
Merge branch 'master' into fix-alt-f4-being-blocked-by-overlays
2019-10-03 08:43:31 -07:00
Dean Herbert
0dd12990c4
Fix possible nullref in MusicController ( #6379 )
...
Fix possible nullref in MusicController
2019-10-03 20:11:52 +08:00
Craftplacer
dbcb9e51c2
Merge branch 'master' into muted-notification
2019-10-03 12:51:22 +02:00
smoogipoo
636913a4a6
Refactor PlayerLoader changes
2019-10-03 19:22:41 +09:00
smoogipoo
6c878cb167
Prevent nullrefs
2019-10-03 19:15:37 +09:00
smoogipoo
662a1a9c2c
Use current
2019-10-03 18:55:53 +09:00
smoogipoo
bcf0b2752e
Fix possible MusicController nullref
2019-10-03 18:48:44 +09:00
smoogipoo
2d0c522398
Remove unused method
2019-10-03 18:43:46 +09:00
smoogipoo
f2ba87a1d2
Fix placement blueprint test scenes not working
2019-10-03 16:28:56 +09:00
smoogipoo
652acac87f
Move placement movement event to BlueprintContainer
2019-10-03 16:14:42 +09:00
Dean Herbert
6268bbcfc8
Merge branch 'master' into beatmap-parsing-fallback-v2
2019-10-03 15:12:21 +08:00
Dean Herbert
b28689c774
Fix key counters appearing negative on intense beatmaps
...
When `FrameStabilityContainer` decides it needs multiple updates on the same frame, it ends up with an elapsed time of zero. This was interacting badly with the condition used in `RulesetInputManager` to govern playback direction.
I have changed this to use `Rate` as exposed by the frame stable clock.
- Closes #6198 .
2019-10-03 15:01:54 +08:00
smoogipoo
2c13043c42
Hook up the event to HitObjectComposer
2019-10-03 14:40:00 +09:00
smoogipoo
3fb0b0b668
Rename to StartTimeChanged and add xmldocs
2019-10-03 14:37:16 +09:00
smoogipoo
897b3233af
Add start time tracking to EditorBeatmap
2019-10-03 14:23:48 +09:00
smoogipoo
f8eb07b211
Only lock database for the duration of a model restoration
2019-10-03 11:24:17 +09:00
Dean Herbert
c85d7c8b3f
Merge branch 'master' into reduce-database-deletion-locks
2019-10-03 10:17:27 +08:00
Joehu
8017788521
Revert "Fix alt-f4 being blocked in interface"
...
This reverts commit 752dd26a4f
.
2019-10-02 16:08:24 -07:00
Joehu
148089f160
Revert "Remove unnecessary exitConfirmed condition check"
...
This reverts commit 38fe519c91
.
2019-10-02 16:08:19 -07:00
Joehu
38fe519c91
Remove unnecessary exitConfirmed condition check
2019-10-02 12:28:48 -07:00
Joehu
752dd26a4f
Fix alt-f4 being blocked in interface
2019-10-02 11:17:43 -07:00
Joehu
a69b9f1148
Fix alt-f4 being blocked during gameplay
2019-10-02 11:16:31 -07:00
Craftplacer
4d4e846296
Merge branch 'master' into muted-notification
2019-10-02 17:31:34 +02:00
Craftplacer
6929847b08
Remove redundant override
2019-10-02 17:22:34 +02:00
Dean Herbert
3e07e508f2
Merge branch 'master' into fix-track-leak
2019-10-02 22:20:05 +08:00
Andrei Zavatski
5274f69872
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables
2019-10-02 13:00:29 +03:00
smoogipoo
dfaa9531f8
Only lock the database for the duration of a deletion
2019-10-02 18:48:50 +09:00
Dan Balasescu
2519fd26a9
Merge pull request #6351 from Joehuu/simplify-exit-logic-of-screens
...
Simplify exit logic of screens with textboxes using back button receptor
2019-10-02 18:38:06 +09:00
Dan Balasescu
b161aa22c3
Merge branch 'master' into simplify-exit-logic-of-screens
2019-10-02 18:13:57 +09:00
HDragonHR
faf8fe132e
Change bindable int to float
2019-10-02 12:26:46 +08:00
Ganendra Afrasya
b6dd610af8
Apply reviews
2019-10-01 23:18:03 +07:00
Craftplacer
5f399add82
Resolve @iiSaLMaN 's suggested changes
2019-10-01 18:15:40 +02:00
Craftplacer
2ac5e0bfa0
Make use of SessionStatics
2019-10-01 17:39:01 +02:00
Joehu
e3502f5200
Fix typo on Key.Escape comment
2019-10-01 08:37:08 -07:00
Joehu
ff6367fa4b
Make back button glow when pressing escape
2019-10-01 08:26:45 -07:00
Joehu
5f700f2ae9
Simplify exit logic of screens with textboxes using back button receptor
2019-10-01 08:26:34 -07:00
Craftplacer
4e394e0ed5
Merge branch 'master' into muted-notification
2019-10-01 17:26:11 +02:00
Ganendra Afrasya
208b9a4eba
Add new virtual float for username to timestamp padding
2019-10-01 20:47:53 +07:00
Andrei Zavatski
ff477cd56c
Remove humanized number dependency
2019-10-01 14:12:03 +03:00
Andrei Zavatski
5b09daef1a
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables
2019-10-01 13:54:15 +03:00
smoogipoo
a310c4b65f
Make selection blueprints a bit more testable
2019-10-01 19:32:47 +09:00
smoogipoo
cc533e8fe4
Remove BindableBeatmap
2019-10-01 17:24:47 +09:00
Dan Balasescu
b4da92e5a6
Merge branch 'master' into bot-profile
2019-10-01 16:26:48 +09:00
smoogipoo
81a227796e
Merge remote-tracking branch 'origin/master' into rulesets_fail_load_exception_log
2019-10-01 15:41:16 +09:00
smoogipoo
ce609302ed
Fix CI error
2019-10-01 15:41:09 +09:00
smoogipoo
04ac414249
Fix memory leaks due to audio track recycle order
2019-10-01 13:49:09 +09:00
Dean Herbert
351e89bf18
Update framework
2019-09-30 22:03:56 +09:00
Dan Balasescu
2d4e557134
Merge branch 'master' into fix-potential-null-test
2019-09-30 12:19:11 +09:00
miterosan
9f498d2990
Log the exception that caused to loading of rulesets to fail.
2019-09-29 19:25:44 +02:00
Andrei Zavatski
febe0175cd
Small cleanups
2019-09-29 15:27:29 +03:00
Andrei Zavatski
138e65d7a4
Add missing blank line
2019-09-29 15:15:41 +03:00
Andrei Zavatski
883ee9851a
Update dependencies
2019-09-29 15:02:33 +03:00
Andrei Zavatski
5314f76fda
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables
2019-09-29 14:58:58 +03:00
Andrei Zavatski
907f73ef8f
Merge remote-tracking branch 'refs/remotes/ppy/master' into bot-profile
2019-09-29 14:45:36 +03:00
Dean Herbert
193a9b0dd7
Merge branch 'master' into labelled-switch-button
2019-09-29 14:56:26 +08:00
Dean Herbert
ce62f3c75b
Simplify and future-proof random retrieval method
...
Will support future added intros without further code changes. Also uses RNG instead of `new Random`.
2019-09-29 14:35:35 +08:00
Dean Herbert
740efa5747
Handle potential null case
2019-09-29 12:19:42 +08:00
V1ntagezTV
9f1c378733
moved into the switch case
2019-09-29 00:35:47 +05:00
V1ntagezTV
2681e2064a
remove comment
2019-09-29 00:34:09 +05:00
V1ntagezTV
1babd139bc
remove needless blank
2019-09-29 00:22:23 +05:00
V1ntagezTV
52b044b7f6
Add random intro!
2019-09-29 00:10:17 +05:00
Dean Herbert
02c1f490f1
Merge branch 'master' into muted-notification
2019-09-28 20:33:32 +08:00
Dean Herbert
a45f8c968b
Rename and add simple xmldoc
2019-09-28 20:21:51 +08:00
Dean Herbert
d01c30fd52
Merge branch 'master' into introduce-session-statics
2019-09-28 20:16:52 +08:00
Dean Herbert
1d1df2433f
Merge branch 'master' into fix-track-adjustments-not-applied-after-resume
2019-09-28 19:42:31 +08:00
Andrei Zavatski
a8eef0d0c4
Merge remote-tracking branch 'refs/remotes/ppy/master' into bot-profile
2019-09-28 12:34:16 +03:00
iiSaLMaN
fb9f21237e
Reset track adjustments on resuming from another screen
2019-09-28 04:18:16 +03:00
dependabot-preview[bot]
3af7c910fb
Bump Humanizer from 2.7.2 to 2.7.9
...
Bumps [Humanizer](https://github.com/Humanizr/Humanizer ) from 2.7.2 to 2.7.9.
- [Release notes](https://github.com/Humanizr/Humanizer/releases )
- [Changelog](https://github.com/Humanizr/Humanizer/blob/master/release_notes.md )
- [Commits](https://github.com/Humanizr/Humanizer/compare/v2.7.2...v2.7.9 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-27 19:09:07 +00:00
Andrei Zavatski
bbaf21a69d
Tables implementation
2019-09-27 19:33:52 +03:00
Andrei Zavatski
2a395956aa
Merge dependencies
2019-09-27 19:00:17 +03:00
Dan Balasescu
8b7f558728
Merge branch 'master' into improve-hold-button-text
2019-09-27 17:35:03 +09:00
Andrei Zavatski
4908cb826b
Fix line breaks
2019-09-27 09:46:11 +03:00
Andrei Zavatski
475455d7cd
Add missing line breaks
2019-09-27 09:32:46 +03:00
Andrei Zavatski
94eacbca5d
Fix Bot users have all the profile sections in ProfileOverlay
2019-09-27 09:22:25 +03:00
Dean Herbert
f4f5a7e9c8
Fix test regressions
2019-09-27 13:20:17 +08:00
Dean Herbert
b50ef8ffa4
Allow null NotificationManager
2019-09-27 13:15:33 +08:00
iiSaLMaN
2670a23e6f
Assign to field and move to load complete
2019-09-27 08:15:24 +03:00
iiSaLMaN
7904f77cd5
Bind event to activation delay change
2019-09-27 02:59:42 +03:00
smoogipoo
45f2bcc440
Fix combo bindings not being bound to nested hitobjects
2019-09-26 17:39:19 +09:00
smoogipoo
706e884cc0
Update accent colour on combo index change
2019-09-26 17:13:13 +09:00
smoogipoo
bbf0544a8d
Add bindables for IHasComboInformation properties
2019-09-26 16:55:08 +09:00
iiSaLMaN
911094e790
Replace menu button text with "press for menu" on 0ms activation delay
2019-09-26 01:42:56 +03:00
Dean Herbert
e2744054c7
Merge branch 'master' into back-button-part-2
2019-09-25 22:46:08 +09:00
Dean Herbert
7d5544460b
Fix mania scrolling speed not including beatmap slider multipli… ( #6236 )
...
Fix mania scrolling speed not including beatmap slider multiplier
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-25 22:34:46 +09:00
Dean Herbert
45f833ceea
Add invocation null checks for safety
2019-09-25 22:14:42 +09:00
Salman Ahmed
3aa9a172d8
Merge branch 'master' into introduce-session-statics
2019-09-25 16:14:39 +03:00
Dean Herbert
42fd323020
Move protected method
2019-09-25 22:13:49 +09:00
Dean Herbert
8c01677e0b
Merge remote-tracking branch 'upstream/master' into back-button-part-2
2019-09-25 22:12:00 +09:00
iiSaLMaN
8844d567cb
Use bindable setting instead
2019-09-25 15:56:47 +03:00
smoogipoo
244627ff10
Add comment + test for slider multiplier
2019-09-25 20:12:01 +09:00
Dean Herbert
f11156c2dc
Fix tests not working correctly
2019-09-25 19:30:25 +09:00
smoogipoo
9f77a1ef35
Adjust namespaces
2019-09-25 17:53:08 +09:00
smoogipoo
d32a0acd10
Merge remote-tracking branch 'origin/master' into labelled-switch-button
2019-09-25 17:51:12 +09:00
smoogipoo
c9e39c124e
Add a labelled switch button
2019-09-25 17:42:35 +09:00
smoogipoo
261ba5c80a
Fix button not transforming correctly in some cases
2019-09-25 17:42:27 +09:00
Dean Herbert
ff9033f9ac
Merge remote-tracking branch 'upstream/master' into muted-notification
2019-09-25 16:47:56 +09:00
Dean Herbert
3bd0fc2947
Merge remote-tracking branch 'upstream/master' into android-build-automation
2019-09-25 16:33:36 +09:00
Dan Balasescu
0eff9aa5e9
Merge branch 'master' into improve-carousel-tests
2019-09-25 15:55:11 +09:00
Dan Balasescu
213488a25e
Merge branch 'master' into abstract-update-manager
2019-09-25 15:41:45 +09:00
Dean Herbert
c83db94eb7
Use isolated storage/api
2019-09-25 15:00:08 +09:00
Dean Herbert
654b815b36
Merge remote-tracking branch 'upstream/master' into back-button-part-2
2019-09-25 14:38:39 +09:00
Dean Herbert
bb1289e83c
Merge branch 'master' into improve-carousel-tests
2019-09-25 14:24:28 +09:00
Joehu
102dbd85bd
Fix CI errors
2019-09-24 16:48:22 -07:00
Joehu
9861b21440
Remove unnecessary padding/margin
2019-09-24 16:28:40 -07:00
Joehu
7fab1a4337
Truncate long metadata on beatmap info wedge
2019-09-24 16:06:33 -07:00
Bartłomiej Dach
9323df26a1
Decouple bar line hitobjects from generator
...
Introduce an IBarLine interface, which together with generic constraints
helps decouple BarLineGenerator from the actual hitobject types it
creates. Thanks to this, all rulesets that want bar lines can provide
an implementation of IBarLine that also derives from the base hitobject
class.
This allows DrawableBarLines in taiko and mania to be migrated back to
DrawableTaikoHitObject and DrawableManiaHitObject base classes
respectively. This in turn resolves #6215 without code duplication,
since the missing anchoring application is now done in mania's
DrawableBarLine through deriving from DrawableManiaHitObject.
2019-09-25 00:36:27 +02:00
iiSaLMaN
cde7f49db1
Use direct get and set instead
2019-09-25 01:26:02 +03:00
iiSaLMaN
d013b73d33
Move in-memory logic to a base class
2019-09-25 01:25:05 +03:00
Dean Herbert
4a59e3351e
Update beatmap carousel tests code style
...
Also fixes one issue I spotted in BeatmapCarousel related to incorrectly holding a selection after new sets are loaded.
2019-09-25 02:42:12 +09:00
LeNitrous
851e42a444
avoid memory leak
2019-09-24 22:57:29 +08:00
LeNitrous
0bc59e17dc
remove Seasonal and apply suggestions
2019-09-24 21:56:32 +08:00
Dean Herbert
03ec0fb27d
Merge branch 'master' into fix-mania-scrolling-speed
2019-09-24 22:20:19 +09:00
LeNitrous
03947e5b85
change background for ScalingContainer
2019-09-24 19:49:46 +08:00
Dean Herbert
d2b76ec688
Make LabelledTextBox use the new LabelledComponent class ( #6188 )
...
Make LabelledTextBox use the new LabelledComponent class
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-24 19:37:12 +09:00
LeNitrous
afa043aa7d
always use default samples
2019-09-24 18:17:27 +08:00
Dean Herbert
f493f1c71d
Move new components to v2 namespace
2019-09-24 19:00:26 +09:00
Dean Herbert
551b66ccec
Update framework ( #6234 )
...
Update framework
Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-24 18:54:47 +09:00
LeNitrous
b8d147a3b4
introduce main menu background modes
2019-09-24 17:42:06 +08:00
smoogipoo
028c958431
Initial implementation of a switch button
2019-09-24 18:39:11 +09:00
Dean Herbert
42b6041763
Move post-update notification logic to UpdateManager base class
2019-09-24 18:37:05 +09:00
Dean Herbert
c226d52b53
Don't automatic download for now
2019-09-24 18:34:54 +09:00
Dan Balasescu
1e70b83fd3
Merge branch 'master' into update-framework
2019-09-24 18:27:38 +09:00
smoogipoo
6b702eb6de
Update with generic labelledcomponent
2019-09-24 18:25:17 +09:00
smoogipoo
5212c50654
Merge branch 'generic-labelledcomponent' into labelled-textbox-improvements
2019-09-24 18:23:01 +09:00
smoogipoo
df692b091c
Make LabelledComponent generic
2019-09-24 18:22:02 +09:00
Dean Herbert
84d9f98ff1
fixup! Move post-update notification logic to UpdateManager base class
2019-09-24 18:15:57 +09:00
Dean Herbert
1c474de0ed
Move post-update notification logic to UpdateManager base class
2019-09-24 18:03:05 +09:00
Dan Balasescu
45015fc4ba
Merge branch 'master' into tournament-setup
2019-09-24 17:27:17 +09:00
smoogipoo
4abe0473b9
Fix relative beat length not considering slider multiplier
2019-09-24 16:49:42 +09:00
smoogipoo
af0c15a93c
Fix initial hitobject states not being recomputed correctly
2019-09-24 16:48:39 +09:00
smoogipoo
75cceb9e30
Fix LifetimeChanged being invoked before lifetime is set
2019-09-24 16:47:34 +09:00
Dean Herbert
1860c2f9ce
Update framework
2019-09-24 16:22:30 +09:00
Dan Balasescu
b67b594036
Merge branch 'master' into menu-key-support
2019-09-24 15:09:38 +09:00
smoogipoo
4555ecc5e0
Check for exact key
2019-09-24 15:09:08 +09:00
Dan Balasescu
615e300bc9
Merge branch 'master' into fix-changelog-margin
2019-09-24 13:39:17 +09:00
iiSaLMaN
267e12ce3c
Add sample usage to the session statics
2019-09-24 05:45:47 +03:00
LeNitrous
ec78889e94
remove unused dependencies
2019-09-24 08:14:20 +08:00
dependabot-preview[bot]
53603b5591
Bump System.ComponentModel.Annotations from 4.5.0 to 4.6.0
...
Bumps [System.ComponentModel.Annotations](https://github.com/dotnet/corefx ) from 4.5.0 to 4.6.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-09-23 20:15:51 +00:00
Andrei Zavatski
5c4dfe0809
Apply suggested change
2019-09-23 17:05:19 +03:00
Andrei Zavatski
ffbab25358
Fix incorrect icon margin in ChangelogOverlay
2019-09-23 16:12:43 +03:00
LeNitrous
5024770544
move common logic to IntroScreen
2019-09-23 20:52:44 +08:00
iiSaLMaN
e3e245ab20
Introduce SessionStatics
2019-09-23 08:15:27 +03:00
Dean Herbert
9a6d748498
Merge branch 'master' into add-creator-artist-filters
2019-09-23 12:31:51 +09:00
Craftplacer
9a687ae8e2
Merge branch 'master' into muted-notification
2019-09-23 01:59:37 +02:00
Dean Herbert
b41ac543c5
Allow changing logged in user
2019-09-23 04:46:50 +09:00
Bartłomiej Dach
96c0c80dc5
Factor out methods in FilterQueryParser
...
Factor FilterQueryParser.ApplyQueries into shorter methods to reduce
method complexity.
2019-09-22 21:20:50 +02:00
Dean Herbert
d6ec6b1eda
Merge branch 'master' into labelled-textbox-improvements
2019-09-23 00:39:29 +09:00
Dean Herbert
9fe7675be8
Add a base class for all future labelled components ( #6187 )
...
Add a base class for all future labelled components
2019-09-23 00:38:51 +09:00
Dean Herbert
e5b14ce74d
Add null check for safety
...
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
2019-09-22 21:42:32 +09:00
Dean Herbert
fc1d49631a
Allow top-level menu key pressed to progress the osu! logo
2019-09-22 20:31:53 +09:00
Dean Herbert
cdf29b0952
Specify model name on initialize and fail import notification m… ( #6192 )
...
Specify model name on initialize and fail import notification messages
2019-09-22 15:54:04 +09:00
Bartłomiej Dach
70842f71f4
Fix floating point handling in filter intervals
...
Due to floating-point rounding and representation errors, filters could
wrongly display results incongruous with the wedge display text (ie.
a beatmap with the BPM of 139.99999 would be displayed as having 140
BPM and also pass the bpm<140 filter).
Apply tolerance when parsing floating-point constraints. The tolerance
chosen is half of what the UI displays for the particular values (so
for example half of 0.1 for AR/DR/CS, 0.01 for stars, etc.)
Tests updated accordingly.
2019-09-22 00:20:55 +02:00
Bartłomiej Dach
b262ba13cd
Add creator= and artist= filters
...
To match stable, add creator= and artist= filters to the beatmap
carousel on song select screen. Contrary to stable, this implementation
supports phrase queries with spaces within using double quotes.
The quote handling is not entirely correct (can't nest), but quotes
should rarely happen within names, and it is an edge case of an edge
case - leaving best-effort as is. Test coverage also included.
2019-09-22 00:20:55 +02:00
Bartłomiej Dach
f5f5094611
Take culture into account when parsing filters
...
Culture was not taken into account when parsing filters, which meant
that in cultures that use the comma (,) as a decimal delimiter, it would
conflict with the comma used to delimit search criteria. To remove
any ambiguity, introduce local helper functions that allow the decimal
point to be utilised, using the invariant culture. This also matches
stable behaviour.
The decision to not reuse osu.Game.Beatmaps.Formats.Parsing was
deliberate due to differing semantics (it's not really sane to throw
exceptions on receiving user-facing input).
2019-09-22 00:18:53 +02:00
Bartłomiej Dach
dddd94684b
Split out lower and upper interval inclusivity
...
A single IsInclusive field causes unexpected issues when trying to
formulate a half-open interval query. Split out IsInclusive into two
fields, Is{Lower,Upper}Inclusive and update usages accordingly.
2019-09-22 00:18:28 +02:00
Bartłomiej Dach
33c51d5178
Extract parsing filter queries to class
...
For the sake of testability without having to spin up visual tests,
extract methods related to parsing filter queries from FilterControl
to a static FilterQueryParser class.
2019-09-22 00:18:28 +02:00
iiSaLMaN
9be8bdef52
Remove pluralize and use title letter casing
2019-09-21 21:00:24 +03:00
iiSaLMaN
6bb0f3eb41
Move humanizing to the model name instead
2019-09-21 20:04:12 +03:00
Dean Herbert
db90d211cb
Fix scores importing with deleted beatmap sets ( #6190 )
...
Fix scores importing with deleted beatmap sets
2019-09-22 01:15:22 +09:00
Dean Herbert
c99b48f934
Bring up-to-date and use IApplicableFailOverride
2019-09-21 23:30:54 +09:00
Dean Herbert
4c4b71eeec
Merge branch 'master' into master
2019-09-21 22:45:05 +09:00
Dean Herbert
a76771e696
Add support for "additions" in changelog ( #6177 )
...
Add support for "additions" in changelog
2019-09-21 22:27:18 +09:00
Dan Balasescu
73fe402756
Merge branch 'master' into fix-html-unescaping
2019-09-21 12:59:57 +09:00
Andrei Zavatski
befdd140f4
Reverse padding changes
2019-09-20 23:50:19 +03:00
Andrei Zavatski
6ad26e61d1
Merge remote-tracking branch 'refs/remotes/ppy/master' into changelog-improvements
2019-09-20 23:49:24 +03:00
Andrei Zavatski
e7118a9272
Use System mod type for NoMod
2019-09-20 23:47:21 +03:00
Andrei Zavatski
0d43f4e4f9
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-09-20 23:39:44 +03:00
Dean Herbert
dced3c38b5
Update framework ( #6196 )
...
Update framework
2019-09-21 02:21:00 +09:00
Dean Herbert
92f9cf3e06
Update framework
2019-09-21 02:08:19 +09:00
Vperus
ac8fe6045f
Fixed typo
...
Changed CreateReourceStore() to CreateResourceStore()
2019-09-20 19:58:39 +03:00
iiSaLMaN
3be03a26c9
Pluralize instead of adding 's'
2019-09-20 16:18:55 +03:00
iiSaLMaN
8300e86f20
Specify model name on import notification messages
2019-09-20 15:46:43 +03:00
smoogipoo
c89c092b98
Allow undeleting scores if their beatmap exists
2019-09-20 19:55:59 +09:00
smoogipoo
dfc0928ebe
Fix scores importing with deleted beatmap sets
2019-09-20 19:39:21 +09:00
smoogipoo
2bbf4ca4b5
Update LabelledTextBox to use LabelledComponent
2019-09-20 18:50:50 +09:00
smoogipoo
523272edab
Add xmldocs
2019-09-20 18:39:04 +09:00
smoogipoo
e0a97cfac5
Add a LabelledComponent base class
2019-09-20 18:35:15 +09:00
Dean Herbert
a06cb54732
Merge branch 'master' into beatmap-parsing-fallback-v2
2019-09-20 15:28:08 +09:00
Dean Herbert
d0a4e1e3c2
Force a checksum check before skipping FileStore copy op
2019-09-20 15:00:27 +09:00
Revel
f7f9c0f7e0
Update BeatmapDetailAreaTabControl.cs
2019-09-19 15:47:32 -04:00
Lucas A
5663e3e6b3
Fix escaped html strings not being unescaped in changelog entries.
2019-09-19 20:08:14 +02:00
Andrei Zavatski
daa64f1be7
Adjust icon padding
2019-09-19 20:53:06 +03:00
Andrei Zavatski
573da7b1e7
Implement ChangelogEntryType
2019-09-19 20:34:37 +03:00
Dean Herbert
636582e089
Always show exit confirmation when closing via alt-f4 or window control
2019-09-20 02:22:49 +09:00
Andrei Zavatski
0cf4db899f
Few cleanups
2019-09-19 17:03:52 +03:00
Andrei Zavatski
efea8be97d
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-09-19 17:03:00 +03:00
Andrei Zavatski
529a1c3b91
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-09-19 16:46:58 +03:00
Dean Herbert
67796e0982
Apply code styling suggestions
2019-09-19 22:46:21 +09:00
Dean Herbert
4e9bb7b121
Merge remote-tracking branch 'upstream/master' into hold-to-press-setting
2019-09-19 22:35:18 +09:00
Dean Herbert
0a67d1db1b
Merge pull request #5355 from EVAST9919/songselect-best-user-score
...
Show personal best on song select
2019-09-19 21:17:23 +09:00
smoogipoo
94d3bcc612
Fix top score not being selectable
2019-09-19 20:47:33 +09:00
Dean Herbert
50d4206c45
Fix exit scenarios
2019-09-19 20:17:58 +09:00
Dean Herbert
ead3ee3b41
Merge branch 'master' into hold-to-press-setting
2019-09-19 20:05:14 +09:00
Dean Herbert
cffee1fd5e
Fix imported beatmap paths not correctly matching files
2019-09-19 20:02:45 +09:00
Dean Herbert
ddff9882cf
Fix importing archives which are nested in a single folder within a zip
2019-09-19 19:11:04 +09:00
Dean Herbert
0640b2eb35
Fix judgement sizes not matching legacy skins ( #6145 )
...
Fix judgement sizes not matching legacy skins
2019-09-19 18:49:35 +09:00
Dean Herbert
3abcd898a6
Add hit lighting ( #6144 )
...
Add hit lighting
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 18:49:22 +09:00
Dean Herbert
28342baa8f
Add auto-restart functionality to sudden death and perfect mods ( #6159 )
...
Add auto-restart functionality to sudden death and perfect mods
Co-authored-by: Paul Teng <plankp@outlook.com>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 18:49:09 +09:00
Dan Balasescu
027d6194f2
Merge branch 'master' into add-hit-lighting
2019-09-19 18:07:29 +09:00
smoogipoo
bc9941a990
Newline required when xmldocs are involved
2019-09-19 18:00:11 +09:00
smoogipoo
65276cd235
Remove whitespace
2019-09-19 17:58:10 +09:00
smoogipoo
db24cfbead
Merge remote-tracking branch 'origin/master' into auto-restart-mod-perfect
...
# Conflicts:
# osu.Game/Screens/Play/Player.cs
2019-09-19 17:57:04 +09:00
smoogipoo
da15b900f7
Remove virtual member from ModBlockFail
2019-09-19 17:44:24 +09:00
Dean Herbert
646d762468
Merge branch 'master' into songselect-advanced-filtering
2019-09-19 17:42:32 +09:00
Dean Herbert
fa54a0bfd3
Fix test failures
2019-09-19 17:40:46 +09:00
smoogipoo
5120d82ef8
Fix crash with multiple range criterias
2019-09-19 17:36:44 +09:00
Dean Herbert
e6c36a8bc7
Fix scaling mode being applied to judgements
2019-09-19 17:36:32 +09:00
smoogipoo
96ea507320
Reorder comparison for readability
2019-09-19 17:21:22 +09:00
smoogipoo
e075dd7ea8
Fix equals operator not working
2019-09-19 17:16:34 +09:00
smoogipoo
7683f7ff23
Make OnlineStatus use OptionalRange
2019-09-19 17:12:07 +09:00
smoogipoo
d7831d8f5d
Use non-generic IComparable interface
2019-09-19 17:11:43 +09:00
smoogipoo
167bb9fcc1
Fix ugly casts
2019-09-19 17:11:28 +09:00
smoogipoo
0915a94470
Make BeatDivisor use OptionalRange
2019-09-19 16:53:27 +09:00
smoogipoo
3c21b68b73
Make OptionalRange generic
2019-09-19 16:51:57 +09:00
Dean Herbert
2cd7c769e1
Merge remote-tracking branch 'upstream/master' into fix-judgement-size
2019-09-19 16:32:37 +09:00
Dean Herbert
929f05884b
Always confirm exit when button is clicked
2019-09-19 16:28:06 +09:00
Dean Herbert
a214e7e72f
Add confirmation dialog when exiting game
2019-09-19 16:26:22 +09:00
Dean Herbert
39a5a3eebe
Merge remote-tracking branch 'upstream/master' into hold-to-press-setting
2019-09-19 16:26:14 +09:00
Dean Herbert
83657239bd
Disallow failing for replay players ( #6162 )
...
Disallow failing for replay players
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 16:00:37 +09:00
Dean Herbert
e2f7d4bc62
Remove unnecessary ToMetric avoidance
2019-09-19 15:45:43 +09:00
Dean Herbert
48ee95955b
Remove unnecessary redirection
2019-09-19 15:45:08 +09:00
smoogipoo
c1daa187fe
Reduce default tolerance
2019-09-19 15:44:14 +09:00
Dean Herbert
36d0695e5c
Add spacing
2019-09-19 15:44:05 +09:00
Dean Herbert
033c68a428
Fade in score, not container
2019-09-19 15:44:00 +09:00
Dean Herbert
2b6c9aeb26
Move top score container to more local namespace
2019-09-19 15:38:40 +09:00
Dean Herbert
e0fd8609d1
Fix margins and clean up implementation
2019-09-19 15:34:46 +09:00
smoogipoo
80f46e02d8
Add equals (=) query operator variants
2019-09-19 15:33:54 +09:00
Dean Herbert
098e89cb66
Improve state reset flow
2019-09-19 15:23:33 +09:00
Dan Balasescu
9f8c9af3b4
Merge branch 'master' into add-class-combo-colours
2019-09-19 15:13:00 +09:00
Salman Ahmed
865425d35e
Merge branch 'master' into block-failing-on-replays
2019-09-19 09:09:56 +03:00
smoogipoo
c76e27549a
Remove spacing
2019-09-19 14:56:52 +09:00
Dan Balasescu
1f0f4d52f3
Merge branch 'master' into state-update-on-skin-change
2019-09-19 14:55:21 +09:00
Dean Herbert
4967ffd8e5
Move inside leaderboard
2019-09-19 14:52:31 +09:00
iiSaLMaN
da4d83063e
Simplify LINQ expression
2019-09-19 08:31:11 +03:00
Dean Herbert
a7b6895d4c
Revert changes to BeatmapDetailArea
2019-09-19 14:26:15 +09:00
smoogipoo
762adb783a
Fix duplicate invocation of updateState on load complete
2019-09-19 14:15:06 +09:00
Dean Herbert
177a789d79
Add setting to adjust hold-to-confirm activation time
2019-09-19 14:06:25 +09:00
iiSaLMaN
e793854735
Invert BypassFail usage
2019-09-19 08:00:41 +03:00
iiSaLMaN
9de0bcae1e
Check for blocking fail mods by default
2019-09-19 07:58:54 +03:00
smoogipoo
4b97327b37
Cleanup draggedItem usages and make them more safe
2019-09-19 13:53:52 +09:00
smoogipoo
0644443979
Use resolved attribute for music controller
2019-09-19 13:51:50 +09:00
smoogipoo
c34842cb80
Merge remote-tracking branch 'Joehuu/master' into randomise-song-playback
2019-09-19 13:37:46 +09:00
Dean Herbert
2e0a85c2f6
Merge remote-tracking branch 'upstream/master' into songselect-best-user-score
2019-09-19 12:57:30 +09:00
Dean Herbert
3fa1b53b2a
Add back combo colours for osu!classic
2019-09-19 12:39:15 +09:00
Andrei Zavatski
647433a8d1
Don't trigger request if there are no avaliable users
2019-09-19 04:09:14 +03:00
Andrei Zavatski
44412f9ddb
Fix local sorting calls an online request
2019-09-19 03:35:56 +03:00
Andrei Zavatski
9a81a44134
Merge remote-tracking branch 'refs/remotes/ppy/master' into friends-sorting
2019-09-19 03:22:53 +03:00
Craftplacer
c3221e1a36
Prepare classes for player loader test scene
2019-09-18 23:27:26 +02:00
iiSaLMaN
775b90e066
Bypass fail on replays
2019-09-18 22:49:48 +03:00
iiSaLMaN
ecd721e8c5
Add bypass fail property to Player
2019-09-18 22:49:28 +03:00
Dean Herbert
92556db9cd
Add query-based filter modes to song select search field
2019-09-19 02:48:28 +09:00
Dean Herbert
2296ea75d7
Add reference to xmldoc
...
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
2019-09-19 02:03:30 +09:00
Dean Herbert
2fcc8c2d72
Simplify implementation, play fail animation during restart
2019-09-19 01:45:59 +09:00
Dean Herbert
1150e9fdfb
Bring other mods up-to-date
2019-09-19 01:45:42 +09:00
Dean Herbert
ff3a7c1d13
Merge remote-tracking branch 'upstream/master' into auto-restart-mod-perfect
2019-09-19 01:36:29 +09:00
dependabot-preview[bot]
1d7377df65
Bump ppy.osu.Framework from 2019.911.0 to 2019.918.0
...
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework ) from 2019.911.0 to 2019.918.0.
- [Release notes](https://github.com/ppy/osu-framework/releases )
- [Commits](https://github.com/ppy/osu-framework/compare/2019.911.0...2019.918.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-18 14:51:01 +00:00
Dean Herbert
5901a915e7
Always update drawable hitobject state on skin change
2019-09-18 20:19:57 +09:00
Dean Herbert
2046f64b22
Revert clamping logic
2019-09-18 16:07:02 +09:00
Dean Herbert
b4a396885d
Merge remote-tracking branch 'upstream/master' into key-counter-fixes
2019-09-18 14:08:40 +09:00
Dean Herbert
91bdece9af
Localise OrderChanged handling and fix callbacks
...
The dragged item's position now only updates after the drag finishes. Local handling changes were required to ignore the bindable remove/add events that are fired as a result.
2019-09-18 13:15:39 +09:00
Dean Herbert
7e791f7cd7
Expose as IBindableList
2019-09-18 13:14:33 +09:00
Dean Herbert
18fd82e83a
Merge remote-tracking branch 'upstream/master' into randomise-song-playback
2019-09-18 13:14:08 +09:00
Dean Herbert
26eca5b1f4
Fix judgement sizes not matching skins stable
2019-09-18 02:56:03 +09:00
Dean Herbert
ba76f09c99
Add initial implementation of hit lighting
...
Requires a supporting skin, like osu!classic for now.
2019-09-18 02:49:54 +09:00
Dean Herbert
63cc8d4f90
Add hit lighting setting
2019-09-18 02:16:57 +09:00
Dean Herbert
b5b29a21e7
Move menu cursor rotation to more appropriate settings section
2019-09-18 02:15:18 +09:00
Dean Herbert
3ab352ffe5
Randomise beatmap playback order on startup
...
Closes #6135 .
2019-09-17 23:15:03 +09:00
Dean Herbert
ec5f420818
Merge branch 'master' into key-counter-fixes
2019-09-17 22:56:34 +09:00
Dean Herbert
057c4aa795
Remove unused using statement
2019-09-17 22:42:20 +09:00
Dean Herbert
77947e8309
Fix rewind tests failing
2019-09-17 22:33:27 +09:00
Dean Herbert
38d85e44be
Merge branch 'master' into key-counter-fixes
2019-09-17 22:33:15 +09:00
Dean Herbert
fd3e2375bb
Fix disclaimer potentially pushing a null screen ( #6137 )
...
Fix disclaimer potentially pushing a null screen
2019-09-17 16:39:04 +09:00
smoogipoo
f0bcb2b933
Debounce user-requested replay seeks
2019-09-17 16:12:18 +09:00
smoogipoo
efedfefe63
Fix disclaimer potentially pushing a null screen
2019-09-17 15:54:11 +09:00
Craftplacer
220fdd0a04
Make muteWarningShownOnce static
...
... so it will actually get an instance per osu session.
2019-09-16 06:56:52 +02:00
Bartłomiej Dach
a407e267a2
Fix PF/SD legacy mod conversion
...
Upon investigating an user report in #6091 that indicated that viewing
replays using the Perfect mod would also display the Sudden Death mod
icon despite Perfect being the more restrictive of the two, it turned
out that the logic of importing legacy scores was missing that corner
case. A similar case of Double Time/Nightcore mutual exclusion was
handled, but PF/SD was missed.
Add analogous handling of PF/SD legacy mods for all four rulesets,
and additionally cover a tiny fraction of all cases with unit tests.
The most problematic cases (NC+HD and PF+SD) are covered in all four
basic rulesets.
2019-09-15 22:55:25 +02:00
Craftplacer
cb033591c4
Merge branch 'master' into muted-notification
2019-09-15 17:59:27 +02:00
Dean Herbert
9d8eb42ac7
Merge branch 'master' into news-overlay-header
2019-09-16 00:59:18 +09:00
Craftplacer
ecce12981e
Use block body for constructor to fix remaining code inspection issue
2019-09-15 17:47:44 +02:00
Craftplacer
e3884658af
Resolve code inspection errors
2019-09-15 17:36:53 +02:00
Dean Herbert
2381b4c003
Move video behind storyboard
2019-09-16 00:20:56 +09:00
Craftplacer
ec788ac09d
Make notification only show up once per session
2019-09-15 17:20:07 +02:00