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

7280 Commits

Author SHA1 Message Date
Jorolf
3e8ae93b34 appveyor 2017-09-17 22:54:23 +02:00
Jorolf
f8b09df13c Merge branch 'master' of git://github.com/ppy/osu into direct-previews 2017-09-17 22:40:14 +02:00
Jorolf
be1e868a2a add previews to osu!direct 2017-09-17 22:39:34 +02:00
Dean Herbert
7f18990582 Merge pull request #1281 from UselessToucan/DisposeIDisposableBeforeMethodReturns
Dispose IDisposable object before method returns
2017-09-16 21:49:21 +09:00
TocoToucan
51a5e963bb Dispose IDisposable object before method returns 2017-09-16 15:10:24 +03:00
Dan Balasescu
218a5f8097 Merge pull request #1273 from peppy/scores-lookup-requires-id
Ensure an OnlineBeatmapID is present before attempting API requests
2017-09-16 08:52:39 +09:00
Dan Balasescu
02ccea1c4e Merge branch 'master' into scores-lookup-requires-id 2017-09-16 08:43:59 +09:00
Dean Herbert
77252a76db Merge pull request #1276 from Damnae/fix_player_loading
Fix player loading.
2017-09-15 16:12:58 +09:00
Damnae
010a6ec252 Fix player loading. 2017-09-15 09:06:27 +02:00
Dean Herbert
b72921b30e Ensure an OnlineBeatmapID is present before attempting API requests 2017-09-15 12:44:48 +09:00
Dean Herbert
a0bbabd18f Merge pull request #1269 from peppy/force-clean-before-deploy
Force clean before deploying
2017-09-15 11:56:41 +09:00
Dan Balasescu
3d56c1e99f Merge branch 'master' into force-clean-before-deploy 2017-09-15 11:46:28 +09:00
Dan Balasescu
c200fbe961 Merge pull request #1271 from peppy/missing-return
Add missing return to PlayerLoader
2017-09-15 09:19:55 +09:00
Dean Herbert
6ea22cc6c7 Add missing return to PlayerLoader
was being a bit too eager previously
2017-09-15 08:15:23 +09:00
Dean Herbert
9e059a2ef0 Force clean before deploying
Ensures app.config is up-to-date before deploying, rather than using a potentially old version
2017-09-15 00:25:38 +09:00
Dean Herbert
742cd5db91 Merge pull request #1268 from MrTheMake/keybindingrow-filter-terms
Removed unnecessary casting of KeyBindingRow.FilterTerms
2017-09-14 21:01:50 +09:00
MrTheMake
1e0ce6dabd Removed unnecessary casting of KeyBindingRow.FilterTerms 2017-09-14 13:18:50 +02:00
Dan Balasescu
24e14ec62a Merge pull request #1265 from peppy/more_context_menus
Add some more context menus; remove global ContextMenuContainer
2017-09-14 19:58:52 +09:00
Dan Balasescu
605c8462f4 Merge branch 'master' into more_context_menus 2017-09-14 19:32:06 +09:00
Dan Balasescu
7f5531b394 Merge pull request #1261 from tom-arrow/mania-random-mod
Implement random mod for osu!mania
2017-09-14 19:31:56 +09:00
Dan Balasescu
9044875222 Merge branch 'master' into mania-random-mod 2017-09-14 19:21:49 +09:00
Dan Balasescu
77d2b1e478 Merge branch 'master' into more_context_menus 2017-09-14 19:21:29 +09:00
Dean Herbert
9adf38d5e1 Merge pull request #1267 from peppy/user-profile-api-update
Update profiles to support newer return structure from osu-web API
2017-09-14 19:10:12 +09:00
Tom
a42fb4af2a Add icon for random mod 2017-09-14 12:04:05 +02:00
Dean Herbert
bf2d1debdb Merge branch 'master' into user-profile-api-update 2017-09-14 18:57:27 +09:00
Dean Herbert
6e0e198098 Merge pull request #1258 from peppy/update-deploy-paths
Update deploy dependency paths
2017-09-14 18:45:43 +09:00
Dan Balasescu
d6d9b73a9c Merge branch 'master' into update-deploy-paths 2017-09-14 18:36:18 +09:00
Dan Balasescu
51cb12c074 Merge pull request #1266 from peppy/visualtests-64bit
Fix visualtests preferring 32-bit
2017-09-14 18:35:58 +09:00
Dean Herbert
7cd6caacaa Update to support newer return structure from osu-web API 2017-09-14 18:08:12 +09:00
Dean Herbert
db6437eea9 Remove very old defined constants 2017-09-14 17:58:42 +09:00
Dean Herbert
160f48bf85 Make VisualTests target 64 bit where possible 2017-09-14 17:55:56 +09:00
Dean Herbert
cbed9bc141 Merge branch 'master' into more_context_menus 2017-09-14 17:55:32 +09:00
Dean Herbert
307a709e6b Merge pull request #1224 from Damnae/storyboards
Storyboards implementation.
2017-09-14 16:12:18 +09:00
Dean Herbert
33d33a49ae Merge branch 'master' into storyboards 2017-09-14 16:06:19 +09:00
Dean Herbert
b7c9819680 Add context menus to chat names and user panels 2017-09-14 15:43:47 +09:00
Dean Herbert
396a56ddf4 Remove global OsuContextMenuContainer 2017-09-14 15:41:32 +09:00
Dean Herbert
bdf62870d1 Update framework 2017-09-14 15:40:36 +09:00
Dan Balasescu
1e7dc2f17f Merge pull request #1264 from peppy/inspectcode-update
Update code to support new inspectcode analysis rules
2017-09-14 14:31:16 +09:00
Dean Herbert
d330b39db4 Remove max 2017-09-14 13:47:25 +09:00
Dean Herbert
4f09f30b7a Fix incorrect exception 2017-09-14 13:13:54 +09:00
Dean Herbert
fe90570d0f Lower inheritdoc code suggestions to hint level 2017-09-14 13:10:24 +09:00
Dean Herbert
b1145272d1 Update code to support new inspectcode analysis rules 2017-09-14 12:58:32 +09:00
smoogipooo
ae3e118584 Dummy commit to test CI 2017-09-14 09:32:10 +09:00
Dan Balasescu
44bfc63e09 Merge branch 'master' into mania-random-mod 2017-09-14 09:15:01 +09:00
Dean Herbert
0ca60eaecc Merge pull request #1260 from MrTheMake/ihasfilterterms-filterterms-ienumerable
Changed type of IHasFilterTerms.FilterTerms according to framework update
2017-09-14 08:10:55 +09:00
MrTheMake
4a232bbc04 updated framework 2017-09-13 18:44:44 +02:00
Tom
886ad7496d Implement random mod for osu!mania 2017-09-13 17:35:05 +02:00
MrTheMake
89b5a6670e Changed type of IHasFilterTerms.FilterTerms according to framework update 2017-09-13 16:18:02 +02:00
Dean Herbert
14efee7ed8 Update deploy dependency paths
Forgot about these. Should probably make them automatically handle version changes at some point...
2017-09-13 21:02:25 +09:00
Dean Herbert
b08844d2db Merge pull request #1250 from smoogipooo/scoring-revamp
Revamp scoring game-wide for more intuitive exponential and standardised scoring calculations
2017-09-13 20:56:28 +09:00