smoogipoo
|
0a79b444d9
|
Move metrics to beatmap set
|
2019-06-13 16:52:49 +09:00 |
|
Dean Herbert
|
021d0273f9
|
Split out user activity from user status (#4619)
Split out user activity from user status
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-06-12 20:14:03 +09:00 |
|
smoogipoo
|
243cd517ad
|
Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups
# Conflicts:
# osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
|
2019-06-12 17:24:16 +09:00 |
|
Dean Herbert
|
20b43c20c8
|
Rename variables to remove redundant "screen" terminology
|
2019-06-12 16:33:15 +09:00 |
|
smoogipoo
|
13234fb4a4
|
Adjust comments a bit
|
2019-06-12 16:07:35 +09:00 |
|
Dean Herbert
|
a9c229b1ec
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-06-12 16:00:35 +09:00 |
|
smoogipoo
|
5d3fa51360
|
Merge remote-tracking branch 'origin/master' into selection-update
|
2019-06-12 15:10:57 +09:00 |
|
Lucas A
|
15893bbb75
|
Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages.
|
2019-06-11 19:41:48 +02:00 |
|
Dean Herbert
|
606be3d7ce
|
Merge branch 'master' into backgrounded-beatmap-status-lookups
|
2019-06-12 00:22:47 +09:00 |
|
Dean Herbert
|
609a82bc94
|
Update VisibilityContainer usage in line with framework
|
2019-06-11 15:13:58 +09:00 |
|
Lucas A
|
141775d98c
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-06-10 21:41:00 +02:00 |
|
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 |
|
Lucas A
|
a2bc5b538e
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-06-05 16:59:38 +02:00 |
|
smoogipoo
|
a6dc5606bc
|
Allow beatmapsets to be sorted by date added
|
2019-06-05 18:17:43 +09:00 |
|
David Zhao
|
4f09141718
|
remove extra bool
|
2019-05-29 12:22:34 +09:00 |
|
Dean Herbert
|
a20eda7b5f
|
Fix remaining cases to work without things
|
2019-05-28 23:54:42 +09:00 |
|
David Zhao
|
1a871af552
|
Fix hide selection, add test
|
2019-05-28 19:15:29 +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 |
|
Lucas A
|
55663b3576
|
Nest all UserActivities into UserActivity
|
2019-05-12 17:38:02 +02:00 |
|
Lucas A
|
5ac6bd8204
|
Merge remote-tracking branch 'upstream/master' into user-status-wiring
|
2019-05-12 11:53:30 +02: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
|
4f697e2bd5
|
Add licence header
|
2019-05-08 19:35:20 +09:00 |
|
Dean Herbert
|
6dea16f365
|
Move action and hotkey specification local
|
2019-05-08 19:29:43 +09:00 |
|
Dean Herbert
|
c91b9c6032
|
Add missing button
|
2019-05-08 19:27:53 +09:00 |
|
Dean Herbert
|
772eb460fb
|
Move button definitions to their respective classes
|
2019-05-08 19:03:26 +09:00 |
|
Dean Herbert
|
0693290ad4
|
Merge remote-tracking branch 'upstream/master' into refactor-select-footer
|
2019-05-08 18:43:21 +09:00 |
|
Dean Herbert
|
b33372ca62
|
Don't expand mods in button on hover
|
2019-05-08 18:43:15 +09:00 |
|
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 |
|