1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-12 05:27:40 +08:00
Commit Graph

12946 Commits

Author SHA1 Message Date
smoogipoo
33c7ce1bec Adjust TaikoDifficultyCalculator in-line with changes 2018-06-14 15:47:42 +09:00
smoogipoo
47fc18d7c4 Adjust OsuDifficultyCalculator in-line with changes 2018-06-14 15:45:16 +09:00
smoogipoo
b7a06b9594 Restructure of DifficultyCalculator to cleanup mod + attribute handling 2018-06-14 15:32:07 +09:00
smoogipoo
1431ee1867 Remove unused method 2018-06-14 14:46:25 +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
b318b770d4 Fix pixellation of volume meter progress bars 2018-06-13 19:22:39 +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
ca3186f34c Create dependencies before children are loaded 2018-06-12 19:51:35 +09: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
ac1990c093
Remove unused using 2018-06-12 16:36:46 +09:00
smoogipoo
93d2b5c4de Adjust precision for failing test 2018-06-12 16:20:38 +09:00
smoogipoo
34f23359bb Fix unit tests 2018-06-12 16:20:31 +09:00
smoogipoo
3b396e38ca Hide the scrollbar 2018-06-12 15:51:48 +09:00
smoogipoo
aaf2f66594 Make scrolling only zoom the timeline 2018-06-12 15:51:36 +09:00
smoogipoo
7dfe171869 Fix rebase error 2018-06-12 14:34:28 +09:00
smoogipoo
6ceac8ab0a Add a centre marker to the timeline 2018-06-12 14:34:28 +09:00
smoogipoo
b90cdfbfd1 Remove unused variable 2018-06-12 14:33:33 +09:00
Dan Balasescu
f71b0456e8
Merge branch 'master' into timeline-audio-scrolling 2018-06-12 14:23:05 +09:00
smoogipoo
30b7b7961f Merge remote-tracking branch 'origin/master' into timeline-audio-scrolling
# Conflicts:
#	osu-framework
#	osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
#	osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
2018-06-12 14:22:27 +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
smoogipoo
7651819fb0 Add same change to mania's hit explosions 2018-06-12 12:53:53 +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
Dan Balasescu
1b12820de9
Restore a removed comment 2018-06-11 21:54:11 +09:00
smoogipoo
22dfe46572 Make taiko hitobject properly unproxy when rewound 2018-06-11 21:46:45 +09:00
smoogipoo
8f3215f5a0 Make sure taiko hitexplosions expire and get removed 2018-06-11 20:42:04 +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