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

7547 Commits

Author SHA1 Message Date
Dean Herbert
4a0370a68a Merge pull request #1288 from peppy/remove-include
Remove unnecessary Microsoft.Net.Http include
2017-09-18 18:35:52 +09:00
Dean Herbert
34ca7aec6d Merge branch 'master' into remove-include 2017-09-18 18:25:47 +09:00
Dean Herbert
507261fb55 Merge pull request #1289 from Damnae/legacyfilesystem_fix
Fix LegacyFilesystemReader Filenames property.
2017-09-18 18:25:36 +09:00
Damnae
5a76ed4000 Fix LegacyFilesystemReader Filenames property. 2017-09-18 10:14:29 +02:00
Dan Balasescu
375fda4f8d Merge branch 'master' into remove-include 2017-09-18 15:12:07 +09:00
Dan Balasescu
407d02ba87 Merge pull request #1285 from peppy/dont-unlimit-visualtests-fps
Don't unlimit FPS for visual tests
2017-09-18 15:11:51 +09:00
Dean Herbert
d62ad89150 Remove unnecessary Microsoft.Net.Http include 2017-09-18 14:10:59 +09:00
Dean Herbert
83579138d2 Merge branch 'master' into ctb-improvements 2017-09-18 12:57:53 +09:00
Dean Herbert
60b38b2776 Add the most basic score calculation for catch 2017-09-18 12:48:45 +09:00
Dean Herbert
d3c58c848d Add licence header 2017-09-18 12:48:33 +09:00
Dean Herbert
e52a4fe72c Put caught fruit in their own container to reduce casting 2017-09-18 12:33:01 +09:00
Dean Herbert
15d3a998fa Don't unlimit FPS for visual tests 2017-09-18 11:13:14 +09:00
Dean Herbert
d51ff7590d Merge pull request #1280 from ColdVolcano/file-count-fix
Account for all files instead of just the main directory ones
2017-09-18 11:02:31 +09:00
Dean Herbert
067dac495f Merge branch 'master' into file-count-fix 2017-09-18 10:43:49 +09:00
gabixdev
387705b2b6 revert csproj 2017-09-17 19:43:53 +02:00
gabixdev
3c00a7cc51 Reformat again... 2017-09-17 01:44:49 +02:00
ColdVolcano
8944d0f705 make it only look for files instead of directories 2017-09-16 18:44:32 -05:00
gabixdev
a33dfbba25 Code reformat 2017-09-17 01:40:38 +02:00
gabixdev
48008cd7e6 ... 2017-09-17 01:34:56 +02:00
gabixdev
a8ada75633 CODE STYLE XD 2017-09-17 01:28:02 +02:00
gabixdev
846838c621 Move to MenuCursor 2017-09-17 01:14:33 +02:00
gabixdev
bfe1febef2 Fix field access + remove unneeded this 2017-09-17 01:00:44 +02:00
gabixdev
e8462ac134 Add option to disable cursor rotation. 2017-09-17 00:47:55 +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
Damnae
2201fc745e Fix storyboard loops start time when none of their commands start at 0. 2017-09-16 13:32:51 +02: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
ColdVolcano
47b62803d8 Account for all files instead of just the main directory ones 2017-09-15 15:47:56 -05:00
DrabWeb
7e30c55bf4 CI fix. 2017-09-15 13:54:16 -03:00
DrabWeb
9787b92129 Merge branch 'online-beatmap-set-overlay' of https://github.com/DrabWeb/osu into online-beatmap-set-overlay 2017-09-15 13:47:34 -03:00
DrabWeb
1bac1e2c0e Make PreviewButton async. 2017-09-15 13:47:03 -03:00
EVAST9919
429e7723b3 Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three 2017-09-15 19:40:30 +03:00
EVAST9919
740e766201 BreakOverlay and LetterboxOverlay implementation 2017-09-15 19:39:55 +03:00
Damnae
5f6b300a3a Fix visual test crash when BeatmapInfo doesn't have a BeatmapSet. 2017-09-15 15:12:16 +02:00
Damnae
d9bde5ad5a Fix TestCaseStoryboard Restart button. 2017-09-15 14:31:59 +02:00
Damnae
291486a4d1 Only create drawables for storyboard elements that will be visible. 2017-09-15 14:31:59 +02:00
Damnae
757a159516 Display a non-parallax background at the appropriate size when storyboards do not replace it. 2017-09-15 14:31:54 +02:00
Dean Herbert
cfcb0c1c6e Add (incorrectly) exploding fruit 2017-09-15 21:26:36 +09:00
Dean Herbert
fe221905fa Make fruits look a bit closer to the final design 2017-09-15 20:55:04 +09:00
Dean Herbert
8ccbc07dec Remove unnecessary constructor 2017-09-15 20:54:46 +09:00
Dean Herbert
4e0aed4b8a Add combo/colour metadata to CatchBaseHit 2017-09-15 20:54:34 +09:00
Dean Herbert
b9ab034f94 Fix catcher movement speed being way too slow
Now matches osu-stable
2017-09-15 19:32:46 +09:00
Damnae
f5368505ab Load the storyboard asynchronously if it wasn't loaded with the beatmap. 2017-09-15 11:58:37 +02:00
Damnae
4a15762139 Don't create drawables for hidden storyboards. 2017-09-15 11:58:37 +02:00
Damnae
c8cdf6787e Better property name. 2017-09-15 11:58:31 +02:00
Damnae
7c3ce7e830 Unbind events affecting the background after gameplay has ended. 2017-09-15 09:16:56 +02:00
Damnae
cb8029af9e Add a setting to hide storyboards. 2017-09-15 09:16:56 +02:00
Damnae
ddaf28d7f6 Integrate storyboards with gameplay. 2017-09-15 09:16:56 +02:00
Dean Herbert
77252a76db Merge pull request #1276 from Damnae/fix_player_loading
Fix player loading.
2017-09-15 16:12:58 +09:00