1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-07 11:07:32 +08:00
Commit Graph

18991 Commits

Author SHA1 Message Date
naoey
4a16ac53ba
Remove extra newline 2019-06-15 12:28:23 +05:30
Dean Herbert
4882283084
Merge branch 'master' into generic-download-model-manager 2019-06-15 15:35:08 +09:00
Dan Balasescu
fd121a069c
Merge pull request #5023 from peppy/update-scrollcontainer
Update ScrollContainer usages in line with framework changes
2019-06-14 23:52:20 +09:00
Dean Herbert
0ca33e16dd Update framework 2019-06-14 23:25:29 +09:00
Dean Herbert
1b75fbed9a Merge remote-tracking branch 'upstream/master' into update-scrollcontainer 2019-06-14 23:25:17 +09:00
Dean Herbert
51ff0d71d1
Fix stacked objects shaking on rewind (#5012)
Fix stacked objects shaking on rewind

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-14 22:33:09 +09:00
Dean Herbert
cf713fbacc
Merge branch 'master' into fix-stacking-shaking 2019-06-14 22:16:35 +09:00
Dean Herbert
f354fd3317
Fix potential songselect testcase failures (#5024)
Fix potential songselect testcase failures
2019-06-14 22:16:27 +09:00
smoogipoo
512b9dfd82 Fix potential songselect testcase failures 2019-06-14 20:18:22 +09:00
Dan Balasescu
f66f46bff7
Merge pull request #5022 from peppy/button-sizing-fix
Fix IconButtons not being scaled correctly
2019-06-14 20:02:05 +09:00
smoogipoo
0c293be89c Wait for track to start running before seeking 2019-06-14 19:51:31 +09:00
smoogipoo
95082d2fcc Rename testcase 2019-06-14 19:35:47 +09:00
smoogipoo
4972f862e6 Seek track instead 2019-06-14 19:35:35 +09:00
Dean Herbert
bc574520bf Update ScrollContainer usages in line with framework changes 2019-06-14 15:55:32 +09:00
Dean Herbert
15b9b53d35 Fix IconButtons not being scaled correctly 2019-06-14 13:40:32 +09:00
naoey
3c2a2b2390
Move doc to interface 2019-06-13 21:28:32 +05:30
Dean Herbert
73a83e7f05
Reset result time offset to 0 when rewound (#5014)
Reset result time offset to 0 when rewound
2019-06-13 16:40:58 +09:00
smoogipoo
f12caaf907 Increase leniency 2019-06-13 15:47:21 +09:00
smoogipoo
4818187d8f Reset result timeoffset to 0 when rewound 2019-06-13 14:55:52 +09:00
smoogipoo
44d2514f1a Add test scene 2019-06-13 14:45:09 +09:00
smoogipoo
27fdda8b91 Don't update hitobject results when rewinding 2019-06-13 12:21:49 +09:00
naoey
7ba676ad31
Rename Info to Model 2019-06-12 21:56:36 +05:30
Dean Herbert
8014238901
Merge pull request #5009 from yousef157/master
Update readme with new testflight invite link
2019-06-13 00:56:38 +09:00
Dan Balasescu
10daf58787
Merge pull request #5010 from peppy/update-ios-resources
Update outdated game resources in iOS project
2019-06-13 00:06:19 +09:00
Ludde
50999c3677
revert change in paranthesses 2019-06-12 18:53:39 +04:00
Dean Herbert
d868280b2d Update outdated game resources in iOS project 2019-06-12 23:51:01 +09:00
naoey
9cd5519da3
Remove unused delegate, use model name in notifications, add more xmldoc
- Applies a `class` constraint to the generic type in `IModelManager`
- Add xmldoc
2019-06-12 19:26:06 +05:30
naoey
c5f1da0f71
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager 2019-06-12 18:20:35 +05:30
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
naoey
951a5abccc
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager 2019-06-12 17:41:16 +05:30
Ludde
f6c9e36720
Merge branch 'master' into master 2019-06-12 16:03:31 +04:00
Ludde
03c98ff57b
Update TestFlight 2019-06-12 15:55:06 +04: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
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