1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 01:43:20 +08:00
Commit Graph

8376 Commits

Author SHA1 Message Date
Dean Herbert
bcc30fd947 Revert osu-resources 2017-11-01 16:05:06 +09:00
Dean Herbert
d6c86ebcb1 Merge branch 'master' into intro 2017-11-01 15:38:14 +09:00
Dean Herbert
a7c04e9069 Merge branch 'fix-visualtests-configuration' 2017-11-01 15:37:22 +09:00
Dean Herbert
cbf543de73 Apply framework project format revert 2017-11-01 15:31:38 +09:00
Dean Herbert
8138796ee3 Fix VisualTests configuration being completely wrong 2017-11-01 14:53:33 +09:00
Dean Herbert
ca8afc0c80 Merge remote-tracking branch 'upstream/master' into intro 2017-10-31 15:49:28 +09:00
Dan Balasescu
3ed8624015
Merge pull request #1446 from peppy/delayed-load
Make avatars use a delayed load wrapper
2017-10-30 23:04:59 +09:00
Dean Herbert
ba7c0695c5
Merge branch 'master' into delayed-load 2017-10-30 22:48:33 +09:00
Dean Herbert
757d8be95f
Merge pull request #1444 from smoogipoo/webrequest-updates
Apply osu!-side WebRequest changes
2017-10-30 22:48:19 +09:00
smoogipoo
40f3cb5db7 Update framework 2017-10-30 22:39:25 +09:00
smoogipoo
7b72c6d811 Merge branch 'master' into webrequest-updates 2017-10-30 22:39:01 +09:00
smoogipoo
cd5324f1d1 Update API code to use the new Add* methods on requests 2017-10-30 21:33:44 +09:00
Dean Herbert
f486ab1f6c
Merge branch 'master' into song_select_delete 2017-10-30 21:07:02 +09:00
Dean Herbert
009d8ca49e
Merge pull request #1426 from jorolf/recent-scores
Add recent scores section to user profile
2017-10-30 21:06:43 +09:00
Dean Herbert
d871c3fdda Fix test not working due to null refs 2017-10-30 20:55:23 +09:00
Dean Herbert
d8b3f984f5
Merge branch 'master' into webrequest-updates 2017-10-30 19:50:45 +09:00
Dean Herbert
1ae0eff6ad Add some sanity to request/drawable creation logic 2017-10-30 19:40:42 +09:00
Dean Herbert
23a729c83a Make avatars use a delayed load wrapper 2017-10-30 19:39:23 +09:00
Dean Herbert
605853267d Update framework 2017-10-30 19:31:45 +09:00
Dean Herbert
a51e64b2d1 Remove unnecessary schedule 2017-10-30 19:16:16 +09:00
Dean Herbert
069f4b1fcf Make DrawableScore abstract and move shared class to own file 2017-10-30 19:15:19 +09:00
Dean Herbert
096998d5f4 Fix user bindable being assigned rather than bound 2017-10-30 19:08:15 +09:00
Dean Herbert
b660366d96 ScoreContainer -> PaginatedScoreContainer 2017-10-30 19:06:40 +09:00
Dean Herbert
dce7d1c910 Move pp score representation to own file 2017-10-30 19:05:13 +09:00
Dean Herbert
fcb88de626
Merge branch 'master' into recent-scores 2017-10-30 18:48:26 +09:00
smoogipoo
f94505243d Use AllowRetryOnTimeout where to maintain previous functionality 2017-10-30 17:28:53 +09:00
Dean Herbert
3a202e1a42
Merge pull request #1373 from EVAST9919/beatmap-preview-fix
Fix audio preview still playing after closing the beatmap overlay
2017-10-30 16:31:47 +09:00
Dean Herbert
7bc0ef44f2
Merge branch 'master' into beatmap-preview-fix 2017-10-30 16:22:47 +09:00
Dean Herbert
eccf56a551
Merge branch 'master' into settingsitem-getboundcopy 2017-10-30 16:20:39 +09:00
smoogipoo
b59401357e Remove singular RetryCount usage, update framework 2017-10-27 12:53:08 +09:00
EVAST9919
a7bcae4869 Add startup value for the slider 2017-10-26 15:18:06 +03:00
EVAST9919
826d806e81 Submodules update 2017-10-26 15:07:58 +03:00
EVAST9919
08637253df Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed 2017-10-26 15:04:44 +03:00
EVAST9919
db3e4e77da Submodules update 2017-10-26 14:45:45 +03:00
EVAST9919
e5dae81356 Move testcase to the right place 2017-10-26 14:42:23 +03:00
EVAST9919
189b51551d Merge remote-tracking branch 'refs/remotes/ppy/master' into intro 2017-10-26 14:40:40 +03:00
Shane Woolcock
22d222354c Change SettingsItem to use GetBoundCopy to ensure it has the right class for numeric bindables 2017-10-26 18:45:20 +10:30
smoogipoo
bfee3317aa Update WebRequest usage in-line with framework 2017-10-26 16:37:44 +09:00
Dean Herbert
f91a820278 Merge pull request #1440 from DerpyCrabs/patch-1
Fix case-sensitive linux build
2017-10-26 15:55:54 +09:00
DerpyCrabs
de10300675 Fix case-sensitive linux build 2017-10-26 10:44:38 +07:00
Jorolf
b2c3ba05d7 remove redundant stuff 2017-10-25 20:15:45 +02:00
Jorolf
0449639f41 remove inner classes and make User property a bindable 2017-10-25 20:07:12 +02:00
Dean Herbert
3eaa4cb706 Merge pull request #1436 from peppy/user-iqueryable
Use IQueryable wherever possible
2017-10-26 00:07:15 +09:00
Dean Herbert
b89112c2a1 Fix incorrect alignment 2017-10-25 23:56:18 +09:00
Dean Herbert
41cc2f725a Fix incorrect comment 2017-10-25 23:56:10 +09:00
Dean Herbert
4d4b505ef7 Add AsNoTracking to common read-only queries 2017-10-25 23:56:05 +09:00
Dean Herbert
c260b0d2a5 Explicitly return list 2017-10-25 23:53:09 +09:00
Dean Herbert
e62928102c Merge remote-tracking branch 'upstream/master' into user-iqueryable 2017-10-25 23:49:56 +09:00
Dean Herbert
a7d4a4cb6e Merge pull request #1435 from peppy/fix-threaded-context-issues
Fix write operations potentially using  other-threaded tracked instances
2017-10-25 23:49:22 +09:00
Dean Herbert
ead3ca1f27 Merge branch 'master' into fix-threaded-context-issues 2017-10-25 23:42:08 +09:00