|
|
33c721bcbb
|
Fix post-merge errors
|
2018-03-12 09:51:32 +09:00 |
|
|
|
6e51b74890
|
Merge remote-tracking branch 'origin/master' into rewrite-break-overlay
|
2018-03-12 09:47:05 +09:00 |
|
|
|
db2a663234
|
Use private instead of protected
|
2018-03-11 01:26:03 +09:00 |
|
|
|
56730247e3
|
Merge branch 'fix-unplayable-beatmaps' of github.com:naoey/osu into fix-unplayable-beatmaps
|
2018-03-09 19:40:00 +05:30 |
|
|
|
2c0488b1f1
|
Invert bool, add test, and handle ruleset change.
|
2018-03-09 19:39:28 +05:30 |
|
|
|
9ad9fc5aa9
|
Merge branch 'master' into fix-unplayable-beatmaps
|
2018-03-09 21:39:48 +09:00 |
|
|
|
d04f47718f
|
Make song select choose random when initial selection fails.
- Revert TestCasePlaySongSelect to master
|
2018-03-09 17:36:55 +05:30 |
|
|
|
25fb527cc7
|
Remove previous fix and move filtered logic to carousel.
- Add an optional bool parameter to SelectBeatmap to skip selecting
filtered maps
|
2018-03-09 15:51:00 +05:30 |
|
|
|
6d91889ca6
|
Move player-specific configuration bindables back to player
|
2018-03-08 22:16:47 +09:00 |
|
|
|
2cb197d0c4
|
Replace ConfigureBackgroundUpdate with OnEntering
|
2018-03-08 11:35:00 +03:00 |
|
|
|
8f3f886805
|
Merge branch 'master' into PlayerBase
|
2018-03-08 16:12:12 +09:00 |
|
|
|
81c1ec2005
|
Merge branch 'master' into fix-unplayable-beatmaps
|
2018-03-08 13:02:57 +09:00 |
|
|
|
91c984ed97
|
Merge branch 'master' into rewrite-break-overlay
|
2018-03-08 09:31:59 +09:00 |
|
|
|
3731cbe5eb
|
Removing "mouse wheel disabled" checkbox from visual settings gameplay menu
|
2018-03-07 14:20:59 +01:00 |
|
|
|
6a768e378a
|
Merge branch 'master' into rewrite-break-overlay
|
2018-03-07 17:00:34 +09:00 |
|
|
|
78d73d4c11
|
Additional fixes for flow ordering after framework changes
|
2018-03-06 17:20:58 +09:00 |
|
|
|
148551afa2
|
osu!-side changes in-line with framework layout changes
|
2018-03-06 14:12:37 +09:00 |
|
|
|
697ad63d72
|
Resolve merge conflicts
|
2018-03-05 22:24:25 +03:00 |
|
|
|
c6c55c40ed
|
Rewrite BreakOverlay
No longer relies on Schedule calls (could not be rewound).
Also no longer sucks.
|
2018-03-04 00:51:24 +09:00 |
|
|
|
a57dc154f9
|
More specific tests.
|
2018-03-03 20:34:29 +05:30 |
|
|
|
307147a8a3
|
Merge remote-tracking branch 'upstream/master' into fix-unplayable-beatmaps
|
2018-03-03 16:10:22 +05:30 |
|
|
|
fb724ca8a7
|
Make song select ensure current beatmap is always playable in the active ruleset.
- Add a to TestCasePlaySongSelect testing this scenario
|
2018-03-03 16:09:24 +05:30 |
|
|
|
bd510e5356
|
Merge remote-tracking branch 'upstream/master' into clock-fixes
|
2018-03-02 21:01:53 +09:00 |
|
|
|
6dc9411a90
|
Don't use BufferedContainer for OsuLogo
Minor performance improvement. Not sure why this was done but it's not required any more.
|
2018-03-01 16:01:42 +09:00 |
|
|
|
bda673e6fe
|
Merge branch 'master' into player-reduced-parallax
|
2018-02-28 23:15:25 +09:00 |
|
|
|
33a64cb497
|
Merge branch 'master' into fix-multiple-tracks-playing
|
2018-02-28 22:53:02 +09:00 |
|
|
|
25c748ed45
|
Merge branch 'master' into fix-player-exit
|
2018-02-28 22:05:44 +09:00 |
|
|
|
f9faf8e3d8
|
Localise offset clock usage out of Player as much as possible
|
2018-02-28 22:01:52 +09:00 |
|
|
|
01fcf9c813
|
Update in line with framework changes
|
2018-02-28 22:01:48 +09:00 |
|
|
|
b898226a91
|
Merge branch 'master' into fix-mod-select
|
2018-02-28 21:52:07 +09:00 |
|
|
|
a3d26d7d55
|
Merge branch 'master' into fix-song-select-iteration
|
2018-02-28 21:40:25 +09:00 |
|
|
|
08497427fd
|
Merge branch 'master' into fix-multiple-tracks-playing
|
2018-02-28 15:32:16 +09:00 |
|
|
|
bc0bbd2e3b
|
Merge branch 'master' into reduce-transforms
|
2018-02-28 14:39:31 +09:00 |
|
|
|
4a52db14d1
|
Fix depth of already-visible panels not being updates after a sorting change
|
2018-02-28 14:18:25 +09:00 |
|
|
|
dd6cf1379e
|
Reduce parallax effect during gameplay
This also cleans up some shared code in OsuScreen.
|
2018-02-28 11:42:47 +09:00 |
|
|
|
0cd049c6b0
|
Rely less on zero-duration transform helpers
They have huge overheads.
See ppy/osu-framework#1411.
|
2018-02-28 11:00:54 +09:00 |
|
|
|
510ecd7c87
|
Ensure selection is finalised before exiting song select
Resolves #2080.
|
2018-02-28 00:07:28 +09:00 |
|
|
|
f64afc738d
|
Fix incorrect exit block conditional
Resolves #2130.
|
2018-02-27 23:59:34 +09:00 |
|
|
|
84a8fbe0b3
|
Fix null ref
|
2018-02-27 21:26:06 +09:00 |
|
|
|
034875be47
|
Fix bindings not being unbound on ModSelect
Resolves #2018.
Closes #2079.
|
2018-02-27 20:45:32 +09:00 |
|
|
|
9b44f447ca
|
Fix song select iteration when all panels are filtered
Resolves #2069.
|
2018-02-27 17:52:12 +09:00 |
|
|
|
cff17f1864
|
Update in line with inverse ShoudProcessClock default
|
2018-02-27 17:23:38 +09:00 |
|
|
|
8e78a7b114
|
Fix HUD using incorrect clock for time display
|
2018-02-27 17:23:38 +09:00 |
|
|
|
37d2a2c3cc
|
Rename clock types to match across classes
|
2018-02-27 17:23:38 +09:00 |
|
|
|
3d52ead213
|
Rename sourceClock
|
2018-02-27 17:23:38 +09:00 |
|
|
|
fee258f2f2
|
Rework PauseContainer to better pause
|
2018-02-27 17:23:38 +09:00 |
|
|
|
d4f1723ae6
|
Remove unnecessary secondary argument from HUDOverlay
|
2018-02-27 17:23:38 +09:00 |
|
|
|
0635ae2293
|
Include missing offset
|
2018-02-27 17:23:38 +09:00 |
|
|
|
9c0dfb7c8c
|
Avoid creating an extra framed clock in SkipButton
|
2018-02-27 17:23:38 +09:00 |
|
|
|
c0d983bbdf
|
Merge branch 'master' into PlayerBase
|
2018-02-23 13:51:11 +09:00 |
|
