1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 12:23:22 +08:00
Commit Graph

8158 Commits

Author SHA1 Message Date
Dean Herbert
a8bacd1ed4 Remove unnecessary private method /shrug 2017-11-08 14:46:47 +09:00
Dean Herbert
7ad498cb29 Remove unused puzzle pieces 2017-11-08 14:45:01 +09:00
Dean Herbert
fafca093e8 Update framework 2017-11-08 14:43:15 +09:00
Dean Herbert
90fec5f370
Merge branch 'master' into single-osu-logo 2017-11-08 14:37:20 +09:00
Dean Herbert
3761df249f
Merge pull request #1357 from EVAST9919/song_select_delete
Fix wrong beatmap selection in song-select when deleting selected beatmap
2017-11-07 23:11:30 +09:00
Dean Herbert
5af2cc29f5
Merge branch 'master' into song_select_delete 2017-11-07 16:42:40 +09:00
Dan Balasescu
4f52000f5f
Merge pull request #1466 from EVAST9919/auto-deleting-fix
Fix osu! deleting beatmaps on startup if MenuMusic is disabled
2017-11-06 13:51:54 +09:00
Dan Balasescu
e5aa0db6f7
Merge branch 'master' into auto-deleting-fix 2017-11-06 13:45:55 +09:00
Dan Balasescu
8460b4b2a2
Merge pull request #1441 from swoolcock/settingsitem-getboundcopy
Change SettingsItem to use GetBoundCopy
2017-11-06 13:07:16 +09:00
smoogipoo
d24cd00a01 Merge remote-tracking branch 'origin/master' into settingsitem-getboundcopy 2017-11-06 12:39:35 +09:00
EVAST9919
1afe2c18be Fix osu! deleting beatmaps on startup if MenuMusic is disabled 2017-11-04 19:42:28 +03:00
Dean Herbert
6a206c616b Update in line with framework changes 2017-11-03 14:34:12 +09:00
Dean Herbert
8f78d84ad6 Make intro resume slower 2017-11-02 21:52:23 +09:00
Dean Herbert
c99ffb4aa3 Fix potential nullref 2017-11-02 21:52:12 +09:00
Dean Herbert
9b2d41f4eb Fix quick retry looking bad 2017-11-02 21:52:01 +09:00
Dean Herbert
b8b05fe8d2 Make the osu! logo shared game-wide
There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.
2017-11-02 20:38:02 +09:00
Dan Balasescu
7fa3ac8cf2
Merge pull request #1451 from peppy/fix-endless-auth-loop
Fix a possible horrendous endless auth loop
2017-11-02 20:37:10 +09:00
Dean Herbert
b0785b2f09 Fix a possible horrendous endless auth loop 2017-11-02 20:26:26 +09:00
Dan Balasescu
718f11f26e
Merge pull request #1450 from peppy/fix-incorrect-guid
Revert incorrectly changed GUID
2017-11-01 23:44:46 +09:00
Dean Herbert
beb9d621c4 Revert incorrectly changed GUID 2017-11-01 23:38:08 +09:00
Dan Balasescu
0362218700
Merge pull request #1448 from peppy/fix-visualtests-configuration
Fix VisualTests not working under mono (or windows)
2017-11-01 22:54:28 +09:00
Dean Herbert
f0c0e8c34c Update framework 2017-11-01 17:34:36 +09:00
Dan Balasescu
05e5e3d279
Merge branch 'master' into fix-visualtests-configuration 2017-11-01 17:33:15 +09:00
Dan Balasescu
012a81a52e
Merge pull request #1449 from peppy/less-internal
Use internal less
2017-11-01 17:32:52 +09:00
Dean Herbert
ed89f03900 Make ParallaxContainer public 2017-11-01 17:10:59 +09:00
Dean Herbert
6fa02ce9bb Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 17:10:54 +09:00
Dean Herbert
bcc30fd947 Revert osu-resources 2017-11-01 16:05:06 +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
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