Dean Herbert
|
8906eb874a
|
Fix CI issues
|
2019-05-08 18:43:06 +09:00 |
|
Dean Herbert
|
9a9ac05cd9
|
Fix post-merge issues
|
2019-05-08 18:42:54 +09:00 |
|
Lucas A
|
a5f758b977
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-05-07 18:27:14 +02:00 |
|
smoogipoo
|
d7c09e7dbd
|
Merge remote-tracking branch 'origin/master' into fix-new-inspections
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
|
2019-05-07 13:20:17 +09:00 |
|
Lucas A
|
d5d31282e5
|
Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes
|
2019-05-05 20:55:42 +02: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 |
|
LeNitrous
|
009eaa647a
|
fixes to FooterButtonRandom
|
2019-05-03 16:38:15 +08:00 |
|
Lucas A
|
5d4aa5a12e
|
Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus
|
2019-05-02 20:51:19 +02:00 |
|
Lucas A
|
7e42068a14
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-04-28 19:48:35 +02:00 |
|
Dean Herbert
|
d40177f97c
|
Merge branch 'master' into drawnode-composability
|
2019-04-27 18:41:19 +09:00 |
|
smoogipoo
|
0bd35ab7bb
|
Turn on warnings, resolve issues
|
2019-04-25 17:36:17 +09:00 |
|
Lucas A
|
5887008fb3
|
Merge branch 'master' into user-status-wiring
|
2019-04-15 11:43:53 +02:00 |
|
LeNitrous
|
2d227d25cc
|
fix appveyor warnings
|
2019-04-14 07:55:15 +08:00 |
|
LeNitrous
|
91c327a90f
|
use ModDisplay
|
2019-04-14 07:22:31 +08:00 |
|
Lucas A
|
da5d6cb1d4
|
Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap
|
2019-04-12 22:54:35 +02:00 |
|
LeNitrous
|
01cc78108c
|
add random button
|
2019-04-11 05:47:32 +08:00 |
|
LeNitrous
|
b4d0755818
|
please appveyor
|
2019-04-10 22:10:09 +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 |
|
smoogipoo
|
772bef91fa
|
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
|
2019-04-08 23:01:12 +09:00 |
|
Ferdinand Bachmann
|
d431ca4efc
|
BeatmapLeaderboard: use OrderByDescending instead of negation
(suggested by peppy)
|
2019-04-07 13:26:35 +02:00 |
|
theFerdi265
|
cb3532e7d4
|
BeatmapLeaderboard: fix local scores not being sorted
|
2019-04-06 00:53:02 +02:00 |
|
Samuel Van Allen
|
bb516da5b6
|
Removed redundant empty argument list
|
2019-04-03 22:57:05 +08:00 |
|
Samuel Van Allen
|
3660924441
|
Trimmed whitespace
|
2019-04-03 22:40:20 +08:00 |
|
Samuel Van Allen
|
4d60f6fb6a
|
Use collection initializer and added missing blank line
|
2019-04-03 22:37:50 +08:00 |
|
Samuel Van Allen
|
73c7c6c316
|
Hides "Details" button when OnlineBeatmapID is null
|
2019-04-03 21:44:36 +08:00 |
|
Dean Herbert
|
f1952c0816
|
Update font awesome usage
|
2019-04-02 19:55:24 +09:00 |
|
smoogipoo
|
a56e29347f
|
Adjust namespaces
|
2019-04-02 14:51:28 +09:00 |
|
Dean Herbert
|
c39c37a18d
|
Apply more missed cases
|
2019-04-01 12:44:46 +09:00 |
|
Dean Herbert
|
612db31c38
|
Apply newline additions
|
2019-04-01 12:16:32 +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 |
|
Dan Balasescu
|
5de99f3f5b
|
Merge branch 'master' into fix-random-select-crash
|
2019-03-22 14:11:06 +09:00 |
|
Dean Herbert
|
37010f97d7
|
Fix random select crashing
Closes #3383.
|
2019-03-21 21:02:54 +09: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 |
|
Dean Herbert
|
e2503888a4
|
Expose carousel's loaded flag
|
2019-03-21 20:51:06 +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
|
f1b2073bf6
|
Merge remote-tracking branch 'upstream/master' into visual-settings-container
|
2019-03-19 13:01:05 +09:00 |
|
Dean Herbert
|
14df9f94e2
|
Merge branch 'master' into fix-background-loading
|
2019-03-18 14:59:35 +09:00 |
|
David Zhao
|
eac7672c6b
|
Clean up debug logging
|
2019-03-18 14:03:54 +09:00 |
|
Dean Herbert
|
392a0a1d74
|
Merge branch 'master' into update-framework
|
2019-03-18 11:34:59 +09:00 |
|
Dan Balasescu
|
e0b3149e32
|
Merge branch 'master' into api-testability
|
2019-03-18 10:59:06 +09:00 |
|
Dean Herbert
|
c496f6e56b
|
Fix usages of OnLoadComplete
|
2019-03-17 13:44:20 +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 |
|
Jamie Taylor
|
69eb4ef983
|
Change updateMetrics parameter to be optional
|
2019-03-14 13:35:49 +09:00 |
|
Dean Herbert
|
dd6fbccb56
|
Slight refactoring of order for readability
|
2019-03-13 19:57:45 +09:00 |
|
David Zhao
|
de6d8fc637
|
Move user blurring into VIsualSettingsContainer
|
2019-03-13 18:25:22 +09:00 |
|
Jamie Taylor
|
e6449db8e3
|
Null metrics on null beatmap for transition animation
|
2019-03-13 14:13:42 +09:00 |
|
Dean Herbert
|
f0114d776d
|
Use interface to access API
Allows for better testability.
|
2019-03-13 12:58:18 +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 |
|
Dean Herbert
|
9df27f3a5f
|
Merge branch 'master' into prevent-null-lookup
|
2019-03-09 11:14:54 +09:00 |
|
Jamie Taylor
|
8e5816805c
|
Fix showing outdated data for non-online beatmaps
|
2019-03-08 18:44:35 +09:00 |
|
Jamie Taylor
|
c34e110a2c
|
Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel
|
2019-03-07 17:01:24 +09:00 |
|
Jamie Taylor
|
054db48089
|
Move online id null check to only bypass metrics lookup
|
2019-03-07 16:59:43 +09:00 |
|
Jamie Taylor
|
e5e454ddcd
|
Don't perform lookup of beatmap stats unless an online id is present
|
2019-03-07 16:17:12 +09:00 |
|
Jamie Taylor
|
e13516c2ba
|
Only attempt to restore CurrentItem state if present
|
2019-03-07 14:09:28 +09:00 |
|
Jamie Taylor
|
6e5ea78ca2
|
Fix some nullref crashes when escaping out of new room creation
|
2019-03-06 20:03:37 +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
|
49cbaecf4c
|
Update licence header
|
2019-03-01 10:52:53 +09:00 |
|
Dean Herbert
|
acc2113027
|
Make operation run asynchronously
|
2019-03-01 10:09:03 +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 |
|
Dan Balasescu
|
a37445a938
|
Merge branch 'master' into better-mp-songselect-deletion-handling
|
2019-02-28 17:35:08 +09:00 |
|
Jamie Taylor
|
4c8aa65200
|
private + renaming
|
2019-02-28 17:02:45 +09:00 |
|
Jamie Taylor
|
6e821a426d
|
Fix restoration of enabled mods when cancelling song select
|
2019-02-28 15:06:11 +09:00 |
|
Dean Herbert
|
0788a7e9f1
|
Merge branch 'master' into more-inspections
|
2019-02-28 14:32:57 +09:00 |
|
Dean Herbert
|
42be7857d1
|
Use expression body for property get/set where possible
|
2019-02-28 13:58:19 +09:00 |
|
Dean Herbert
|
26d53d06a9
|
Fix remaining issues
|
2019-02-28 13:31:40 +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 |
|
Jamie Taylor
|
a3f71d69a9
|
Ensure ruleset and mods are set correctly when leaving MatchSongSelect
|
2019-02-27 16:16:13 +09:00 |
|
Jamie Taylor
|
7c2ffb1826
|
Fix MatchSongSelect not handling beatmapset deletions
|
2019-02-27 14:34:39 +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
|
d9872dda12
|
Use fade instead of negative margin
|
2019-02-26 16:10:06 +09:00 |
|
Dean Herbert
|
2d6d9dd723
|
Add better easing
|
2019-02-26 16:09:45 +09:00 |
|
Dean Herbert
|
c1432b2ed5
|
Add back newline
|
2019-02-26 15:48:34 +09:00 |
|
Dean Herbert
|
97dc7f9819
|
Merge branch 'master' into MissingSource
|
2019-02-25 19:35:44 +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
|
367bc53a06
|
Revert some more instances of 'e' variable names
|
2019-02-22 20:15:25 +09:00 |
|
Dean Herbert
|
3015d40f8f
|
Merge branch 'master' into osu-fontusage
|
2019-02-22 18:09:23 +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 |
|
smoogipoo
|
4db5531e4b
|
Replace copy-constructor/method with extension method
|
2019-02-20 19:32:30 +09:00 |
|
smoogipoo
|
dbfa95b9e7
|
Made medium the default font weight
|
2019-02-20 16:52:36 +09:00 |
|
smoogipoo
|
0693ab8e7d
|
Merge remote-tracking branch 'origin/master' into osu-fontusage
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
|
2019-02-20 15:04:08 +09:00 |
|
smoogipoo
|
a2aa3ec5cb
|
Adjust sprite texts in-line with framework changes
|
2019-02-20 15:03:20 +09:00 |
|
ThePyrotechnic
|
7bb56a198a
|
Merge branch 'master' into MissingSource
|
2019-02-17 19:54:43 +00:00 |
|
Dean Herbert
|
94ceb1e32b
|
Move screen change allowance to local usage
|
2019-02-14 13:28:21 +09:00 |
|
Dean Herbert
|
e604806398
|
Fix regression in screen change allowance logic
|
2019-02-13 19:43:01 +09:00 |
|
Dean Herbert
|
ab3adafafd
|
Fix crashes after entering player
|
2019-02-13 14:13:54 +09:00 |
|
Michael Manis
|
5fbdbcf209
|
removed 'unknown source' line
|
2019-02-12 15:30:42 -05:00 |
|
Dean Herbert
|
e2e615cc5c
|
Merge branch 'master' into leased-bindables-dont-work
|
2019-02-11 16:30:12 +09:00 |
|
Michael Manis
|
cfe14dcdb1
|
Options for handing unknown beatmap source
|
2019-02-10 18:31:39 -05: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
|
f85518b175
|
Don't expose padding
|
2019-01-31 18:16:28 +09: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 |
|
Unknown
|
6eff79913b
|
remove blank lines
|
2019-01-11 10:34:56 +01: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
|
562c9e56fb
|
Fix naming
|
2019-01-06 13:38:43 +01: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
|
dae710f9a6
|
Make leaderboard top not fade by default
|
2018-12-27 17:29:55 +09:00 |
|
Dean Herbert
|
67e200e1b2
|
Leaderboard design updates
|
2018-12-27 15:52:40 +09:00 |
|
Dean Herbert
|
8cf30bdb6a
|
Play with delegate
|
2018-12-26 22:16:35 +09:00 |
|
Dean Herbert
|
2353c204ee
|
Renaming
|
2018-12-26 20:05:57 +09:00 |
|
smoogipoo
|
2f32c4d4d1
|
Fix title of match song select
|
2018-12-25 17:17:51 +09:00 |
|
smoogipoo
|
02365ee5ba
|
Merge remote-tracking branch 'origin/master' into timeshift-wip
|
2018-12-22 23:23:21 +09:00 |
|
Dan Balasescu
|
e6c197e9aa
|
Merge branch 'master' into improve-text-search
|
2018-12-22 16:38:50 +09:00 |
|
smoogipoo
|
daa6292e08
|
Split results screen to allow for extensibility
|
2018-12-22 15:39:06 +09:00 |
|
smoogipoo
|
ac0e6f8d42
|
Fix post-merge issues
|
2018-12-22 15:35:22 +09:00 |
|
smoogipoo
|
bdb6e03dfb
|
Merge remote-tracking branch 'peppy/leaderboard-modularity' into timeshift-wip
# Conflicts:
# osu.Game/Online/Leaderboards/Leaderboard.cs
# osu.Game/Online/Leaderboards/LeaderboardScore.cs
# osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
# osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
|
2018-12-22 15:33:26 +09:00 |
|
Dean Herbert
|
787e65c3c5
|
Reduce generic-ness
|
2018-12-22 15:20:35 +09:00 |
|
smoogipoo
|
e657f13c15
|
Separate out Leaderboard into BeatmapLeaderboard
|
2018-12-22 14:44:36 +09:00 |
|
smoogipoo
|
8a2cc64bfa
|
Split results screen to allow for extensibility
|
2018-12-21 16:34:03 +09:00 |
|
Dean Herbert
|
eec5afa382
|
Change inspection and add redundant parenthesis to appease codefactor
|
2018-12-15 16:37:37 +09:00 |
|
Dean Herbert
|
3892454ecc
|
Improve the way text search works at song select
|
2018-12-15 16:34:48 +09:00 |
|
smoogipoo
|
d9fc7c7d66
|
Separate out Leaderboard into BeatmapLeaderboard
|
2018-12-14 19:51:27 +09:00 |
|
smoogipoo
|
5f0069eb83
|
Fix incorrect ruleset being sent to API
|
2018-12-14 17:35:05 +09:00 |
|
smoogipoo
|
56fd4b95cd
|
Fix mod/beatmap selection not always working
|
2018-12-14 13:38:27 +09:00 |
|
smoogipoo
|
208273f16a
|
Merge branch 'timeshift'
# Conflicts:
# osu.Game/osu.Game.csproj
|
2018-12-13 17:06:20 +09:00 |
|
smoogipoo
|
49dd6ae9b0
|
Move a lot more of PlaySongSelect into SongSelect
|
2018-12-12 13:21:44 +09:00 |
|
smoogipoo
|
1ac615b490
|
Renamespace
|
2018-12-10 19:27:25 +09:00 |
|
smoogipoo
|
10b526504a
|
Move ModOverlay to SongSelect
|
2018-12-06 19:29:18 +09:00 |
|
smoogipoo
|
a7ac544e12
|
Add interface for the multiplayer screen short title
|
2018-12-04 17:43:44 +09:00 |
|
Dean Herbert
|
415349e6ef
|
Add missing return
|
2018-12-04 12:14:26 +09:00 |
|
Dean Herbert
|
a33865efce
|
Fix home button being cancelled by mod select
|
2018-12-04 12:06:05 +09:00 |
|
smoogipoo
|
b1c5b43767
|
Fix post-rebase errors
|
2018-11-30 18:46:47 +09:00 |
|
smoogipoo
|
10ed09521c
|
Add leaderboard display for local scores
|
2018-11-30 18:40:53 +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 |
|
Dean Herbert
|
831cd3ed59
|
ScoreInfo scoreInfo -> ScoreInfo score
|
2018-11-30 15:18:52 +09:00 |
|
smoogipoo
|
a88b69ec43
|
Notify of existing imports
|
2018-11-28 20:19:35 +09:00 |
|
smoogipoo
|
219929eb47
|
Score -> ScoreInfo
|
2018-11-28 18:33:01 +09:00 |
|
smoogipoo
|
09b79d736b
|
Remove unused usings
|
2018-11-28 16:33:42 +09:00 |
|
smoogipoo
|
5fd6e6ca77
|
Re-namespacing
|
2018-11-28 16:12:57 +09:00 |
|
Dean Herbert
|
6cd69b794d
|
Fix leaderboard accessing drawables in a possibly invalid state
|
2018-11-22 19:08:46 +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
|
886dd0f0d4
|
Remove unneeded using directive
|
2018-10-28 13:21:12 -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 |
|
HoLLy
|
cf3b4447eb
|
Fade only textContainer instead of entire MetadataSection
|
2018-10-26 13:35:51 +02:00 |
|
HoLLy
|
88aca46500
|
Fade MetadataSection back in if non-null Text is set
|
2018-10-24 18:53:22 +02:00 |
|
Dean Herbert
|
2babdc079c
|
Merge pull request #3568 from smoogipoo/fix-beatmap-details
Fix beatmap details not displaying
|
2018-10-10 20:14:58 +09: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 |
|
smoogipoo
|
6d24bde72b
|
Fix beatmap details not displaying
|
2018-10-09 17:39:27 +09:00 |
|
ekrctb
|
68980fc477
|
Adjust usage of Handle(Non)PositionalInput to follow framework update
|
2018-10-02 14:45:33 +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 |
|
Dean Herbert
|
6841d5c2ec
|
Merge remote-tracking branch 'smoogipoo/fix-beatmapinfowedge' into update-framework
|
2018-09-28 18:32:59 +09:00 |
|
Dean Herbert
|
a4bf21268b
|
Merge remote-tracking branch 'upstream/master' into update-framework
|
2018-09-26 19:59:18 +09:00 |
|
smoogipoo
|
a8f156584b
|
Update framework with positional/non-positional changes
|
2018-09-26 14:01:15 +09:00 |
|
smoogipoo
|
cb500e80e4
|
Make BeatmapInfoWedge present until info is not null
|
2018-09-25 14:45:26 +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 |
|
Dean Herbert
|
37f3035437
|
Merge remote-tracking branch 'upstream/master' into update-framework
|
2018-09-20 18:39:48 +09:00 |
|
smoogipoo
|
62135c39aa
|
Cleanup
|
2018-09-20 12:56:39 +09:00 |
|
smoogipoo
|
7b8094d731
|
Move text size/padding out of constructor
|
2018-09-20 12:53:45 +09:00 |
|
Dean Herbert
|
b2cf636ab5
|
Merge branch 'localisation-changes' into update-framework
|
2018-09-20 00:29:31 +09:00 |
|
smoogipoo
|
38a3c2a820
|
Fix song select wedge sometimes not updating when localisation changes
|
2018-09-19 14:57:32 +09:00 |
|
smoogipoo
|
28f31540c4
|
Apply changes in-line with framework localisation changes
|
2018-09-19 14:07:46 +09:00 |
|
Joehu
|
f99eff1192
|
Use consistent terminology format
|
2018-09-15 07:30:11 -07:00 |
|
Unknown
|
04853b8c83
|
don't show StatusPill without a difficulty
|
2018-09-13 13:49:57 +02:00 |
|
Unknown
|
5414ce9932
|
add StatusPill to BeatmapInfoWedge and DrawabelCarouselBeatmapSet
|
2018-09-13 10:18:20 +02:00 |
|
Dean Herbert
|
81da7ce298
|
Merge branch 'master' into add-skin-import-delete
|
2018-09-07 16:48:01 +09:00 |
|
Dean Herbert
|
c23b9b61a8
|
Simplify implementation in line with framework improvements
|
2018-09-06 17:28:08 +09:00 |
|
Dean Herbert
|
e63f60231a
|
Optimise carousel memory usage by unloading off-screen panels
|
2018-09-06 13:31:37 +09:00 |
|
Dean Herbert
|
fa569e5ae4
|
Offer to import skins on first startup
|
2018-09-03 10:10:39 +09:00 |
|
Dean Herbert
|
144e80dff6
|
Add "import all skins from stable" option (and mass delete)
|
2018-09-03 10:10:04 +09: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 |
|
smoogipoo
|
1b279d383f
|
Use GetAsync on all textures
|
2018-08-27 17:26:44 +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
|
4453b5faca
|
Cache mods at PlaySongSelect
|
2018-08-08 12:43:08 +09:00 |
|
Dean Herbert
|
4cb7063801
|
Add automated testing of mod preservation/removal
|
2018-08-07 16:45:18 +09:00 |
|
Dean Herbert
|
7b8bd7f21c
|
Fix mod selection not restoring when re-entering song select
|
2018-08-07 14:49:44 +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
|
1b456fd716
|
Fix a potential InvalidOperationException when entering song select
Closes #3052.
|
2018-07-23 13:11:06 +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
|
9611292f4e
|
FilterTask -> PendingFilter
|
2018-07-18 13:18:50 +09:00 |
|
Dean Herbert
|
f1c3fbe644
|
Improve integrity of song select bind/change logic
|
2018-07-18 13:18:50 +09:00 |
|
Dan Balasescu
|
745d596343
|
Merge branch 'master' into fix-incorrect-mods
|
2018-07-17 13:41:02 +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
|
bbb11a4066
|
Fix regression in drawable rank first display
|
2018-07-13 19:53:29 +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 |
|
smoogipoo
|
0a67e5a274
|
Fix some possible null reference exceptions
|
2018-07-09 17:09:17 +09:00 |
|
Dan Balasescu
|
8f3f872182
|
Merge branch 'master' into go-forward
|
2018-07-06 14:29:26 +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 |
|
Joehu
|
d476842c44
|
Fix FooterButton clicking area
|
2018-07-02 22:03:17 -07:00 |
|
Dan Balasescu
|
118366303c
|
Merge branch 'master' into fix-leaderboard-placeholder
|
2018-07-02 17:17:40 +09:00 |
|
smoogipoo
|
4070c1a888
|
Merge remote-tracking branch 'origin/master' into non-null-ruleset
# Conflicts:
# osu.Game/Screens/Select/FilterControl.cs
|
2018-07-02 15:05:34 +09:00 |
|
Dean Herbert
|
2c597874bf
|
Fix leaderboard showing placeholder briefly when entering song select
|
2018-07-01 18:17:02 +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
|
06bd3d4815
|
Use IBindable where possible
|
2018-06-29 20:28:28 +09:00 |
|
Dean Herbert
|
9fce4eaccf
|
Merge branch 'master' into di-backed-ruleset
|
2018-06-29 19:33:12 +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
|
a377e87bf6
|
Add missing licence headers
|
2018-06-28 17:34:04 +09:00 |
|
Dean Herbert
|
c44a81bdf5
|
Add word wrap support
|
2018-06-28 13:04:39 +09:00 |
|
Joehu
|
8518fce4a9
|
Fix osu!supporter naming
|
2018-06-27 17:57:55 -07:00 |
|
Dean Herbert
|
4bcc05a7fc
|
Remove null checks on ruleset
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
|
2018-06-26 18:24:34 +09:00 |
|
Dean Herbert
|
4dd12cedad
|
Fix review issues
|
2018-06-26 17:01:40 +09:00 |
|
Dean Herbert
|
13480feb4f
|
Remove error logging
Already logged to network.log with ample detail.
|
2018-06-26 16:38:19 +09:00 |
|
Dean Herbert
|
388ca5d572
|
Move leaderboard update scheduling to a more central method
|
2018-06-26 16:33:22 +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
|
96100a2200
|
Remove schedule logic (seems unnecessary)
|
2018-06-20 17:41:48 +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
|
d2633a706d
|
Merge branch 'master' into score-component-tooltips
|
2018-06-06 09:06:22 +09:00 |
|
Dean Herbert
|
00c8d2ff11
|
Merge branch 'master' into source-link-colour
|
2018-06-06 08:27:28 +09:00 |
|
Dean Herbert
|
4b604bf055
|
Merge branch 'master' into disallow-beatmap-change
|
2018-06-04 10:53:04 +09:00 |
|
DrabWeb
|
a7bab14b30
|
Add tooltip to ScoreComponentLabel.
|
2018-06-03 22:26:30 -03:00 |
|
DrabWeb
|
db4c26e1ab
|
Rewrite ScoreComponentLabel.
|
2018-06-03 22:22:44 -03:00 |
|
Joehu
|
bd7c9cd8bf
|
Set 'Colour' when creating 'textFlow'
|
2018-06-03 17:41:34 -07:00 |
|
Joehu
|
5c713ac2ab
|
Use default colour in MetadataSection
|
2018-06-03 07:51:57 -07:00 |
|
Joehu
|
dc2a004c87
|
Remove link colours for all unlinked text
|
2018-06-02 12:04:58 -07:00 |
|
Dean Herbert
|
5c2a2e394e
|
Fix incorrect async logic in BeatmapInfoWedge
Closes #2653.
Alternative to #2657.
|
2018-06-01 20:31:29 +09:00 |
|
Joehu
|
b4d621a2cb
|
Add link colour to beatmap source
|
2018-05-31 10:21:22 -07: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 |
|
Joehu
|
46c6c1d07e
|
Allow drag clicking footer and filter on song select
|
2018-05-20 20:25:39 -07:00 |
|
Dean Herbert
|
d20011ba58
|
Fix an endless feedback loop
|
2018-05-17 17:56:29 +09:00 |
|
Dean Herbert
|
db0470243a
|
Fix nullref when changing ruleset at main menu
|
2018-05-13 12:55:54 +09:00 |
|
smoogipoo
|
fd9796d08c
|
Remove some unnecessary changes
|
2018-05-11 14:13:52 +09:00 |
|
smoogipoo
|
816ad5c426
|
Pass down ruleset to the buffered wedge
|
2018-05-11 14:10:53 +09:00 |
|
smoogipoo
|
fbd7ccc03f
|
Make BeatmapInfoWedge display properly for converts
|
2018-05-07 15:51:08 +09:00 |
|
smoogipoo
|
5489976c20
|
Implement ruleset-specific beatmap statistics
|
2018-05-07 15:51:08 +09:00 |
|
smoogipoo
|
9128e64c9a
|
Rename OriginalBeatmap back to Beatmap
|
2018-05-07 10:29:38 +09:00 |
|
smoogipoo
|
77e661489d
|
Merge branch 'i-beatmap' into beatmap-conversion-rework
|
2018-05-07 10:00:24 +09:00 |
|
smoogipoo
|
1aefd71b65
|
Merge remote-tracking branch 'origin/master' into i-beatmap
|
2018-05-07 09:58:53 +09:00 |
|
Dean Herbert
|
3886e75959
|
Fix potentially missing group headers in beatmap carousel
|
2018-04-24 01:52:25 +09:00 |
|
Dean Herbert
|
2d1cef79d6
|
Fix instability in carousel item sorting
|
2018-04-23 19:01:01 +09:00 |
|
Dean Herbert
|
c77f339444
|
Merge remote-tracking branch 'upstream/master' into show-beatmap-id
|
2018-04-20 12:41:38 +09:00 |
|
smoogipoo
|
03a5df84c6
|
Initial rework of beatmap conversion process
|
2018-04-19 22:04:12 +09:00 |
|
Dean Herbert
|
f7ca6267b1
|
Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability
|
2018-04-19 20:53:06 +09:00 |
|
smoogipoo
|
66b3b295e7
|
Use IBeatmap wherever possible
|
2018-04-19 20:44:38 +09:00 |
|
Dean Herbert
|
e395a47112
|
Changes to naming and text
|
2018-04-18 19:47:13 +09:00 |
|
Dean Herbert
|
bd834dd487
|
Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling
|
2018-04-18 19:46:59 +09:00 |
|
Dean Herbert
|
1728dd6502
|
Make BeatmapSetOverlay accept nulls everywhere
|
2018-04-18 16:42:09 +09:00 |
|
Dean Herbert
|
7e5d5a197b
|
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
|
2018-04-18 16:41:01 +09:00 |
|
Dean Herbert
|
1be2571d33
|
Make BeatmapSetOverlay accept nulls everywhere
|
2018-04-18 16:08:45 +09:00 |
|
Dean Herbert
|
f62677222c
|
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
|
2018-04-18 13:08:53 +09:00 |
|
Dean Herbert
|
188c8ce1e7
|
Remove unnecessary score nulling (already happens in PlaceholderState_Set)
|
2018-04-18 11:58:55 +09:00 |
|
Dean Herbert
|
a27f39a555
|
Add documentation explaining intertwining logic
|
2018-04-18 11:57:06 +09:00 |
|
smoogipoo
|
9af6ef1864
|
Remove extra unneded safety
|
2018-04-16 17:48:49 +09:00 |
|
smoogipoo
|
b9220a1e29
|
Fix leaderboard placeholder sometimes disappearing indefinitely
|
2018-04-16 17:39:55 +09:00 |
|
smoogipoo
|
1b9d54a6ad
|
Fix various data races causing crashes or incorrect leaderboard states
|
2018-04-16 17:39:03 +09:00 |
|
Dean Herbert
|
81f0649e44
|
Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling
|
2018-04-13 19:50:44 +09:00 |
|
tgi74000
|
1a2b1d4c98
|
Use the already existent RightMouseScrollbar field
|
2018-04-13 11:32:33 +02:00 |
|
Dean Herbert
|
32a74f95a5
|
Normalize all the line endings
|
2018-04-13 18:26:38 +09:00 |
|
tgi74000
|
e3cd0ef200
|
Add right click scrolling in song select (and its option)
|
2018-04-13 11:09:49 +02:00 |
|
Dean Herbert
|
c33cb9c02e
|
Merge branch 'master' into show-beatmap-id
|
2018-04-10 16:05:32 +09:00 |
|
Endrik
|
c7440201fb
|
Merge branch 'master' into alt-eagerselect
|
2018-04-06 12:37:16 +03:00 |
|
naoey
|
7482d5986a
|
Add a loading state to BeatmapSetOverlay.
- Handle null value in header and info sections
- Add item to context menu for carousel beatmaps to show details
|
2018-04-04 21:46:31 +05:30 |
|
smoogipoo
|
69e2d4fd22
|
Make CarouselRoot a nested class
|
2018-04-02 15:24:08 +09:00 |
|
smoogipoo
|
82a847b820
|
Extract random selection logic into CarouselRoot
|
2018-04-02 15:16:10 +09:00 |
|
Huo Yaoyuan
|
b842f682eb
|
Use Linq.Append and Prepend.
|
2018-04-02 12:06:34 +08:00 |
|
Endrik Tombak
|
7e30375443
|
Use selectNextRandom instead
|
2018-03-30 10:46:46 +03:00 |
|
Endrik Tombak
|
3f65e3a7e3
|
Make selection at random when last was null
|
2018-03-30 00:15:32 +03:00 |
|
smoogipoo
|
097ab66182
|
Fix resharper error
|
2018-03-25 01:54:25 +09:00 |
|
Dean Herbert
|
0e669c9a3f
|
Fix many warnings
|
2018-03-24 18:23:22 +09:00 |
|
smoogipoo
|
c29f7a4333
|
Merge remote-tracking branch 'origin/master' into netstandard
|
2018-03-24 14:49:46 +09:00 |
|
Dean Herbert
|
d4aeb3d00b
|
Fix BeatmapCarousel's flush not correctly applying selection changes
They may have been delayed until the next Update, which is too late in this case.
|
2018-03-23 12:10:13 +09:00 |
|
Dean Herbert
|
62229300c4
|
Fix DummyRuleset getting selected
Resolves #2261.
|
2018-03-22 00:26:48 +09:00 |
|
FreezyLemon
|
95c84ea7fe
|
remove (now) unnecessary line
|
2018-03-12 23:00:06 +01:00 |
|
FreezyLemon
|
ddc1f03a96
|
deselect autoplay button after ctrl-enter play
before, the mod was removed, but the button was still active
|
2018-03-12 22:35:45 +01: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 |
|
Dean Herbert
|
81c1ec2005
|
Merge branch 'master' into fix-unplayable-beatmaps
|
2018-03-08 13:02:57 +09:00 |
|
smoogipoo
|
78d73d4c11
|
Additional fixes for flow ordering after framework changes
|
2018-03-06 17:20:58 +09:00 |
|
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 |
|
Dan Balasescu
|
33a64cb497
|
Merge branch 'master' into fix-multiple-tracks-playing
|
2018-02-28 22:53:02 +09:00 |
|
Dan Balasescu
|
b898226a91
|
Merge branch 'master' into fix-mod-select
|
2018-02-28 21:52:07 +09:00 |
|
Dan Balasescu
|
a3d26d7d55
|
Merge branch 'master' into fix-song-select-iteration
|
2018-02-28 21:40:25 +09:00 |
|
Dean Herbert
|
08497427fd
|
Merge branch 'master' into fix-multiple-tracks-playing
|
2018-02-28 15:32:16 +09:00 |
|
Dean Herbert
|
4a52db14d1
|
Fix depth of already-visible panels not being updates after a sorting change
|
2018-02-28 14:18:25 +09:00 |
|
Dean Herbert
|
510ecd7c87
|
Ensure selection is finalised before exiting song select
Resolves #2080.
|
2018-02-28 00:07:28 +09:00 |
|
Dean Herbert
|
84a8fbe0b3
|
Fix null ref
|
2018-02-27 21:26:06 +09:00 |
|
Dean Herbert
|
034875be47
|
Fix bindings not being unbound on ModSelect
Resolves #2018.
Closes #2079.
|
2018-02-27 20:45:32 +09:00 |
|
Dean Herbert
|
9b44f447ca
|
Fix song select iteration when all panels are filtered
Resolves #2069.
|
2018-02-27 17:52:12 +09:00 |
|
Dean Herbert
|
f2b3d9a0e8
|
Change some missed instances
|
2018-02-22 14:17:35 +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 |
|
Shane Woolcock
|
d603d032d5
|
Inlined delete beatmap dialog
|
2018-02-13 16:26:05 +10:30 |
|
Shane Woolcock
|
8d313486b3
|
Add a confirmation dialog to the Delete option in the beatmap context menu
|
2018-02-13 00:40:34 +10:30 |
|
smoogipoo
|
b500b76407
|
Merge branch 'master' into update-branch
|
2018-02-08 23:35:48 +09:00 |
|
Dan Balasescu
|
2bae22999d
|
Merge branch 'master' into global-mod-binding
|
2018-01-29 15:18:11 +09:00 |
|