Dean Herbert
|
8d0d1ca378
|
Merge branch 'master' into tournament-tools
|
2019-06-13 19:44:43 +09:00 |
|
Dean Herbert
|
9e4f2c7eb9
|
Move font local
|
2019-06-13 19:41:01 +09:00 |
|
Dean Herbert
|
ee9d82f0fe
|
Revert right click handling for now
|
2019-06-13 19:10:57 +09:00 |
|
Dean Herbert
|
d744c900c2
|
Fix incorrect unbind logic
|
2019-06-13 19:04:59 +09:00 |
|
Dean Herbert
|
1f24541883
|
Re-expose OsuButton
|
2019-06-13 15:43:03 +09:00 |
|
smoogipoo
|
4818187d8f
|
Reset result timeoffset to 0 when rewound
|
2019-06-13 14:55:52 +09:00 |
|
Dean Herbert
|
830ddbc2de
|
Merge remote-tracking branch 'upstream/master' into tournament-tools
|
2019-06-13 12:49:52 +09:00 |
|
Dean Herbert
|
224e417f68
|
Merge pull request #5005 from peppy/fix-social-overlay-performance
Fix abysmal load performance when showing the social overlay
|
2019-06-12 21:14:33 +09:00 |
|
Dean Herbert
|
dab18cb9da
|
Merge pull request #5004 from smoogipoo/improve-deletion-notification
Improve model deletion notification text
|
2019-06-12 21:14:18 +09:00 |
|
smoogipoo
|
a17d480f51
|
Use "beatmap" as the model name
|
2019-06-12 20:41:02 +09:00 |
|
Dan Balasescu
|
169c18d238
|
Merge branch 'master' into fix-social-overlay-performance
|
2019-06-12 20:37:15 +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 |
|
Dean Herbert
|
0f000fcc14
|
Fix abysmal load performance when showing the social overlay
|
2019-06-12 19:58:26 +09:00 |
|
Dean Herbert
|
b2b3df3885
|
Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build
|
2019-06-12 18:28:43 +09:00 |
|
Dean Herbert
|
f358fce9ab
|
Move activity (writable) bindable to APIAccess so it correctly transfers between users
|
2019-06-12 18:04:57 +09:00 |
|
Dean Herbert
|
412c9646ec
|
Merge branch 'master' into improve-deletion-notification
|
2019-06-12 17:47:00 +09:00 |
|
smoogipoo
|
d4deac48ee
|
Improve model deletion notification text
|
2019-06-12 17:27:15 +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 |
|
smoogipoo
|
2a67944889
|
Remove interlocked within a lock
|
2019-06-12 17:10:55 +09:00 |
|
smoogipoo
|
fd7dc9504e
|
Remove async when not required
|
2019-06-12 17:08:50 +09:00 |
|
smoogipoo
|
c4f54d94bc
|
Rename methods
|
2019-06-12 17:00:38 +09:00 |
|
smoogipoo
|
28f8b04765
|
Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups
|
2019-06-12 16:47:56 +09:00 |
|
Dan Balasescu
|
47dad52091
|
Merge branch 'master' into fix-checkbox-filterability
|
2019-06-12 16:43:30 +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 |
|
Dean Herbert
|
fc1f778b82
|
Remove implicit null
|
2019-06-12 15:53:53 +09:00 |
|
Dean Herbert
|
94e65a3244
|
Fix settings checkboxes not being searchable
|
2019-06-12 15:16:59 +09:00 |
|
smoogipoo
|
5d3fa51360
|
Merge remote-tracking branch 'origin/master' into selection-update
|
2019-06-12 15:10:57 +09:00 |
|
Dean Herbert
|
b29b1bf254
|
Merge branch 'master' into mod-grow-improvement
|
2019-06-12 13:18:02 +09:00 |
|
Lucas A
|
51d428ef94
|
Refactor UserPanel status display logic
|
2019-06-11 20:00:14 +02:00 |
|
Lucas A
|
15893bbb75
|
Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages.
|
2019-06-11 19:41:48 +02:00 |
|
Lucas A
|
6c74998487
|
Set ScreenActivity to InitialScreenActivity only when ScreenActivity hasn't been set manually before.
|
2019-06-11 19:24:36 +02:00 |
|
Dean Herbert
|
27054a744e
|
Fill in thread pool names
|
2019-06-12 00:35:13 +09:00 |
|
Dean Herbert
|
606be3d7ce
|
Merge branch 'master' into backgrounded-beatmap-status-lookups
|
2019-06-12 00:22:47 +09:00 |
|
Dean Herbert
|
a690a67a6c
|
Merge branch 'master' into fullscreen-overlay-surface
|
2019-06-12 00:07:30 +09:00 |
|
Dean Herbert
|
6a34d5575b
|
Bump framework version
|
2019-06-11 20:44:11 +09:00 |
|
Dean Herbert
|
00ee45fe46
|
Merge remote-tracking branch 'origin/update-visibility-container' into update-framework
|
2019-06-11 19:36:13 +09:00 |
|
Dean Herbert
|
261badc770
|
Update framework
|
2019-06-11 19:24:54 +09:00 |
|
Dean Herbert
|
5c2c4f0ada
|
Merge pull request #4878 from HoLLy-HaCKeR/expose-skills
Expose skills in DifficultyAttributes
|
2019-06-11 18:47:56 +09:00 |
|
Dean Herbert
|
6973e1af4d
|
Fix incorrect xmldoc in OsuAnimatedButton (#4984)
Fix incorrect xmldoc in OsuAnimatedButton
|
2019-06-11 18:45:23 +09:00 |
|
Dean Herbert
|
591be33fc2
|
Merge branch 'master' into async-results-pages
|
2019-06-11 18:45:06 +09:00 |
|
Dean Herbert
|
86b6070ae8
|
Tween track frequency on pause (#4973)
Tween track frequency on pause
|
2019-06-11 18:44:56 +09:00 |
|
smoogipoo
|
a9758ba813
|
Merge remote-tracking branch 'origin/master' into fix-checkbox-overlap
|
2019-06-11 18:26:42 +09:00 |
|
smoogipoo
|
e5417416a2
|
Remove braces
|
2019-06-11 18:24:50 +09:00 |
|
Arphox
|
07e17518e9
|
Fix all "Maintainability" CodeFactor issues
|
2019-06-11 10:28:16 +02:00 |
|
Dean Herbert
|
8de62b608e
|
Allow FullscreenOverlay to surface to front on subsequent Show requests
|
2019-06-11 15:22:27 +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 |
|
Lucas A
|
2e911d0e96
|
Merge remote-tracking branch 'upstream/master' into settings-footer-show-changelog-current-build
|
2019-06-10 19:13:54 +02:00 |
|