Salman Ahmed
4f6b85e5ea
Add test ensuring correct break lightening behaviour
2019-12-12 00:32:39 +03:00
Albie
6b048a03a6
Merge branch 'cinema-mod' of https://github.com/aspriddell/osu into cinema-mod
2019-12-11 19:01:28 +00:00
Albie
2ca722423b
remove uneccesary using statement
2019-12-11 18:58:14 +00:00
Albie
4a1c6db3ed
Merge branch 'master' into cinema-mod
2019-12-11 18:00:17 +00:00
Albie
caa9286a90
update tests, change binding and reduce lines in cinema mod
2019-12-11 17:39:40 +00:00
Dean Herbert
e6102200a8
Merge remote-tracking branch 'upstream/master' into filesafety
2019-12-12 01:59:57 +09:00
unknown
b0cf44c3be
fix appveyor issues
2019-12-11 20:12:29 +08:00
unknown
b795532aa5
add difficulty adjustment mods
2019-12-11 19:43:16 +08:00
smoogipoo
40f918dce6
Remove unused using
2019-12-11 19:49:32 +09:00
smoogipoo
c34b6b59ed
Remove time ramp and rate adjust mod incompatibility
2019-12-11 19:48:57 +09:00
smoogipoo
404d3207ff
Refactor ModNightcore/ModDaycore
2019-12-11 19:43:32 +09:00
Dan Balasescu
b77f9504d0
Merge branch 'master' into adjustable-rate-mods
2019-12-11 19:28:59 +09:00
Dan Balasescu
9963d18d17
Add whitespace
2019-12-11 19:13:04 +09:00
Dan Balasescu
e288706802
Merge branch 'master' into rankings-overlay-refactor
2019-12-11 19:09:29 +09:00
Dan Balasescu
166e957104
Merge pull request #6432 from LeNitrous/customized-mods
...
Add per-mod settings
2019-12-11 19:07:29 +09:00
Dean Herbert
a106e2a53f
Refactor distance snap grid to not require hitobjects ( #7138 )
...
Refactor distance snap grid to not require hitobjects
2019-12-11 19:02:29 +09:00
Dan Balasescu
900cbd7af3
Merge branch 'master' into customized-mods
2019-12-11 18:52:00 +09:00
smoogipoo
48f1dad4aa
Remove abstract ScoreProcessor class
2019-12-11 17:25:06 +09:00
Huo Yaoyuan
cffeceb229
Remove unnecessary comment.
2019-12-11 16:24:22 +08:00
Huo Yaoyuan
b86a3dbfab
PathStandardise -> ToStandardisedPath
2019-12-11 16:06:56 +08:00
Huo Yaoyuan
6b3c7c8421
Remove usages of FileSafety class.
2019-12-11 16:05:35 +08:00
Albie
83b2e0525e
further fixes, not perfect yet
2019-12-11 07:02:51 +00:00
Dean Herbert
75f9250645
Don't automatically pause when window is inactive if in break time
2019-12-11 15:46:07 +09:00
Dean Herbert
6c8f325063
Add failing test
2019-12-11 15:46:07 +09:00
Dean Herbert
9ebad16436
Fix logic regression
2019-12-11 14:37:10 +09:00
Dean Herbert
77b9989e11
Fix some weird private field names
2019-12-11 14:10:35 +09:00
Dean Herbert
9eed64997f
Merge branch 'customized-mods' into adjustable-rate-mods
2019-12-11 13:26:05 +09:00
Dean Herbert
5624b9fd3f
Fix US english
2019-12-11 13:19:13 +09:00
Dean Herbert
a37af311d0
Simplify settings update logic
2019-12-11 13:19:02 +09:00
Salman Ahmed
53daa37eaa
Fix failing tests
2019-12-10 23:06:13 +03:00
Albie
a61f8cc2c3
Merge branch 'master' into cinema-mod
2019-12-10 17:06:53 +00:00
Albie
6c1ae3bc8a
add tests
2019-12-10 16:59:31 +00:00
Salman Ahmed
38f1a8bc17
Bind UserDimContainer.IsBreakTime from Player
2019-12-10 15:14:47 +03:00
Salman Ahmed
bb078c2afc
Lighten user-dim container if on break time
2019-12-10 15:13:44 +03:00
Salman Ahmed
b93bbf81aa
Add lighten background during breaks setting
2019-12-10 15:10:35 +03:00
smoogipoo
c378e525da
Extract the rest of legacy enums
2019-12-10 20:23:15 +09:00
smoogipoo
3c18872a16
Extract legacy effect flags enum
2019-12-10 20:19:31 +09:00
smoogipoo
e3f925f69a
Extract legacy hitobject type enum
2019-12-10 20:19:16 +09:00
smoogipoo
8012b21ffa
Extract legacy sound type enum
2019-12-10 20:18:44 +09:00
Dean Herbert
138b83c9ea
Merge branch 'master' into customized-mods
2019-12-10 19:13:32 +09:00
Dean Herbert
f6c0b5c44a
Merge branch 'master' into settings-source
2019-12-10 18:49:41 +09:00
Dean Herbert
efc3b7fc9f
Merge branch 'master' into fix-settings-bindable-logic
2019-12-10 18:30:27 +09:00
Dean Herbert
55c938e5da
Fix bindable usage
2019-12-10 18:08:24 +09:00
Dean Herbert
65f2d1f875
Update framework
2019-12-10 17:49:42 +09:00
Dean Herbert
f7f4a57c5f
Update bindable types in line with framework
2019-12-10 16:48:24 +09:00
Dean Herbert
609c511309
Update framework
2019-12-10 16:43:58 +09:00
Dan Balasescu
bd6a08a21b
Merge branch 'master' into apply-to-track
2019-12-10 16:15:24 +09:00
smoogipoo
94a298a82d
Refactor distance snap grid to not require hitobjects
2019-12-10 16:00:09 +09:00
Dean Herbert
5f3d163772
Merge branch 'master' into segmented-slider-paths-3
2019-12-10 14:28:20 +09:00
smoogipoo
ab0f2e7c6a
Apply suggested refactorings
2019-12-10 13:12:54 +09:00
Dean Herbert
cdde5d1d69
Fix song select filters not reapplied if in a child screen
...
Closes https://github.com/ppy/osu/issues/6980 .
2019-12-10 02:30:23 +09:00
Dean Herbert
dc9775742c
Fix incorrect code migration
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2019-12-10 02:23:17 +09:00
Dean Herbert
12bdb1dafd
Pin DC/NC pitch
2019-12-09 20:40:38 +09:00
smoogipoo
47f3c4a596
Don't serialise path version
2019-12-09 20:18:18 +09:00
Dean Herbert
edc8220554
Add time ramp settings
2019-12-09 19:58:51 +09:00
Dean Herbert
7fd52c21f5
Update mods and user adjust to use adjustments
2019-12-09 19:41:31 +09:00
Dean Herbert
6b667daf09
Update bindable types in line with framework
2019-12-09 19:41:18 +09:00
Huo Yaoyuan
ad1fb3bda2
Remove IComparable in constraint.
2019-12-09 17:48:41 +08:00
Huo Yaoyuan
c3518a2b94
Enum constraint for enum dropdown.
2019-12-09 17:45:26 +08:00
Huo Yaoyuan
40a5c1fd96
Constrain transformable with class.
2019-12-09 17:45:26 +08:00
Huo Yaoyuan
04b3297a05
Constrain configuration lookup as enum.
2019-12-09 17:45:26 +08:00
smoogipoo
cd61893814
Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3
2019-12-09 18:25:27 +09:00
smoogipoo
6d9cd0fafe
Split out complex method
2019-12-09 18:25:13 +09:00
smoogipoo
b6e2738236
Remove unused using
2019-12-09 18:15:00 +09:00
Dean Herbert
9fa745aecc
Merge branch 'apply-to-track' into adjustable-rate-mods
2019-12-09 18:12:01 +09:00
Dean Herbert
d650bfb6d6
Remove unnecessary cast
2019-12-09 18:05:14 +09:00
smoogipoo
a1798fd38d
Fix bad ctor implementation
2019-12-09 18:01:13 +09:00
smoogipoo
bfbb9aa18e
Remove outdated assert
2019-12-09 18:01:02 +09:00
Dean Herbert
c39d2f006c
Merge branch 'master' into fix-settings-bindable-logic
2019-12-09 17:55:17 +09:00
smoogipoo
883d5bc11d
Remove automatic slider path offsetting
2019-12-09 17:54:22 +09:00
smoogipoo
9cb649436c
Default to linear control point type
2019-12-09 17:47:05 +09:00
smoogipoo
5a093c039c
Simplify path/point construction
2019-12-09 17:46:40 +09:00
Dean Herbert
ba538cf09b
Merge branch 'apply-to-track' into adjustable-double-time
2019-12-09 17:45:19 +09:00
Dean Herbert
eb074b7058
Allow mods to apply to track, not clock
2019-12-09 17:44:45 +09:00
Dean Herbert
0c7e5a2e3b
Add bindable adjustments for DT/HT rate
2019-12-09 16:54:00 +09:00
Dean Herbert
e37526888c
Merge remote-tracking branch 'upstream/master' into adjustable-double-time
2019-12-09 16:43:17 +09:00
dependabot-preview[bot]
12cfb7dedb
Bump System.ComponentModel.Annotations from 4.6.0 to 4.7.0
...
Bumps [System.ComponentModel.Annotations](https://github.com/dotnet/corefx ) from 4.6.0 to 4.7.0.
- [Release notes](https://github.com/dotnet/corefx/releases )
- [Commits](https://github.com/dotnet/corefx/commits )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-12-09 07:28:11 +00:00
smoogipoo
c18f2e6436
Merge remote-tracking branch 'refs/remotes/origin/master' into segmented-slider-paths-3
2019-12-09 15:34:49 +09:00
Dan Balasescu
0c9f7a64f1
Merge branch 'master' into improve-dialog-button-visuals
2019-12-09 15:31:48 +09:00
Dan Balasescu
07efd66287
Merge pull request #7075 from peppy/editor-timeline-hitobject-display
...
Editor timeline hitobject display
2019-12-09 14:53:25 +09:00
Dan Balasescu
5738ef5fab
Merge branch 'master' into editor-timeline-hitobject-display
2019-12-09 14:34:55 +09:00
Dean Herbert
58db745121
Merge remote-tracking branch 'upstream/master' into improve-dialog-button-visuals
2019-12-09 14:11:52 +09:00
Dean Herbert
03d18186c2
Fix broken merge
2019-12-09 14:11:44 +09:00
Andrei Zavatski
69deb0ca96
Fix unavailable replays can be accessed via leaderboard
2019-12-09 07:19:55 +03:00
smoogipoo
4905709ea4
Remove unused usings
2019-12-09 13:19:21 +09:00
Dean Herbert
003eef8595
Fix mod buttons being selected when drag scrolling overlay ( #7099 )
...
Fix mod buttons being selected when drag scrolling overlay
2019-12-09 12:24:48 +09:00
Dean Herbert
ad2ecf4dff
Fix key config search not clearing after pressing escape ( #7105 )
...
Fix key config search not clearing after pressing escape
2019-12-09 12:22:30 +09:00
Dean Herbert
4fbe5b7002
Merge branch 'master' into rankings-overlay-refactor
2019-12-09 11:34:32 +09:00
Joehu
9974fff5cc
Make sub panel back button inherit osu button
2019-12-08 10:51:25 -08:00
Joehu
5cf35869e9
Fix key config search not clearing after pressing escape
2019-12-08 10:40:39 -08:00
Lucas A
88ec0c1486
Add missing async content loading logic to NewsOverlay
2019-12-08 18:49:58 +01:00
Dean Herbert
fd38e56435
Merge branch 'master' into fix-settings-bindable-logic
2019-12-09 02:18:51 +09:00
Dean Herbert
c2a40c574d
Split out if statement for readability
2019-12-09 02:13:47 +09:00
Joehu
e394b28799
Remove redundant transform
2019-12-08 09:12:32 -08:00
Joehu
463b6c0030
Remove whitespace
2019-12-08 09:04:34 -08:00
Joehu
8956768fe0
Fix mod buttons being selected when drag scrolling overlay
2019-12-08 08:55:45 -08:00
Andrei Zavatski
929be3e9e7
Highlight own score in BeatmapSetOverlay
2019-12-08 12:34:07 +03:00
Dan Balasescu
52a0d98012
Merge pull request #7077 from peppy/fix-player-loader-speed
...
Fix mod speed adjustments unapplying if exiting the player loading screen early
2019-12-08 03:53:55 +09:00
Dan Balasescu
54798b134e
Add accessibility modifiers
2019-12-08 03:16:41 +09:00
Dan Balasescu
299daa26da
Merge branch 'master' into dont-confine-skins
2019-12-08 03:14:24 +09:00
Dean Herbert
5347e7c4a2
Apply code quality improvements
2019-12-06 20:14:06 +09:00
Dean Herbert
347373a3ba
Fix test failures
2019-12-06 19:04:55 +09:00
Dean Herbert
46d055604a
Customize -> Customise
2019-12-06 18:59:45 +09:00
Dean Herbert
680b2653ae
Improve animation of popup dialog buttons
2019-12-06 18:51:30 +09:00
smoogipoo
16f8341a02
Handle control point positional updates within SliderPath
2019-12-06 18:49:01 +09:00
Dean Herbert
cf0413663d
Merge branch 'settings-source' into customized-mods
2019-12-06 18:05:39 +09:00
Dean Herbert
2fa0b30fa2
Add textbox and dropdown support
2019-12-06 18:04:46 +09:00
Dean Herbert
ed6d1ccd95
Add a method for getting settings UI components automatically from a target class
2019-12-06 18:04:46 +09:00
Dean Herbert
901eb5d996
Fix incorrect trigger logic
2019-12-06 18:03:50 +09:00
Dean Herbert
9de032e35f
Fix SettingsItem bindable logic
2019-12-06 17:10:06 +09:00
Dean Herbert
a5d5099868
Use SettingsSource for mod cusomisation
2019-12-06 17:09:48 +09:00
Dean Herbert
23e47530c5
Add a method for getting settings UI components automatically from a target class
2019-12-06 17:09:24 +09:00
smoogipoo
b4e1b5fa98
Explose + use the full calculated length of the path
2019-12-06 15:53:19 +09:00
Dean Herbert
af35df4077
Add multiple mod testing and update test code style
2019-12-06 15:42:11 +09:00
smoogipoo
2654710d91
Add tests and fix negative expected distances
2019-12-06 15:37:06 +09:00
Dean Herbert
170954bc6e
Merge remote-tracking branch 'upstream/master' into customized-mods
2019-12-06 15:31:20 +09:00
Dean Herbert
f4bc9f087e
Merge remote-tracking branch 'upstream/master' into fix-player-loader-speed
2019-12-06 15:29:06 +09:00
smoogipoo
27dd12a66d
Rewrite slider length calculation for readability
2019-12-06 15:06:31 +09:00
Dean Herbert
21ceb7f85d
Always display skins at native sizes for now
2019-12-06 14:40:45 +09:00
Dean Herbert
04b89c8242
Merge branch 'master' into expertplus-tooltip-colour
2019-12-06 13:54:13 +09:00
Dean Herbert
48c6279e8b
Only undo adjustments in GameplayClockContainer if applied at least once
2019-12-06 13:49:22 +09:00
Dean Herbert
de23364608
Add failing test
2019-12-06 13:47:34 +09:00
Dean Herbert
b1426d1b22
Full impossible nullref
2019-12-06 12:51:43 +09:00
Dean Herbert
9248fbe881
Remove extra checkboxes for now
2019-12-06 12:22:44 +09:00
Dean Herbert
9f4c8db395
Add xmldoc
2019-12-06 12:17:41 +09:00
Ganendra Afrasya
8be6abf607
Add param to let function return lighter colour for some diff
2019-12-06 10:07:16 +07:00
smoogipoo
23c7132c4f
Add missing license header
2019-12-06 11:53:22 +09:00
Dean Herbert
28400aa865
Update test scene
2019-12-06 11:27:24 +09:00
Dean Herbert
12a9843835
Move thickness to a constant
2019-12-06 10:48:18 +09:00
Dean Herbert
e76f8bdd64
Fix warnings
2019-12-05 23:31:21 +09:00
Dean Herbert
d8620a70fb
Make work in editor
2019-12-05 20:12:25 +09:00
smoogipoo
3ebbf62b2a
Initial game-wide update with the new SliderPath
2019-12-05 19:53:36 +09:00
Dean Herbert
e225b0032a
Add basic hitobject display to timeline
2019-12-05 19:31:40 +09:00
smoogipoo
c9a66c0d07
Expose a version to indicate path changes
2019-12-05 18:31:28 +09:00
Dean Herbert
2419077c07
Update framework
2019-12-05 18:31:13 +09:00
smoogipoo
1585d83b96
Add legacy constructor
2019-12-05 18:19:42 +09:00
smoogipoo
986ac1cee4
Make expected distance a bindable
2019-12-05 17:51:29 +09:00
smoogipoo
2702edfa55
Rename new path, replace existing one
2019-12-05 17:49:32 +09:00
Ganendra Afrasya
0e97871461
Change colour if difficulty is ExpertPlus
2019-12-05 14:53:01 +07:00
smoogipoo
5e9b739b67
Re-implement slider paths to support multiple segments
2019-12-05 16:45:02 +09:00
Andrei Zavatski
33737d3d89
Move tests to TestSceneRankingsOverlay due to refactoring
2019-12-05 09:53:25 +03:00
Andrei Zavatski
22863da360
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-refactor
2019-12-05 09:29:37 +03:00
Dean Herbert
de413418c7
Remove redundant prefix
2019-12-05 14:50:12 +09:00
smoogipoo
0149e47673
Expose general control point change event
2019-12-05 14:38:32 +09:00
smoogipoo
3e0f499e72
Add xmldocs
2019-12-05 14:38:21 +09:00
Dean Herbert
6e9157d59c
Standardise request/response handling
2019-12-05 14:29:48 +09:00
Dean Herbert
cd473f207a
Use child set, not Clear/Add
2019-12-05 14:09:33 +09:00
Dean Herbert
5f9b9631ef
Move scope/country restrictions into RankingsOverlay
2019-12-05 14:07:39 +09:00
Dean Herbert
753715f7db
Merge branch 'master' into rankings-overlay-refactor
2019-12-05 13:46:21 +09:00
smoogipoo
40d0700fa5
Add structure for path control points
2019-12-05 13:43:38 +09:00
Dan Balasescu
36c734c4c2
Merge branch 'master' into decouple-api-room-scoreinfo
2019-12-05 12:43:43 +09:00
Dan Balasescu
f18519965c
Merge branch 'master' into eager-skip-filters
2019-12-05 12:27:42 +09:00
Andrei Zavatski
f8f144b6c0
Remove pointless ScheduledDelegate
2019-12-05 05:20:22 +03:00
Andrei Zavatski
48732e49b9
Improve async logic
2019-12-05 04:20:13 +03:00
Andrei Zavatski
0560a6637c
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-overlay-refactor
2019-12-05 04:11:45 +03:00
Dean Herbert
48287459a0
Optimise filters to avoid property retrieval
...
Also reduces number of instantiations of SearchableTerms array in the case of multiple criteria terms.
2019-12-05 01:52:22 +09:00
Dean Herbert
36224dca13
Fix multiplayer aggregate score inheriting from ScoreInfo
2019-12-05 01:45:28 +09:00
Dean Herbert
9ac0ac0944
Merge branch 'master' into fix-pause-testcase
2019-12-05 01:00:27 +09:00
Dean Herbert
0734b52483
Update framework
2019-12-04 23:33:26 +09:00
Dean Herbert
ca1f3417a3
Merge pull request #7046 from smoogipoo/fix-replay-button
...
Fix replay download button not working
2019-12-04 23:00:40 +09:00
Dan Balasescu
19c5848e73
Merge branch 'master' into decouple-legacy-score-info
2019-12-04 11:47:27 +09:00
Dan Balasescu
242e1b0b2e
Merge branch 'master' into add-missing-long-running
2019-12-04 11:29:25 +09:00
Huo Yaoyuan
46c9bdcf62
Replace Convert.ChangeType with IConvertible.
2019-12-03 20:49:41 +08:00
Huo Yaoyuan
5375af7820
Remove other Equals(object) calls.
2019-12-03 20:23:27 +08:00
Huo Yaoyuan
05cfef92f9
Don't compare spans with null.
2019-12-03 20:09:58 +08:00
Huo Yaoyuan
a42f9447e6
Don't use Equals(object) on T?.
2019-12-03 20:07:22 +08:00
Dean Herbert
e2591f154b
Only parse statistics when not null
2019-12-03 16:16:46 +09:00
Dean Herbert
1ce6a5ceb3
Rename class
2019-12-03 15:38:57 +09:00
Dean Herbert
f0d49d0cdf
Decouple APILegacyScoreInfo from ScoreInfo
2019-12-03 15:31:11 +09:00
smoogipoo
aadbbb1af3
Fix replay download button not working
2019-12-03 13:33:42 +09:00
recapitalverb
1ec11946c6
Fix spelling in comment on SearchTextBox.OnPressed
2019-12-02 18:45:57 +07:00
Dean Herbert
6893ec22bb
Fix currenTrackCompleted not being run on main thread
2019-12-02 18:26:45 +09:00
Dan Balasescu
700fe5162d
Merge branch 'master' into fix-overlays-drag-closing
2019-12-02 14:12:37 +09:00
Dan Balasescu
133c25f4c1
Merge branch 'master' into hide-mouse-in-playfield
2019-12-02 13:29:32 +09:00
Joehu
74176a6954
Remove redundant ternary expression
2019-12-01 12:54:37 -08:00
Joehu
3b88afd069
Fix overlays closing when dragging from in/out or out/in
2019-12-01 12:02:47 -08:00
Andrei Zavatski
62daea195c
Fix possible null
2019-12-01 04:09:45 +03:00
Andrei Zavatski
f375db368f
Remove useless null check
2019-12-01 03:56:03 +03:00
Andrei Zavatski
0ac4675546
Implement IEquatable<Country>
2019-12-01 03:52:41 +03:00
Andrei Zavatski
c451542915
Rankings overlay basic implementation
2019-11-30 03:01:07 +03:00
Dean Herbert
c49aeb08c4
Add API methods to perform requests out-of-queue
2019-11-29 20:03:14 +09:00
Dean Herbert
f181ee1843
Hide the menu cursor while inside the playfield by default
2019-11-29 17:35:11 +09:00
Dean Herbert
5dbc32f49b
Fix MedalIcon usage
2019-11-29 16:19:57 +09:00
Dean Herbert
b51ebe4431
Fix ScoreResultsPage usage
2019-11-29 15:50:50 +09:00
Dean Herbert
7efbf9f38f
Merge remote-tracking branch 'upstream/master' into rankings-tables
2019-11-29 15:37:08 +09:00
Dean Herbert
e678fe7a77
Move potentially expensive load to BDL
2019-11-29 15:35:33 +09:00
Dean Herbert
2663e5d756
Add some more missing LongRunningLoad flags
2019-11-29 13:52:23 +09:00
Dean Herbert
f4f54bc46b
Fix social browser calling game-wide load stalls
2019-11-29 13:03:17 +09:00
Andrei Zavatski
36d694ad2d
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables
2019-11-28 20:43:17 +03:00
Dean Herbert
9a941c4f94
Update font loading to use new method
2019-11-29 02:15:13 +09:00
Andrei Zavatski
83e3ad9e69
Make Rankings a ctor variable
2019-11-28 20:09:05 +03:00
Andrei Zavatski
da01f0ee5a
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables
2019-11-28 20:08:41 +03:00
Dean Herbert
b20e62096d
Merge remote-tracking branch 'upstream/master' into reduce-background-blur-scale
2019-11-29 01:49:25 +09:00
Albie
7864899249
Merge branch 'master' into cinema-mod
2019-11-28 16:42:01 +00:00
Dean Herbert
bb0a4db847
Fix failing tests
2019-11-29 01:17:58 +09:00
Dean Herbert
b9a8a36e60
Update framework
2019-11-29 00:44:32 +09:00
Ganendra Afrasya
71a871d7d1
Add loved enum on BeatmapApproval
2019-11-28 21:59:57 +07:00
Dean Herbert
56e8a1fdd5
Merge remote-tracking branch 'upstream/master' into reduce-background-blur-scale
2019-11-28 22:02:31 +09:00
Dean Herbert
a4f584c6a4
Update framework
2019-11-28 22:00:01 +09:00
Ganendra Afrasya
ada8dabf7e
Add right margin on score multiplier text
2019-11-28 18:48:43 +07:00
Dean Herbert
46379902be
Merge branch 'master' into hover-debounce
2019-11-28 20:44:32 +09:00
Dean Herbert
aa9776d51a
seal and compact rows
2019-11-28 19:07:43 +09:00
smoogipoo
f504370867
Make player block exit if pausable
2019-11-28 15:58:26 +09:00
Min
92ab8026a0
Completely remove click sound debounce
2019-11-28 16:03:59 +11:00
Ganendra Afrasya
944835da23
Add multiplier score text on mods footer button
2019-11-28 12:01:40 +07:00
Andrei Zavatski
8077c86d13
CI fixes
2019-11-27 23:58:31 +03:00
Andrei Zavatski
800bda7e81
Refactor tables to avoid code duplication
2019-11-27 23:35:02 +03:00
Andrei Zavatski
c546df8a80
Refactor API logic
2019-11-27 21:56:22 +03:00
Andrei Zavatski
2135a7fd7b
Don't use repetitive headers in each class
2019-11-27 21:46:41 +03:00
Andrei Zavatski
4cf5968026
Simplify place calculation
2019-11-27 21:39:38 +03:00
Andrei Zavatski
14c471fe5d
Move Rankings property below ctor
2019-11-27 21:37:34 +03:00
Andrei Zavatski
bb3152ac8b
Use string.empty for empty headers
2019-11-27 21:35:03 +03:00
Dean Herbert
e1302d84dd
Use string.Empty
2019-11-28 00:26:10 +09:00
Dean Herbert
2865f32052
Fix nullref on clicking links in tests
2019-11-28 00:13:44 +09:00
Dean Herbert
4221a0126c
Merge branch 'master' into rankings-tables
2019-11-27 23:26:54 +09:00
phosphene47
786fb9ede3
Split click and hover and disable click debounce
2019-11-28 00:44:01 +11:00
phosphene47
d4afea0b5e
Use double instead of TimeSpan
2019-11-27 23:06:07 +11:00
phosphene47
037d927e45
TimeSpans can be negative!
2019-11-27 22:51:27 +11:00
phosphene47
b126700f01
Debounce hover sounds
2019-11-27 22:47:00 +11:00
Huo Yaoyuan
ffb5b6c82b
Merge branch 'master' into ci
2019-11-27 19:38:24 +08:00
Dean Herbert
01a37771bc
Merge branch 'master' into customized-mods
2019-11-27 19:44:32 +09:00
Dan Balasescu
c6a85a11bd
Merge branch 'master' into sharpen
2019-11-27 17:09:11 +09:00
Dean Herbert
9494a477b6
Consider intro and outro time as "break" time ( #6960 )
...
Consider intro and outro time as "break" time
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-27 17:09:01 +09:00
smoogipoo
d1e3718038
Reduce the scale of background blurs
2019-11-27 15:04:09 +09:00
Huo Yaoyuan
eba8657d38
Remove newly introduced redundant this.
2019-11-26 18:41:19 +08:00
Huo Yaoyuan
c0fe91a84c
Merge branch 'master' into sharpen
2019-11-26 18:21:50 +08:00
Huo Yaoyuan
deaeda7348
Change packing to be runned by AppVeyor.
2019-11-26 17:17:10 +08:00
Huo Yaoyuan
ffb2f21f50
Merge branch 'master' into ci
2019-11-26 15:41:34 +08:00
Albie
09158b6b08
Merge branch 'master' into cinema-mod
2019-11-26 06:57:47 +00:00
Dean Herbert
ab017ee648
Update framework
2019-11-26 15:37:13 +09:00
Dean Herbert
77ce9642ba
Add test coverage and simplify break time updating
2019-11-26 15:32:48 +09:00
Dean Herbert
a453129d44
Fix nullref in tests
2019-11-26 15:13:50 +09:00
Dan Balasescu
8a8e863c0e
Merge branch 'master' into intro-outro-break
2019-11-26 12:47:42 +09:00
Dan Balasescu
7c5a49c4d8
Merge branch 'master' into username-login
2019-11-26 12:28:57 +09:00
Dan Balasescu
b21de98296
Merge branch 'master' into get-end-time
2019-11-26 11:47:01 +09:00
Dean Herbert
fbebbab5db
Remove excess parenthesis
2019-11-25 22:37:07 +09:00
Albie
87ee3f1083
Merge branch 'master' into cinema-mod
2019-11-25 13:35:14 +00:00
Dean Herbert
1fd5ed3c0f
Change login placeholder text to ask for username
2019-11-25 21:35:25 +09:00
Huo Yaoyuan
d2f6439d5f
Merge branch 'master' into ci
2019-11-25 19:48:26 +08:00
Dean Herbert
709ec1404f
Centralise End/StartTime retrieval to extension method
2019-11-25 19:09:14 +09:00
Dean Herbert
6b8983b489
Consider intro and outro time as "break" time
2019-11-25 19:02:11 +09:00
smoogipoo
719f0d5947
Fix stutters when changing beatmap difficulties
2019-11-25 18:28:43 +09:00
Huo Yaoyuan
575b4db186
Patch csproj version.
2019-11-25 16:42:20 +08:00
Huo Yaoyuan
3a62406c58
Update deploy script.
2019-11-25 16:42:20 +08:00
Albie
0a70ec0b11
Merge branch 'master' into cinema-mod
2019-11-25 07:25:30 +00:00
Albie
9fdbb2a58e
change name of interface and expose method instead of seperate values
2019-11-25 07:24:29 +00:00
Dan Balasescu
dd7e4b2340
Merge branch 'master' into dimmed-load-input-blocking
2019-11-25 13:49:10 +09:00
Dan Balasescu
51eff3d49c
Merge branch 'master' into add-access-to-skin-legacy-version
2019-11-25 12:40:01 +09:00
Dan Balasescu
92c4e8e4f6
Merge pull request #6911 from peppy/fix-spritetext-usage
...
Fix usage of SpriteText instead of OsuSpriteText
2019-11-25 12:30:45 +09:00
Dean Herbert
22bdc8435d
Increase padding on mod section title ( #6916 )
...
Increase padding on mod section title
2019-11-25 12:28:38 +09:00
Dan Balasescu
9f93727a80
Merge branch 'master' into fix-spritetext-usage
2019-11-25 12:15:05 +09:00
Dan Balasescu
ffd2ba5d7d
Merge branch 'master' into beatmap-overlay-no-supporter-filter
2019-11-25 11:51:10 +09:00
Dean Herbert
36cabe72cf
Make DimmedLoadingLayer block input when active
2019-11-25 11:49:54 +09:00
Dean Herbert
b85189f855
Merge remote-tracking branch 'upstream/master' into fix-spritetext-usage
2019-11-25 11:31:12 +09:00
Dean Herbert
45514ff660
Apply fixes
2019-11-25 11:30:55 +09:00
Dan Balasescu
19339326e2
Merge branch 'master' into andy840119/_20191124_fix_ApplyToDrawableHitObjects
2019-11-25 11:30:44 +09:00
Berkan Diler
fccdbffa93
Use MathF instead of Math- functions when possible
...
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
2019-11-25 00:45:42 +01:00
Albie
9a8e3fe1da
add brackets
2019-11-24 07:44:35 +00:00
Albie
1d6665fe57
improve code quality using resharper and codefactor advice
2019-11-24 07:42:39 +00:00
Albie
8294b9ebe7
Merge branch 'cinema-mod' of https://github.com/aspriddell/osu into cinema-mod
2019-11-24 07:37:47 +00:00
Albie
b8e5796af5
add forced video/storyboard and disabled dim for mod inside new interface
2019-11-24 07:37:06 +00:00
andy840119
6126fd9a6b
ApplyToDrawableHitObjects should be able to get all the hitobject in nasted Playfield
2019-11-24 10:42:05 +09:00
iiSaLMaN
b58afa3eb6
Remove unnecessary mentioning in xmldoc
2019-11-24 04:36:34 +03:00
iiSaLMaN
20a8a653c2
Change LegacySkin.Configuration accessibility
2019-11-24 04:10:04 +03:00
iiSaLMaN
5bf6e57eb0
Remove unnecessary usage
2019-11-24 02:16:43 +03:00
iiSaLMaN
0f9978b34a
Use AddRange instead
2019-11-24 02:08:36 +03:00
iiSaLMaN
1e24ee7956
Remove ClearComboColours()
2019-11-24 02:07:56 +03:00
Andrei Zavatski
96533631fc
Simplify if/else statement
2019-11-24 01:29:11 +03:00
Andrei Zavatski
29b05e2939
Fix getScores can be fired twice on user change
2019-11-24 00:01:49 +03:00
Andrei Zavatski
ced78dc900
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-no-supporter-filter
2019-11-23 23:54:46 +03:00
Albie
aa00909ef7
Merge branch 'master' into cinema-mod
2019-11-23 18:38:41 +00:00
Albie Spriddell
20edaf4ba6
add cinema mod support
2019-11-23 17:32:16 +00:00
Albie
5c55060173
Merge branch 'master' into master
2019-11-23 16:54:23 +00:00
Dean Herbert
65d71b9442
Fix beatmap lookups failing for beatmaps with no local path
...
Turns out the underlying EscapeUriString doesn't like nulls
2019-11-23 20:55:42 +09:00
Andrei Zavatski
2e161f7e99
Hook up the rest of the logic
2019-11-22 22:25:58 +03:00
Andrei Zavatski
aede1b183a
Make ScopeSelector always visible
2019-11-22 22:04:58 +03:00
Andrei Zavatski
d6c9387beb
Implement NotSupporterPlaceholder
2019-11-22 21:55:21 +03:00
Albie Spriddell
4cb09df754
increase padding
2019-11-22 18:23:48 +00:00
Dean Herbert
4063135a3a
Fix result mode button's corner exponent
2019-11-22 20:45:05 +09:00
Dean Herbert
d0002cc1c2
Update performance logging setting
2019-11-22 19:50:30 +09:00
Dean Herbert
c2e85a2057
Apply CornerExponent fixes
2019-11-22 19:49:20 +09:00
Dean Herbert
6469199f0d
Update framework
2019-11-22 19:47:21 +09:00
Dean Herbert
2796a135bf
Add mod selector to beatmap overlay ( #6812 )
...
Add mod selector to beatmap overlay
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-22 18:46:25 +09:00
Dean Herbert
b026197859
Add spacing
2019-11-22 18:23:48 +09:00
Dean Herbert
dad2e5c678
Improve legibility of NoScroesPlaceholder
2019-11-22 18:10:44 +09:00
Dean Herbert
16bdf4e6bd
Update english to be more readable
2019-11-22 18:07:56 +09:00
Dean Herbert
0cc1698b6d
Rename incorrectly named container
2019-11-22 18:05:12 +09:00
Dean Herbert
880f7ddca7
Merge remote-tracking branch 'upstream/master' into beatmap-overlay-mod-selector-new
2019-11-22 18:00:58 +09:00
Dean Herbert
f079ebe857
Simplify beatmap lookup to use a single endpoint
2019-11-22 16:13:48 +09:00
Dean Herbert
83080c3b5f
Fix merge regression
2019-11-22 14:14:18 +09:00
Dan Balasescu
5d2a608be0
Merge branch 'master' into lead-in-fixes
2019-11-22 13:48:55 +09:00
Dan Balasescu
7c19f7cd7b
Merge branch 'master' into improve-skip-button-feel
2019-11-22 13:36:27 +09:00
Dan Balasescu
ba0ac93f70
Merge branch 'master' into skip-multiple-times
2019-11-22 13:23:50 +09:00
Andrei Zavatski
745047fd19
Remove useless line from ModIcon
2019-11-22 05:10:47 +03:00
Andrei Zavatski
da425c93fa
Fix beatmap switch doesn't trigger scores update
2019-11-22 05:08:50 +03:00
Andrei Zavatski
dee9ffc694
Merge master with conflicts resolved
2019-11-22 04:59:46 +03:00
Dean Herbert
d8260f4a65
Reduce carousel scroll motion on initial display
2019-11-22 10:51:49 +09:00
Dean Herbert
e170cd2892
Move private methods below
2019-11-22 10:29:16 +09:00
Dean Herbert
ced0ad404e
Merge branch 'master' into beatmap-mod-selector
2019-11-22 10:17:40 +09:00
Dean Herbert
5da5abdb05
Merge branch 'master' into prev-button-revamp
2019-11-22 02:57:22 +09:00
Dean Herbert
57d38c5c74
Add final newline
2019-11-22 02:39:54 +09:00
Dean Herbert
ab42fac43a
Improve naming
2019-11-22 02:38:31 +09:00
Andrei Zavatski
eb2f7c1d0a
Rename forgotten variable
2019-11-21 20:37:02 +03:00
Andrei Zavatski
0f1a3d97c8
Naming adjustments
2019-11-21 20:34:19 +03:00
Dean Herbert
f390e558c7
Combine and simplify beatmap change logic
2019-11-22 02:32:02 +09:00
Dean Herbert
a97d760afa
Merge remote-tracking branch 'upstream/master' into menu-background-modes
2019-11-22 02:23:02 +09:00
Andrei Zavatski
c7c8527f5f
Remove OnHighlightedChanged function
2019-11-21 20:22:15 +03:00
Andrei Zavatski
e22a71c6b8
Add visual difference between hovered and selected states
2019-11-21 19:42:07 +03:00
Andrei Zavatski
23fc7b1987
Implement updateHighlighted method
2019-11-21 19:02:24 +03:00
Andrei Zavatski
984ec11a78
Make Ruleset a bindable
2019-11-21 18:56:48 +03:00
Andrei Zavatski
737c2bd1c8
Remove pointless const
2019-11-21 18:50:29 +03:00
Andrei Zavatski
458496206c
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-11-21 18:49:37 +03:00
Huo Yaoyuan
818553027b
Merge branch 'master' into sharpen
2019-11-21 23:42:46 +08:00
Dean Herbert
0d4854ac09
Add News Overlay skeleton and header ( #5726 )
...
Add News Overlay skeleton and header
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-22 00:14:31 +09:00
Dean Herbert
1a6b5e8714
Implement TotalCommentsCounter component for CommentsContainer ( #6867 )
...
Implement TotalCommentsCounter component for CommentsContainer
2019-11-21 23:45:23 +09:00
Dean Herbert
76722534ec
Fix cancel button animating when entering a dialog ( #6825 )
...
Fix cancel button animating when entering a dialog
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-21 23:22:17 +09:00
Dean Herbert
4475307707
Fix spacing
2019-11-21 22:55:31 +09:00
Dean Herbert
ac2dfffb23
Merge remote-tracking branch 'upstream/master' into sharpraven-deprecation
2019-11-21 22:52:45 +09:00
Dean Herbert
f173961def
Add some extra search keywords to settings ( #6893 )
...
Add some extra search keywords to settings
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-21 22:51:20 +09:00
Dean Herbert
d7cb23a909
Remove redundant keyword
2019-11-21 22:51:00 +09:00
Dean Herbert
8b1fb2d5a1
Standardise keyword specifications
2019-11-21 22:35:15 +09:00
Dean Herbert
201f32859a
Merge branch 'master' into slider-control-point-removal
2019-11-21 22:10:52 +09:00
Dean Herbert
bd6831624a
Decouple skip button animations from gameplay clock
2019-11-21 19:51:22 +09:00
Dean Herbert
ffd0e17826
Merge branch 'skip-multiple-times' into lead-in-fixes
2019-11-21 19:01:28 +09:00
Dean Herbert
46a94821d4
Add support for consecutive skips
2019-11-21 18:59:55 +09:00
Dean Herbert
8d1b11d4bd
Add storyboard lead-in tests
2019-11-21 18:50:54 +09:00
Dean Herbert
4e53bca8dd
Simplify tests
2019-11-21 18:50:38 +09:00
Dean Herbert
29d2374928
Add back skip button actuation count tests
2019-11-21 17:23:52 +09:00
Dean Herbert
2dd2e3d861
Add correct AudioLeadIn support
2019-11-21 16:55:18 +09:00
Dean Herbert
8369be90f2
Allow skip button to actuate more than once
2019-11-21 15:19:06 +09:00
Dean Herbert
c0b9bb5a12
Merge remote-tracking branch 'upstream/master' into lead-in-fixes
2019-11-21 14:22:17 +09:00
Dean Herbert
2325f0382c
Cancel a potentially pending filter update when an update occurs
2019-11-21 13:46:45 +09:00
Dean Herbert
4d6904468d
Merge remote-tracking branch 'upstream/master' into multi-searching
2019-11-21 13:44:04 +09:00
Dean Herbert
0804d8d7a4
Replace all MathHelper.Clamp usages with Math.Clamp ( #6891 )
...
Replace all MathHelper.Clamp usages with Math.Clamp
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-21 11:14:34 +09:00
Dean Herbert
94009a22b8
Fix osu!direct previews muting game audio permanently ( #6838 )
...
Fix osu!direct previews muting game audio permanently
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-21 11:13:11 +09:00
Dan Balasescu
a7c074ff37
Merge branch 'master' into math_clamp
2019-11-21 11:08:56 +09:00
smoogipoo
0cbe29dbec
Refactor / cleanup debouncing
2019-11-21 11:05:18 +09:00
Dean Herbert
19dfbb0a45
Update obsolete usages
2019-11-21 10:55:31 +09:00
Dean Herbert
cf0f0f8a1b
Reword comment
2019-11-21 10:37:50 +09:00
Dean Herbert
7637e680d7
Merge remote-tracking branch 'upstream/master' into fix-preview-track-never-stopping
2019-11-21 10:27:32 +09:00
Dean Herbert
76e63722cc
Update framework
2019-11-21 10:26:10 +09:00
Dan Balasescu
ec35d92ec0
Merge branch 'master' into fix-song-select-scroll
2019-11-21 10:22:52 +09:00
iiSaLMaN
5391c752b4
Implement IAggregateAudioAdjustments properties for FallbackSampleStore
2019-11-21 03:20:08 +03:00
iiSaLMaN
ebae92db7b
Revert "Implement IAggregateAudioAdjustments properties for FallbackSampleStore"
...
This reverts commit 4a4f5ccbb2
2019-11-21 03:18:31 +03:00
iiSaLMaN
4a4f5ccbb2
Implement IAggregateAudioAdjustments properties for FallbackSampleStore
2019-11-21 02:35:58 +03:00
Andrei Zavatski
f066d8434c
Apply suggestions
2019-11-21 00:26:39 +03:00
Andrei Zavatski
6b3010535f
Simplify Keywords usage for SettingsSubsection
2019-11-20 21:03:31 +03:00
Andrei Zavatski
f3d9abc84a
Capitalize Bar for consistency
2019-11-20 19:57:02 +03:00
Andrei Zavatski
7d8252183e
CI fix
2019-11-20 19:42:57 +03:00
Andrei Zavatski
e820ddd3e8
Implement settings keywords
2019-11-20 19:27:34 +03:00
Berkan Diler
66a3837ff4
Fix CI
2019-11-20 14:25:44 +01:00
Berkan Diler
6cab517b2d
.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.
2019-11-20 13:37:47 +01:00
Dean Herbert
3ba9f840fd
Fix song select not always scrolling to the correct location
2019-11-20 19:39:13 +09:00
Dean Herbert
a81c26577d
Fix carousel filtering twice on startup due to unpopulated rule… ( #6833 )
...
Fix carousel filtering twice on startup due to unpopulated ruleset
2019-11-20 19:39:00 +09:00
Huo Yaoyuan
374ef6ff83
Merge branch 'master' into sharpen
2019-11-20 17:30:58 +08:00
Dean Herbert
8d7be98b8b
Move to .NET Standard 2.1 ( #6837 )
...
Move to .NET Standard 2.1
Co-authored-by: Shane Woolcock <samahnub@gmail.com>
2019-11-20 17:57:00 +09:00
Dean Herbert
8c9ed99b1b
Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter
2019-11-20 17:24:54 +09:00
Dean Herbert
5b416eb7ba
Move initial filter to run on entering
2019-11-20 17:24:43 +09:00
Dean Herbert
e0f59d8e24
Move method
2019-11-20 15:43:00 +09:00
Dean Herbert
bcb1504110
Fix naming
2019-11-20 15:40:35 +09:00
smoogipoo
6288e6da56
Add null check
2019-11-20 13:42:54 +09:00
smoogipoo
76ed573c56
Fix crash when loading results after gameplay
2019-11-20 12:21:49 +09:00
iiSaLMaN
08b8cedfdf
Add setter to legacy skin configuration access
2019-11-20 01:15:40 +03:00
iiSaLMaN
0407d2248c
Merge remote-tracking branch 'refs/remotes/upstream/master' into add-access-to-skin-legacy-version
2019-11-20 01:10:32 +03:00
Huo Yaoyuan
b5c20fecee
Merge branch 'master' into netstandard2.1
2019-11-19 21:40:12 +08:00
Huo Yaoyuan
608785b99a
Update .Net Standard projects to 2.1
2019-11-18 18:35:58 +08:00
Huo Yaoyuan
53bc2dcab7
Use costum displaying text for inherited references.
2019-11-18 15:29:18 +08:00
Huo Yaoyuan
4d1513cef6
Sadly, xmldoc doesn't support tuple elements.
2019-11-17 21:01:56 +08:00
Huo Yaoyuan
b04bca7db6
Reference elements in origin definition.
2019-11-17 20:55:40 +08:00
Huo Yaoyuan
b1b234c6fb
Use paramref.
2019-11-17 20:49:36 +08:00
Huo Yaoyuan
f05b83d7d4
Use typeparamref.
2019-11-17 20:48:23 +08:00
Andrei Zavatski
509440ea14
TotalCommentsCounter implementation
2019-11-16 18:02:34 +03:00
Dean Herbert
e9e37fc821
Add private setter for FilterControl
2019-11-15 18:23:35 +09:00
Dean Herbert
296fff9243
Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter
2019-11-15 18:20:36 +09:00
Andrei Zavatski
f2862e95e0
CI fix
2019-11-15 12:15:51 +03:00
Andrei Zavatski
e51fd00d58
CI fix
2019-11-15 12:09:31 +03:00
Andrei Zavatski
18f77008db
Update dependency
2019-11-15 12:04:01 +03:00
smoogipoo
10287eb66d
Add debounce logic in several places
2019-11-15 17:58:47 +09:00
Andrei Zavatski
9fd225bda7
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-mod-selector-new
2019-11-15 11:58:05 +03:00
Andrei Zavatski
2592a0489b
Use existing ModNoMod
2019-11-15 11:57:40 +03:00
Andrei Zavatski
1218d41b50
Make Ruleset a property
2019-11-15 11:52:49 +03:00
smoogipoo
1b4bcb81c8
Fix filtering breaking on secondary filters
2019-11-15 17:49:02 +09:00
Andrei Zavatski
b7efc276f1
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-11-15 11:42:32 +03:00
Dean Herbert
813aebca1d
Remove unintentional dependency
2019-11-15 14:51:01 +09:00
Dean Herbert
eee5902851
Merge remote-tracking branch 'upstream/master' into lead-in-fixes
2019-11-15 14:05:31 +09:00
Dean Herbert
2c3109980a
Fix broken merge
2019-11-15 13:51:39 +09:00
Dean Herbert
6d06b444ba
Allow screen to specify whether to apply audio rate adjustments from mods
2019-11-15 13:47:14 +09:00
Dean Herbert
b8bb97607b
Merge remote-tracking branch 'upstream/master' into fix-mod-retention
2019-11-15 13:46:44 +09:00
Dan Balasescu
644c581c92
Merge branch 'master' into fix-duplicate-online-ids
2019-11-15 11:12:06 +09:00
smoogipoo
f0b7b2e1c4
Fix broken test case
2019-11-15 11:07:16 +09:00
Dean Herbert
0e587cb9f5
Merge branch 'master' into fix-duplicate-online-ids
2019-11-15 10:18:53 +09:00
Dean Herbert
6d54846462
Null online id on lookup failure
2019-11-15 10:18:47 +09:00
Dan Balasescu
cd9902cc9f
Merge branch 'master' into commit-on-focus-lost
2019-11-15 08:58:59 +09:00
Dan Balasescu
22e46c560c
Merge branch 'master' into dedupe-same-hash
2019-11-15 08:31:46 +09:00
smoogipoo
956fb9912d
Hook up multiplayer search filter
2019-11-15 08:23:56 +09:00
Huo Yaoyuan
0998afdbdb
Use ReferenceEquals instead of SequenceEqual.
2019-11-14 19:38:08 +08:00
iiSaLMaN
d2ce0878bc
Change 'current' accessibility to protected
2019-11-14 14:20:29 +03:00
iiSaLMaN
4e79bbad6b
Add inline comment
2019-11-14 14:19:42 +03:00
Dean Herbert
12243aaa9a
Dedupe .osu files with same hash in same set
2019-11-14 19:38:20 +09:00
Dean Herbert
fbf81207d4
Don't assign server-fetched online id if it was assigned elsewhere
2019-11-14 18:55:12 +09:00
Dean Herbert
1bc0eae2a6
Fix beatmap online retrieval response running incorrectly scheduled
2019-11-14 18:53:45 +09:00
Dean Herbert
81033e1fdf
Add extra logging
2019-11-14 18:52:07 +09:00
Huo Yaoyuan
677717875e
Change a case to EqualityComparer.Default to handle null properly.
2019-11-14 17:35:02 +08:00
Huo Yaoyuan
f25b1ba06f
Merge branch 'master' into equals
2019-11-14 17:33:44 +08:00
Dean Herbert
bf567e6df5
Make settings textboxes commit on focus lost
2019-11-14 14:19:55 +09:00
Dean Herbert
c15f909d83
Remove local bindable at song select, along with misplaced reset logic
2019-11-14 13:29:06 +09:00
Dean Herbert
d8a5750e5d
Fix typo
...
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2019-11-14 08:38:01 +09:00
Dean Herbert
a580b9079a
Reword comment
2019-11-14 08:28:41 +09:00
Andrei Zavatski
2d3fadc1a8
Don't update mod filter visibility on every beatmap change
2019-11-14 00:38:37 +03:00
Andrei Zavatski
633c497602
Hide content if beatmap has no leaderboard
2019-11-13 17:36:08 +03:00
Huo Yaoyuan
87d40cf8d0
Resolve equals usages.
2019-11-13 22:35:50 +08:00
Andrei Zavatski
d1853ea55b
Fix incorrect formatting for switch/case
2019-11-13 17:29:50 +03:00
Andrei Zavatski
8005ee73af
Trim whitespace
2019-11-13 17:23:46 +03:00
Andrei Zavatski
3f6140db6d
Improve loading animation
2019-11-13 17:18:58 +03:00
Andrei Zavatski
4e90daf212
Implement NoScoresPlaceholder
2019-11-13 16:39:33 +03:00
iiSaLMaN
172e777416
Fix preview track manager permanently muting game tracks
2019-11-13 16:16:06 +03:00
iiSaLMaN
47cbd516f3
Revert "Fix preview track manager potentially not updating"
...
This reverts commit 8f7fd9993d
2019-11-13 16:11:13 +03:00
Andrei Zavatski
2dbee5da79
Update dependency
2019-11-13 16:06:37 +03:00
Andrei Zavatski
6715b25ddd
Apply suggestions
2019-11-13 16:04:15 +03:00
iiSaLMaN
8f7fd9993d
Fix preview track manager potentially not updating
2019-11-13 14:24:22 +03:00
Dean Herbert
110c155fa0
Fix background loading twice when entering song select
2019-11-13 19:42:05 +09:00
Dean Herbert
280c1a0eb4
Fix carousel filtering twice on startup due to unpopulated ruleset
2019-11-13 19:04:52 +09:00
Dean Herbert
bca1be0bfa
Add failing test
2019-11-13 18:54:33 +09:00
smoogipoo
76ab0ecd3c
Disallow deselections with right clicks
2019-11-13 17:21:55 +09:00
Dean Herbert
f11ad7535d
Merge branch 'master' into rankings-tables
2019-11-13 15:39:13 +09:00
Dean Herbert
dfc6973d70
Merge branch 'master' into fallback-to-skin-combo-colours
2019-11-13 15:39:12 +09:00
Dean Herbert
c8e06dd1f0
Merge branch 'master' into sharpraven-deprecation
2019-11-13 15:39:10 +09:00
Dean Herbert
230de261c8
Merge branch 'master' into fix-popup-dialog-button
2019-11-13 15:39:08 +09:00
Dean Herbert
0292cea2c4
Merge branch 'master' into beatmap-mod-selector
2019-11-13 15:39:08 +09:00
Dean Herbert
367d12aef9
Merge branch 'master' into beatmap-overlay-mod-selector-new
2019-11-13 15:39:06 +09:00
Dean Herbert
ce60f8262c
Merge branch 'master' into sharpen
2019-11-13 15:38:59 +09:00
Dean Herbert
c751328665
Disable button when not logged in
2019-11-13 12:13:33 +09:00
Andrei Zavatski
5f609b48da
Use local bindable for api.LocalUser
2019-11-13 00:29:28 +03:00
Andrei Zavatski
99ec84ed38
Update dependency
2019-11-13 00:26:19 +03:00
Andrei Zavatski
2719be7769
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-overlay-mod-selector-new
2019-11-13 00:24:40 +03:00
Andrei Zavatski
27f721eec2
Use = instead of += for OnSelectionChanged Action
2019-11-13 00:24:13 +03:00
Andrei Zavatski
aca3690d77
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-11-13 00:20:51 +03:00
Andrei Zavatski
3903e59f2f
Add null check for notification overlay
2019-11-13 00:01:13 +03:00
Andrei Zavatski
dfd5c88075
Typo fix
2019-11-13 00:00:08 +03:00
Huo Yaoyuan
8a1276db3a
Change to use instance API of sentry.
2019-11-12 22:16:48 +08:00
Huo Yaoyuan
6ae6603ded
Cleanup.
2019-11-12 22:08:16 +08:00
Ganendra Afrasya
8276428efc
Add IsPresent check when dialog popping out
2019-11-12 20:48:26 +07:00
Huo Yaoyuan
e01a50e4b3
Correct disposal.
2019-11-12 21:39:38 +08:00
Huo Yaoyuan
de732c6c24
Change code to use Sentry client.
2019-11-12 21:12:38 +08:00
Dean Herbert
da819261e0
Shrink and darken loading layer to better suit button
2019-11-12 21:38:16 +09:00
Dean Herbert
5110ae82a1
Tidy up implementation
2019-11-12 21:38:08 +09:00
Huo Yaoyuan
1349289c0e
Remove SharpRaven package and install Sentry.
2019-11-12 20:32:41 +08:00
Dean Herbert
61464c5c89
Fix potential nullref in unrelated test
2019-11-12 21:27:15 +09:00
Huo Yaoyuan
f3f5094c26
Convert delegate to local function.
2019-11-12 20:14:22 +08:00
Huo Yaoyuan
42a98c5d87
Use constants.
2019-11-12 20:07:01 +08:00
Huo Yaoyuan
d60493a961
Use discards.
2019-11-12 20:03:21 +08:00
Huo Yaoyuan
144812669d
Use static local functions.
2019-11-12 19:56:54 +08:00
Huo Yaoyuan
dcfa98414f
Use ??=.
2019-11-12 19:56:51 +08:00
Huo Yaoyuan
64fc5007fc
Use language primitive types.
2019-11-12 19:56:45 +08:00
Huo Yaoyuan
ca52d09e81
Enforce expression body for typical simple ones.
2019-11-12 19:56:37 +08:00
Huo Yaoyuan
8a1b70513c
No this. qualification.
2019-11-12 19:55:29 +08:00
Huo Yaoyuan
31cc0d13da
Use 'out var'.
2019-11-12 19:55:26 +08:00
Huo Yaoyuan
0d81b96c5f
Use deconstruction declaration.
2019-11-12 19:55:22 +08:00
Huo Yaoyuan
e5e8e70704
Use pattern matching.
2019-11-12 19:55:19 +08:00
Huo Yaoyuan
7d7b9e36b2
Use compound assignment.
2019-11-12 19:53:50 +08:00
Huo Yaoyuan
bbeab6fa76
Use auto property.
2019-11-12 19:53:25 +08:00
Dean Herbert
58df6930b2
Get error message from server
2019-11-12 19:34:20 +09:00
Dean Herbert
f04d7f733f
Merge remote-tracking branch 'upstream/master' into favourite-beatmap
2019-11-12 19:19:29 +09:00
Dean Herbert
758c304d92
Merge branch 'master' into fallback-to-skin-combo-colours
2019-11-12 19:00:05 +09:00
Dean Herbert
a83c3523ae
Merge branch 'master' into rankings-tables
2019-11-12 18:59:43 +09:00
Dean Herbert
4b66ce0c52
Merge branch 'master' into slider-controlpoint-addition
2019-11-12 18:13:27 +09:00
Dean Herbert
dd196385cb
Add Ctrl+A to select all and Escape to deselect all ( #6803 )
...
Add Ctrl+A to select all and Escape to deselect all
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-12 18:10:45 +09:00
Dean Herbert
cdd87a6903
Merge branch 'master' into delete-selection
2019-11-12 17:59:43 +09:00
Dean Herbert
2066da6c3c
Lookup tournament player statistics for the correct ruleset ( #6807 )
...
Lookup tournament player statistics for the correct ruleset
2019-11-12 17:53:39 +09:00
Dean Herbert
46d02d9077
Update framework
2019-11-12 17:37:01 +09:00
Dean Herbert
faa5997b48
Move scaling container to OsuGame so OsuGameBase doesn't apply… ( #6804 )
...
Move scaling container to OsuGame so OsuGameBase doesn't apply UI scale
2019-11-12 16:40:49 +09:00
Dean Herbert
0113ab5e56
Add local preserving container to OsuTestScene to ensure correc… ( #6805 )
...
Add local preserving container to OsuTestScene to ensure correct test dimensions
2019-11-12 16:40:40 +09:00
Dean Herbert
3ab332e60b
Implement hitobject sound adjustment ( #6762 )
...
Implement hitobject sound adjustment
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-12 16:40:15 +09:00
Dean Herbert
e32f88c770
Fix home button not closing login and now playing overlays ( #6758 )
...
Fix home button not closing login and now playing overlays
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-12 15:40:28 +09:00
Dean Herbert
47be20fa37
Private set on track for safety
2019-11-12 15:13:47 +09:00
Dean Herbert
712a2f6918
Merge remote-tracking branch 'upstream/master' into fix-playing-multiple-beatmap-preview-tracks
2019-11-12 15:10:42 +09:00
Dean Herbert
35351d7f7c
Use variable instead of duplicated list
2019-11-12 15:04:51 +09:00
Dean Herbert
25eb964290
Simplify overlay adding logic
2019-11-12 15:03:58 +09:00
smoogipoo
10fd5ef5a7
Merge context menus
2019-11-12 15:02:27 +09:00
Andrei Zavatski
a69a4643c9
Simplify LINQ expressions
2019-11-12 08:45:21 +03:00
Dean Herbert
b4525c1f6e
Fix right clicking to select not showing context menu
2019-11-12 14:42:30 +09:00
Andrei Zavatski
fa01e11a6e
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-11-12 08:25:42 +03:00
smoogipoo
3f8928ca25
Suppress warnings
2019-11-12 13:41:54 +09:00
smoogipoo
ed11c72d0b
Merge remote-tracking branch 'origin/master' into selection-hitsound-addition
2019-11-12 13:40:25 +09:00
smoogipoo
9f1d490ac9
Only handle selection input on blueprints
2019-11-12 12:18:24 +09:00
Dean Herbert
e28ddec8d6
Merge branch 'master' into fix-home-not-closing-all-overlays
2019-11-12 12:05:19 +09:00
Dean Herbert
4516da223d
Merge branch 'master' into fix-mod-section-overflow
2019-11-12 11:35:01 +09:00
Dean Herbert
2f8768a4b1
Move LabelledDropdown local to usage
2019-11-12 11:04:49 +09:00
Dean Herbert
bedd136c81
Merge remote-tracking branch 'upstream/master' into lookup-players-for-ruleset
2019-11-12 11:02:36 +09:00
Dean Herbert
a43b0ee01b
Apply naming and styling changes
2019-11-12 10:45:46 +09:00
Dean Herbert
b37bf4ea01
Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition
2019-11-12 10:44:53 +09:00
Dean Herbert
52ab309295
Merge branch 'master' into stateful-menu-items
2019-11-12 10:31:50 +09:00
Dean Herbert
5bb65d0716
Rename button class
2019-11-12 10:21:06 +09:00
Dean Herbert
0f23844c5d
Merge remote-tracking branch 'upstream/master' into lookup-players-for-ruleset
2019-11-12 09:47:12 +09:00
Andrei Zavatski
0578f91a76
Small logic adjustments
2019-11-11 19:06:46 +03:00
Andrei Zavatski
32cc7b3d4d
CI fix
2019-11-11 19:04:50 +03:00
Andrei Zavatski
c5b64e26a3
Layout adjustment
2019-11-11 18:51:29 +03:00
Andrei Zavatski
5f5d130d1a
Update mod filter visibility on user change
2019-11-11 18:40:57 +03:00
Andrei Zavatski
31191dadf1
Handle mods change
2019-11-11 18:31:42 +03:00
Andrei Zavatski
2cfd54ca0d
Handle scope changing
2019-11-11 18:27:48 +03:00
Andrei Zavatski
00b9229737
Add mod filter to beatmap overlay
2019-11-11 18:21:07 +03:00
Andrei Zavatski
32b2f5e330
Use Bindable for ScoresContainer
2019-11-11 18:10:25 +03:00
Andrei Zavatski
3655f88180
Merge dependency
2019-11-11 17:56:57 +03:00
Andrei Zavatski
4145e25f7b
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-11-11 17:55:10 +03:00
Huo Yaoyuan
e9b8cbb516
Apply other styles.
2019-11-11 20:27:04 +08:00
Huo Yaoyuan
ccc8aa6fa4
Apply brace style.
2019-11-11 20:13:13 +08:00
Dean Herbert
bed62e0d2f
Rename ThreeState -> TernaryState and add basic tests
2019-11-11 18:56:18 +09:00
Dean Herbert
c0f6e4687a
Merge branch 'master' into stateful-menu-items
2019-11-11 18:33:50 +09:00
dependabot-preview[bot]
a345fd8a86
Bump Newtonsoft.Json from 12.0.2 to 12.0.3
...
Bumps [Newtonsoft.Json](https://github.com/JamesNK/Newtonsoft.Json ) from 12.0.2 to 12.0.3.
- [Release notes](https://github.com/JamesNK/Newtonsoft.Json/releases )
- [Commits](https://github.com/JamesNK/Newtonsoft.Json/compare/12.0.2...12.0.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-11 09:26:56 +00:00
iiSaLMaN
6d3d7c5d95
Remove unnecessary use of local
2019-11-11 11:57:14 +03:00
Dean Herbert
fced262c41
Add labelled dropdown component
2019-11-11 17:39:24 +09:00
Dan Balasescu
f27398e899
Merge branch 'master' into infrastructure
2019-11-11 16:02:05 +09:00
Dean Herbert
df51f138c0
Merge branch 'master' into edit-select-all
2019-11-11 15:44:26 +09:00
Dean Herbert
13fd95d513
Remove misplaced usings
2019-11-11 14:03:29 +09:00
Dean Herbert
8ac708ada5
Move scaling container to OsuGame so OsuGameBase doesn't apply UI scale
2019-11-11 13:58:35 +09:00
Dean Herbert
dc88bd3d61
Add local preserving container to OsuTestScene to ensure correct test dimensions
2019-11-11 13:52:04 +09:00
smoogipoo
f3dc38e342
Add Ctrl+A to select all (esc to deselect all)
2019-11-11 13:41:10 +09:00
smoogipoo
e924a5d51e
Disable ruleset input in the editor
2019-11-11 13:04:43 +09:00
Dean Herbert
fd7bdc03ab
Merge remote-tracking branch 'upstream/master' into infrastructure
2019-11-11 11:11:59 +09:00
Dean Herbert
9db73d33cc
Remove horizontal padding on toolbar ruleset selector ( #6780 )
...
Remove horizontal padding on toolbar ruleset selector
2019-11-11 10:02:30 +09:00
Andrei Zavatski
93954c8da0
Use BindableList for selected mods
2019-11-10 23:58:07 +03:00
iiSaLMaN
8f4916ad2d
Add inline comment
2019-11-10 23:53:31 +03:00
Andrei Zavatski
e3d8e29cdd
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-11-10 23:38:41 +03:00
iiSaLMaN
9d61d73ced
Change Track and TrackManagerPreviewTrack accessibilities
2019-11-10 23:09:04 +03:00
iiSaLMaN
20ed6c4d52
Use track check solution for this
2019-11-10 23:07:51 +03:00
Dean Herbert
45e1501c02
Merge branch 'master' into infrastructure
2019-11-09 16:23:58 +09:00
Dean Herbert
5c47641608
Reorder conditional
2019-11-09 16:23:22 +09:00
Joehu
b675024161
Remove horizontal padding on toolbar ruleset selector
2019-11-08 20:28:24 -08:00
Dean Herbert
683916967c
Merge branch 'master' into vote-pill-fix
2019-11-09 12:15:48 +09:00
Dean Herbert
2dd514012a
Update framework
2019-11-08 23:28:22 +09:00
Joehu
ff225c3691
Remove toolbarElements
2019-11-08 06:04:18 -08:00
Huo Yaoyuan
6ebe02f409
Merge branch 'master' into infrastructure
2019-11-08 21:19:59 +08:00
smoogipoo
97ea07db0e
Add delete option to the right-click menu
2019-11-08 19:44:47 +09:00
iiSaLMaN
8ef9ccc39e
Schedule new track assignment after stopping current track
2019-11-08 13:19:06 +03:00
Dean Herbert
c70c05c896
Less sickening parallax ( #6743 )
...
Less sickening parallax
2019-11-08 19:15:25 +09:00
Dean Herbert
5699f3e22b
Seek to the first hitobject when entering the editor ( #6766 )
...
Seek to the first hitobject when entering the editor
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-08 19:15:08 +09:00
Dan Balasescu
1c1a49011b
Merge branch 'master' into infrastructure
2019-11-08 19:10:49 +09:00
Dean Herbert
ac0ec0d66e
Read initial beat divisor value from the beatmap ( #6765 )
...
Read initial beat divisor value from the beatmap
2019-11-08 19:06:25 +09:00
Dean Herbert
a849bc0746
Move implementation into resetTrack for safety
2019-11-08 18:51:01 +09:00
smoogipoo
e904928314
Seek to first hitobject when entering editor
2019-11-08 17:42:19 +09:00
smoogipoo
36cc79f04f
Softly handle invalid beat divisors instead of throwing
2019-11-08 17:28:11 +09:00
smoogipoo
998e1dfe47
Fix non-1/1 initial beat divisor control display
2019-11-08 17:23:47 +09:00
smoogipoo
eb9fff96ba
Read default beat divisor from beatmap
2019-11-08 17:22:58 +09:00
Dean Herbert
8bcbc93501
Fix tournament buttons playing sound effects
2019-11-08 17:00:47 +09:00
smoogipoo
df08a95734
Separate addition/removal into separate methods
2019-11-08 16:46:58 +09:00
smoogipoo
b4cb4c1243
Remove previous samples on change
2019-11-08 16:19:55 +09:00
smoogipoo
a9b4106075
Remove unnecessary (for now) scheduling
2019-11-08 16:19:43 +09:00
smoogipoo
53e6186b6d
Fix drawable hitobject samples not updating
2019-11-08 14:59:47 +09:00
smoogipoo
6fc1be64c2
Make hitobject samples a bindable list
2019-11-08 14:04:57 +09:00
smoogipoo
864b8db638
Use three states for the hitsound menu items
2019-11-08 13:52:36 +09:00
smoogipoo
046f0b0fe5
Allow right-clicks to trigger selection
2019-11-08 13:40:47 +09:00
smoogipoo
573d11503e
Remove unused using
2019-11-08 13:36:17 +09:00
smoogipoo
abb3a6ca5b
Initial right click context menu implementation
2019-11-08 13:36:17 +09:00
smoogipoo
a2c265c147
Separate ThreeStates into its own file
2019-11-08 13:23:13 +09:00
smoogipoo
011bf09516
Add xmldocs and cleanup
2019-11-08 13:23:13 +09:00
smoogipoo
0a15a13fab
Reorder parameters
2019-11-08 13:23:13 +09:00
smoogipoo
30f877c4ab
Implement a three-state menu item
2019-11-08 13:23:13 +09:00
smoogipoo
ce08d664a5
Abstract statefulness of new menu item type
2019-11-08 13:23:13 +09:00
smoogipoo
4fe69dbc89
Fix context menu sub-menu display
2019-11-08 13:23:13 +09:00
Joehu
5235d2b319
Fix home button not closing login and now playing overlays
2019-11-07 14:38:06 -08:00
iiSaLMaN
cee16e9419
Merge remote-tracking branch 'refs/remotes/upstream/master' into fallback-to-skin-combo-colours
2019-11-07 19:11:29 +03:00
smoogipoo
c3a3b4091b
Add basic implementation of a toggleable menu item
2019-11-07 22:26:35 +09:00
iiSaLMaN
9874ce49ce
Move fallback allowance to the skin configuration only.
2019-11-07 15:55:34 +03:00
iiSaLMaN
808543885f
Change ComboColours type to IReadOnlyList<Color4>
...
Also exposes functions to modify the internal list (AddComboColours, ClearComboColours)
2019-11-07 15:54:30 +03:00
smoogipoo
29672c48e1
Make simple OsuMenuItem ctor invoke the complex one
2019-11-07 16:04:13 +09:00
smoogipoo
20d6eceecf
Move DrawableOsuMenuItem out of OsuMenu
2019-11-07 16:03:35 +09:00
Andrei Zavatski
446e2894f7
Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix
2019-11-07 08:48:35 +03:00
smoogipoo
f3ddc4c00b
Advance editor clock after a snapped placement
2019-11-07 14:08:02 +09:00
Dean Herbert
d400e4a5f6
Add shared constant for parallax amount
2019-11-07 09:30:50 +09:00
Bartłomiej Dach
70feab8316
Merge branch 'master' into prev-button-revamp
2019-11-06 22:41:33 +01:00
iiSaLMaN
61778232d8
Rewrite inline comment
2019-11-06 23:24:54 +03:00
iiSaLMaN
cef6e2a26b
Move colours fallback logic to SkinConfiguration.ComboColours getter
2019-11-06 23:20:36 +03:00
iiSaLMaN
198a1750c3
Use is pattern matching
2019-11-06 20:46:02 +03:00
iiSaLMaN
69d9a0ae1a
Use null check and pattern matching
2019-11-06 20:30:26 +03:00
iiSaLMaN
ba14345107
Specify culture and number style
2019-11-06 20:27:55 +03:00
iiSaLMaN
947602f70a
Specify why legacy version is nullable
2019-11-06 20:24:19 +03:00
iiSaLMaN
502dcc5669
Fix incorrect skin version case
2019-11-06 20:23:22 +03:00
iiSaLMaN
55230a36dd
Set correct legacy version
2019-11-06 19:58:07 +03:00
iiSaLMaN
6ecea0e4c1
Fix DummyAPIAccess being potentially incorrect
2019-11-06 18:15:49 +03:00
Andrei Zavatski
c01f3a58cb
Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix
2019-11-06 18:15:49 +03:00
Dean Herbert
3bc4685a46
Merge pull request #6692 from peppy/fix-network-stalls
...
Use LongRunningLoad on network load components
2019-11-06 19:54:30 +09:00
Dean Herbert
70cf91fb40
Seek editor when hit objects are double clicked ( #6745 )
...
Seek editor when hit objects are double clicked
2019-11-06 19:22:41 +09:00
Andrei Zavatski
423e26a4d1
Fix header text could be sticked together
2019-11-06 13:07:25 +03:00
Dean Herbert
91bcb5d4a7
Merge remote-tracking branch 'upstream/master' into fix-network-stalls
2019-11-06 19:06:28 +09:00
Andrei Zavatski
0f53725005
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables
2019-11-06 13:03:34 +03:00
Andrei Zavatski
b35b3484ca
Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix
2019-11-06 12:46:28 +03:00
Andrei Zavatski
4330507da8
Use api.IsLoggedIn
2019-11-06 12:46:25 +03:00
Dean Herbert
46a0fbe561
Share framework file-exclusion function ( #6668 )
...
Share framework file-exclusion function
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-06 18:40:22 +09:00
Dean Herbert
a6d000baa2
Fix audio preview muting game audio indefinitely when beatmap p… ( #6738 )
...
Fix audio preview muting game audio indefinitely when beatmap panel is off-screen
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-06 18:34:17 +09:00
Dean Herbert
0df0260dd9
Disallow selections to be moved outside of the playfield ( #6742 )
...
Disallow selections to be moved outside of the playfield
2019-11-06 18:29:06 +09:00
Andrei Zavatski
1f3b209a6c
Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix
2019-11-06 12:26:41 +03:00
smoogipoo
3680e7c704
Seek editor when hit objects are double clicked
2019-11-06 18:15:57 +09:00
Dean Herbert
aaa06396f0
Reduce editor parallax
2019-11-06 18:11:56 +09:00
Dean Herbert
ee4839b7e7
Reduce delay on parallax
2019-11-06 18:09:36 +09:00
Dean Herbert
813d3a0bfa
Fix adjustments not being removed correctly on retry from pause ( #6728 )
...
Fix adjustments not being removed correctly on retry from pause
2019-11-06 17:54:20 +09:00
Dean Herbert
143f316cbe
Merge branch 'master' into fix-network-stalls
2019-11-06 17:54:08 +09:00
Dan Balasescu
402eedce03
Merge branch 'master' into reuse-framework-exclusuion-function
2019-11-06 17:48:26 +09:00
Dan Balasescu
1e52c83804
Merge branch 'master' into fix-preview-not-stopping
2019-11-06 17:47:54 +09:00
Dean Herbert
09e9ef0e4b
Add background colour to music player ProgressBar ( #6741 )
...
Add background colour to music player ProgressBar
2019-11-06 17:44:08 +09:00
smoogipoo
2c1bfd62ef
Disallow selections to be moved outside of the playfield
2019-11-06 17:28:04 +09:00
Dean Herbert
c631a05a44
Add ability to edit individual ControlPoint attributes from tim… ( #6638 )
...
Add ability to edit individual ControlPoint attributes from timing screen
2019-11-06 17:24:51 +09:00
Dean Herbert
a2963b66f6
Limit distance snap between two adjacent hit objects ( #6740 )
...
Limit distance snap between two adjacent hit objects
2019-11-06 17:18:00 +09:00
Dan Balasescu
ff6bfc453b
Merge pull request #6718 from peppy/update-framework
...
Update framework
2019-11-06 16:38:15 +09:00
Dean Herbert
23eab68c72
Merge remote-tracking branch 'upstream/master' into editor-timing-screen-2
2019-11-06 16:22:55 +09:00
Ganendra Afrasya
02c21a1379
Make progress bar hoverable
2019-11-06 14:11:47 +07:00
Ganendra Afrasya
d985d04857
Add background colour to music player ProgressBar
2019-11-06 14:07:34 +07:00
Dean Herbert
c1a6cb1def
Fix audio preview muting game audio indefinitely when beatmap panel is off-screen
2019-11-06 15:58:47 +09:00
smoogipoo
020b08b450
Initial implementation of limited distance snap
2019-11-06 15:27:48 +09:00
smoogipoo
0b09fb293e
Fix background being coloured
2019-11-06 15:16:00 +09:00
Dean Herbert
a3d8738cab
Merge branch 'master' into vote-pill-fix
2019-11-06 14:52:06 +09:00
Dean Herbert
ebfb5d050d
Move section update code to abstract method to avoid incorrect BindValue usage
2019-11-06 14:36:43 +09:00
Dean Herbert
4ce3450cfc
Move button implementation to OsuButton
2019-11-06 14:08:52 +09:00
smoogipoo
322a1f0a86
Fix potential nullref
2019-11-06 12:45:35 +09:00
smoogipoo
7cd4cb8a93
Rename selectedPoints to selectedGroup
2019-11-06 12:32:12 +09:00
smoogipoo
9dd7f997d2
Reoder SampleSection to match others
2019-11-06 12:17:18 +09:00
smoogipoo
f20bfe7a55
Fix extra semicolon
2019-11-06 12:16:48 +09:00
Dean Herbert
8cf349c1ee
Update once more
2019-11-06 12:10:53 +09:00
Dean Herbert
b4ae02cc69
Merge remote-tracking branch 'upstream/master' into update-framework
2019-11-06 12:09:51 +09:00
Dan Balasescu
b5a8bbaa60
Merge branch 'master' into editor-timing-screen
2019-11-06 12:02:00 +09:00
Dean Herbert
cd1dd0f898
Fix adjustments not being removed correctly on retry from pause
2019-11-06 10:38:04 +09:00
Dean Herbert
52dba69a64
Implement slider control point deletion ( #6679 )
...
Implement slider control point deletion
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-05 19:15:15 +09:00
Dean Herbert
f0a6fbdeb0
Fix selecting underneath selected blueprints ( #6719 )
...
Fix selecting underneath selected blueprints
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-05 18:48:46 +09:00
Dean Herbert
3b8dc57ad3
Disable input for non-selected blueprints ( #6717 )
...
Disable input for non-selected blueprints
2019-11-05 18:34:43 +09:00
Dean Herbert
f4b93ec943
Add exception when holding control
2019-11-05 18:29:08 +09:00
Dean Herbert
f77de7d880
Simplify implementation
2019-11-05 18:25:38 +09:00
smoogipoo
0db34a47f8
Fix selecting underneath selected blueprints
2019-11-05 17:28:42 +09:00
Dean Herbert
44d0791676
Update button usage
2019-11-05 16:26:31 +09:00
Dan Balasescu
0758025b6b
Merge branch 'master' into reuse-framework-exclusuion-function
2019-11-05 16:18:16 +09:00
Dean Herbert
fe374eabe0
Update framework
2019-11-05 15:47:01 +09:00
smoogipoo
7c20a589f2
Remove unused usings
2019-11-05 13:56:21 +09:00
smoogipoo
c8beb5296f
Use PlatformAction.Delete instead of Delete key
2019-11-05 13:26:44 +09:00
Dan Balasescu
23ad516348
Merge branch 'master' into game-handles-links
2019-11-05 12:33:32 +09:00
smoogipoo
64d900b387
Disable input for non-selected blueprints
2019-11-05 11:33:37 +09:00
unknown
a92b32f6dc
add basic tests
2019-11-05 00:56:09 +08:00
unknown
2bc6932567
make interface mod applicable
2019-11-05 00:55:55 +08:00
unknown
1216d66a4c
Merge remote-tracking branch 'origin/customized-mods' into customized-mods
2019-11-04 23:21:45 +08:00
Dean Herbert
eb1ec78b33
Disable retry hotkey overlay when viewing results from leaderbo… ( #6702 )
...
Disable retry hotkey overlay when viewing results from leaderboard
2019-11-04 12:34:18 +09:00
Bartłomiej Dach
539f8ad6dd
Remove overlay when viewing leaderboard scores
...
Do not add the hold-to-retry hotkey overlay if the user has navigated
to the results screen from the leaderboard and not from gameplay.
2019-11-04 01:57:31 +01:00
Dean Herbert
1a7b803d4d
Change colour to green to match web implementation
2019-11-04 08:39:51 +09:00
Dean Herbert
c71a082ffe
Merge branch 'master' into user-score-highlight
2019-11-04 08:18:18 +09:00
Joehu
fe23b9a262
Fix mod section overflowing mod select overlay at higher ui scale
2019-11-03 07:32:47 -08:00
Andrei Zavatski
48385dbdfe
Layout adjustments
2019-11-03 14:31:23 +03:00
Andrei Zavatski
daefabf271
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables
2019-11-03 14:16:33 +03:00
Dean Herbert
1155aacd90
Update sliders when control points change ( #6680 )
...
Update sliders when control points change
2019-11-03 19:05:48 +09:00
Dean Herbert
6bc62385b6
Merge branch 'master' into slider-controlpoint-selection
2019-11-03 15:28:50 +09:00
Dean Herbert
fe3583b6ee
Move schedule call
2019-11-03 13:16:54 +09:00
Dean Herbert
5127b52c25
Merge remote-tracking branch 'upstream/master' into game-handles-links
2019-11-03 13:04:18 +09:00
Dean Herbert
6dde755ef2
Merge branch 'master' into add-retry-button
2019-11-02 21:23:16 +09:00
Dean Herbert
fd13f0bc55
Move ReplayDownloadButton to correct namespace ( #6689 )
...
Move ReplayDownloadButton to correct namespace
2019-11-02 21:22:23 +09:00
Dean Herbert
551032803d
Fix GameplayClockContainer operating on beatmap's track after s… ( #6688 )
...
Fix GameplayClockContainer operating on beatmap's track after screen exited
2019-11-02 21:22:13 +09:00
Dan Balasescu
8a5d3ab40a
Merge branch 'master' into add-retry-button
2019-11-02 10:51:14 +09:00
Dan Balasescu
5be7d439ae
Add null check for nullable dependency
2019-11-02 10:32:23 +09:00
Andrei Zavatski
2f703090ef
Update API with latest web changes
2019-11-01 21:49:50 +03:00
Andrei Zavatski
1e73cf1025
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-tables
2019-11-01 21:14:09 +03:00
Ganendra Afrasya
8da15f6897
Fix all score are highlighted on local scope
2019-11-01 23:19:15 +07:00
Ganendra Afrasya
ce3b34a768
Fix UserTopScoreContainer is also tinted
2019-11-01 23:00:55 +07:00
Ganendra Afrasya
d9a91100fb
Add tint to user's score container background
2019-11-01 22:47:23 +07:00
Dean Herbert
ddd58ea3da
Use LongRunningLoad on network load components
2019-11-01 19:40:45 +09:00
Dan Balasescu
036e67bbc2
Merge pull request #6676 from peppy/fix-multi-logout-crash
...
Fix multi logout crash
2019-11-01 17:13:16 +09:00
Dean Herbert
156d0ae9b9
Remove braces
...
Co-Authored-By: Salman Ahmed <email@iisalman.me>
2019-11-01 16:08:44 +09:00
Dean Herbert
daa0ebe2b5
Add xmldoc
2019-11-01 15:51:45 +09:00
Dean Herbert
14453da1d2
Centralise MakeCurrent call
2019-11-01 15:51:10 +09:00
Dean Herbert
c532f77657
Add hold-to-retry support to results
2019-11-01 15:49:42 +09:00
Dean Herbert
84d17f3702
Add retry button
2019-11-01 15:41:51 +09:00
Dean Herbert
14fec6f1f3
Move ReplayDownloadButton to correct namespace
2019-11-01 15:06:36 +09:00
Dean Herbert
dcc8f6e827
Better group cancel conditional
2019-11-01 14:43:52 +09:00
Dean Herbert
d089e47a56
Merge branch 'master' into master
2019-11-01 14:15:57 +09:00
Dean Herbert
ac02bb005d
Fix GameplayClockContainer operating on beatmap's track after scren exited
2019-11-01 14:11:18 +09:00
Dan Balasescu
9b9366e2d7
Merge branch 'master' into fix-multi-logout-crash
2019-11-01 13:55:28 +09:00
Dean Herbert
7c3dd36add
Fix scrolling hitobjects expiring too soon ( #6687 )
...
Fix scrolling hitobjects expiring too soon
2019-11-01 13:03:51 +09:00
Dan Balasescu
770726cc95
Merge branch 'master' into fix-multi-logout-crash
2019-11-01 12:46:26 +09:00
smoogipoo
0171b2ae7c
Fix scrolling hitobjects expiring too soon
2019-11-01 12:10:03 +09:00
Dean Herbert
f038c579f0
Protect against requests to show overlays before the target overlay is ready
2019-11-01 11:41:00 +09:00
Dean Herbert
898520935e
Move link handling code to OsuGame
...
This allows for future calls from arguments / associations
2019-11-01 11:40:51 +09:00
Dan Balasescu
54681a6206
Merge branch 'master' into catch-api-request-exceptions
2019-11-01 11:33:23 +09:00
smoogipoo
41ae66d517
Update slider when control points change
2019-10-31 18:24:38 +09:00
smoogipoo
9f28b1905b
Expose composer method to update hitobject
2019-10-31 18:15:19 +09:00
Dean Herbert
ce19b2ed36
Avoid using CreateChildDependencies with a *child* bindable
...
Don't do this.
2019-10-31 17:16:26 +09:00
Dean Herbert
3e3ff81229
Reorder methods
2019-10-31 17:13:00 +09:00
Dean Herbert
4f04abf282
Fix tabs to match design (should not show pinhair line)
2019-10-31 16:54:28 +09:00
smoogipoo
cfdf710676
Add test
2019-10-31 16:51:58 +09:00
Dean Herbert
5d47a2e557
Merge branch 'master' into add-beatmap-ruleset-selector
2019-10-31 16:42:32 +09:00
Dean Herbert
bf45fa6309
Use lambda function expression
2019-10-31 16:24:03 +09:00
Dean Herbert
f8187fa301
Don't rely on masking for bar display
2019-10-31 16:23:10 +09:00
Dean Herbert
923041c3f9
Merge branch 'master' into beatmap-overlay-ruleset-selector
2019-10-31 15:15:52 +09:00
Dean Herbert
0cd912fcd3
Cover all non-APIAccess APIRequest calls with exception handling
2019-10-31 15:04:13 +09:00
Dean Herbert
5b405abc52
Schedule forcefullyExit call for safety
...
Screen state may have changed at an inopportune moment. Run on local scheduler, not API scheduler to avoid any weirdness.
2019-10-31 13:43:25 +09:00
Dean Herbert
32dabf80a6
Ensure forceful exit completely exits from mutliplayer
...
Previously it may have gotten blocked by being in a sub screen.
2019-10-31 13:42:28 +09:00
Dean Herbert
5b5703544b
Fix crash when quickly exiting multiplayer after joining a room ( #6666 )
...
Fix crash when quickly exiting multiplayer after joining a room
2019-10-31 13:15:46 +09:00
Andrei Zavatski
4730453083
Apply suggestions
2019-10-31 02:10:00 +03:00
Andrei Zavatski
d90545227c
Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix
2019-10-30 23:49:56 +03:00
Huo Yaoyuan
9d4f80c2a2
Add icon and use licence expression for NuGet.
...
Unlike framework, if other components are packed, they are likely to use different icons.
2019-10-30 23:37:58 +08:00
Huo Yaoyuan
3ad0369d7b
Resolve new diagnostics in C# 7.3
2019-10-30 23:13:11 +08:00
Huo Yaoyuan
bcf8e3a9d4
Remove redundant properties from desktop projects.
...
While OutputType=Library maybe doubtful, PlatformTarget=AnyCPU should be clearly the default.
2019-10-30 22:56:33 +08:00
Huo Yaoyuan
31595159be
Normalize .props
2019-10-30 21:54:14 +08:00
Huo Yaoyuan
93fae7ad4d
Remove meanless properties.
2019-10-30 21:46:30 +08:00
Dean Herbert
35be8f9dfb
Share framework file-exclusion function
2019-10-30 19:34:17 +09:00
Dean Herbert
7b67701e57
Merge branch 'master' into editor-timing-screen
2019-10-30 19:27:24 +09:00
Dean Herbert
7f2916454d
Simplify EditorClock.Seek method
2019-10-30 19:09:46 +09:00
Dean Herbert
5899bbd8a6
Fix merge regressions
2019-10-30 18:45:50 +09:00
Dean Herbert
93076ad6a1
Merge branch 'master' into editor-timing-screen
2019-10-30 18:42:20 +09:00
smoogipoo
cf2d885099
Fix control points being flushed too late
2019-10-30 18:02:18 +09:00
smoogipoo
45af796943
Remove usages of EF internals
2019-10-30 17:05:15 +09:00
Dan Balasescu
514c9f1eef
Merge branch 'master' into bindable-control-points
2019-10-30 16:20:54 +09:00
Dan Balasescu
3045ba4bf4
Merge branch 'master' into bindable-control-point-properties
2019-10-30 16:02:39 +09:00
Dan Balasescu
ced6042b3e
Use internal type name
2019-10-30 15:51:09 +09:00
smoogipoo
f56d9fe50c
Forcefully part room when multiplayer exits
2019-10-30 14:42:14 +09:00
smoogipoo
b6457f0ce9
Cancel room joins on part
2019-10-30 14:41:54 +09:00
smoogipoo
95ff48c123
Don't log cancelled join requests
2019-10-30 14:38:06 +09:00
Dean Herbert
dbee63c1a6
Make OsuButton correctly block hover events ( #6636 )
...
Make OsuButton correctly block hover events
2019-10-30 12:38:16 +09:00
Dan Balasescu
4322933470
Merge branch 'master' into signin-ux-improvement
2019-10-30 12:10:52 +09:00
Andrei Zavatski
8ad5ccda68
Test steps rearrangement and condition fix
2019-10-30 04:16:14 +03:00
Andrei Zavatski
2c31492bbe
Fix comment can be voted if user is null
2019-10-30 03:27:06 +03:00
Andrei Zavatski
1502a6c631
Cleanups
2019-10-30 03:09:14 +03:00
Andrei Zavatski
092d16bb64
Dont use binding to set disabled value
2019-10-29 23:43:16 +03:00
Andrei Zavatski
30d9b21b86
Condition simplification
2019-10-29 21:57:20 +03:00
Andrei Zavatski
e287dae64b
Fix VotePill can be activated by the comment sender
2019-10-29 21:25:48 +03:00
Ganendra Afrasya
5c2917d303
Place sign in button inside ShakeContainer
2019-10-30 00:50:04 +07:00
Dean Herbert
04b0916196
Merge branch 'master' into fix-day-separator-purging
2019-10-29 18:44:39 +09:00
Dean Herbert
f4c4523034
Merge branch 'update-framework' into fix-chat-scroll-to-bottom
2019-10-29 18:17:41 +09:00
Dean Herbert
342dfc26d2
Merge remote-tracking branch 'upstream/master' into fix-chat-scroll-to-bottom
2019-10-29 18:17:38 +09:00
Dean Herbert
3f192ca915
Fix song progress not displaying correctly ( #6640 )
...
Fix song progress not displaying correctly
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-10-29 18:16:54 +09:00
Dean Herbert
e3a1613d2a
Fix PlayerSettingsOverlay being shown by default ( #6641 )
...
Fix PlayerSettingsOverlay being shown by default
2019-10-29 18:16:33 +09:00
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
Dean Herbert
e1de0b0537
Merge remote-tracking branch 'upstream/master' into fix-video-fill-mode
2019-09-16 00:19:30 +09:00
Craftplacer
08ab4e508f
Use loadComponentSingleFile for caching
2019-09-15 17:15:52 +02:00
Craftplacer
811a08d18f
Use Bindable instead of bool
2019-09-15 16:50:01 +02:00
Craftplacer
00e46fdefe
Add check if game is muted by MuteButton
2019-09-15 16:32:23 +02:00
Craftplacer
0afb5c5bb0
Expose muted state from VolumeOverlay
2019-09-15 16:31:57 +02:00
Craftplacer
72af640df7
Expose VolumeOverlay as available dependencies
2019-09-15 16:31:40 +02:00
Craftplacer
4a10e6c44e
Use ResolvedAttribute for NotificationOverlay
2019-09-15 16:11:45 +02:00
Craftplacer
78931c8e23
Implement notification when user has track or master volume muted
...
This took around under a hour to implement, it has the same behavior and content from osu!stable.
A notification will show up when the user has either its master or track volume set to the minimum, clicking it will set it to the default values.
2019-09-15 15:59:46 +02:00
Dean Herbert
fedbac74e4
Wait for cursor hiding using ManualResetEventSlim ( #6112 )
...
Wait for cursor hiding using ManualResetEventSlim
2019-09-15 15:00:38 +09:00
Andrei Zavatski
96453d8197
Remove redundant string interpolation
2019-09-15 02:46:28 +03:00
Andrei Zavatski
babd34470e
Fix DrawableFlag returns empty texture if there's no flag avaliable for needed country
2019-09-15 02:33:21 +03:00
Bartłomiej Dach
dd9f620c23
Fix misleading xmldoc
2019-09-15 01:28:07 +02:00
Bartłomiej Dach
86588778b1
Implement fallback decoder registration
...
After the preparatory introduction of LineBufferedReader, it is now
possible to introduce registration of fallback decoders that won't drop
input supplied in the first line of the file.
A fallback decoder is used when the magic in the first line of the file
does not match any of the other known decoders. In such a case,
the fallback decoder is constructed and provided a LineBufferedReader
instance. The process of matching magic only peeks the first non-empty
line, so it is available for re-reading in Decode() using ReadLine().
There can be only one fallback decoder per type; a second attempt of
registering a fallback will result in an exception to avoid bugs.
To address the issue of parsing failing on badly or non-headered files,
set the legacy decoders for Beatmaps and Storyboards as the fallbacks.
Due to non-trivial logic, several new, passing unit tests with possible
edge cases also included.
2019-09-15 01:28:07 +02:00
Bartłomiej Dach
11eda44d34
Migrate decoding to line-buffered reader
...
Migrate all usages of StreamReader in the context of decoding beatmaps,
storyboards or skins to the new LineBufferedReader.
2019-09-15 01:28:07 +02:00
Bartłomiej Dach
7b1ff38df7
Implement line-buffered reader
...
Add a line-buffered reader decorator operating on StreamReader
instances. The decorator has two main operations - PeekLine(), which
allows to see the next line in the stream without consuming it,
ReadLine(), which consumes and returns the next line in the stream, and
ReadToEnd() which reads all the remaining text in the stream (including
the unconsumed peeked line). Peeking line-per-line uses an internal
queue of lines that have been read ahead from the underlying stream.
The addition of the line-buffered reader is a workaround solution to
a problem with decoding. At current selecting a decoder works by
irreversibly reading the first line from the stream and looking for
a magic string that indicates the type of decoder to use.
It might however be possible for a file to be valid in format, just
missing a header. In such a case a lack of a line-buffered reader makes
it impossible to reparse the content of that first line. Introducing it
will however allow to peek the first line for magic first.
- If magic is found in the first line, GetDecoder() will peek it and
use it to return the correct Decoder instance. Note that in the case
of JsonBeatmapDecoder the magic is the opening JSON object brace,
and therefore must not be consumed.
- If magic is not found, the fallback decoder will be able to consume
it using ReadLine() in Decode().
This commit additionally contains basic unit tests for the reader.
Suggested-by: Aergwyn <aergwyn@t-online.de>
2019-09-15 01:26:15 +02:00
Roman Kapustin
8456861b8d
Wait for cursor hiding using ManualResetEventSlim
2019-09-14 17:08:56 +03:00
Andrei Zavatski
2783ae62ef
Remove useless container
2019-09-14 06:34:57 +03:00
Andrei Zavatski
9febeb1f3d
Add black background
2019-09-14 06:32:00 +03:00
Andrei Zavatski
a36c808682
Use Fit FillFode
2019-09-14 06:28:59 +03:00
Andrei Zavatski
8ad782a82d
Fix RankingsHeader dropdown can be clickable when not visible
2019-09-14 06:16:25 +03:00
Andrei Zavatski
9a94405b3a
Fix video playback is stretched on client resize
2019-09-14 06:05:09 +03:00
Dean Herbert
65aa7b2016
Recreate beatmap video on each consumption
...
Should not be shared over multiple usages
2019-09-14 00:07:06 +09:00
Dean Herbert
1b8d5decfa
Add beatmap video support ( #5908 )
...
Add beatmap video support
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-13 23:31:34 +09:00
Dean Herbert
2cd3657b5e
Merge branch 'master' into beatmap-video
2019-09-13 23:08:57 +09:00
Dean Herbert
624e5644a4
Change osu!catch key trigger to occur on frame before positional change
2019-09-13 23:06:35 +09:00
Dean Herbert
9e53c091a3
Merge pull request #6095 from peppy/fix-test-dummy-api
...
Fix incorrect DI usage of IAPIProvider in many tests
2019-09-13 22:22:07 +09:00
Dean Herbert
2379b665e3
Use InvalidOperationException
2019-09-13 22:15:11 +09:00
Dean Herbert
d385c35955
Apply suggestions from code review
...
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
2019-09-13 21:55:45 +09:00
Andrei Zavatski
9e742839ac
Use correct database migration
2019-09-13 13:57:55 +03:00
Andrei Zavatski
fb9b25b786
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video
2019-09-13 13:48:14 +03:00
Dan Balasescu
b10ce0b12d
Merge branch 'master' into key-counter-fixes
2019-09-13 19:43:33 +09:00
Andrei Zavatski
c13950fbbf
Remove custom db additions
2019-09-13 13:43:21 +03:00
Andrei Zavatski
437e121056
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video
2019-09-13 13:39:58 +03:00
Dan Balasescu
125b3fda6c
Merge branch 'master' into improve-catch-replay-frames
2019-09-13 19:23:15 +09:00
Dean Herbert
e1ed5dfa7d
Reset DrawableHitObject lifetimes on state change ( #6028 )
...
Reset DrawableHitObject lifetimes on state change
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-13 19:10:02 +09:00
Dean Herbert
614e68cdf9
Remove redundant BindTarget usage
2019-09-13 18:11:17 +09:00
Dean Herbert
031f0ee1e7
Consume ValueChanged and inline some pointless constants
2019-09-13 18:09:15 +09:00
Dean Herbert
1e4f3507ed
Fix layout not matching web
2019-09-13 18:07:52 +09:00
Dean Herbert
0cc21c9c74
Fix changelog overlay potentially adding children after disposal
2019-09-13 17:21:47 +09:00
Dean Herbert
7cb79dd760
Fix incorrect DI usage of IAPIProvider in many tests
2019-09-13 17:15:33 +09:00
Andrei Zavatski
6867b3c232
Update resources
2019-09-13 10:56:21 +03:00
Andrei Zavatski
cb98b07e33
Merge master with conflicts resolved
2019-09-13 10:45:01 +03:00
Dean Herbert
ffd205f470
Merge remote-tracking branch 'upstream/master' into pr/EVAST9919/6076
2019-09-13 16:25:30 +09:00
Dean Herbert
78e7be919f
Remove unnecessary container
2019-09-13 16:25:25 +09:00
Dean Herbert
c4f9be5913
Merge pull request #6093 from smoogipoo:fix-player-restart
...
Fix player not correctly restarting after an unpause
2019-09-13 16:09:41 +09:00
Dean Herbert
7818ecd71c
Forward ValueChangedEvent instead
2019-09-13 16:03:44 +09:00
Dean Herbert
a05ae2c1b2
Merge remote-tracking branch 'upstream/master' into pr/EVAST9919/6082
2019-09-13 15:53:11 +09:00
smoogipoo
cf2f841b4d
Fix player not correctly exiting after an unpause
2019-09-13 15:42:58 +09:00
Dean Herbert
c66e963705
Make constructor private
2019-09-13 15:42:36 +09:00
Dean Herbert
dc8c7a5041
Add null check for safety
2019-09-13 15:27:42 +09:00
Dean Herbert
44947aa9ed
Make PopupDialog abstract
2019-09-13 15:27:29 +09:00
Dean Herbert
e2e87d5268
Merge branch 'master' into properly-fix-dialog-double-samples
2019-09-13 14:53:29 +09:00
Andrei Zavatski
5a72083c13
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-title
2019-09-13 08:32:06 +03:00
Dean Herbert
43d7615734
Merge remote-tracking branch 'upstream/master' into rankings-scope-selector
2019-09-13 14:07:39 +09:00
Dean Herbert
0e679fb468
Use colour constant rather than opacity helper function
2019-09-13 14:06:19 +09:00
Dean Herbert
b917f29cfe
Make GradientLineTabControl abstract
2019-09-13 13:59:06 +09:00
Dean Herbert
3b82c6db49
Merge branch 'master' into leaderboard-mod-icons-spacing
2019-09-13 13:27:18 +09:00
Joehu
2a8fa2f593
Refactor modsContainer on profile scores
2019-09-12 14:01:12 -07:00
Andrei Zavatski
99fc13b4d8
Update usage of the DismissableFlag
2019-09-12 19:34:58 +03:00
Andrei Zavatski
0142fcd07a
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-title
2019-09-12 19:29:05 +03:00
Andrei Zavatski
b17d097a39
Simplify colour usage in GradientLine
2019-09-12 17:17:57 +03:00
Andrei Zavatski
4dd819c150
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-scope-selector
2019-09-12 17:17:32 +03:00
Andrei Zavatski
cafb5105bc
Rename HeaderFlag to DismissableFlag
2019-09-12 16:44:15 +03:00
Dean Herbert
2cb084666b
Merge branch 'master' into rankings-scope-selector
2019-09-12 22:37:14 +09:00
Dean Herbert
5f77236c01
Merge branch 'master' into closable-flag
2019-09-12 22:27:34 +09:00
Dean Herbert
b81b162ee1
Update InitialLifetimeOffset comment
2019-09-12 19:30:27 +09:00
Dean Herbert
9fc60aeefc
Merge branch 'master' into reset-dho-lifetimes
2019-09-12 19:29:14 +09:00
Dean Herbert
f21e47d6d2
Move expire to DrawableHitObject
2019-09-12 19:29:08 +09:00
Dean Herbert
1dfd104690
Merge branch 'improve-catch-replay-frames' into key-counter-fixes
2019-09-12 18:34:00 +09:00
Dean Herbert
acdfeef1dc
Improve how osu!catch stores and replays key actions
2019-09-12 18:33:46 +09:00
Dean Herbert
831d04f339
Don't use gameplay clock in KeyCounter
2019-09-12 15:48:07 +09:00
Dean Herbert
0cdf125c1e
Handle key counter rewinding in a better way
...
Use ElapsedFrameTime rather than storing state data
2019-09-12 15:42:14 +09:00
Dean Herbert
cb0cf6e2c5
Remove reset functions
2019-09-12 14:27:52 +09:00
Dean Herbert
158737e001
Remove FadeTime customisation
...
Also adjusts fade transitions to feel better, especially in fast forward scenarios.
2019-09-12 14:27:29 +09:00
Dean Herbert
f9c969788a
Fix keys not reaching full brightness as soon as they should
2019-09-12 13:56:23 +09:00
Andrei Zavatski
acdd26422d
Implement Spotlights logic
2019-09-12 06:36:17 +03:00
Andrei Zavatski
0c6c8fdcd0
Implement RankingsHeader component
2019-09-12 05:53:18 +03:00
Andrei Zavatski
b657e31f93
Merge dependent changes
2019-09-12 05:26:10 +03:00
Andrei Zavatski
4bfb681db6
CI fixes
2019-09-12 05:16:56 +03:00
Andrei Zavatski
581508b8e7
Implement RankingsRulesetSelector
2019-09-12 05:06:51 +03:00
Andrei Zavatski
c3c2efe35c
Add ability to override text in PageTabItem
2019-09-12 05:03:59 +03:00
Joehu
77ac186cf8
Add spacing to mod icons on leaderboards
2019-09-11 16:08:01 -07:00
Joehu
e0bf579b18
Properly fix dialog overlay playing double samples on show/hide
2019-09-11 15:35:47 -07:00
Andrei Zavatski
dbfbd1262f
Implement HeaderTitle component for RankingsOverlay
2019-09-11 23:39:22 +03:00
Andrei Zavatski
eee1cad760
Merge remote-tracking branch 'refs/remotes/origin/closable-flag' into rankings-title
2019-09-11 23:01:38 +03:00
Andrei Zavatski
d6132f5e60
Merge remote-tracking branch 'refs/remotes/origin/rankings-scope-selector' into rankings-title
2019-09-11 23:00:47 +03:00
Dean Herbert
55a071e8ba
Use BindValueChanged
2019-09-11 19:12:55 +09:00
Dean Herbert
be66c0e912
Fix potential of toggle between load and LoadComplete
2019-09-11 19:06:31 +09:00
Dean Herbert
039b5ec958
Update framework
2019-09-11 18:47:25 +09:00
Andrei Zavatski
41ad44791b
Move RankingsScopeSelector to another namespace
2019-09-11 11:58:18 +03:00
Andrei Zavatski
f6de286868
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-scope-selector
2019-09-11 11:53:45 +03:00
Andrei Zavatski
660c678cdc
Remove unused using directives
2019-09-11 11:40:51 +03:00
Dean Herbert
2c09efa23b
Handle changes to OverlayActivationMode
2019-09-11 17:34:28 +09:00
Dean Herbert
825a34ecd3
Early return to avoid other potential fail cases
2019-09-11 17:34:03 +09:00
Andrei Zavatski
1d1da1bc13
Visual improvements
2019-09-11 11:26:09 +03:00
Dean Herbert
f53410a42a
Merge remote-tracking branch 'upstream/master' into re-order-events
2019-09-11 16:48:44 +09:00
Andrei Zavatski
95828b07ef
Implement HeaderFlag component for rankings overlay
2019-09-11 10:40:58 +03:00
Dean Herbert
6760e239a1
Fix osu! hitcircle font textures being incorrectly sized
2019-09-11 13:39:21 +09:00
Andrei Zavatski
6c2db8e4b0
Merge remote-tracking branch 'refs/remotes/ppy/master' into rankings-scope-selector
2019-09-10 16:33:08 +03:00
Dean Herbert
c27eed0195
Centralise and share bar line generation code between rulesets ( #6054 )
...
Centralise and share bar line generation code between rulesets
2019-09-10 19:31:29 +09:00
Dan Balasescu
4910c23482
Merge branch 'master' into show-beatmap-not-selected-in-leaderboards
2019-09-10 17:43:42 +09:00
Dan Balasescu
ea2793637d
Merge branch 'master' into add-chat-truncation
2019-09-10 17:11:49 +09:00
smoogipoo
717a287d69
Use real ellipsis character
2019-09-10 17:11:26 +09:00
smoogipoo
01fd08cba9
Fix broken positioning of effected usernames
2019-09-10 17:11:16 +09:00
Dean Herbert
af3bb5a2cd
Centralise and share bar line generation code between rulesets
2019-09-10 13:30:54 +09:00
Andrei Zavatski
03bd7ca8e7
Implement RankingsScopeSelector
2019-09-10 04:20:32 +03:00
Andrei Zavatski
65869c7ebb
Refactor LeaderboardScopeSelector for more extensibility
2019-09-10 04:04:37 +03:00
iiSaLMaN
b77550625c
Check if DummyWorkingBeatmap is selected instead
2019-09-09 20:04:04 +03:00
Dean Herbert
98e384129c
Remove redundant initialisation
2019-09-10 01:34:48 +09:00
Dean Herbert
7eb20da820
Add back local bool (required due to action limitations)
2019-09-10 01:18:02 +09:00
Dean Herbert
dce675d6a8
Merge branch 'master' into login-on-startup
2019-09-10 01:13:29 +09:00
Dean Herbert
f398f134e1
Remove unnecessary bool storage
...
Also delay show slightly for better user experience.
2019-09-10 01:12:30 +09:00
Dean Herbert
0ec642d826
Show instead of toggle
2019-09-10 01:06:37 +09:00
Dean Herbert
455a421caa
Merge remote-tracking branch 'upstream/master' into add-chat-truncation
2019-09-09 17:56:24 +09:00
Dean Herbert
2d636ce147
Update framework
2019-09-09 17:54:53 +09:00
LeNitrous
ff49c4ae98
remove redundancies
2019-09-09 13:50:14 +08:00
LeNitrous
c2353cbdfa
move logic to logo action
2019-09-09 13:30:48 +08:00
Dean Herbert
07fce8397b
Move reset call to ctor
2019-09-09 14:24:17 +09:00
LeNitrous
04a4f9c9a3
use IsLoggedIn and remove useless clause
2019-09-09 11:26:51 +08:00
Dean Herbert
d0e8b1efce
Merge remote-tracking branch 'upstream/master' into add-chat-truncation
2019-09-09 12:09:14 +09:00
Dean Herbert
eeebd517f3
Use MaxWidth specification
2019-09-09 12:08:59 +09:00
LeNitrous
be4f0cc2dd
remove null conditional
2019-09-09 06:14:49 +08:00
LeNitrous
a67a2899a9
move api state check to it's own clause
2019-09-08 16:18:15 +08:00
LeNitrous
3435e2a8d3
open login on enter main menu
2019-09-08 13:36:58 +08:00
iiSaLMaN
be803fa921
Reset score processor before starting the simulation
2019-09-07 18:15:49 +03:00
iiSaLMaN
55b2bc1ed5
Set Health default value to 1
2019-09-07 18:03:04 +03:00
Dean Herbert
7f2d14416a
Reset DrawableHitObject lifetimes on state change
2019-09-07 14:44:44 +09:00
Andrei Zavatski
3227dc87fb
Don't use CancelDelayedTasks to avoid cancelling unwanted tasks
2019-09-06 22:56:46 +03:00
Andrei Zavatski
157502339e
Merge remote-tracking branch 'refs/remotes/ppy/master' into friends-sorting
2019-09-06 22:30:10 +03:00
Dan Balasescu
f47f0e797c
Merge branch 'master' into volume-at-pause
2019-09-06 19:47:37 +09:00
Dean Herbert
c6b8f2db77
Update historic licence header
2019-09-06 19:05:50 +09:00
Dean Herbert
374479f837
Add truncatino of long usernames in chat
2019-09-06 19:00:57 +09:00
Dean Herbert
95baae5088
Fix dragging from inside to outside an overlay incorrectly hiding
2019-09-06 18:27:54 +09:00
Dean Herbert
88d0756107
Allow global actions to propagate through pause screen
2019-09-06 17:17:30 +09:00
Dean Herbert
b89fb5cdf7
Fix failing test
2019-09-06 16:51:30 +09:00
Dean Herbert
6ce36bd39e
Merge branch 'master' into stop-counting-to-score-after-fail
2019-09-06 16:12:53 +09:00
Dean Herbert
a50284a5eb
Merge pull request #6019 from peppy/hit-window-refactor
...
Refactor HitWindows for legibility
2019-09-06 16:10:04 +09:00
Dean Herbert
75476df1af
Use float types for chat overlay height ( #5960 )
...
Use float types for chat overlay height
2019-09-06 16:08:16 +09:00
Dean Herbert
985375d1c6
Remove private field xmldoc
2019-09-06 15:47:01 +09:00
Dean Herbert
b3f61abd49
Use float types for cursor sizes ( #5958 )
...
Use float types for cursor sizes
2019-09-06 15:45:44 +09:00
Dean Herbert
4031f51745
More permissive IsHitResultAllow by default
2019-09-06 15:37:30 +09:00
Dean Herbert
c379480e7b
Merge branch 'master' into remove-judgement-occurred
2019-09-06 15:32:34 +09:00
Dean Herbert
f925e781a9
Refactor HitWindows for legibility
2019-09-06 15:24:14 +09:00
Dean Herbert
fbdef97498
Fix fallback to default combo colours not working ( #6009 )
...
Fix fallback to default combo colours not working
2019-09-06 12:36:39 +09:00
Dean Herbert
404ad3834d
Merge pull request #6008 from peppy/fix-sample-fallback
...
Add back missing sample fallback to default skin
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-06 12:36:31 +09:00
Dean Herbert
f4f9519761
Add todo comment
2019-09-06 12:16:20 +09:00
Dean Herbert
bf6f803e69
Nest temporary class
2019-09-06 12:12:27 +09:00
Dean Herbert
7d1f5310d2
Don't implement anything
2019-09-06 12:03:29 +09:00
dependabot-preview[bot]
43aed7fea7
Bump Humanizer from 2.6.2 to 2.7.2
...
Bumps [Humanizer](https://github.com/Humanizr/Humanizer ) from 2.6.2 to 2.7.2.
- [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.6.2...v2.7.2 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-06 02:58:58 +00:00
Dan Balasescu
5dbdce17a7
Merge branch 'master' into fix-sample-fallback
2019-09-06 11:27:39 +09:00
Dean Herbert
50985d1b1d
Fix disposal logic
2019-09-06 10:43:19 +09:00
Dean Herbert
d6cdde552d
Add comment explaining dispose logic
2019-09-06 01:14:37 +09:00
Dean Herbert
5b094f8e1d
Actually register the RulesetConfigCache as a component
2019-09-06 01:13:58 +09:00
Dean Herbert
dafe9da851
Dispose config managers ahead of time to avoid database errors
2019-09-06 00:22:35 +09:00
Dean Herbert
a0aeccf232
Fix fallback to default combo colours not working
2019-09-05 23:24:13 +09:00
Dean Herbert
60c2d113b8
Fix typo
2019-09-05 23:07:03 +09:00
Dean Herbert
0a6c42972c
Add back missing sample fallback to default skin
2019-09-05 23:01:35 +09:00
Dean Herbert
9d0151f19f
Merge pull request #5969 from peppy/skin-configuration-refactor
...
Refactor skin configuration lookups to be more flexible
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-05 17:28:37 +09:00
Dean Herbert
986ac08397
Fix pause menu keyboard navigation being affected by initial cu… ( #6002 )
...
Fix pause menu keyboard navigation being affected by initial cursor hover
2019-09-05 17:27:48 +09:00
smoogipoo
90985b6af6
Add missing license header
2019-09-05 17:01:14 +09:00
Dan Balasescu
f729282c73
Merge branch 'master' into skin-configuration-refactor
2019-09-05 16:56:05 +09:00
Dean Herbert
3c1a95d486
Don't redraw certain buffered containers on scale change ( #5987 )
...
Don't redraw certain buffered containers on scale change
2019-09-05 16:54:16 +09:00
Dean Herbert
696802e674
Don't use in music player for now
2019-09-05 16:52:53 +09:00
smoogipoo
bda21998c4
Add helper method to make direct casts be used
2019-09-05 16:48:56 +09:00
Dean Herbert
174f8ddb31
Remove incorrect usages
2019-09-05 16:37:47 +09:00
Dean Herbert
55c6feab64
Update framework
2019-09-05 16:33:14 +09:00
Dean Herbert
a1d7291ffa
Fix pause menu keyboard navigation being affected by initial cursor hover
2019-09-05 16:31:10 +09:00
smoogipoo
99579255ad
Force glowing sprite text to never redraw
2019-09-05 14:41:02 +09:00
Dean Herbert
c0bcbfd892
Merge branch 'master'
...
Conflicts:
osu.Game.Tests/Visual/Gameplay/TestSceneSkinnableDrawable.cs
2019-09-05 14:40:30 +09:00
smoogipoo
2e6af84ca8
Don't redraw leaderboard scores
2019-09-05 14:39:02 +09:00
Dean Herbert
4df6bd5477
Merge branch 'master' into use-dummy-api-for-overall-tests
2019-09-05 14:27:01 +09:00
Dean Herbert
2e6efebb17
Fix storyboard samples not stopping on exit ( #5972 )
...
Fix storyboard samples not stopping on exit
2019-09-05 14:18:20 +09:00
Dean Herbert
2c871c52f1
Add automatic resource mapping for rulesets to their own dll ( #5988 )
...
Add automatic resource mapping for rulesets to their own dll
2019-09-05 14:18:12 +09:00
Dean Herbert
c8f8141e9f
Fix tests crashing if a ruleset doesn't provide a NoFail mod ( #5989 )
...
Fix tests crashing if a ruleset doesn't provide a NoFail mod
2019-09-05 14:18:03 +09:00
Dean Herbert
29520dc120
Merge pull request #5990 from peppy/fix-unavailable-rulesets
...
Fix unavailable rulesets crashing at song select
2019-09-05 14:17:55 +09:00
Dean Herbert
42829b4fe7
Fix databased config save performance ( #5994 )
...
Fix databased config save performance
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-05 14:17:44 +09:00
smoogipoo
070a005294
Add braces to lock()
...
Personal preference, I want to be sure that everything is wrapped correctly.
2019-09-05 13:37:11 +09:00
smoogipoo
d40129aabe
Remove unnecessary count check
2019-09-05 13:36:37 +09:00
iiSaLMaN
1b0123a60c
Set beatmap of leaderboard to null if NoBeatmapsAvailable is selected
2019-09-05 05:56:52 +03:00
iiSaLMaN
a1c580f27e
Create "none selected" placeholder state
2019-09-05 05:56:21 +03:00
Dean Herbert
afac512a1b
Fix databased config save performance
...
Adds proper save debounce logic. Closes #5991 .
2019-09-05 02:12:17 +09:00
Dean Herbert
50de4d1a3a
Remove PrivateAssets changes for now
2019-09-05 01:11:53 +09:00
Dean Herbert
8e8f33ec7b
Remove null hinting for now
2019-09-04 21:35:59 +09:00
Dean Herbert
6197c7fd31
Add automatic resource mapping for rulesets to their own dll
2019-09-04 20:29:28 +09:00
Dean Herbert
c59a2bf9bb
Fix tests crashing if a ruleset doesn't provide a NoFail mod
2019-09-04 20:29:10 +09:00
Dean Herbert
b80a8296cd
Fix unavailable rulesets crashing at song select
2019-09-04 20:28:52 +09:00
smoogipoo
a87a1e6031
Don't redraw certain buffered containers on scale change
2019-09-04 19:38:12 +09:00
smoogipoo
07f662071d
Remove judgementOccurred
2019-09-04 18:14:55 +09:00
Dean Herbert
8ea82123e4
Fix nullref on test disposal
2019-09-04 15:59:09 +09:00
Dean Herbert
69b9d70a35
Add minimal configuration to support nuget package creation
2019-09-04 15:56:18 +09:00
Dan Balasescu
1aead3cda8
Merge branch 'master' into brace-escaping-in-links
2019-09-04 13:57:39 +09:00
Dean Herbert
2983918f71
Merge remote-tracking branch 'upstream/master' into skin-configuration-refactor
2019-09-04 13:40:41 +09:00
Dean Herbert
f655cd4516
Fix parsing of null configuration elements
2019-09-04 13:30:46 +09:00
Dean Herbert
04c2c33c64
Allow LegacySkin to be constructed with all nulls
2019-09-04 13:29:55 +09:00
dependabot-preview[bot]
9edfe6800f
Bump ppy.osu.Game.Resources from 2019.903.1 to 2019.904.0
...
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources ) from 2019.903.1 to 2019.904.0.
- [Release notes](https://github.com/ppy/osu-resources/releases )
- [Commits](https://github.com/ppy/osu-resources/compare/2019.903.1...2019.904.0 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-04 04:20:46 +00:00
Dan Balasescu
c88a5306aa
Merge branch 'master' into handle-click-event
2019-09-04 12:38:48 +09:00
Dean Herbert
4c563232d6
HoverClickSounds should handle click event instead of MouseUp
2019-09-04 11:37:19 +09:00
Dean Herbert
1802d2efaf
Merge remote-tracking branch 'upstream/master' into fix-gameplay-menu-button-hover-ani
2019-09-04 10:35:14 +09:00
Andrei Zavatski
04111cc3b7
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-mod-selector
2019-09-04 02:46:23 +03:00
Bartłomiej Dach
08350a1aca
Add parenthesis handling to old link format
...
Allow users to put both balanced round parentheses, as well as
unbalanced escaped ones, in old style link text. The implementation
is the same as for Markdown and new style links, except for swapping
all instances of
\[\]
to
\(\)
for obvious reasons (different type of parenthesis requiring escaping).
Tests also included.
2019-09-04 00:21:27 +02:00
Bartłomiej Dach
f04add6d9e
Add bracket handling to Markdown link format
...
Allow users to put both balanced brackets, as well as unbalanced
escaped ones, in Markdown link text. The implementation is the exact
same as in the case of new format links.
For completion's sake, tests also included.
2019-09-04 00:07:00 +02:00
Bartłomiej Dach
24d4f0372c
Refactor link parsing regexes to use named groups
...
For the sake of readability, consistency and to make further changes
easier, introduce named groups (?<text>) and (?<url>) to all link
parsing regexes which have parts containing the desired link text
and (optionally) URL.
The introduction of the named groups additionally simplifies
handleMatches() and makes all calls to it consistent.
2019-09-04 00:06:52 +02:00
Bartłomiej Dach
a8f16503e2
Add backslash escaping to new link format
...
For users to be able to add square brackets inside of links using
the new format, the regular expression used for parsing those links
contained a balancing group, which can be used for matching pairs
of tokens (in this case, opening and closing brackets, in that order).
However, this means that users could not post links with unmatched
brackets inside of them (ie. ones that contain single brackets, or
a closing bracket and then an opening one). Allow for escaping opening
and closing brackets using the backslash character.
The change substitutes this old fragment of the regex in the display
text group:
[^\[\]]* // any character other than closing/opening bracket
for this one:
(((?<=\\)[\[\]])|[^\[\]])*
The second pattern in the alternative remains the same; the first one
performs the escaping, as follows:
(
(?<=\\) // positive lookbehind expression:
// this match will succeed, if the next expression
// is preceded by a single backslash
[\[\]] // either an opening or closing brace
)
Since the entire display group is matched, unfortunately the lookbehind
expression does not actually strip the backslashes, so they are
manually stripped in handleMatches.
As demonstrated in the unit tests attached, this also allows balanced
brackets to be mixed with escaped ones.
2019-09-03 23:18:39 +02:00
Dean Herbert
53fe290ef3
Merge branch 'master' into back-button-part-2
2019-09-03 19:44:30 +09:00
Dean Herbert
4b2cb8854e
Fix storyboard samples not stopping on exit
2019-09-03 19:28:10 +09:00
Dean Herbert
e98059267d
Improve xmldoc
2019-09-03 19:21:24 +09:00
Dean Herbert
299d528654
Simplify implementation
2019-09-03 19:20:23 +09:00
Dean Herbert
e88965b433
Merge remote-tracking branch 'upstream/master' into consistent-mod-button-sounds
2019-09-03 19:18:59 +09:00
Dean Herbert
609adf4b59
Fix catch catcher lookups ( #5964 )
...
Fix catch catcher lookups
Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-09-03 19:08:49 +09:00
Dean Herbert
f58ca82398
Don't include section for now
2019-09-03 18:56:01 +09:00
Dean Herbert
312e12e3b4
Add spacing to difficulty icons on direct panels ( #5957 )
...
Add spacing to difficulty icons on direct panels
2019-09-03 18:44:58 +09:00
Dean Herbert
858828d4ef
Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Game.Resources-2019.903.1' into fix-catch-catcher
2019-09-03 18:31:19 +09:00
Dean Herbert
002de80c30
Add xmldoc to ISkin
2019-09-03 18:30:22 +09:00
dependabot-preview[bot]
352fd3efda
Bump ppy.osu.Game.Resources from 2019.903.0 to 2019.903.1
...
Bumps [ppy.osu.Game.Resources](https://github.com/ppy/osu-resources ) from 2019.903.0 to 2019.903.1.
- [Release notes](https://github.com/ppy/osu-resources/releases )
- [Commits](https://github.com/ppy/osu-resources/compare/2019.903.0...2019.903.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-03 09:18:24 +00:00
Dean Herbert
097012dc95
Move slider ball colouring to DefaultLegacySkin for now
2019-09-03 18:05:16 +09:00
Dean Herbert
bebc3309ce
Refactor skin configuration to be infinitely extensible
2019-09-03 17:57:34 +09:00
Dan Balasescu
b7f1efbf38
Merge branch 'master' into center-icon-and-text-correctly
2019-09-03 14:51:59 +09:00
Dean Herbert
d1cdf49dd5
Revert SkinnableSprite lookups to old behaviour
2019-09-03 14:21:54 +09:00
Dean Herbert
05ed9d3802
Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements
2019-09-03 13:07:58 +09:00
Dean Herbert
4cad55cee6
Move hit windows lookup to DrawableRuleset
2019-09-03 13:05:03 +09:00
Dean Herbert
444419b2e6
Update resources
2019-09-03 12:04:49 +09:00
Dean Herbert
4a8bdbd014
Merge remote-tracking branch 'upstream/master' into play-to-gameplay
2019-09-03 12:04:46 +09:00
Dean Herbert
0261456d5a
Merge branch 'master' into play-to-gameplay
2019-09-03 11:42:15 +09:00
smoogipoo
eab06995d0
Add some whitespace
2019-09-03 11:37:56 +09:00
smoogipoo
ec8726e163
Merge remote-tracking branch 'origin/master' into background-beat
2019-09-03 11:35:20 +09:00
jorolf
3b769128a8
Add a 60bpm beat when no beatmap is playing
2019-09-03 00:57:29 +02:00
iiSaLMaN
de6dba9716
Use float type for chat overlay height
2019-09-03 01:50:52 +03:00
iiSaLMaN
cb55159b28
Use float types for cursor sizes
2019-09-03 01:28:51 +03:00
Joehu
ce446826e8
Match web's max diff icon number
2019-09-02 11:00:12 -07:00
Joehu
5d3f3b7cc2
Add spacing to diff icons on direct panels
2019-09-02 10:59:43 -07:00
Joehu
6ca17bdfd5
Center icon and text using anchor and origin instead of margin
2019-09-02 10:42:21 -07:00
Bartłomiej Dach
53c254c6a5
Replace Array.IndexOf() with Contains()
2019-09-02 19:01:36 +02:00
Dean Herbert
09097f7680
Merge branch 'master' into iskincomponent
2019-09-02 22:38:57 +09:00
Dean Herbert
91e3eeb1c0
Merge branch 'master' into beatmap-mod-selector
2019-09-02 21:35:42 +09:00
Dean Herbert
3443a9517f
Merge pull request #5953 from peppy/fix-direct-panel-unbind-nullref
...
Fix potential null reference on DirectPanel unbind
2019-09-02 21:35:17 +09:00
Dean Herbert
1e7528c2b3
Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements
2019-09-02 19:13:00 +09:00
Dean Herbert
b460f76fa6
Adjust file spacing slightly
2019-09-02 19:01:43 +09:00
Dean Herbert
0bfe4650c3
Early return if no change occurred in looping value
2019-09-02 19:01:17 +09:00
Dean Herbert
f08b523abf
Name tuple items
2019-09-02 18:20:30 +09:00
Dean Herbert
9c53430a0f
Only initialise when required
2019-09-02 18:18:59 +09:00
Dean Herbert
eaeecfb300
Merge remote-tracking branch 'upstream/master' into add-adjustment-function-for-skinnable-sound
2019-09-02 18:15:17 +09:00
smoogipoo
f20e07136a
Add attribute to catch potential future nullrefs
2019-09-02 17:48:41 +09:00
Dean Herbert
be5baef386
Merge pull request #5778 from EVAST9919/kudosu-info
...
Add kudosu history to UserProfileOverlay
2019-09-02 17:22:53 +09:00
smoogipoo
f6102b4d92
Adjust xmldoc
2019-09-02 17:15:36 +09:00
smoogipoo
0c73c5acf3
Expose full hitobject rather than hit windows
2019-09-02 17:14:40 +09:00
Dean Herbert
841da7d691
Fix potential null reference on DirectPanel unbind
2019-09-02 17:12:32 +09:00
Dean Herbert
d21d68b36c
Refactor to match web implementation 1:1
2019-09-02 17:04:38 +09:00
smoogipoo
f2bdf94a1d
Add HitWindows to JudgementResult to indicate timing errors
2019-09-02 16:28:14 +09:00
smoogipoo
0a89603e79
Fix hit error potentially not displaying with null hitwindows
2019-09-02 16:07:16 +09:00
Dean Herbert
0985b1679f
Move enum to response class
2019-09-02 15:57:55 +09:00
Dean Herbert
3d551b08a9
Rename legacy actions
2019-09-02 15:57:23 +09:00
Dean Herbert
da45070373
Group common prefixes together
2019-09-02 15:44:21 +09:00
Dean Herbert
c06908adf7
Fix spacing specifications
2019-09-02 15:37:38 +09:00
Dean Herbert
13fadec6ec
Merge remote-tracking branch 'upstream/master' into kudosu-info
2019-09-02 15:25:41 +09:00
Dan Balasescu
daa2007b41
Merge branch 'master' into fix-switching-ruleset-unpauses-beatmap
2019-09-02 15:24:01 +09:00
Dean Herbert
e1e4c00a15
Merge branch 'master' into improve-scrolling-ruleset-performance
2019-09-02 15:09:48 +09:00
smoogipoo
d74e1b9b64
Remove from dictionary on Remove()
2019-09-02 15:06:43 +09:00
smoogipoo
8f8d35bd15
Delay initial hitobject state computation
2019-09-02 15:06:34 +09:00
Dean Herbert
f9fcf1562f
Merge remote-tracking branch 'upstream/master' into iskincomponent
2019-09-02 14:21:02 +09:00
Dean Herbert
81e8290caf
Merge pull request #5334 from stanriders/beatmapset-genre-language
...
Add genre and language sections to beatmapset overlay
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-09-02 14:16:55 +09:00
Dean Herbert
78f753d919
Merge pull request #5949 from smoogipoo/fix-swell-timeoffset
...
Fix taiko swell tick judgements having non-zero time offsets
2019-09-02 13:46:37 +09:00
Dean Herbert
043034a6ce
Merge remote-tracking branch 'upstream/master' into beatmapset-genre-language
2019-09-02 13:45:25 +09:00
Dean Herbert
d4c12881f5
Remove unnecessary over-complication and fix transitions
2019-09-02 13:45:13 +09:00
Dean Herbert
6603cbd74d
No language doesn't mean "Other"
2019-09-02 13:41:14 +09:00
smoogipoo
fc668d8a74
Move autoplay mod to a less overridable location
2019-09-02 13:24:39 +09:00
smoogipoo
2945fef62d
Expose HasCompleted from ScoreProcessor
2019-09-02 13:04:30 +09:00
smoogipoo
cad68bb82f
Add autoplay helper property
2019-09-02 12:54:59 +09:00
Dean Herbert
e479be3fba
Merge pull request #5894 from smoogipoo/accessible-beatdivisor-colours
...
Move beat divisor colour retrieval to BindableBeatDivisor
2019-09-02 12:41:19 +09:00
Dan Balasescu
31645a5834
Merge branch 'master' into channel-topic-serach
2019-09-02 12:07:11 +09:00
Dean Herbert
7ca51d3866
Fix resume overlay being drawn below cursor
...
Closes #5905 .
2019-09-02 11:20:55 +09:00
Bartłomiej Dach
fc48b190fe
Fix inaccurate xmldoc
2019-09-01 13:32:53 +02:00
Bartłomiej Dach
c4dc34eefd
Consolidate HoverClickSounds constructors
...
As suggested in review, merge both HoverClickSounds constructors into
one accepting optional arguments. Due to existing usages the parameter
is added as second and supplied by name in ModButton.
2019-09-01 13:10:11 +02:00
Dean Herbert
d1eafafa51
Allow searching channels by topics
...
Closes #5939
2019-09-01 19:57:12 +09:00
Dean Herbert
f182fb158c
Fix some spelling mistakes on code comments ( #5927 )
...
Fix some spelling mistakes on code comments
2019-09-01 13:32:56 +09:00
iiSaLMaN
a155814bc4
Implement instant movement properly
2019-09-01 06:07:25 +03:00
iiSaLMaN
7d955839be
Instantly move rank graph tooltip
2019-09-01 04:22:24 +03:00
iiSaLMaN
aff4dab9aa
Ensure playing track of beatmap selected only if a track change occurred
2019-09-01 03:17:55 +03:00
Bartłomiej Dach
658e0edc3e
Handle other button clicks in HoverClickSounds
...
As suggested in review, remove previously introduced HoverMouseUpSounds
and instead change effect playing logic in HoverClickSounds by moving it
out of OnClick() to OnMouseUp().
Users of the class can either use the existing constructor to play
the effect only on left click or use the newly introduced constructor
with the MouseButton[] parameter to specify which button clicks should
trigger the sound.
2019-08-31 20:16:16 +02:00
Bartłomiej Dach
a1c72db5f6
Fix inconsistent sound effects on mod buttons
...
Because HoverClickSounds.OnClick() does not fire upon right clicking
on mod buttons, the sound effects that play on left and right click
were inconsistent. Introduce HoverMouseUpSounds drawable that allows
to play the click sound effect upon mouse up events for an arbitrary
set of mouse buttons and use it on mod buttons.
2019-08-31 17:01:12 +02:00
pi1024e
5695bb670e
change back to queuing
2019-08-31 10:55:05 -04:00
pi1024e
1b4ae5a4a4
Spelling fixes
2019-08-31 10:55:05 -04:00
Andrei Zavatski
94512fea8e
Apply naming suggestions
2019-08-31 16:20:33 +03:00
Andrei Zavatski
d2f7a653a8
Fix nullref
2019-08-31 16:10:07 +03:00
Andrei Zavatski
d9beee926a
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video
2019-08-31 15:54:28 +03:00
Dean Herbert
691b89ae19
Merge pull request #5911 from peppy/fix-skin-configuration-fallback
...
Fix ruleset skins incorrectly providing configuration defaults
2019-08-31 21:50:14 +09:00
Andrei Zavatski
c10d2302dc
Remove video property from migrations
2019-08-31 15:49:57 +03:00
Andrei Zavatski
28b19e8d54
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video
2019-08-31 15:49:21 +03:00
smoogipoo
cbbc6aad6e
Make method static
2019-08-31 21:32:02 +09:00
Dean Herbert
d2a3e0581b
Fix legacy decoder using wrong configuration
2019-08-31 13:27:03 +09:00
Dean Herbert
12eeec36fc
Fix ruleset skins incorrectly providing configuration defaults
2019-08-31 12:33:29 +09:00
Dean Herbert
1ddf292ad6
Fix vertical alignment of hit error display ticks
...
Wasn't correctly centered before.
2019-08-31 12:20:50 +09:00
Andrei Zavatski
d4291556ee
Remove unused using
2019-08-31 02:57:14 +03:00
Andrei Zavatski
fd958ec1ab
Remove unused property accessor
2019-08-31 02:56:41 +03:00
Andrei Zavatski
fa3591e5ec
Add setting to turn on/off the video
2019-08-31 00:42:20 +03:00
Andrei Zavatski
5dd688a51b
Fix video doesn't use gameplay clock
2019-08-31 00:09:23 +03:00
Andrei Zavatski
d55be4d59c
Implement DimmableVideo component
2019-08-30 23:48:38 +03:00
Andrei Zavatski
58a0b4e19b
Add basic layout for player
2019-08-30 23:19:55 +03:00
Andrei Zavatski
6e5cb8a318
implement video parsing
2019-08-30 23:19:34 +03:00
Dean Herbert
8f5dc06d55
Merge remote-tracking branch 'upstream/master' into accuracy-bar
2019-08-30 20:18:25 +09:00
Dean Herbert
f1db6c7039
Fix likely nullref
2019-08-30 20:18:21 +09:00
smoogipoo
fc813347ac
Make JudgementLine private
2019-08-30 19:54:36 +09:00
smoogipoo
dfccc60361
Reorder HitErrorDisplay
2019-08-30 19:53:38 +09:00
smoogipoo
fab12fa9cd
Centre align the icons
...
Seems to look better this way.
2019-08-30 19:53:38 +09:00
Dean Herbert
665fc95d49
Handle no hitobjects / no hitwindows (osu!catch)
2019-08-30 19:37:20 +09:00
Dean Herbert
394208afc5
Merge remote-tracking branch 'upstream/master' into accuracy-bar
2019-08-30 19:27:35 +09:00
Dan Balasescu
ff599ba623
Merge branch 'master' into add-ruleset-legacy-skin
2019-08-30 19:23:34 +09:00
Dean Herbert
80671cefd7
Final visual polish
2019-08-30 19:14:07 +09:00
Dean Herbert
c3abf0ccb7
Improve visuals
2019-08-30 18:50:38 +09:00
dependabot-preview[bot]
171f88da40
Bump ppy.osu.Framework from 2019.830.0 to 2019.830.1
...
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework ) from 2019.830.0 to 2019.830.1.
- [Release notes](https://github.com/ppy/osu-framework/releases )
- [Commits](https://github.com/ppy/osu-framework/compare/2019.830.0...2019.830.1 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-08-30 09:47:18 +00:00
Dean Herbert
8fc177b743
Fix namespacing and hitwindow source
2019-08-30 18:46:42 +09:00
Dean Herbert
741bd0a5cf
Fix incorrect colour sizes and simplify alignment specification
2019-08-30 18:35:17 +09:00
smoogipoo
40729356fa
Move beat divisor colour retrieval to BindableBeatDivisor
2019-08-30 17:34:58 +09:00
Dean Herbert
54696eef39
Reverse display, add animation and reduce width
2019-08-30 17:06:23 +09:00
Dean Herbert
a73d672c2f
Tidy up judgement line logic (and fix it displaying at the wrong place)
2019-08-30 16:40:39 +09:00
Andrei Zavatski
72dbeaec16
Fix the comment
2019-08-30 10:26:11 +03:00
Andrei Zavatski
71c844facd
Remove unwanted spacings
2019-08-30 10:22:49 +03:00
Andrei Zavatski
b03b520818
Move Absing from the APIKudosuHistory
2019-08-30 10:13:21 +03:00
Andrei Zavatski
b7a75ef5e1
Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info
2019-08-30 10:09:00 +03:00
Dean Herbert
6640161bc1
Simplify event propagation
2019-08-30 15:51:36 +09:00
Dean Herbert
bdbfa7bd2f
Fix class naming
2019-08-30 15:32:47 +09:00
Dean Herbert
3aa2ece49b
Merge branch 'iskincomponent' into play-to-gameplay
2019-08-30 15:29:55 +09:00
Dean Herbert
fe90e194e3
Remove redundant qualifier
2019-08-30 15:29:44 +09:00
Dean Herbert
835ee0aa2f
Code quality fixes
2019-08-30 15:29:13 +09:00
Dean Herbert
1d77e3764d
Merge branch 'master' into accuracy-bar
2019-08-30 15:21:32 +09:00
Dean Herbert
70e417533f
Update naming
2019-08-30 15:13:29 +09:00
Dean Herbert
a7c94c3883
Simplify hit result lookups
2019-08-30 15:12:03 +09:00
Dean Herbert
a15828ab25
Introduce the concept of SkinComponents
...
Removes reliance on string lookups and better defines elements for introduction into database
2019-08-30 14:55:52 +09:00
Dean Herbert
8f9fe99237
Move SliderFollowCircle implementation
2019-08-30 14:40:36 +09:00
Dean Herbert
71192791d5
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
2019-08-30 14:12:56 +09:00
Dean Herbert
c389a5c798
Move remaining osu-specific implementations to OsuLegacySkin
2019-08-30 13:42:29 +09:00
Dean Herbert
7bba8ca14b
Split out nested classes
2019-08-30 13:04:11 +09:00
Dean Herbert
84e4748268
Remove duplicate getAnimation function and improve namespacing
2019-08-30 12:59:58 +09:00
Dean Herbert
dc1046bf0c
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
2019-08-30 12:53:05 +09:00
Dean Herbert
9c622680e3
Update framework
2019-08-30 12:35:53 +09:00
Dean Herbert
8fe37d0c43
Update resources
2019-08-30 12:35:44 +09:00
Dean Herbert
d17cfe20c2
Merge remote-tracking branch 'upstream/master' into add-legacy-default
2019-08-30 11:54:49 +09:00
Dean Herbert
bfbec067b1
Remove remnants of user skin PR
2019-08-30 11:54:36 +09:00
Dean Herbert
3f500131d4
Add basic xmldoc
2019-08-30 11:33:50 +09:00
iiSaLMaN
06224a7d4e
Fix build issue
2019-08-29 15:38:33 +03:00
iiSaLMaN
ec6a40af33
Add adjustments on channel creation if there is
2019-08-29 15:32:21 +03:00
smoogipoo
ae0a5504d7
Revert unnecessary change
2019-08-29 19:43:33 +09:00
smoogipoo
6641811125
Add EditorWorkingBeatmap for reuse of the playable beatmap
2019-08-29 19:41:12 +09:00
smoogipoo
6ab2b20c70
Add an interface for working beatmaps
2019-08-29 19:38:44 +09:00
StanR
c1c1c7874b
Nullcheck
2019-08-29 13:25:05 +03:00
StanR
68ee7346b2
Remove usings
2019-08-29 12:49:44 +03:00
StanR
d303083179
Update to match api
2019-08-29 12:29:31 +03:00
Dan Balasescu
d8a48a37d1
Merge branch 'master' into editor-refactor
2019-08-29 18:22:42 +09:00
smoogipoo
714ee312da
Rename DrawableEditRuleset -> DrawableEditRulesetWrapper
2019-08-29 18:20:43 +09:00
Dean Herbert
98626018fd
Encapsulate editor hitobject additions/removals ( #5878 )
...
Encapsulate editor hitobject additions/removals
2019-08-29 18:20:24 +09:00
smoogipoo
87e28ab1f9
Remove non-generic DrawableEditRuleset
2019-08-29 18:12:29 +09:00
smoogipoo
59296d12f3
Refactor HitObjectComposer
2019-08-29 18:02:50 +09:00
smoogipoo
0fbdcabb6f
Re-use a single beatmap processor
2019-08-29 17:21:52 +09:00
smoogipoo
b40143cb73
Remove unnecessary comment
2019-08-29 17:18:34 +09:00
Dean Herbert
40c1c6072e
Add "osu!classic" as a bundled skin choice
2019-08-29 16:39:42 +09:00
smoogipoo
b04a8ae856
Add xmldocs
2019-08-29 16:31:43 +09:00
smoogipoo
dad0fa2dca
Bind disposal
2019-08-29 16:31:40 +09:00
smoogipoo
5db813b7a4
Add secondary interface for further abstraction
2019-08-29 16:26:39 +09:00
smoogipoo
7927b684d3
Hook up + use editor beatmap
2019-08-29 16:06:40 +09:00
smoogipoo
840f224619
Remove typed events to reduce complexity
2019-08-29 16:05:44 +09:00
StanR
3347ee8170
Merge branch 'master' into beatmapset-genre-language
2019-08-29 09:57:53 +03:00
smoogipoo
6949c96aaa
Add initial EditorBeatmap structure
2019-08-29 15:17:27 +09:00
Dean Herbert
03a4acaf4c
Fix drags outside of overlay container bounds not hiding overlay
2019-08-29 12:07:58 +09:00
Joehu
73fd3cf03c
Fix gameplay menu button initial hover animation
2019-08-28 19:00:01 -07:00
Dean Herbert
6295fb4171
Merge remote-tracking branch 'upstream/master' into relative-beat-lengths
2019-08-28 22:11:27 +09:00
Dean Herbert
c6e757fdae
Remove redundant qualifier
2019-08-28 22:11:23 +09:00
Dean Herbert
3c03d36694
Merge pull request #5530 from nyquillerium/humanizer-fallback
...
Add a fallback for humanizer localization lookup failures
2019-08-28 21:45:01 +09:00
iiSaLMaN
3d62003382
Add null check
2019-08-28 15:39:45 +03:00
Dean Herbert
1597cf874e
Merge branch 'master' into relative-beat-lengths
2019-08-28 20:26:20 +09:00
Dean Herbert
720908ba22
Merge pull request #5865 from peppy/fix-osu-hitobject-fade-in
...
Fix osu! approach circles fading in too late
2019-08-28 20:25:49 +09:00
Dean Herbert
f6ad95018a
Centralise default beat length specification
2019-08-28 20:22:16 +09:00
Dean Herbert
ecfcbe3723
Merge remote-tracking branch 'upstream/master' into relative-beat-lengths
2019-08-28 20:21:56 +09:00
smoogipoo
348d88846d
Add IBeatmap<T> interface for typed hitobject retrieval
2019-08-28 20:19:22 +09:00
Dean Herbert
dfdf3f5e96
Merge remote-tracking branch 'upstream/master' into humanizer-fallback
2019-08-28 20:15:32 +09:00
Dean Herbert
c7e20b34ba
Cleanup
2019-08-28 20:15:28 +09:00
Dean Herbert
01aede3e29
Add comprehensive skin fallback integration testing
2019-08-28 19:57:17 +09:00
iiSaLMaN
2f3fb8cf88
Add Stop + RemoveAdjustment functions
2019-08-28 13:10:11 +03:00
iiSaLMaN
cb8fe89b8b
Allow setting looping to existing channels
2019-08-28 13:09:53 +03:00
iiSaLMaN
d1cbd11d28
Merge remote-tracking branch 'upstream/master' into add-adjustment-function-for-skinnable-sound
2019-08-28 13:09:07 +03:00
Dean Herbert
4c2a6b755f
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
2019-08-28 18:44:23 +09:00
Dean Herbert
9a98f39f06
Share logic with other rulesets (and make default)
2019-08-28 18:12:47 +09:00
Dean Herbert
bb22c2d6e4
Tidy up text construction
2019-08-28 17:29:18 +09:00
Dean Herbert
b1f523dae3
Merge remote-tracking branch 'upstream/master' into kudosu-info
2019-08-28 17:13:57 +09:00
Dean Herbert
fcf770c744
Merge branch 'master' into update-framework
2019-08-28 17:04:44 +09:00
Dean Herbert
70da25cfca
Update framework
2019-08-28 17:03:54 +09:00
Dean Herbert
7ea55a5cdd
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
2019-08-28 16:36:20 +09:00
Dean Herbert
bef44b8e58
item -> model
2019-08-28 13:31:12 +09:00
Dean Herbert
3942c83c18
Simplify schedule layout
2019-08-28 13:28:57 +09:00
Dean Herbert
27633c8dbd
T -> TModel
2019-08-28 13:28:21 +09:00
Dean Herbert
f18b5a3c02
Remove "AllowCreate" function by instead handling nulls
2019-08-28 13:27:44 +09:00
Dean Herbert
c4aaab20c7
Merge remote-tracking branch 'upstream/master' into simplify-paginated-container
2019-08-28 13:15:57 +09:00
Dean Herbert
1aa09ff05c
Merge pull request #5795 from iiSaLMaN/allow-fallback-to-samples-without-bank
...
Try retrieving samples without bank names
2019-08-28 13:12:51 +09:00
Andrei Zavatski
b6b4173a84
Remove unused using
2019-08-28 01:27:16 +03:00
Andrei Zavatski
6aef05f5d8
Remove useless function
2019-08-28 01:16:55 +03:00
Andrei Zavatski
2d7024ffd9
Use CancellationTokenSource to avoid unwanted panels creation
2019-08-28 01:14:35 +03:00
Andrei Zavatski
9b1e8cf48b
Use CancelDelayedTasks instead of private ScheduledDelegate
2019-08-28 01:03:51 +03:00
Andrei Zavatski
11df8c5576
Remove a lot of loading animation calls
2019-08-28 01:02:26 +03:00
Andrei Zavatski
f9841369e8
Merge remote-tracking branch 'refs/remotes/ppy/master' into friends-sorting
2019-08-27 22:22:28 +03:00
Dean Herbert
4add1727b7
Fix hitsounds not updating immediately after switching skins
2019-08-28 03:25:57 +09:00
iiSaLMaN
18431a42e6
Resolve merge conflicts
2019-08-27 20:06:17 +03:00
iiSaLMaN
4ef991b973
Loop over lookup names on default-samples retrieval
2019-08-27 19:42:17 +03:00
Andrei Zavatski
5fd43d42f4
CI fixes
2019-08-27 16:09:37 +03:00
Andrei Zavatski
9a383eee1a
Add AllowCreate function
2019-08-27 15:58:57 +03:00
Andrei Zavatski
22ee7db805
Refactor PaginatedContainer to avoid code duplication
2019-08-27 15:47:37 +03:00
Andrei Zavatski
ed827d514f
Add comments
2019-08-27 15:36:08 +03:00
Andrei Zavatski
f49b58c102
Simplify text building
2019-08-27 15:30:41 +03:00
Andrei Zavatski
7f0a4fbef9
Merge remote-tracking branch 'refs/remotes/ppy/master' into kudosu-info
2019-08-27 15:11:55 +03:00
Dean Herbert
b59973c712
Update in line with framework changes
2019-08-27 18:43:58 +09:00
Dean Herbert
0fba446c01
Obsolete legacy UpdateState() method ( #5853 )
...
Obsolete legacy UpdateState() method
2019-08-27 18:34:16 +09:00
Dean Herbert
7ccc409df7
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
2019-08-27 18:27:26 +09:00
Dean Herbert
7aeeb65ae7
Tidy up Player's container loading logic
...
Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).
2019-08-27 18:27:21 +09:00
Dean Herbert
0ea10a4922
Fix skin sample reading failing
2019-08-27 17:18:32 +09:00
smoogipoo
9e926d44c0
Obsolete legacy UpdateState() method
2019-08-27 16:09:47 +09:00
Dean Herbert
66223b9954
Merge branch 'master' into allow-fallback-to-samples-without-bank
2019-08-27 14:44:16 +09:00
Dean Herbert
7885c79467
Make bindables private
2019-08-27 14:31:34 +09:00
Dean Herbert
69145eb83a
Merge branch 'master' into select-filters-persistence
2019-08-27 14:12:59 +09:00
smoogipoo
6368189d46
Refactor
2019-08-27 11:59:25 +09:00
Andrei Zavatski
9223a1ba8a
Simplify sorting logic
2019-08-27 05:03:47 +03:00
Dean Herbert
6aab7168d4
Merge branch 'master' into relative-beat-lengths
2019-08-27 10:59:52 +09:00
Andrei Zavatski
385bc6f529
Remove using and add blank lines
2019-08-27 04:11:22 +03:00
Andrei Zavatski
66b27875e0
Fix possible null exception
2019-08-27 04:00:22 +03:00
Andrei Zavatski
7cc6494482
Remove sorting by rank
...
Since it isn't working for any case currently
2019-08-27 03:54:49 +03:00
