Commit Graph

22053 Commits

Author SHA1 Message Date
Dan Balasescu
0dfce5d15d
Merge branch 'master' into traceable-mod 2019-09-19 17:38:15 +09:00
Dean Herbert
83657239bd
Disallow failing for replay players (#6162)
Disallow failing for replay players

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 16:00:37 +09:00
Dean Herbert
ecaf3328bf
Add back combo colours for osu!classic (#6165)
Add back combo colours for osu!classic

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 15:43:19 +09:00
Dan Balasescu
9f8c9af3b4
Merge branch 'master' into add-class-combo-colours 2019-09-19 15:13:00 +09:00
Dan Balasescu
e686bcf8e0
Merge pull request #6151 from peppy/state-update-on-skin-change
Always update drawable hitobject state on skin change
2019-09-19 15:12:49 +09:00
Salman Ahmed
865425d35e
Merge branch 'master' into block-failing-on-replays 2019-09-19 09:09:56 +03:00
smoogipoo
c76e27549a Remove spacing 2019-09-19 14:56:52 +09:00
Dan Balasescu
1f0f4d52f3
Merge branch 'master' into state-update-on-skin-change 2019-09-19 14:55:21 +09:00
iiSaLMaN
da4d83063e Simplify LINQ expression 2019-09-19 08:31:11 +03:00
smoogipoo
762adb783a Fix duplicate invocation of updateState on load complete 2019-09-19 14:15:06 +09:00
Dean Herbert
1d97a82e4f
Randomise beatmap playback order on startup (#6141)
Randomise beatmap playback order on startup

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 14:06:41 +09:00
iiSaLMaN
e793854735 Invert BypassFail usage 2019-09-19 08:00:41 +03:00
iiSaLMaN
9de0bcae1e Check for blocking fail mods by default 2019-09-19 07:58:54 +03:00
smoogipoo
4b97327b37 Cleanup draggedItem usages and make them more safe 2019-09-19 13:53:52 +09:00
smoogipoo
0644443979 Use resolved attribute for music controller 2019-09-19 13:51:50 +09:00
smoogipoo
c34842cb80 Merge remote-tracking branch 'Joehuu/master' into randomise-song-playback 2019-09-19 13:37:46 +09:00
Dean Herbert
3fa1b53b2a Add back combo colours for osu!classic 2019-09-19 12:39:15 +09:00
iiSaLMaN
3efcf0493c Remove redundant using directive 2019-09-18 23:28:48 +03:00
iiSaLMaN
ea6318ed73 Fix failing test 2019-09-18 23:17:24 +03:00
iiSaLMaN
871adb16e0 Add asserts for fail bypassing 2019-09-18 22:51:03 +03:00
iiSaLMaN
775b90e066 Bypass fail on replays 2019-09-18 22:49:48 +03:00
iiSaLMaN
ecd721e8c5 Add bypass fail property to Player 2019-09-18 22:49:28 +03:00
Dean Herbert
3710c7bdc4
Merge pull request #6041 from miterosan/removenotneededandroidnativelibraryitemgroup
Remove unnecessary AndroidNativeLibrary specification
2019-09-19 01:55:36 +09:00
Dean Herbert
52fcd834ab
Bump ppy.osu.Framework.iOS from 2019.911.0 to 2019.918.0 (#6158)
Bump ppy.osu.Framework.iOS from 2019.911.0 to 2019.918.0

Co-authored-by: null <27856297+dependabot-preview[bot]@users.noreply.github.com>
2019-09-19 00:50:57 +09:00
dependabot-preview[bot]
5dc5181c90
Bump ppy.osu.Framework.iOS from 2019.911.0 to 2019.918.0
Bumps [ppy.osu.Framework.iOS](https://github.com/ppy/osu-framework) from 2019.911.0 to 2019.918.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.911.0...2019.918.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-18 15:27:39 +00:00
Dean Herbert
66c28b4c27
Merge pull request #6154 from ppy/dependabot/nuget/ppy.osu.Framework.Android-2019.918.0
Bump ppy.osu.Framework.Android from 2019.911.0 to 2019.918.0
2019-09-18 23:58:15 +09:00
Dean Herbert
bc2c47f8c9
Merge pull request #6155 from ppy/dependabot/nuget/ppy.osu.Framework-2019.918.0
Bump ppy.osu.Framework from 2019.911.0 to 2019.918.0
2019-09-18 23:58:08 +09:00
dependabot-preview[bot]
1d7377df65
Bump ppy.osu.Framework from 2019.911.0 to 2019.918.0
Bumps [ppy.osu.Framework](https://github.com/ppy/osu-framework) from 2019.911.0 to 2019.918.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.911.0...2019.918.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-18 14:51:01 +00:00
dependabot-preview[bot]
646a64792a
Bump ppy.osu.Framework.Android from 2019.911.0 to 2019.918.0
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.911.0 to 2019.918.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.911.0...2019.918.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-09-18 14:36:31 +00:00
Dean Herbert
5901a915e7 Always update drawable hitobject state on skin change 2019-09-18 20:19:57 +09:00
Dean Herbert
aa1a625643 Add back incompatibility marker 2019-09-18 20:07:44 +09:00
Dean Herbert
cfdac956c2 Fix issues with colour and skin application 2019-09-18 20:04:49 +09:00
Dean Herbert
9c9cb8e217 Merge remote-tracking branch 'upstream/master' into traceable-mod 2019-09-18 19:36:07 +09:00
Dan Balasescu
096a007e68
Merge pull request #6087 from peppy/key-counter-fixes
Key counter improvements
2019-09-18 18:18:09 +09:00
Dean Herbert
61b396f235
Remove redundant length check 2019-09-18 17:09:43 +09:00
Dean Herbert
e17cd9e964 Reduce length of tests 2019-09-18 16:14:31 +09:00
Dean Herbert
381daffe52 Generate better temporary frames to support framed handling flaws 2019-09-18 16:09:48 +09:00
Dean Herbert
2046f64b22 Revert clamping logic 2019-09-18 16:07:02 +09:00
Dean Herbert
b4a396885d Merge remote-tracking branch 'upstream/master' into key-counter-fixes 2019-09-18 14:08:40 +09:00
Dean Herbert
2db1e236a7 Fix frame count dependent tests regressing 2019-09-18 14:08:09 +09:00
Dean Herbert
91bdece9af Localise OrderChanged handling and fix callbacks
The dragged item's position now only updates after the drag finishes. Local handling changes were required to ignore the bindable remove/add events that are fired as a result.
2019-09-18 13:15:39 +09:00
Dean Herbert
7e791f7cd7 Expose as IBindableList 2019-09-18 13:14:33 +09:00
Dean Herbert
18fd82e83a Merge remote-tracking branch 'upstream/master' into randomise-song-playback 2019-09-18 13:14:08 +09:00
Dan Balasescu
a1db5c32a6
Merge pull request #6146 from peppy/fix-long-combo-test
Fix HitCircleLongCombo test stacking off-screen
2019-09-18 12:52:48 +09:00
Dan Balasescu
834111c488
Merge branch 'master' into fix-long-combo-test 2019-09-18 12:41:43 +09:00
Dean Herbert
38245c5c3b
Move menu cursor rotation to more appropriate settings section (#6142)
Move menu cursor rotation to more appropriate settings section
2019-09-18 11:33:50 +09:00
Dean Herbert
adc2dfa6c6 Fix HitCircleLongCombo test stacking off-screen 2019-09-18 03:00:17 +09:00
Dean Herbert
b5b29a21e7 Move menu cursor rotation to more appropriate settings section 2019-09-18 02:15:18 +09:00
Dean Herbert
3ab352ffe5 Randomise beatmap playback order on startup
Closes #6135.
2019-09-17 23:15:03 +09:00
Dean Herbert
ec5f420818
Merge branch 'master' into key-counter-fixes 2019-09-17 22:56:34 +09:00