1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 09:37:24 +08:00
Commit Graph

35511 Commits

Author SHA1 Message Date
Dean Herbert
88b3bf06e8 Merge branch 'master' into add-bundle-header 2020-12-16 13:40:15 +09:00
Dean Herbert
ef57ae6f40
Merge pull request #11127 from peppy/realtime-multiplayer
Add client-side models and interfaces required for multiplayer
2020-12-16 13:22:01 +09:00
smoogipoo
31fe28b8b3 Remove IStatefulMultiplayerClient 2020-12-16 12:32:53 +09:00
smoogipoo
4cd290af11 Split server interfaces 2020-12-16 12:31:11 +09:00
Bartłomiej Dach
f5eab1047c Merge branch 'master' into android-add-import-support 2020-12-15 21:26:12 +01:00
Bartłomiej Dach
d0668192aa Ensure stream disposal & move entire operation inside task 2020-12-15 21:25:53 +01:00
Dean Herbert
d0bcab3c98
Merge pull request #5499 from frenzibyte/ingame-leaderboard-general-implementation
Add base implementation for in-game leaderboards
2020-12-15 22:09:25 +09:00
Dean Herbert
ea6c196f81 Remove unused using statement 2020-12-15 16:03:18 +09:00
Dean Herbert
e37089af5e Further code cleanup 2020-12-15 15:44:56 +09:00
Dean Herbert
b5ab400ad7 Fix test filename not matching updated class name 2020-12-15 15:44:43 +09:00
Dean Herbert
8b68ccc0ff Rename class and move inside HUD namespace 2020-12-15 15:34:11 +09:00
Dean Herbert
dd5572b20a Remove unnecessary methods and event 2020-12-15 15:26:20 +09:00
Dean Herbert
8362ad37e3 Bring up-to-date with code changes 2020-12-15 15:22:14 +09:00
Dean Herbert
70e5d4495a
Merge branch 'master' into ingame-leaderboard-general-implementation 2020-12-15 15:14:56 +09:00
Dean Herbert
3faf7db068
Merge pull request #10882 from PercyDan54/import-screen
Add File Import screen
2020-12-15 15:03:15 +09:00
Dan Balasescu
bcb59fe425
Merge pull request #11175 from Xexxar/speedacc-rework
Change accuracy curve for speed pp awarded in the osu! ruleset
2020-12-15 14:42:35 +09:00
Dan Balasescu
865d3b5df1
Merge branch 'master' into speedacc-rework 2020-12-15 14:08:33 +09:00
Dan Balasescu
801080e06e
Merge pull request #11180 from gagahpangeran/beatmap-diff-icon
Fix beatmapset panel difficulty icon order
2020-12-15 13:58:23 +09:00
Dan Balasescu
8bdef0ff55
Code quality fix
Co-authored-by: Dean Herbert <pe@ppy.sh>
2020-12-15 13:18:41 +09:00
Gagah Pangeran
f0e6b6eaf8 sort by ruleset id first then star diff 2020-12-15 11:09:09 +07:00
Dean Herbert
10ee8ed8e8 Reorder functions and simplify transform logic 2020-12-15 13:04:11 +09:00
Dean Herbert
0d4ac2f748 Refresh view after import completes 2020-12-15 12:57:28 +09:00
Dean Herbert
db4f2d5ffb Refresh view after import succeeds 2020-12-15 12:52:45 +09:00
Dean Herbert
cafe81ab97 Further refactoring and bindable simplification 2020-12-15 12:52:38 +09:00
Dean Herbert
33f77f81f2 Disable the import button when no file is selected, rather than weird flash logic 2020-12-15 12:43:48 +09:00
Dean Herbert
cba4657021 Get handled file extensions from game itself, rather than duplicating locally 2020-12-15 12:37:41 +09:00
Dean Herbert
26fa010fed Merge branch 'master' into import-screen 2020-12-15 12:37:27 +09:00
Dean Herbert
8ec7a10580
Merge pull request #11163 from bdach/taiko-strong-state-refactor
Refactor taiko's strong state management in hitobject hierarchy
2020-12-15 12:24:22 +09:00
Dan Balasescu
48805a82f9
Merge branch 'master' into taiko-strong-state-refactor 2020-12-15 11:46:52 +09:00
Dan Balasescu
52d9864818
Merge pull request #11179 from bdach/swell-rewind-crash
Fix swells crashing on rapid seeks in editor
2020-12-15 11:21:37 +09:00
Dan Balasescu
22a6ebb7a2
Merge branch 'master' into speedacc-rework 2020-12-15 11:18:58 +09:00
Dan Balasescu
e7c90223bf
Merge pull request #11177 from bdach/bar-line-initial-state
Ensure correct initial state of taiko bar lines
2020-12-15 11:08:01 +09:00
Bartłomiej Dach
523e803440 Fix swells crashing on rapid seeks in editor 2020-12-15 00:28:00 +01:00
Bartłomiej Dach
2051f49f78 Ensure correct initial state of taiko bar lines 2020-12-14 21:58:17 +01:00
Bartłomiej Dach
512549b4ea Rename DrawableTaikoStrong{-> able}HitObject 2020-12-14 21:47:31 +01:00
Bartłomiej Dach
c5a218f7c9 Add "strongable" to user dictionary 2020-12-14 21:46:28 +01:00
Bartłomiej Dach
5af1ac1b53 Rename TaikoStrong{-> able}HitObject 2020-12-14 21:46:02 +01:00
Bartłomiej Dach
7ba04a2cc3 Merge branch 'master' into taiko-strong-state-refactor 2020-12-14 21:44:50 +01:00
Bartłomiej Dach
f9d7945a6f Remove non-functional replay import for now 2020-12-14 21:03:49 +01:00
Bartłomiej Dach
3e3be56e46 Touch up and clarify intent handling 2020-12-14 20:25:42 +01:00
Bartłomiej Dach
1f6e5f4d32 Copy archive contents to memory stream 2020-12-14 20:11:53 +01:00
Bartłomiej Dach
a323c5ce58 Use most backwards-compatible overload for query 2020-12-14 20:01:30 +01:00
Xexxar
54827d4e96 fixed low 50s count still penalizing high obj count maps 2020-12-14 12:41:24 -06:00
Xexxar
01564fd9c0 Merge branch 'master' of https://github.com/ppy/osu 2020-12-14 12:09:39 -06:00
Dean Herbert
0d9c1cb5d3 Fix issues with data serialisation 2020-12-14 18:41:24 +09:00
Dan Balasescu
c364b17141
Merge pull request #11170 from peppy/fix-load-too-fast
Fix gameplay loading too fast the first time entering a beatmap
2020-12-14 18:31:07 +09:00
Dean Herbert
38e0b4e64d Remove unused using statements 2020-12-14 18:13:32 +09:00
Dean Herbert
7bf0480848 Tidy up android-side code quality 2020-12-14 18:12:23 +09:00
Dean Herbert
c5112edd08 Add comment regarding the reasoning for encapsulating the task in another 2020-12-14 18:03:01 +09:00
Dean Herbert
f3e6c586f7 Change waitForReady back to private implementation 2020-12-14 17:59:04 +09:00