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

10627 Commits

Author SHA1 Message Date
smoogipoo
77149b00ce Merge branch 'codestyle-fixes' into update-branch 2018-02-08 23:47:31 +09:00
smoogipoo
4699b5ad7c Fix a few code styling issues
These are present in the netstandard branch (the rules aren't working there - probably using the wrong configuration).
2018-02-08 23:47:03 +09:00
smoogipoo
1d3e1bdc1d Update submodules 2018-02-08 23:37:16 +09:00
smoogipoo
b500b76407 Merge branch 'master' into update-branch 2018-02-08 23:35:48 +09:00
Dean Herbert
a636d1207a
Merge pull request #2039 from peppy/api-updates
Update user object to match new standardised api
2018-02-08 18:15:47 +09:00
Dean Herbert
e107566575 Update user object to match new standardised api 2018-02-08 18:06:04 +09:00
Dean Herbert
7e544af0b7
Merge pull request #2035 from smoogipoo/unified-hitwindows
Unify hit windows between all rulesets
2018-02-08 18:05:21 +09:00
Dean Herbert
534eb223b3
Merge branch 'master' into unified-hitwindows 2018-02-08 17:46:29 +09:00
smoogipoo
0511728fbe Remove "keypress" from comment 2018-02-08 17:38:46 +09:00
Dan Balasescu
b6531d632f
Merge pull request #2038 from peppy/perform-clean-testing
Fix non-visual tests not cleaning up previous executions
2018-02-08 17:32:46 +09:00
Dean Herbert
d8da68c55f Disable test again (accidentally re-enabled) 2018-02-08 17:22:23 +09:00
Dean Herbert
789e25069f Fix non-visual tests not cleaning up previous executions 2018-02-08 17:07:59 +09:00
Dean Herbert
553c9bb2fa
Merge pull request #2037 from peppy/fix-checkbox-sounds
Fix visual settings checkboxes playing sounds in bindable binding
2018-02-08 16:05:18 +09:00
Dean Herbert
e3a4cebd48
Merge branch 'master' into fix-checkbox-sounds 2018-02-08 15:56:34 +09:00
Dean Herbert
cb2744c678
Merge pull request #2036 from smoogipoo/fix-slider-samples
Make slider tails not play hitsounds
2018-02-08 14:48:58 +09:00
Dean Herbert
cafa605b90 Fix visual settings checkboxes playing sounds in bindable binding
Move sound binding to much later in the process to avoid programmatic checkbox changes triggering interaction sounds
2018-02-08 14:43:47 +09:00
smoogipoo
c213e58eff Make slider tails not play hitsounds 2018-02-08 14:40:35 +09:00
Dan Balasescu
998acc5150
Merge pull request #2030 from smoogipoo/fix-import-tests
Make sure the import tests exit their hosts
2018-02-08 14:28:52 +09:00
smoogipoo
46284c61ae Return HitResult.None instead of null 2018-02-08 14:25:59 +09:00
smoogipoo
c537af0289 Fix/improve commends 2018-02-08 14:25:44 +09:00
smoogipoo
a6f1a4689e Fix incorrect value copy-pasta 2018-02-08 14:16:37 +09:00
smoogipoo
3d167c40ae Remove now unneeded Math.Abs call 2018-02-08 14:15:58 +09:00
Dean Herbert
48918b5324 Bring framework up-to-date 2018-02-08 14:07:12 +09:00
Dean Herbert
0e4dcb6814
Merge branch 'master' into fix-import-tests 2018-02-08 14:04:44 +09:00
smoogipoo
4f5bfdb888 Remove explicit .Exit on IPC test 2018-02-08 14:03:37 +09:00
smoogipoo
17aa915c77 Rename DifficultyRange parameters 2018-02-08 13:57:45 +09:00
smoogipoo
802aaefe35 Give rulesets a way to disable/enable perfect/ok hit results 2018-02-08 13:54:08 +09:00
Dean Herbert
6e7d696366
Merge pull request #2031 from peppy/attribute-formatting
Always put attributes on a separate line to their target
2018-02-08 13:50:33 +09:00
smoogipoo
cfdeac6428 Make hit windows settable by derived classes 2018-02-08 13:38:31 +09:00
Dan Balasescu
8bb69ed2c4
Merge branch 'master' into attribute-formatting 2018-02-08 13:26:15 +09:00
smoogipoo
beaecbafbd Merge branch 'master' into unified-hitwindows 2018-02-08 13:22:44 +09:00
smoogipoo
a7aaaf9088 Update framework 2018-02-08 12:43:17 +09:00
smoogipoo
93f1500278 Merge remote-tracking branch 'origin/master' into fix-import-tests 2018-02-08 12:40:05 +09:00
Dean Herbert
23d211e9b1
Merge pull request #2029 from smoogipoo/slider-tooltip-precision
Use bindable precision for OsuSliderBar's tooltip value
2018-02-08 11:33:45 +09:00
Dean Herbert
a70989cb70 Rely on bindable's formatting rather than setting a default 2018-02-08 11:12:05 +09:00
Dean Herbert
7e83aedb86
Merge branch 'master' into slider-tooltip-precision 2018-02-08 11:00:46 +09:00
Dan Balasescu
b9f70486a6
Merge pull request #2020 from peppy/raw-input-fixes
Raw input improvements
2018-02-07 22:26:58 +09:00
Dean Herbert
7a9dffd780 Update framework again 2018-02-07 22:17:32 +09:00
Dean Herbert
67bd375bfa Merge remote-tracking branch 'upstream/master' into raw-input-fixes 2018-02-07 22:05:44 +09:00
smoogipoo
ee93c0bc19 Use an endian-independent method to find precision 2018-02-07 20:03:37 +09:00
Dean Herbert
0c580c6374
Merge pull request #2027 from tgi74/country_rank
Add support for country rank
2018-02-07 19:25:47 +09:00
Dean Herbert
6b6d4f9527
Merge branch 'master' into country_rank 2018-02-07 18:49:40 +09:00
Dean Herbert
9d14c7145d
Merge pull request #2026 from swoolcock/revert-hiding-visual-settings
Fix revert-to-default hiding visual settings at beatmap load
2018-02-07 18:35:11 +09:00
Dean Herbert
4c3606f8fb Handle non-present country rank 2018-02-07 18:34:38 +09:00
Dean Herbert
93c4612f4f Add comment about deserialising helper 2018-02-07 18:18:26 +09:00
Dean Herbert
647cc4bdad Remove in-between properties 2018-02-07 18:04:32 +09:00
smoogipoo
23d4c20726 Apply suggestions to normalisation function 2018-02-07 17:31:18 +09:00
Dean Herbert
20c00720e5 Fix formatting 2018-02-07 17:18:38 +09:00
Dean Herbert
b66d089400 Always put attributes on a separate line to their target 2018-02-07 17:12:12 +09:00
Dean Herbert
666b85d392
Merge branch 'master' into revert-hiding-visual-settings 2018-02-07 16:27:38 +09:00