1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 17:32:54 +08:00
Commit Graph

16566 Commits

Author SHA1 Message Date
smoogipoo
fdd37dbc4b Merge remote-tracking branch 'origin/master' into cmc-rooms 2019-02-08 15:44:33 +09:00
smoogipoo
b5cc0ec8db Update framework 2019-02-08 15:44:11 +09:00
smoogipoo
5643dc2e99 Remove redundant qualifiers 2019-02-08 15:44:05 +09:00
smoogipoo
6fe1f57236 Fix crash when start button is repeatedly pressed 2019-02-08 15:39:11 +09:00
smoogipoo
99a7ccc01a Slight cleanup in multiplayer 2019-02-08 15:38:05 +09:00
smoogipoo
43240ea85e Fix playlist issues with room creation 2019-02-08 15:23:03 +09:00
smoogipoo
42cd55e0d7 Move current room to multiplayer 2019-02-08 14:57:51 +09:00
smoogipoo
7f13e3c5f7 Directly resolve the filter bindable 2019-02-08 13:02:17 +09:00
smoogipoo
990bd44ca2 Combine roommanager and roompollingcomponent 2019-02-08 13:01:10 +09:00
smoogipoo
17fdfc15d9 Fix room title in the breadcrumbs 2019-02-07 20:09:49 +09:00
smoogipoo
1c2450a95a Fix up room inspector status 2019-02-07 17:59:14 +09:00
smoogipoo
1e0135af6f Move StatusColouredContainer into a more public location 2019-02-07 17:52:40 +09:00
smoogipoo
2d61548251 Fix room name being coloured 2019-02-07 16:45:36 +09:00
Dan Balasescu
7ee8115eaa
Merge pull request #4220 from HoLLy-HaCKeR/diffcalc-proper-attributes
Use correct DifficultyAttributes where possible
2019-02-07 12:42:31 +09:00
Dan Balasescu
5b4933ca60
Merge branch 'master' into diffcalc-proper-attributes 2019-02-07 12:30:55 +09:00
Dan Balasescu
8402c4c4ef
Merge pull request #4221 from Morilli/patch-1
Fix typo in README.md
2019-02-07 12:20:26 +09:00
Moritz Bender
6e2ecd5fcc
Fix typo in README.md 2019-02-06 21:59:47 +01:00
HoLLy
ae9d5f999c Use correct DifficultyAttributes where possible 2019-02-06 21:28:42 +01:00
smoogipoo
4f86fe92ea Fix match settings not showing 2019-02-06 18:50:43 +09:00
ProgrammaticNajel
9f8e724a76 Fix background being cut off at the top of the screen (#4207)
Fix background being cut off at the top of the screen
2019-02-06 18:14:33 +09:00
smoogipoo
3207983a1c Fix current room being set to null when parted 2019-02-06 15:12:40 +09:00
smoogipoo
a9aa22c97b Remove ShadowModel requirement 2019-02-06 13:52:48 +09:00
Dan Balasescu
0d6ce3b8bb
Merge pull request #4213 from ekrctb/vscode-task-restore-fix
Fix VSCode Restore task
2019-02-06 12:12:30 +09:00
ekrctb
0e3a087ed3 Fix VSCode Restore task 2019-02-06 12:02:04 +09:00
Dan Balasescu
43d66b2e90
Merge pull request #4209 from peppy/fix-combo-color-fallbacks
Fix combo colour fallbacks when skin is not providing any
2019-02-06 11:38:59 +09:00
smoogipoo
594dffba41 Fix a few cases of missed instant invocation 2019-02-05 19:11:20 +09:00
smoogipoo
aac371ba6e Use CMC for all of multiplayer 2019-02-05 19:00:08 +09:00
Dean Herbert
5b1f111922 Rollback other fallthrough regressions 2019-02-05 18:14:43 +09:00
Dean Herbert
8ae2861ed6 Fix class name 2019-02-05 18:09:15 +09:00
Dean Herbert
a6b2e9eb0b Remove unused pieces of ini 2019-02-05 18:08:27 +09:00
Dean Herbert
2f8f4fac64 Fix combo colour fallbacks when skin is not providing any 2019-02-05 17:54:14 +09:00
smoogipoo
be51ee4ed5 Implement MultiplayerComposite, replaces RoomBindings 2019-02-05 16:14:37 +09:00
smoogipoo
d9537017c8 Use CMC in the Multiplayer screen 2019-02-05 16:03:05 +09:00
smoogipoo
37c1f5a824 Split polling logic from RoomManager, now a container 2019-02-05 15:38:19 +09:00
Dan Balasescu
e33277bd76
Merge pull request #4203 from EVAST9919/keybindings-settings-groups
Use sidebar in key bindings overlay
2019-02-05 12:11:29 +09:00
Dan Balasescu
84ab16c7c8
Merge branch 'master' into keybindings-settings-groups 2019-02-05 11:42:53 +09:00
Dean Herbert
a47023b607
Merge pull request #4205 from smoogipoo/fix-background-fade-2
Fix background not being faded correctly
2019-02-04 22:43:10 +09:00
Dean Herbert
216030fe64
Merge branch 'master' into fix-background-fade-2 2019-02-04 22:32:50 +09:00
Dan Balasescu
ea7b56c8b1
Merge pull request #4192 from UselessToucan/fix_song_rearranging_in_music_controller_playlist
Add PlaylistItemHandle.HandlePositionalInput override
2019-02-04 17:05:43 +09:00
smoogipoo
065b0c9076 Fix background not being faded correctly 2019-02-04 17:04:52 +09:00
Dan Balasescu
779477959f
Merge branch 'master' into fix_song_rearranging_in_music_controller_playlist 2019-02-04 15:39:29 +09:00
Dan Balasescu
492f26c709
Merge pull request #3992 from peppy/fix-replay-import-statistics
Fix imported replays having excess statistics
2019-02-04 15:39:19 +09:00
Dan Balasescu
40e4a3f725
Merge branch 'master' into fix-replay-import-statistics 2019-02-04 15:32:29 +09:00
Dan Balasescu
c5ef81dbc3
Merge branch 'master' into fix_song_rearranging_in_music_controller_playlist 2019-02-04 15:17:19 +09:00
Dan Balasescu
74cb5084c4
Merge pull request #4193 from qwewqa/lazer-ppcalc-sliderend-fix
Fix slider tail evaluation in osu difficulty calculator
2019-02-04 14:56:52 +09:00
Dan Balasescu
2d365fbb69
Merge branch 'master' into lazer-ppcalc-sliderend-fix 2019-02-04 14:44:38 +09:00
Kyle Chang
cf91b882c8 Fix slider tail evaluation in osu difficulty calculator
The slider tail circle was already included as a nested hit object and is judged before the end of the slider's actual duration, so using the slider end time leads to an inaccurate travel distance and end position.
2019-02-03 23:49:05 -05:00
Dean Herbert
91d875db0d Remove unused local 2019-02-04 12:56:55 +09:00
Dean Herbert
cd92dddd46 Add per-ruleset mappings 2019-02-04 12:31:05 +09:00
Dean Herbert
2d7c23dd9f Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics 2019-02-04 12:15:53 +09:00