1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 10:02:55 +08:00
Commit Graph

24912 Commits

Author SHA1 Message Date
Dan Balasescu
aa2fcbb660
Merge branch 'master' into fix-key-overlay-always-shown 2019-12-20 14:47:20 +09:00
Dan Balasescu
5e898ecbfc
Merge pull request #7298 from peppy/fix-restore-default
Update RestoreDefaultValueButton when default value changes
2019-12-20 14:22:30 +09:00
Dean Herbert
11214628ad Add post-update notification for iOS users 2019-12-20 14:02:01 +09:00
Dean Herbert
de8154bc7f Update readme with new testflight link source 2019-12-20 13:59:27 +09:00
Dean Herbert
656c584503 Update RestoreDefaultValueButton when default value changes 2019-12-20 13:59:01 +09:00
Salman Ahmed
7d090d6cd9 Fix key overlay appearing regardless of the setting 2019-12-19 17:52:58 +03:00
Dean Herbert
3ac0e3ce51 Fix iOS project failing to compile 2019-12-19 23:04:53 +09:00
Dean Herbert
3bd4ba3f9f
Update framework (#7280)
Update framework
2019-12-19 20:48:45 +09:00
Dean Herbert
a3154f2f7b Update framework 2019-12-19 20:30:58 +09:00
smoogipoo
50fa6c5f77 Update score on reverts 2019-12-19 20:18:23 +09:00
smoogipoo
04c3a6f8a4 Move more properties to the base class 2019-12-19 20:18:17 +09:00
smoogipoo
76f2fb378f Separate score and health parts of ScoreProcessor 2019-12-19 20:03:14 +09:00
Dean Herbert
81e842f6b4 Fix waveform test beatmap accessing zip archive across multiple threads 2019-12-19 19:48:48 +09:00
smoogipoo
1da8cc8690 Encapsulate common logic of ScoreProcessor 2019-12-19 19:03:27 +09:00
Dan Balasescu
ed856851a1
Merge pull request #7278 from peppy/fix-score-serialisation
Fix score serialisation failing for unknown mod properties
2019-12-19 15:25:43 +09:00
Dean Herbert
b1533ae2a9 Fix score serialisation failing for unknown mod properties 2019-12-19 14:58:56 +09:00
Dean Herbert
c94c803562
Implement local sorting by name and country in SocialOverlay (#5847)
Implement local sorting by name and country in SocialOverlay

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-19 12:54:02 +09:00
Dean Herbert
fd7309551c
Refactor storyboard timeline to reduce GC / fix crashes (#7270)
Refactor storyboard timeline to reduce GC / fix crashes

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-12-19 12:02:08 +09:00
Dean Herbert
ada8efb4ab
Merge branch 'master' into fix-storyboard-crash 2019-12-19 11:44:20 +09:00
Dean Herbert
9fc3a076e9
Improve performance of storyboard loading (#7272)
Improve performance of storyboard loading
2019-12-19 11:44:12 +09:00
Dean Herbert
a46602f705 Move cancellation token construction closer to usage 2019-12-19 11:26:22 +09:00
smoogipoo
dd68106d90 Recreate panels only while loading/loaded 2019-12-19 02:21:33 +09:00
smoogipoo
007e2e80c1 Refactor to fix sorting issues 2019-12-19 02:02:57 +09:00
Dan Balasescu
37d7c984bc
Merge branch 'master' into friends-sorting 2019-12-19 01:33:03 +09:00
smoogipoo
f38853d229 Improve performance of storyboard loading 2019-12-19 00:52:50 +09:00
smoogipoo
8d6987c870 Refactor storyboard timeline to reduce GC / fix crashes 2019-12-18 23:59:48 +09:00
Dan Balasescu
1c9b27a9c9
Merge pull request #7267 from peppy/less-verbose-discord
Don't log discord connection failures
2019-12-18 23:17:00 +09:00
Dean Herbert
9ac15ef3a8 Don't log discord connection failures 2019-12-18 22:56:00 +09:00
Dan Balasescu
e968426341
Merge pull request #6990 from GSculerlor/multiplier-text
Add score multiplier on mods footer button
2019-12-18 22:11:52 +09:00
smoogipoo
2905a4418d Fix potential nullref 2019-12-18 21:30:57 +09:00
smoogipoo
cb5a35f8f9 Fix incorrect bindable valuechanged usage 2019-12-18 21:08:49 +09:00
smoogipoo
4e11fb0fd7 Merge remote-tracking branch 'refs/remotes/origin/master' into multiplier-text 2019-12-18 19:36:16 +09:00
Dean Herbert
e643f498ba
Fix editor crashing after re-ordering objects (#7250)
Fix editor crashing after re-ordering objects
2019-12-18 19:21:28 +09:00
smoogipoo
39489e2901 Merge remote-tracking branch 'refs/remotes/origin/master' into fix-editor-movement-crash 2019-12-18 18:51:56 +09:00
smoogipoo
5664ce3109 Add hitobject container regression test 2019-12-18 18:51:12 +09:00
Dean Herbert
ea661fce21
Merge branch 'master' into adjustable-map-settings 2019-12-18 18:44:11 +09:00
Dean Herbert
36172cf2bd
Merge pull request #7175 from LeNitrous/update-beatmap-settings
Display current difficulty statistics with mods applied
2019-12-18 18:43:49 +09:00
Dean Herbert
5cdc7d3b18
Merge pull request #7183 from smoogipoo/legacy-beatmap-saving
Add initial implementation of a legacy beatmap encoder
2019-12-18 18:43:14 +09:00
Dean Herbert
51a01c7006
Merge pull request #7256 from peppy/remove-ruleset-ctor-param
Remove RulesetInfo parameter from Ruleset constructor
2019-12-18 18:42:42 +09:00
Dean Herbert
06287f72f3
Merge pull request #7221 from LeNitrous/nightcore-beats
Implement backing beats for Nightcore mods
2019-12-18 18:28:16 +09:00
Dean Herbert
4ff5310473
Fix editor crashing when loading a beatmap for an unsupported r… (#7261)
Fix editor crashing when loading a beatmap for an unsupported ruleset
2019-12-18 18:16:07 +09:00
Dan Balasescu
6683460240
Merge branch 'master' into update-beatmap-settings 2019-12-18 17:59:27 +09:00
Dean Herbert
1f3e1b3085 Remove unused using 2019-12-18 17:59:07 +09:00
smoogipoo
2a128340d0 Merge remote-tracking branch 'refs/remotes/origin/master' into nightcore-beats 2019-12-18 17:58:37 +09:00
smoogipoo
d65e37d795 Fix typo 2019-12-18 17:58:29 +09:00
Dean Herbert
bf85f4affb Fix editor crashing when loading a beatmap for an unsupported ruleset 2019-12-18 17:53:26 +09:00
Dean Herbert
69f888fc49
Fix storyboard flipping potentially not having an effect (#7260)
Fix storyboard flipping potentially not having an effect
2019-12-18 17:48:41 +09:00
Dean Herbert
53d6693c89
Fix storyboard vectorscale and scale cross-polluting each other (#7259)
Fix storyboard vectorscale and scale cross-polluting each other
2019-12-18 17:41:55 +09:00
smoogipoo
8e651962c7 Fix incorrectly binding inside BDL load() 2019-12-18 17:41:30 +09:00
Dean Herbert
4befabc257 Split out complex method 2019-12-18 17:35:51 +09:00