RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,197 Commits 3 Branches 651 Tags 355 MiB
Commit Graph

1325 Commits

Author SHA1 Message Date
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