Dean Herbert
|
d7cb932606
|
Merge branch 'master' into selection-update
|
2019-06-10 17:51:40 +09:00 |
|
Dean Herbert
|
600503ec8e
|
Use Task.Run/Wait to avoid warnings
|
2019-06-10 13:42:29 +09:00 |
|
Dean Herbert
|
a20eda7b5f
|
Fix remaining cases to work without things
|
2019-05-28 23:54:42 +09:00 |
|
Dean Herbert
|
4ca34bd5e8
|
Update osu! in line with audio subsystem refactor
|
2019-05-28 17:06:01 +09:00 |
|
David Zhao
|
e59a00ac6e
|
Remove excessive selection updating
|
2019-05-28 14:04:33 +09:00 |
|
Dean Herbert
|
9add2562f9
|
Close beatmap options when suspending (#4761)
Close beatmap options when suspending
|
2019-05-12 15:50:10 +09:00 |
|
Dean Herbert
|
790700d8bf
|
Use more correct calculation
|
2019-05-12 15:40:58 +09:00 |
|
Joehu
|
175daac16a
|
Close beatmap options when suspending
|
2019-05-11 21:26:42 -07:00 |
|
Joehu
|
29cec54b3c
|
Fix beatmap carousel overlapping beatmap info wedge
|
2019-05-11 20:08:45 -07:00 |
|
Dean Herbert
|
6dea16f365
|
Move action and hotkey specification local
|
2019-05-08 19:29:43 +09:00 |
|
Dean Herbert
|
772eb460fb
|
Move button definitions to their respective classes
|
2019-05-08 19:03:26 +09:00 |
|
Dean Herbert
|
9a9ac05cd9
|
Fix post-merge issues
|
2019-05-08 18:42:54 +09:00 |
|
Dean Herbert
|
41ab82cdc3
|
Merge branch 'master' into refactor-select-footer
|
2019-05-03 21:46:41 +09:00 |
|
LeNitrous
|
31341bfeb1
|
use SongSelect's SelectedMods property to ensure it exists
|
2019-05-03 16:51:33 +08:00 |
|
smoogipoo
|
0bd35ab7bb
|
Turn on warnings, resolve issues
|
2019-04-25 17:36:17 +09:00 |
|
LeNitrous
|
01cc78108c
|
add random button
|
2019-04-11 05:47:32 +08:00 |
|
LeNitrous
|
22f9339b01
|
let mods button have selected mod icons
|
2019-04-10 21:53:13 +08:00 |
|
smoogipoo
|
0222424aef
|
Make mods IReadOnlyList<Mod> gamewide
Prevents potential multiple evaluations of enumerable.
|
2019-04-10 17:20:36 +09:00 |
|
smoogipoo
|
4310f07a5c
|
Rename SelectedMods -> Mods
|
2019-04-10 12:03:57 +09:00 |
|
smoogipoo
|
cbb3fdaca8
|
Fix various crashes due to bindable being disabled
|
2019-04-09 12:59:32 +09:00 |
|
smoogipoo
|
ad124bfeec
|
Reimplement select mod track adjustments
|
2019-04-09 12:59:32 +09:00 |
|
smoogipoo
|
c584967eb1
|
Remove mods from workingbeatmap
|
2019-04-09 12:59:32 +09:00 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +09:00 |
|
Dean Herbert
|
d6f8dbfd5c
|
Merge branch 'master' into wedge-fix
|
2019-03-29 12:23:42 +09:00 |
|
Dean Herbert
|
26a73b4a65
|
Merge branch 'master' into correct-preview-loop
|
2019-03-29 12:00:58 +09:00 |
|
Dean Herbert
|
759c5b3db9
|
Restore previous resume behaviour for the time being
|
2019-03-29 10:52:26 +09:00 |
|
Dean Herbert
|
3b1f83da1d
|
Merge remote-tracking branch 'upstream/master' into correct-preview-loop
|
2019-03-29 10:31:15 +09:00 |
|
Dean Herbert
|
de80fc0eac
|
Update icon usage to match framework changes
|
2019-03-27 19:29:27 +09:00 |
|
Unknown
|
fea6adbf54
|
fix wedge bleeding into other elements (and being misaligned)
|
2019-03-27 10:12:09 +01:00 |
|
Dean Herbert
|
a10e43410a
|
Fix song select potentially starting play before the carousel (and bindables) have been initialised
|
2019-03-21 20:52:34 +09:00 |
|
Dean Herbert
|
4789aa81cb
|
Add an explicit flag for tracking song select's bindable binding
Not required (this change does not affect logic) but improves clarity.
|
2019-03-21 20:52:15 +09:00 |
|
Dean Herbert
|
96dba6a20d
|
Move nested method to bottom of class
|
2019-03-21 20:51:21 +09:00 |
|
David Zhao
|
2646126d86
|
Merge remote-tracking branch 'upstream/master' into visual-settings-container
|
2019-03-20 14:29:20 +09:00 |
|
David Zhao
|
15637f9c4a
|
Rework instant blur logic such that updateVisuals doesn't need to be public
|
2019-03-20 14:17:35 +09:00 |
|
Dean Herbert
|
e59917ed03
|
Merge remote-tracking branch 'upstream/master' into correct-preview-loop
|
2019-03-20 10:58:15 +09:00 |
|
David Zhao
|
eac7672c6b
|
Clean up debug logging
|
2019-03-18 14:03:54 +09:00 |
|
David Zhao
|
8cdfb1fd61
|
Remove BlurrableBackgroundScreen, rework tests
|
2019-03-14 16:09:17 +09:00 |
|
David Zhao
|
8714902349
|
Handle all blurring directly from background
|
2019-03-14 14:02:46 +09:00 |
|
David Zhao
|
de6d8fc637
|
Move user blurring into VIsualSettingsContainer
|
2019-03-13 18:25:22 +09:00 |
|
Dean Herbert
|
8230d5b52e
|
Ensure initial blur is set on song select background creation
We do not want the blur transition to play here
|
2019-03-12 17:27:20 +09:00 |
|
Dean Herbert
|
1954eaca4c
|
Populate an initial beatmap
|
2019-03-12 14:01:27 +09:00 |
|
Dan Balasescu
|
fd147dae21
|
Merge branch 'master' into fix-disabled-set-crash
|
2019-03-05 17:25:13 +09:00 |
|
Dean Herbert
|
c01990d005
|
Fix callback potentially not getting fired
|
2019-03-01 20:52:34 +09:00 |
|
Dean Herbert
|
19ce1f2869
|
Remove second conditional
|
2019-03-01 13:43:16 +09:00 |
|
Dean Herbert
|
798bc1306b
|
Merge remote-tracking branch 'upstream/master' into m2307-master
# Conflicts:
# osu.Game/Screens/Select/SongSelect.cs
|
2019-03-01 10:08:35 +09:00 |
|
Dean Herbert
|
80b5f1c523
|
Fix code formatting issues
|
2019-03-01 09:49:36 +09:00 |
|
Dean Herbert
|
67928ac1fe
|
Remove pointless check
|
2019-03-01 09:49:11 +09:00 |
|
Dean Herbert
|
3e1f283281
|
Merge remote-tracking branch 'upstream/master' into more-inspections
|
2019-02-28 13:09:18 +09:00 |
|
Dean Herbert
|
c8793911a8
|
Enable more stringent inspectcode style inspections
|
2019-02-27 21:25:40 +09:00 |
|
Joehu
|
5b4319a80f
|
Fix home button being cancelled by mod select again
|
2019-02-26 21:01:28 -08:00 |
|
Dean Herbert
|
56697339b3
|
Merge branch 'master' into fix-disabled-set-crash
|
2019-02-27 11:14:42 +09:00 |
|
Dean Herbert
|
6881563346
|
Merge branch 'master' into ScrollingExitFix
|
2019-02-25 19:11:05 +09:00 |
|
David Zhao
|
59ad470eed
|
Clean up test code
|
2019-02-25 18:41:13 +09:00 |
|
David Zhao
|
ad1bce3585
|
Fix song select backround not being exited in time
|
2019-02-25 18:40:19 +09:00 |
|
Dean Herbert
|
80737b9ef8
|
Remove "silent" parameter; consolidate import logic
|
2019-02-25 18:24:06 +09:00 |
|
Dean Herbert
|
3fe4b8fd1c
|
Update variable names
Also cleans up some weird code
|
2019-02-22 17:51:39 +09:00 |
|
smoogipoo
|
d8c55bc729
|
Adjust namespaces
|
2019-02-21 19:05:52 +09:00 |
|
smoogipoo
|
bca347427f
|
Update with framework bindable changes
|
2019-02-21 18:56:34 +09:00 |
|
Jamie Taylor
|
9b3f2fdd24
|
Change RelativePositionAxes default on osu! logo to be both
|
2019-02-20 19:34:55 +09:00 |
|
Dean Herbert
|
94ceb1e32b
|
Move screen change allowance to local usage
|
2019-02-14 13:28:21 +09:00 |
|
Dean Herbert
|
e2e615cc5c
|
Merge branch 'master' into leased-bindables-dont-work
|
2019-02-11 16:30:12 +09:00 |
|
smoogipoo
|
065b0c9076
|
Fix background not being faded correctly
|
2019-02-04 17:04:52 +09:00 |
|
Dean Herbert
|
ca5c8d37d1
|
Use leased bindables
|
2019-02-01 16:44:06 +09:00 |
|
Unknown
|
8c1f8ee596
|
restart correctly when leaving player (without noises)
|
2019-01-31 12:33:08 +01:00 |
|
Unknown
|
e2347ae7bf
|
Merge branch 'master' into correct-preview-loop
|
2019-01-31 10:53:09 +01:00 |
|
Dean Herbert
|
d34aa50613
|
Merge branch 'master' into iscreen
|
2019-01-31 01:08:06 +09:00 |
|
smoogipoo
|
ac0bc53c4b
|
Revert "Merge pull request #4154 from phosphene47/carousel-wedge-level"
This reverts commit cc8793a45e, reversing
changes made to 94276c8abb.
|
2019-01-31 00:02:05 +09:00 |
|
smoogipoo
|
91302ea0bc
|
Merge remote-tracking branch 'origin/master' into iscreen
# Conflicts:
# osu.Game/Screens/Multi/Match/MatchSubScreen.cs
# osu.Game/Screens/Multi/Multiplayer.cs
# osu.Game/Screens/Multi/MultiplayerSubScreen.cs
# osu.Game/Screens/OsuScreen.cs
# osu.Game/osu.Game.csproj
# osu.sln
|
2019-01-29 21:21:36 +09:00 |
|
Unknown
|
1fa87521f6
|
fix restarting with a different track in the same BeatmapSet
|
2019-01-26 07:29:30 +01:00 |
|
Unknown
|
3d5520d277
|
correctly loop from preview point in SongSelect
|
2019-01-26 07:09:01 +01:00 |
|
phosphene47
|
5c70be07ab
|
Display carousel over beatmap info wedge
|
2019-01-25 22:58:55 +11:00 |
|
smoogipoo
|
8ea7ec6445
|
Convert everything to use IScreen
|
2019-01-24 19:47:44 +09:00 |
|
Dean Herbert
|
8617aaa2a7
|
Update licence header (and remove year)
|
2019-01-24 17:43:03 +09:00 |
|
Microgolf
|
097062caf7
|
Addresses requested changes
|
2019-01-08 17:57:03 +01:00 |
|
smoogipoo
|
b17b88d071
|
Fix null beatmap possibly being selected
|
2019-01-08 18:06:46 +09:00 |
|
Matthias Coenraerds
|
472325b885
|
Verify leaderboard scope to be local
|
2019-01-06 13:37:30 +01:00 |
|
Matthias Coenraerds
|
a93c26ccfd
|
Filename does not match contained type
|
2019-01-04 20:40:07 +01:00 |
|
Matthias Coenraerds
|
3879348ee4
|
Implement clear scores on beatmap
|
2019-01-04 20:23:06 +01:00 |
|
smoogipoo
|
daa6292e08
|
Split results screen to allow for extensibility
|
2018-12-22 15:39:06 +09:00 |
|
smoogipoo
|
49dd6ae9b0
|
Move a lot more of PlaySongSelect into SongSelect
|
2018-12-12 13:21:44 +09:00 |
|
smoogipoo
|
10b526504a
|
Move ModOverlay to SongSelect
|
2018-12-06 19:29:18 +09:00 |
|
Dean Herbert
|
a33865efce
|
Fix home button being cancelled by mod select
|
2018-12-04 12:06:05 +09:00 |
|
smoogipoo
|
a8ad7d4670
|
Add silent import parameter
|
2018-11-30 18:27:13 +09:00 |
|
smoogipoo
|
d07a724970
|
Only allow replay screen changes in menu + songselect
|
2018-11-30 18:25:54 +09:00 |
|
smoogipoo
|
a88b69ec43
|
Notify of existing imports
|
2018-11-28 20:19:35 +09:00 |
|
smoogipoo
|
f27bd3ef3e
|
OpenTK -> osuTK
|
2018-11-20 17:14:59 +09:00 |
|
Kyle Chang
|
214ed43b81
|
Check if SongSelect is current screen before playing selected song
|
2018-10-30 23:47:54 -04:00 |
|
Kyle Chang
|
c7e950af7f
|
Remove EditSelected in favor in inlining beatmapNoDebounce in Edit
|
2018-10-29 00:04:51 -04:00 |
|
Kyle Chang
|
2b736c3cd6
|
Make beatmap edit button reload beatmap without mods
|
2018-10-28 13:04:45 -04:00 |
|
Kyle Chang
|
f8a8c7cb6b
|
Stop transferring track when editing
|
2018-10-28 12:43:19 -04:00 |
|
Dean Herbert
|
d28b9860ff
|
Don't use "beatmapset" terminology
|
2018-10-10 19:26:35 +09:00 |
|
Dean Herbert
|
841b2e8692
|
Merge branch 'master' into consistent-terminology-format
|
2018-10-10 19:19:36 +09:00 |
|
ekrctb
|
b7a2ad1aa5
|
Use UIEvent level getters for modifier keys.
|
2018-10-02 13:26:36 +09:00 |
|
ekrctb
|
50091252e2
|
Adapt signature change of event handlers
|
2018-10-02 12:02:55 +09:00 |
|
ekrctb
|
99fc04c8af
|
Change signature to new event handler
|
2018-10-02 12:02:47 +09:00 |
|
Paul Teng
|
654345f380
|
Remove duplicate condition test
|
2018-09-20 22:32:24 -04:00 |
|
Paul Teng
|
1644719893
|
Update SongSelect.cs
|
2018-09-20 22:29:37 -04:00 |
|
Paul Teng
|
49fbe8443a
|
Test if there are beatmaps when click on delete btn
|
2018-09-20 22:00:20 -04:00 |
|
Joehu
|
f99eff1192
|
Use consistent terminology format
|
2018-09-15 07:30:11 -07:00 |
|
Dean Herbert
|
03084aa04b
|
Revert async changes
|
2018-08-31 07:07:10 +09:00 |
|
Dean Herbert
|
919e78a89a
|
Attempt to fix cross-thread database usage
|
2018-08-29 01:42:25 +09:00 |
|
smoogipoo
|
e7a5816d27
|
Use GetAsync for all samples
|
2018-08-27 17:30:16 +09:00 |
|
Dean Herbert
|
18aa30fcb0
|
Unbind song select's ruleset to avoid test failures
|
2018-08-20 14:27:32 +09:00 |
|
smoogipoo
|
970aa811bd
|
Fix mods not being reset prior to ruleset changing
|
2018-08-14 13:19:50 +09:00 |
|
Dean Herbert
|
9ab56bc4ef
|
Make Ruleset non-public
|
2018-07-31 16:35:51 +09:00 |
|
Dean Herbert
|
95cca046fb
|
Merge branch 'master' into open-downloaded-beatmas
|
2018-07-25 12:38:49 +02:00 |
|
Dean Herbert
|
0f37758314
|
Update framework
|
2018-07-21 16:21:53 +09:00 |
|
Dean Herbert
|
64ead0fdf7
|
Add more tests and fix one remaining issue case
|
2018-07-20 11:55:17 +09:00 |
|
Dean Herbert
|
d7f1766ee2
|
wip
|
2018-07-19 18:51:08 +09:00 |
|
Dean Herbert
|
c31676f8f1
|
Rework update methods to separate out ruleset and beatmap changes
Combining them was causing complexity and logic errors.
|
2018-07-19 18:48:40 +09:00 |
|
Dean Herbert
|
f1c3fbe644
|
Improve integrity of song select bind/change logic
|
2018-07-18 13:18:50 +09:00 |
|
Dean Herbert
|
4f5578245e
|
Fix regression causing previews to not play
|
2018-07-13 21:45:49 +09:00 |
|
Dean Herbert
|
63c40e9051
|
Remove unnecessary cache operations
|
2018-07-13 21:45:42 +09:00 |
|
Dean Herbert
|
ac078153ae
|
Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods
|
2018-07-13 14:20:56 +09:00 |
|
Dean Herbert
|
fbc5250bf1
|
Update framework
|
2018-07-11 17:12:01 +09:00 |
|
Dean Herbert
|
9e59b4a8e2
|
Fix SongSelect binding to ruleset too early
Causes music to stop playing while at main menu.
|
2018-07-10 01:29:24 +09:00 |
|
Dan Balasescu
|
ee4607c86e
|
Merge branch 'master' into fix-exit-race-condition
|
2018-07-09 19:02:37 +09:00 |
|
Dean Herbert
|
49e94850b6
|
Fix being able to trigger player before carousel is ready
Causes an eventual crash.
|
2018-07-09 18:43:20 +09:00 |
|
Dean Herbert
|
09b3375a9d
|
Fix pressing escape too fast causing multiple exit attempts at song select
|
2018-07-09 18:12:23 +09:00 |
|
Dean Herbert
|
e28a610757
|
Fix mods not correctly resetting when changing ruleset at song select
|
2018-07-05 13:22:52 +09:00 |
|
Dean Herbert
|
5fc17bacf3
|
Add "Select" action
Allows progressing forwards in the interface
|
2018-07-03 18:39:15 +09:00 |
|
smoogipoo
|
6d6436c8d3
|
Fix ruleset not getting updated if changed
|
2018-06-29 20:50:39 +09:00 |
|
smoogipoo
|
9187eb8626
|
SongSelect needs to recache as IBindable
|
2018-06-29 20:50:30 +09:00 |
|
Dean Herbert
|
1c32951d4b
|
Ensure toolbar triggers updates to SongSelect's ruleset
|
2018-06-29 19:32:42 +09:00 |
|
Dean Herbert
|
6d6fcc953b
|
Trim lines
|
2018-06-29 19:25:20 +09:00 |
|
Dean Herbert
|
4dd12cedad
|
Fix review issues
|
2018-06-26 17:01:40 +09:00 |
|
Dean Herbert
|
b0a1b25983
|
Privatise game ruleset and access via DI
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
|
2018-06-26 16:32:32 +09:00 |
|
Dean Herbert
|
475fb06559
|
Use new bind method
|
2018-06-07 16:46:54 +09:00 |
|
smoogipoo
|
e77084bec4
|
Give OsuScreen a mutable BindableBeatmap
|
2018-06-06 20:19:53 +09:00 |
|
smoogipoo
|
72cc53aded
|
Rename GameBeatmap -> BindableBeatmap
|
2018-06-06 20:16:20 +09:00 |
|
smoogipoo
|
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 |
|
Dean Herbert
|
4b604bf055
|
Merge branch 'master' into disallow-beatmap-change
|
2018-06-04 10:53:04 +09:00 |
|
Dean Herbert
|
5c2a2e394e
|
Fix incorrect async logic in BeatmapInfoWedge
Closes #2653.
Alternative to #2657.
|
2018-06-01 20:31:29 +09:00 |
|
Dan Balasescu
|
76567ae98b
|
Merge branch 'master' into song-selet-enumerable
|
2018-05-31 14:42:58 +09:00 |
|
Dean Herbert
|
a28e71995d
|
Offload database query to task
Allows song select to load a touch faster, in theory.
|
2018-05-30 16:15:57 +09:00 |
|
Dean Herbert
|
54e53f7190
|
Fix player getting loaded when exiting song select
|
2018-05-30 15:48:20 +09:00 |
|
smoogipoo
|
f1ac84d95b
|
Fix base.CreateLocalDependencies sometimes not being called
|
2018-05-24 13:03:25 +09:00 |
|
smoogipoo
|
8004b8af4d
|
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
|
2018-05-23 17:38:02 +09:00 |
|
Dean Herbert
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|
Dean Herbert
|
62229300c4
|
Fix DummyRuleset getting selected
Resolves #2261.
|
2018-03-22 00:26:48 +09:00 |
|
Dean Herbert
|
db2a663234
|
Use private instead of protected
|
2018-03-11 01:26:03 +09:00 |
|
naoey
|
2c0488b1f1
|
Invert bool, add test, and handle ruleset change.
|
2018-03-09 19:39:28 +05:30 |
|
naoey
|
d04f47718f
|
Make song select choose random when initial selection fails.
- Revert TestCasePlaySongSelect to master
|
2018-03-09 17:36:55 +05:30 |
|
naoey
|
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 |
|
naoey
|
a57dc154f9
|
More specific tests.
|
2018-03-03 20:34:29 +05:30 |
|
naoey
|
307147a8a3
|
Merge remote-tracking branch 'upstream/master' into fix-unplayable-beatmaps
|
2018-03-03 16:10:22 +05:30 |
|
naoey
|
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 |
|
Dean Herbert
|
510ecd7c87
|
Ensure selection is finalised before exiting song select
Resolves #2080.
|
2018-02-28 00:07:28 +09:00 |
|
Dean Herbert
|
ddf49c2e65
|
Fix intro not being replaced by a playable song when entering song select
|
2018-02-16 10:45:15 +09:00 |
|
Dean Herbert
|
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 |
|