Dean Herbert
|
19dd00e8b4
|
Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.Android-2019.1106.0' into update-framework
|
2019-11-06 12:10:14 +09:00 |
|
Dean Herbert
|
b4ae02cc69
|
Merge remote-tracking branch 'upstream/master' into update-framework
|
2019-11-06 12:09:51 +09:00 |
|
dependabot-preview[bot]
|
1d83f51a80
|
Bump ppy.osu.Framework.Android from 2019.1029.0 to 2019.1106.0
Bumps [ppy.osu.Framework.Android](https://github.com/ppy/osu-framework) from 2019.1029.0 to 2019.1106.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.1029.0...2019.1106.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-11-06 03:05:05 +00:00 |
|
dependabot-preview[bot]
|
892ef017ef
|
Bump ppy.osu.Framework.iOS from 2019.1029.0 to 2019.1106.0
Bumps [ppy.osu.Framework.iOS](https://github.com/ppy/osu-framework) from 2019.1029.0 to 2019.1106.0.
- [Release notes](https://github.com/ppy/osu-framework/releases)
- [Commits](https://github.com/ppy/osu-framework/compare/2019.1029.0...2019.1106.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
|
2019-11-06 03:05:03 +00:00 |
|
Dan Balasescu
|
b5a8bbaa60
|
Merge branch 'master' into editor-timing-screen
|
2019-11-06 12:02:00 +09:00 |
|
Dean Herbert
|
cd1dd0f898
|
Fix adjustments not being removed correctly on retry from pause
|
2019-11-06 10:38:04 +09:00 |
|
Dean Herbert
|
1f40641d05
|
Add failing test
|
2019-11-06 10:32:09 +09:00 |
|
smoogipoo
|
68ca5cb26a
|
Adjust comments
|
2019-11-05 23:20:46 +09:00 |
|
smoogipoo
|
aff275ea21
|
Revert "Fix follow point lifetime not being updated correctly"
This reverts commit 1ef2b81041.
|
2019-11-05 23:03:05 +09:00 |
|
smoogipoo
|
0a2af2b0fe
|
Apply transform override at a higher level
|
2019-11-05 23:02:39 +09:00 |
|
smoogipoo
|
d762ec959c
|
Schedule group refresh when loaded
|
2019-11-05 22:50:38 +09:00 |
|
smoogipoo
|
68a81e0eb0
|
Fix follow point transforms not working after rewind
|
2019-11-05 22:50:21 +09:00 |
|
smoogipoo
|
d028603769
|
Rename tests
|
2019-11-05 22:50:01 +09:00 |
|
smoogipoo
|
f2118b0eba
|
Add automated test cases
|
2019-11-05 19:31:58 +09:00 |
|
smoogipoo
|
6c58faf30c
|
Fix group ends potentially not being updated correctly
|
2019-11-05 19:31:48 +09:00 |
|
Dean Herbert
|
52dba69a64
|
Implement slider control point deletion (#6679)
Implement slider control point deletion
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-11-05 19:15:15 +09:00 |
|
Dean Herbert
|
f0a6fbdeb0
|
Fix selecting underneath selected blueprints (#6719)
Fix selecting underneath selected blueprints
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-11-05 18:48:46 +09:00 |
|
Dean Herbert
|
3b8dc57ad3
|
Disable input for non-selected blueprints (#6717)
Disable input for non-selected blueprints
|
2019-11-05 18:34:43 +09:00 |
|
Dean Herbert
|
f4b93ec943
|
Add exception when holding control
|
2019-11-05 18:29:08 +09:00 |
|
Dean Herbert
|
f77de7d880
|
Simplify implementation
|
2019-11-05 18:25:38 +09:00 |
|
Dean Herbert
|
3680b9a380
|
Merge branch 'master' into fix-selection-priority
|
2019-11-05 17:51:30 +09:00 |
|
Dean Herbert
|
86f05154f5
|
Fix slider selection input handled outside path (#6720)
Fix slider selection input handled outside path
|
2019-11-05 17:51:14 +09:00 |
|
smoogipoo
|
1ef2b81041
|
Fix follow point lifetime not being updated correctly
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
3b6064336b
|
Implement group re-ordering based on start time
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
a19e26f8aa
|
Improve performance of refreshes
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
712253ff50
|
Replace follow point renderer with new implementation
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
ddfcda9e02
|
Remove abstract ConnectionRenderer class
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
bfe7309964
|
Fix nullref
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
02a7f92d18
|
Allow constructing arbitrary hitobject types
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
e0ba35db75
|
Implement binding to hitobjects + refreshing
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
c0badf1dce
|
Type to DrawableOsuHitObject
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
513ad96adf
|
Cleanup property
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
f861d8099c
|
Remove unnecessary class
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
c1850b2353
|
Add some basic tests
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
7e60bc7240
|
Fix groups having 0 size
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
861268eb1d
|
Add basic structure for new follow point renderer
|
2019-11-05 17:33:02 +09:00 |
|
smoogipoo
|
d77882c21b
|
Fix slider selection input handled outside path
|
2019-11-05 17:31:52 +09:00 |
|
smoogipoo
|
0db34a47f8
|
Fix selecting underneath selected blueprints
|
2019-11-05 17:28:42 +09:00 |
|
Dean Herbert
|
44d0791676
|
Update button usage
|
2019-11-05 16:26:31 +09:00 |
|
Dan Balasescu
|
0758025b6b
|
Merge branch 'master' into reuse-framework-exclusuion-function
|
2019-11-05 16:18:16 +09:00 |
|
Dean Herbert
|
fe374eabe0
|
Update framework
|
2019-11-05 15:47:01 +09:00 |
|
Dean Herbert
|
621f4387c9
|
Improve iOS importing and file system (#5574)
Improve iOS importing and file system
Co-authored-by: Dean Herbert <pe@ppy.sh>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
|
2019-11-05 15:12:01 +09:00 |
|
Dan Balasescu
|
7ecd1ea0e9
|
Merge branch 'master' into fix-ios-import
|
2019-11-05 14:51:30 +09:00 |
|
smoogipoo
|
7c20a589f2
|
Remove unused usings
|
2019-11-05 13:56:21 +09:00 |
|
smoogipoo
|
c8beb5296f
|
Use PlatformAction.Delete instead of Delete key
|
2019-11-05 13:26:44 +09:00 |
|
smoogipoo
|
08bd811326
|
Merge remote-tracking branch 'origin/master' into slider-controlpoint-deletion
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Blueprints/Sliders/Components/PathControlPointVisualiser.cs
|
2019-11-05 13:07:06 +09:00 |
|
Dan Balasescu
|
af7322a763
|
Merge pull request #6685 from peppy/game-handles-links
Move link handling code to OsuGame
|
2019-11-05 12:51:18 +09:00 |
|
Dan Balasescu
|
23ad516348
|
Merge branch 'master' into game-handles-links
|
2019-11-05 12:33:32 +09:00 |
|
Dan Balasescu
|
48711299f8
|
Merge pull request #6699 from peppy/fix-slider-creation
Fix slider creation regressing with path selection changes
|
2019-11-05 11:56:48 +09:00 |
|
smoogipoo
|
64d900b387
|
Disable input for non-selected blueprints
|
2019-11-05 11:33:37 +09:00 |
|