Commit Graph

342 Commits

Author SHA1 Message Date
e77084bec4 Give OsuScreen a mutable BindableBeatmap 2018-06-06 20:19:53 +09:00
72cc53aded Rename GameBeatmap -> BindableBeatmap 2018-06-06 20:16:20 +09:00
4086ff7313 Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
# Conflicts:
#	osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
#	osu.Game/Screens/Menu/Intro.cs
#	osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
4b604bf055 Merge branch 'master' into disallow-beatmap-change 2018-06-04 10:53:04 +09:00
5c2a2e394e Fix incorrect async logic in BeatmapInfoWedge
Closes #2653.
Alternative to #2657.
2018-06-01 20:31:29 +09:00
76567ae98b Merge branch 'master' into song-selet-enumerable 2018-05-31 14:42:58 +09:00
a28e71995d Offload database query to task
Allows song select to load a touch faster, in theory.
2018-05-30 16:15:57 +09:00
54e53f7190 Fix player getting loaded when exiting song select 2018-05-30 15:48:20 +09:00
f1ac84d95b Fix base.CreateLocalDependencies sometimes not being called 2018-05-24 13:03:25 +09:00
8004b8af4d Privatise the OsuGame beatmap, add local beatmap to OsuTestCase 2018-05-23 17:38:02 +09:00
32a74f95a5 Normalize all the line endings 2018-04-13 18:26:38 +09:00
62229300c4 Fix DummyRuleset getting selected
Resolves #2261.
2018-03-22 00:26:48 +09:00
db2a663234 Use private instead of protected 2018-03-11 01:26:03 +09:00
2c0488b1f1 Invert bool, add test, and handle ruleset change. 2018-03-09 19:39:28 +05:30
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
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
510ecd7c87 Ensure selection is finalised before exiting song select
Resolves #2080.
2018-02-28 00:07:28 +09:00
ddf49c2e65 Fix intro not being replaced by a playable song when entering song select 2018-02-16 10:45:15 +09:00
d340509b1d Move ArchiveReaders to a more global namespace
Also moves delete and action logic to a shared implementation
2018-02-15 14:22:39 +09:00
6e0cb1adb3 Remove redundant arguments 2018-01-29 15:05:07 +09:00
b4e1872322 osu!-side changes in-line with framework BDL cache changes 2018-01-22 12:56:30 +09:00
3c11978cfa Use local functions 2018-01-15 21:42:17 +03:00
37d393bca0 Update licence headers 2018-01-05 20:21:19 +09:00
dfee8e911f Fix dummy beatmap selection not propagating to song select components 2017-12-31 12:55:53 +09:00
e0f23a056a Fix crash from being able to perform selection after entering play mode
Closes #1757
2017-12-28 21:07:19 +09:00
18d2be75d5 Fix random selection happening more than once on quick imports 2017-12-27 13:04:50 +09:00
3182c22c7d Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info 2017-12-26 20:36:22 +09:00
7504cd589d Move alpha handling to state 2017-12-26 20:18:47 +09:00
ee67e7119d Merge remote-tracking branch 'upstream/master' into fix-info-wedge 2017-12-26 19:44:28 +09:00
798c2c6666 Add special logic to song select to avoid obvious clipping when notifications are displayed
Not sure if we will keep this going forward (there will likely be an opaque tab control on the notifications overlay similar to options) but let's go with this for now.
2017-12-26 02:52:43 +09:00
482e10966c Ensure a selection is made on entering song select if no selection is current 2017-12-24 17:02:56 +09:00
cf316b3c51 Add tests for initial load states of PlaySongSelect 2017-12-24 15:39:25 +09:00
2313ff0ddb Fix beatmap info wedge not showing up when zero beatmaps are loaded
Closes #1722.
2017-12-22 22:19:11 +09:00
5c9d484395 Adjust debounce a bit 2017-12-22 00:50:32 +09:00
4c1f00567b Fix incorrect flush logic when starting play from non-selected difficulty using context menu 2017-12-18 11:31:38 +09:00
30a15729ec Fix event handling from outside carousel being scheduled at the wrong level
Was causing BeatmapSet's Set to run *after* newer events were received.
2017-12-18 02:46:53 +09:00
33f8c8419a Fix initial beatmap selection potentially being incorrect 2017-12-16 21:25:54 +09:00
df7e795aa3 Simplify and rename filter methods 2017-12-16 16:27:39 +09:00
59d512762e SongSelect tidying 2017-12-15 14:44:14 +09:00
5cbb9b9b18 Fix random and add tests
Also exposes SelectedBeatmapSet.
2017-12-15 14:36:51 +09:00
1b85952441 Cleanup and basic TestCase 2017-12-15 14:36:51 +09:00
99b00143eb More clean-ups and event bindings 2017-12-15 14:36:51 +09:00
78dd975a35 Initial carousel infrastructue changes 2017-12-15 14:36:51 +09:00
9fed972678 removed unnecessary using 2017-12-12 11:15:34 +01:00
d11bf379d8 no longer select beatmapsets on import/download
let's save some ears and eyes for now
2017-12-12 11:04:11 +01:00
e4628427cb moved query into schedule 2017-12-10 08:15:29 +01:00
dde7678095 select beatmap on import/download 2017-12-08 13:09:30 +01:00