Dean Herbert
|
e75ff1145c
|
Merge branch 'master' into editor-seek-snapping-fix
|
2018-06-25 18:27:03 +09:00 |
|
Dean Herbert
|
1cd29b5d40
|
Merge pull request #2776 from smoogipoo/fix-taiko-rewind
Fix taiko hit states not being reverted on rewind
|
2018-06-25 18:26:17 +09:00 |
|
Dean Herbert
|
d4d9d20147
|
Merge branch 'master' into fix-taiko-rewind
|
2018-06-25 18:08:27 +09:00 |
|
Dan Balasescu
|
a3079c9303
|
Merge pull request #2879 from peppy/taiko-barline-regression
Fix taiko barlines appearing too often
|
2018-06-25 17:24:10 +09:00 |
|
Dan Balasescu
|
a9af980ea4
|
Merge branch 'master' into taiko-barline-regression
|
2018-06-25 17:16:28 +09:00 |
|
Dean Herbert
|
5e6634cd00
|
Merge branch 'master' into fix-taiko-rewind
|
2018-06-25 17:10:53 +09:00 |
|
Dean Herbert
|
d7133f059d
|
Fix incorrect implementation
|
2018-06-25 16:53:12 +09:00 |
|
Dean Herbert
|
a843344119
|
Merge pull request #2873 from nl-tatatat/master
Remove low BPM barline increase in taiko
|
2018-06-25 16:40:24 +09:00 |
|
Dean Herbert
|
63448dc9dc
|
Merge branch 'master' into master
|
2018-06-25 16:33:08 +09:00 |
|
Dean Herbert
|
00e1ae6db0
|
Merge pull request #2878 from smoogipoo/always-proxy-taiko-hits
Always proxy taiko hits when hit
|
2018-06-25 16:31:49 +09:00 |
|
smoogipoo
|
185789bc7f
|
Remove unused variable
|
2018-06-25 16:13:15 +09:00 |
|
Dean Herbert
|
12c2212483
|
Merge branch 'master' into always-proxy-taiko-hits
|
2018-06-25 16:11:34 +09:00 |
|
Dan Balasescu
|
26d9e3cc10
|
Merge branch 'master' into fix-taiko-rewind
|
2018-06-25 16:08:52 +09:00 |
|
Dan Balasescu
|
2e556e3051
|
Merge pull request #2877 from peppy/fix-test-case-lounge-2
Fix race condition causing TestCaseLounge to randomly fail
|
2018-06-25 16:03:42 +09:00 |
|
smoogipoo
|
70e9f7cb8d
|
Always proxy taiko hits when hit
|
2018-06-25 15:55:09 +09:00 |
|
Dean Herbert
|
b0cd227e81
|
Fix race condition in TestCaseLounge (attempt 2)
|
2018-06-25 14:10:54 +09:00 |
|
Dan Balasescu
|
11d730496f
|
Merge pull request #2874 from starburst997/patch-1
I guess you meant an "or" ?
|
2018-06-25 12:40:31 +09:00 |
|
Jean-Denis Boivin
|
55364af56c
|
I guess you meant an "or" ?
|
2018-06-24 14:55:27 -04:00 |
|
nl-tatatat
|
09b2025fad
|
Update TaikoRulesetContainer.cs
Remove code that I am almost 100% sure that makes barlines every 1/1 instead of 4/1.
|
2018-06-24 04:48:38 -05:00 |
|
Dean Herbert
|
9cec769191
|
Merge pull request #2858 from ekrctb/use-new-input-manager
Update osu!-side code in line with input handling changes
|
2018-06-22 18:31:49 +09:00 |
|
Dean Herbert
|
2c6fa5b7dd
|
Merge branch 'master' into use-new-input-manager
|
2018-06-22 18:19:43 +09:00 |
|
ekrctb
|
d6084c0b30
|
Adapt to new input handling changes
|
2018-06-22 18:10:27 +09:00 |
|
Dan Balasescu
|
3aa52f1e00
|
Merge pull request #2850 from peppy/fix-test-case-lounge
Fix race condition in TestCaseLounge
|
2018-06-22 17:44:34 +09:00 |
|
Dan Balasescu
|
d77ba64a73
|
Merge branch 'master' into fix-test-case-lounge
|
2018-06-22 17:36:40 +09:00 |
|
Dan Balasescu
|
7a4cfe6667
|
Merge pull request #2859 from peppy/add-pr-template
Add a simple Pull Request template
|
2018-06-22 17:00:06 +09:00 |
|
Dean Herbert
|
0b5bfea9f4
|
Add a simple Pull Request template
|
2018-06-22 16:49:47 +09:00 |
|
Dean Herbert
|
155db6969a
|
Merge pull request #2744 from peppy/improve-volume-controls
Improve UX of volume controls
|
2018-06-22 13:51:18 +09:00 |
|
Dean Herbert
|
99cc406b97
|
Merge branch 'master' into improve-volume-controls
|
2018-06-22 13:39:48 +09:00 |
|
Dan Balasescu
|
0616107b21
|
Merge pull request #2815 from peppy/api-offline-early-return
Avoid errors being logged when importing beatmaps while logged out
|
2018-06-22 13:36:15 +09:00 |
|
smoogipoo
|
8d3c2d54f3
|
Merge remote-tracking branch 'origin/master' into improve-volume-controls
|
2018-06-22 13:33:07 +09:00 |
|
smoogipoo
|
67a067ffa5
|
Fix overlay not disappearing when losing hover from the last pixel
OnMouseMove isn't invoked when hover is lost.
|
2018-06-22 13:32:32 +09:00 |
|
smoogipoo
|
72aee8344e
|
Always call schedulePopOut
|
2018-06-22 13:32:00 +09:00 |
|
smoogipoo
|
206f913a4c
|
Make mute button not handle hover
|
2018-06-22 13:31:32 +09:00 |
|
Dean Herbert
|
5d3b51b8d4
|
Merge branch 'master' into api-offline-early-return
|
2018-06-22 13:16:30 +09:00 |
|
Dan Balasescu
|
2801c18845
|
Merge pull request #2469 from UselessToucan/multiple_previews_different_overlays
Centralise preview track handling
|
2018-06-22 13:13:07 +09:00 |
|
Dean Herbert
|
73e13e2d63
|
Rename Stop to StopAnyPlaying for clarity
|
2018-06-22 12:35:43 +09:00 |
|
Dean Herbert
|
4b2b1f51f9
|
Apply some code review
|
2018-06-22 12:33:30 +09:00 |
|
Dean Herbert
|
de10480e95
|
Merge branch 'master' into multiple_previews_different_overlays
|
2018-06-22 10:44:36 +09:00 |
|
Dean Herbert
|
91af960200
|
Merge pull request #2848 from peppy/notification-usability
Improve log to notification forwarding
|
2018-06-21 20:04:00 +09:00 |
|
Dan Balasescu
|
465342c636
|
Merge branch 'master' into notification-usability
|
2018-06-21 19:48:16 +09:00 |
|
smoogipoo
|
15bb301d14
|
Remove unused field
|
2018-06-21 19:37:45 +09:00 |
|
smoogipoo
|
1932399521
|
Add testcases
|
2018-06-21 19:31:07 +09:00 |
|
smoogipoo
|
63a6fc2596
|
XMLDoc all the things
|
2018-06-21 18:54:50 +09:00 |
|
smoogipoo
|
40ed3fdd05
|
Fix possible incorrect order of events due to threaded load
|
2018-06-21 18:45:32 +09:00 |
|
smoogipoo
|
b2066c5d73
|
Rework preview tracks to reduce usage complexities
|
2018-06-21 18:40:27 +09:00 |
|
Dean Herbert
|
fcf7e211fa
|
Merge pull request #2851 from peppy/remove-dangling-files
Remove vscode files from long-gone deploy project
|
2018-06-21 18:34:05 +09:00 |
|
Dean Herbert
|
8706740825
|
Merge pull request #2593 from frankhjwx/catch_star_rating
Implement osu!catch star rating
|
2018-06-21 18:29:22 +09:00 |
|
Dean Herbert
|
999d3a240d
|
Merge remote-tracking branch 'upstream/master' into frankhjwx-catch_star_rating
|
2018-06-21 17:49:13 +09:00 |
|
Dean Herbert
|
34498f7f86
|
Use var where possible
|
2018-06-21 17:49:04 +09:00 |
|
Dean Herbert
|
c64f64814f
|
Remove unnecessary AimRating
|
2018-06-21 17:32:10 +09:00 |
|