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

12791 Commits

Author SHA1 Message Date
Dean Herbert
2819a283f7
Merge pull request #2811 from Joehuu/remove-from-prefix
Remove "from" prefix from sources on direct panels
2018-06-15 14:26:30 +09:00
Dean Herbert
e2a4d6c15f
Merge branch 'master' into remove-from-prefix 2018-06-15 14:19:36 +09:00
Joehu
069d939e29 Remove "from" prefix from sources on direct panels 2018-06-14 21:53:01 -07:00
Dan Balasescu
dea5143028
Merge pull request #2801 from peppy/fix-juice-explosions
Fix combos ending with JuiceStreams never leaving the catcher's plate
2018-06-15 13:43:03 +09:00
Dean Herbert
c41a50bf24 Fix combos ending with JuiceStreams never leaving the catcher's plate
Closes #2634.
2018-06-14 16:39:31 +09:00
Dan Balasescu
af4d4b529f
Merge pull request #2791 from peppy/fix-memory-leak
Fix gameplay memory leak due to incorrect binding
2018-06-14 02:47:08 +09:00
Dean Herbert
0fdb04f57d Fix empty line 2018-06-13 15:43:18 +09:00
Dean Herbert
3ac90511c9
Merge branch 'master' into fix-memory-leak 2018-06-13 15:27:39 +09:00
Dean Herbert
39738a997e Add check for player screens too 2018-06-13 15:26:23 +09:00
Dean Herbert
14f5c814a6 Add test for WorkingBeatmap leakage 2018-06-13 15:12:10 +09:00
Dean Herbert
f4cb0d7d8d Fix memory leak due to incorrect binding 2018-06-13 14:16:58 +09:00
Dan Balasescu
fc569e873c
Merge pull request #2749 from peppy/mania-step-interval
Greatly increase the playfield scroll speed adjust step
2018-06-13 14:05:14 +09:00
Dan Balasescu
0e0e64895a
Merge branch 'master' into mania-step-interval 2018-06-13 13:55:27 +09:00
Dean Herbert
c273e9a2d5
Merge pull request #2789 from Joehuu/fix-taiko-nightcore
Fix osu!taiko nightcore mod regression
2018-06-13 12:35:40 +09:00
Joehu
b182635aae Fix taiko nightcore regression 2018-06-12 20:21:37 -07:00
Dean Herbert
c2fb224dc4
Merge pull request #2784 from smoogipoo/autoplay-keycounter
Always display the key counter during replay/autoplay
2018-06-13 11:46:20 +09:00
Dean Herbert
a7ed3ea80b Rename alwaysVisible to explain where it comes from 2018-06-13 11:38:15 +09:00
Dean Herbert
d9e7a324c0 Revert HudOverlay to private field 2018-06-13 11:30:22 +09:00
Dean Herbert
2eb4117814
Merge branch 'master' into autoplay-keycounter 2018-06-13 11:14:47 +09:00
Dean Herbert
ddce8a619d
Merge pull request #2786 from FreezyLemon/remove-compiling.md
Delete COMPILING.md
2018-06-13 08:10:40 +09:00
FreezyLemon
2a5a524223 delete COMPILING.md 2018-06-12 20:37:01 +02:00
smoogipoo
67aa52fb1d Use bindable binding 2018-06-12 19:34:49 +09:00
Dean Herbert
bcfb092e53
Change step to 200 2018-06-12 18:03:45 +09:00
smoogipoo
c70c7a476b Always display the key counter during replay/autoplay 2018-06-12 17:59:59 +09:00
Dan Balasescu
370e079640
Merge pull request #2761 from peppy/populate-missing-online-ids
Lookup online IDs on import when missing from .osu files
2018-06-12 14:12:35 +09:00
Dan Balasescu
80ec0b1839
Merge branch 'master' into populate-missing-online-ids 2018-06-12 14:03:23 +09:00
Dean Herbert
065991996f
Merge pull request #2772 from smoogipoo/ruleset-configs
Allow ruleset settings to DI the ruleset's config manager
2018-06-12 13:20:14 +09:00
Dean Herbert
ae136e89a4
Merge branch 'master' into ruleset-configs 2018-06-12 13:13:18 +09:00
Dan Balasescu
0a35a81c2d
Merge branch 'master' into populate-missing-online-ids 2018-06-12 13:11:21 +09:00
Dean Herbert
6e1c0264a2
Merge pull request #2581 from smoogipoo/editor-timeline-rework
Rework the editor compose timeline
2018-06-11 23:41:45 +09:00
Dean Herbert
37ea4c273b Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework 2018-06-11 20:17:41 +09:00
Dean Herbert
8092d70402 Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework 2018-06-11 20:17:33 +09:00
Dan Balasescu
f07e6370ca
Merge pull request #2759 from peppy/refactor-api
Reorganise API requests and response classes
2018-06-11 19:47:30 +09:00
Dan Balasescu
7de8e1cfc4
Merge branch 'master' into refactor-api 2018-06-11 18:49:15 +09:00
Dan Balasescu
5c61a172ab
Merge pull request #2757 from peppy/exponential-scoring-toggle
Add setting to toggle standardised or classic scoring display
2018-06-11 18:42:23 +09:00
Dan Balasescu
3981f56157
Merge branch 'master' into exponential-scoring-toggle 2018-06-11 18:34:55 +09:00
Dan Balasescu
45b00dee0e
Merge pull request #2741 from peppy/fix-object-ordering
Reverse order of exposed objects in HitObjectContainer
2018-06-11 18:19:46 +09:00
Dan Balasescu
78daf1c7ad
Merge branch 'master' into exponential-scoring-toggle 2018-06-11 18:19:33 +09:00
smoogipoo
b9391b3c6b Fix bindable not working under non-debug due to weak references 2018-06-11 18:18:24 +09:00
Dan Balasescu
9994c69d58
Merge branch 'master' into fix-object-ordering 2018-06-11 17:53:33 +09:00
smoogipoo
b51e714ae5 Fix xmldoc 2018-06-11 15:44:59 +09:00
smoogipoo
14b7530994 Use a global ruleset config cache 2018-06-11 15:07:42 +09:00
smoogipoo
be01dbae3a Move ruleset dependency caching to CreateLocalDependencies
In some cases we may want to refer to the cached configmanager dependency from subclasses. This prevents injection errors when doing so.
2018-06-11 15:07:29 +09:00
smoogipoo
f4fbf27d42 Give ruleset settings a ruleset-specific config manager 2018-06-11 13:28:50 +09:00
smoogipoo
eca016ec6c Move ruleset config managers to Ruleset 2018-06-11 13:17:08 +09:00
smoogipoo
22e8a0bb6e Make ruleset config manager variants nullable 2018-06-11 13:13:36 +09:00
smoogipoo
63ec36b3be Explicitly handle null settings case + add annotations 2018-06-11 12:57:56 +09:00
smoogipoo
b219c17115 Move dependency creation under ctor 2018-06-11 12:57:26 +09:00
Dean Herbert
86fb9666b2 Rename "Exponential" to "Classic" 2018-06-10 01:45:05 +09:00
Dean Herbert
cc37a355d2 Add comment about matching stable scoring
Also updated equation to be close to what is expected
2018-06-10 01:44:46 +09:00