18eb74d38c
Merge branch 'master' into sliderbouncers-fix
2017-12-28 00:13:04 +09:00
dcd994e65b
Merge branch 'master' into better-notification-delays
2017-12-27 23:58:04 +09:00
e6876c95ac
Merge branch 'master' into fix-notification-scheduled-events
2017-12-27 23:47:04 +09:00
996e156fd0
Merge branch 'master' into fix-notification-scheduled-events
2017-12-27 23:27:23 +09:00
3bfa6bd9fd
Merge branch 'master' into better-notification-delays
2017-12-27 23:26:57 +09:00
259e32f485
Merge branch 'master' into fix-beatmap-wedge-appear
2017-12-27 23:22:06 +09:00
3a2dadc9d3
Fix spelling error
2017-12-27 23:14:48 +09:00
02f4705178
Merge branch 'master' into proper-taiko-hitsounds
2017-12-27 23:13:30 +09:00
07e0c423f5
Merge branch 'master' into fix-beatmap-wedge-appear
2017-12-27 22:58:50 +09:00
f68bf2e258
Merge branch 'master' into proper-taiko-hitsounds
2017-12-27 21:45:20 +09:00
d99c6db4a1
Merge branch 'master' into fix-progress-notifications-close
2017-12-27 21:44:31 +09:00
3f73a9a693
Add better sample fallback logic
...
Also adds support for null channels at InputDrum level.
2017-12-27 21:44:04 +09:00
3de07ddba8
Merge branch 'master' into fix-progress-notifications-close
2017-12-27 21:43:58 +09:00
9a4b2f0d1d
Apply workaround at two levels
2017-12-27 21:19:06 +09:00
46ef17354e
Simplify path construction
2017-12-27 21:05:16 +09:00
496b0fef01
Merge branch 'master' into proper-taiko-hitsounds
2017-12-27 20:40:16 +09:00
324a7d6377
Merge remote-tracking branch 'upstream/master' into better-testcase-player
2017-12-27 20:26:38 +09:00
7d0c94fd01
Fix notification overlay layout and scheduled tasks being delayed
...
Closes #1295
2017-12-27 19:42:44 +09:00
b87e6c8b2a
Add a method to get ruleset by name
2017-12-27 17:33:34 +09:00
1af7f71c97
Merge branch 'master' into notification-verbosity
2017-12-27 15:01:28 +09:00
de353ee6af
Merge branch 'master' into proper-taiko-hitsounds
2017-12-27 14:59:26 +09:00
f6e72706d9
Merge branch 'master' into fix-multiple-random-selects
2017-12-27 14:51:54 +09:00
2a7147240f
Fix progress notifications not creating their completion notification early enough
...
FIxes notification overlay thinking it has no notifications left and closing.
2017-12-27 13:25:42 +09:00
5b529511ec
Update OpenTK nuget package
...
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +09:00
18d2be75d5
Fix random selection happening more than once on quick imports
2017-12-27 13:04:50 +09:00
ddee9e992a
Merge remote-tracking branch 'origin/master' into proper-taiko-hitsounds
2017-12-27 13:04:10 +09:00
cf9a9762f7
Fix beatmap wedge appearing with incorrect info on entering song select
...
Closes #1762
2017-12-27 13:02:21 +09:00
b95d7fc2cd
Revert "Make ControlPointInfo return a set default control point"
...
This reverts commit 3113a55a98
2017-12-27 12:41:59 +09:00
ae9f08f387
Fix crash in editor when trying to seek on a virtual track
2017-12-27 11:47:04 +09:00
d17f6cb564
Fix crash when starting play mode with no beatmap
...
Closes #1767
2017-12-27 11:46:44 +09:00
94449ed597
Merge branch 'master' into notification-verbosity
2017-12-26 20:48:59 +09:00
35ae5173cd
Merge branch 'master' into better-notification-delays
2017-12-26 20:48:41 +09:00
3182c22c7d
Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info
2017-12-26 20:36:22 +09:00
7504cd589d
Move alpha handling to state
2017-12-26 20:18:47 +09:00
d479955e20
Fix spelling error
2017-12-26 20:01:02 +09:00
9690591593
Make taiko use namespaced hitsounds
...
This is a temporary solution for now that uses DrawableHitObject.SampleNamespace for the override. We will not want to do this going forward, and instead have the rulesets add their custom resource stores to the games', but that requires deciding where/when to apply/remove such resource stores, and is probably left to skinning.
2017-12-26 19:55:56 +09:00
ee67e7119d
Merge remote-tracking branch 'upstream/master' into fix-info-wedge
2017-12-26 19:44:28 +09:00
44fbe7859a
move anchor and origin so metadata doesn't move if it's partially empty
2017-12-26 11:34:26 +01:00
3113a55a98
Make ControlPointInfo return a set default control point
2017-12-26 19:33:01 +09:00
836d807f4f
Give SampleControlPoint a 100% volume by default
2017-12-26 19:32:20 +09:00
460eeafd32
Merge branch 'master' into quieter-notifications
2017-12-26 18:18:28 +09:00
cf71ffdb6c
Merge branch 'master' into fix-taiko-stronghit
2017-12-26 18:06:07 +09:00
11542b697c
Merge branch 'master' into improve-screen-offset
2017-12-26 17:53:13 +09:00
ab6c93fba4
Merge branch 'master' into notification-verbosity
2017-12-26 16:14:24 +09:00
3524ad3dc2
Merge remote-tracking branch 'upstream/master' into better-notification-delays
2017-12-26 16:10:57 +09:00
f737a64189
Remove ScreenChanged
2017-12-26 16:09:40 +09:00
f7a54a203b
Merge branch 'master' into beatmap-import-prompt
2017-12-26 16:00:37 +09:00
c15b2382a2
Remove unused variable
2017-12-26 15:56:32 +09:00
24d8d357d0
Only bounce and flash notification count when increasing
2017-12-26 15:54:37 +09:00
45b3acdd6f
Fix progress notifications not closing properly when opening their continuation
2017-12-26 15:54:33 +09:00
