1
0
mirror of https://github.com/ppy/osu.git synced 2025-03-06 05:53:11 +08:00
Commit Graph

23270 Commits

Author SHA1 Message Date
Dean Herbert
7ebd5daf7d Merge remote-tracking branch 'upstream/master' into dynamic-followpoints 2019-11-06 16:33:47 +09:00
Dean Herbert
ee544e174a Group -> Connection 2019-11-06 16:33:42 +09:00
Dan Balasescu
e4ad657353
Merge pull request #6736 from peppy/fix-tourney-crash
Fix tournament client crashing if beatmap added with an ID of zero
2019-11-06 15:42:20 +09:00
Dan Balasescu
1c1f5abac8
Merge branch 'master' into fix-tourney-crash 2019-11-06 15:05:35 +09:00
Dan Balasescu
8a83537f7f
Merge pull request #6634 from peppy/editor-timing-screen
Add editor timing screen
2019-11-06 15:05:22 +09:00
Dean Herbert
5e416bd18d Fix tournament client crashing if beatmap added with an ID of zero 2019-11-06 14:47:31 +09:00
Dean Herbert
ebfb5d050d Move section update code to abstract method to avoid incorrect BindValue usage 2019-11-06 14:36:43 +09:00
smoogipoo
322a1f0a86 Fix potential nullref 2019-11-06 12:45:35 +09:00
smoogipoo
7cd4cb8a93 Rename selectedPoints to selectedGroup 2019-11-06 12:32:12 +09:00
smoogipoo
9dd7f997d2 Reoder SampleSection to match others 2019-11-06 12:17:18 +09:00
smoogipoo
f20bfe7a55 Fix extra semicolon 2019-11-06 12:16:48 +09:00
Dan Balasescu
b5a8bbaa60
Merge branch 'master' into editor-timing-screen 2019-11-06 12:02:00 +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
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