Dan Balasescu
|
c6a85a11bd
|
Merge branch 'master' into sharpen
|
2019-11-27 17:09:11 +09:00 |
|
Huo Yaoyuan
|
eba8657d38
|
Remove newly introduced redundant this.
|
2019-11-26 18:41:19 +08:00 |
|
Huo Yaoyuan
|
c0fe91a84c
|
Merge branch 'master' into sharpen
|
2019-11-26 18:21:50 +08:00 |
|
Albie
|
09158b6b08
|
Merge branch 'master' into cinema-mod
|
2019-11-26 06:57:47 +00:00 |
|
Dean Herbert
|
77ce9642ba
|
Add test coverage and simplify break time updating
|
2019-11-26 15:32:48 +09:00 |
|
Dean Herbert
|
a453129d44
|
Fix nullref in tests
|
2019-11-26 15:13:50 +09:00 |
|
Dan Balasescu
|
8a8e863c0e
|
Merge branch 'master' into intro-outro-break
|
2019-11-26 12:47:42 +09:00 |
|
Dan Balasescu
|
b21de98296
|
Merge branch 'master' into get-end-time
|
2019-11-26 11:47:01 +09:00 |
|
Dean Herbert
|
fbebbab5db
|
Remove excess parenthesis
|
2019-11-25 22:37:07 +09:00 |
|
Albie
|
87ee3f1083
|
Merge branch 'master' into cinema-mod
|
2019-11-25 13:35:14 +00:00 |
|
Dean Herbert
|
709ec1404f
|
Centralise End/StartTime retrieval to extension method
|
2019-11-25 19:09:14 +09:00 |
|
Dean Herbert
|
6b8983b489
|
Consider intro and outro time as "break" time
|
2019-11-25 19:02:11 +09:00 |
|
smoogipoo
|
719f0d5947
|
Fix stutters when changing beatmap difficulties
|
2019-11-25 18:28:43 +09:00 |
|
Albie
|
0a70ec0b11
|
Merge branch 'master' into cinema-mod
|
2019-11-25 07:25:30 +00:00 |
|
Albie
|
9fdbb2a58e
|
change name of interface and expose method instead of seperate values
|
2019-11-25 07:24:29 +00:00 |
|
Berkan Diler
|
fccdbffa93
|
Use MathF instead of Math- functions when possible
MathF-functions are faster than the Math-counterpart and it looks cleaner, so use MathF when we cast to float or int anyway.
|
2019-11-25 00:45:42 +01:00 |
|
Albie
|
9a8e3fe1da
|
add brackets
|
2019-11-24 07:44:35 +00:00 |
|
Albie
|
1d6665fe57
|
improve code quality using resharper and codefactor advice
|
2019-11-24 07:42:39 +00:00 |
|
Albie
|
b8e5796af5
|
add forced video/storyboard and disabled dim for mod inside new interface
|
2019-11-24 07:37:06 +00:00 |
|
Dean Herbert
|
4063135a3a
|
Fix result mode button's corner exponent
|
2019-11-22 20:45:05 +09:00 |
|
Dean Herbert
|
c2e85a2057
|
Apply CornerExponent fixes
|
2019-11-22 19:49:20 +09:00 |
|
Dean Herbert
|
83080c3b5f
|
Fix merge regression
|
2019-11-22 14:14:18 +09:00 |
|
Dan Balasescu
|
5d2a608be0
|
Merge branch 'master' into lead-in-fixes
|
2019-11-22 13:48:55 +09:00 |
|
Dan Balasescu
|
7c19f7cd7b
|
Merge branch 'master' into improve-skip-button-feel
|
2019-11-22 13:36:27 +09:00 |
|
Dan Balasescu
|
ba0ac93f70
|
Merge branch 'master' into skip-multiple-times
|
2019-11-22 13:23:50 +09:00 |
|
Dean Herbert
|
d8260f4a65
|
Reduce carousel scroll motion on initial display
|
2019-11-22 10:51:49 +09:00 |
|
Dean Herbert
|
ab42fac43a
|
Improve naming
|
2019-11-22 02:38:31 +09:00 |
|
Dean Herbert
|
f390e558c7
|
Combine and simplify beatmap change logic
|
2019-11-22 02:32:02 +09:00 |
|
Dean Herbert
|
a97d760afa
|
Merge remote-tracking branch 'upstream/master' into menu-background-modes
|
2019-11-22 02:23:02 +09:00 |
|
Huo Yaoyuan
|
818553027b
|
Merge branch 'master' into sharpen
|
2019-11-21 23:42:46 +08:00 |
|
Dean Herbert
|
201f32859a
|
Merge branch 'master' into slider-control-point-removal
|
2019-11-21 22:10:52 +09:00 |
|
Dean Herbert
|
bd6831624a
|
Decouple skip button animations from gameplay clock
|
2019-11-21 19:51:22 +09:00 |
|
Dean Herbert
|
ffd0e17826
|
Merge branch 'skip-multiple-times' into lead-in-fixes
|
2019-11-21 19:01:28 +09:00 |
|
Dean Herbert
|
46a94821d4
|
Add support for consecutive skips
|
2019-11-21 18:59:55 +09:00 |
|
Dean Herbert
|
29d2374928
|
Add back skip button actuation count tests
|
2019-11-21 17:23:52 +09:00 |
|
Dean Herbert
|
2dd2e3d861
|
Add correct AudioLeadIn support
|
2019-11-21 16:55:18 +09:00 |
|
Dean Herbert
|
8369be90f2
|
Allow skip button to actuate more than once
|
2019-11-21 15:19:06 +09:00 |
|
Dean Herbert
|
c0b9bb5a12
|
Merge remote-tracking branch 'upstream/master' into lead-in-fixes
|
2019-11-21 14:22:17 +09:00 |
|
Dean Herbert
|
2325f0382c
|
Cancel a potentially pending filter update when an update occurs
|
2019-11-21 13:46:45 +09:00 |
|
Dean Herbert
|
4d6904468d
|
Merge remote-tracking branch 'upstream/master' into multi-searching
|
2019-11-21 13:44:04 +09:00 |
|
Dan Balasescu
|
a7c074ff37
|
Merge branch 'master' into math_clamp
|
2019-11-21 11:08:56 +09:00 |
|
smoogipoo
|
0cbe29dbec
|
Refactor / cleanup debouncing
|
2019-11-21 11:05:18 +09:00 |
|
Berkan Diler
|
6cab517b2d
|
.NET Standard 2.1 implements Math.Clamp , use it instead of MathHelper.Clamp from osuTK.
|
2019-11-20 13:37:47 +01:00 |
|
Dean Herbert
|
3ba9f840fd
|
Fix song select not always scrolling to the correct location
|
2019-11-20 19:39:13 +09:00 |
|
Huo Yaoyuan
|
374ef6ff83
|
Merge branch 'master' into sharpen
|
2019-11-20 17:30:58 +08:00 |
|
Dean Herbert
|
8c9ed99b1b
|
Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter
|
2019-11-20 17:24:54 +09:00 |
|
Dean Herbert
|
5b416eb7ba
|
Move initial filter to run on entering
|
2019-11-20 17:24:43 +09:00 |
|
Dean Herbert
|
e0f59d8e24
|
Move method
|
2019-11-20 15:43:00 +09:00 |
|
Huo Yaoyuan
|
b04bca7db6
|
Reference elements in origin definition.
|
2019-11-17 20:55:40 +08:00 |
|
Dean Herbert
|
e9e37fc821
|
Add private setter for FilterControl
|
2019-11-15 18:23:35 +09:00 |
|
Dean Herbert
|
296fff9243
|
Merge remote-tracking branch 'upstream/master' into fix-carousel-double-filter
|
2019-11-15 18:20:36 +09:00 |
|
smoogipoo
|
10287eb66d
|
Add debounce logic in several places
|
2019-11-15 17:58:47 +09:00 |
|
smoogipoo
|
1b4bcb81c8
|
Fix filtering breaking on secondary filters
|
2019-11-15 17:49:02 +09:00 |
|
Dean Herbert
|
eee5902851
|
Merge remote-tracking branch 'upstream/master' into lead-in-fixes
|
2019-11-15 14:05:31 +09:00 |
|
Dean Herbert
|
2c3109980a
|
Fix broken merge
|
2019-11-15 13:51:39 +09:00 |
|
Dean Herbert
|
6d06b444ba
|
Allow screen to specify whether to apply audio rate adjustments from mods
|
2019-11-15 13:47:14 +09:00 |
|
Dean Herbert
|
b8bb97607b
|
Merge remote-tracking branch 'upstream/master' into fix-mod-retention
|
2019-11-15 13:46:44 +09:00 |
|
smoogipoo
|
f0b7b2e1c4
|
Fix broken test case
|
2019-11-15 11:07:16 +09:00 |
|
smoogipoo
|
956fb9912d
|
Hook up multiplayer search filter
|
2019-11-15 08:23:56 +09:00 |
|
Huo Yaoyuan
|
677717875e
|
Change a case to EqualityComparer.Default to handle null properly.
|
2019-11-14 17:35:02 +08:00 |
|
Huo Yaoyuan
|
f25b1ba06f
|
Merge branch 'master' into equals
|
2019-11-14 17:33:44 +08:00 |
|
Dean Herbert
|
c15f909d83
|
Remove local bindable at song select, along with misplaced reset logic
|
2019-11-14 13:29:06 +09:00 |
|
Dean Herbert
|
d8a5750e5d
|
Fix typo
Co-Authored-By: Bartłomiej Dach <dach.bartlomiej@gmail.com>
|
2019-11-14 08:38:01 +09:00 |
|
Dean Herbert
|
a580b9079a
|
Reword comment
|
2019-11-14 08:28:41 +09:00 |
|
Huo Yaoyuan
|
87d40cf8d0
|
Resolve equals usages.
|
2019-11-13 22:35:50 +08:00 |
|
Dean Herbert
|
110c155fa0
|
Fix background loading twice when entering song select
|
2019-11-13 19:42:05 +09:00 |
|
Dean Herbert
|
280c1a0eb4
|
Fix carousel filtering twice on startup due to unpopulated ruleset
|
2019-11-13 19:04:52 +09:00 |
|
Dean Herbert
|
bca1be0bfa
|
Add failing test
|
2019-11-13 18:54:33 +09:00 |
|
smoogipoo
|
76ab0ecd3c
|
Disallow deselections with right clicks
|
2019-11-13 17:21:55 +09:00 |
|
Huo Yaoyuan
|
f3f5094c26
|
Convert delegate to local function.
|
2019-11-12 20:14:22 +08:00 |
|
Huo Yaoyuan
|
42a98c5d87
|
Use constants.
|
2019-11-12 20:07:01 +08:00 |
|
Huo Yaoyuan
|
d60493a961
|
Use discards.
|
2019-11-12 20:03:21 +08:00 |
|
Huo Yaoyuan
|
e5e8e70704
|
Use pattern matching.
|
2019-11-12 19:55:19 +08:00 |
|
Huo Yaoyuan
|
7d7b9e36b2
|
Use compound assignment.
|
2019-11-12 19:53:50 +08:00 |
|
Dean Herbert
|
4b66ce0c52
|
Merge branch 'master' into slider-controlpoint-addition
|
2019-11-12 18:13:27 +09:00 |
|
Dean Herbert
|
dd196385cb
|
Add Ctrl+A to select all and Escape to deselect all (#6803)
Add Ctrl+A to select all and Escape to deselect all
Co-authored-by: Dean Herbert <pe@ppy.sh>
|
2019-11-12 18:10:45 +09:00 |
|
Dean Herbert
|
cdd87a6903
|
Merge branch 'master' into delete-selection
|
2019-11-12 17:59:43 +09:00 |
|
smoogipoo
|
10fd5ef5a7
|
Merge context menus
|
2019-11-12 15:02:27 +09:00 |
|
Dean Herbert
|
b4525c1f6e
|
Fix right clicking to select not showing context menu
|
2019-11-12 14:42:30 +09:00 |
|
smoogipoo
|
9f1d490ac9
|
Only handle selection input on blueprints
|
2019-11-12 12:18:24 +09:00 |
|
Dean Herbert
|
a43b0ee01b
|
Apply naming and styling changes
|
2019-11-12 10:45:46 +09:00 |
|
Dean Herbert
|
b37bf4ea01
|
Merge remote-tracking branch 'upstream/master' into selection-hitsound-addition
|
2019-11-12 10:44:53 +09:00 |
|
Huo Yaoyuan
|
e9b8cbb516
|
Apply other styles.
|
2019-11-11 20:27:04 +08:00 |
|
Huo Yaoyuan
|
ccc8aa6fa4
|
Apply brace style.
|
2019-11-11 20:13:13 +08:00 |
|
smoogipoo
|
f3dc38e342
|
Add Ctrl+A to select all (esc to deselect all)
|
2019-11-11 13:41:10 +09:00 |
|
smoogipoo
|
97ea07db0e
|
Add delete option to the right-click menu
|
2019-11-08 19:44:47 +09: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 |
|
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 |
|
smoogipoo
|
df08a95734
|
Separate addition/removal into separate methods
|
2019-11-08 16:46:58 +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 |
|
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
|
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 |
|
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
|
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 |
|
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 |
|
Dean Herbert
|
23eab68c72
|
Merge remote-tracking branch 'upstream/master' into editor-timing-screen-2
|
2019-11-06 16:22:55 +09:00 |
|
smoogipoo
|
020b08b450
|
Initial implementation of limited distance snap
|
2019-11-06 15:27:48 +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 |
|
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
|
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 |
|
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 |
|
Dan Balasescu
|
23ad516348
|
Merge branch 'master' into game-handles-links
|
2019-11-05 12:33:32 +09:00 |
|
Dean Herbert
|
eb1ec78b33
|
Disable retry hotkey overlay when viewing results from leaderbo… (#6702)
Disable retry hotkey overlay when viewing results from leaderboard
|
2019-11-04 12:34:18 +09:00 |
|
Bartłomiej Dach
|
539f8ad6dd
|
Remove overlay when viewing leaderboard scores
Do not add the hold-to-retry hotkey overlay if the user has navigated
to the results screen from the leaderboard and not from gameplay.
|
2019-11-04 01:57:31 +01:00 |
|
Dean Herbert
|
c71a082ffe
|
Merge branch 'master' into user-score-highlight
|
2019-11-04 08:18:18 +09:00 |
|
Dean Herbert
|
5127b52c25
|
Merge remote-tracking branch 'upstream/master' into game-handles-links
|
2019-11-03 13:04:18 +09:00 |
|
Dean Herbert
|
6dde755ef2
|
Merge branch 'master' into add-retry-button
|
2019-11-02 21:23:16 +09:00 |
|
Dean Herbert
|
fd13f0bc55
|
Move ReplayDownloadButton to correct namespace (#6689)
Move ReplayDownloadButton to correct namespace
|
2019-11-02 21:22:23 +09:00 |
|
Dean Herbert
|
551032803d
|
Fix GameplayClockContainer operating on beatmap's track after s… (#6688)
Fix GameplayClockContainer operating on beatmap's track after screen exited
|
2019-11-02 21:22:13 +09:00 |
|
Dan Balasescu
|
8a5d3ab40a
|
Merge branch 'master' into add-retry-button
|
2019-11-02 10:51:14 +09:00 |
|
Dan Balasescu
|
5be7d439ae
|
Add null check for nullable dependency
|
2019-11-02 10:32:23 +09:00 |
|
Ganendra Afrasya
|
8da15f6897
|
Fix all score are highlighted on local scope
|
2019-11-01 23:19:15 +07:00 |
|
Ganendra Afrasya
|
ce3b34a768
|
Fix UserTopScoreContainer is also tinted
|
2019-11-01 23:00:55 +07:00 |
|
Dan Balasescu
|
036e67bbc2
|
Merge pull request #6676 from peppy/fix-multi-logout-crash
Fix multi logout crash
|
2019-11-01 17:13:16 +09:00 |
|
Dean Herbert
|
156d0ae9b9
|
Remove braces
Co-Authored-By: Salman Ahmed <email@iisalman.me>
|
2019-11-01 16:08:44 +09:00 |
|
Dean Herbert
|
daa0ebe2b5
|
Add xmldoc
|
2019-11-01 15:51:45 +09:00 |
|
Dean Herbert
|
14453da1d2
|
Centralise MakeCurrent call
|
2019-11-01 15:51:10 +09:00 |
|
Dean Herbert
|
c532f77657
|
Add hold-to-retry support to results
|
2019-11-01 15:49:42 +09:00 |
|
Dean Herbert
|
84d17f3702
|
Add retry button
|
2019-11-01 15:41:51 +09:00 |
|
Dean Herbert
|
14fec6f1f3
|
Move ReplayDownloadButton to correct namespace
|
2019-11-01 15:06:36 +09:00 |
|
Dean Herbert
|
dcc8f6e827
|
Better group cancel conditional
|
2019-11-01 14:43:52 +09:00 |
|
Dean Herbert
|
d089e47a56
|
Merge branch 'master' into master
|
2019-11-01 14:15:57 +09:00 |
|
Dean Herbert
|
ac02bb005d
|
Fix GameplayClockContainer operating on beatmap's track after scren exited
|
2019-11-01 14:11:18 +09:00 |
|
Dean Herbert
|
898520935e
|
Move link handling code to OsuGame
This allows for future calls from arguments / associations
|
2019-11-01 11:40:51 +09:00 |
|
Dean Herbert
|
5b405abc52
|
Schedule forcefullyExit call for safety
Screen state may have changed at an inopportune moment. Run on local scheduler, not API scheduler to avoid any weirdness.
|
2019-10-31 13:43:25 +09:00 |
|
Dean Herbert
|
32dabf80a6
|
Ensure forceful exit completely exits from mutliplayer
Previously it may have gotten blocked by being in a sub screen.
|
2019-10-31 13:42:28 +09:00 |
|
Dean Herbert
|
5b5703544b
|
Fix crash when quickly exiting multiplayer after joining a room (#6666)
Fix crash when quickly exiting multiplayer after joining a room
|
2019-10-31 13:15:46 +09:00 |
|
Dean Herbert
|
7b67701e57
|
Merge branch 'master' into editor-timing-screen
|
2019-10-30 19:27:24 +09:00 |
|
Dean Herbert
|
7f2916454d
|
Simplify EditorClock.Seek method
|
2019-10-30 19:09:46 +09:00 |
|