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 |
|
Crusensis
|
fbc0cd6f5f
|
Split AffectsCombo into IsBonus
|
2018-06-09 18:14:33 -07:00 |
|
clayton
|
808118e4d4
|
Add health drain to catch
|
2018-06-09 17:39:17 -07:00 |
|
clayton
|
f486bcfee1
|
Add judgements to catch
|
2018-06-09 17:38:17 -07: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 |
|
Aergwyn
|
b9b04c1b6e
|
move back logic into GameplayMenuOverlay
|
2018-06-09 09:28:02 +02:00 |
|
Aergwyn
|
792d3b8215
|
allow "go back" keybind in play
|
2018-06-09 09:14:58 +02:00 |
|
Roman Kapustin
|
8702a70524
|
Resolve merge conflicts in DirectOverlay
|
2018-06-08 21:03:16 +03: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 |
|
Dean Herbert
|
064e8190be
|
Add basic documentation
|
2018-06-08 20:53:58 +09:00 |
|
Thomas Müller
|
b287b69476
|
Merge pull request #2762 from peppy/fix-volume-precise-scroll
Fix volume control adjustment being extreme when precision scrolling
|
2018-06-08 04:37:19 -07:00 |
|
smoogipoo
|
0fb4e6b41b
|
Fix hold note body not following the scroll direction
|
2018-06-08 18:16:55 +09:00 |
|