1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 19:22:54 +08:00
Commit Graph

29249 Commits

Author SHA1 Message Date
Dan Balasescu
fbe76e4f16
Merge branch 'master' into silence-on-seek 2020-05-21 12:55:44 +09:00
Dan Balasescu
8c6f5d2933
Merge pull request #9068 from peppy/skinnable-sound-drawable-sample
Use DrawableSample in SkinnableSound class
2020-05-21 12:54:51 +09:00
Dean Herbert
c0e68f9854 Also support taiko drum 2020-05-21 11:08:06 +09:00
Dean Herbert
ce223a2bd8 Silence hit sounds while seeking 2020-05-21 11:08:06 +09:00
Dean Herbert
c2697d3907 Use DrawableSample in SkinnableSound class 2020-05-20 20:49:01 +09:00
Dan Balasescu
d2350aba24
Merge pull request #9064 from bdach/storyboard-overlay-layer
Add support for storyboard overlay layer
2020-05-20 16:41:31 +09:00
smoogipoo
e5de382760 Merge branch 'master' into storyboard-overlay-layer 2020-05-20 15:08:45 +09:00
smoogipoo
85088c9b3b Privatise setter 2020-05-20 15:08:33 +09:00
Dan Balasescu
b6c9a50f7a
Merge pull request #9057 from peppy/fix-taiko-whistle
Fix taiko rim markers incorrectly playing as whistle samples
2020-05-20 14:24:01 +09:00
Dean Herbert
b691511737
Merge branch 'master' into fix-taiko-whistle 2020-05-20 10:14:39 +09:00
Dean Herbert
76080368e9 Mark test as headless 2020-05-20 10:14:08 +09:00
Dean Herbert
9638064741 Tidy up ruleset assignment code 2020-05-20 10:06:23 +09:00
Bartłomiej Dach
ce4301c5b8 Add overlay layer to player by proxying 2020-05-19 19:47:50 +02:00
Bartłomiej Dach
2398f2e537 Expose drawable overlay layer 2020-05-19 19:47:50 +02:00
Bartłomiej Dach
6e27247cdf Adjust storyboard decoder test in line with changes 2020-05-19 19:47:50 +02:00
Bartłomiej Dach
e211785704 Add overlay layer to storyboard definition 2020-05-19 19:47:45 +02:00
Dan Balasescu
a7ff7fae90
Merge pull request #9062 from peppy/fix-outwards-event-bindings
Convert dangerous events to IBindables
2020-05-20 02:17:19 +09:00
Dan Balasescu
a075529f93
Merge branch 'master' into fix-outwards-event-bindings 2020-05-20 00:07:30 +09:00
Dean Herbert
db4e3047dd Add test for final sample output 2020-05-19 23:28:13 +09:00
Dean Herbert
dabf782a23
Merge branch 'master' into fix-taiko-whistle 2020-05-19 23:08:11 +09:00
Dean Herbert
eee8af28f6
Merge pull request #9018 from Game4all/allowgameplayoverlays-hide-skip
Allow disabling SkipOverlay through AllowGameplayOverlays.
2020-05-19 19:22:51 +09:00
Dean Herbert
052ad79fc6 Convert dangerous events to IBindables 2020-05-19 16:44:22 +09:00
Dean Herbert
4dbe948397
Merge pull request #9061 from smoogipoo/fix-enter-in-multi
Fix being able to press enter to create matches
2020-05-19 14:21:42 +09:00
smoogipoo
6d3ca4ec43 Fix failing tests 2020-05-19 13:16:46 +09:00
smoogipoo
3ee698cfa0 Fix being able to press enter to create matches 2020-05-19 12:39:09 +09:00
Dean Herbert
e9710b6f83 Add taiko type conversion test coverage 2020-05-19 09:43:05 +09:00
Bartłomiej Dach
9415e45aea Add overlay layer to enumeration type 2020-05-18 22:45:31 +02:00
Dean Herbert
013683c23b Fix taiko rim markers incorrectly playing as whistle samples 2020-05-19 00:17:13 +09:00
Dan Balasescu
87e501d4ba
Merge pull request #9055 from huoyaoyuan/unify-pp-numbers
Unify number types in performance calculators
2020-05-18 20:16:57 +09:00
smoogipoo
f98ee27185 Fix referencing wrong child 2020-05-18 20:01:00 +09:00
smoogipoo
6d70f4b410 Merge branch 'master' into allowgameplayoverlays-hide-skip 2020-05-18 19:54:38 +09:00
smoogipoo
2fd25f5ee6 Fix tests 2020-05-18 19:54:26 +09:00
Dan Balasescu
490b6dbd7a
Merge pull request #9023 from Fukashi13/sections-container-fix
Fix overlay section display highlighting wrong section
2020-05-18 19:49:28 +09:00
smoogipoo
49ee05c3c4 Make into CompositeDrawable 2020-05-18 19:37:49 +09:00
Huo Yaoyuan
c20902f249 Fix double in accuracy calculation in OsuPerformanceCalculator. 2020-05-18 18:22:03 +08:00
Dan Balasescu
e975e53e39
Merge branch 'master' into sections-container-fix 2020-05-18 19:16:44 +09:00
Huo Yaoyuan
373aae0610 Use int for total hits in OsuPerformanceCalculator. 2020-05-18 17:45:32 +08:00
Huo Yaoyuan
b43e978156 Unify to use double in CatchPerformanceCalculator. 2020-05-18 17:44:56 +08:00
Dean Herbert
3e81d6d55f
Merge pull request #9053 from smoogipoo/fix-possible-ppcalc-exception
Fix possible exceptions in performance calculators
2020-05-18 16:37:33 +09:00
Dean Herbert
1f1f337a42
Merge pull request #9048 from bdach/hide-catch-judgements-in-mania
Disallow catch-specific judgements in mania
2020-05-18 15:43:44 +09:00
smoogipoo
1865cd0762 Fix possible exceptions in performance calculators 2020-05-18 15:10:59 +09:00
Dean Herbert
89c0c7d080
Merge pull request #9052 from peppy/update-framework
Update framework
2020-05-18 13:57:04 +09:00
Dean Herbert
59ef6002bd Update framework 2020-05-18 13:12:30 +09:00
Bartłomiej Dach
76c5be7bc1 Disallow catch-specific judgements in mania 2020-05-17 17:16:22 +02:00
Dan Balasescu
9003c069bb
Merge pull request #9041 from MiraiSubject/tourney-subscreen-back-button
Add a back button to sub screens in the Tournament Client
2020-05-17 19:28:03 +09:00
Dean Herbert
11537dd688 Merge branch 'master' into tourney-subscreen-back-button 2020-05-17 17:38:36 +09:00
Dean Herbert
13d4997c91 Remove custom back action logic (use receptor as intended) 2020-05-17 17:35:10 +09:00
Dean Herbert
864c1a73ae Only add back button if required 2020-05-17 17:27:52 +09:00
Dean Herbert
2c0ac8cc36 Move padding to fill, not scroll container 2020-05-17 17:25:26 +09:00
Dan Balasescu
b4ed03fdd4
Merge pull request #9031 from peppy/avoid-host-disable
Avoid disabling a host-level bindable from osu! code
2020-05-17 16:40:06 +09:00