Commit Graph

14161 Commits

Author SHA1 Message Date
5848c16f5d Merge branch 'master' into api-ref-reduction 2018-09-06 17:18:35 +09:00
5351f802cd Merge pull request #3357 from peppy/fix-ci-explode-failure
Fix CI failures on CatcherArea.Explode
2018-09-06 16:06:18 +09:00
65018705f4 Restore IsLoaded check 2018-09-06 13:09:57 +09:00
c03d1d9566 Attempt to fix CI failures on CatcherArea.Explode 2018-09-06 10:14:23 +09:00
9b753bb429 Merge pull request #3321 from peppy/fix-importing
Fix order of import set conflict checks
2018-09-05 18:51:15 +09:00
a7de2bda39 Merge pull request #3356 from Joehuu/fix-direct-list-play-button
Fix direct list play button disappearing after preview/switch
2018-09-05 16:08:30 +09:00
77455e4463 Fix direct list play button disappearing after preview/switch 2018-09-04 19:44:49 -07:00
02437d9bbf Merge branch 'master' into api-ref-reduction 2018-09-03 21:57:30 +09:00
b0f9c0f6f0 Merge pull request #3334 from agnimurus/master
Refactor some variable names for improved code readability
2018-09-01 17:38:47 +09:00
e503878956 Merge branch 'master' into master 2018-09-01 17:31:04 +09:00
562a792a99 Use thread instead of LongRunning for API 2018-09-01 13:19:22 +09:00
bf6fb1c380 Don't use ConcurrentQueue for API
This queue type can hold several references to already dequeued requests. In our usage, this can cause old api calls to hold references to already-disposed screens (and in turn, very large memory portions).
2018-09-01 12:56:09 +09:00
442c10db73 Merge pull request #3345 from peppy/update-framework
Update framework
2018-09-01 12:42:33 +09:00
62a8245f11 Update framework 2018-09-01 10:59:04 +09:00
174c52decf Merge pull request #3341 from peppy/rip-async
Remove async logic in line with framework
2018-08-31 23:49:12 +09:00
4c72565936 Update framework 2018-08-31 19:20:10 +09:00
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
247e1ee714 Merge pull request #3331 from smoogipoo/update-framework
Update with framework async changes
2018-08-30 15:10:28 +09:00
37bae8c840 Merge remote-tracking branch 'upstream/master' into smoogipoo-update-framework 2018-08-30 14:58:25 +09:00
46099fcbef Merge pull request #3332 from smoogipoo/fix-startup-webrequests
Fix DirectOverlay performing web requests on startup
2018-08-30 14:58:17 +09:00
3276f0f54d Update ef/sqlite version 2018-08-30 14:58:00 +09:00
9fb78852de Update framework 2018-08-30 14:58:00 +09:00
68a79f895a Fix mania throwing an exception on start of map 2018-08-30 14:58:00 +09:00
2ff48da5af Merge branch 'master' into fix-startup-webrequests 2018-08-30 14:43:29 +09:00
91a8039829 Merge pull request #3330 from peppy/fix-single-file-loading
Fix single file component loading not actually working correctly
2018-08-30 14:42:39 +09:00
b1a3dfedd1 Reduce async-await pairs 2018-08-30 14:41:16 +09:00
327bc708d7 Fix DirectOverlay performing webrequests on startup 2018-08-30 14:41:09 +09:00
20817fdf1d Avoid using symbol windows can't diplay 2018-08-30 14:34:45 +09:00
499c5d28ff Refactored variable names in OsuGame.cs for improved code readability. 2018-08-29 18:04:51 -04:00
4b54c65d3f Fix single file component loading not actually working correctly 2018-08-29 15:11:02 +09:00
73c764d983 Update SpriteIcon 2018-08-29 03:36:01 +09:00
919e78a89a Attempt to fix cross-thread database usage 2018-08-29 01:42:25 +09:00
da2f04c79c Update framework once more 2018-08-28 21:06:32 +09:00
0d4aa37a91 Fix order of import set conflict checks 2018-08-28 02:53:32 +09:00
e7a5816d27 Use GetAsync for all samples 2018-08-27 17:30:16 +09:00
1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
21d5322899 Update with async changes 2018-08-27 17:05:58 +09:00
df18508bd6 Merge pull request #3310 from smoogipoo/reduce-import-noise
Softly handle errors when no beatmap file exists in archive
2018-08-25 15:53:24 +09:00
5c7ff31675 Add note about null return 2018-08-25 14:51:42 +09:00
8204d3292e Log to correct file 2018-08-25 14:50:46 +09:00
3d52e9dea6 Merge branch 'master' into reduce-import-noise 2018-08-25 14:44:57 +09:00
a2a1277b91 Merge pull request #3312 from smoogipoo/better-mania-failsafe
Aggressively check for valid columns before iterating endlessly in mania conversion
2018-08-25 14:01:47 +09:00
49913f00f0 Fix xmldoc 2018-08-25 00:07:48 +09:00
26dfabc86c Aggressively check for valid columns before iterating endlessly 2018-08-24 23:57:44 +09:00
aeb4d47c06 Remove skipping part of message 2018-08-24 18:07:39 +09:00
99574ecad8 Softly handle errors when no beatmap file exists in archive 2018-08-24 17:57:39 +09:00
27c151db8f Merge pull request #2909 from tgi74/hit-shake
Add shake effect when clicking osu! hitobjects too early
2018-08-24 16:04:43 +09:00
1a2c3715c7 Fix testcase dodginess 2018-08-24 15:50:39 +09:00
59d6ccbaab Update framework 2018-08-24 15:27:13 +09:00
196fc03180 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake 2018-08-24 15:26:46 +09:00