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
|
2421ec10d9
|
Merge branch 'master' into fix-taiko-rewind
|
2018-06-12 11:44:35 +09:00 |
|
clayton
|
785c24b11b
|
Check for null CatchJudgement
|
2018-06-11 13:30:30 -07:00 |
|
clayton
|
d3ada7914c
|
Fix condition for dropping health on miss
|
2018-06-11 13:29:36 -07:00 |
|
clayton
|
e44e08201b
|
Remove unnecessary usings and move Banana out of BananaShower
|
2018-06-11 12:43:01 -07: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 |
|
smoogipoo
|
0f9c05d1e6
|
Fix taiko swells not properly rewinding
|
2018-06-11 22:32:08 +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
|
b6fb01440b
|
Fix taiko hit states not being reverted on rewind
|
2018-06-11 20:44:26 +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
|
41452a0754
|
Merge branch 'master' into multiple_previews_different_overlays
|
2018-06-11 18:56:50 +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
|
3bad319dd2
|
Fix filename
|
2018-06-11 16:19:57 +09:00 |
|
smoogipoo
|
a36dab638a
|
Improve TestCaseStage
|
2018-06-11 16:12:52 +09:00 |
|
smoogipoo
|
10d1dfa7cd
|
A bit of cleanup
|
2018-06-11 16:10:27 +09:00 |
|
smoogipoo
|
b9bf3a1829
|
Make mania scroll downwards by default
|
2018-06-11 15:56:30 +09:00 |
|
smoogipoo
|
b51e714ae5
|
Fix xmldoc
|
2018-06-11 15:44:59 +09:00 |
|
smoogipoo
|
162237dc46
|
Fix bar lines being offset
|
2018-06-11 15:43:15 +09:00 |
|
smoogipoo
|
563a2667d3
|
Merge branch 'ruleset-configs' into mania-playfield-inversions
|
2018-06-11 15:08:48 +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
|
f49b7d6e16
|
Add mania direction to settings
|
2018-06-11 14:36:19 +09:00 |
|
smoogipoo
|
93696fb5e5
|
Merge branch 'ruleset-configs' into mania-playfield-inversions
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
|
2018-06-11 13:46:39 +09:00 |
|
smoogipoo
|
4fb6a8627e
|
Merge remote-tracking branch 'origin/master' into mania-playfield-inversions
|
2018-06-11 13:45:47 +09:00 |
|
smoogipoo
|
baaf431b9e
|
Make IScrollingInfo and store direction as bindable
|
2018-06-11 13:42:13 +09:00 |
|
smoogipoo
|
ca5103615d
|
DI the scrolling info rather than pass by ctor
|
2018-06-11 13:42:13 +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 |
|
clayton
|
3e6e2ac09a
|
Add CatchBananaShowerJudgements in simulated autoplays
|
2018-06-09 18:23:05 -07:00 |
|