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 |
|
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 |
|
Dean Herbert
|
519200c3d3
|
Merge pull request #2720 from smoogipoo/diffcalc-modtypes
Add difficulty calculation mod combinations
|
2018-06-09 23:48:56 +09:00 |
|
Dean Herbert
|
aaa65c428f
|
Merge branch 'master' into diffcalc-modtypes
|
2018-06-09 23:35:17 +09:00 |
|
Dean Herbert
|
d3570df64f
|
Merge pull request #2764 from peppy/update-dependencies
Update framework and other packages
|
2018-06-08 22:07:25 +09:00 |
|
Dean Herbert
|
a5ddae3f37
|
Merge pull request #2763 from peppy/revert-update-subtree
Revert InputManager UpdateSubTree change
|
2018-06-08 22:06:55 +09:00 |
|
Dean Herbert
|
fd4f61fc88
|
Update framework and other packages
|
2018-06-08 21:51:43 +09:00 |
|
Dean Herbert
|
d5c42d74ba
|
Merge pull request #2607 from jorolf/badge-ordering
Ensure profile badges are ordered correctly
|
2018-06-08 21:28:36 +09:00 |
|
Dean Herbert
|
a880e626d8
|
Use for loop and SetLayoutPosition
|
2018-06-08 21:20:15 +09:00 |
|
Dean Herbert
|
1e7bffe5e3
|
Merge branch 'master' into badge-ordering
|
2018-06-08 21:13:35 +09:00 |
|
Dean Herbert
|
9bdb3113ce
|
Revert "Always update children when ruleset input manager is updated"
This reverts commit 4eb7a34944.
|
2018-06-08 21:05:28 +09:00 |
|
Dean Herbert
|
4e1b801dd8
|
Merge pull request #2735 from DrabWeb/beatmap-set-downloader
Centralise downloaded beatmap set logic
|
2018-06-08 21:03:21 +09:00 |
|
Dean Herbert
|
803598c3d0
|
Merge remote-tracking branch 'upstream/master' into DrabWeb-beatmap-set-downloader
|
2018-06-08 20:54:14 +09:00 |
|
Dean Herbert
|
ecc0f5e575
|
Use Any() instead of Count()
|
2018-06-08 20:54:09 +09:00 |
|