1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 23:05:37 +08:00
Commit Graph

27555 Commits

Author SHA1 Message Date
Dean Herbert
4f9ac7b81e Merge branch 'master' into show-mod-settings-tooltip 2020-03-23 14:57:54 +09:00
Dean Herbert
ffd3ae4191
Merge pull request #8405 from smoogipoo/remove-hit-abstraction
Remove taiko CentreHit/RimHit hitobject abstraction
2020-03-23 14:54:46 +09:00
Dan Balasescu
a98885a172
Merge pull request #8408 from peppy/fix-settings-double-dim
Fix some pieces of SettingsItem getting dimmed twice when disabled
2020-03-23 14:31:09 +09:00
Dan Balasescu
b5488bdecf
Merge pull request #8403 from peppy/chroma-key-width
Add ability to adjust (and save) chroma-key area width
2020-03-23 13:54:56 +09:00
Dan Balasescu
37ad787d90
Merge pull request #8404 from peppy/remove-tournament-chat-scrollbars
Hide scrollbars in tournament chat display
2020-03-23 13:54:49 +09:00
Dan Balasescu
9a0dfebd60
Merge pull request #8394 from peppy/fix-long-spinner-performance
Fix very long spinners degrading in performance
2020-03-23 13:49:21 +09:00
Dan Balasescu
b01c10e1f1
Merge pull request #8389 from peppy/increase-sample-concurrency
Increase sample concurrency to better match stable
2020-03-23 13:46:16 +09:00
Dean Herbert
3a3df06e0b Fix some pieces of SettingsItem getting dimmed twice when disabled 2020-03-23 13:11:40 +09:00
Dan Balasescu
c281ccd590
Merge branch 'master' into fix-long-spinner-performance 2020-03-23 12:39:59 +09:00
Dan Balasescu
6e0cafa7a0
Merge branch 'master' into increase-sample-concurrency 2020-03-23 12:39:58 +09:00
Dan Balasescu
aefd2fd847
Merge pull request #8370 from peppy/fix-carousel-root-selects-from-nothing
Fix selection not occurring when switching away from empty ruleset
2020-03-23 12:39:43 +09:00
smoogipoo
5106d275ca Remove CentreHit/RimHit hitobject abstraction 2020-03-23 12:08:15 +09:00
Liam DeVoe
64fc116d67 use two decimal points for ModRateAdjust format 2020-03-22 23:08:00 -04:00
Dean Herbert
1b6342438f Hide scrollbars in tournament chat display 2020-03-23 12:05:16 +09:00
Liam DeVoe
5cc626d37b move SettingDescription override to ModRateAdjust 2020-03-22 22:57:46 -04:00
Liam DeVoe
1da590c63f use N1 format instead of 0.# 2020-03-22 22:54:21 -04:00
Liam DeVoe
889608a408 remove redundant ToString call 2020-03-22 22:51:29 -04:00
Liam DeVoe
afe7397d89 remove unnecessary using statements 2020-03-22 22:50:52 -04:00
Dean Herbert
27ae2d29aa Add ability to adjust (and save) chroma-key area width 2020-03-23 11:47:24 +09:00
Dan Balasescu
d0c7b49376
Merge branch 'master' into fix-carousel-root-selects-from-nothing 2020-03-23 11:34:04 +09:00
Dan Balasescu
4fbf94f963
Merge pull request #8368 from peppy/fix-carousel-restore-previous-selection
Fix carousel not returning to previous selection after filter
2020-03-23 11:27:07 +09:00
smoogipoo
448e5c0deb Merge branch 'master' into fix-carousel-root-selects-from-nothing 2020-03-23 11:15:22 +09:00
smoogipoo
bf70276496 Fix test re-using the same beatmap sets 2020-03-23 11:12:36 +09:00
Dean Herbert
2e9fc80a72
Merge pull request #8172 from peppy/tournament-mappool-flow-logic
Add better flow logic to map pool layout when few beatmaps are present
2020-03-23 11:10:56 +09:00
Liam DeVoe
481031b207 Merge branch 'show-mod-settings-tooltip' of github.com:tybug/osu into show-mod-settings-tooltip 2020-03-22 22:10:31 -04:00
Liam DeVoe
98b8f82810 simplify SettingDescription default definition 2020-03-22 22:07:09 -04:00
Liam DeVoe
ea87afd577 use string.Empty in IconTooltip 2020-03-22 22:06:54 -04:00
Liam DeVoe
cb6e602556 enforce single signficiant digit precision for other mods 2020-03-22 22:06:35 -04:00
Dan Balasescu
fb21c7d82d
Merge branch 'master' into fix-carousel-restore-previous-selection 2020-03-23 11:01:18 +09:00
Dan Balasescu
296a594d0c
Merge branch 'master' into tournament-mappool-flow-logic 2020-03-23 10:33:58 +09:00
smoogipoo
754d0ca14d Fix crashes due to ladder re-use 2020-03-23 10:28:17 +09:00
Dean Herbert
55496399f6
Merge pull request #8402 from iiSaLMaN/fix-tests-using-framework-mimts
Fix test scene potentially missing dependencies
2020-03-23 10:26:29 +09:00
Liam DeVoe
67667b3d22 enforce precision for ModDifficultyAdjust and derived classes 2020-03-22 21:22:46 -04:00
Dean Herbert
0b728f483f Rename base test class to help avoid incorrect reference 2020-03-23 10:01:33 +09:00
Liam DeVoe
63e9b2a299 use string.Empty, use base SettingDescription for [Osu/Catch]ModDifficultyAdjust 2020-03-22 18:50:09 -04:00
Salman Ahmed
97076325c4 Fix test scenes using framework-testing-specifc test scene 2020-03-23 01:45:13 +03:00
Dean Herbert
68b501b032
Merge branch 'master' into show-mod-settings-tooltip 2020-03-22 13:36:31 +09:00
Dean Herbert
19b6e496ef Fix (very) long spinners degrading in performance due to high transform count 2020-03-22 04:18:03 +09:00
Dean Herbert
febf9adabd
Merge pull request #8329 from Fuewburvpoa/MyBranch
Fix beat divisor control selecting invalid divisors on drag end
2020-03-22 02:21:13 +09:00
Dean Herbert
d8041a0dcb Increase sample concurrency to better match stable 2020-03-22 02:16:28 +09:00
Dean Herbert
29009c85c0
Fix typo in comment
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-03-22 00:32:53 +09:00
Liam DeVoe
4907fb8fd1 remove another ToString statement 2020-03-20 17:04:22 -04:00
Liam DeVoe
eab705a9b6 remove another ToString statement 2020-03-20 17:00:36 -04:00
Liam DeVoe
a440d15620 simplify array initializationstatement 2020-03-20 16:58:02 -04:00
Liam DeVoe
ac202ba7ea remove unused using directive 2020-03-20 16:57:37 -04:00
Liam DeVoe
e84b40f8ed remove unnecessary ToString calls 2020-03-20 16:53:40 -04:00
Liam DeVoe
55568ee6a5 remove extra parentheses 2020-03-20 16:44:38 -04:00
Liam DeVoe
6a63ba1bb8 use humanizer for ModEasy lives setting 2020-03-20 16:42:35 -04:00
Liam DeVoe
cda1efef0b move overridability to SettingDescription method 2020-03-20 16:34:36 -04:00
Liam DeVoe
7bdbdd25f8 Revert "use SettingSource to define IconTooltip format"
This reverts commit 5a6d8f1932.
2020-03-20 16:05:12 -04:00