1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 21:02:55 +08:00
Commit Graph

14478 Commits

Author SHA1 Message Date
MaxOhn
01a4c8d92b Add deflate mod to OsuRuleset.cs 2018-10-01 12:11:19 +02:00
MaxOhn
0f0ee48bfd Merge with ppy/osu master 2018-10-01 12:10:42 +02:00
Dan Balasescu
b2ad603e81
Merge pull request #3429 from Hanamuke/AR_Catch
Fix osu!catch scrolling speed
2018-10-01 18:48:56 +09:00
Hanamuke
6c1b3cf1a5 Merge remote-tracking branch 'origin/AR_Catch' into AR_Catch 2018-09-30 16:09:27 +02:00
Hanamuke
08f58047c2 Remade measurements, turns out the correction was not needed 2018-09-30 16:08:17 +02:00
Hanamuke
b983e20067 Merge branch 'master' into AR_Catch 2018-09-30 16:01:55 +02:00
MaxOhn
8b09935c37 previous commit only added scaling-up (oops), this one includes fading 2018-09-30 14:49:52 +02:00
MaxOhn
98042eb7d4 add the default fadeout-while-scaling-up to clicked objects 2018-09-30 14:46:36 +02:00
MaxOhn
cf8e6cf0ec Merge remote-tracking branch 'origin/deflate-branch' into deflate-branch 2018-09-30 14:30:57 +02:00
MaxOhn
9a5127d506 fixed object scale upon hit 2018-09-30 14:29:55 +02:00
Dean Herbert
1fe5ed5524 Update signing certificate 2018-09-29 02:00:07 +09:00
Dean Herbert
3281b7ee07
Merge pull request #3499 from peppy/update-framework
Update framework
2018-09-28 19:45:25 +09:00
Dean Herbert
862d3c4a69 Add back autojoins 2018-09-28 19:33:35 +09:00
Dean Herbert
3cacc11af1 Fix outdated API variable 2018-09-28 19:33:30 +09:00
Dean Herbert
4e9833499f
Merge pull request #3493 from smoogipoo/fix-taiko-doublehits
Fix multiple hits in the same frame pressing multiple hitobjects
2018-09-28 19:14:59 +09:00
Dean Herbert
a355d342d4
Merge branch 'master' into fix-taiko-doublehits 2018-09-28 18:57:02 +09:00
Dean Herbert
6841d5c2ec Merge remote-tracking branch 'smoogipoo/fix-beatmapinfowedge' into update-framework 2018-09-28 18:32:59 +09:00
Dean Herbert
d3eb24e70a Fix score retrieval no longer working 2018-09-28 18:29:49 +09:00
Dean Herbert
9baf587246 Bump framework again 2018-09-28 18:25:40 +09:00
Dean Herbert
e1c187b641 Merge remote-tracking branch 'origin/update-chat-api' into update-framework 2018-09-28 18:23:09 +09:00
smoogipoo
3479bfa409 Rename variable 2018-09-28 17:18:34 +09:00
Dean Herbert
d5d8a28b53 Add explanatory comment about startup channel joins 2018-09-28 10:01:25 +09:00
Dean Herbert
6a763334a1 Exit early as safety when no messages are received 2018-09-28 10:00:40 +09:00
Dean Herbert
f0b1aa7edf Fix unnecessary messages retrieval 2018-09-27 20:04:22 +09:00
Dean Herbert
a4bf21268b Merge remote-tracking branch 'upstream/master' into update-framework 2018-09-26 19:59:18 +09:00
Dean Herbert
6f3c8e9f8b Add explicit usage via attribute 2018-09-26 19:58:58 +09:00
Dean Herbert
16d74a5983
Merge pull request #3465 from plankp/patch-1
Check if object to be deleted actually exists
2018-09-26 19:53:51 +09:00
Dean Herbert
2ed7785cfc Merge remote-tracking branch 'upstream/master' into update-framework 2018-09-26 19:50:48 +09:00
Dean Herbert
80179d9095
Merge pull request #3479 from qwewqa/judgement-size-fix
Fix judgements not scaling with circle size
2018-09-26 19:50:41 +09:00
Dean Herbert
1b77d9fd05 Merge branch 'update-chat-api' into update-framework 2018-09-26 19:50:23 +09:00
Dean Herbert
a77a55d71d Merge remote-tracking branch 'smoogipoo/update-framework' into update-framework 2018-09-26 19:49:41 +09:00
Dean Herbert
b8f19f8640
Merge branch 'master' into judgement-size-fix 2018-09-26 19:42:09 +09:00
Dean Herbert
5197bf77e4
Merge pull request #3478 from peppy/fix-case-sensitivity-import-extensions
Fix files with upper-case extensions failing to import correctly
2018-09-26 19:40:00 +09:00
Dean Herbert
1fd2782dd4 Fix loading spinner not disappearing on empty channels 2018-09-26 19:15:02 +09:00
Dean Herbert
2436ee589d Remove incorrect API response 2018-09-26 19:13:38 +09:00
smoogipoo
e259911875 Use invariant tolower 2018-09-26 18:44:03 +09:00
Dan Balasescu
e71e871d1f
Remove unnecessary comment 2018-09-26 18:41:55 +09:00
Dan Balasescu
3a5e380e46
Merge branch 'master' into judgement-size-fix 2018-09-26 18:36:12 +09:00
Dan Balasescu
901a7445fa
Merge pull request #3488 from plankp/dnd-osr-files
Handle external files with File instead
2018-09-26 18:21:27 +09:00
smoogipoo
a8f156584b Update framework with positional/non-positional changes 2018-09-26 14:01:15 +09:00
Dean Herbert
7cd547a760 Update chat to work with new API version 2018-09-25 20:53:24 +09:00
smoogipoo
5f61faa2d9 Fix multiple hits in the same frame pressing multiple hitobjects 2018-09-25 18:37:25 +09:00
smoogipoo
cb500e80e4 Make BeatmapInfoWedge present until info is not null 2018-09-25 14:45:26 +09:00
Paul Teng
319ed1bf0f Reorder if statement 2018-09-24 21:35:13 -04:00
Kyle Chang
2069467434 Use HitObject scale to determine judgement size 2018-09-24 21:18:55 -04:00
Paul Teng
dd36b6a381 Remove unused field storage 2018-09-24 21:08:58 -04:00
Paul Teng
b95cc798b2 Remove unused fallback 2018-09-24 20:56:18 -04:00
Paul Teng
62df0ec7d4 Handle external files with File instead 2018-09-24 07:16:19 -04:00
Kyle Chang
7a43677849 Make judgements scale with cs 2018-09-22 22:54:38 -04:00
Dean Herbert
6efecc4b35 Fix files with upper-case extensions failing to import correctly 2018-09-23 05:23:49 +09:00