1e696d247e
Re-privatise
2018-06-29 18:33:28 +09:00
bebf47d0d5
Merge branch 'master' into fix-dialog-overlay-sounds
2018-06-27 12:21:29 +09:00
0f123734f5
Merge pull request #2827 from smoogipoo/editor-seek-snapping-fix
...
Fix editor not always scrolling beyond timing point beats
2018-06-27 12:03:46 +09:00
ac1bf3b092
Merge branch 'master' into editor-seek-snapping-fix
2018-06-27 11:08:19 +09:00
73994482d5
Merge pull request #2860 from peppy/fix-unauthorized-request
...
Fix API getting stuck in an endless loop under a certain unauthorized scenario
2018-06-26 22:37:50 +09:00
1b050ca68e
Merge branch 'master' into fix-unauthorized-request
2018-06-26 22:25:19 +09:00
c58728d72e
Merge pull request #2883 from peppy/update-framework
...
Update framework and other nuget dependencies
2018-06-26 20:54:59 +09:00
830ce0da4c
Merge branch 'master' into update-framework
2018-06-26 20:41:08 +09:00
8a81fba1ea
Other input states need to be considered for wheel bindings
2018-06-26 20:34:22 +09:00
f9e2aabbdb
Merge pull request #2635 from ekrctb/catch-droplet-fix
...
Use FastRandom for catch droplets and bananas positions
2018-06-26 20:32:50 +09:00
1a8aa6eab1
Fix regression causing new combos to once again not be respected
2018-06-26 20:13:55 +09:00
f1dfe04bd9
Fix broken conditional
2018-06-26 20:13:44 +09:00
02b733a42e
Merge remote-tracking branch 'origin/master' into fix-unauthorized-request
2018-06-26 19:58:51 +09:00
f7f17bab78
Merge branch 'master' into catch-droplet-fix
2018-06-26 19:29:15 +09:00
a8579c49f9
Merge pull request #2628 from ekrctb/catch-stable-hyper
...
Modify catch hyperdash behavior to match to stable
2018-06-26 13:29:35 +09:00
cc746c0dde
Merge remote-tracking branch 'upstream/master' into ekrctb-catch-stable-hyper
2018-06-26 13:02:39 +09:00
96191fc3ce
Move transition variable back to being local to function
2018-06-26 13:02:29 +09:00
563cb46b4a
Update framework and other nuget dependencies
2018-06-26 12:10:56 +09:00
cd74ec705e
Fix possible mis-ordering of scroll position updates
...
1. Checking whether the scroll position has changed must be done _after_ Current is updated in base.UpdateAfterChildren. This was causing the timeline to sometimes not provide smooth scrolling while the track is not running.
2. We can't just move all code to UpdateAfterChildren to fulfill (1) - we need the code to follow the track time to still run prior to base.UpdateAfterChildren, so that it modifies Current prior to base.UpdateAfterChildren changing to position.
2018-06-25 20:31:06 +09:00
6736f2988e
Merge pull request #2803 from smoogipoo/more-diffcalc-attributes
...
Move beatmap difficulty attributes to the difficulty calculators
2018-06-25 20:04:45 +09:00
22138d39ca
Merge branch 'master' into more-diffcalc-attributes
2018-06-25 19:53:22 +09:00
bef41c5c16
Merge pull request #2773 from smoogipoo/mania-playfield-inversions
...
Rework osu!mania drawables to support playfield directions
2018-06-25 19:52:10 +09:00
a397827841
Reduce line length
2018-06-25 19:28:38 +09:00
594cc0d21d
Merge branch 'master' into mania-playfield-inversions
2018-06-25 18:36:23 +09:00
e75ff1145c
Merge branch 'master' into editor-seek-snapping-fix
2018-06-25 18:27:03 +09:00
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
d4d9d20147
Merge branch 'master' into fix-taiko-rewind
2018-06-25 18:08:27 +09:00
a3079c9303
Merge pull request #2879 from peppy/taiko-barline-regression
...
Fix taiko barlines appearing too often
2018-06-25 17:24:10 +09:00
a9af980ea4
Merge branch 'master' into taiko-barline-regression
2018-06-25 17:16:28 +09:00
5e6634cd00
Merge branch 'master' into fix-taiko-rewind
2018-06-25 17:10:53 +09:00
d7133f059d
Fix incorrect implementation
2018-06-25 16:53:12 +09:00
a843344119
Merge pull request #2873 from nl-tatatat/master
...
Remove low BPM barline increase in taiko
2018-06-25 16:40:24 +09:00
63448dc9dc
Merge branch 'master' into master
2018-06-25 16:33:08 +09:00
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
185789bc7f
Remove unused variable
2018-06-25 16:13:15 +09:00
12c2212483
Merge branch 'master' into always-proxy-taiko-hits
2018-06-25 16:11:34 +09:00
26d9e3cc10
Merge branch 'master' into fix-taiko-rewind
2018-06-25 16:08:52 +09:00
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
70e9f7cb8d
Always proxy taiko hits when hit
2018-06-25 15:55:09 +09:00
b0cd227e81
Fix race condition in TestCaseLounge (attempt 2)
2018-06-25 14:10:54 +09:00
11d730496f
Merge pull request #2874 from starburst997/patch-1
...
I guess you meant an "or" ?
2018-06-25 12:40:31 +09:00
55364af56c
I guess you meant an "or" ?
2018-06-24 14:55:27 -04:00
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
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
2c6fa5b7dd
Merge branch 'master' into use-new-input-manager
2018-06-22 18:19:43 +09:00
d6084c0b30
Adapt to new input handling changes
2018-06-22 18:10:27 +09:00
3aa52f1e00
Merge pull request #2850 from peppy/fix-test-case-lounge
...
Fix race condition in TestCaseLounge
2018-06-22 17:44:34 +09:00
d77ba64a73
Merge branch 'master' into fix-test-case-lounge
2018-06-22 17:36:40 +09:00
78ccbcabf3
Fix API getting stuck in an endless loop under a certain unauthorized scenario
2018-06-22 17:34:29 +09:00
7a4cfe6667
Merge pull request #2859 from peppy/add-pr-template
...
Add a simple Pull Request template
2018-06-22 17:00:06 +09:00
