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

29250 Commits

Author SHA1 Message Date
Dean Herbert
d31a59b074 Fix logic results in infinite loop on default timing point return 2020-05-20 14:55:36 +09:00
Dean Herbert
4f83bb679b Merge branch 'master' into mania-distance-snap-grid 2020-05-20 11:44:19 +09: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
da8729e6bd Update framework 2020-05-19 23:28:42 +09:00
Dean Herbert
85156c62ef Add xmldoc and address some code quality concerns 2020-05-19 23:05:08 +09:00
Dean Herbert
c28a9bdb80 Move load method up 2020-05-19 23:02:20 +09:00
Dean Herbert
a6f3dc53f7 Fix time value not being updated for next timing point 2020-05-19 23:01:36 +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
d56466e2b9 Add very basic pooling of grid lines 2020-05-19 19:07:35 +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
406f39e8bf Construct online visible lines 2020-05-18 21:27:26 +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
Dean Herbert
b35b150f38 Simplify colouring logic 2020-05-18 19:48:51 +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
16e85ae0b1 Remove Grid class 2020-05-18 17:52:04 +09:00
Dean Herbert
d9bb90078b Move grids to inside columns 2020-05-18 17:47:52 +09: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
Dan Balasescu
533010f168
Merge branch 'master' into avoid-host-disable 2020-05-17 15:59:39 +09:00
Shivam
d1f39b6b00
Merge branch 'master' into tourney-subscreen-back-button 2020-05-16 12:51:30 +02:00
Shivam
358345cee7 Change logic for parentscreen/subscreen relation 2020-05-16 12:50:56 +02:00
Dean Herbert
32dd00cb17
Merge branch 'master' into mania-distance-snap-grid 2020-05-16 18:55:48 +09:00
Dean Herbert
9ca4fdf95b
Merge pull request #9042 from smoogipoo/remove-requiredtypes
Remove all RequiredTypes usages
2020-05-16 18:55:12 +09:00
Dean Herbert
0279bcf3c8 Fix missed issues 2020-05-16 18:28:22 +09:00
Dean Herbert
be3a0a3c1d Merge branch 'master' into remove-requiredtypes 2020-05-16 18:28:14 +09:00
smoogipoo
648999a2de Remove all RequiredTypes usages 2020-05-16 18:17:12 +09:00
Shivam
b1243d6a87 Add padding to so the back button is not in the way 2020-05-16 04:05:01 +02:00
Dean Herbert
9d3df14179 Remove unused variable 2020-05-16 11:03:27 +09:00