1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-14 21:02:55 +08:00
Commit Graph

29009 Commits

Author SHA1 Message Date
Bartłomiej Dach
942cc48e99 Improve mascot scaling 2020-05-12 20:26:11 +02:00
Bartłomiej Dach
e5821ff2b2 Integrate GameplayBeatmap changes 2020-05-11 22:53:05 +02:00
Craftplacer
43342c57b8
Fix switch case
... caused by a poor merge
2020-05-11 07:13:06 +02:00
Dan Balasescu
d697de29a6
Merge branch 'master' into taiko-don 2020-05-11 13:24:27 +09:00
Dean Herbert
adf9a90fc4
Merge pull request #8988 from peppy/dont-timeout-during-debug
Don't timeout on long beatmap load when debugging
2020-05-11 13:18:02 +09:00
Dean Herbert
916d8245e6 Don't timeout on long beatmap load when debugging 2020-05-11 12:50:47 +09:00
Dan Balasescu
7072207c7c
Merge pull request #8935 from peppy/custom-data-directory
Add basic custom data directory support
2020-05-11 12:49:56 +09:00
Dan Balasescu
0b05a6d895
Merge branch 'master' into custom-data-directory 2020-05-11 12:12:03 +09:00
Dan Balasescu
4768b3ee33
Merge pull request #8920 from peppy/taiko-scroller
Add taiko scroller
2020-05-11 11:46:08 +09:00
Dan Balasescu
6841bd5609
Merge branch 'master' into taiko-scroller 2020-05-11 11:10:55 +09:00
Dean Herbert
8243dc239a
Merge branch 'master' into taiko-don 2020-05-10 22:34:47 +09:00
Dean Herbert
da368383aa
Merge pull request #8945 from Game4all/publicly-expose-hud
Add ability for a ruleset to disable gameplay overlays from displaying
2020-05-10 22:10:37 +09:00
Dean Herbert
44fdf1e6b0
Reword xmldoc 2020-05-10 20:09:41 +09:00
Dean Herbert
c712e98f2b
Merge branch 'master' into publicly-expose-hud 2020-05-10 20:06:28 +09:00
Dean Herbert
36ee54f876
Merge pull request #8973 from smoogipoo/mania-holdnote-selection-fix
Fix hold note selection pieces disappearing on movement
2020-05-10 15:30:58 +09:00
Dean Herbert
729585e151
Merge branch 'master' into mania-holdnote-selection-fix 2020-05-10 15:07:30 +09:00
Dan Balasescu
2f12c4126a
Apply suggestions from code review
Co-authored-by: Bartłomiej Dach <dach.bartlomiej@gmail.com>
2020-05-10 13:49:08 +09:00
Dean Herbert
384862d48b Fix incorrect relative paths when using GetStorageForDirectory 2020-05-10 13:20:13 +09:00
Dean Herbert
5902cd81a4 Move passing transforms to post-load for safety 2020-05-10 07:52:54 +09:00
Dean Herbert
3565fe1cb2 Fix incorrect passing logic 2020-05-10 07:51:39 +09:00
Dean Herbert
7ce78d8ce4
Merge branch 'master' into taiko-scroller 2020-05-09 23:25:54 +09:00
Dan Balasescu
c9b1735a53
Merge pull request #8982 from peppy/fix-nullref-on-early-exit
Fix null reference causing hard freeze if game is forcefully closed during disclaimer
2020-05-09 20:25:18 +09:00
Dean Herbert
3f78ddf482 Add CanBeNull hinting 2020-05-09 19:13:18 +09:00
Dean Herbert
e2979cbe9a Merge branch 'master' into fix-nullref-on-early-exit 2020-05-09 19:13:11 +09:00
Dean Herbert
fa711a6456 Fix null reference causing hard freeze if game is forcefully closed during disclaimer 2020-05-09 19:11:51 +09:00
Dean Herbert
8f370c5ef5
Merge pull request #8980 from LittleEndu/already-downloaded
Check local availability of beatmap before disabling download buttons
2020-05-09 18:32:38 +09:00
Dean Herbert
55e0d91f37 Fix download button being disabled after importing a download disabled beatmap 2020-05-09 18:09:17 +09:00
Dean Herbert
56f17fa64f
Merge branch 'master' into custom-data-directory 2020-05-09 17:27:16 +09:00
Endrik Tombak
d1976b194d Check local availability before disabling buttons 2020-05-09 10:42:56 +03:00
Dan Balasescu
2d49210250
Merge pull request #8972 from peppy/fix-ruleset-upgrade
Fix loading a ruleset with a new version specification causing a crash
2020-05-08 21:01:17 +09:00
Dean Herbert
5c2778d5f0 Change comparison direction 2020-05-08 20:33:02 +09:00
smoogipoo
be3b77cf25 Fix potentially skipping hitobject updates 2020-05-08 20:09:59 +09:00
Dean Herbert
115cbf25ae Fix new sprites not getting spawned with correct passing state 2020-05-08 19:15:19 +09:00
Dean Herbert
1a31e1f10f Also check for AffectsCombo to avoid too many passing switches 2020-05-08 19:13:41 +09:00
Dean Herbert
9b8589583c Merge branch 'master' into taiko-scroller 2020-05-08 19:10:39 +09:00
Dean Herbert
abd1115c6d Fix test failures 2020-05-08 19:08:43 +09:00
Dean Herbert
d9658bc34e Merge branch 'master' into custom-data-directory 2020-05-08 19:08:07 +09:00
smoogipoo
d67facf8e4 Add test scene 2020-05-08 18:50:06 +09:00
smoogipoo
22dda3fe02 Make ScrollingHitObjectContainer respond to defaults applied events 2020-05-08 18:49:58 +09:00
smoogipoo
efff2bf15d Add HitObject to DefaultsApplied event 2020-05-08 18:49:19 +09:00
smoogipoo
dcfef6b443 Add clear method to EditorBeatmap 2020-05-08 18:46:37 +09:00
Dean Herbert
a59db976d6 Fix loading a ruleset with a new version specification causing a crash 2020-05-08 18:05:06 +09:00
Lucas A
30dd158c33 Rename property to AllowGameplayOverlays and update XMLDoc accordingly. 2020-05-08 09:37:50 +02:00
Dean Herbert
48f93adb53
Merge pull request #8970 from peppy/android-version-update
Fix android usage of obsoleted VersionCode
2020-05-08 16:09:04 +09:00
Dean Herbert
116957a213
Merge pull request #8971 from peppy/commit-rider-vcs-update
Revert "Commit autogenerated rider VCS settings update"
2020-05-08 15:35:58 +09:00
Dean Herbert
c5589d278b Revert "Commit autogenerated rider VCS settings update"
This reverts commit af5e1f8298.
2020-05-08 15:35:25 +09:00
Dean Herbert
8b5de7403f Fix android usage of obsoleted VersionCode 2020-05-08 15:12:29 +09:00
Dean Herbert
586ddd8200
Merge pull request #8969 from peppy/update-framework
Update framework
2020-05-08 15:11:50 +09:00
Dan Balasescu
e893144c1f
Merge pull request #8968 from peppy/commit-rider-vcs-update
Commit autogenerated rider VCS settings update
2020-05-08 14:50:04 +09:00
Dean Herbert
9f64882f37 Update framework 2020-05-08 14:48:38 +09:00