1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-15 03:47:26 +08:00
Commit Graph

33388 Commits

Author SHA1 Message Date
Bartłomiej Dach
a1696942f0 Merge branch 'master' into right-click-circle-delete 2020-10-28 22:12:14 +01:00
Bartłomiej Dach
202fe09306 Group selection actions back up in SelectionHandler 2020-10-28 22:06:48 +01:00
Dean Herbert
37e9e39ee8
Merge pull request #10602 from peppy/fix-editor-samples-not-pausing-screen-swap
Fix editor not pausing samples when switching away from compose mode
2020-10-27 22:43:27 +09:00
Dan Balasescu
26a7545534
Merge branch 'master' into fix-editor-samples-not-pausing-screen-swap 2020-10-27 21:29:16 +09:00
Dean Herbert
df5348cd93
Merge pull request #10601 from peppy/move-sample-pause-logic 2020-10-27 17:49:32 +09:00
Dean Herbert
b8beac27ce Use previous logic for catching-up mode 2020-10-27 17:14:41 +09:00
Dan Balasescu
4395852003
Merge pull request #10598 from peppy/editor-timing-seek-on-click-only
Change editor timing screen seek behaviour to only occur on clicking table rows
2020-10-27 15:47:18 +09:00
Dean Herbert
d148bafedc Merge branch 'move-sample-pause-logic' into fix-editor-samples-not-pausing-screen-swap 2020-10-27 14:35:58 +09:00
Dean Herbert
03d566da35 Rename test variable and remove unncessary cast 2020-10-27 14:35:12 +09:00
Dean Herbert
e0ad005cc1 Move editor sample disabling logic to editor class (and support screen switching) 2020-10-27 14:33:44 +09:00
Dean Herbert
606a4304a8 Remove unused usings 2020-10-27 14:33:16 +09:00
Dean Herbert
09087faf3b Fix non-matching filename 2020-10-27 14:23:24 +09:00
Dean Herbert
9cfb81589e Use bindable flow instead 2020-10-27 14:10:12 +09:00
Dean Herbert
6853da459d Move sample pausing logic out of FrameStabilityContainer 2020-10-27 13:54:33 +09:00
Dean Herbert
3c2e2f29bc Remove unused using statement 2020-10-27 13:17:44 +09:00
Dean Herbert
27c1a4c4d3 Move right-click deletion logic to be handled at a SelectionBlueprint level 2020-10-27 12:53:54 +09:00
Dean Herbert
e1f578c590 Change editor timing screen seek behaviour to only occur on clicking table rows
Previously it would react to any selection changed event, which could in
lude time changes (which is done by removing then adding the
ControlPointGroup).

Closes #10590.
2020-10-27 12:28:12 +09:00
Dean Herbert
266596d404
Merge branch 'master' into right-click-circle-delete 2020-10-27 12:02:29 +09:00
Dean Herbert
11ebd2d7f8
Merge pull request #10597 from bdach/fix-mania-spectator-crash 2020-10-27 11:56:41 +09:00
Dean Herbert
68719bb23d Rename other variables to match 2020-10-27 10:59:24 +09:00
Bartłomiej Dach
7392876b5f Fix mania crashing due to spectator client handling frames with unconverted beatmap 2020-10-27 00:35:25 +01:00
Bartłomiej Dach
3f8c4c57d0 Fix code style issues & restructure 2020-10-26 22:16:28 +01:00
Charlie
255bb9d100 fixed issue with returns 2020-10-26 14:52:59 -05:00
Charlie
ccaf6560ec formatting 2020-10-26 14:30:37 -05:00
Charlie
1239670566 moved right click shift delete functionality to HandleSelectionRequested + reduced func size 2020-10-26 14:28:53 -05:00
Charlie
ead3c19567 added function so circle is deleted when shift+right click 2020-10-26 13:40:42 -05:00
Dean Herbert
19e58dc4fc
Merge pull request #9970 from MiraiSubject/flag-fit 2020-10-26 19:41:22 +09:00
Dan Balasescu
b8047f5f1d
Merge pull request #10582 from peppy/spectator
Add spectator replay streaming support
2020-10-26 17:07:33 +09:00
Dean Herbert
b1a88a4993 Remove extra using 2020-10-26 16:34:30 +09:00
Dean Herbert
dfe07271de Add very basic latency handling to spectator test 2020-10-26 16:31:39 +09:00
Dean Herbert
f5dbaa9b0f Only watch local user to prevent conflict between testers 2020-10-26 15:27:15 +09:00
Dean Herbert
8508d5f8b9 Rename test scene to match purpose 2020-10-26 15:24:28 +09:00
Dean Herbert
e941f2fb71 Fix playback not being smooth (and event unbinding logic) 2020-10-26 15:24:12 +09:00
Dean Herbert
ac13a1d217 Adjust a couple of flag scales to match previous display size 2020-10-26 14:27:55 +09:00
Dean Herbert
7ed128e030 Merge branch 'master' into flag-fit 2020-10-26 14:19:32 +09:00
Dean Herbert
b86347dc81 Merge branch 'master' into spectator 2020-10-26 13:39:07 +09:00
Dean Herbert
9caa7ff64d Remove debug endpoint 2020-10-26 13:38:05 +09:00
Dean Herbert
38ca5548f4
Merge pull request #10595 from bdach/traceable-hide-hit-circles 2020-10-26 10:30:32 +09:00
Bartłomiej Dach
5ef1b5dcb5 Remove unused locals 2020-10-25 23:55:22 +01:00
Bartłomiej Dach
0a23e994e2 Hide sliderend & repeat circles in traceable mod 2020-10-25 23:30:26 +01:00
Dean Herbert
bab8c7480d
Merge pull request #10591 from bdach/epilepsy-warning-volume-restoration
Fix epilepsy warning not restoring track volume
2020-10-25 22:59:56 +09:00
Dean Herbert
431054377a
Merge branch 'master' into epilepsy-warning-volume-restoration 2020-10-25 22:22:11 +09:00
Bartłomiej Dach
6d0b0d1f08
Merge pull request #10593 from peppy/fix-song-select-potential-nullref
Fix a potential null reference when loading carousel difficulties
2020-10-25 13:11:45 +01:00
Bartłomiej Dach
0542a45c43 Change to manual adjustment add/remove 2020-10-25 12:33:35 +01:00
Dean Herbert
8b04cd2cb0 Fix a potential null reference when loading carousel difficulties 2020-10-25 20:28:24 +09:00
Bartłomiej Dach
85e14f3f0c Shorten fade duration to make fade out snappier 2020-10-25 00:40:11 +02:00
Bartłomiej Dach
e101ba5cba Move volume manipulations to player loader 2020-10-25 00:40:11 +02:00
Bartłomiej Dach
73174961f0 Rework animation sequence for readability 2020-10-24 22:30:08 +02:00
Shivam
c24a29d1ac Update flag scale of drawablematchteam 2020-10-23 14:23:08 +02:00
Shivam
25145cdb62 Merge branch 'master' into flag-fit 2020-10-23 14:11:47 +02:00