1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-24 06:43:03 +08:00
Commit Graph

42422 Commits

Author SHA1 Message Date
Dan Balasescu
d2722f1523
Merge branch 'master' into ruleset-shaders 2021-07-07 15:44:30 +09:00
Dan Balasescu
05c4e0254b
Merge pull request #13796 from peppy/fix-skin-providing-container
Rewrite `SkinProvidingContainer`
2021-07-07 15:43:24 +09:00
smoogipoo
faf95c7161 Remove unused usings 2021-07-07 15:35:14 +09:00
Salman Ahmed
28adb43a4a Add detailed explaination for the reason of using old binding method 2021-07-07 09:26:17 +03:00
Dean Herbert
8ec82150cf
Merge pull request #13809 from peppy/fix-submission-test-timeout
Shorten test beatmap to avoid timeouts in score submission test
2021-07-07 15:25:10 +09:00
Dean Herbert
fd46d30f29
Merge pull request #13795 from ekrctb/juice-stream-selection-1
Add path visualization to juice stream selection blueprint
2021-07-07 15:24:39 +09:00
Dean Herbert
bb58a9412b
Merge branch 'master' into consume-bindable-current-factory 2021-07-07 15:16:02 +09:00
Dan Balasescu
34a867a335
Merge branch 'master' into fix-skin-providing-container 2021-07-07 15:00:35 +09:00
Dan Balasescu
a933181715
Merge pull request #13808 from peppy/update-framework
Update framework
2021-07-07 15:00:25 +09:00
Dean Herbert
35672f372a Shorten test beatmap to avoid timeouts in score submission test 2021-07-07 14:58:01 +09:00
Dean Herbert
b08fece2d4 Update framework 2021-07-07 14:30:47 +09:00
Dean Herbert
c18b8ca86c Add missing ToArray() call 2021-07-07 14:08:29 +09:00
Dean Herbert
ca791c2afa Remove unused using statement 2021-07-07 13:53:00 +09:00
Dean Herbert
35d4b12a4f Remove single local usage of AllSources 2021-07-07 13:52:52 +09:00
Dean Herbert
eb8b14a931 Reorder methods to make more sense 2021-07-07 13:51:51 +09:00
Dean Herbert
ddb1da5a66 Tidy up class (although it's not in a good state logically) 2021-07-07 13:48:35 +09:00
Bartłomiej Dach
e94e283ee4 Move shared inner classes to separate files 2021-07-06 22:11:54 +02:00
Bartłomiej Dach
f45418dde7 Replace game-side directory/file selector with framework extensions 2021-07-06 22:11:54 +02:00
Dean Herbert
523546d8b6 Use List to guarantee lookup order 2021-07-06 22:51:56 +09:00
Salman Ahmed
255f7b7b53 Add failing test scene 2021-07-06 22:44:23 +09:00
Dean Herbert
2e0155ce04
Merge pull request #13798 from smoogipoo/fix-spectate-button-tests
Fix intermittent spectate button test failures
2021-07-06 22:29:57 +09:00
Dean Herbert
12afdbdf57
Merge pull request #13791 from peppy/remove-resx-files
Remove all `.resx` files from osu project
2021-07-06 22:29:28 +09:00
Derrick Timmermans
4451598bcf
Fix remaining quality complaints 2021-07-06 15:17:19 +02:00
Derrick Timmermans
4b1b5a88fe
Add null check to supress quality errors 2021-07-06 14:39:53 +02:00
Derrick Timmermans
ffe18ebe51
Resolve build errors 2021-07-06 14:11:46 +02:00
smoogipoo
6bc0020825 Fix intermittent spectate button test failures 2021-07-06 20:28:55 +09:00
Derrick Timmermans
07d54d261a
Let selection container handle manual selection changes 2021-07-06 13:24:18 +02:00
Dean Herbert
06d2c6f0a1 Update resources 2021-07-06 19:51:57 +09:00
ekrctb
7b21d1ecf9 Fix juice stream outline disappears away when start position is outside the screen. 2021-07-06 19:50:32 +09:00
Derrick Timmermans
c5a0672277
Use IStateful<SelectionState> instead of ISelected 2021-07-06 12:07:25 +02:00
Dean Herbert
e4b436198b
Merge pull request #13797 from smoogipoo/fix-ready-button-tests
Fix intermittent ready button test failures
2021-07-06 18:36:35 +09:00
Derrick Timmermans
32ef2405c4
Use null instead of -1 2021-07-06 11:30:56 +02:00
smoogipoo
b209868d96 Fix another potential failure 2021-07-06 17:57:24 +09:00
smoogipoo
8b12ec9586 Fix intermittent ready button test failures 2021-07-06 17:52:27 +09:00
Dean Herbert
d75d67577a Fix regressed tests 2021-07-06 17:37:34 +09:00
Dean Herbert
cd4885e450 Add xmldoc and remove any question of how the intitial flow is being run 2021-07-06 17:18:45 +09:00
ekrctb
2ba3003934 Add nested fruit outlines to juice stream selection blueprint 2021-07-06 17:15:51 +09:00
ekrctb
7833a1b09a Allow FruitOutline to be used for nested hit objects 2021-07-06 17:15:27 +09:00
Dean Herbert
032c285ede Move private downwards 2021-07-06 17:07:29 +09:00
Dean Herbert
1232925f93 Make source manipulation methods protected 2021-07-06 17:06:00 +09:00
Dean Herbert
b4240d3ca4 Simplify lookups to avoid a second dictionary fetch 2021-07-06 17:04:59 +09:00
Dean Herbert
ec1224218c Localise source changed flow for better clarity 2021-07-06 16:57:19 +09:00
Dean Herbert
935fbe7cc6 Remove double fetch/binding of parent source 2021-07-06 16:51:29 +09:00
ekrctb
0fa7716ced Show path of juice stream in selection blueprint 2021-07-06 16:46:12 +09:00
ekrctb
7ef7c5148f Add ScrollingPath for visualization of the real path of a JuiceStream 2021-07-06 16:41:53 +09:00
Dean Herbert
93ef783339 Remove BindableList usage 2021-07-06 16:40:23 +09:00
Dan Balasescu
fe70b52086
Merge pull request #13793 from ekrctb/catch-hit-object-serialization
Fix copy-and-paste not working in osu!catch editor
2021-07-06 16:38:05 +09:00
Dan Balasescu
32e6c9c5d3
Merge pull request #13786 from peppy/multiplayer-test-fixes
Fix multiplayer test failures due to leaderboard load process
2021-07-06 16:33:41 +09:00
Dean Herbert
4366be5c1f
Merge pull request #13792 from peppy/fix-migration-cleanup-failure
Fix potential failure during cleanup of files in migration tests
2021-07-06 15:39:04 +09:00
ekrctb
175d666906 Use getters of OriginalX and XOffset 2021-07-06 15:32:32 +09:00