Dean Herbert
|
df51f138c0
|
Merge branch 'master' into edit-select-all
|
2019-11-11 15:44:26 +09:00 |
|
Dean Herbert
|
13fd95d513
|
Remove misplaced usings
|
2019-11-11 14:03:29 +09:00 |
|
Dean Herbert
|
8ac708ada5
|
Move scaling container to OsuGame so OsuGameBase doesn't apply UI scale
|
2019-11-11 13:58:35 +09:00 |
|
Dean Herbert
|
dc88bd3d61
|
Add local preserving container to OsuTestScene to ensure correct test dimensions
|
2019-11-11 13:52:04 +09:00 |
|
smoogipoo
|
f3dc38e342
|
Add Ctrl+A to select all (esc to deselect all)
|
2019-11-11 13:41:10 +09:00 |
|
smoogipoo
|
e924a5d51e
|
Disable ruleset input in the editor
|
2019-11-11 13:04:43 +09:00 |
|
Dean Herbert
|
fd7bdc03ab
|
Merge remote-tracking branch 'upstream/master' into infrastructure
|
2019-11-11 11:11:59 +09:00 |
|
Dean Herbert
|
9db73d33cc
|
Remove horizontal padding on toolbar ruleset selector (#6780)
Remove horizontal padding on toolbar ruleset selector
|
2019-11-11 10:02:30 +09:00 |
|
iiSaLMaN
|
8f4916ad2d
|
Add inline comment
|
2019-11-10 23:53:31 +03:00 |
|
iiSaLMaN
|
9d61d73ced
|
Change Track and TrackManagerPreviewTrack accessibilities
|
2019-11-10 23:09:04 +03:00 |
|
iiSaLMaN
|
20ed6c4d52
|
Use track check solution for this
|
2019-11-10 23:07:51 +03:00 |
|
Dean Herbert
|
45e1501c02
|
Merge branch 'master' into infrastructure
|
2019-11-09 16:23:58 +09:00 |
|
Dean Herbert
|
5c47641608
|
Reorder conditional
|
2019-11-09 16:23:22 +09:00 |
|
Joehu
|
b675024161
|
Remove horizontal padding on toolbar ruleset selector
|
2019-11-08 20:28:24 -08:00 |
|
Dean Herbert
|
683916967c
|
Merge branch 'master' into vote-pill-fix
|
2019-11-09 12:15:48 +09:00 |
|
Dean Herbert
|
2dd514012a
|
Update framework
|
2019-11-08 23:28:22 +09:00 |
|
Joehu
|
ff225c3691
|
Remove toolbarElements
|
2019-11-08 06:04:18 -08:00 |
|
Huo Yaoyuan
|
6ebe02f409
|
Merge branch 'master' into infrastructure
|
2019-11-08 21:19:59 +08:00 |
|
smoogipoo
|
97ea07db0e
|
Add delete option to the right-click menu
|
2019-11-08 19:44:47 +09:00 |
|
iiSaLMaN
|
8ef9ccc39e
|
Schedule new track assignment after stopping current track
|
2019-11-08 13:19:06 +03:00 |
|
Dean Herbert
|
c70c05c896
|
Less sickening parallax (#6743)
Less sickening parallax
|
2019-11-08 19:15:25 +09:00 |
|
Dean Herbert
|
5699f3e22b
|
Seek to the first hitobject when entering the editor (#6766)
Seek to the first hitobject when entering the editor
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-11-08 19:15:08 +09:00 |
|
Dan Balasescu
|
1c1a49011b
|
Merge branch 'master' into infrastructure
|
2019-11-08 19:10:49 +09:00 |
|
Dean Herbert
|
ac0ec0d66e
|
Read initial beat divisor value from the beatmap (#6765)
Read initial beat divisor value from the beatmap
|
2019-11-08 19:06:25 +09:00 |
|
Dean Herbert
|
a849bc0746
|
Move implementation into resetTrack for safety
|
2019-11-08 18:51:01 +09:00 |
|
smoogipoo
|
e904928314
|
Seek to first hitobject when entering editor
|
2019-11-08 17:42:19 +09:00 |
|
smoogipoo
|
36cc79f04f
|
Softly handle invalid beat divisors instead of throwing
|
2019-11-08 17:28:11 +09:00 |
|
smoogipoo
|
998e1dfe47
|
Fix non-1/1 initial beat divisor control display
|
2019-11-08 17:23:47 +09:00 |
|
smoogipoo
|
eb9fff96ba
|
Read default beat divisor from beatmap
|
2019-11-08 17:22:58 +09:00 |
|
Dean Herbert
|
8bcbc93501
|
Fix tournament buttons playing sound effects
|
2019-11-08 17:00:47 +09:00 |
|
smoogipoo
|
df08a95734
|
Separate addition/removal into separate methods
|
2019-11-08 16:46:58 +09:00 |
|
smoogipoo
|
b4cb4c1243
|
Remove previous samples on change
|
2019-11-08 16:19:55 +09:00 |
|
smoogipoo
|
a9b4106075
|
Remove unnecessary (for now) scheduling
|
2019-11-08 16:19:43 +09:00 |
|
smoogipoo
|
53e6186b6d
|
Fix drawable hitobject samples not updating
|
2019-11-08 14:59:47 +09:00 |
|
smoogipoo
|
6fc1be64c2
|
Make hitobject samples a bindable list
|
2019-11-08 14:04:57 +09:00 |
|
smoogipoo
|
864b8db638
|
Use three states for the hitsound menu items
|
2019-11-08 13:52:36 +09:00 |
|
smoogipoo
|
046f0b0fe5
|
Allow right-clicks to trigger selection
|
2019-11-08 13:40:47 +09:00 |
|
smoogipoo
|
573d11503e
|
Remove unused using
|
2019-11-08 13:36:17 +09:00 |
|
smoogipoo
|
abb3a6ca5b
|
Initial right click context menu implementation
|
2019-11-08 13:36:17 +09:00 |
|
smoogipoo
|
a2c265c147
|
Separate ThreeStates into its own file
|
2019-11-08 13:23:13 +09:00 |
|
smoogipoo
|
011bf09516
|
Add xmldocs and cleanup
|
2019-11-08 13:23:13 +09:00 |
|
smoogipoo
|
0a15a13fab
|
Reorder parameters
|
2019-11-08 13:23:13 +09:00 |
|
smoogipoo
|
30f877c4ab
|
Implement a three-state menu item
|
2019-11-08 13:23:13 +09:00 |
|
smoogipoo
|
ce08d664a5
|
Abstract statefulness of new menu item type
|
2019-11-08 13:23:13 +09:00 |
|
smoogipoo
|
4fe69dbc89
|
Fix context menu sub-menu display
|
2019-11-08 13:23:13 +09:00 |
|
Joehu
|
5235d2b319
|
Fix home button not closing login and now playing overlays
|
2019-11-07 14:38:06 -08:00 |
|
smoogipoo
|
c3a3b4091b
|
Add basic implementation of a toggleable menu item
|
2019-11-07 22:26:35 +09:00 |
|
smoogipoo
|
29672c48e1
|
Make simple OsuMenuItem ctor invoke the complex one
|
2019-11-07 16:04:13 +09:00 |
|
smoogipoo
|
20d6eceecf
|
Move DrawableOsuMenuItem out of OsuMenu
|
2019-11-07 16:03:35 +09:00 |
|
Andrei Zavatski
|
446e2894f7
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into vote-pill-fix
|
2019-11-07 08:48:35 +03:00 |
|
smoogipoo
|
f3ddc4c00b
|
Advance editor clock after a snapped placement
|
2019-11-07 14:08:02 +09:00 |
|
Dean Herbert
|
d400e4a5f6
|
Add shared constant for parallax amount
|
2019-11-07 09:30:50 +09:00 |
|
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 |
|
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 |
|
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
|
23eab68c72
|
Merge remote-tracking branch 'upstream/master' into editor-timing-screen-2
|
2019-11-06 16:22:55 +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 |
|
Dean Herbert
|
c1a6cb1def
|
Fix audio preview muting game audio indefinitely when beatmap panel is off-screen
|
2019-11-06 15:58:47 +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 |
|
Dean Herbert
|
a3d8738cab
|
Merge branch 'master' into vote-pill-fix
|
2019-11-06 14:52:06 +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
|
b4ae02cc69
|
Merge remote-tracking branch 'upstream/master' into update-framework
|
2019-11-06 12:09:51 +09: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
|
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 |
|
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 |
|