1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 03:17:28 +08:00
Commit Graph

14968 Commits

Author SHA1 Message Date
Dan Balasescu
492b5edb02
Merge pull request #3425 from LastExceed/close-chattabs-with-Mclick
Close chat tabs with middle mouse button
2018-09-18 15:45:46 +09:00
Dan Balasescu
ad31962643
Cleanup, use similar code to everywhere else 2018-09-18 15:27:21 +09:00
LastExceed
27ea6102bc only return true on Mclick 2018-09-18 08:07:19 +02:00
Dan Balasescu
af6618a239
Merge branch 'master' into close-chattabs-with-Mclick 2018-09-18 14:52:56 +09:00
Dan Balasescu
008bafae45
Merge pull request #3420 from Aergwyn/add-rank-status
Add rank status display in song select
2018-09-18 14:23:21 +09:00
Dan Balasescu
d3bb78d139
Merge branch 'master' into add-rank-status 2018-09-18 14:10:42 +09:00
Dan Balasescu
759633d4c8
Merge pull request #3396 from peppy/music-controller-topmost
Bring music controller in front of notification overlay
2018-09-18 14:03:44 +09:00
Dan Balasescu
9f1f879f3d
Merge branch 'master' into music-controller-topmost 2018-09-18 13:56:13 +09:00
Dan Balasescu
3bd719072c
Merge pull request #3424 from Hanamuke/fix_combo
Fruit type now depends on combo (osu!catch)
2018-09-18 13:17:52 +09:00
Dan Balasescu
29e023b252
Merge branch 'master' into fix_combo 2018-09-18 12:54:51 +09:00
smoogipoo
aba1de8b1a Cleanup 2018-09-18 12:54:07 +09:00
Paul Teng
8bfd981a50 Handle directory checking before entering task 2018-09-17 21:05:28 -04:00
Paul Teng
000beea01b
Merge branch 'master' into patch-2 2018-09-17 15:20:54 -04:00
miterosan
5898b779bb
Merge branch 'master' into Cakefy_osu! 2018-09-16 18:13:29 +02:00
miterosan
3870980f3e Seperate the compile from restoring. 2018-09-16 16:57:53 +02:00
miterosan
ead2e38882 Build the projects before testing 2018-09-16 16:40:40 +02:00
miterosan
0491fd581a Reduce the verbosity of the Restore. 2018-09-16 16:25:40 +02:00
miterosan
03ff695a67 Use Dotnet core VSTest
This allows only running one testrun.
2018-09-16 16:25:19 +02:00
Fayne Aldan
d855e5957a Don't wiggle repeat points independently 2018-09-15 16:16:37 -06:00
LastExceed
ed01f3067f
Merge branch 'master' into close-chattabs-with-Mclick 2018-09-15 18:05:01 +02:00
LastExceed
fce9740f28 return true since we are handling the action 2018-09-15 18:00:47 +02:00
Dean Herbert
b17bd6aaaa
Merge pull request #3438 from peppy/fix-new-inspections
Fix new resharper redundant parenthesis inspections
2018-09-16 00:16:39 +09:00
Dean Herbert
00d0613053 Fix new resharper redundant parenthesis inspections 2018-09-16 00:09:17 +09:00
Dean Herbert
a34b0d67f8
Merge pull request #3435 from plankp/patch-1
Make Transform and Wiggle incompatible with each other
2018-09-15 23:59:48 +09:00
Joehu
f99eff1192 Use consistent terminology format 2018-09-15 07:30:11 -07:00
Paul Teng
d469748612 Reformat code 2018-09-15 09:53:59 -04:00
Paul Teng
42b2c32222 Catch directory not found exception 2018-09-15 09:47:50 -04:00
Paul Teng
75e6bbc4d8 Revert "Check for skins folder also"
This reverts commit eb86f9de5e.
2018-09-15 09:33:31 -04:00
Paul Teng
eb86f9de5e Check for skins folder also 2018-09-15 09:28:19 -04:00
Paul Teng
1a8665864c Remove redundant explicit array type info 2018-09-15 08:55:29 -04:00
Paul Teng
3e02a36938
Make Wiggle incompatible with Transform 2018-09-15 08:43:22 -04:00
Paul Teng
92c6b570ea
Make Transform incompatible with Wiggle 2018-09-15 08:42:04 -04:00
Dean Herbert
8cb0b5e98d
Merge pull request #3423 from peppy/update-squirrel
Bump squirrel version
2018-09-15 19:07:00 +09:00
Dean Herbert
6a1e2c6fa5 Update efcore packages 2018-09-15 18:49:01 +09:00
Dean Herbert
39a6bcba17 Merge remote-tracking branch 'upstream/master' into update-squirrel 2018-09-15 18:45:19 +09:00
Dean Herbert
9a88e09eb0
Merge pull request #3388 from peppy/fix-logo-overhead
Fix osu! logo being present throughout the whole game
2018-09-15 18:44:12 +09:00
Dean Herbert
41be757a11
Merge branch 'master' into fix-logo-overhead 2018-09-15 18:33:22 +09:00
Dean Herbert
7fa6b4154e
Merge pull request #3427 from Hanamuke/disable_scroll_control_catch
Disable scrolling speed control for osu!catch
2018-09-15 18:31:47 +09:00
Dean Herbert
511f129ee1 Merge remote-tracking branch 'upstream/master' into disable_scroll_control_catch 2018-09-15 17:03:57 +09:00
Dean Herbert
2d74c088ce Add newline 2018-09-15 17:03:51 +09:00
Dean Herbert
d18a86c5a7
Merge pull request #3100 from UselessToucan/replay_keycounter
Restore key counters state on replay rewinding
2018-09-15 16:59:41 +09:00
Dean Herbert
79b56cb35c Make saveState private 2018-09-15 16:34:08 +09:00
Dean Herbert
7b57439976 Add proper testing 2018-09-15 16:25:37 +09:00
Dean Herbert
e636cfe79e Fix dynamic compilation not working 2018-09-15 16:24:06 +09:00
Dean Herbert
65b2bceef2 Simplify implementation 2018-09-15 14:51:04 +09:00
Hanamuke
dd7f667fe3 Disable scrolling speed control for osu!catch 2018-09-15 00:18:42 +02:00
Hanamuke
3e7006ec1f Fix fonction name 2018-09-14 19:52:32 +02:00
Hanamuke
c8d3776c79 Remove uneeded brackets 2018-09-14 19:46:04 +02:00
Hanamuke
347cb0a1b5 Check for type conversion, mais the update recursive 2018-09-14 19:41:29 +02:00
Hanamuke
a17200a66a Merge branch 'master' into fix_combo 2018-09-14 18:48:13 +02:00