1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-17 20:25:17 +08:00
Commit Graph

14179 Commits

Author SHA1 Message Date
Dean Herbert
34c42aed89
Merge branch 'master' into ArrangeMod 2018-09-05 02:33:00 +09:00
Dean Herbert
b0f9c0f6f0
Merge pull request #3334 from agnimurus/master
Refactor some variable names for improved code readability
2018-09-01 17:38:47 +09:00
Dean Herbert
e503878956
Merge branch 'master' into master 2018-09-01 17:31:04 +09:00
Dean Herbert
442c10db73
Merge pull request #3345 from peppy/update-framework
Update framework
2018-09-01 12:42:33 +09:00
Dean Herbert
62a8245f11 Update framework 2018-09-01 10:59:04 +09:00
Dean Herbert
174c52decf
Merge pull request #3341 from peppy/rip-async
Remove async logic in line with framework
2018-08-31 23:49:12 +09:00
Dean Herbert
4c72565936 Update framework 2018-08-31 19:20:10 +09:00
Dean Herbert
03084aa04b Revert async changes 2018-08-31 07:07:10 +09:00
Dean Herbert
247e1ee714
Merge pull request #3331 from smoogipoo/update-framework
Update with framework async changes
2018-08-30 15:10:28 +09:00
Dean Herbert
37bae8c840 Merge remote-tracking branch 'upstream/master' into smoogipoo-update-framework 2018-08-30 14:58:25 +09:00
Dean Herbert
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
Dean Herbert
3276f0f54d Update ef/sqlite version 2018-08-30 14:58:00 +09:00
Dean Herbert
9fb78852de Update framework 2018-08-30 14:58:00 +09:00
Dean Herbert
68a79f895a Fix mania throwing an exception on start of map 2018-08-30 14:58:00 +09:00
Dean Herbert
2ff48da5af
Merge branch 'master' into fix-startup-webrequests 2018-08-30 14:43:29 +09:00
Dean Herbert
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
Dean Herbert
b1a3dfedd1 Reduce async-await pairs 2018-08-30 14:41:16 +09:00
smoogipoo
327bc708d7 Fix DirectOverlay performing webrequests on startup 2018-08-30 14:41:09 +09:00
Dean Herbert
20817fdf1d Avoid using symbol windows can't diplay 2018-08-30 14:34:45 +09:00
unknown
499c5d28ff Refactored variable names in OsuGame.cs for improved code readability. 2018-08-29 18:04:51 -04:00
Dean Herbert
4b54c65d3f Fix single file component loading not actually working correctly 2018-08-29 15:11:02 +09:00
Dean Herbert
73c764d983 Update SpriteIcon 2018-08-29 03:36:01 +09:00
Dean Herbert
919e78a89a Attempt to fix cross-thread database usage 2018-08-29 01:42:25 +09:00
smoogipoo
da2f04c79c Update framework once more 2018-08-28 21:06:32 +09:00
smoogipoo
e7a5816d27 Use GetAsync for all samples 2018-08-27 17:30:16 +09:00
smoogipoo
1b279d383f Use GetAsync on all textures 2018-08-27 17:26:44 +09:00
smoogipoo
21d5322899 Update with async changes 2018-08-27 17:05:58 +09:00
Dean Herbert
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
Dean Herbert
5c7ff31675 Add note about null return 2018-08-25 14:51:42 +09:00
Dean Herbert
8204d3292e Log to correct file 2018-08-25 14:50:46 +09:00
Dean Herbert
3d52e9dea6
Merge branch 'master' into reduce-import-noise 2018-08-25 14:44:57 +09:00
Dean Herbert
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
miterosan
726a510189 remove not needed usings 2018-08-24 22:33:14 +02:00
miterosan
8b016f05e6 Remove unessesary nl 2018-08-24 22:24:57 +02:00
miterosan
8112a51d5f Only apply the transformation once and make the distance and theta dynamic. 2018-08-24 22:23:27 +02:00
smoogipoo
49913f00f0 Fix xmldoc 2018-08-25 00:07:48 +09:00
smoogipoo
26dfabc86c Aggressively check for valid columns before iterating endlessly 2018-08-24 23:57:44 +09:00
smoogipoo
aeb4d47c06 Remove skipping part of message 2018-08-24 18:07:39 +09:00
smoogipoo
99574ecad8 Softly handle errors when no beatmap file exists in archive 2018-08-24 17:57:39 +09:00
Dan Balasescu
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
smoogipoo
1a2c3715c7 Fix testcase dodginess 2018-08-24 15:50:39 +09:00
Dean Herbert
59d6ccbaab Update framework 2018-08-24 15:27:13 +09:00
Dean Herbert
196fc03180 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake 2018-08-24 15:26:46 +09:00
Dean Herbert
ffcad6e0f1 Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake
# Conflicts:
#	osu.Game.Rulesets.Osu.Tests/TestCaseHitCircle.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/DrawableOsuHitObject.cs
#	osu.Game.Rulesets.Osu/Objects/Drawables/Pieces/SliderBall.cs
2018-08-24 15:26:36 +09:00
Dan Balasescu
53dc20c560
Merge pull request #3289 from peppy/break-overlay-double-parallax
Add a second parallax layer to break overlay arrows
2018-08-24 15:17:33 +09:00
Dan Balasescu
83ca3053c5
Merge branch 'master' into break-overlay-double-parallax 2018-08-24 15:10:28 +09:00
Dean Herbert
5ec1a5a774
Merge pull request #3296 from peppy/fix-notifications-too-early
Fix notifications appearing too early in load process
2018-08-24 15:09:03 +09:00
Dan Balasescu
2fee90dbd8
Merge branch 'master' into fix-notifications-too-early 2018-08-24 15:02:17 +09:00
Dan Balasescu
0802dbdce5
Merge pull request #3308 from smoogipoo/decoder-logging
Log the format line when a decoder isn't found
2018-08-24 10:45:17 +09:00
smoogipoo
55370165c0 Compare with invariant culture 2018-08-24 10:12:30 +09:00