1
0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 22:47:25 +08:00
Commit Graph

8396 Commits

Author SHA1 Message Date
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
27156aeb93 Fix the shit 2017-11-01 17:07:03 +09:00
Dean Herbert
fd5bc6fe58 Make ParallaxContainer public 2017-11-01 17:06:55 +09:00
Dean Herbert
09e0bd7a78 Remove unused class file 2017-11-01 16:58:12 +09:00
Dean Herbert
15197b9a76 Use internal less
Allows for more dynamic compilation to succeed. No reason for using internal here anyways.
2017-11-01 16:57:59 +09:00
Dean Herbert
4c54af2fc0 Merge branch 'fix-visualtests-configuration' into intro 2017-11-01 16:05:51 +09:00
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
smoogipoo
687a850216 Merge remote-tracking branch 'origin/master' into migrate-osu-game 2017-11-01 12:57:55 +09:00
smoogipoo
3462fdcad9 Remove some apparently unneeded references from osu.Game 2017-10-31 16:57:01 +09:00
smoogipoo
9b1ec83eb4 Propagate sqlite build assets to parent projects 2017-10-31 16:56:50 +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
smoogipoo
98deb1f215 Fix up VisualTests build config 2017-10-30 22:53:44 +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
04b271cce9 Migrate osu.Game project to VS2017 project structure 2017-10-30 22:24:11 +09:00
smoogipoo
5a8ed4c242 Update framework 2017-10-30 22:23:42 +09:00
smoogipoo
437b6d67a4 Merge branch 'webrequest-updates' into migrate-osu-game 2017-10-30 22:10:30 +09:00
smoogipoo
b574b817f9 Update framework 2017-10-30 22:03:45 +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