1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 00:52:59 +08:00
Commit Graph

23406 Commits

Author SHA1 Message Date
iiSaLMaN
6ecea0e4c1 Fix DummyAPIAccess being potentially incorrect 2019-11-06 18:15:49 +03:00
Andrei Zavatski
c01f3a58cb Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix 2019-11-06 18:15:49 +03:00
Dean Herbert
3bc4685a46
Merge pull request #6692 from peppy/fix-network-stalls
Use LongRunningLoad on network load components
2019-11-06 19:54:30 +09:00
Dean Herbert
70cf91fb40
Seek editor when hit objects are double clicked (#6745)
Seek editor when hit objects are double clicked
2019-11-06 19:22:41 +09:00
Dean Herbert
91bcb5d4a7 Merge remote-tracking branch 'upstream/master' into fix-network-stalls 2019-11-06 19:06:28 +09:00
Dean Herbert
31f2d6a842 Fix regressed test 2019-11-06 19:06:24 +09:00
Andrei Zavatski
5589329e16 Split tests 2019-11-06 12:54:04 +03:00
Andrei Zavatski
b35b3484ca Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix 2019-11-06 12:46:28 +03:00
Andrei Zavatski
4330507da8 Use api.IsLoggedIn 2019-11-06 12:46:25 +03:00
Dean Herbert
46a0fbe561
Share framework file-exclusion function (#6668)
Share framework file-exclusion function

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-06 18:40:22 +09:00
Dean Herbert
a6d000baa2
Fix audio preview muting game audio indefinitely when beatmap p… (#6738)
Fix audio preview muting game audio indefinitely when beatmap panel is off-screen

Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-11-06 18:34:17 +09:00
Dean Herbert
0df0260dd9
Disallow selections to be moved outside of the playfield (#6742)
Disallow selections to be moved outside of the playfield
2019-11-06 18:29:06 +09:00
Andrei Zavatski
1f3b209a6c Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix 2019-11-06 12:26:41 +03:00
smoogipoo
3680e7c704 Seek editor when hit objects are double clicked 2019-11-06 18:15:57 +09:00
Dean Herbert
aaa06396f0 Reduce editor parallax 2019-11-06 18:11:56 +09:00
Dean Herbert
ee4839b7e7 Reduce delay on parallax 2019-11-06 18:09:36 +09:00
Dean Herbert
813d3a0bfa
Fix adjustments not being removed correctly on retry from pause (#6728)
Fix adjustments not being removed correctly on retry from pause
2019-11-06 17:54:20 +09:00
Dean Herbert
143f316cbe
Merge branch 'master' into fix-network-stalls 2019-11-06 17:54:08 +09:00
Dan Balasescu
402eedce03
Merge branch 'master' into reuse-framework-exclusuion-function 2019-11-06 17:48:26 +09:00
Dan Balasescu
1e52c83804
Merge branch 'master' into fix-preview-not-stopping 2019-11-06 17:47:54 +09:00
Dean Herbert
09e9ef0e4b
Add background colour to music player ProgressBar (#6741)
Add background colour to music player ProgressBar
2019-11-06 17:44:08 +09:00
Dean Herbert
41a8954b81
Refactor follow points to support dynamic updates (#6721)
Refactor follow points to support dynamic updates

Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-11-06 17:43:58 +09:00
smoogipoo
2c1bfd62ef Disallow selections to be moved outside of the playfield 2019-11-06 17:28:04 +09:00
Dean Herbert
c631a05a44
Add ability to edit individual ControlPoint attributes from tim… (#6638)
Add ability to edit individual ControlPoint attributes from timing screen
2019-11-06 17:24:51 +09:00
Dean Herbert
a2963b66f6
Limit distance snap between two adjacent hit objects (#6740)
Limit distance snap between two adjacent hit objects
2019-11-06 17:18:00 +09:00
Dan Balasescu
ff6bfc453b
Merge pull request #6718 from peppy/update-framework
Update framework
2019-11-06 16:38:15 +09:00
Dean Herbert
7b5b3ff15c Remove unused returns 2019-11-06 16:36:12 +09:00
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
Dean Herbert
23eab68c72 Merge remote-tracking branch 'upstream/master' into editor-timing-screen-2 2019-11-06 16:22:55 +09:00
smoogipoo
b83ceab1c1 Add tests 2019-11-06 16:20:13 +09:00
Ganendra Afrasya
02c21a1379 Make progress bar hoverable 2019-11-06 14:11:47 +07:00
Ganendra Afrasya
d985d04857 Add background colour to music player ProgressBar 2019-11-06 14:07:34 +07:00
smoogipoo
2588534eda Skin entire selection, add xmldocs 2019-11-06 16:04:20 +09:00
Dean Herbert
c1a6cb1def Fix audio preview muting game audio indefinitely when beatmap panel is off-screen 2019-11-06 15:58:47 +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
smoogipoo
020b08b450 Initial implementation of limited distance snap 2019-11-06 15:27:48 +09:00
smoogipoo
0b09fb293e Fix background being coloured 2019-11-06 15:16:00 +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
a3d8738cab
Merge branch 'master' into vote-pill-fix 2019-11-06 14:52:06 +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
Dean Herbert
4ce3450cfc Move button implementation to OsuButton 2019-11-06 14:08:52 +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
Dean Herbert
8cf349c1ee Update once more 2019-11-06 12:10:53 +09:00
Dean Herbert
55018339c9 Merge remote-tracking branch 'upstream/dependabot/nuget/ppy.osu.Framework.iOS-2019.1106.0' into update-framework 2019-11-06 12:10:31 +09:00