Hanamuke
6c1b3cf1a5
Merge remote-tracking branch 'origin/AR_Catch' into AR_Catch
2018-09-30 16:09:27 +02:00
Hanamuke
b983e20067
Merge branch 'master' into AR_Catch
2018-09-30 16:01:55 +02:00
smoogipoo
0bc2bcaf14
Remove GetAspectAdjustedSize() and PlayfieldArea
2018-09-21 15:14:49 +09:00
smoogipoo
368ceec47c
Simplify creation of a playfield
2018-09-21 14:35:50 +09:00
smoogipoo
826dc6ceb7
Make Playfield not a ScalableContainer
2018-09-21 14:02:32 +09:00
Dan Balasescu
4b907336c5
Move readonly field above ctor
2018-09-20 13:17:17 +09:00
Hanamuke
309d8c8cb4
CI
2018-09-19 18:43:39 +02:00
Hanamuke
e7d78b94ae
Remove ScrollingVisualisation from settings
2018-09-19 18:30:25 +02:00
ekrctb
a3e6973b41
Replace usage of now removed TriggerKeyPress and similar methods.
2018-09-19 11:36:55 +09:00
ekrctb
c8e9d9375f
Use new InputStateChangeEvent for RulesetInputManager
2018-09-19 11:36:55 +09:00
Hanamuke
6d229716e7
Remove unused using directives
2018-09-18 20:42:55 +02:00
Hanamuke
2afcdb1451
Add the file
2018-09-18 20:23:25 +02:00
Hanamuke
e3cc25a96a
Implement ConstantScrollingSpeedVisualiser
2018-09-18 20:21:10 +02:00
WebFreak001
5f3c0549c9
Sprites in blinds mod & gameplay improvements
...
There are now skinnable actual blinds (shoji screen panels)
The black overlay is still behind them to avoid cheating with skins
The blinds don't open linearly anymore, they are health squared now
When easy mod is on, there is always a little gap open
2018-09-15 23:44:22 +02:00
WebFreak001
040a44d42c
Merge branch 'master' of github.com:WebFreak001/osu into mod-fl2
2018-09-15 20:12:06 +02:00
Joehu
f99eff1192
Use consistent terminology format
2018-09-15 07:30:11 -07:00
Dean Herbert
68a79f895a
Fix mania throwing an exception on start of map
2018-08-30 14:58:00 +09:00
smoogipoo
fcf98390f5
Cleanup
2018-08-21 12:10:00 +09:00
Dean Herbert
ff0dfa7acf
Merge branch 'master' into relax
2018-08-16 17:36:24 +09:00
Dan Balasescu
c1517e1521
Merge branch 'master' into judgement-rework
2018-08-06 12:30:46 +09:00
smoogipoo
2a54b5b78d
ResetResult -> RevertResult
2018-08-06 12:29:22 +09:00
smoogipoo
5fd4ed2f4e
Rename judgement-related methods/events + commenting
2018-08-06 10:55:25 +09:00
Dean Herbert
0c920fe486
Merge branch 'master' into mania-mask-container
2018-08-06 04:22:21 +09:00
WebFreak001
b011edd85d
added Overlays container to RulesetContainer
...
this is required for mods such as flashlight which always want to draw
objects above hitcircles. If just adding children to a RulesetContainer
the hit circles would always be above the added children (no matter
the Depth).
2018-08-05 13:12:31 +02:00
tgi74000
07d6a75e23
Rename variables to be human readable
2018-08-04 00:18:09 +02:00
tgi74000
7310c38df9
Add relax mod
2018-08-03 14:03:11 +02:00
smoogipoo
3619290c34
Split out judgement definition from judgement result
2018-08-02 20:35:54 +09:00
Dean Herbert
3c06655672
Split out Special mods into Automation and Conversion
2018-07-31 18:00:42 +09:00
Dean Herbert
aead4be134
Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container
2018-07-23 06:36:10 +02:00
Dean Herbert
d868d81b59
Merge branch 'master' into centralise-judgement-display
2018-07-23 02:58:49 +09:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dean Herbert
3fc7f33e90
Merge branch 'master' into centralise-judgement-display
2018-07-20 17:29:15 +09:00
smoogipoo
1139f0dbf2
Centralise method of disabling playfield judgements
2018-07-20 17:04:33 +09:00
Dean Herbert
c2cdf12986
Better pause logic
2018-07-18 19:59:04 +09:00
smoogipoo
6437fdd9db
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-07-17 16:46:48 +09:00
smoogipoo
3905a9105c
Add a playfield method to retrieve all hitobjects
2018-07-17 15:51:10 +09:00
smoogipoo
48190e3b5a
Make NestedPlayfields non-null
2018-07-17 15:48:51 +09:00
Dean Herbert
569d0f7993
Merge branch 'master' into scrolldirection-cleanup
2018-07-17 15:39:13 +09:00
smoogipoo
827c5c4939
Remove scroll direction from ScrolingPlayfield constructor
2018-07-17 15:14:03 +09:00
Dean Herbert
b967fe714b
Fix lead-in time now being long enough in many cases
2018-07-17 14:29:22 +09:00
Dean Herbert
24054246b8
Fix DI regression
2018-07-11 17:54:01 +09:00
Dean Herbert
fbc5250bf1
Update framework
2018-07-11 17:12:01 +09:00
ekrctb
d71b61c122
Rewrite disable mouse buttons logic
2018-07-03 20:04:15 +09:00
Dean Herbert
1e1ff8339e
Merge branch 'master' into non-null-nestedobjects
2018-07-03 19:43:46 +09:00
smoogipoo
f0ec117bcb
Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds
...
# Conflicts:
# osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs
2018-07-02 17:21:18 +09:00
smoogipoo
45a4187923
Tidy up lookups to NestedHitObjects
2018-07-02 16:10:56 +09:00
Dean Herbert
594cc0d21d
Merge branch 'master' into mania-playfield-inversions
2018-06-25 18:36:23 +09:00
ekrctb
d6084c0b30
Adapt to new input handling changes
2018-06-22 18:10:27 +09:00
Tom Arrow
ad883e087a
RulesetContainer<TObject> cannot be derived
2018-06-19 14:31:24 +02:00
Dean Herbert
57011ff13b
Merge branch 'master' into mania-playfield-inversions
2018-06-15 18:33:40 +09:00
Dan Balasescu
0e0e64895a
Merge branch 'master' into mania-step-interval
2018-06-13 13:55:27 +09:00
Dean Herbert
bcfb092e53
Change step to 200
2018-06-12 18:03:45 +09:00
Dean Herbert
ae136e89a4
Merge branch 'master' into ruleset-configs
2018-06-12 13:13:18 +09:00
Dan Balasescu
9994c69d58
Merge branch 'master' into fix-object-ordering
2018-06-11 17:53:33 +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
eca016ec6c
Move ruleset config managers to Ruleset
2018-06-11 13:17:08 +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
9bdb3113ce
Revert "Always update children when ruleset input manager is updated"
...
This reverts commit 4eb7a34944
2018-06-08 21:05:28 +09:00
smoogipoo
2a48e0e44a
Fix sequential speed change visualiser not working with 0 control points
2018-06-08 15:11:43 +09:00
smoogipoo
55a5dfa9b6
Add column testcase
2018-06-07 20:24:33 +09:00
Dean Herbert
5e9a1961cb
Greatly increase the playfield scroll speed adjust step
...
It was so small previously that I believe many people didn't even realise it was working.
2018-06-07 14:35:33 +09:00
Dean Herbert
3567823759
Reverse order of exposed objects in HitObjectContainer
...
Closes #2740 .
2018-06-06 15:03:47 +09:00
Dean Herbert
d3cd267036
Formatting fixes
2018-06-06 14:20:51 +09:00
Dean Herbert
ee92986494
Merge branch 'master' into osu-hd-setting
2018-06-06 12:09:12 +09:00
smoogipoo
4eb7a34944
Always update children when ruleset input manager is updated
2018-05-31 18:02:10 +09:00
Dean Herbert
7f0cb0bbf6
Add key bindings for scroll speed
...
Closes #2689 .
- [ ] Depends on ppy/osu-framework#1569 being fixed.
2018-05-31 12:10:53 +09:00
Dean Herbert
5ec349de78
Reorder methods and remove useless comments
2018-05-21 15:59:33 +09:00
Dean Herbert
f53164843d
Reduce spacing changes
2018-05-21 15:56:02 +09:00
Vidalee
2492e34d3f
resolving codefactor styling issues
2018-05-17 19:44:09 +02:00
Vidalee
6a1abf4084
Merge branch 'master' into osu-hd-setting
2018-05-17 19:39:17 +02:00
smoogipoo
397d93660a
Don't deep-clone beatmapinfo/control points
2018-05-17 13:17:33 +09:00
Dean Herbert
8a6ef0dabb
Merge branch 'master' into beatmap-conversion-rework
2018-05-10 19:10:07 +08:00
smoogipoo
db3e48c194
Rename GetBeatmap() to GetPlayableBeatmap()
2018-05-07 10:40:30 +09:00
smoogipoo
4ecdea8b2e
Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
2018-05-07 10:17:54 +09:00
smoogipoo
77e661489d
Merge branch 'i-beatmap' into beatmap-conversion-rework
2018-05-07 10:00:24 +09:00
Vidalee
c4e45e30ef
Solving conflict
2018-05-06 13:18:12 +02:00
Vidalee
d36d9643eb
Missed one white space.. I guess my editor wasn't properly configured
...
for this file
2018-05-06 13:09:46 +02:00
Vidalee
af85102277
Should be ok now
2018-05-06 13:04:20 +02:00
Vidalee
008daf9a07
White space trimmed
2018-05-06 12:57:52 +02:00
Vidalee
095f6e1530
Code sanity
2018-05-06 12:49:15 +02:00
Vidalee
393c01ba90
Made the changes requested
2018-05-06 12:38:25 +02:00
smoogipoo
2d6b2d10f7
Use bindable transforms
2018-05-02 18:26:23 +09:00
Dean Herbert
76e58a51b9
Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting
2018-04-25 17:28:21 +09:00
smoogipoo
11b943c820
ComputePositions -> UpdatePositions
2018-04-20 14:22:48 +09:00
smoogipoo
52e3ffff30
Add some more commenting to lifetime calculation
2018-04-20 14:20:16 +09:00
smoogipoo
f3fddcc82c
Reorder parameter for consistency
2018-04-20 14:20:04 +09:00
smoogipoo
48b421b4b4
Add comments to SequentialSpeedChangeVisualiser
2018-04-20 14:16:30 +09:00
smoogipoo
1bab601cbc
Comments + xmldocs
2018-04-20 13:51:36 +09:00
smoogipoo
03a5df84c6
Initial rework of beatmap conversion process
2018-04-19 22:04:12 +09:00
smoogipoo
ea0683adb2
Fix hitobject lengths not being calculated for overlapping speed changes
...
Fixes #2359
2018-04-16 20:34:59 +09:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
smoogipoo
551ba6ac4b
Fix ScalableContainer irrepairably altering content size
2018-04-02 13:06:06 +09:00
smoogipoo
187a025d36
Make hitobjects sorted by their start times
2018-03-29 16:07:31 +09:00
smoogipoo
c29f7a4333
Merge remote-tracking branch 'origin/master' into netstandard
2018-03-24 14:49:46 +09:00
