1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-17 05:13:21 +08:00
Commit Graph

19418 Commits

Author SHA1 Message Date
Dean Herbert
73e561bf10
Show changelog for current build when clicking on settings footer (#4884)
Show changelog for current build when clicking on settings footer

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-12 18:41:11 +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
Dan Balasescu
d2035c49fe
Merge pull request #4978 from peppy/backgrounded-beatmap-status-lookups
Decouple online retrieval from import process
2019-06-12 17:37:51 +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
Dean Herbert
ddbd240d76
Fix settings checkboxes not being searchable (#5003)
Fix settings checkboxes not being searchable

Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-06-12 17:01:59 +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
Dan Balasescu
6cb0cd9617
Merge pull request #4872 from nyquillerium/selection-update
Remove excessive selection updating for SongSelect
2019-06-12 16:34:13 +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
bb8a77d27d Apply all steps to same user panel so interactions can be observed 2019-06-12 15:59:52 +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
Dan Balasescu
f23e812318
Merge pull request #4957 from GSculerlor/mod-grow-improvement
Add option to increase visibility of first object with grow mod
2019-06-12 13:31:14 +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
15f1ee4b67
Allow fullscreen overlays to surface on subsequent show requests (#4989)
Allow fullscreen overlays to surface on subsequent show requests
2019-06-12 00:21:37 +09:00
Dean Herbert
a690a67a6c
Merge branch 'master' into fullscreen-overlay-surface 2019-06-12 00:07:30 +09:00
Dean Herbert
3cf3154e1d
Update framework (#4992)
Update framework

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-06-11 20:57:24 +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
d2e42b38fc Merge remote-tracking branch 'smoogipoo/cursortrail-vertexbatch' into update-framework 2019-06-11 19:25:25 +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
8faca7c9ef
Load results pages asynchronously (#4983)
Load results pages asynchronously
2019-06-11 18:45:11 +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
Dean Herbert
c07e1088c6
Fix checkboxes with long labels overlapping nub (#4970)
Fix checkboxes with long labels overlapping nub

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-06-11 18:44:27 +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
Dean Herbert
dc566f3477
Fix all "Maintainability" CodeFactor issues (#4990)
Fix all "Maintainability" CodeFactor issues
2019-06-11 17:40:26 +09:00
Arphox
07e17518e9 Fix all "Maintainability" CodeFactor issues 2019-06-11 10:28:16 +02:00
David Zhao
a53ade07a5 remove unused using 2019-06-11 15:51:57 +09:00
David Zhao
975bb3db8a cleanup 2019-06-11 15:51:14 +09:00
Dean Herbert
620c2311ac Add test 2019-06-11 15:39:18 +09: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