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
Dean Herbert
93076ad6a1
Merge branch 'master' into editor-timing-screen
2019-10-30 18:42:20 +09:00
smoogipoo
45af796943
Remove usages of EF internals
2019-10-30 17:05:15 +09:00
Dan Balasescu
514c9f1eef
Merge branch 'master' into bindable-control-points
2019-10-30 16:20:54 +09:00
smoogipoo
f56d9fe50c
Forcefully part room when multiplayer exits
2019-10-30 14:42:14 +09:00
smoogipoo
b6457f0ce9
Cancel room joins on part
2019-10-30 14:41:54 +09:00
smoogipoo
95ff48c123
Don't log cancelled join requests
2019-10-30 14:38:06 +09:00
Dean Herbert
3f192ca915
Fix song progress not displaying correctly ( #6640 )
...
Fix song progress not displaying correctly
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-10-29 18:16:54 +09:00
Dean Herbert
e3a1613d2a
Fix PlayerSettingsOverlay being shown by default ( #6641 )
...
Fix PlayerSettingsOverlay being shown by default
2019-10-29 18:16:33 +09:00
Dan Balasescu
f4ae65c3e8
Merge branch 'master' into fix-song-progress-display
2019-10-29 18:06:58 +09:00
Dan Balasescu
c25a243d5b
Merge branch 'master' into fix-triangles-performance
2019-10-29 13:31:33 +09:00
Dean Herbert
a4a57eec54
Fix game-wide performance drop when triangles intro is used
2019-10-29 01:09:49 +09:00
Bartłomiej Dach
c181edaedf
Replace manual comparer implementation
...
Replace manually-implemented CriteriaComparer with a call to
Comparer<T>.Create() to decrease verbosity.
2019-10-28 15:07:36 +01:00
Dean Herbert
46b44f4f99
Fix PlayerSettingsOverlay being shown by default
2019-10-28 18:37:58 +09:00
Dean Herbert
16e33e8bc7
Fix song progress not displaying correctly
2019-10-28 18:34:58 +09:00
Dean Herbert
522572eace
Add ability to adjust all control point attributes
2019-10-28 16:21:31 +09:00
Dean Herbert
9c3e54909c
Ensure tooltips of RowAttributes are up-to-date
2019-10-28 16:20:54 +09:00
Dean Herbert
ee5591d7d5
Add missing license headers
2019-10-28 12:42:17 +09:00
Dean Herbert
43ad4a3a3c
Tidy up string output
2019-10-28 12:31:38 +09:00
Dean Herbert
1953aa64b6
Merge branch 'bindable-control-points' into editor-timing-screen
2019-10-28 12:00:51 +09:00
Dean Herbert
8069674824
Merge remote-tracking branch 'upstream/master' into bindable-control-points
2019-10-28 11:52:04 +09:00
Dean Herbert
29e20bc8d2
Add xmldoc and combine GroupAt / CreateGroup
2019-10-28 10:45:11 +09:00
Bartłomiej Dach
c8d3dd0e5a
Make carousel item sorting stable
...
Migrate beatmap carousel item sorting from List<T>.Sort()
to IEnumerable<T>.OrderBy(), as the second variant is documented to be
a stable sorting algorithm. This allows for eliminating unnecessary
movement of carousel items occurring whenever any set of items is tied
when changing sorting criteria.
2019-10-27 23:14:14 +01:00
Dean Herbert
81b5d7b79f
Select another group after deleting selected
2019-10-27 16:30:05 +09:00
Dean Herbert
73369ae613
Add the ability to add/remove groups
2019-10-27 16:13:24 +09:00
Dean Herbert
0fba272e78
Add the ability to add new ControlPoint types to existing groups
2019-10-27 15:19:36 +09:00
Dean Herbert
de69665a46
Reduce horizontal spacing of attributes
2019-10-27 14:17:59 +09:00
Dean Herbert
93b003eb5a
Add selected row state
2019-10-27 13:31:23 +09:00
nwabear
349a2745c5
Merge remote-tracking branch 'origin/master'
2019-10-26 14:30:17 -05:00
Dean Herbert
194e501f86
Merge branch 'master' into snapping-refactor
2019-10-26 14:20:08 +09:00
nwabear
b0e21c2749
Fixed Issue #6442
2019-10-25 14:57:49 -05:00
Dean Herbert
b8efc59cdc
Update UI components to use new grouping
2019-10-25 20:13:22 +09:00
Dean Herbert
32242f22de
Merge branch 'no-auto-gen' into editor-timing-screen
2019-10-25 20:02:40 +09:00
Dean Herbert
e987db37ec
Add grouping of ControlPoints
2019-10-25 19:52:02 +09:00
Dean Herbert
da6769f0fc
Remove necessity of AutoGenerated flag
2019-10-25 19:43:38 +09:00
Dean Herbert
94ffe03e6e
Group timing points
2019-10-25 19:36:12 +09:00
Dan Balasescu
3692846367
Merge branch 'master' into snapping-refactor
2019-10-25 18:26:14 +09:00
smoogipoo
ae011e8ee8
Fix distance snap grid test scenes
2019-10-25 17:25:46 +09:00
smoogipoo
4ca6a5a0cc
Interface the distance snap provider
2019-10-25 16:50:21 +09:00
smoogipoo
607b4d874a
Refactor flow of snapping through HitObjectComposer
2019-10-25 16:40:30 +09:00
Dean Herbert
351f8d3dd1
Merge branch 'master' into editor-timing-screen
2019-10-25 13:21:56 +09:00
Dean Herbert
e5b5d286fd
Increase spacing to closer match the design
2019-10-25 12:48:34 +09:00
Dean Herbert
07f7944fc6
Fix DateTime display sizing on results screen
2019-10-25 12:22:19 +09:00
Dean Herbert
0b3c7f28af
Merge branch 'master' into fix-dragbox-first-frame
2019-10-24 23:01:32 +09:00
Dean Herbert
fa3350ce2d
Refactor blueprint movement and selection events ( #6588 )
...
Refactor blueprint movement and selection events
2019-10-24 22:58:03 +09:00
smoogipoo
a969914d6e
Mention coordinate space
2019-10-24 18:24:22 +09:00
smoogipoo
d83b9ef0e4
Rename grid snapping methods
2019-10-24 18:18:04 +09:00
smoogipoo
f45f17339c
Implement slider path distance snapping
2019-10-24 18:17:30 +09:00
smoogipoo
7a71352684
Fix drag box being positioned incorrectly for 1 frame
2019-10-24 17:22:14 +09:00
smoogipoo
fb88001c0e
Reorder blueprint addition/removal + add regions
2019-10-24 16:53:34 +09:00
smoogipoo
45bd91f63f
Add special cases for click-selection
2019-10-24 16:14:29 +09:00
smoogipoo
8e4a21bee7
Separate out mouse down/click/up handling
2019-10-24 15:58:22 +09:00
smoogipoo
a07e5a269b
Extract drag events into multiple methods
2019-10-24 15:33:08 +09:00
smoogipoo
f128e99fb2
Remove unused methods
2019-10-24 15:07:04 +09:00
smoogipoo
e04c77178c
Move selection events to BlueprintContainer
2019-10-24 14:58:02 +09:00
smoogipoo
714c89faa4
Move selection drag events to BlueprintContainer
2019-10-24 14:57:58 +09:00
smoogipoo
cef2318cf5
Move drag box drag handling to BlueprintContainer
2019-10-23 18:38:06 +09:00
Dean Herbert
f61d7e4fbe
Add smoothing and tidy code a touch
2019-10-23 17:56:09 +09:00
smoogipoo
c9fec50f63
Remove unnecessary whitespace
2019-10-23 17:00:17 +09:00
smoogipoo
97383b4a37
Show centre point of distance snap grid
2019-10-23 16:58:56 +09:00
smoogipoo
851773a842
Apply adjustments for framework changes
2019-10-23 14:04:06 +09:00
Dean Herbert
c06f142433
Fix some spacing and references
2019-10-23 11:22:55 +09:00
Dean Herbert
6866d27634
Merge remote-tracking branch 'upstream/master' into editor-timing-screen
2019-10-23 11:18:42 +09:00
Dean Herbert
5e22eed131
Add add/remove buttons
2019-10-22 21:50:21 +09:00
Dean Herbert
4883844c4c
Add basic information display for all types of control points
2019-10-22 20:57:56 +09:00
Dean Herbert
81e8b678d3
Update editor time when a new timing point is selected
2019-10-22 20:17:19 +09:00
Dean Herbert
25601ac17c
Merge branch 'master' into editor-timing-screen
2019-10-22 18:01:53 +09:00
Dean Herbert
001eae2c02
Merge remote-tracking branch 'upstream/master' into make-most-textbox-carets-movable
2019-10-22 15:04:16 +09:00
Joehu
f7924d3bad
Rename "FixedSearchTextBox" to "SeekLimitedSearchTextBox"
2019-10-21 16:00:09 -07:00
Dean Herbert
0bf35faae8
Update incorrect reference
2019-10-21 19:25:56 +09:00
Dean Herbert
e3fa5f1da3
Merge branch 'master' into beatsnap-grid-integration
2019-10-21 18:44:34 +09:00
Dean Herbert
b157aaead1
Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration
2019-10-21 17:09:43 +09:00
smoogipoo
38c2c328ff
Rename HitObject -> DrawableObject in selection blueprints
2019-10-21 17:04:56 +09:00
smoogipoo
fc7e4680a7
Split on multiple lines
2019-10-21 14:08:28 +09:00
Dean Herbert
80bf68c108
Add control sections and hook up bindable control groups
2019-10-21 00:06:38 +09:00
Dean Herbert
0fbba9a5e5
Split out more classes
2019-10-20 23:42:13 +09:00
Dean Herbert
07286c0cfc
Fix editor's clock not being processed unless composer is loaded
2019-10-18 18:21:53 +09:00
Dean Herbert
ffec960b77
Split out classes
2019-10-18 17:59:54 +09:00
Dean Herbert
71d45d41d1
Add basic visualisation of different control point types
2019-10-18 17:57:37 +09:00
Dean Herbert
f22ec6f5bd
Merge branch 'master' into editor-timing-screen
2019-10-18 16:57:46 +09:00
smoogipoo
463079e148
Implement placement snapping
2019-10-18 13:48:59 +09:00
smoogipoo
ba4402207a
Implement selection time snapping
2019-10-18 12:53:38 +09:00
smoogipoo
1dc7c59853
Implement selection position snapping
2019-10-18 12:53:27 +09:00
smoogipoo
bc76a9cb8c
Expose selection changed event from BlueprintContainer
2019-10-18 12:40:27 +09:00
smoogipoo
c5ee533524
Merge branch 'dho-apply' into beatsnap-grid-integration
2019-10-18 12:38:29 +09:00
Joehu
e5b50b5e1f
Fix slider bar regression when using arrows
2019-10-17 13:54:36 -07:00
smoogipoo
510ce9345f
Fix potential blueprint nullrefs with the new structure
2019-10-17 16:14:28 +09:00
Dean Herbert
f92331531c
Rename grid to DistanceSnap to be more in line with its purpose
2019-10-17 15:32:02 +09:00
Dan Balasescu
05c6d1a66d
Merge branch 'master' into osu-beatsnapping-grid
2019-10-16 20:12:31 +09:00
smoogipoo
b6b8098b98
Add an arbitrary offset to prevent div-by-0
2019-10-16 19:44:53 +09:00
smoogipoo
2d4b7dc361
Remove redundant code
2019-10-16 19:33:18 +09:00
smoogipoo
5ac5e34f85
Use a cleaner distance function
2019-10-16 19:32:45 +09:00
Joehu
649951198e
Make most textbox carets movable
2019-10-15 14:47:48 -07:00
Joehu
ccc753a315
Make OverlayContainers with no blocking input VisibilityContainers
2019-10-14 16:27:59 -07:00
Dean Herbert
f3c38ae089
Merge branch 'master' into osu-beatsnapping-grid
2019-10-13 18:38:57 +09:00
Dean Herbert
00f0957cc3
Merge branch 'master' into editor-grids-2
2019-10-12 23:28:51 +09:00
Dan Balasescu
bb7de50697
Merge pull request #6451 from peppy/fix-resume-from-player-audio
...
Fix audio playback position being reset after resuming to song select
2019-10-11 19:44:00 +09:00
Dean Herbert
00d4d976b7
Move editor selections relative to hitobject start positions ( #6431 )
...
Move editor selections relative to hitobject start positions
2019-10-11 19:35:11 +09:00
Dan Balasescu
26a33bfa4e
Merge branch 'master' into fix-resume-from-player-audio
2019-10-11 19:21:14 +09:00
Dean Herbert
de13320a2d
Add initial table display
2019-10-11 18:46:05 +09:00
smoogipoo
45835f97a1
Split out grids into separate files
2019-10-11 18:41:17 +09:00
smoogipoo
050d86a741
Always use the local coordinate space
2019-10-11 18:24:33 +09:00
smoogipoo
9ecec806c2
Rename grid creation method + parameter
2019-10-11 18:24:33 +09:00
smoogipoo
5f0cd356d7
Rename startPosition to centrePosition
2019-10-11 18:24:33 +09:00
smoogipoo
8fb2628f9e
Improve xmldocs
2019-10-11 18:24:33 +09:00
smoogipoo
66e0fef85b
Expose StartPosition for derived grids to use
2019-10-11 18:24:33 +09:00
smoogipoo
97d4a8e59e
Remove unnecessary dependency
2019-10-11 18:24:33 +09:00
smoogipoo
2df519ddfa
Simplify colour retrieval function
2019-10-11 18:24:33 +09:00
smoogipoo
2aa3d0bb39
Implement base class for beat snapping grids
2019-10-11 18:24:33 +09:00
Dan Balasescu
d4282473c6
Merge branch 'master' into fix-background-disposal
2019-10-11 17:15:30 +09:00
Dean Herbert
937dbb7bf6
Initial layout for timing screen
2019-10-11 16:22:24 +09:00
Dean Herbert
8255a94cd4
Merge branch 'master' into fix-resume-from-player-audio
2019-10-10 22:08:20 +09:00
Dan Balasescu
356c0fdca0
Merge branch 'master' into cleanup-intros
2019-10-10 21:58:54 +09:00
Dean Herbert
5eba33e876
Simplify logic and add test coverage for remaining case
2019-10-10 20:12:47 +09:00
Dean Herbert
e66f9adb86
Fix user pause not being cancelled when playing audio
2019-10-10 16:53:03 +09:00
smoogipoo
2e2768870f
Merge remote-tracking branch 'origin/master' into editor-selection-movement-params
2019-10-10 16:38:41 +09:00
Dan Balasescu
5497d210b6
Merge branch 'master' into fix-editor-slider-display
2019-10-10 16:22:30 +09:00
Dean Herbert
f74c79c2b8
Fix audio playback position being reset after resuming to song select
2019-10-10 11:58:43 +09:00
Dean Herbert
51bf600ea7
Use empty hitwindows instead of null
2019-10-09 19:08:31 +09:00
Dean Herbert
0681bb9a2b
Fix potential nullref
2019-10-09 16:49:10 +09:00
Dean Herbert
2d8e5615e4
Extract timeline and layout logic from ComposeScreen
2019-10-09 16:05:55 +09:00
Dean Herbert
3dd2b18ff0
Make EditorScreen abstract
2019-10-09 16:04:58 +09:00
Dan Balasescu
69b9e359bf
Merge branch 'master' into fix-ss-track-playback
2019-10-09 12:26:07 +09:00
smoogipoo
179656788d
Remove unnecessary method
2019-10-08 19:27:59 +09:00
smoogipoo
c1db11fa06
More removal of "drag"
2019-10-08 19:24:58 +09:00
smoogipoo
8b661e624d
Remove drag from class/method namings + refactor
2019-10-08 19:08:31 +09:00
smoogipoo
08d043f447
Move selection relative to the hitobject start positions
2019-10-08 18:57:03 +09:00
Dean Herbert
4e026b163c
Don't resume playback when user has paused and track hasn't changed
2019-10-08 15:04:38 +09:00
Dean Herbert
3e904b4838
Fix naming of file
2019-10-08 14:37:56 +09:00
Dean Herbert
63bf8ff832
Better signify under construction screens in editor
2019-10-08 14:32:48 +09:00
Dan Balasescu
73e3dac64b
Merge branch 'master' into fix-editor-skinning
2019-10-08 13:28:10 +09:00
Dean Herbert
24269c0384
Fix skins not being displayed correctly in the editor
2019-10-08 12:52:34 +09:00
Dean Herbert
5472029ffe
Fix editor defaulting to 0.5x playback speed
2019-10-08 12:27:51 +09:00
Dean Herbert
52770f803d
Fix incorrect beatmap usage
2019-10-08 12:15:32 +09:00
Dean Herbert
cbb120cd38
Switch beatmap to private
2019-10-08 12:09:42 +09:00
Dean Herbert
c280bee894
Protect configuration bindables
2019-10-08 12:08:47 +09:00
Dean Herbert
b8b2ff2674
Move welcome to local usages
2019-10-08 12:07:59 +09:00
Dean Herbert
4ba2dccde3
Reorder file contents
2019-10-08 12:05:52 +09:00
Dean Herbert
a0bb193342
Remove unnecessary beatmap storage
2019-10-08 12:04:13 +09:00
Dean Herbert
449e53ee6d
Centralise track handling
2019-10-08 12:03:42 +09:00
Dean Herbert
c3d56088d8
Make constant private
2019-10-08 11:54:39 +09:00
Dean Herbert
3c0b1be7f4
Add xmldoc where applicable
2019-10-08 11:52:16 +09:00
Dean Herbert
393683f8f1
Merge branch 'master' into cleanup-intros
2019-10-08 11:29:13 +09:00
Dean Herbert
e7fc5e556c
Fix song select not correctly playing tracks in some cases
2019-10-08 11:06:07 +09:00
Dean Herbert
bb161222ef
Merge branch 'master' into fix-tab-controls-overflowing
2019-10-08 10:12:03 +09:00
Joehu
9fdbe58326
Fix dropdown header padding when selected mod filter is hidden
2019-10-07 16:17:58 -07:00
Joehu
8e6e90eaec
Use fixed numbers for padding instead
2019-10-07 16:11:40 -07:00
Dean Herbert
f15953d65c
Fix carousel including filtered difficulties in sort comparisons
2019-10-07 15:17:03 +09:00
Joehu
11d937beab
Fix beatmap detail area tab dropdown being blocked by content
2019-10-06 10:24:33 -07:00
Joehu
38c1cee5fd
Fix tab controls overflowing
2019-10-06 10:22:55 -07:00
Dean Herbert
2e20380d07
Merge branch 'master' into placement-blueprint-movement
2019-10-06 13:52:22 +08:00
Joehu
e257f4ca04
Resume music to same position when exiting gameplay
2019-10-05 10:31:44 -07:00
Joehu
a71db11ea5
Remove depth parameter description
2019-10-04 18:38:44 -07:00
Joehu
5d460eaf6b
Remove depth specification and button order regression
2019-10-04 17:14:19 -07:00
Joehu
e7ba6ef5c4
Fix keybinding order of beatmap options
2019-10-04 14:32:43 -07:00
Dean Herbert
6fce646369
Merge branch 'master' into placement-blueprint-movement
2019-10-04 19:05:56 +08:00
Dean Herbert
9eab56e2fc
Merge branch 'master' into editor-beatmap-changed-event
2019-10-04 17:58:58 +08:00
Dean Herbert
49fdb4b731
Fix Alt-F4 being blocked during gameplay ( #6369 )
...
Fix Alt-F4 being blocked during gameplay
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-10-04 13:33:00 +08:00
Dean Herbert
47c1f36f9d
Add ValidForResume check
2019-10-04 11:41:53 +08:00
Dean Herbert
71985c7ef1
Update fail logic to match
2019-10-04 11:23:42 +08:00
Dean Herbert
d2c9a29c0d
Remove unnecessary local assign
2019-10-04 10:45:18 +08:00
smoogipoo
a5e1cb8feb
Merge remote-tracking branch 'Game4all/master' into truncate-metadata-on-wedge
2019-10-04 11:21:33 +09:00
Joseph Madamba
d87f6d270b
Merge branch 'master' into fix-alt-f4-being-blocked-by-overlays
2019-10-03 08:43:31 -07:00
smoogipoo
636913a4a6
Refactor PlayerLoader changes
2019-10-03 19:22:41 +09:00
smoogipoo
652acac87f
Move placement movement event to BlueprintContainer
2019-10-03 16:14:42 +09:00
smoogipoo
3fb0b0b668
Rename to StartTimeChanged and add xmldocs
2019-10-03 14:37:16 +09:00
smoogipoo
897b3233af
Add start time tracking to EditorBeatmap
2019-10-03 14:23:48 +09:00
Joehu
8017788521
Revert "Fix alt-f4 being blocked in interface"
...
This reverts commit 752dd26a4f
2019-10-02 16:08:24 -07:00
Joehu
148089f160
Revert "Remove unnecessary exitConfirmed condition check"
...
This reverts commit 38fe519c91
2019-10-02 16:08:19 -07:00
Joehu
38fe519c91
Remove unnecessary exitConfirmed condition check
2019-10-02 12:28:48 -07:00
Joehu
752dd26a4f
Fix alt-f4 being blocked in interface
2019-10-02 11:17:43 -07:00
Joehu
a69b9f1148
Fix alt-f4 being blocked during gameplay
2019-10-02 11:16:31 -07:00
Craftplacer
4d4e846296
Merge branch 'master' into muted-notification
2019-10-02 17:31:34 +02:00
Craftplacer
6929847b08
Remove redundant override
2019-10-02 17:22:34 +02:00
Dan Balasescu
2519fd26a9
Merge pull request #6351 from Joehuu/simplify-exit-logic-of-screens
...
Simplify exit logic of screens with textboxes using back button receptor
2019-10-02 18:38:06 +09:00
HDragonHR
faf8fe132e
Change bindable int to float
2019-10-02 12:26:46 +08:00
Craftplacer
5f399add82
Resolve @iiSaLMaN 's suggested changes
2019-10-01 18:15:40 +02:00
Craftplacer
2ac5e0bfa0
Make use of SessionStatics
2019-10-01 17:39:01 +02:00
Joehu
5f700f2ae9
Simplify exit logic of screens with textboxes using back button receptor
2019-10-01 08:26:34 -07:00
Craftplacer
4e394e0ed5
Merge branch 'master' into muted-notification
2019-10-01 17:26:11 +02:00
Dean Herbert
ce62f3c75b
Simplify and future-proof random retrieval method
...
Will support future added intros without further code changes. Also uses RNG instead of `new Random`.
2019-09-29 14:35:35 +08:00
V1ntagezTV
9f1c378733
moved into the switch case
2019-09-29 00:35:47 +05:00
V1ntagezTV
2681e2064a
remove comment
2019-09-29 00:34:09 +05:00
V1ntagezTV
1babd139bc
remove needless blank
2019-09-29 00:22:23 +05:00
V1ntagezTV
52b044b7f6
Add random intro!
2019-09-29 00:10:17 +05:00
Dean Herbert
02c1f490f1
Merge branch 'master' into muted-notification
2019-09-28 20:33:32 +08:00
Dean Herbert
a45f8c968b
Rename and add simple xmldoc
2019-09-28 20:21:51 +08:00
Dean Herbert
d01c30fd52
Merge branch 'master' into introduce-session-statics
2019-09-28 20:16:52 +08:00
iiSaLMaN
fb9f21237e
Reset track adjustments on resuming from another screen
2019-09-28 04:18:16 +03:00
Dean Herbert
f4f5a7e9c8
Fix test regressions
2019-09-27 13:20:17 +08:00
Dean Herbert
b50ef8ffa4
Allow null NotificationManager
2019-09-27 13:15:33 +08:00
iiSaLMaN
2670a23e6f
Assign to field and move to load complete
2019-09-27 08:15:24 +03:00
iiSaLMaN
7904f77cd5
Bind event to activation delay change
2019-09-27 02:59:42 +03:00
iiSaLMaN
911094e790
Replace menu button text with "press for menu" on 0ms activation delay
2019-09-26 01:42:56 +03:00
Salman Ahmed
3aa9a172d8
Merge branch 'master' into introduce-session-statics
2019-09-25 16:14:39 +03:00
iiSaLMaN
8844d567cb
Use bindable setting instead
2019-09-25 15:56:47 +03:00
Dean Herbert
f11156c2dc
Fix tests not working correctly
2019-09-25 19:30:25 +09:00
Dean Herbert
ff9033f9ac
Merge remote-tracking branch 'upstream/master' into muted-notification
2019-09-25 16:47:56 +09:00
Joehu
102dbd85bd
Fix CI errors
2019-09-24 16:48:22 -07:00
Joehu
9861b21440
Remove unnecessary padding/margin
2019-09-24 16:28:40 -07:00
Joehu
7fab1a4337
Truncate long metadata on beatmap info wedge
2019-09-24 16:06:33 -07:00
iiSaLMaN
cde7f49db1
Use direct get and set instead
2019-09-25 01:26:02 +03:00
Dean Herbert
4a59e3351e
Update beatmap carousel tests code style
...
Also fixes one issue I spotted in BeatmapCarousel related to incorrectly holding a selection after new sets are loaded.
2019-09-25 02:42:12 +09:00
LeNitrous
0bc59e17dc
remove Seasonal and apply suggestions
2019-09-24 21:56:32 +08:00
LeNitrous
afa043aa7d
always use default samples
2019-09-24 18:17:27 +08:00
Dean Herbert
f493f1c71d
Move new components to v2 namespace
2019-09-24 19:00:26 +09:00
LeNitrous
b8d147a3b4
introduce main menu background modes
2019-09-24 17:42:06 +08:00
smoogipoo
6b702eb6de
Update with generic labelledcomponent
2019-09-24 18:25:17 +09:00
smoogipoo
5212c50654
Merge branch 'generic-labelledcomponent' into labelled-textbox-improvements
2019-09-24 18:23:01 +09:00
smoogipoo
df692b091c
Make LabelledComponent generic
2019-09-24 18:22:02 +09:00
Dan Balasescu
b67b594036
Merge branch 'master' into menu-key-support
2019-09-24 15:09:38 +09:00
smoogipoo
4555ecc5e0
Check for exact key
2019-09-24 15:09:08 +09:00
iiSaLMaN
267e12ce3c
Add sample usage to the session statics
2019-09-24 05:45:47 +03:00
LeNitrous
ec78889e94
remove unused dependencies
2019-09-24 08:14:20 +08:00
LeNitrous
5024770544
move common logic to IntroScreen
2019-09-23 20:52:44 +08:00
Dean Herbert
9a6d748498
Merge branch 'master' into add-creator-artist-filters
2019-09-23 12:31:51 +09:00
Craftplacer
9a687ae8e2
Merge branch 'master' into muted-notification
2019-09-23 01:59:37 +02:00
Bartłomiej Dach
96c0c80dc5
Factor out methods in FilterQueryParser
...
Factor FilterQueryParser.ApplyQueries into shorter methods to reduce
method complexity.
2019-09-22 21:20:50 +02:00
Dean Herbert
e5b14ce74d
Add null check for safety
...
Co-Authored-By: Salman Ahmed <slmanarendo1950@gmail.com>
2019-09-22 21:42:32 +09:00
Dean Herbert
fc1d49631a
Allow top-level menu key pressed to progress the osu! logo
2019-09-22 20:31:53 +09:00
Bartłomiej Dach
70842f71f4
Fix floating point handling in filter intervals
...
Due to floating-point rounding and representation errors, filters could
wrongly display results incongruous with the wedge display text (ie.
a beatmap with the BPM of 139.99999 would be displayed as having 140
BPM and also pass the bpm<140 filter).
Apply tolerance when parsing floating-point constraints. The tolerance
chosen is half of what the UI displays for the particular values (so
for example half of 0.1 for AR/DR/CS, 0.01 for stars, etc.)
Tests updated accordingly.
2019-09-22 00:20:55 +02:00
Bartłomiej Dach
b262ba13cd
Add creator= and artist= filters
...
To match stable, add creator= and artist= filters to the beatmap
carousel on song select screen. Contrary to stable, this implementation
supports phrase queries with spaces within using double quotes.
The quote handling is not entirely correct (can't nest), but quotes
should rarely happen within names, and it is an edge case of an edge
case - leaving best-effort as is. Test coverage also included.
2019-09-22 00:20:55 +02:00
Bartłomiej Dach
f5f5094611
Take culture into account when parsing filters
...
Culture was not taken into account when parsing filters, which meant
that in cultures that use the comma (,) as a decimal delimiter, it would
conflict with the comma used to delimit search criteria. To remove
any ambiguity, introduce local helper functions that allow the decimal
point to be utilised, using the invariant culture. This also matches
stable behaviour.
The decision to not reuse osu.Game.Beatmaps.Formats.Parsing was
deliberate due to differing semantics (it's not really sane to throw
exceptions on receiving user-facing input).
2019-09-22 00:18:53 +02:00
Bartłomiej Dach
dddd94684b
Split out lower and upper interval inclusivity
...
A single IsInclusive field causes unexpected issues when trying to
formulate a half-open interval query. Split out IsInclusive into two
fields, Is{Lower,Upper}Inclusive and update usages accordingly.
2019-09-22 00:18:28 +02:00
Bartłomiej Dach
33c51d5178
Extract parsing filter queries to class
...
For the sake of testability without having to spin up visual tests,
extract methods related to parsing filter queries from FilterControl
to a static FilterQueryParser class.
2019-09-22 00:18:28 +02:00
smoogipoo
2bbf4ca4b5
Update LabelledTextBox to use LabelledComponent
2019-09-20 18:50:50 +09:00
smoogipoo
523272edab
Add xmldocs
2019-09-20 18:39:04 +09:00
smoogipoo
e0a97cfac5
Add a LabelledComponent base class
2019-09-20 18:35:15 +09:00
Revel
f7f9c0f7e0
Update BeatmapDetailAreaTabControl.cs
2019-09-19 15:47:32 -04:00
Dean Herbert
636582e089
Always show exit confirmation when closing via alt-f4 or window control
2019-09-20 02:22:49 +09:00
Dean Herbert
67796e0982
Apply code styling suggestions
2019-09-19 22:46:21 +09:00
Dean Herbert
4e9bb7b121
Merge remote-tracking branch 'upstream/master' into hold-to-press-setting
2019-09-19 22:35:18 +09:00
Dean Herbert
0a67d1db1b
Merge pull request #5355 from EVAST9919/songselect-best-user-score
...
Show personal best on song select
2019-09-19 21:17:23 +09:00
smoogipoo
94d3bcc612
Fix top score not being selectable
2019-09-19 20:47:33 +09:00
Dean Herbert
50d4206c45
Fix exit scenarios
2019-09-19 20:17:58 +09:00
Dean Herbert
ead3ee3b41
Merge branch 'master' into hold-to-press-setting
2019-09-19 20:05:14 +09:00
Dean Herbert
28342baa8f
Add auto-restart functionality to sudden death and perfect mods ( #6159 )
...
Add auto-restart functionality to sudden death and perfect mods
Co-authored-by: Paul Teng <plankp@outlook.com>
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-19 18:49:09 +09:00
smoogipoo
db24cfbead
Merge remote-tracking branch 'origin/master' into auto-restart-mod-perfect
...
# Conflicts:
# osu.Game/Screens/Play/Player.cs
2019-09-19 17:57:04 +09:00
Dean Herbert
646d762468
Merge branch 'master' into songselect-advanced-filtering
2019-09-19 17:42:32 +09:00
Dean Herbert
fa54a0bfd3
Fix test failures
2019-09-19 17:40:46 +09:00
smoogipoo
5120d82ef8
Fix crash with multiple range criterias
2019-09-19 17:36:44 +09:00
smoogipoo
96ea507320
Reorder comparison for readability
2019-09-19 17:21:22 +09:00
smoogipoo
e075dd7ea8
Fix equals operator not working
2019-09-19 17:16:34 +09:00
smoogipoo
7683f7ff23
Make OnlineStatus use OptionalRange
2019-09-19 17:12:07 +09:00
smoogipoo
d7831d8f5d
Use non-generic IComparable interface
2019-09-19 17:11:43 +09:00
smoogipoo
167bb9fcc1
Fix ugly casts
2019-09-19 17:11:28 +09:00
smoogipoo
0915a94470
Make BeatDivisor use OptionalRange
2019-09-19 16:53:27 +09:00
smoogipoo
3c21b68b73
Make OptionalRange generic
2019-09-19 16:51:57 +09:00
Dean Herbert
929f05884b
Always confirm exit when button is clicked
2019-09-19 16:28:06 +09:00
Dean Herbert
a214e7e72f
Add confirmation dialog when exiting game
2019-09-19 16:26:22 +09:00
Dean Herbert
48ee95955b
Remove unnecessary redirection
2019-09-19 15:45:08 +09:00
smoogipoo
c1daa187fe
Reduce default tolerance
2019-09-19 15:44:14 +09:00
Dean Herbert
36d0695e5c
Add spacing
2019-09-19 15:44:05 +09:00
Dean Herbert
033c68a428
Fade in score, not container
2019-09-19 15:44:00 +09:00
Dean Herbert
2b6c9aeb26
Move top score container to more local namespace
2019-09-19 15:38:40 +09:00
Dean Herbert
e0fd8609d1
Fix margins and clean up implementation
2019-09-19 15:34:46 +09:00
smoogipoo
80f46e02d8
Add equals (=) query operator variants
2019-09-19 15:33:54 +09:00
Dean Herbert
098e89cb66
Improve state reset flow
2019-09-19 15:23:33 +09:00
smoogipoo
c76e27549a
Remove spacing
2019-09-19 14:56:52 +09:00
Dean Herbert
4967ffd8e5
Move inside leaderboard
2019-09-19 14:52:31 +09:00
iiSaLMaN
da4d83063e
Simplify LINQ expression
2019-09-19 08:31:11 +03:00
Dean Herbert
a7b6895d4c
Revert changes to BeatmapDetailArea
2019-09-19 14:26:15 +09:00
iiSaLMaN
e793854735
Invert BypassFail usage
2019-09-19 08:00:41 +03:00
iiSaLMaN
9de0bcae1e
Check for blocking fail mods by default
2019-09-19 07:58:54 +03:00
Dean Herbert
2e0a85c2f6
Merge remote-tracking branch 'upstream/master' into songselect-best-user-score
2019-09-19 12:57:30 +09:00
Craftplacer
c3221e1a36
Prepare classes for player loader test scene
2019-09-18 23:27:26 +02:00
iiSaLMaN
775b90e066
Bypass fail on replays
2019-09-18 22:49:48 +03:00
iiSaLMaN
ecd721e8c5
Add bypass fail property to Player
2019-09-18 22:49:28 +03:00
Dean Herbert
92556db9cd
Add query-based filter modes to song select search field
2019-09-19 02:48:28 +09:00
Dean Herbert
2fcc8c2d72
Simplify implementation, play fail animation during restart
2019-09-19 01:45:59 +09:00
Dean Herbert
ff3a7c1d13
Merge remote-tracking branch 'upstream/master' into auto-restart-mod-perfect
2019-09-19 01:36:29 +09:00
Dean Herbert
ec5f420818
Merge branch 'master' into key-counter-fixes
2019-09-17 22:56:34 +09:00
Dean Herbert
77947e8309
Fix rewind tests failing
2019-09-17 22:33:27 +09:00
Dean Herbert
38d85e44be
Merge branch 'master' into key-counter-fixes
2019-09-17 22:33:15 +09:00
Dean Herbert
fd3e2375bb
Fix disclaimer potentially pushing a null screen ( #6137 )
...
Fix disclaimer potentially pushing a null screen
2019-09-17 16:39:04 +09:00
smoogipoo
f0bcb2b933
Debounce user-requested replay seeks
2019-09-17 16:12:18 +09:00
smoogipoo
efedfefe63
Fix disclaimer potentially pushing a null screen
2019-09-17 15:54:11 +09:00
Craftplacer
220fdd0a04
Make muteWarningShownOnce static
...
... so it will actually get an instance per osu session.
2019-09-16 06:56:52 +02:00
Craftplacer
cb033591c4
Merge branch 'master' into muted-notification
2019-09-15 17:59:27 +02:00
Craftplacer
ecce12981e
Use block body for constructor to fix remaining code inspection issue
2019-09-15 17:47:44 +02:00
Craftplacer
e3884658af
Resolve code inspection errors
2019-09-15 17:36:53 +02:00
Dean Herbert
2381b4c003
Move video behind storyboard
2019-09-16 00:20:56 +09:00
Craftplacer
ec788ac09d
Make notification only show up once per session
2019-09-15 17:20:07 +02:00
Craftplacer
811a08d18f
Use Bindable instead of bool
2019-09-15 16:50:01 +02:00
Craftplacer
00e46fdefe
Add check if game is muted by MuteButton
2019-09-15 16:32:23 +02:00
Craftplacer
4a10e6c44e
Use ResolvedAttribute for NotificationOverlay
2019-09-15 16:11:45 +02:00
Craftplacer
78931c8e23
Implement notification when user has track or master volume muted
...
This took around under a hour to implement, it has the same behavior and content from osu!stable.
A notification will show up when the user has either its master or track volume set to the minimum, clicking it will set it to the default values.
2019-09-15 15:59:46 +02:00
Andrei Zavatski
9febeb1f3d
Add black background
2019-09-14 06:32:00 +03:00
Andrei Zavatski
a36c808682
Use Fit FillFode
2019-09-14 06:28:59 +03:00
Andrei Zavatski
9a94405b3a
Fix video playback is stretched on client resize
2019-09-14 06:05:09 +03:00
Dan Balasescu
b10ce0b12d
Merge branch 'master' into key-counter-fixes
2019-09-13 19:43:33 +09:00
Andrei Zavatski
437e121056
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video
2019-09-13 13:39:58 +03:00
smoogipoo
cf2f841b4d
Fix player not correctly exiting after an unpause
2019-09-13 15:42:58 +09:00
Dean Herbert
831d04f339
Don't use gameplay clock in KeyCounter
2019-09-12 15:48:07 +09:00
Dean Herbert
0cdf125c1e
Handle key counter rewinding in a better way
...
Use ElapsedFrameTime rather than storing state data
2019-09-12 15:42:14 +09:00
Dean Herbert
cb0cf6e2c5
Remove reset functions
2019-09-12 14:27:52 +09:00
Dean Herbert
158737e001
Remove FadeTime customisation
...
Also adjusts fade transitions to feel better, especially in fast forward scenarios.
2019-09-12 14:27:29 +09:00
Dean Herbert
f9c969788a
Fix keys not reaching full brightness as soon as they should
2019-09-12 13:56:23 +09:00
Dan Balasescu
4910c23482
Merge branch 'master' into show-beatmap-not-selected-in-leaderboards
2019-09-10 17:43:42 +09:00
iiSaLMaN
b77550625c
Check if DummyWorkingBeatmap is selected instead
2019-09-09 20:04:04 +03:00
Dean Herbert
98e384129c
Remove redundant initialisation
2019-09-10 01:34:48 +09:00
Dean Herbert
7eb20da820
Add back local bool (required due to action limitations)
2019-09-10 01:18:02 +09:00
Dean Herbert
f398f134e1
Remove unnecessary bool storage
...
Also delay show slightly for better user experience.
2019-09-10 01:12:30 +09:00
Dean Herbert
0ec642d826
Show instead of toggle
2019-09-10 01:06:37 +09:00
LeNitrous
ff49c4ae98
remove redundancies
2019-09-09 13:50:14 +08:00
LeNitrous
c2353cbdfa
move logic to logo action
2019-09-09 13:30:48 +08:00
LeNitrous
04a4f9c9a3
use IsLoggedIn and remove useless clause
2019-09-09 11:26:51 +08:00
LeNitrous
be4f0cc2dd
remove null conditional
2019-09-09 06:14:49 +08:00
LeNitrous
a67a2899a9
move api state check to it's own clause
2019-09-08 16:18:15 +08:00
LeNitrous
3435e2a8d3
open login on enter main menu
2019-09-08 13:36:58 +08:00
Dean Herbert
88d0756107
Allow global actions to propagate through pause screen
2019-09-06 17:17:30 +09:00
Dean Herbert
f925e781a9
Refactor HitWindows for legibility
2019-09-06 15:24:14 +09:00
Dean Herbert
9d0151f19f
Merge pull request #5969 from peppy/skin-configuration-refactor
...
Refactor skin configuration lookups to be more flexible
Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>
2019-09-05 17:28:37 +09:00
Dean Herbert
986ac08397
Fix pause menu keyboard navigation being affected by initial cu… ( #6002 )
...
Fix pause menu keyboard navigation being affected by initial cursor hover
2019-09-05 17:27:48 +09:00
Dan Balasescu
f729282c73
Merge branch 'master' into skin-configuration-refactor
2019-09-05 16:56:05 +09:00
Dean Herbert
a1d7291ffa
Fix pause menu keyboard navigation being affected by initial cursor hover
2019-09-05 16:31:10 +09:00
iiSaLMaN
1b0123a60c
Set beatmap of leaderboard to null if NoBeatmapsAvailable is selected
2019-09-05 05:56:52 +03:00
iiSaLMaN
a1c580f27e
Create "none selected" placeholder state
2019-09-05 05:56:21 +03:00
smoogipoo
a87a1e6031
Don't redraw certain buffered containers on scale change
2019-09-04 19:38:12 +09:00
Dean Herbert
2983918f71
Merge remote-tracking branch 'upstream/master' into skin-configuration-refactor
2019-09-04 13:40:41 +09:00
Dean Herbert
1802d2efaf
Merge remote-tracking branch 'upstream/master' into fix-gameplay-menu-button-hover-ani
2019-09-04 10:35:14 +09:00
Dean Herbert
bebc3309ce
Refactor skin configuration to be infinitely extensible
2019-09-03 17:57:34 +09:00
Dean Herbert
4cad55cee6
Move hit windows lookup to DrawableRuleset
2019-09-03 13:05:03 +09:00
Dean Herbert
1e7528c2b3
Merge remote-tracking branch 'upstream/master' into non-timeoffset-judgements
2019-09-02 19:13:00 +09:00
smoogipoo
0c73c5acf3
Expose full hitobject rather than hit windows
2019-09-02 17:14:40 +09:00
smoogipoo
f2bdf94a1d
Add HitWindows to JudgementResult to indicate timing errors
2019-09-02 16:28:14 +09:00
smoogipoo
0a89603e79
Fix hit error potentially not displaying with null hitwindows
2019-09-02 16:07:16 +09:00
Dan Balasescu
daa2007b41
Merge branch 'master' into fix-switching-ruleset-unpauses-beatmap
2019-09-02 15:24:01 +09:00
Dean Herbert
e479be3fba
Merge pull request #5894 from smoogipoo/accessible-beatdivisor-colours
...
Move beat divisor colour retrieval to BindableBeatDivisor
2019-09-02 12:41:19 +09:00
Dean Herbert
7ca51d3866
Fix resume overlay being drawn below cursor
...
Closes #5905 .
2019-09-02 11:20:55 +09:00
iiSaLMaN
aff4dab9aa
Ensure playing track of beatmap selected only if a track change occurred
2019-09-01 03:17:55 +03:00
pi1024e
5695bb670e
change back to queuing
2019-08-31 10:55:05 -04:00
pi1024e
1b4ae5a4a4
Spelling fixes
2019-08-31 10:55:05 -04:00
Andrei Zavatski
94512fea8e
Apply naming suggestions
2019-08-31 16:20:33 +03:00
Andrei Zavatski
d2f7a653a8
Fix nullref
2019-08-31 16:10:07 +03:00
Andrei Zavatski
28b19e8d54
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video
2019-08-31 15:49:21 +03:00
smoogipoo
cbbc6aad6e
Make method static
2019-08-31 21:32:02 +09:00
Dean Herbert
1ddf292ad6
Fix vertical alignment of hit error display ticks
...
Wasn't correctly centered before.
2019-08-31 12:20:50 +09:00
Andrei Zavatski
d4291556ee
Remove unused using
2019-08-31 02:57:14 +03:00
Andrei Zavatski
fd958ec1ab
Remove unused property accessor
2019-08-31 02:56:41 +03:00
Andrei Zavatski
fa3591e5ec
Add setting to turn on/off the video
2019-08-31 00:42:20 +03:00
Andrei Zavatski
5dd688a51b
Fix video doesn't use gameplay clock
2019-08-31 00:09:23 +03:00
Andrei Zavatski
d55be4d59c
Implement DimmableVideo component
2019-08-30 23:48:38 +03:00
Andrei Zavatski
58a0b4e19b
Add basic layout for player
2019-08-30 23:19:55 +03:00
Andrei Zavatski
6e5cb8a318
implement video parsing
2019-08-30 23:19:34 +03:00
Dean Herbert
8f5dc06d55
Merge remote-tracking branch 'upstream/master' into accuracy-bar
2019-08-30 20:18:25 +09:00
Dean Herbert
f1db6c7039
Fix likely nullref
2019-08-30 20:18:21 +09:00
smoogipoo
fc813347ac
Make JudgementLine private
2019-08-30 19:54:36 +09:00
smoogipoo
dfccc60361
Reorder HitErrorDisplay
2019-08-30 19:53:38 +09:00
smoogipoo
fab12fa9cd
Centre align the icons
...
Seems to look better this way.
2019-08-30 19:53:38 +09:00
Dean Herbert
665fc95d49
Handle no hitobjects / no hitwindows (osu!catch)
2019-08-30 19:37:20 +09:00
Dean Herbert
80671cefd7
Final visual polish
2019-08-30 19:14:07 +09:00
Dean Herbert
c3abf0ccb7
Improve visuals
2019-08-30 18:50:38 +09:00
Dean Herbert
8fc177b743
Fix namespacing and hitwindow source
2019-08-30 18:46:42 +09:00
Dean Herbert
741bd0a5cf
Fix incorrect colour sizes and simplify alignment specification
2019-08-30 18:35:17 +09:00
smoogipoo
40729356fa
Move beat divisor colour retrieval to BindableBeatDivisor
2019-08-30 17:34:58 +09:00
Dean Herbert
54696eef39
Reverse display, add animation and reduce width
2019-08-30 17:06:23 +09:00
Dean Herbert
a73d672c2f
Tidy up judgement line logic (and fix it displaying at the wrong place)
2019-08-30 16:40:39 +09:00
Dean Herbert
6640161bc1
Simplify event propagation
2019-08-30 15:51:36 +09:00
Dean Herbert
bdbfa7bd2f
Fix class naming
2019-08-30 15:32:47 +09:00
Dean Herbert
835ee0aa2f
Code quality fixes
2019-08-30 15:29:13 +09:00
Dean Herbert
1d77e3764d
Merge branch 'master' into accuracy-bar
2019-08-30 15:21:32 +09:00
Dean Herbert
84e4748268
Remove duplicate getAnimation function and improve namespacing
2019-08-30 12:59:58 +09:00
Dean Herbert
dc1046bf0c
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
2019-08-30 12:53:05 +09:00
Dean Herbert
3f500131d4
Add basic xmldoc
2019-08-30 11:33:50 +09:00
smoogipoo
6641811125
Add EditorWorkingBeatmap for reuse of the playable beatmap
2019-08-29 19:41:12 +09:00
smoogipoo
b04a8ae856
Add xmldocs
2019-08-29 16:31:43 +09:00
smoogipoo
5db813b7a4
Add secondary interface for further abstraction
2019-08-29 16:26:39 +09:00
smoogipoo
7927b684d3
Hook up + use editor beatmap
2019-08-29 16:06:40 +09:00
smoogipoo
840f224619
Remove typed events to reduce complexity
2019-08-29 16:05:44 +09:00
smoogipoo
6949c96aaa
Add initial EditorBeatmap structure
2019-08-29 15:17:27 +09:00
Joehu
73fd3cf03c
Fix gameplay menu button initial hover animation
2019-08-28 19:00:01 -07:00
Dean Herbert
7ccc409df7
Merge remote-tracking branch 'upstream/master' into add-ruleset-legacy-skin
2019-08-27 18:27:26 +09:00
Dean Herbert
7aeeb65ae7
Tidy up Player's container loading logic
...
Fixes drawable ruleset being loaded before skin sources are finished, by loading them as a separate operation (to avoid children being loaded first).
2019-08-27 18:27:21 +09:00
Dean Herbert
7885c79467
Make bindables private
2019-08-27 14:31:34 +09:00
Dean Herbert
69145eb83a
Merge branch 'master' into select-filters-persistence
2019-08-27 14:12:59 +09:00
smoogipoo
6368189d46
Refactor
2019-08-27 11:59:25 +09:00
Andrei Zavatski
9321f20884
Move arrow to the first line
2019-08-26 14:32:27 +03:00
Andrei Zavatski
fd0f42eee4
Fix filtered grouped difficulty items in DrawableCarouselBeatmapSet aren't hidden on first load
2019-08-26 14:11:24 +03:00
Dean Herbert
5e362d10b1
Add ruleset-specific legacy skin providers
...
This moves implementation of osu! skinnables to OsuLegacySkin.
2019-08-26 12:21:49 +09:00
Dean Herbert
9881d3677d
Simplify icon creation
2019-08-25 12:05:46 +09:00
Dean Herbert
ef397434f6
use GroupBy instead of Distinct+FindAll
2019-08-25 12:00:06 +09:00
Dean Herbert
a19a9b90ed
Simplify group filter display
2019-08-25 11:39:26 +09:00
Lucas A
b204e4419a
Rename SelectSortingMode & SelectGroupingMode -> SongSelectSortingMode & SongSelectGroupingMode
2019-08-24 10:34:54 +02:00
iiSaLMaN
8ccbe84f67
Loop on distinct rulesets of beatmap instead of all
2019-08-24 01:30:33 +03:00
iiSaLMaN
87340061e1
Add logic to create grouped difficulty icons in carousel beatmap set
2019-08-24 00:06:28 +03:00
Lucas A
ce5ee095b9
Fetch config bindables in BDL.
2019-08-23 14:03:56 +02:00
Lucas A
6bf31e8f91
Make song select grouping & sorting filters persistent
2019-08-23 13:15:38 +02:00
Dean Herbert
900df5d72f
Fix crash on closing game
2019-08-23 13:02:50 +09:00
Shane Woolcock
f19b5ba570
Merge branch 'master' into fix-decoding-loop
2019-08-22 17:02:13 +09:30
Dean Herbert
db1ff6d211
Fix video decoding loop running permanently in the background
2019-08-22 13:48:27 +09:00
Dean Herbert
7bf430afd5
Add padding back to difficulty icons on carousel
2019-08-21 21:16:06 +09:00
Andrei Zavatski
0ccfaeb8d9
Simplify moving average
2019-08-21 10:13:59 +03:00
Andrei Zavatski
a5acc913ea
CI fixes
2019-08-21 09:58:47 +03:00
Andrei Zavatski
a994ad9c84
Use moving average to calculate arrow position
2019-08-21 09:40:15 +03:00
Andrei Zavatski
336f979480
Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar
2019-08-21 09:39:28 +03:00
Andrei Zavatski
71cbc3525d
Add/remove displays only if necessary
2019-08-21 09:16:09 +03:00
Andrei Zavatski
ab1586ff33
Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar
2019-08-21 08:56:34 +03:00
Dean Herbert
6a48819055
Merge branch 'master' into update-framework-blending
2019-08-21 14:27:57 +09:00
Dean Herbert
724365c6d1
Minor tidying
2019-08-21 14:01:07 +09:00
Dean Herbert
48716f8f2b
Update framework
2019-08-21 13:29:50 +09:00
Lucas A
33946f0458
Fix CI issues and update comments.
2019-08-20 11:18:41 +02:00
Andrei Zavatski
f72edb8bf8
Add missing blank line
2019-08-20 09:03:31 +03:00
Andrei Zavatski
596ee150c6
Add xmldoc for not obvious const
2019-08-20 08:51:41 +03:00
Andrei Zavatski
9f64e09625
Move HitErrorDisplayOverlay back to the HUD
2019-08-20 08:45:51 +03:00
Andrei Zavatski
d337f9b482
DefaultHitErrorDisplay -> BarHitErrorDisplay
2019-08-20 08:03:17 +03:00
Andrei Zavatski
c4251d512e
Simplify bar building
2019-08-20 08:00:09 +03:00
Dean Herbert
caf8354f50
Merge branch 'master' into music-playback-improvements
2019-08-20 11:49:39 +09:00
Andrei Zavatski
415f180261
Delete extra semicolon
2019-08-19 22:53:28 +03:00
Andrei Zavatski
50c47568e4
Don't present Meh hit windows if it has no value
2019-08-19 22:45:27 +03:00
Andrei Zavatski
f1c3a60660
Add ability to select side
2019-08-19 22:04:27 +03:00
Andrei Zavatski
1bff103d32
CI fixes
2019-08-19 21:25:14 +03:00
Andrei Zavatski
6d3aa0520b
Make HitErrorDisplay an abstract class
2019-08-19 20:44:06 +03:00
Andrei Zavatski
70084b5553
Move HitErrorDisplay outside of the HUD
2019-08-19 20:28:03 +03:00
Andrei Zavatski
f70a7abea3
Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar
2019-08-19 19:36:28 +03:00
Dean Herbert
9ea4921e2b
Merge pull request #5036 from GSculerlor/difficulty-icon-tooltip
...
Add tooltips to difficulty icons with extra details
2019-08-19 17:23:13 +09:00
Dan Balasescu
9c069f6f22
Merge branch 'master' into unpause-on-selection-change
2019-08-19 13:15:46 +09:00
Dean Herbert
1f00793891
Unpause music when changing selection at song select
2019-08-19 11:30:04 +09:00
Lucas A
3fcd786198
Take lease on WorkingBeatmap during intro screens to prevent weird interactions with Playback control.
2019-08-18 19:32:56 +02:00
Andrei Zavatski
4c817b18b7
Use direct cast
2019-08-18 17:03:11 +03:00
Andrei Zavatski
dd6351b8ca
Apply suggested changes
2019-08-18 16:51:16 +03:00
Andrei Zavatski
6c60db550f
Fix crash if ruleset has no Meh hit windows
2019-08-18 16:24:13 +03:00
Andrei Zavatski
55cd1cecdf
Add missing blank line
2019-08-18 15:53:42 +03:00
Andrei Zavatski
8740ebd13f
Simplify layout
2019-08-18 15:45:18 +03:00
Andrei Zavatski
a59a14c9e6
Add setting to enable/disable hit error visibility
2019-08-18 15:01:04 +03:00
Andrei Zavatski
ee5568e596
Use Queue instead of List for stored Judgements
2019-08-18 14:43:34 +03:00
Andrei Zavatski
50133ba863
naming adjustments
2019-08-18 02:57:12 +03:00
Andrei Zavatski
906984ad95
Fix the math
2019-08-18 02:49:07 +03:00
Andrei Zavatski
f7024b513e
Visual improvements
2019-08-18 01:43:43 +03:00
Andrei Zavatski
94dbd6386f
Merge remote-tracking branch 'refs/remotes/ppy/master' into accuracy-bar
2019-08-18 01:14:27 +03:00
Dean Herbert
3dc81bdad5
Merge branch 'refactor-difficulty-colours' into difficulty-icon-tooltip
2019-08-17 15:19:46 +09:00
Dean Herbert
4fa9abeece
Replace DifficultyColouredContainer with a more scalable solution
2019-08-17 15:16:24 +09:00
Dean Herbert
f552de6ebc
Merge branch 'master' into difficulty-icon-tooltip
2019-08-17 13:45:20 +09:00
Dean Herbert
b57298406f
Fix right click blocking not resetting correctly
2019-08-15 19:25:33 +09:00
Dean Herbert
0f4bada21e
Fix right click absolute scrolling interfering with context menus
2019-08-15 18:27:45 +09:00
Dean Herbert
e73a9c2748
Fix song select context menus displaying off-screen
2019-08-15 14:06:29 +09:00
Dean Herbert
f355cff8bc
Apply reviews
2019-08-15 12:11:54 +09:00
Dean Herbert
7e74953784
Merge remote-tracking branch 'upstream/master' into difficulty-icon-tooltip
2019-08-15 11:54:59 +09:00
smoogipoo
e356cc8d9e
Refactor MatchBeatmapPanel for thread safety
2019-08-13 17:57:16 +09:00
smoogipoo
7c9c9f1ce1
Simplify caching
2019-08-13 17:38:21 +09:00
smoogipoo
92c2dafa12
Tighten accessibility
2019-08-13 17:34:16 +09:00
smoogipoo
6b57c9801d
Cull some unnecessary whitespace
2019-08-13 17:32:43 +09:00
smoogipoo
2b155e5407
Merge remote-tracking branch 'origin/master' into multi-room-update
2019-08-13 17:03:44 +09:00
Dan Balasescu
f6e1df8952
Merge branch 'master' into triangles
2019-08-13 16:34:08 +09:00
Andrei Zavatski
982066dfdf
Convert to method group
2019-08-12 10:38:34 +03:00
Dean Herbert
75cb0d093b
Use description correctly
...
Required for localisation
2019-08-12 16:10:48 +09:00
Andrei Zavatski
cb910a6518
Replace if/else statement
2019-08-12 10:02:45 +03:00
Andrei Zavatski
5b68a2f34a
Rename trackManager to previewTrackManager
2019-08-12 09:50:49 +03:00
Andrei Zavatski
520924b440
Don't create a new request if onlineId is null
2019-08-12 09:45:21 +03:00
Andrei Zavatski
6095480a54
Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update
2019-08-12 09:36:15 +03:00
Dean Herbert
d0f2d22995
Merge branch 'master' into fix-storyboard-not-shown-on-disabled-user-dim
2019-08-12 05:46:15 +09:00
Dean Herbert
9ac4870a21
Merge branch 'master' into triangles
2019-08-12 02:24:45 +09:00
Dean Herbert
359261d4a4
Fix game not starting if intro music is disabled
2019-08-12 02:04:06 +09:00
Andrei Zavatski
e7964c165f
Make judgement lines alive for a bit longer
2019-08-11 19:09:50 +03:00
Andrei Zavatski
3136d46c7f
Do not generate new judgement line on miss
2019-08-11 19:04:56 +03:00
Andrei Zavatski
5e0ac28ca8
Add basic colours
2019-08-11 18:30:03 +03:00
Andrei Zavatski
177a317a48
rename AccuracyBar to HitErrorDisplay
2019-08-11 18:11:49 +03:00
Andrei Zavatski
2a35c3c3e2
Calculate real position for judgement lines
2019-08-11 18:04:54 +03:00
Andrei Zavatski
0a255fe4d1
Add moving arrow
2019-08-11 16:38:03 +03:00
Andrei Zavatski
ed409d113b
Add judgement lines generator
2019-08-11 15:53:15 +03:00
Andrei Zavatski
fd334e0319
Implement basic layout for AccuracyBar
2019-08-11 14:57:21 +03:00
Dean Herbert
cb0cd7ed58
Add triangles intro
2019-08-09 20:05:28 +09:00
Dean Herbert
90b1fe81f3
Update cached usage in line with framework changes
2019-08-09 19:12:29 +09:00
iiSaLMaN
0fcc6c1676
Add DimLevel property
2019-08-08 22:13:48 +03:00
iiSaLMaN
bedb744a2e
Add parentheses
2019-08-08 17:11:26 +03:00
iiSaLMaN
88b9942b2a
Move EnableUserDim check to defualt value of ShowDimContent
2019-08-08 17:07:06 +03:00
Andrei Zavatski
9ab132520c
Testcase improvements
2019-08-08 12:25:46 +03:00
Andrei Zavatski
e9b5c91690
Fade out existing panel on beatmap change
2019-08-08 12:08:51 +03:00
Andrei Zavatski
08a92c38d7
adjust naming
2019-08-08 12:04:44 +03:00
Andrei Zavatski
1b559c1585
Use async loading
2019-08-08 12:01:33 +03:00
Dean Herbert
a3dbaef4ca
Adjust background gradient
2019-08-08 17:29:50 +09:00
Andrei Zavatski
8668bce25d
Fix preview can be played on start
2019-08-08 09:52:42 +03:00
Andrei Zavatski
cbcdc28900
Fix hard crash when clicking on a preview button
2019-08-08 09:04:24 +03:00
Andrei Zavatski
f5cd0eae48
Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update
2019-08-08 09:04:06 +03:00
Dean Herbert
2172c5a52b
Merge branch 'master' into use-bindable-break-time-in-player
2019-08-08 14:24:52 +09:00
Andrei Zavatski
4a38c4f9d1
Merge remote-tracking branch 'refs/remotes/ppy/master' into multi-room-update
2019-08-08 07:36:53 +03:00
Dean Herbert
f774c46f57
Remove linq usage in BreakOverlay update ( #5641 )
...
Remove linq usage in BreakOverlay update
2019-08-08 13:33:23 +09:00
Joehu
77df6a0cb7
Remove unused direct placeholder screen
2019-08-07 21:16:36 -07:00
Andrei Zavatski
a4459972b6
Remove ViewBeatmapButton
2019-08-08 07:15:30 +03:00
Andrei Zavatski
ffed642929
Implement MatchBeatmapPanel
2019-08-08 07:08:51 +03:00
Dean Herbert
7d42561da9
Remove linq usage in BreakOverlay update
2019-08-08 12:58:20 +09:00
Salman Ahmed
3f9f9e7bc9
Merge branch 'master' into use-bindable-break-time-in-player
2019-08-08 05:36:45 +03:00
Dean Herbert
99f5ca07ce
Remove redundant comment
2019-08-08 10:42:54 +09:00
Dean Herbert
40a33b3382
Move IsLoaded check to more correct place
2019-08-08 10:41:23 +09:00
Dean Herbert
a2e3ab6463
Merge branch 'master' into add-bindable-for-break-times
2019-08-08 10:13:14 +09:00
iiSaLMaN
ba269a49ee
Expose break fade duration and add it in the calculation
2019-08-07 16:59:35 +03:00
iiSaLMaN
d3657d82cd
Simplify final check for break time
2019-08-07 16:28:16 +03:00
iiSaLMaN
c2b3c28c79
Use IsBreakTime for checking if currently in a break
...
Rather than iterating over all breaks to find which is in current time
2019-08-07 16:15:53 +03:00
Dean Herbert
616de1830a
Less sheep
2019-08-07 12:20:49 +09:00
Dean Herbert
9033327923
Merge remote-tracking branch 'upstream/master' into fix-footer-button-hover-sounds
2019-08-07 12:19:25 +09:00
Dean Herbert
dda078277a
Minor variable name changes
2019-08-06 23:05:12 +09:00
iiSaLMaN
2a68bb2749
onCompletionEvent -> pushResults
2019-08-06 14:11:43 +03:00
iiSaLMaN
dd701eaa62
Safely cancel the completion task on restart or immediate exit
2019-08-06 14:10:03 +03:00
Joehu
1fc7ddf621
Fix text depth regression
2019-08-05 18:14:41 -07:00
Joehu
a7ac411c25
Fix footer button hover sounds playing in unclickable area
2019-08-05 17:57:04 -07:00
Dan Balasescu
cd27e1eb70
Merge branch 'master' into update-direct-categories-sorting
2019-08-05 17:11:48 +09:00
Andrei Zavatski
fd44ca3233
Rename Animation to Layer
2019-08-04 13:54:23 +03:00
Andrei Zavatski
a30d7912b1
Move DimmedLoadingAnimation to it's own file
2019-08-04 11:09:12 +03:00
Joehu
0082695cd8
Choose default category sorting instead of being always first
2019-08-02 13:22:58 -07:00
Dean Herbert
4c6cccb3a3
Update settings in line with framework changes
2019-07-30 23:31:21 +09:00
iiSaLMaN
e6e315e07b
Expose current break index
2019-07-30 13:29:41 +03:00
Salman Ahmed
c8b7cf8672
Merge branch 'master' into add-bindable-for-break-times
2019-07-30 06:23:47 +03:00
Dean Herbert
2d03c849bf
Improve testability of intro sequence ( #5275 )
...
Improve testability of intro sequence
2019-07-29 18:56:38 +09:00
Dan Balasescu
0dc25d7a35
Merge branch 'master' into exit-multi-from-null
2019-07-29 13:52:26 +09:00
David Zhao
26fc782de9
Don't exit if screenstack is null
2019-07-29 10:35:51 +09:00
Dean Herbert
088c04a20f
Revert "Fix BackButton handling escape before all other elements ( #5440 )"
...
This reverts commit 17a6563f4c
2019-07-28 23:38:55 +09:00
iiSaLMaN
5bf0277fd4
Remove unnecessary quick check
...
Not saving for anything
2019-07-28 09:17:13 +03:00
iiSaLMaN
1dd3a66300
Remove unnecessary index resets
2019-07-28 09:16:19 +03:00
Dean Herbert
872822035a
Merge branch 'master' into back-button-priority
2019-07-28 12:50:18 +09:00
iiSaLMaN
95b568eb46
Remove unnecessary condition
2019-07-27 15:52:30 +03:00
iiSaLMaN
6c580ac9d5
Use while loops instead
2019-07-27 15:52:01 +03:00
Dean Herbert
3571cb96b0
Fix broken merge
2019-07-27 12:56:55 +09:00
David Zhao
57e6c388a1
Merge branch 'master' into carousel-sizing
2019-07-27 11:40:07 +09:00
Salman Ahmed
934439e138
Merge branch 'master' into add-bindable-for-break-times
2019-07-26 12:57:52 +03:00
Dean Herbert
392e1cbafb
Merge pull request #5456 from peppy/fix-import-select
...
Fix beatmap present failing directly after an import
2019-07-26 18:48:49 +09:00
Dean Herbert
4d49aad153
Start not visible
2019-07-26 15:51:51 +09:00
Dean Herbert
7fa419a38b
Fix file layout order
2019-07-26 15:49:21 +09:00
iiSaLMaN
4c9e8527d8
Modify global index directly in the for loop
...
Moves the global index to a near break if not in a break yet
2019-07-26 09:24:53 +03:00
David Zhao
0f6c6c7de0
consolidate halfheight as well
2019-07-26 15:22:29 +09:00
Joehu
0b6cfec21c
Hide leaderboard mod filter when on details tab
2019-07-25 23:20:56 -07:00
iiSaLMaN
5a94a22314
Add a quick check if we're not in a break with current index
2019-07-26 09:17:39 +03:00
David Zhao
6765e9f7fa
Combine into properties and update for framework changes
2019-07-26 15:13:10 +09:00
iiSaLMaN
3fa6804501
Use better loops for moving index
...
Easy to read, suggested by peppy
2019-07-26 08:12:32 +03:00
iiSaLMaN
806d41daf4
Add function to reset break index
2019-07-26 08:11:13 +03:00
iiSaLMaN
91fa8a6552
Simplify null and any check
2019-07-26 08:09:18 +03:00
David Zhao
c89830f3d8
move constants, combine local vars into properties
2019-07-26 13:07:28 +09:00
Dean Herbert
7b7e4f924d
Merge branch 'master' into songselect-best-user-score
2019-07-26 13:06:14 +09:00
iiSaLMaN
44895c4b69
Use IReadOnlyList for break periods list
2019-07-26 05:41:10 +03:00
iiSaLMaN
b4c93b1777
Use lookup direction than 2 while loops
2019-07-26 05:11:01 +03:00
iiSaLMaN
a08d54eb06
Remove unnecessary checks
2019-07-26 03:11:59 +03:00
Shane Woolcock
1d6c321e14
Ensure we don't ping-pong nearestBreakIndex between breaks
2019-07-26 08:34:18 +09:30
Shane Woolcock
5e51012800
Rewrite updateBreakTimeBindable
2019-07-25 22:54:05 +09:30
iiSaLMaN
cdda264c49
Use global index and move it to find if break time
...
Avoid using iterations
2019-07-25 12:28:21 +03:00
iiSaLMaN
5a55433d6c
Return if breaks are null
...
Fixes a test
2019-07-25 11:53:32 +03:00
iiSaLMaN
172a9ce33a
Use a for loop instead of foreach
...
avoid allocating an iterator
2019-07-25 11:40:45 +03:00
David Zhao
a9f0dda9d7
Confine positional input
2019-07-25 17:36:13 +09:00
David Zhao
97eb5293a8
Don't depend on parent sizing
2019-07-25 17:32:21 +09:00
iiSaLMaN
9bd66b6e7a
Better xmldoc
2019-07-25 11:27:32 +03:00
iiSaLMaN
69d2f57f4f
Avoid using LINQ
2019-07-25 11:27:01 +03:00
iiSaLMaN
0ea0a10ca4
Expose as IBindable<bool>
2019-07-25 11:26:38 +03:00
iiSaLMaN
7b82d184bd
Add bindable boolean for break times
2019-07-25 11:07:53 +03:00
David Zhao
c4bed0e6d2
Resize BeatmapCarousel, update carouselitem logic
2019-07-25 15:31:21 +09:00
Dean Herbert
69844e6c24
Fix beatmap present failing directly after an import
2019-07-25 12:18:18 +09:00
David Zhao
6ef3c71e22
remove unused using
2019-07-25 11:31:46 +09:00
David Zhao
e63c97b306
remove unnecessary overrides
2019-07-25 11:20:24 +09:00
David Zhao
bbcc8f0721
Add new container level and unblock footer
2019-07-25 11:11:20 +09:00
Andrei Zavatski
76b79f3554
Transform adjustments
2019-07-23 01:14:45 +03:00
Andrei Zavatski
94ed03548d
Hide top score at every leaderboard change
2019-07-22 18:34:31 +03:00
Dean Herbert
ade661236a
Merge branch 'master' into intro-testing-improvements
2019-07-22 23:44:14 +09:00
Dean Herbert
5a6c8bfec9
Adjust transition to now show janky resize
2019-07-22 23:28:17 +09:00
Dean Herbert
95241165cc
Fix text alignment
2019-07-22 23:26:11 +09:00
Dean Herbert
d83d93ee66
Use asynchronous loading
2019-07-22 23:21:07 +09:00
Dean Herbert
764513feea
Fix code quality
2019-07-22 23:13:48 +09:00
Dean Herbert
8c54708582
Merge branch 'master' into songselect-best-user-score
2019-07-22 22:34:11 +09:00
Dean Herbert
a05a6bbb77
Set "Title" as the default grouping/sorting modes in song select ( #5396 )
...
Set "Title" as the default grouping/sorting modes in song select
2019-07-22 18:06:23 +09:00
Dean Herbert
e76b3e2b40
User property instead of method
2019-07-21 10:42:40 +09:00
iiSaLMaN
842417cf42
Check if selected scope requires API
2019-07-21 03:07:27 +03:00
smoogipoo
1ce2b2eace
Set title as default grouping/sorting modes
2019-07-18 13:18:06 +09:00
Dean Herbert
a6ddcd78d4
Fix results screen not showing first tab correctly
2019-07-18 01:08:12 +09:00
Dean Herbert
98d0713fa9
Merge branch 'master' into fix-background-blur-safety
2019-07-17 22:01:10 +09:00
smoogipoo
7c5a227fc5
Fix crashes when presenting replays
2019-07-17 14:46:25 +09:00
Dean Herbert
7634e3cc81
Fix song select iterating over all beatmaps in database unnnecessarily
2019-07-16 14:57:11 +09:00
Andrei Zavatski
7e367dc397
Push results screen when clicking on top score
2019-07-15 12:30:42 +03:00
Andrei Zavatski
9c13ede5a8
Merge remote-tracking branch 'refs/remotes/ppy/master' into songselect-best-user-score
2019-07-15 12:11:28 +03:00
Dean Herbert
d4c1005c7e
Fix incorrect comparison in line updating logic
2019-07-15 15:53:19 +09:00
Dean Herbert
12e7668afc
Fix potential cross-thread talk from bindable updates
2019-07-15 11:48:33 +09:00
Andrei Zavatski
19680c8df8
Minor adjustments
2019-07-14 16:37:05 +03:00
Andrei Zavatski
ecf0e62484
CI fixes
2019-07-14 16:16:21 +03:00
Andrei Zavatski
963e025bb8
Make it works and some layout adjustments
2019-07-14 14:03:14 +03:00
Andrei Zavatski
d1409d4610
Add top score section into beatmap detail area
2019-07-14 13:33:47 +03:00
Andrei Zavatski
d30ae24f58
Use Bindable for setting score
2019-07-14 12:40:54 +03:00
Andrei Zavatski
0584ee9ce5
Basic implementation
2019-07-14 12:34:12 +03:00
Dan Balasescu
986031e127
Merge branch 'master' into storyboard-clock-di
2019-07-12 23:14:12 +09:30
Dan Balasescu
fc96fbc8a1
Merge branch 'master' into fix-skip-button-clickability
2019-07-12 22:44:20 +09:30
Dean Herbert
44855d8bb2
Ensure any existing background is expired if set more than once
2019-07-12 13:45:34 +09:00
Dean Herbert
671f7f99cd
Use constant for blur amount
2019-07-12 13:44:43 +09:00
Dean Herbert
8b67f88d16
Don't expose dimmable container creation in player
2019-07-12 12:04:45 +09:00
Dean Herbert
46f7bb885b
Move classes to local namespaces
...
Also renames test scene to more appropriate name.
2019-07-12 11:50:06 +09:00
Dean Herbert
c9599b65eb
Merge remote-tracking branch 'upstream/master' into storyboard-clock-di
2019-07-12 11:20:43 +09:00
Dean Herbert
a1e64106d4
Merge branch 'master' into intro-testing-improvements
2019-07-11 23:46:02 +09:00
Dean Herbert
ecbd0f7eff
Merge branch 'master' into fix-skip-button-clickability
2019-07-11 23:10:28 +09:00
Dean Herbert
19e8198bff
Merge branch 'master' into flow_container_insert
2019-07-11 22:53:57 +09:00
David Zhao
ac170a6957
add comment and cleanup
2019-07-11 14:00:25 +09:00
David Zhao
6c0de0b436
Merge remote-tracking branch 'upstream/master' into storyboard-clock-di
2019-07-11 13:33:35 +09:00
David Zhao
321266e96f
Make UserDimContainer abstract
2019-07-11 13:17:28 +09:00
Dean Herbert
3b448b0086
Merge remote-tracking branch 'upstream/master' into Desconocidosmh-master
2019-07-11 00:25:35 +09:00
Dean Herbert
ad873b542a
Simplify editor logic
2019-07-11 00:22:40 +09:00
Dean Herbert
6819c528db
Use canBeNull instead of needlessly caching MusicController for tests
2019-07-11 00:20:01 +09:00
Dean Herbert
b225b2eb39
Rename to IsUserPaused
2019-07-11 00:18:19 +09:00
Salman Ahmed
1eed6955fa
Merge branch 'master' into implement-other-sorting-criteria
2019-07-10 14:33:48 +03:00
Desconocidosmh
100d15e651
Move reseting tempo to Editor
2019-07-10 10:43:02 +02:00
Desconocidosmh
8b8e67fd72
Add accidentally deleted code
2019-07-10 10:41:52 +02:00
David Zhao
7929104b8a
move default into StoryboardContainer, fix load bug, remove comment
2019-07-10 12:24:05 +09:00
David Zhao
41afe89c0b
delete no longer needed bindable
2019-07-10 00:46:34 +09:00
Dean Herbert
27e79d56ec
Merge branch 'master' into collapse-graph-option
2019-07-09 23:40:43 +09:00
iiSaLMaN
38bc652bf2
Remove sorting by length for beatmaps
2019-07-09 17:02:51 +03:00
Oskar Solecki
2fb9b5dd69
Merge branch 'master' into master
2019-07-09 13:49:07 +02:00
iiSaLMaN
e0c1fb7818
Compare by milliseconds for length
2019-07-09 14:47:54 +03:00
Oskar Solecki
3472979d0b
Make sure exiting editor doesn't unpause the music
2019-07-09 12:53:40 +02:00
Desconocidosmh
2546f647be
Completely change the way we fix the bug
2019-07-09 11:32:49 +02:00
Dean Herbert
e835cd0f6f
Improve information flow to Disclaimer
2019-07-09 18:08:44 +09:00
Dean Herbert
0580c32263
Abstract intro screen logic to base class
2019-07-09 18:05:57 +09:00
Dean Herbert
32fb811bc9
Merge branch 'master' into intro-testing-improvements
2019-07-09 18:05:52 +09:00
David Zhao
5bb21ecae0
remove storyboard region
2019-07-09 16:50:37 +09:00
David Zhao
89cb8a0cac
Move storyboard initialization to new StoryboardContainer
2019-07-09 16:23:59 +09:00
Oskar Solecki
8f7476e9cc
Remove unused stuff
2019-07-09 00:26:57 +02:00
Oskar Solecki
a4957909b4
Merge branch 'master' into Fix-music-playing-while-exiting-from-editor
2019-07-09 00:11:29 +02:00
Desconocidosmh
338371c3fc
Fix music playing while exiting from editor
2019-07-09 00:08:18 +02:00
Dean Herbert
8a98aff318
Merge branch 'master' into replay-local-mods
2019-07-08 22:38:02 +09:00
Dean Herbert
54f5e6aedf
Add assertion and comment about lease logic
2019-07-08 22:37:39 +09:00
David Zhao
0cf4bf2352
Manually set clock for storyboard if loading before being given a parent
2019-07-08 18:46:12 +09:00
David Zhao
d489a77fe1
remove new container and comment
2019-07-08 17:57:29 +09:00
iiSaLMaN
5f3f59629e
Use the length field instead of recalculating
2019-07-08 11:55:07 +03:00
David Zhao
fbd300e664
Move ruleset into ReplayPlayerLoader as well
2019-07-08 17:37:20 +09:00
David Zhao
e78e326f34
remove unused using
2019-07-08 17:02:42 +09:00
iiSaLMaN
129899f419
Add a BPM property in BeatmapInfo
2019-07-08 10:43:35 +03:00
David Zhao
ef22ab9340
remove bindable
2019-07-08 16:32:11 +09:00
David Zhao
6a86f62d17
Get mods from score info
2019-07-08 16:13:03 +09:00
David Zhao
5853a877c2
create base dependencies before caching, create player in playerloader
2019-07-08 15:40:10 +09:00
iiSaLMaN
90d5484818
Return BPM back to OnlineInfo
...
Revert commit of "Move BPM out of OnlineInfo"
2019-07-08 09:10:41 +03:00
David Zhao
2747d7692b
Create ReplayPlayerLoader for local mod caching
2019-07-08 14:55:05 +09:00
iiSaLMaN
729f0901f7
Move Length out of OnlineInfo
2019-07-07 20:25:36 +03:00
iiSaLMaN
3ea9629daf
Move BPM out of OnlineInfo
2019-07-07 20:11:44 +03:00
iiSaLMaN
6ee10640e3
Remove unnecessary migration + Fix CI issues
2019-07-07 19:26:41 +03:00
iiSaLMaN
b4ef64fa61
Add sorting by Length
2019-07-07 18:26:56 +03:00
iiSaLMaN
65c8249c94
Add beatmap extension for calculating length
2019-07-07 18:25:52 +03:00
iiSaLMaN
188c80374e
Add sorting by BPM
2019-07-07 18:14:23 +03:00
Desconocidosmh
84cadc688a
Change method name
2019-07-07 17:11:54 +02:00
Desconocidosmh
1a117d1511
Closes #5277
2019-07-07 17:05:53 +02:00
Dean Herbert
ebc0e50295
Simplify conditions
2019-07-07 13:21:41 +09:00
Dean Herbert
1eec69c6b6
Merge remote-tracking branch 'Joehuu/master' into fix-unranked-map-lb-placeholder
2019-07-07 13:06:34 +09:00
Dean Herbert
8f2ec73626
Move logic inside of HUDOverlay
...
Add vertical offset adjust.
2019-07-07 05:30:53 +09:00
Joseph Madamba
7c0e3a50b6
Merge branch 'master' into fix-unranked-map-lb-placeholder
2019-07-06 12:09:28 -07:00
Dean Herbert
3f332cca2f
Merge branch 'master' into applicable-to-hud
2019-07-07 01:03:50 +09:00
Dean Herbert
be2d0048db
Merge branch 'master' into buttonsystem-entermode
2019-07-07 00:01:41 +09:00
Salman Ahmed
dfabed3d85
Merge branch 'master' into applicable-to-hud
2019-07-06 16:30:02 +03:00
Dean Herbert
ea911b2fd2
Ensure intro restarts track
2019-07-06 19:05:42 +09:00
Dean Herbert
2149d639de
Merge branch 'master' into leaderboard-mod-filter
2019-07-06 13:27:49 +09:00
Dan Balasescu
3a9f16ccf2
Merge branch 'master' into idle-still-starts
2019-07-06 00:08:59 +09:30
Unknown
d05512a12a
invert usage corresponding to previous description change
2019-07-05 09:16:50 +02:00
David Zhao
a259247a98
use const
2019-07-05 16:07:17 +09:00
Dean Herbert
598b0d668b
Merge branch 'master' into import-stable-scores
2019-07-05 15:54:33 +09:00
Unknown
ee44caf964
better setting description
2019-07-05 08:52:44 +02:00
Unknown
2d5fd7f1c4
remove unnecessarily setting value of bindable that was already bound to
2019-07-05 08:49:56 +02:00
Unknown
b425df6c75
various fixes
...
- make AllowSeeking a Bindable which fixes incorrect initial position and removes unnecessary variables
- make SongProgressInfo fixed height
2019-07-05 08:48:40 +02:00
Dean Herbert
b54c0176eb
Merge branch 'master' into disable-own-replays
2019-07-05 15:41:43 +09:00
Dean Herbert
b902457f8d
Allow PlayerLoader to proceed even if the mouse is hovering an overlay panel
2019-07-05 15:32:07 +09:00
Unknown
ed22c23f37
mask SongProgress
2019-07-05 08:30:32 +02:00
Unknown
e69160a0ce
fix graph not completely hiding
2019-07-05 08:05:18 +02:00
Dean Herbert
adf6d6c942
Update initial run import process to include scores
2019-07-05 14:25:52 +09:00
Joehu
1534b75d27
Fix ci errors
2019-07-04 21:39:21 -07:00
Joehu
e8168037f9
Fix unranked beatmap leaderboards showing "no records" placeholder
2019-07-04 21:19:51 -07:00
Dean Herbert
d77d49f595
Merge branch 'master' into fade-music-on-exit
2019-07-05 13:13:07 +09:00
David Zhao
9eeafa0861
Merge branch 'buttonsystem-entermode' of https://github.com/nyquillerium/osu into buttonsystem-entermode
2019-07-05 13:08:48 +09:00
David Zhao
79d6670dc5
Expose durations from MainMenu and reorder
2019-07-05 13:08:45 +09:00
naoey
1dab363be3
Require supporter for filtering mods on online leaderboards
2019-07-05 08:42:44 +05:30
naoey
98a242cc37
Merge remote-tracking branch 'ppy/master' into leaderboard-mod-filter
2019-07-05 08:38:33 +05:30
Dean Herbert
f4dcbbbfef
Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode
2019-07-05 11:29:29 +09:00
iiSaLMaN
d624157c45
Remove unnecessary fading
2019-07-05 05:17:36 +03:00
Dean Herbert
91d461eba7
Merge pull request #5251 from Joehuu/remove-edit-song-select-file
...
Remove unused EditSongSelect file
2019-07-05 10:30:37 +09:00
Joehu
5f6544eebf
Fix beatmap leaderboards requiring supporter when signed out
2019-07-04 12:05:07 -07:00
naoey
f04adb7192
Apply mods filter to local scores too
2019-07-04 22:38:33 +05:30
Joehu
9b2ebed669
Remove unused EditSongSelect file
2019-07-04 08:36:34 -07:00
Unknown
608223cbb4
Add setting to collapse the song progress graph
2019-07-04 11:59:38 +02:00
David Zhao
be4e7d0f50
remove comment
2019-07-04 17:08:21 +09:00
Dean Herbert
db24ac28ec
Add tests
2019-07-04 16:53:08 +09:00
Dean Herbert
a20d5baa57
Fix skip button not being clickable after fade out
2019-07-04 16:21:01 +09:00
iiSaLMaN
b53aeec90d
Move audio adjustment inside OnResuming
2019-07-04 05:18:29 +03:00
iiSaLMaN
99603ca0b6
Fade out game volume on exiting
...
Invokes 'this.Exit()' on completion (simplify lines)
2019-07-04 04:50:49 +03:00
Dean Herbert
4ecc690164
Merge branch 'master' into fix-logo-vis-catchup
2019-07-04 00:47:42 +09:00
naoey
99606a018b
Merge remote-tracking branch 'upstream/master' into leaderboard-mod-filter
2019-07-03 19:35:08 +05:30
naoey
4ba60ed089
Apply currently selected mods to filter leaderboard scores
...
Modifies GetScoresRequest to build query string locally instead of using WebRequest.AddParameter since it doesn't support array parameters
2019-07-03 17:04:20 +05:30
naoey
ccae4ce95e
Fix local beatmap leaderboard displaying scores from all game modes
2019-07-03 14:39:11 +05:30
David Zhao
b2185cd3a2
Merge branch 'master' into buttonsystem-entermode
2019-07-03 15:54:34 +09:00
Dean Herbert
6e308945b1
Fix logo visualisation trying to catch up after being off-screen
2019-07-03 15:22:17 +09:00
Dean Herbert
23acddcb56
Rename download buttons to avoid ambiguity
2019-07-03 12:02:35 +09:00
Dean Herbert
466bc7f28a
Merge branch 'master' into watch-replays-4
2019-07-03 11:47:10 +09:00
Salman Ahmed
8b4ef52c13
Revert unnecessary changes
2019-07-03 07:27:24 +03:00
Dean Herbert
7caa6eaed5
Remove all non-transform LogoVisualisation per-frame allocations ( #5200 )
...
Remove all non-transform LogoVisualisation per-frame allocations
Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>
2019-07-02 22:42:18 +09:00
Dean Herbert
73474826f6
Avoid Intro screen holding references to the intro beatmap ( #5211 )
...
Avoid Intro screen holding references to the intro beatmap
2019-07-02 22:41:34 +09:00
Dan Balasescu
15321ee0e8
Merge branch 'master' into reduce-logovis-allocs
2019-07-02 22:44:39 +09:30
naoey
eaa19d5a49
Remove unused/unnecessary fields
2019-07-02 16:13:47 +05:30
naoey
ee516d2515
Make direct panel download and replay buttons share UI
2019-07-02 15:55:30 +05:30
Dean Herbert
587be955c3
Increase number of backgrounds in line with resources
2019-07-02 17:57:23 +09:00
Dean Herbert
29bb227de2
Avoid Intro screen holding references to the intro beatmap
2019-07-02 16:28:06 +09:00
Dean Herbert
6539c6da17
Merge branch 'master' into watch-replays-4
2019-07-02 13:24:16 +09:00
Salman Ahmed
744e651a37
Merge branch 'master' into applicable-to-hud
2019-07-02 05:24:56 +03:00
Salman Ahmed
6a79349f4a
Move health display out of the visibility container
2019-07-02 02:19:59 +03:00
Roman Kapustin
9037fb59de
Make BeatmapOptionsButton insertion cleaner
2019-07-01 18:42:18 +03:00
Dan Balasescu
3d4c5104b3
Merge branch 'master' into reduce-db-contexts
2019-07-01 23:40:58 +09:30
Dean Herbert
9de4bb3423
Remove all non-transform LogoVisualisation per-frame allocations
2019-07-01 16:12:20 +09:00
Dean Herbert
8703f0ad40
Change song select initialisation to promote db context sharing
2019-06-30 22:23:48 +09:00
Dean Herbert
60ea3d4e1a
Fix skinning support for combobreak
2019-06-30 21:58:30 +09:00
Dean Herbert
bd54b34538
Merge remote-tracking branch 'upstream/master' into combobreak
2019-06-30 21:27:53 +09:00
Dean Herbert
fa879b4b60
Add a note explaining why manual handling is required
2019-06-30 20:47:09 +09:00
Unknown
5b26ef75b1
allow exiting editor again
2019-06-30 12:31:31 +02:00
naoey
bfcbb47b77
Clean up some more leftover code
2019-06-30 10:56:20 +05:30
welsar55
d6561531a3
Merge branch 'master' into combobreak
2019-06-29 11:55:10 -05:00
Welsar55
a22c166575
Make ComboEffects its own class
2019-06-29 11:28:40 -05:00
naoey
d8f6bbc90e
Disable replay button when replay is unavailable
2019-06-29 12:49:03 +05:30
naoey
7d9e215744
Code quality fixes
2019-06-29 12:29:12 +05:30
naoey
424711d24b
Fix replay button shake container
...
- Add license headers
- Slightly reduce bottom margin of button in score screen
2019-06-29 12:26:37 +05:30
naoey
bc52f76556
Move replay button to score card
2019-06-29 10:55:30 +05:30
Welsar55
a57218e50e
Move to LocalSkinOverride
2019-06-28 20:45:11 -05:00
iiSaLMaN
d37cefbad8
Implement IApplicableToHUD
2019-06-29 04:23:59 +03:00
naoey
53d6d74537
Update to match upstream changes
2019-06-28 09:33:13 +05:30
naoey
ab0bb8b678
Implement replay downloading with ArchiveDownloadModelManager
2019-06-28 09:33:13 +05:30
Welsar55
826699a7e7
Remove unneeded bindable
2019-06-26 12:16:44 -05:00
Dean Herbert
c34f6180e6
Merge branch 'master' into generic-download-model-manager
2019-06-26 20:37:56 +09:00
Dan Balasescu
f06aabad5f
Merge branch 'master' into toolbar-rulesets-refactor
2019-06-26 18:33:45 +09:00
Welsar55
7dd1479050
Add combobreak sound
2019-06-26 00:20:33 -05:00
Dean Herbert
1eda4e0dd4
Merge remote-tracking branch 'upstream/master' into generic-download-model-manager
2019-06-26 12:21:04 +09:00
Dean Herbert
9e1cb90dd8
Remove existing argument for ItemAdded event
...
For all usages, it looks like this was unnecessary.
2019-06-26 11:40:41 +09:00
Dan Balasescu
6063e7a69f
Merge branch 'master' into one-hit-screen
2019-06-26 11:34:54 +09:00
Dean Herbert
446fbce81c
Add base class for startup screens
...
Avoids missing adding changes to screens like Disclaimer, which may not be shown in debug builds.
2019-06-26 01:36:17 +09:00
Dean Herbert
40cf573368
Fix pause not correctly showing pause screen
2019-06-25 23:15:58 +09:00
Dean Herbert
983cabdb98
Disallow back button on disclaimer screen
2019-06-25 22:27:50 +09:00
Dean Herbert
f9dad0f640
Merge remote-tracking branch 'upstream/master' into gamewide-backbutton
2019-06-25 20:23:49 +09:00
Andrei Zavatski
bae0258d8d
Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
2019-06-25 14:16:05 +03:00
smoogipoo
aa81c95f30
Remove unnecessary extra property
2019-06-25 18:38:14 +09:00
smoogipoo
531b107a98
Exit match before exiting multiplayer
2019-06-25 18:33:26 +09:00
smoogipoo
1a26608ba9
Close mod select before exiting song selection
2019-06-25 18:33:21 +09:00
smoogipoo
d9927204f8
Relieve OsuScreen of back button input duties
2019-06-25 18:33:18 +09:00
smoogipoo
8c96e4c1fa
Move back button to OsuGame
2019-06-25 18:33:08 +09:00
Dean Herbert
7bc7df2249
Reduce background brightness at PlayerLoader
2019-06-25 17:22:10 +09:00
Andrei Zavatski
9dedd62d9a
Revert a hotfix in multi screen
...
since it's been fixed in a framework
2019-06-24 22:57:18 +03:00
Andrei Zavatski
35516e7304
Merge remote-tracking branch 'refs/remotes/ppy/master' into toolbar-rulesets-refactor
2019-06-24 22:52:24 +03:00
Dean Herbert
f91467eddc
Fix licence header
2019-06-24 18:34:23 +09:00
Dean Herbert
fad1ced1b5
Add correct conditionals to allow exit
2019-06-24 18:15:27 +09:00
Dean Herbert
d70248338d
Merge remote-tracking branch 'upstream/master' into quickEscape
2019-06-24 18:14:48 +09:00
smoogipoo
8d6fc3edf0
Fix multiplayer create button appearing in match song selection
2019-06-24 11:54:41 +09:00
Andrei Zavatski
bbdb114f04
Add missing blank line
2019-06-24 02:09:00 +03:00
Andrei Zavatski
94e819578e
Finally fix the problem when we can't apply a ruleset in the multi screen
...
because it's disabled
2019-06-24 01:55:35 +03:00
Ganendra Afrasya
d540565197
Merge branch 'master' into difficulty-icon-tooltip
2019-06-22 11:54:00 +07:00
Dean Herbert
f766068e17
Remove local implementation of bindable in OsuCheckbox ( #5046 )
...
Remove local implementation of bindable in OsuCheckbox
2019-06-21 21:08:09 +09:00
Dean Herbert
6627cdefd2
Merge branch 'master' into tournament-tools
2019-06-21 15:52:47 +09:00
Dan Balasescu
c79c4641f3
Merge branch 'master' into use-modelbackeddrawable
2019-06-21 14:26:07 +09:00
Dan Balasescu
8ab7a8641b
Add comment for why it's not a fill flow
2019-06-21 12:42:35 +09:00
Dan Balasescu
0571bbd555
Merge branch 'master' into carousel-gradient
2019-06-21 12:40:24 +09:00
David Zhao
65c84428cc
Fix position of gradient in beatmap carousel
2019-06-20 15:05:15 +09:00
Joehu
ca919f02e6
Remove bad words on code comments
2019-06-19 21:33:58 -07:00
Dean Herbert
133c1fc0f1
Merge branch 'master' into remove-osu-checkbox-bindable
2019-06-20 11:33:39 +09:00
Dean Herbert
d0a452cdf9
Show tooltips for beatmap set panels
2019-06-20 01:10:03 +09:00
Dean Herbert
816bac9874
Merge remote-tracking branch 'upstream/master' into difficulty-icon-tooltip
2019-06-20 00:55:52 +09:00
Dean Herbert
dd926f55bd
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-06-19 14:55:34 +09:00
Dean Herbert
3043f42eb5
Merge branch 'master' into fix-multiplayer-audio
2019-06-19 14:36:05 +09:00
Dean Herbert
f26fe53feb
Fix startup crash if main menu does not load fast enough
2019-06-19 13:16:19 +09:00
Dean Herbert
6426983de0
Move logic out of update (and simplify, hopefully)
2019-06-19 13:15:58 +09:00
KingLuigi4932
fec0db8fe1
Merge UpdateableAvatar.cs and Avatar.cs + Rename Avatar to DrawableAvatar
2019-06-17 21:55:07 +03:00
KingLuigi4932
d665f1fe4b
Seperate drawable and updateable flag from Country + Use UpdateableFlag
2019-06-17 20:57:57 +03:00
KingLuigi4932
794ba17a2f
Seperate UpdateableRank from DrawableRank and use it
2019-06-17 20:04:09 +03:00
Ganendra Afrasya
efdeb84248
Merge branch 'master' into difficulty-icon-tooltip
2019-06-17 22:48:20 +07:00
Ganendra Afrasya
aa53f14329
Make sure tooltip appear in specific cases
2019-06-17 22:44:28 +07:00
Dean Herbert
26d5c2d85a
Remove local implementation of bindable in OsuCheckbox
2019-06-17 19:37:24 +09:00
Dean Herbert
b259710a62
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-06-17 19:30:17 +09:00
smoogipoo
c1d2fff651
Use RestartPoint
2019-06-17 12:44:19 +09:00
smoogipoo
bc35a30a25
Fix audio being dimmed during multiplayer
2019-06-17 12:27:53 +09:00
Joehu
1a9efb3d7a
Fix editor play button
2019-06-15 11:05:58 -07:00
Dean Herbert
2b48f5d3e0
Tidy up updateMetrics flow
2019-06-15 14:45:51 +09:00
Dean Herbert
587edcb716
Merge branch 'master' into fix-beatmapoverlay-graphs
2019-06-15 13:42:13 +09:00
Dean Herbert
1b75fbed9a
Merge remote-tracking branch 'upstream/master' into update-scrollcontainer
2019-06-14 23:25:17 +09:00
Dean Herbert
bc574520bf
Update ScrollContainer usages in line with framework changes
2019-06-14 15:55:32 +09:00
Dean Herbert
15b9b53d35
Fix IconButtons not being scaled correctly
2019-06-14 13:40:32 +09:00
smoogipoo
f54f6e552b
Fix beatmap details potentially using the incorrect metrics
2019-06-13 18:04:42 +09:00
smoogipoo
583bb53f53
Remove GetBeatmapDetailsRequest
2019-06-13 16:57:19 +09:00
smoogipoo
0a79b444d9
Move metrics to beatmap set
2019-06-13 16:52:49 +09:00
Dean Herbert
830ddbc2de
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-06-13 12:49:52 +09:00
Dean Herbert
021d0273f9
Split out user activity from user status ( #4619 )
...
Split out user activity from user status
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-06-12 20:14:03 +09:00
Dean Herbert
f358fce9ab
Move activity (writable) bindable to APIAccess so it correctly transfers between users
2019-06-12 18:04:57 +09:00
smoogipoo
243cd517ad
Merge remote-tracking branch 'origin/master' into backgrounded-beatmap-status-lookups
...
# Conflicts:
# osu.Game.Tests/Visual/SongSelect/TestScenePlaySongSelect.cs
2019-06-12 17:24:16 +09:00
Dean Herbert
20b43c20c8
Rename variables to remove redundant "screen" terminology
2019-06-12 16:33:15 +09:00
smoogipoo
13234fb4a4
Adjust comments a bit
2019-06-12 16:07:35 +09:00
Dean Herbert
a9c229b1ec
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-06-12 16:00:35 +09:00
Dean Herbert
fc1f778b82
Remove implicit null
2019-06-12 15:53:53 +09:00
smoogipoo
5d3fa51360
Merge remote-tracking branch 'origin/master' into selection-update
2019-06-12 15:10:57 +09:00
Lucas A
15893bbb75
Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages.
2019-06-11 19:41:48 +02:00
Lucas A
6c74998487
Set ScreenActivity to InitialScreenActivity only when ScreenActivity hasn't been set manually before.
2019-06-11 19:24:36 +02:00
Dean Herbert
606be3d7ce
Merge branch 'master' into backgrounded-beatmap-status-lookups
2019-06-12 00:22:47 +09:00
Dean Herbert
00ee45fe46
Merge remote-tracking branch 'origin/update-visibility-container' into update-framework
2019-06-11 19:36:13 +09:00
Dean Herbert
591be33fc2
Merge branch 'master' into async-results-pages
2019-06-11 18:45:06 +09:00
Dean Herbert
609a82bc94
Update VisibilityContainer usage in line with framework
2019-06-11 15:13:58 +09:00
Lucas A
141775d98c
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-06-10 21:41:00 +02:00
Dean Herbert
e87123342c
Load results pages asynchronously
...
Reduces performance burden when first displaying pages. Closes #4977 .
2019-06-10 23:51:09 +09:00
Dean Herbert
d7cb932606
Merge branch 'master' into selection-update
2019-06-10 17:51:40 +09:00
Dean Herbert
600503ec8e
Use Task.Run/Wait to avoid warnings
2019-06-10 13:42:29 +09:00
smoogipoo
f090e292c9
Move ArchiveModelManager import process to async flow
2019-06-10 13:42:22 +09:00
Lucas A
4f6978f2aa
Apply review suggestions.
2019-06-09 20:01:19 +02:00
Dean Herbert
5c2ea0b1a7
Move dispose to end of file
2019-06-10 01:14:46 +09:00
Dean Herbert
d964f6ba9e
Tween track frequency on pause
2019-06-10 00:56:35 +09:00
Dan Balasescu
346c4310c3
Merge branch 'master' into fail-animation
2019-06-07 20:48:36 +09:00
smoogipoo
90966b113b
Merge remote-tracking branch 'origin/master' into ftb-prepass
2019-06-06 20:32:38 +09:00
smoogipoo
c7d0fcd42a
Update drawnodes
2019-06-06 16:49:35 +09:00
Lucas A
a2bc5b538e
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-06-05 16:59:38 +02:00
Lucas A
da20be9a4b
Fetch IAPIProvider via Resolved attribute
2019-06-05 16:59:08 +02:00
smoogipoo
a6dc5606bc
Allow beatmapsets to be sorted by date added
2019-06-05 18:17:43 +09:00
Dean Herbert
9c214c3f0e
Add animation on failing
2019-06-04 16:13:16 +09:00
smoogipoo
cea353975f
Update with further framework-side changes
2019-06-04 11:04:28 +09:00
smoogipoo
53a39e9142
Merge remote-tracking branch 'origin/master' into audio-refactor-update
2019-06-04 10:50:33 +09:00
Dean Herbert
2d15e02406
Merge branch 'master' into selection-update
2019-06-03 11:47:30 +09:00
Lucas A
b3f6640d11
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-31 12:41:26 +02:00
Dean Herbert
a2fbcb2bd3
Fix rebase regressions
2019-05-31 15:58:46 +09:00
Dean Herbert
e03a664970
Fix lead-in logic to match stable
...
Also adds storyboard event priority support.
2019-05-31 15:51:19 +09:00
Dean Herbert
651706b10e
Account for user/system offsets when deciding on an initial seek time
...
Closes #3043
Remove "AllowLeadIn" flag
2019-05-31 15:50:46 +09:00
David Zhao
465aa4e0f6
Prevent idle state from being updated incorrectly
2019-05-31 14:06:18 +09:00
David Zhao
4f09141718
remove extra bool
2019-05-29 12:22:34 +09:00
Dean Herbert
a20eda7b5f
Fix remaining cases to work without things
2019-05-28 23:54:42 +09:00
David Zhao
1a871af552
Fix hide selection, add test
2019-05-28 19:15:29 +09:00
Dean Herbert
4ca34bd5e8
Update osu! in line with audio subsystem refactor
2019-05-28 17:06:01 +09:00
David Zhao
e59a00ac6e
Remove excessive selection updating
2019-05-28 14:04:33 +09:00
Lucas A
a819dd764f
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-25 11:02:19 +02:00
Dean Herbert
e93fea7dc3
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-05-18 19:20:44 +09:00
Dan Balasescu
553d786b94
Merge branch 'master' into fix-logo-tracking-crash
2019-05-17 19:23:14 +09:00
David Zhao
b7aed0a014
Interpolate to tracking position on from Initial button state
2019-05-17 12:21:34 +09:00
David Zhao
fcffad6553
Merge remote-tracking branch 'upstream/master' into buttonsystem-entermode
2019-05-17 11:35:35 +09:00
David Zhao
5bf513eba8
Don't track immediately when entering mode
2019-05-17 11:24:34 +09:00
Dean Herbert
359e5b71a5
Fix race condition causing player to never restart
2019-05-16 17:13:03 +09:00
Dean Herbert
958598d13b
Fix crash on switching from main menu to gameplay too fast
2019-05-15 19:39:36 +09:00
Dean Herbert
7b56180b8b
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-05-15 12:08:23 +09:00
Lucas A
2d966682dc
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-14 18:09:58 +02:00
Dean Herbert
4b508915f6
Centralise caching of components at OsuGame level
2019-05-13 17:10:25 +09:00
Lucas A
55663b3576
Nest all UserActivities into UserActivity
2019-05-12 17:38:02 +02:00
Lucas A
5ac6bd8204
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-12 11:53:30 +02:00
Dean Herbert
038e49701e
Move conditional to within BreakPeriod
2019-05-12 16:25:25 +09:00
Dean Herbert
1391aa342c
Merge branch 'master' into break-pause
2019-05-12 16:15:24 +09:00
Dean Herbert
3566da73cc
Merge branch 'master' into fix-more-pause-cases
2019-05-12 15:57:45 +09:00
Dean Herbert
9add2562f9
Close beatmap options when suspending ( #4761 )
...
Close beatmap options when suspending
2019-05-12 15:50:10 +09:00
Dean Herbert
790700d8bf
Use more correct calculation
2019-05-12 15:40:58 +09:00
Joehu
175daac16a
Close beatmap options when suspending
2019-05-11 21:26:42 -07:00
Joehu
29cec54b3c
Fix beatmap carousel overlapping beatmap info wedge
2019-05-11 20:08:45 -07:00
smoogipoo
bde2d552b6
Merge remote-tracking branch 'origin/master' into fix-more-pause-cases
...
# Conflicts:
# osu.Game.Tests/Visual/Gameplay/TestCasePause.cs
2019-05-10 22:16:59 +09:00
smoogipoo
01eb1a34a9
Remove unused variable
2019-05-10 22:15:33 +09:00
smoogipoo
d2479acbf2
Fix incorrect value being clamped
2019-05-10 18:04:58 +09:00
Dean Herbert
fdf67aaa11
Clamp values
2019-05-10 17:18:39 +09:00
smoogipoo
6a957ad27f
Fix pause triggered when already paused
2019-05-10 15:51:12 +09:00
smoogipoo
7c105fd99f
Fix testcase players pausing on window unfocus
2019-05-10 15:39:25 +09:00
Dean Herbert
9248e6290c
Use FrameStabilityClock to denote current position on song progress
2019-05-09 18:09:26 +09:00
Dean Herbert
5942072128
Add a tween when clicking to seek
2019-05-09 18:07:38 +09:00
Dan Balasescu
22940373a0
Merge branch 'master' into zoomablescrollcontainer-fix
2019-05-09 13:54:21 +09:00
smoogipoo
5c6b4d923f
Reorder methods
2019-05-09 13:53:53 +09:00
David Zhao
d625f3c104
Private method
2019-05-09 13:21:01 +09:00
Dean Herbert
9457a6128e
Fix game pausing when made inactive while watching a replay
2019-05-09 10:57:55 +09:00
Dean Herbert
4f697e2bd5
Add licence header
2019-05-08 19:35:20 +09:00
Dean Herbert
6dea16f365
Move action and hotkey specification local
2019-05-08 19:29:43 +09:00
Dean Herbert
c91b9c6032
Add missing button
2019-05-08 19:27:53 +09:00
Dean Herbert
772eb460fb
Move button definitions to their respective classes
2019-05-08 19:03:26 +09:00
Dean Herbert
0693290ad4
Merge remote-tracking branch 'upstream/master' into refactor-select-footer
2019-05-08 18:43:21 +09:00
Dean Herbert
b33372ca62
Don't expand mods in button on hover
2019-05-08 18:43:15 +09:00
Dean Herbert
8906eb874a
Fix CI issues
2019-05-08 18:43:06 +09:00
Dean Herbert
9a9ac05cd9
Fix post-merge issues
2019-05-08 18:42:54 +09:00
Dean Herbert
bace829629
Add ability to avoid expand animation in ModDisplay
2019-05-08 18:42:26 +09:00
David Zhao
ff3c226596
Give ZoomableScrollContainer an initial width
2019-05-08 13:37:03 +09:00
Lucas A
a5f758b977
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-07 18:27:14 +02:00
Lucas A
3ecfa9dcdb
Invert partialy activity logic introduced in latest commit
2019-05-07 18:26:34 +02:00
Dan Balasescu
288b3deb94
Merge branch 'master' into fix-rank-display
2019-05-07 15:00:51 +09:00
Dean Herbert
8bc313fb33
Merge branch 'master' into fix-new-inspections
2019-05-07 14:14:40 +09:00
Dean Herbert
c878d814f6
Merge branch 'master' into pause-via-inactive
2019-05-07 13:35:23 +09:00
Dean Herbert
f7a570d67a
Fix double confirmation
2019-05-07 13:34:06 +09:00
smoogipoo
d7c09e7dbd
Merge remote-tracking branch 'origin/master' into fix-new-inspections
...
# Conflicts:
# osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs
# osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs
# osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs
# osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs
# osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs
# osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs
# osu.Game/Graphics/OsuFont.cs
# osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs
# osu.Game/Overlays/Profile/Header/BadgeContainer.cs
# osu.Game/Overlays/Profile/ProfileHeader.cs
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/Skinning/LegacySkinDecoder.cs
2019-05-07 13:20:17 +09:00
Dan Balasescu
a1c64d8d26
Merge branch 'master' into fix-retry-sound
2019-05-07 12:40:01 +09:00
Dan Balasescu
8b9cfadd64
Merge branch 'master' into fix-retry-sound
2019-05-07 12:37:22 +09:00
smoogipoo
f26a1cff6c
Fix beatmap import crashing during room creation
2019-05-07 12:14:57 +09:00
Lucas A
e7afaeaa4d
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-06 18:39:58 +02:00
Lucas A
59b8da5c77
Move OsuScreen activity logic to setUserActivity()
2019-05-06 18:37:21 +02:00
Lucas A
a50bbf7f42
Make appveyor happy.
2019-05-05 21:32:23 +02:00
Lucas A
d5d31282e5
Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes
2019-05-05 20:55:42 +02:00
Lucas A
88b8afbb6a
Make UserPanel show current user activity when
...
user status is online.
2019-05-05 20:51:55 +02:00
Lucas A
fa986bb5e9
Rework OsuScreen user activity logic
2019-05-05 20:26:56 +02:00
Dean Herbert
7fdc79dd68
Improve skip boundary logic to be closer to expectations
...
Supersedes #4693 .
Closes #4676 .
2019-05-05 20:20:41 +09:00
Dean Herbert
3e3f12f277
Use more local bindables
2019-05-04 17:53:17 +09:00
Dean Herbert
b9a39fb788
Fix instant pausing when game becomes inactive
...
Resolves #4685 .
2019-05-04 14:54:29 +09:00
Dean Herbert
41ab82cdc3
Merge branch 'master' into refactor-select-footer
2019-05-03 21:46:41 +09:00
LeNitrous
31341bfeb1
use SongSelect's SelectedMods property to ensure it exists
2019-05-03 16:51:33 +08:00
LeNitrous
009eaa647a
fixes to FooterButtonRandom
2019-05-03 16:38:15 +08:00
Dean Herbert
6bdaca1e3b
Fix mod equality checks not working as intended
2019-05-03 10:09:47 +09:00
Lucas A
a4a2ce5ec0
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-05-02 21:36:28 +02:00
Lucas A
5d4aa5a12e
Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus
2019-05-02 20:51:19 +02:00
Lucas A
84b41b3886
Split out setUserStatus() logic to multiple lines. +
...
Make UserStatusDoNotDisturb inherit from UserStatus
2019-05-02 19:44:07 +02:00
Lucas A
a3541339f5
Handle the restoring of the screen status when the user status is changed back to online after having being set to DND / offline via the login overlay
2019-04-30 21:40:44 +02:00
iiSaLMaN
3b03ca802a
Merge branch 'master' into sh-xh-grading-2
2019-04-30 18:55:35 +03:00
Lucas A
7e42068a14
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-04-28 19:48:35 +02:00
Dean Herbert
5a9277ec0e
Merge branch 'master' into fix-retry-sound
2019-04-28 23:38:14 +09:00
Dean Herbert
fa340a9eff
Merge branch 'master' into profile-header-update
2019-04-27 23:48:23 +09:00
Dean Herbert
db75516e79
Merge branch 'master' into fix-lead-in-issues
2019-04-27 21:01:21 +09:00
Dean Herbert
d40177f97c
Merge branch 'master' into drawnode-composability
2019-04-27 18:41:19 +09:00
iiSaLMaN
b08fb5136e
Merge branch 'master' into sh-xh-grading-2
2019-04-26 10:38:10 +03:00
Dean Herbert
a680a38e81
Merge pull request #4675 from nyquillerium/playerloader-tracking
...
Prevent PlayerLoader from tracking the logo after it has been exited.
2019-04-26 13:21:13 +09:00
KingLuigi4932
4e0f21102b
Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2
2019-04-25 14:04:12 +03:00
KingLuigi4932
c6b3197dd0
Add AdjustRank and use it in Hidden Mod
2019-04-25 13:56:57 +03:00
smoogipoo
3b0d4c1bad
Merge branch 'turn-on-warnings' into profile-header-update
2019-04-25 17:43:10 +09:00
smoogipoo
0bd35ab7bb
Turn on warnings, resolve issues
2019-04-25 17:36:17 +09:00
Dean Herbert
6fdcd98caa
Don't play screen "back" sample when retrying
2019-04-25 14:15:07 +09:00
Dan Balasescu
b911322c92
Merge branch 'master' into fix-lead-in-issues
2019-04-25 12:34:29 +09:00
Dan Balasescu
9fa8f62077
Merge branch 'master' into update-framework
2019-04-25 12:25:17 +09:00
David Zhao
8222923ab8
Only track logo if we're still the current screen
2019-04-24 16:20:51 +09:00
Dean Herbert
bb69330e9f
Call ProcessFrame on the userOffsetClock after a seek
...
Without doing this, GameplayClock can be left in an incorrect state after a seek (due to the userOffsetClock being its own FramedClock).
2019-04-24 15:28:14 +09:00
Dean Herbert
efaedafc08
Fix (legacy) AudioLeadIn being used incorrectly.
...
This lead-in is intended to specify a value before zero, not a value before the start time.
Also removes an unnecessary ProcessFrame call (it happens within Seek itself).
2019-04-24 15:28:14 +09:00
Joehu
0838206ddd
Shorten multiplayer header to multi
2019-04-22 22:44:43 -07:00
Dan Balasescu
0bf17081f6
Merge branch 'master' into update-framework
2019-04-23 11:31:17 +09:00
Dean Herbert
c88a11a38f
Merge branch 'master' into fix-multiplayer-crash
2019-04-23 09:28:03 +09:00
smoogipoo
414d555484
Fix possible exit from non-current screen
2019-04-22 19:24:57 +09:00
Dean Herbert
5fe45c9bed
Merge branch 'master' into update-framework
2019-04-22 19:17:14 +09:00
Dan Balasescu
8fc0bf24c7
Merge branch 'master' into fix-hold-for-menu-icon
2019-04-22 18:57:43 +09:00
Dean Herbert
48e82d4b1c
Fix hold for menu button's icon being incorrect
2019-04-22 18:47:28 +09:00
Dean Herbert
6856571f17
Fix incorrect seek target
2019-04-22 18:45:58 +09:00
Dean Herbert
55c5ef898d
Remove delay on entering player
2019-04-22 18:29:58 +09:00
Dean Herbert
908eee9942
Fix pause tests
2019-04-22 18:29:51 +09:00
Dean Herbert
b3c496d72c
Remove delay on entering player
2019-04-22 17:06:40 +09:00
Dean Herbert
034643b835
Fix pause tests
2019-04-22 17:06:22 +09:00
Dean Herbert
6f2bc943eb
Fix rank display on break info display
2019-04-21 12:04:15 +08:00
Lucas A
fe8c705f1b
Merge remote-tracking branch 'upstream/master' into user-status-wiring
2019-04-20 09:42:32 +02:00
David Zhao
6502e26d09
Add draw size invalidation to ZoomableScrollContainer
2019-04-19 16:21:15 +09:00
Dean Herbert
2d7b3094ba
Merge branch 'master' into player-mod-reinstantiation
2019-04-17 16:42:57 +08:00
smoogipoo
12b6bc48bd
Use .With() wherever possible
2019-04-17 17:24:09 +09:00
smoogipoo
09568be270
Merge remote-tracking branch 'origin/master' into facade-container
...
# Conflicts:
# osu.Game/Screens/Play/PlayerLoader.cs
2019-04-17 17:17:33 +09:00
smoogipoo
897bfa60db
Fix tracking position during 150ms state change delay
2019-04-17 17:05:35 +09:00
smoogipoo
5a3d6a0258
Fix post-merge errors
2019-04-17 16:11:59 +09:00
Dean Herbert
bb539af1a0
Merge branch 'master' into player-mod-reinstantiation
2019-04-16 22:35:21 +08:00
Lucas A
5887008fb3
Merge branch 'master' into user-status-wiring
2019-04-15 11:43:53 +02:00
LeNitrous
2d227d25cc
fix appveyor warnings
2019-04-14 07:55:15 +08:00
LeNitrous
91c327a90f
use ModDisplay
2019-04-14 07:22:31 +08:00
DrabWeb
c766631ad6
Check for breaks using GameplayClock time.
2019-04-13 11:39:22 -03:00
Lucas A
361c0ec9f2
Allow UserStatusSoloGame to provide metadata such as the ruleset the current beatmap is played in
2019-04-13 13:18:44 +02:00
Lucas A
da5d6cb1d4
Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap
2019-04-12 22:54:35 +02:00
Lucas A
69dda0ffd4
OsuScreens can now set a per screen user status
...
which defaults to UserStatusOnline
2019-04-12 22:36:01 +02:00
LeNitrous
01cc78108c
add random button
2019-04-11 05:47:32 +08:00
LeNitrous
b4d0755818
please appveyor
2019-04-10 22:10:09 +08:00
LeNitrous
22f9339b01
let mods button have selected mod icons
2019-04-10 21:53:13 +08:00
smoogipoo
0222424aef
Make mods IReadOnlyList<Mod> gamewide
...
Prevents potential multiple evaluations of enumerable.
2019-04-10 17:20:36 +09:00
smoogipoo
85d3ff4846
Merge remote-tracking branch 'origin/master' into no-workingbeatmap-mods
...
# Conflicts:
# osu.Game/Screens/Play/GameplayClockContainer.cs
2019-04-10 12:06:51 +09:00
smoogipoo
4310f07a5c
Rename SelectedMods -> Mods
2019-04-10 12:03:57 +09:00
jorolf
c1db635933
Merge branch 'master' of git://github.com/ppy/osu into profile-header-update
2019-04-09 20:42:39 +02:00
Dan Balasescu
3073508a23
Merge branch 'master' into fix-offset-seek-handling
2019-04-09 15:40:48 +09:00
smoogipoo
4c571acd67
Reinstantiate mods for every player
2019-04-09 13:33:16 +09:00
smoogipoo
56496d28ba
Reset mods when exiting match
2019-04-09 12:59:32 +09:00
smoogipoo
cbb3fdaca8
Fix various crashes due to bindable being disabled
2019-04-09 12:59:32 +09:00
smoogipoo
ad124bfeec
Reimplement select mod track adjustments
2019-04-09 12:59:32 +09:00
smoogipoo
c584967eb1
Remove mods from workingbeatmap
2019-04-09 12:59:32 +09:00
smoogipoo
ca9f172a96
Use var
2019-04-09 12:58:10 +09:00
smoogipoo
93b6cc00df
Fix OsuScreenDependencies using the incorrect parent
2019-04-09 12:56:23 +09:00
smoogipoo
772bef91fa
Merge remote-tracking branch 'Joehuu/master' into drawnode-composability
...
# Conflicts:
# osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs
2019-04-08 23:01:12 +09:00
David Zhao
8a01995668
Remove need for tracking bool and backing logo
2019-04-08 16:14:41 +09:00
David Zhao
a690302d00
Apply reviews
2019-04-08 15:24:09 +09:00
DrabWeb
e76897d6a7
Fix ResumeContainers appearing when resuming during breaks.
2019-04-07 16:32:55 -03:00
Lucas A
e948b11756
Merge branch 'master' into invert-login-notification-depth
2019-04-07 14:03:01 +02:00
Ferdinand Bachmann
d431ca4efc
BeatmapLeaderboard: use OrderByDescending instead of negation
...
(suggested by peppy)
2019-04-07 13:26:35 +02:00
Lucas A
3f2e6a9376
Allow loginOverlay to be null if there's no cached instance in DI (for testing cases)
2019-04-06 18:52:30 +02:00
Lucas A
394f14965b
Make appveyor happy with whitespaces
2019-04-06 18:23:56 +02:00
Lucas A
59410dbe3b
Open login overlay when notification asking for signing in to play multi is clicked
2019-04-06 18:05:13 +02:00
theFerdi265
cb3532e7d4
BeatmapLeaderboard: fix local scores not being sorted
2019-04-06 00:53:02 +02:00
Dean Herbert
46ecaf3d6c
Merge branch 'master' into facade-container
2019-04-05 21:14:21 +09:00
Dean Herbert
f93504c65a
Merge branch 'master' into button_fix
2019-04-05 20:47:08 +09:00
Dean Herbert
88445647c8
Merge branch 'master' into update-beatmap-scores-design
2019-04-05 18:27:30 +09:00
David Zhao
0208526837
Fix button system visual issue
2019-04-05 18:21:54 +09:00
smoogipoo
15fbb6f176
Use common AddUserLink method
2019-04-05 14:15:36 +09:00
David Zhao
b1d74e57e5
Add checks guarding against setting tracking on multiple trackingcongtainers and setting facade size
2019-04-05 13:56:08 +09:00
David Zhao
7047f305a1
Apply reviews, add safety for multiple facades
2019-04-05 12:02:47 +09:00
David Zhao
b2857384b8
Remove unnecessary logo assignment
2019-04-04 12:08:05 +09:00
David Zhao
15b2b6af7d
Clean up remaining assignments of logo relativePositionAxes
2019-04-04 11:28:36 +09:00
jorolf
ccc804a9b2
get everything working again
2019-04-04 00:24:42 +02:00
Samuel Van Allen
bb516da5b6
Removed redundant empty argument list
2019-04-03 22:57:05 +08:00
Samuel Van Allen
3660924441
Trimmed whitespace
2019-04-03 22:40:20 +08:00
Samuel Van Allen
4d60f6fb6a
Use collection initializer and added missing blank line
2019-04-03 22:37:50 +08:00
Samuel Van Allen
73c7c6c316
Hides "Details" button when OnlineBeatmapID is null
2019-04-03 21:44:36 +08:00
David Zhao
8a40b27e8f
Remove need for logo relativePositionAxes none
2019-04-03 20:32:53 +09:00
David Zhao
2ed945605e
Fix Axes.None requirement for FacadeContainer
2019-04-03 19:57:22 +09:00
Dean Herbert
efd7bea771
Add further xmldoc
2019-04-03 17:01:11 +09:00
Dean Herbert
50f8ab3dfb
Fix gameplay offset handling on seeks
2019-04-03 16:58:20 +09:00
Dean Herbert
1ef2a4c46f
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-04-03 16:23:33 +09:00
Dean Herbert
f1952c0816
Update font awesome usage
2019-04-02 19:55:24 +09:00
smoogipoo
a56e29347f
Adjust namespaces
2019-04-02 14:51:28 +09:00
smoogipoo
d8af5e1c5a
Update in-line with drawnode changes
2019-04-02 11:56:22 +09:00
David Zhao
020be50f03
Merge remote-tracking branch 'upstream/master' into facade-container
2019-04-02 11:28:44 +09:00
Dean Herbert
184403c7e1
Merge branch 'master' into resume-cursor-2
2019-04-01 14:24:00 +09:00
Dean Herbert
2b3c70b2d2
Refactor with constants and better method names
2019-04-01 13:13:56 +09:00
Dean Herbert
c39c37a18d
Apply more missed cases
2019-04-01 12:44:46 +09:00
Dean Herbert
612db31c38
Apply newline additions
2019-04-01 12:16:32 +09:00
LeNitrous
698e38c4e0
make menu flashes and visualisation colourable by skin
2019-03-31 20:10:44 +08:00
David Zhao
952a12bb19
Return logo relativepositionaxes on content out
2019-03-29 16:54:34 +09:00
Dean Herbert
81585a8283
Merge branch 'master' into resume-cursor-2
2019-03-29 15:56:46 +09:00
Dean Herbert
4225d41a84
Merge pull request #4443 from jorolf/screen-title-class
...
Add ScreenTitle class
Co-authored-by: Dean Herbert <pe@ppy.sh>
2019-03-29 15:02:38 +09:00
Dean Herbert
6949c233bf
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-29 15:02:12 +09:00
Dean Herbert
de47e0a8e8
Merge remote-tracking branch 'upstream/master' into screen-title-class
2019-03-29 14:01:08 +09:00
Dean Herbert
202a0086cc
Merge branch 'master' into better-player-flags
2019-03-29 13:45:45 +09:00
Dean Herbert
d6f8dbfd5c
Merge branch 'master' into wedge-fix
2019-03-29 12:23:42 +09:00
Dean Herbert
fed58fba3a
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-29 12:14:28 +09:00
Dean Herbert
26a73b4a65
Merge branch 'master' into correct-preview-loop
2019-03-29 12:00:58 +09:00
Dan Balasescu
d410054ec8
Merge branch 'master' into key-counter-display
2019-03-29 11:22:59 +09:00
Dean Herbert
7715606188
Merge branch 'master' into sprite-icon-compatibility
2019-03-29 11:15:34 +09:00
Dan Balasescu
7ab24e35f9
Merge branch 'master' into gameplay-paused-no-update
2019-03-29 10:53:32 +09:00
Dean Herbert
759c5b3db9
Restore previous resume behaviour for the time being
2019-03-29 10:52:26 +09:00
Dean Herbert
3b1f83da1d
Merge remote-tracking branch 'upstream/master' into correct-preview-loop
2019-03-29 10:31:15 +09:00
Dean Herbert
2f5668f4e7
Fix remaining framework changes
2019-03-29 00:29:14 +09:00
David Zhao
f066bd1138
Adjust facade scale now that the size is different
2019-03-28 16:35:15 +09:00
David Zhao
9d66a5e4b2
Ensure logo stops tracking before suspend animation
2019-03-28 16:29:35 +09:00
David Zhao
039e451ab1
ensure logo is where it already needs to be on resume
2019-03-28 16:14:28 +09:00
David Zhao
bfe44eb33d
Remove SizeForFlow magic number
2019-03-28 15:40:58 +09:00
David Zhao
9b047d9b90
Add back menu logo transform
2019-03-28 12:00:50 +09:00
Dean Herbert
253b18b92f
Merge remote-tracking branch 'upstream/master' into better-player-flags
2019-03-28 11:18:54 +09:00
Dean Herbert
5c4f2cefea
Fix Loader and TestCaseLoaderAnimation
2019-03-27 22:28:25 +09:00
David Zhao
061527a260
Add new automated tests for logofacade, reset interpolation
2019-03-27 20:04:01 +09:00
Dean Herbert
de80fc0eac
Update icon usage to match framework changes
2019-03-27 19:29:27 +09:00
Unknown
fea6adbf54
fix wedge bleeding into other elements (and being misaligned)
2019-03-27 10:12:09 +01:00
David Zhao
2e3791be1c
Fix incorrect usage of LogoFacade
2019-03-27 18:11:12 +09:00
David Zhao
ca7a20585d
Apply reviews, delete playerloader test
2019-03-27 17:28:53 +09:00
David Zhao
efeed71517
Add comment
2019-03-27 11:37:16 +09:00
David Zhao
384eee3395
Remove DI requirement for the Facade in PlayerLoader
2019-03-27 11:32:26 +09:00
David Zhao
3fe52be77f
Better tests, add documentation
2019-03-26 17:22:36 +09:00
Dean Herbert
a88f23e555
Convert remaining two flags to ctor parameters
2019-03-26 16:53:44 +09:00
Dean Herbert
83863d35c3
Remove AllowLeadIn flag
2019-03-26 16:35:00 +09:00
Dean Herbert
8658de5108
Rename KeyCounterCollection -> KeyCounterDisplay
...
Also fix not working
2019-03-26 13:52:48 +09:00
Dean Herbert
b4d785c76c
Don't update gameplay loop while paused
2019-03-26 13:36:17 +09:00
Dean Herbert
e512d88899
Apply required refactor
2019-03-26 13:29:26 +09:00
Dean Herbert
256a579de0
Allow player to not pause on focus loss
2019-03-26 13:17:00 +09:00
Dean Herbert
4c0121a112
Merge remote-tracking branch 'upstream/master' into resume-cursor-2
2019-03-26 11:31:23 +09:00
Dean Herbert
b75ea295db
Rename KeyCounterCollection -> KeyCounterDisplay
...
Also fix not working
2019-03-26 11:28:43 +09:00
David Zhao
35bf262d19
Merge remote-tracking branch 'upstream/master' into facade-container
2019-03-26 11:11:13 +09:00
David Zhao
a0f6718145
Better tests and implementation
2019-03-26 10:48:29 +09:00
Dean Herbert
15aea7f745
Update framework
2019-03-25 21:50:28 +09:00
Dean Herbert
245f463e3f
Don't update gameplay loop while paused
2019-03-25 20:31:55 +09:00
Dean Herbert
8ad4009c33
osu! resume overlay
2019-03-25 20:31:55 +09:00
Dean Herbert
9a6576c0a1
Merge remote-tracking branch 'upstream/master' into multi-background-stack
2019-03-25 12:40:31 +09:00
Dean Herbert
371166955e
Apply a few minor refactors
2019-03-25 12:39:40 +09:00
David Zhao
5169f7a43c
Change default for null screen parallax, apply reviews
2019-03-24 16:21:43 +09:00
David Zhao
d37968d88d
Add better test for facade containers
2019-03-24 15:18:38 +09:00
Dean Herbert
11b474e194
Handle released for safety
2019-03-24 12:19:09 +09:00
Dean Herbert
0d72104235
Refactor for formatting sanity
2019-03-24 12:03:06 +09:00
Dean Herbert
8ad19fc2d4
Merge branch 'master' into menu-globalaction-select
2019-03-24 11:58:52 +09:00
Dean Herbert
9a11a08acc
Update textbox usages
2019-03-23 02:00:27 +09:00
David Zhao
6e98a8dd7c
Initial implementation
2019-03-22 20:01:58 +09:00
David Zhao
e93311fdc9
DI facade
2019-03-22 19:01:32 +09:00
Dean Herbert
db89796752
Merge remote-tracking branch 'upstream/master' into multi-background-stack
2019-03-22 16:05:39 +09:00
Dan Balasescu
b4954c5a7f
Merge branch 'master' into pause-logic-simplification
2019-03-22 15:11:34 +09:00
Dean Herbert
9e6cdd7bd5
Combine conditionals and clarify comment
2019-03-22 14:42:51 +09:00
Dean Herbert
5b8fd6822e
Move storyboard logic region down
2019-03-22 14:39:20 +09:00
Dan Balasescu
5de99f3f5b
Merge branch 'master' into fix-random-select-crash
2019-03-22 14:11:06 +09:00
David Zhao
dcae86e39a
Add a new test for OsuScreenStack, fix parallax
2019-03-22 14:10:38 +09:00
jorolf
7873022a8b
Merge branch 'master' of git://github.com/ppy/osu into screen-title-class
2019-03-21 22:18:59 +01:00
jorolf
454c82c49e
Don't go outside of the container bounds
2019-03-21 22:18:45 +01:00
Dean Herbert
37010f97d7
Fix random select crashing
...
Closes #3383 .
2019-03-21 21:02:54 +09:00
Dean Herbert
a10e43410a
Fix song select potentially starting play before the carousel (and bindables) have been initialised
2019-03-21 20:52:34 +09:00
Dean Herbert
4789aa81cb
Add an explicit flag for tracking song select's bindable binding
...
Not required (this change does not affect logic) but improves clarity.
2019-03-21 20:52:15 +09:00
Dean Herbert
96dba6a20d
Move nested method to bottom of class
2019-03-21 20:51:21 +09:00
Dean Herbert
e2503888a4
Expose carousel's loaded flag
2019-03-21 20:51:06 +09:00
Dean Herbert
15f9a6b9df
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
2019-03-21 16:04:18 +09:00
David Zhao
ee0d7b6c6d
Merge remote-tracking branch 'upstream/master' into multi-background-stack
2019-03-21 15:35:14 +09:00
Dean Herbert
67a65b80fc
Merge branch 'master' into visual-settings-container
2019-03-20 20:48:30 +09:00
Dean Herbert
ba89bfee0c
Define explicit method to add background
...
Also cleans up some redundant/misplaced comments.
2019-03-20 20:16:45 +09:00
Dean Herbert
8865d53992
Reword comment
2019-03-20 20:04:07 +09:00
David Zhao
2e9d823af4
Add comment regarding HandlePositionalInput
2019-03-20 19:59:54 +09:00
David Zhao
2ff7aa6c2e
Remove handle positional input
2019-03-20 19:49:37 +09:00
David Zhao
bc6e8ce7b4
Merge branch 'visual-settings-container' of https://github.com/nyquillerium/osu into visual-settings-container
2019-03-20 19:48:57 +09:00
Dean Herbert
01f795b046
Make restart public rather than reimplementing
2019-03-20 19:45:04 +09:00
David Zhao
8543e8c36f
Put loadcomplete next to other protected overrides
2019-03-20 19:42:39 +09:00
Dean Herbert
cda5bc28c8
Add proper comment
2019-03-20 19:41:20 +09:00
David Zhao
9013afe412
Query for input manager once
2019-03-20 19:35:40 +09:00
Dean Herbert
acbcca4462
Merge branch 'master' into multi-background-stack
2019-03-20 19:11:27 +09:00
David Zhao
fbfef844de
Add test case for resuming PlayerLoader
2019-03-20 17:18:42 +09:00
David Zhao
a5916f995e
Use the previous conditional instead
2019-03-20 16:54:42 +09:00
David Zhao
e9034c8a30
Move blurring logic into Update instead
2019-03-20 16:50:47 +09:00
Dean Herbert
f43e7a880c
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
2019-03-20 15:27:06 +09:00
David Zhao
1086688e0a
Fix variable hiding
2019-03-20 15:13:59 +09:00
Dean Herbert
6f1610be79
Merge branch 'master' into ruleset-container-refactor
2019-03-20 14:55:58 +09:00
David Zhao
86658e357b
Override add instead
2019-03-20 14:55:52 +09:00
Dean Herbert
5f288650bf
Fix misses/typos
2019-03-20 14:49:33 +09:00
David Zhao
9964644683
Fix merge
2019-03-20 14:37:32 +09:00
David Zhao
2646126d86
Merge remote-tracking branch 'upstream/master' into visual-settings-container
2019-03-20 14:29:20 +09:00
David Zhao
15637f9c4a
Rework instant blur logic such that updateVisuals doesn't need to be public
2019-03-20 14:17:35 +09:00
Dean Herbert
e59917ed03
Merge remote-tracking branch 'upstream/master' into correct-preview-loop
2019-03-20 10:58:15 +09:00
Dean Herbert
7b65d3437f
Merge branch 'master' into fix-background-loading
2019-03-20 10:33:53 +09:00
Dean Herbert
5b6ac7abdc
Merge remote-tracking branch 'upstream/master' into pause-logic-simplification
2019-03-20 10:31:42 +09:00
Dean Herbert
baea7230bc
Rename RulesetContainer to DrawableRuleset
2019-03-19 23:47:31 +09:00
Dean Herbert
68f28326a2
Refactor RulesetContainer for readability
2019-03-19 20:21:31 +09:00
David Zhao
a1000524ee
Merge branch 'master' into visual-settings-container
2019-03-19 20:17:12 +09:00
David Zhao
a8e2072286
Make blurtarget private, improve documentation
2019-03-19 20:15:28 +09:00
Dean Herbert
e36ad3eb6b
Add initial alpha in case
2019-03-19 16:11:22 +09:00
Dean Herbert
d2007cfb38
Fix weird transition
2019-03-19 16:10:28 +09:00
Dean Herbert
83f3d3abde
Merge remote-tracking branch 'upstream/master' into disclaimer-support-text
2019-03-19 16:02:34 +09:00
David Zhao
dc26e90a8d
Remove unused usings
2019-03-19 13:16:06 +09:00
David Zhao
df37973e84
Move showstoryboard into player
2019-03-19 13:13:19 +09:00
David Zhao
27a92e017c
rename back to UserDimContainer
2019-03-19 13:06:14 +09:00
David Zhao
f1b2073bf6
Merge remote-tracking branch 'upstream/master' into visual-settings-container
2019-03-19 13:01:05 +09:00
Dean Herbert
4f075f4740
Add more comprehensive testing
2019-03-18 20:33:43 +09:00
Dean Herbert
9433a97747
Add resume requesting support and fix exit scenarios
2019-03-18 20:33:43 +09:00
Dean Herbert
536b5e0dab
Remove PausableGameplayContainer
2019-03-18 20:33:43 +09:00
Dean Herbert
f13003c53b
Simplify and localise storyboard logic in Player.cs
2019-03-18 20:33:43 +09:00
Dean Herbert
bcaff9f7b4
Add basic pause tests
2019-03-18 20:33:43 +09:00
Dean Herbert
465c95e952
Refactor pause logic so GameplayClockContainer is in control
2019-03-18 20:33:43 +09:00
Dean Herbert
14df9f94e2
Merge branch 'master' into fix-background-loading
2019-03-18 14:59:35 +09:00
David Zhao
eac7672c6b
Clean up debug logging
2019-03-18 14:03:54 +09:00
Dean Herbert
392a0a1d74
Merge branch 'master' into update-framework
2019-03-18 11:34:59 +09:00
Dan Balasescu
e0b3149e32
Merge branch 'master' into api-testability
2019-03-18 10:59:06 +09:00
Dean Herbert
300cb70859
Merge branch 'master' into multi-background-stack
2019-03-18 09:54:27 +09:00
Dean Herbert
c496f6e56b
Fix usages of OnLoadComplete
2019-03-17 13:44:20 +09:00
Dean Herbert
36e5c09710
Merge pull request #4433 from nekodex/prevent-null-lookup
...
Don't perform lookup of beatmap stats unless an online id is present
2019-03-15 10:39:39 +09:00
David Zhao
8fc90bb9a0
Remove unused usings
2019-03-14 16:26:34 +09:00
David Zhao
8cdfb1fd61
Remove BlurrableBackgroundScreen, rework tests
2019-03-14 16:09:17 +09:00
David Zhao
8714902349
Handle all blurring directly from background
2019-03-14 14:02:46 +09:00
Jamie Taylor
69eb4ef983
Change updateMetrics parameter to be optional
2019-03-14 13:35:49 +09:00
Dean Herbert
0042cc5337
Merge branch 'master' into mod-ramp-hotfix
2019-03-14 13:02:29 +09:00
Dean Herbert
dd6fbccb56
Slight refactoring of order for readability
2019-03-13 19:57:45 +09:00
David Zhao
de6d8fc637
Move user blurring into VIsualSettingsContainer
2019-03-13 18:25:22 +09:00
Jamie Taylor
7a2af5634c
Merge remote-tracking branch 'upstream/master' into prevent-null-lookup
2019-03-13 14:13:50 +09:00
Jamie Taylor
e6449db8e3
Null metrics on null beatmap for transition animation
2019-03-13 14:13:42 +09:00
Dean Herbert
b1f18481e0
Show text to supporters telling them they're cool
...
Also adds better tests for disclaimer screen.
2019-03-13 12:58:42 +09:00
Dean Herbert
f0114d776d
Use interface to access API
...
Allows for better testability.
2019-03-13 12:58:18 +09:00
Dean Herbert
c1a356161f
Allow use rate adjust to fallback to clock rate adjust
2019-03-12 18:14:01 +09:00
David Zhao
e6a55cd674
Fix TestCaseEditor as well
2019-03-12 17:45:16 +09:00
Dean Herbert
3c2d8cad0a
Add better async logic for ScreenWithBeatmapBackground
2019-03-12 17:32:40 +09:00
Dean Herbert
8230d5b52e
Ensure initial blur is set on song select background creation
...
We do not want the blur transition to play here
2019-03-12 17:27:20 +09:00
Dean Herbert
ee7169a629
Use new non-immediate suspend logic in BackgroundScreenStack
2019-03-12 17:26:16 +09:00
David Zhao
e3567a5507
Make OsuGame use OsuScreenStack too
2019-03-12 16:03:25 +09:00
Dean Herbert
00feb34a3d
Perform load even if default beatmap
2019-03-12 14:02:49 +09:00
Dean Herbert
1954eaca4c
Populate an initial beatmap
2019-03-12 14:01:27 +09:00
Dean Herbert
cc41618760
Reorganise class
2019-03-12 12:56:01 +09:00
Dean Herbert
5ba8388e54
Add load check to avoid double-loading
2019-03-12 12:55:54 +09:00
Dean Herbert
cdeaa80fea
Call ResetSpeedAdjustments before adjusting clock
2019-03-12 11:35:25 +09:00
jorolf
f91e4a1fdd
make ScreenTitle abstract and properties protected
2019-03-11 19:10:37 +01:00
Dean Herbert
13b3036ec6
Fix "wind" mods adjusting rate twice
...
This is a hotfix for incorrect framework behaviour.
Closes #4442
2019-03-12 02:45:45 +09:00
jorolf
f3ab5070b9
apply suggestions
2019-03-11 18:37:36 +01:00
Dean Herbert
1be4c7b813
Fix excess newline
2019-03-12 02:23:23 +09:00
Dean Herbert
38e75421ab
Fix HoldForMenuButton getting stuck in a confirming state
...
Closes #4446 .
2019-03-12 02:21:34 +09:00
Dean Herbert
e9ab329e93
Fix backgrounds not correctly handling initial async load
2019-03-12 00:05:05 +09:00
Dean Herbert
81d9e391f4
Preload main menu background
2019-03-12 00:04:19 +09:00
David Zhao
63b9fa58ef
Cleanup
2019-03-11 19:52:28 +09:00
David Zhao
6a1e600099
Create new OsuScreenStack for use in Multiplayer
2019-03-11 19:48:07 +09:00
David Zhao
aeae6143c1
Remove unnecessary variable
2019-03-11 17:47:03 +09:00
David Zhao
0b64af5e02
Put multiplayer background inside a parallax container
2019-03-11 16:51:43 +09:00
David Zhao
0d95511222
Merge branch 'master' into multi-background-stack
2019-03-11 11:19:08 +09:00
David Zhao
2df57c3a29
Give Multiplayer its own background stack
2019-03-11 11:08:04 +09:00
Joehu
0fc6fa7245
Fix file naming on ParticipantCountDisplay
2019-03-09 20:29:56 -08:00
Dean Herbert
9df27f3a5f
Merge branch 'master' into prevent-null-lookup
2019-03-09 11:14:54 +09:00
jorolf
af1c54d995
add ScreenTitle class
2019-03-08 23:44:01 +01:00
Jamie Taylor
8e5816805c
Fix showing outdated data for non-online beatmaps
2019-03-08 18:44:35 +09:00
smoogipoo
d055b248ac
Remove blank line
2019-03-08 15:56:36 +09:00
smoogipoo
7c5ca67691
Merge remote-tracking branch 'origin/master' into gameplay-clock-container
...
# Conflicts:
# osu.Game/Screens/Play/Player.cs
2019-03-08 15:54:15 +09:00
Dean Herbert
ed8c9bc88a
Merge remote-tracking branch 'upstream/master' into gameplay-clock-container
2019-03-08 15:07:55 +09:00
Dean Herbert
42efea1e06
Apply review
2019-03-08 15:05:45 +09:00
Dean Herbert
3ccc76e18f
Merge remote-tracking branch 'upstream/master' into cursor-in-playfield
2019-03-08 14:50:46 +09:00
Dan Balasescu
969d5bcbd0
Merge branch 'master' into fix-roomstate-on-cancel
2019-03-08 14:10:24 +09:00
Dan Balasescu
d1c18c52ab
Merge branch 'master' into fix-cursor-in-scale-container
2019-03-08 12:43:57 +09:00
Jamie Taylor
08fc42f8e9
Merge branch 'master' into fix-roomstate-on-cancel
2019-03-08 12:39:29 +09:00
Dean Herbert
75e94eba35
Merge branch 'master' into gameplay-clock-container
2019-03-08 12:32:48 +09:00
smoogipoo
04d756524d
Adjust with shader changes
2019-03-07 18:30:18 +09:00
smoogipoo
e430b8a640
Merge remote-tracking branch 'nekodex/master' into drawnode-changes
2019-03-07 18:15:12 +09:00
Jamie Taylor
c34e110a2c
Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel
2019-03-07 17:01:24 +09:00
Jamie Taylor
054db48089
Move online id null check to only bypass metrics lookup
2019-03-07 16:59:43 +09:00
Jamie Taylor
50c1b3a576
Move room resetting logic from MatchSubScreen to LoungeSubScreen
2019-03-07 16:49:48 +09:00
Jamie Taylor
e5e454ddcd
Don't perform lookup of beatmap stats unless an online id is present
2019-03-07 16:17:12 +09:00
Dean Herbert
64b6eaa844
Simplify inward bindings
2019-03-07 16:04:11 +09:00
Dean Herbert
58ef397f4f
Move all clock related gameplay logic inside GameplayClockContainer
2019-03-07 16:02:24 +09:00
Dan Balasescu
7783c33398
Merge branch 'master' into fix-mp-chat-in-own-room
2019-03-07 15:59:53 +09:00
Jamie Taylor
ee076bbbe3
Fix chat channel ids not being updated on room creation
2019-03-07 15:35:57 +09:00
Jamie Taylor
e13516c2ba
Only attempt to restore CurrentItem state if present
2019-03-07 14:09:28 +09:00
Jamie Taylor
6e5ea78ca2
Fix some nullref crashes when escaping out of new room creation
2019-03-06 20:03:37 +09:00
Jamie Taylor
5de6e29294
Reset currentRoom state when cancelling room creation
2019-03-06 20:03:37 +09:00
Dean Herbert
ffe53411f6
Add back cursor proxying
2019-03-06 17:44:58 +09:00
Dean Herbert
acf518c208
Move cursor inside playfield
2019-03-06 17:41:54 +09:00
Dean Herbert
5411c63093
Fix menu cursor not displaying outside of gameplay scaling area
2019-03-06 17:14:08 +09:00
Dean Herbert
b94d080b1c
Merge branch 'master' into LobbyList
2019-03-06 12:34:36 +09:00
Dean Herbert
6b042eae94
Merge branch 'master' into fix-cursor-in-scale-container
2019-03-05 22:22:56 +09:00
Dean Herbert
8a6fa0915e
Merge branch 'master' into simplify-gameplay-clock
2019-03-05 20:22:46 +09:00
Dean Herbert
76ce3954a0
Rename PauseContainer
2019-03-05 19:30:55 +09:00
David Zhao
89987210c3
Merge remote-tracking branch 'upstream/master' into LobbyList
2019-03-05 18:59:38 +09:00
David Zhao
34b2553b95
Remove redundant boolean
2019-03-05 18:59:25 +09:00
Dan Balasescu
fafc80818c
Fix typo
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-03-05 18:50:46 +09:00
Dean Herbert
fc0b297232
Fix menu cursor not displaying outside of gameplay scaling area
2019-03-05 18:06:24 +09:00
smoogipoo
c06dac5b1a
Remove null check (beatmap cannot be null)
2019-03-05 17:58:30 +09:00
smoogipoo
2fee7276ae
Combine creation + assignment
2019-03-05 17:58:05 +09:00
Dan Balasescu
bb6c83ab25
Merge branch 'master' into show-mods-on-loader
2019-03-05 17:46:35 +09:00
Dan Balasescu
fd147dae21
Merge branch 'master' into fix-disabled-set-crash
2019-03-05 17:25:13 +09:00
David Zhao
166a8c8bbb
Add back fallback behavior for match creation
2019-03-05 16:41:59 +09:00
Dean Herbert
93c79023dc
Merge remote-tracking branch 'upstream/master' into simplify-gameplay-clock
2019-03-05 16:41:01 +09:00
David Zhao
11e353c152
Use local class instead of having a separate file
2019-03-05 15:55:37 +09:00
Dean Herbert
4e33a98dbc
Move gameplay clock to own class
2019-03-05 13:53:47 +09:00
Dean Herbert
c5cd9972c4
Make restart private
2019-03-05 13:37:51 +09:00
Dean Herbert
01f1018d02
Tidy up clock logic using DI and a GameplayClock
2019-03-05 13:37:51 +09:00
Dean Herbert
5bb0511f0a
Fix SquareGraph not correctly filling columns when loaded with a non-zero time
2019-03-05 13:37:28 +09:00
David Zhao
aecbc31ffa
Use BeatmapSetCoverType.List for lobby listing
2019-03-05 12:08:14 +09:00
Dean Herbert
ec7842dd5a
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-03-04 12:06:56 +09:00
Dean Herbert
08e153208d
Unbinds are automatic
2019-03-03 20:03:22 +09:00
Dean Herbert
6ffa139ea8
Adjust transition length slightly
2019-03-03 20:02:56 +09:00
jorolf
e8d568470d
use a bindable instead
2019-03-02 19:13:38 +01:00
jorolf
176cbc7f2e
Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer
2019-03-02 19:04:48 +01:00
Dean Herbert
687d5d5ff1
Merge pull request #4387 from smoogipoo/fix-fonts
...
Fix a few incorrect fonts
2019-03-02 20:07:26 +09:00
Dean Herbert
5487b011d6
Fix some inspections rider isn't able to deal with automatically
2019-03-02 14:34:56 +09:00
smoogipoo
83a02d32f7
Fix a few incorrect fonts
2019-03-02 13:25:59 +09:00
Dean Herbert
796f6c3092
Merge remote-tracking branch 'upstream/master' into tournament-tools
2019-03-02 13:13:51 +09:00
Nitrous
0be9f81310
Merge branch 'master' into show-mods-on-loader
2019-03-02 06:40:45 +08:00
Dean Herbert
1871e8bb2c
Merge branch 'master' into master
2019-03-01 21:22:34 +09:00
Dean Herbert
c01990d005
Fix callback potentially not getting fired
2019-03-01 20:52:34 +09:00
LeNitrous
cf51c8aa31
attempt to comply with appveyor
2019-03-01 19:10:32 +08:00
LeNitrous
4e081fe1fc
Merge branch 'show-mods-on-loader' of https://github.com/LeNitrous/osu into show-mods-on-loader
2019-03-01 18:41:41 +08:00
smoogipoo
bf8360636a
Adjust drawnodes to use the new shared data structure
2019-03-01 17:25:15 +09:00
Dean Herbert
19ce1f2869
Remove second conditional
2019-03-01 13:43:16 +09:00
David Zhao
f6303a2855
Fix songselect blur potentially never being applied
2019-03-01 11:52:51 +09:00
Dean Herbert
49cbaecf4c
Update licence header
2019-03-01 10:52:53 +09:00
Dean Herbert
acc2113027
Make operation run asynchronously
2019-03-01 10:09:03 +09:00
Dean Herbert
798bc1306b
Merge remote-tracking branch 'upstream/master' into m2307-master
...
# Conflicts:
# osu.Game/Screens/Select/SongSelect.cs
2019-03-01 10:08:35 +09:00
Dean Herbert
80b5f1c523
Fix code formatting issues
2019-03-01 09:49:36 +09:00
Dean Herbert
67928ac1fe
Remove pointless check
2019-03-01 09:49:11 +09:00
Dean Herbert
09e1e3bab6
Merge branch 'master' into UserDimLogic
2019-02-28 20:38:09 +09:00
Dean Herbert
30e820d107
Fix storyboard potentially being loaded many times
2019-02-28 20:36:00 +09:00
Dean Herbert
53eb0e7e4e
More formatting fixes
2019-02-28 20:30:23 +09:00
Dean Herbert
6861163226
Remove pointless method
2019-02-28 20:21:27 +09:00
Dean Herbert
c5270dd577
Remove unnecessary using
2019-02-28 20:17:00 +09:00
David Zhao
e3338e94d1
Make test cases more compact, add two way toggles
2019-02-28 20:01:15 +09:00
Dean Herbert
d10ad3c8a7
Fix warnings
2019-02-28 18:59:05 +09:00
Dean Herbert
5b53cf0961
Merge branch 'master' into hide-desktop-only-elements
2019-02-28 18:50:16 +09:00
Dan Balasescu
99812bd448
Apply suggestions from code review
...
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-02-28 18:25:58 +09:00
Dan Balasescu
a37445a938
Merge branch 'master' into better-mp-songselect-deletion-handling
2019-02-28 17:35:08 +09:00
smoogipoo
921346d303
Rename a few more members
2019-02-28 17:27:28 +09:00
Dean Herbert
b2872b47d0
Merge branch 'master' into UserDimLogic
2019-02-28 17:18:04 +09:00
Jamie Taylor
4c8aa65200
private + renaming
2019-02-28 17:02:45 +09:00
David Zhao
69b1c76dce
Actually implement blurring fix
2019-02-28 16:51:17 +09:00
Dan Balasescu
3a1066ff02
Merge branch 'master' into toquantity-1
2019-02-28 15:57:51 +09:00
Jamie Taylor
6e821a426d
Fix restoration of enabled mods when cancelling song select
2019-02-28 15:06:11 +09:00
Jamie Taylor
cf2feec7df
Fix multiplayer enabled mods check
2019-02-28 15:02:22 +09:00
Joehu
2241e1af9d
Use ToQuantity for words with number prefixes
2019-02-27 21:55:45 -08:00
Dean Herbert
2dbf7d122c
Merge branch 'master' into use-pattern-matching
2019-02-28 14:53:07 +09:00
Dean Herbert
e2c6a8bc07
Use pattern matching wherever possible
2019-02-28 14:35:00 +09:00
Dean Herbert
0788a7e9f1
Merge branch 'master' into more-inspections
2019-02-28 14:32:57 +09:00
Dean Herbert
42be7857d1
Use expression body for property get/set where possible
2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9
Fix remaining issues
2019-02-28 13:31:40 +09:00
Shane Woolcock
ce17e37c74
Conditionally add some UI elements only on desktop
...
Prevents crashes from trying to access features that are not applicable to mobile.
2019-02-28 13:10:53 +09:00
Dean Herbert
3e1f283281
Merge remote-tracking branch 'upstream/master' into more-inspections
2019-02-28 13:09:18 +09:00
Dan Balasescu
76ec5868da
Merge branch 'master' into fix-square-graph-overhead
2019-02-28 12:23:37 +09:00
Dean Herbert
c8793911a8
Enable more stringent inspectcode style inspections
2019-02-27 21:25:40 +09:00
Dean Herbert
3af7d4939c
Add debounce testing
2019-02-27 19:11:09 +09:00
Dean Herbert
43a1df6e5c
Inline cancellation token source creation
2019-02-27 18:58:53 +09:00
Dean Herbert
6f5d4ce2e2
Debounce SquareGraph some more
2019-02-27 18:58:45 +09:00
Dean Herbert
8c4a59e57e
Fix SquareGraph more
2019-02-27 18:58:34 +09:00
David Zhao
882fff1631
Assert storyboard visibilty at both steps of toggle
2019-02-27 17:56:44 +09:00
David Zhao
14ffd9efe8
Add fake storyboard to visually assess storyboard dim
2019-02-27 17:02:04 +09:00
Jamie Taylor
c59d84fd21
Add sanity check to prevent TimeshiftPlayer from starting with incorrect beatmap/ruleset/mods
2019-02-27 16:21:14 +09:00
Jamie Taylor
a3f71d69a9
Ensure ruleset and mods are set correctly when leaving MatchSongSelect
2019-02-27 16:16:13 +09:00
Jamie Taylor
7c2ffb1826
Fix MatchSongSelect not handling beatmapset deletions
2019-02-27 14:34:39 +09:00
Joehu
5b4319a80f
Fix home button being cancelled by mod select again
2019-02-26 21:01:28 -08:00
Dean Herbert
56697339b3
Merge branch 'master' into fix-disabled-set-crash
2019-02-27 11:14:42 +09:00
jorolf
4c10185f5b
Fade out text instead of removing it immediately
2019-02-26 15:26:00 +01:00
jorolf
cacef7421d
Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer
2019-02-26 14:09:12 +01:00
Dean Herbert
d9872dda12
Use fade instead of negative margin
2019-02-26 16:10:06 +09:00
Dean Herbert
2d6d9dd723
Add better easing
2019-02-26 16:09:45 +09:00
Dean Herbert
c1432b2ed5
Add back newline
2019-02-26 15:48:34 +09:00
Dean Herbert
2fc34496fd
Merge branch 'master' into MissingSource
2019-02-26 15:38:51 +09:00
Shane Woolcock
e91c07209f
Move MainMenu initialisation from ctor to load
2019-02-26 09:54:42 +09:00
jorolf
796044ee7d
*I should've rechecked the code after the master merge*
2019-02-25 23:53:44 +01:00
jorolf
501dab7b32
Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer
2019-02-25 23:49:01 +01:00
jorolf
c680d63694
Don't show the supporter text if the user already has supporter status
2019-02-25 23:44:43 +01:00
Dean Herbert
568e90c70b
Merge branch 'master' into UserDimLogic
2019-02-25 22:35:48 +09:00
David Zhao
d750023c52
Fix TestCasePlayerLoader not having a background stack
2019-02-25 22:05:49 +09:00
Shane Woolcock
bebb635ca1
Merge branch 'master' into hide-exit-button
...
# Conflicts:
# osu.Game/Screens/Menu/MainMenu.cs
2019-02-25 21:48:42 +09:00
Shane Woolcock
2bd5bb3f69
Move all MainMenu button creation into load
2019-02-25 21:41:41 +09:00
Dean Herbert
97dc7f9819
Merge branch 'master' into MissingSource
2019-02-25 19:35:44 +09:00
Dean Herbert
a4e119786f
Fix some weird formatting
2019-02-25 19:19:28 +09:00
Dean Herbert
6881563346
Merge branch 'master' into ScrollingExitFix
2019-02-25 19:11:05 +09:00
David Zhao
59ad470eed
Clean up test code
2019-02-25 18:41:13 +09:00
David Zhao
ad1bce3585
Fix song select backround not being exited in time
2019-02-25 18:40:19 +09:00
Dean Herbert
80737b9ef8
Remove "silent" parameter; consolidate import logic
2019-02-25 18:24:06 +09:00
Dean Herbert
706da017d7
Add target screen support and user bypass
2019-02-25 14:01:51 +09:00
David Zhao
16fa30f71e
Fix bindable
2019-02-25 13:27:44 +09:00
David Zhao
ccc86b66fa
Use local private bindable in Player.cs
2019-02-25 13:15:37 +09:00
David Zhao
af4606f3d2
Create new test for StoryboardReplacesBackground
2019-02-25 12:35:01 +09:00
Shane Woolcock
61be4f2695
Conditionally add ExitConfirmOverlay and disable back action
2019-02-25 10:43:47 +09:00
Shane Woolcock
add8b8e9c4
Only add Exit button if the GameHost supports it
2019-02-25 09:56:00 +09:00
David Zhao
24f5bc7a75
Add documentation and move storyboard init logic
2019-02-24 20:03:24 +09:00
David Zhao
3a9835fcdd
Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic
2019-02-24 18:11:08 +09:00
David Zhao
f4acd6e48f
Move PlayerLoader tests out of constructor, Improve Documentation
2019-02-24 18:10:59 +09:00
Dean Herbert
b140fc973a
Merge branch 'master' into UserDimLogic
2019-02-24 17:48:59 +09:00
Dean Herbert
2281a0235d
Fix regression causing playback rate to display incorrectly
2019-02-24 15:27:06 +09:00
David Zhao
f8d18285a8
Fix backgrounds not properly being faded in song select
2019-02-23 14:59:54 +09:00
David Zhao
bb01948283
Use .Value with new bindable changes
2019-02-22 20:44:02 +09:00
David Zhao
ab3fa91a2f
Merge branch 'master' into UserDimLogic
2019-02-22 20:38:10 +09:00
David Zhao
76de39a344
Put user dim logic in yet another container inside UserDimContainer
2019-02-22 20:34:51 +09:00
Dean Herbert
367bc53a06
Revert some more instances of 'e' variable names
2019-02-22 20:15:25 +09:00
smoogipoo
d61dfe888e
Fix venera fonts not being correctly specified
2019-02-22 19:42:09 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage
2019-02-22 18:09:23 +09:00
David Zhao
a4162a69fb
Remove leftover usage of dimlevel in BackgroundScreenBeatmap
2019-02-22 18:01:50 +09:00
Dean Herbert
0431582959
Remove excess new line
2019-02-22 17:57:49 +09:00
Dean Herbert
3fe4b8fd1c
Update variable names
...
Also cleans up some weird code
2019-02-22 17:51:39 +09:00
Dean Herbert
452caabd40
Apply suggestions from code review
...
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +09:00
David Zhao
263972a048
Remove DimLevel bindable from ScreenWithBeatmapBackground
2019-02-22 17:00:00 +09:00
David Zhao
918a60ebbf
Create a new player every time a test is performed.
2019-02-22 16:56:03 +09:00
David Zhao
65cdac60c3
Add tests to make sure the background is always the same through screen transitions
2019-02-22 14:43:05 +09:00
smoogipoo
8853f7ad76
Explicitly set exo typeface in a few places
2019-02-21 19:26:02 +09:00
smoogipoo
d8c55bc729
Adjust namespaces
2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f
Update with framework bindable changes
2019-02-21 18:56:34 +09:00
David Zhao
97db8abd59
Remove unused includes
2019-02-21 18:34:11 +09:00
David Zhao
0677194f46
Move all storyboard show logic into UserDimContainer
2019-02-21 18:14:58 +09:00
David Zhao
ad5e81f0cd
Add test case for background preview, fix unit tests
2019-02-21 15:24:26 +09:00
smoogipoo
cc33f230b4
Merge remote-tracking branch 'origin/master' into osu-fontusage
2019-02-20 20:37:48 +09:00
Jamie Taylor
9b3f2fdd24
Change RelativePositionAxes default on osu! logo to be both
2019-02-20 19:34:55 +09:00
smoogipoo
4db5531e4b
Replace copy-constructor/method with extension method
2019-02-20 19:32:30 +09:00
David Zhao
f5d8700920
Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic
2019-02-20 17:40:13 +09:00
David Zhao
25e7dcb375
Remove unused includes
2019-02-20 17:39:35 +09:00
David Zhao
49c5a9fc30
Merge branch 'master' into UserDimLogic
2019-02-20 17:30:34 +09:00
David Zhao
d703a9511a
Fix background dim previews
2019-02-20 17:20:45 +09:00
David Zhao
1bd1b6b099
Move user dim logic into UserDimContainer instead
2019-02-20 16:53:57 +09:00
smoogipoo
dbfa95b9e7
Made medium the default font weight
2019-02-20 16:52:36 +09:00
smoogipoo
0693ab8e7d
Merge remote-tracking branch 'origin/master' into osu-fontusage
...
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb
Adjust sprite texts in-line with framework changes
2019-02-20 15:03:20 +09:00
smoogipoo
703df77000
Update in-line with framework IsActive changes
2019-02-19 19:16:03 +09:00
David Zhao
af049004dd
Add test cases for transitioning into pause overlay and into results
2019-02-18 19:53:55 +09:00
David Zhao
4e07aba548
Make it so visual tests only load the osu ruleset
2019-02-18 18:12:45 +09:00
David Zhao
1d80674fbd
Fix fadecontainer being added to multiple containers
2019-02-18 17:11:38 +09:00
David Zhao
af30aefe77
Merge branch 'master' into UserDimLogic
2019-02-18 16:56:16 +09:00
David Zhao
80800f2931
Match up fade behavior with current master
2019-02-18 16:34:11 +09:00
David Zhao
9be25c3758
Fix unit tests
2019-02-18 16:00:59 +09:00
David Zhao
f241d67e5f
Use conditional operator isntead of if
2019-02-18 15:23:03 +09:00
David Zhao
df148f8787
Fix background dim not being disabled on playerloader exit
2019-02-18 12:55:42 +09:00
Dean Herbert
0a265c6d35
Update osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs
...
Co-Authored-By: nyquillerium <nyquill@ppy.sh>
2019-02-18 11:54:25 +09:00
ThePyrotechnic
7bb56a198a
Merge branch 'master' into MissingSource
2019-02-17 19:54:43 +00:00
Dean Herbert
f0743ebecf
Merge remote-tracking branch 'upstream/master' into tournament-tools
...
# Conflicts:
# osu.Game.Tournament.Tests/TestCaseDrawings.cs
# osu.Game/osu.Game.csproj
2019-02-17 17:25:09 +09:00
smoogipoo
134840f118
Fix nullref
2019-02-16 11:18:17 +09:00
David Zhao
8693d6a76b
Merge branch 'master' into UserDimLogic
2019-02-15 17:11:21 +09:00
David Zhao
53b7fdd834
Clean up test code and unused includes
2019-02-15 16:57:53 +09:00
Jamie Taylor
3ea13b1ade
Fix mouse cursor appearing prematurely during startup
2019-02-15 16:55:39 +09:00
David Zhao
0a60f6dacd
Documentation for tests and changes
2019-02-15 16:50:37 +09:00
David Zhao
6da9f94ae3
Fix regression with background dim
2019-02-15 16:17:01 +09:00
David Zhao
3a74ad678a
clean up unused includes
2019-02-14 18:41:10 +09:00
David Zhao
a09e0790e1
Fix storyboards not dimming
2019-02-14 18:07:28 +09:00
David Zhao
e2a312a663
Move user dimming logic into its own container
2019-02-14 17:47:53 +09:00
Dean Herbert
777a606b2d
Don't revert beatmap on exiting leased state
2019-02-14 17:14:58 +09:00
Dean Herbert
94ceb1e32b
Move screen change allowance to local usage
2019-02-14 13:28:21 +09:00
Dean Herbert
e604806398
Fix regression in screen change allowance logic
2019-02-13 19:43:01 +09:00
Dean Herbert
1373e0fad0
Fix BeatmapTitle not always displaying
2019-02-13 14:57:40 +09:00
Dean Herbert
166cdab2e8
Remove unnecessary null check
2019-02-13 14:14:57 +09:00
Dean Herbert
ab3adafafd
Fix crashes after entering player
2019-02-13 14:13:54 +09:00
Dan Balasescu
c3ae4d7b14
Improve comment
...
Co-Authored-By: peppy <pe@ppy.sh>
2019-02-13 11:34:48 +09:00
Michael Manis
5fbdbcf209
removed 'unknown source' line
2019-02-12 15:30:42 -05:00
Dean Herbert
2ea839c475
Fix crashes on beatmap not being set correctly in player
2019-02-12 19:18:22 +09:00
Dean Herbert
d5cce850a8
Revert some unnecessary complications in logo logic
2019-02-12 13:29:41 +09:00
Dean Herbert
272584eb79
Improve file layouts
2019-02-12 13:02:33 +09:00
Dean Herbert
78b47f9fe3
Fix starting matches not working
2019-02-12 11:19:42 +09:00
Dean Herbert
e4422167b6
Fix starting gameplay
2019-02-11 19:13:57 +09:00
Dean Herbert
88ffc78103
Restructure
2019-02-11 19:11:34 +09:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work
2019-02-11 16:30:12 +09:00
ThePyrotechnic
450fa0075f
Merge branch 'master' into MissingSource
2019-02-10 23:44:47 +00:00
Michael Manis
cfe14dcdb1
Options for handing unknown beatmap source
2019-02-10 18:31:39 -05:00
Dean Herbert
a30d3739cf
Merge remote-tracking branch 'upstream/master' into cmc-rooms
2019-02-08 18:45:39 +09:00
Dean Herbert
f52cac966b
Fix multiple blank lines
2019-02-08 18:45:32 +09:00
Dean Herbert
6c4d289901
Pass item rather than ID
2019-02-08 18:33:49 +09:00
Dan Balasescu
7ec0b4ba77
Fix nullref during room creation ( #4228 )
2019-02-08 17:53:01 +09:00
Dan Balasescu
959b1ac845
Fix potential nullref when exiting multiplayer ( #4227 )
...
Fixes https://github.com/ppy/osu/issues/3954
2019-02-08 17:28:00 +09:00
smoogipoo
febcd7d7c0
Remove currentRoom from RoomManager
2019-02-08 15:46:16 +09:00
smoogipoo
fdd37dbc4b
Merge remote-tracking branch 'origin/master' into cmc-rooms
2019-02-08 15:44:33 +09:00
smoogipoo
5643dc2e99
Remove redundant qualifiers
2019-02-08 15:44:05 +09:00
smoogipoo
6fe1f57236
Fix crash when start button is repeatedly pressed
2019-02-08 15:39:11 +09:00
smoogipoo
99a7ccc01a
Slight cleanup in multiplayer
2019-02-08 15:38:05 +09:00
smoogipoo
43240ea85e
Fix playlist issues with room creation
2019-02-08 15:23:03 +09:00
smoogipoo
42cd55e0d7
Move current room to multiplayer
2019-02-08 14:57:51 +09:00
smoogipoo
7f13e3c5f7
Directly resolve the filter bindable
2019-02-08 13:02:17 +09:00
smoogipoo
990bd44ca2
Combine roommanager and roompollingcomponent
2019-02-08 13:01:10 +09:00
smoogipoo
17fdfc15d9
Fix room title in the breadcrumbs
2019-02-07 20:09:49 +09:00
smoogipoo
1c2450a95a
Fix up room inspector status
2019-02-07 17:59:14 +09:00
smoogipoo
1e0135af6f
Move StatusColouredContainer into a more public location
2019-02-07 17:52:40 +09:00
smoogipoo
2d61548251
Fix room name being coloured
2019-02-07 16:45:36 +09:00
smoogipoo
4f86fe92ea
Fix match settings not showing
2019-02-06 18:50:43 +09:00
ProgrammaticNajel
9f8e724a76
Fix background being cut off at the top of the screen ( #4207 )
...
Fix background being cut off at the top of the screen
2019-02-06 18:14:33 +09:00
smoogipoo
3207983a1c
Fix current room being set to null when parted
2019-02-06 15:12:40 +09:00
smoogipoo
a9aa22c97b
Remove ShadowModel requirement
2019-02-06 13:52:48 +09:00
smoogipoo
594dffba41
Fix a few cases of missed instant invocation
2019-02-05 19:11:20 +09:00
smoogipoo
aac371ba6e
Use CMC for all of multiplayer
2019-02-05 19:00:08 +09:00
smoogipoo
be51ee4ed5
Implement MultiplayerComposite, replaces RoomBindings
2019-02-05 16:14:37 +09:00
smoogipoo
d9537017c8
Use CMC in the Multiplayer screen
2019-02-05 16:03:05 +09:00
smoogipoo
37c1f5a824
Split polling logic from RoomManager, now a container
2019-02-05 15:38:19 +09:00
smoogipoo
065b0c9076
Fix background not being faded correctly
2019-02-04 17:04:52 +09:00
Dean Herbert
482a01e7ba
Merge branch 'master' into tournament-tools
...
# Conflicts:
# osu.Game/Online/API/Requests/Responses/APIBeatmap.cs
# osu.Game/OsuGameBase.cs
# osu.Game/Overlays/ChatOverlay.cs
# osu.Game/Screens/Menu/MainMenu.cs
# osu.Game/Screens/Tournament/Drawings.cs
# osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs
# osu.Game/osu.Game.csproj
# osu.sln
2019-02-02 19:09:48 +09:00
Dean Herbert
e01f342ab0
wip
2019-02-02 17:11:25 +09:00
Dean Herbert
ca5c8d37d1
Use leased bindables
2019-02-01 16:44:06 +09:00
Dean Herbert
3da851d93e
Merge branch 'master' into fix-replay-multiplier-text
2019-01-31 21:17:40 +09:00
Unknown
8c1f8ee596
restart correctly when leaving player (without noises)
2019-01-31 12:33:08 +01:00
Unknown
e2347ae7bf
Merge branch 'master' into correct-preview-loop
2019-01-31 10:53:09 +01:00
Dean Herbert
f85518b175
Don't expose padding
2019-01-31 18:16:28 +09:00
Dean Herbert
b48bb5b792
Move parallax logic out of BackgroundScreenStack
2019-01-31 18:10:33 +09:00
smoogipoo
bdaff27575
Fix nullref due to screens now being removed from parent
2019-01-31 15:02:07 +09:00
smoogipoo
255b4a30e0
Allow logo to be null
2019-01-31 13:50:37 +09:00
smoogipoo
58d744e5dc
Remove manual overlay/toolbar logic from multiplayer
2019-01-31 13:38:21 +09:00
Dean Herbert
beab367e6d
Add null checks/allowances
2019-01-31 11:00:33 +09:00
Dean Herbert
d34aa50613
Merge branch 'master' into iscreen
2019-01-31 01:08:06 +09:00
smoogipoo
ac0bc53c4b
Revert "Merge pull request #4154 from phosphene47/carousel-wedge-level"
...
This reverts commit cc8793a45e94276c8abb
2019-01-31 00:02:05 +09:00
smoogipoo
5e78f51e24
Fix multiplayer crashing when exiting from lounge
2019-01-30 23:56:03 +09:00
smoogipoo
82dc7f39a3
Update licenses
2019-01-29 21:48:35 +09:00
smoogipoo
b5d187c4af
Fix post-merge errors
2019-01-29 21:27:32 +09:00
smoogipoo
91302ea0bc
Merge remote-tracking branch 'origin/master' into iscreen
...
# Conflicts:
# osu.Game/Screens/Multi/Match/MatchSubScreen.cs
# osu.Game/Screens/Multi/Multiplayer.cs
# osu.Game/Screens/Multi/MultiplayerSubScreen.cs
# osu.Game/Screens/OsuScreen.cs
# osu.Game/osu.Game.csproj
# osu.sln
2019-01-29 21:21:36 +09:00
smoogipoo
7b1c1f3728
Move toolbar showing and overlay activation to OsuGame
...
Now exposed through IOsuScreen.
2019-01-28 15:42:06 +09:00
Dean Herbert
8118b649d8
Merge branch 'master' into show-mods-on-loader
2019-01-28 14:11:54 +09:00
Dan Balasescu
47f35c423b
Merge branch 'master' into carousel-wedge-level
2019-01-28 13:49:12 +09:00
Jack Scotson
6a2100ddba
Merge branch 'master' into menu-globalaction-select
2019-01-27 19:13:34 +00:00
Scotsoo
c00636d328
Removing whitespace
2019-01-27 19:09:30 +00:00
Scotsoo
29c02fbaa7
Remove redundant space
2019-01-27 18:27:11 +00:00
Scotsoo
07bb278ec0
Considering GlobalActions in GameplatMenuOverlay
2019-01-27 18:19:20 +00:00
LeNitrous
a1ce7e9a95
add ModDisplay on PlayerLoader
2019-01-26 17:14:45 +08:00
Unknown
1fa87521f6
fix restarting with a different track in the same BeatmapSet
2019-01-26 07:29:30 +01:00
Unknown
3d5520d277
correctly loop from preview point in SongSelect
2019-01-26 07:09:01 +01:00
smoogipoo
117703374e
Fix logo animations
2019-01-25 21:02:35 +09:00
smoogipoo
60cc2314ef
Fix ruleset + beatmap being changeable in match
2019-01-25 21:02:30 +09:00
phosphene47
5c70be07ab
Display carousel over beatmap info wedge
2019-01-25 22:58:55 +11:00
smoogipoo
b3403c78da
Fix a few potential crashes
2019-01-25 20:47:37 +09:00
smoogipoo
e2891ab1e9
Fix anchors + origins
2019-01-25 20:47:31 +09:00
smoogipoo
95e6785968
Make Multiplayer not an OsuScreen
2019-01-25 20:25:55 +09:00
smoogipoo
e1e7759e0f
Re-implement MultiplayerSubScreen
2019-01-25 19:32:37 +09:00
Dean Herbert
260034a80e
Don't auto-focus textboxes when on screen keyboard would cause inconvenience
2019-01-25 19:20:29 +09:00
smoogipoo
da135346b2
Fix screen titles
2019-01-25 18:38:48 +09:00
smoogipoo
15100632f1
Remove MultiplayerSubScreen and fix multiplayer crashes
2019-01-25 18:26:04 +09:00
smoogipoo
f0e0088f43
Create a custom background stack to fix various background issues
2019-01-25 15:36:22 +09:00
Dean Herbert
7ed215c521
Make InternalPadding a bit simpler
2019-01-25 14:46:45 +09:00
Dean Herbert
787d4da153
Combine constant
2019-01-25 14:10:59 +09:00
ProgrammaticNajel
4cae9bae83
Merge branch 'master' into fix-multiplayer-parallax-overflow
2019-01-24 20:41:10 +08:00
ProgrammaticNajel
593e0b36f5
Add overflow padding in other multiplayer screen components
...
Added padding to Room Creation and Beatmap Selection in Multiplayer.
2019-01-24 19:42:35 +08:00
smoogipoo
50a384e19c
Fix game not exiting
2019-01-24 20:13:19 +09:00
smoogipoo
28f5c950ec
Fix player never completing load
2019-01-24 19:55:42 +09:00
smoogipoo
8ea7ec6445
Convert everything to use IScreen
2019-01-24 19:47:44 +09:00
ProgrammaticNajel
9fcefa7d69
Typo fix
2019-01-24 18:18:32 +08:00
ProgrammaticNajel
e4084b7d5d
Add overflow padding in other multiplayer screen components
...
Added overflow padding in room selection screen (Header, Room Info, Leaderboards, and Room Chat)
2019-01-24 17:40:48 +08:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
ProgrammaticNajel
7ac20c3545
Add overflow padding to account for parallax shifting
...
Added overflow padding in the Multiplayer screen, and adjusting content (LoungeSubScreen, FilterControl, Header, "Create Room" button) to account for this padding.
2019-01-24 16:11:24 +08:00
Dean Herbert
1730ad143f
Merge branch 'master' into fix-key-counter
2019-01-23 18:22:08 +09:00
chrisny286
76700ad20f
Merge branch 'fix-transparent-background-on-screen-scale-modes' of https://github.com/chrisny286/osu into fix-transparent-background-on-screen-scale-modes
2019-01-23 09:40:44 +01:00
chrisny286
03e3247baf
replace FadeTo in PlayerLoader
...
didnt notice that interaction yet. yes this makes it neccessary.
2019-01-23 09:40:38 +01:00
Dean Herbert
4180ca75bc
Fix typo in comment
2019-01-23 17:14:08 +09:00
chrisny286
bb56c4a1a7
use Color4.Black and White + using osuTK.Graphics
2019-01-23 09:08:34 +01:00
chrisny286
5d2b2ecf06
Merge remote-tracking branch 'upstream/master' into fix-transparent-background-on-screen-scale-modes
2019-01-23 08:52:46 +01:00
chrisny286
f4ebab2d3a
Fix backgrounds being transparent in some scaling modes
...
by replacing `.FadeTo` at the necessary places with `.FadeColour`.
restoring the `.FadeColour` in `fadeOut` of the Player Screen which is ran in every exit scenario.
2019-01-23 08:52:25 +01:00
Dean Herbert
c18ce2c23a
Formatting fixes
2019-01-23 14:51:25 +09:00
Dean Herbert
f107a922b4
Add tests for key counter inside player heirarchy
2019-01-23 14:51:25 +09:00
chrisny286
13ba9d64d0
revert empty line
2019-01-23 02:56:00 +01:00
chrisny286
12503b4d07
revert and make VisibilityContainer not AlwaysPresent
2019-01-23 02:37:17 +01:00
chrisny286
f01ba17d1f
add check if replay is loaded before allowseeking can be overwitten
2019-01-23 02:12:40 +01:00
chrisny286
cabcfffdeb
Fix autoplay rewind/skip usable when UI hidden
2019-01-23 01:16:37 +01:00
Dean Herbert
5ea6e8e247
Allow full osu!direct usage regardless of supporter status for now
2019-01-22 14:22:38 +09:00
Dean Herbert
c58fe4f4ff
Fix nullref
2019-01-22 13:18:01 +09:00
Dean Herbert
cebeb0a219
Fix replay playback speed not being displayed initially
2019-01-22 11:40:57 +09:00
Dean Herbert
21317806c9
Merge remote-tracking branch 'upstream/master' into nwabear-master
2019-01-22 10:07:35 +09:00
Dean Herbert
7baff750de
Consolidate layout, wording and ordering with VisualSettings
2019-01-22 10:06:30 +09:00
Dean Herbert
b373d78143
Add slight easing
2019-01-22 09:47:51 +09:00
Dean Herbert
25b5bbcd8f
Merge branch 'master' into score-panel-layout
2019-01-22 09:43:37 +09:00
Christian Kamphausen
86581feb4a
Merge branch 'master' into fix-playersettingsoverlay-not-coming-back-ctrl+H
2019-01-22 01:29:58 +01:00
chrisny286
d7d2e2fe44
trimmed whitespace
2019-01-21 19:22:19 +01:00
chrisny286
65fd69c817
Update HUDOverlay.cs
...
separate PlayerSettingsOverlay from the other HUD elements in the Visibility Container
2019-01-21 19:10:29 +01:00
chrisny286
fb51578df3
Update PlayerSettingsOverlay.cs
...
Framework renamed this variable so it needs to be renamed here too.
2019-01-21 17:19:40 +01:00
ekrctb
e74f0057bd
Automatically layout based on score display width
2019-01-21 17:07:56 +09:00
Shane Woolcock
fa6dd8c99e
Code sanity
2019-01-20 19:03:06 +10:30
Shane Woolcock
521b11dfcb
Use QuadBatch rather than LinearBatch of quads for LogoVisualisation
...
GL_QUADS is deprecated, and is not supported at all on OpenGL ES.
This fixes the logo visualisation not drawing on iOS.
2019-01-20 18:51:17 +10:30
Dean Herbert
5269ca31be
Merge branch 'master' into fix-room-inspector-cover
2019-01-17 21:49:25 +09:00
Dean Herbert
1d40d88f82
Merge branch 'master' into add-room-null-check
2019-01-17 21:34:25 +09:00
Dean Herbert
59f7c5a26e
Fix room inspector cover not resetting when no room selected
2019-01-17 18:44:22 +09:00
Dean Herbert
ba9cdf2ce2
Add null check to fix crash on deselecting multiplayer room
2019-01-17 18:17:47 +09:00
Dean Herbert
491537b8ba
Add fade duration
...
Not really visible in the existing usage, but once we enable the settings tab it will be required. Tested by manually enabling it.
2019-01-17 18:13:05 +09:00
Dean Herbert
c1f5c0edc9
Merge branch 'master' into hide-multiplayer-match-room-tab
2019-01-17 18:02:17 +09:00
ekrctb
2bc3464802
Hide Room tab when Settings tab is active
2019-01-17 17:27:34 +09:00
ekrctb
f982b6da55
Don't hide 'hold for menu' even hud is hidden
2019-01-17 16:49:04 +09:00
Dean Herbert
99c963c56a
Merge branch 'master' into cancel-request-on-disposal
2019-01-17 15:29:49 +09:00
ekrctb
b6fb3a5c05
Cancel request on disposal for RoomInspector
2019-01-17 15:14:30 +09:00
Dean Herbert
2ab0c4632e
Merge branch 'master' into menu-background-skinning
2019-01-17 14:23:03 +09:00
Dan Balasescu
75113db438
Merge branch 'master' into fix-skip-button-scaling
2019-01-16 16:37:37 +09:00
Unknown
6eff79913b
remove blank lines
2019-01-11 10:34:56 +01:00
Dean Herbert
e2dd025225
Fix scaling of SkipOverlay when UI scale is adjusted
...
Closes #4040 .
2019-01-11 16:54:42 +09:00
Min
29e8c21c46
Merge branch 'master' into menu-background-skinning
2019-01-11 11:36:20 +09:00
Dean Herbert
aa68bbc1d9
Merge branch 'master' into fix-match-select-crash
2019-01-10 15:40:03 +09:00
Dean Herbert
2dc185f249
Display avatars rather than full scores
2019-01-09 15:27:08 +09:00
Dean Herbert
0bf9e9b86b
Merge branch 'master' into lounge-leaderboard
2019-01-09 10:28:55 +09:00
Microgolf
097062caf7
Addresses requested changes
2019-01-08 17:57:03 +01:00
m2307
42ba690809
Merge branch 'master' into master
2019-01-08 17:53:58 +01:00
Dean Herbert
958840fe17
Merge branch 'master' into fix-sliderbar
2019-01-08 21:23:34 +09:00
Dean Herbert
6ce08312b2
Merge branch 'master' into fix-match-select-crash
2019-01-08 20:29:55 +09:00
smoogipoo
2a4c91a6ab
Remove unused using
2019-01-08 19:26:24 +09:00
smoogipoo
122fc2de58
Show room leaderboard instead in the lounge
2019-01-08 19:24:55 +09:00
smoogipoo
b17b88d071
Fix null beatmap possibly being selected
2019-01-08 18:06:46 +09:00
smoogipoo
38a3ccc817
Use value where applicable
2019-01-08 16:31:44 +09:00
smoogipoo
8692be9de3
Fix sliderbar not working correctly with TransferValueOnCommit = true
2019-01-08 16:07:54 +09:00
Dean Herbert
70d644406f
Merge remote-tracking branch 'origin/update-framework' into letterboxing
...
# Conflicts:
# osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs
2019-01-07 18:53:53 +09:00
Dean Herbert
74539b5e5c
Merge remote-tracking branch 'upstream/master' into letterboxing
2019-01-07 18:52:48 +09:00
Dean Herbert
49ba4e5a14
Merge branch 'master' into update-framework
2019-01-07 18:51:54 +09:00
Dean Herbert
f6018294b5
Update framework
2019-01-07 18:50:27 +09:00
Matthias Coenraerds
562c9e56fb
Fix naming
2019-01-06 13:38:43 +01:00
Matthias Coenraerds
472325b885
Verify leaderboard scope to be local
2019-01-06 13:37:30 +01:00
Roman Kapustin
4b5fc85875
Use Find instead of FirstOrDefault
2019-01-05 19:35:33 +03:00
Matthias Coenraerds
a93c26ccfd
Filename does not match contained type
2019-01-04 20:40:07 +01:00
Matthias Coenraerds
3879348ee4
Implement clear scores on beatmap
2019-01-04 20:23:06 +01:00
Dean Herbert
7d1163a7d2
Remove unnecessary null check
2019-01-04 15:49:23 +09:00
Dean Herbert
c528a3896d
Formatting and naming
2019-01-04 15:34:32 +09:00
Dean Herbert
3953f829c8
Add letterbox/screen scaling support
2019-01-04 13:36:02 +09:00
Dean Herbert
b6dc6c4a74
Merge branch 'master' into do_not_use_local_user_for_autoplay_score
2019-01-04 13:11:17 +09:00
Dean Herbert
2d405bfc43
Add back options for 3 and 7 day long rooms
2019-01-02 16:33:52 +09:00
smoogipoo
72482aff8d
Whoops
2018-12-28 01:48:13 +09:00
smoogipoo
a7db0bbb91
Sort rooms based on their API position
2018-12-28 01:45:19 +09:00
Dean Herbert
12a93af156
Merge pull request #3939 from smoogipoo/fix-multi-mods
...
Fix plays with mods not submitting
2018-12-27 22:20:10 +09:00
smoogipoo
a62405d82d
Fix plays with mods not submitting
2018-12-27 22:17:03 +09:00
Dean Herbert
2d1736e477
Merge pull request #3936 from smoogipoo/fix-multi-mods
...
Ensure mods are set prior to starting play
2018-12-27 22:04:35 +09:00
smoogipoo
101fdf993e
Ensure mods are set prior to starting play
2018-12-27 21:59:43 +09:00
Dean Herbert
5977fc838f
Limit available durations for the time being
2018-12-27 21:59:08 +09:00
smoogipoo
50b51a168e
Always submit standardised scores
2018-12-27 21:12:32 +09:00
Dean Herbert
31baf0086f
Optional idle tracker
2018-12-27 20:17:27 +09:00
Dean Herbert
1ce33cb6da
Adjust polling rate based on current screen and idle state
2018-12-27 20:06:07 +09:00
smoogipoo
eaba9e1378
Fix mode icon not being updated for correct ruleset
2018-12-27 18:16:30 +09:00
smoogipoo
9a5630b3d5
Fix working beatmap not being updated
2018-12-27 18:16:30 +09:00
Dean Herbert
d6c53e3851
Cancel old web requests when changing filter modes
2018-12-27 18:09:42 +09:00
smoogipoo
b0e8561ad3
Fix ruleset not changing correctly
2018-12-27 17:48:10 +09:00
smoogipoo
dae710f9a6
Make leaderboard top not fade by default
2018-12-27 17:29:55 +09:00
phosphene47
3c677970cd
Add menu background skinning for supporters
2018-12-27 17:25:28 +09:00
smoogipoo
ea1309e768
Fix missing bind
2018-12-27 17:15:43 +09:00
smoogipoo
bd0576537e
Forcefully exit multiplayer if API loses connectivity
2018-12-27 17:12:58 +09:00
smoogipoo
f70e60747f
Remove option for 1-minute duration
2018-12-27 16:54:14 +09:00
smoogipoo
8e031325dd
CI fixes
2018-12-27 16:28:17 +09:00
smoogipoo
50201e602e
Combine implementations of status + end date info
2018-12-27 16:19:00 +09:00
Dean Herbert
67e200e1b2
Leaderboard design updates
2018-12-27 15:52:40 +09:00
smoogipoo
1e71c5c9c4
Add + set ended room status
2018-12-27 13:32:44 +09:00
Dean Herbert
cc1f3d54b0
Fix looping failure
2018-12-26 22:37:09 +09:00
Dean Herbert
f6aa6e6b3c
Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip
2018-12-26 22:16:41 +09:00
Dean Herbert
8cf30bdb6a
Play with delegate
2018-12-26 22:16:35 +09:00
smoogipoo
e7310a16c7
Fix playlist not updating correcly
2018-12-26 22:14:49 +09:00
Dean Herbert
a1fa914c66
Participants
2018-12-26 21:58:14 +09:00
Dean Herbert
bf9954aede
Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs
# osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs
# osu.Game/Screens/Multi/IRoomManager.cs
# osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
# osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs
# osu.Game/Screens/Multi/RoomManager.cs
2018-12-26 21:32:12 +09:00
smoogipoo
2d19436456
Open -> Push
2018-12-26 21:21:26 +09:00
smoogipoo
152f3b1da3
Add processing overlay to lounge screen
2018-12-26 21:20:53 +09:00
smoogipoo
0c384417f1
Add processing overlay to room creation process
2018-12-26 21:19:02 +09:00
Dean Herbert
26834abd33
Fade and no schedule
2018-12-26 21:18:55 +09:00
smoogipoo
5af29f8384
Reduce code duplication
2018-12-26 21:18:44 +09:00
smoogipoo
940d4a16bb
Add error message when creation fails
2018-12-26 21:18:44 +09:00
smoogipoo
9901b11600
Display room join errors as notifications
2018-12-26 21:18:11 +09:00
Dean Herbert
8386e206c3
Update ParticipantInfo
2018-12-26 20:35:54 +09:00
Dean Herbert
5bd3ab51dd
Open -> Push
2018-12-26 20:35:54 +09:00
Dean Herbert
6f0d13e36b
Move PartRoom calls
2018-12-26 20:35:54 +09:00
smoogipoo
9d305ba024
Reduce code duplication
2018-12-26 20:33:19 +09:00
smoogipoo
be9ba78d47
Add error message when creation fails
2018-12-26 20:33:19 +09:00
smoogipoo
052ab4763a
Display room join errors as notifications
2018-12-26 20:32:36 +09:00
Dean Herbert
7a431ed87f
Update ParticipantInfo
2018-12-26 20:31:04 +09:00
Dean Herbert
869081ce9c
Open -> Push
2018-12-26 20:21:30 +09:00
Dean Herbert
692f5c289d
Move PartRoom calls
2018-12-26 20:12:51 +09:00
Dean Herbert
2353c204ee
Renaming
2018-12-26 20:05:57 +09:00
Dean Herbert
532a970c0f
Give leaderboard and chat more breathing room
2018-12-26 19:20:54 +09:00
Dean Herbert
0cefd4b21d
Improve room padding
2018-12-26 19:14:15 +09:00
Dean Herbert
f442e59620
Icon and beatmap title visual pass
2018-12-26 18:01:53 +09:00
Dean Herbert
c6c8c472bb
Split class out
2018-12-26 16:50:50 +09:00
Dean Herbert
9b2575cc20
RoomSettingsOverlay -> MatchSettingOverlay
2018-12-26 16:50:50 +09:00
Dean Herbert
6e8c46f00b
Fix padding and use grid container for more correctness
2018-12-26 15:23:57 +09:00
Dean Herbert
755c6b9243
Make room settings scroll
2018-12-26 15:03:35 +09:00
Dean Herbert
e9556afe22
Don't use all uppercase (is applied automatically)
2018-12-26 14:26:35 +09:00
Dean Herbert
e4a72c0c64
Fix failing testcase
2018-12-26 13:18:36 +09:00
smoogipoo
1dd2a4e368
Fix host info not working
2018-12-25 18:07:19 +09:00
smoogipoo
2f32c4d4d1
Fix title of match song select
2018-12-25 17:17:51 +09:00
smoogipoo
d4f5a8507c
Exit from match screen on escape
2018-12-25 17:14:56 +09:00
smoogipoo
91b83cd4b8
Fix leaderboard being queried on room creation
2018-12-25 13:57:25 +09:00
smoogipoo
23d21a45e5
More automated tests
2018-12-25 11:59:08 +09:00
smoogipoo
626ec85ae8
Remove IHasFilterableChildren from class
2018-12-25 11:58:28 +09:00
smoogipoo
6712a68797
Create IRoomManager interface, add test for RoomsContainer
2018-12-25 11:45:50 +09:00
smoogipoo
f79aa07d02
Fix enddate not being bound to
2018-12-25 11:31:36 +09:00
smoogipoo
e0e75c7339
Fix incorrect room status
2018-12-25 11:24:46 +09:00
smoogipoo
02365ee5ba
Merge remote-tracking branch 'origin/master' into timeshift-wip
2018-12-22 23:23:21 +09:00
smoogipoo
d9b8df1595
Merge remote-tracking branch 'origin/master' into user-registration
2018-12-22 17:19:28 +09:00
Dan Balasescu
e6c197e9aa
Merge branch 'master' into improve-text-search
2018-12-22 16:38:50 +09:00
Dean Herbert
005c6ff40c
Add tooltip text to results screen pages
2018-12-22 16:30:06 +09:00
smoogipoo
bb08bf10a0
Fix post-merge issues
2018-12-22 16:26:27 +09:00
smoogipoo
c2a00b84c7
Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip
...
# Conflicts:
# osu.Game/Screens/Multi/IMultiplayerScreen.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/SoloResults.cs
# osu.Game/Screens/Ranking/IResultPageInfo.cs
# osu.Game/Screens/Ranking/ResultMode.cs
# osu.Game/Screens/Ranking/ResultModeButton.cs
# osu.Game/Screens/Ranking/ResultModeTabControl.cs
# osu.Game/Screens/Ranking/Results.cs
2018-12-22 16:22:02 +09:00
Dean Herbert
a35d9178f0
Quick rename
2018-12-22 16:20:29 +09:00
Dean Herbert
e7508cbd5e
Fix CI issues
2018-12-22 15:55:10 +09:00
Dean Herbert
e404a0bc20
Clean-ups and renames
2018-12-22 15:51:00 +09:00
smoogipoo
baed0ef3ba
Rename variable
2018-12-22 15:46:04 +09:00
smoogipoo
b9ec179713
Split out more requests + responses
2018-12-22 15:45:16 +09:00
smoogipoo
daa6292e08
Split results screen to allow for extensibility
2018-12-22 15:39:06 +09:00
smoogipoo
ac0e6f8d42
Fix post-merge issues
2018-12-22 15:35:22 +09:00
smoogipoo
bdb6e03dfb
Merge remote-tracking branch 'peppy/leaderboard-modularity' into timeshift-wip
...
# Conflicts:
# osu.Game/Online/Leaderboards/Leaderboard.cs
# osu.Game/Online/Leaderboards/LeaderboardScore.cs
# osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs
# osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs
2018-12-22 15:33:26 +09:00
Dean Herbert
787e65c3c5
Reduce generic-ness
2018-12-22 15:20:35 +09:00
smoogipoo
3570c35d7f
Make RoomScore derive ScoreInfo
2018-12-22 15:17:35 +09:00
smoogipoo
6afd2f7263
Adjust styling of disabled settings
2018-12-22 15:00:35 +09:00
smoogipoo
e657f13c15
Separate out Leaderboard into BeatmapLeaderboard
2018-12-22 14:44:36 +09:00
smoogipoo
b82bb0ea28
Mate RoomSettingsOverlay fill height
2018-12-22 14:40:10 +09:00
smoogipoo
09d7dc73dc
Allow channel manager and osugame to be null
2018-12-22 14:38:46 +09:00
smoogipoo
dbd391825a
Rework+fix TestCaseMultiHeader
2018-12-22 14:30:08 +09:00
smoogipoo
7191233be8
Allow roommanager to be null
2018-12-22 14:14:14 +09:00
smoogipoo
21cfe5a3e6
Decouple header from matchscreen
2018-12-22 14:12:27 +09:00
smoogipoo
c06cf5d379
Decouple match info from match screen
2018-12-22 14:08:00 +09:00
smoogipoo
d93421b796
Merge remote-tracking branch 'Joehuu/master' into timeshift-wip
...
# Conflicts:
# osu.Game/Screens/Play/HUD/ModDisplay.cs
2018-12-22 14:02:45 +09:00
smoogipoo
f1a9a352fc
Cleanup bindable handling
2018-12-22 14:01:06 +09:00
smoogipoo
1cb69c3478
Split requests/responses into separate files
2018-12-22 12:50:37 +09:00
smoogipoo
dd0c04ea36
Move RoomManager to multiplayer screen
2018-12-22 12:45:36 +09:00
smoogipoo
7e9cc4e876
Seed the results screen
2018-12-21 18:37:33 +09:00
smoogipoo
4149734f89
Add room leaderboard to results
2018-12-21 18:22:13 +09:00
smoogipoo
8a2cc64bfa
Split results screen to allow for extensibility
2018-12-21 16:34:03 +09:00
smoogipoo
fe6c369e07
Fix incorrect channel
2018-12-21 14:37:05 +09:00
smoogipoo
fa2bc16140
Remove participants, add match chat
2018-12-21 14:01:11 +09:00
smoogipoo
14879acd83
Fix possible nullref
2018-12-21 13:26:50 +09:00
smoogipoo
5d59a1ffca
Merge remote-tracking branch 'origin/master' into timeshift-wip
...
# Conflicts:
# osu.Game.Tests/Visual/TestCasePollingComponent.cs
# osu.Game/Online/API/APIRequest.cs
# osu.Game/osu.Game.csproj
2018-12-21 12:51:31 +09:00
Dean Herbert
aaac45ab8c
Add ability to select chat tabs with alt-1-9
2018-12-20 21:50:47 +09:00
smoogipoo
822225577b
Add joining/parting room requests
2018-12-20 20:58:34 +09:00
smoogipoo
9031896484
Fix create room button showing in song select
2018-12-20 20:09:17 +09:00
smoogipoo
6a76e335c7
Linkify everything
2018-12-20 20:03:45 +09:00
smoogipoo
deaf4ab4a1
Cleanup
2018-12-20 18:21:55 +09:00
smoogipoo
8db3ac0a9f
Make user links clickable
2018-12-20 18:04:39 +09:00
smoogipoo
1701af61d6
Add host avatar+username to match screen
2018-12-20 18:04:22 +09:00
Dean Herbert
bb4b54799f
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-12-20 15:57:20 +09:00
smoogipoo
2e28f378de
Move beatmap + mod info to header
2018-12-20 15:17:33 +09:00
smoogipoo
72016a416b
Deselect match if ended
2018-12-20 15:17:08 +09:00
smoogipoo
03546c9d0d
Implement primary filter routes
2018-12-20 15:16:46 +09:00
smoogipoo
36f6b4fc3f
Hook up participated filter
...
Very early stages, implementation will change.
2018-12-19 18:02:05 +09:00
smoogipoo
673082445e
Rework filtering
2018-12-19 16:56:51 +09:00
smoogipoo
c544a5b9f0
Add end date to the drawable room too
2018-12-19 15:20:23 +09:00
smoogipoo
a8d88dea3b
Display time remaining in the room
2018-12-19 13:07:56 +09:00
smoogipoo
2c000a9a1d
Disallow starting gameplay if there's not enough time in the room
2018-12-19 10:52:15 +09:00
smoogipoo
1051584f0f
Fix room duration not being set
2018-12-19 10:51:54 +09:00
smoogipoo
72d1ba897f
Reorder tabs
2018-12-18 18:29:13 +09:00
smoogipoo
4050cb88ea
Fix potential nullref
2018-12-18 18:09:54 +09:00
smoogipoo
3cdeeb7ac5
Add forceful set helper methods in OsuGame
2018-12-18 18:09:46 +09:00
smoogipoo
e4e1bde5da
Fix playlist events running too early
...
Screens are async loaded
2018-12-18 17:08:07 +09:00
smoogipoo
aabe6c68f5
Fix looping not working
2018-12-18 17:07:47 +09:00
smoogipoo
2f15d10029
Play track while in the multiplayer lobby
2018-12-18 14:45:35 +09:00
smoogipoo
5a8b255bd8
Directly bypass beatmap/ruleset restrictions
2018-12-18 14:17:20 +09:00
smoogipoo
8d640cdc25
Fix leaderboard not being refreshed when finishing gameplay
2018-12-18 12:56:16 +09:00
smoogipoo
cc68cf2f95
Implement duration
2018-12-17 14:44:54 +09:00
smoogipoo
279891ae08
Change "apply" button to say "create" instead
2018-12-17 13:55:42 +09:00
smoogipoo
84552b5cee
Refresh leaderboard when returning to lobby
2018-12-17 11:51:28 +09:00
smoogipoo
bf8aae8d9b
Boot player back to lobby if token request fails
2018-12-17 11:51:17 +09:00
smoogipoo
2fd2425cc4
Fix playlist deserialisation for creating rooms
2018-12-17 11:05:03 +09:00
Dean Herbert
eec5afa382
Change inspection and add redundant parenthesis to appease codefactor
2018-12-15 16:37:37 +09:00
Dean Herbert
3892454ecc
Improve the way text search works at song select
2018-12-15 16:34:48 +09:00
smoogipoo
983a45c4d8
Fix invalid value
2018-12-14 21:21:02 +09:00
smoogipoo
9726eea0d0
Basic score submission implementation
2018-12-14 21:09:17 +09:00
smoogipoo
e8007ac37f
Implement multiplayer room leaderboard
2018-12-14 21:08:55 +09:00
Dean Herbert
4433346a1f
Merge branch 'master' into star-filtering
2018-12-14 20:19:59 +09:00
smoogipoo
d9fc7c7d66
Separate out Leaderboard into BeatmapLeaderboard
2018-12-14 19:51:27 +09:00
Dean Herbert
fc5d5a7752
Merge branch 'master' into user-registration
2018-12-14 19:45:27 +09:00
smoogipoo
de0fc2a0de
Fix beatmap + ruleset being changeable
2018-12-14 17:35:18 +09:00
smoogipoo
5f0069eb83
Fix incorrect ruleset being sent to API
2018-12-14 17:35:05 +09:00
smoogipoo
edefdb18f8
Fix beatmap not having any mods when going into play
2018-12-14 16:16:38 +09:00
smoogipoo
e3ad226075
Use the local beatmap if existing, fixing player not loading objects
2018-12-14 16:11:00 +09:00
smoogipoo
83bf37a302
Enable/disable the view beatmap + ready buttons based on beatmap presence
2018-12-14 15:04:04 +09:00
smoogipoo
3de65238a2
Completely hide the select beatmap button for now
2018-12-14 14:33:50 +09:00
smoogipoo
b83f99d90a
Fix up header sizing + styling
2018-12-14 14:30:39 +09:00
smoogipoo
56fd4b95cd
Fix mod/beatmap selection not always working
2018-12-14 13:38:27 +09:00
smoogipoo
8e6a85058b
Fix playlist-related errors
2018-12-14 12:35:05 +09:00
smoogipoo
91f6b08479
Merge branch 'timeshift-api-integration'
2018-12-13 18:38:22 +09:00
smoogipoo
680a3e2aa4
Update with proper playlist usage
2018-12-13 18:38:03 +09:00
smoogipoo
2aafaf9ce2
Merge branch 'timeshift-api-integration'
2018-12-13 17:07:39 +09:00
smoogipoo
eb0e9c0bb1
Merge branch 'match-mod-display'
...
# Conflicts:
# osu.Game/Screens/Multi/Match/Components/Info.cs
# osu.Game/osu.Game.csproj
2018-12-13 17:07:31 +09:00
smoogipoo
ca87b42758
Merge branch 'timeshift-player'
...
# Conflicts:
# osu.Game/Screens/Multi/Multiplayer.cs
2018-12-13 17:06:44 +09:00
smoogipoo
208273f16a
Merge branch 'timeshift'
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-12-13 17:06:20 +09:00
Dean Herbert
71e5ce59da
Fix crash on exiting player during results transition
2018-12-13 16:23:51 +09:00
smoogipoo
bac4f42eac
Fix backgrounds not quite working
2018-12-12 19:34:37 +09:00
smoogipoo
450e4cd223
Hook up API
2018-12-12 19:04:11 +09:00
smoogipoo
9af2b49c01
Merge remote-tracking branch 'peppy/polling-component' into timeshift-api-integration
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-12-12 16:22:14 +09:00
smoogipoo
6123a11b67
Use RoomID for creation
2018-12-12 16:20:11 +09:00
smoogipoo
170955110f
Add mods to the match info
2018-12-12 14:38:03 +09:00
smoogipoo
6661b5870f
Merge branch 'songselect-mods' into match-mod-display
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-12-12 14:13:37 +09:00
smoogipoo
49dd6ae9b0
Move a lot more of PlaySongSelect into SongSelect
2018-12-12 13:21:44 +09:00
smoogipoo
497f431366
Implement RoomManager and RoomsContainer
...
Reduces logic from LoungeScreen
2018-12-11 19:07:40 +09:00
smoogipoo
bf3f5ab685
Change ready button to "Start" and make it enter player
2018-12-11 17:32:01 +09:00
smoogipoo
1ac615b490
Renamespace
2018-12-10 19:27:25 +09:00
smoogipoo
cd41c45686
Disable select beatmap button after room is created
2018-12-10 19:03:22 +09:00
smoogipoo
3c44f9e4f1
Make select beatmap button into a triangle button
2018-12-10 18:50:52 +09:00
smoogipoo
3f64cfc1c6
Don't add rooms to lounge until they're actually created
2018-12-10 18:35:08 +09:00
smoogipoo
ca544ef3fe
Adjust match creation process
2018-12-10 18:25:32 +09:00
smoogipoo
77193eeea4
Move from lobby into match for creation process
2018-12-10 18:00:57 +09:00
smoogipoo
3b688c702c
Use graying rather than alpha
2018-12-10 17:06:34 +09:00
smoogipoo
c7970e5425
Cleanup handling of readonly fields
2018-12-10 16:50:00 +09:00
smoogipoo
be3a912d0b
Use UnbindFrom()
2018-12-10 13:48:12 +09:00
smoogipoo
352a758f5c
Replace 3 occurrences of SpriteText.Current
2018-12-10 13:20:05 +09:00
smoogipoo
feb1adb51d
Use bindable propagation rather than properties
2018-12-07 20:18:43 +09:00
smoogipoo
29263d7154
Refactor bindable shenanigans in Match
2018-12-07 16:20:05 +09:00
smoogipoo
d68b4bb8e7
Remove custom action from DrawableRoom
2018-12-07 14:28:43 +09:00
smoogipoo
10b526504a
Move ModOverlay to SongSelect
2018-12-06 19:29:18 +09:00
smoogipoo
c02150a19b
Make match header not fade when beatmap changes
2018-12-06 18:31:12 +09:00
smoogipoo
42817b98f9
Hide max participants box
2018-12-06 18:16:17 +09:00
Dean Herbert
9689c4fa17
Merge branch 'master' into user-registration
2018-12-06 17:06:43 +09:00
smoogipoo
eadbe4c470
Make beatmap selection work
2018-12-06 12:21:30 +09:00
Dean Herbert
0df9fa1e59
Remove pointless default size specification in OsuLogo
2018-12-06 11:56:16 +09:00
Dean Herbert
94045413ce
Change statistics to be int for now
2018-12-05 19:44:01 +09:00
smoogipoo
e7d7e00516
Better disabling of various controls
2018-12-05 17:01:14 +09:00
Dean Herbert
4f5028bbc1
Merge branch 'master' into fix-hudoverlay-presence
2018-12-04 22:14:54 +09:00
smoogipoo
ca91dfa091
Make hudoverlay always present
2018-12-04 19:20:32 +09:00
smoogipoo
ec83790734
Add timeshift game type
2018-12-04 18:58:45 +09:00
smoogipoo
c469d12d63
Set room host when the room is refreshed
2018-12-04 18:18:17 +09:00
smoogipoo
a7ac544e12
Add interface for the multiplayer screen short title
2018-12-04 17:43:44 +09:00
smoogipoo
b251129c59
Block going into multiplayer while logged out
2018-12-04 17:43:27 +09:00
smoogipoo
f2a57ce270
Fix room host not being set
2018-12-04 17:23:58 +09:00
smoogipoo
6e5716c3f3
Adjust transition
2018-12-04 15:32:12 +09:00
smoogipoo
a02e025f06
Fix selections not working anymore
2018-12-04 15:26:06 +09:00
smoogipoo
d8739d9dee
Fix creating a new room re-using the existing model
2018-12-04 15:25:48 +09:00
smoogipoo
e22cefc27d
Immediately select newly-created rooms
2018-12-04 12:49:22 +09:00
Dean Herbert
415349e6ef
Add missing return
2018-12-04 12:14:26 +09:00
Dean Herbert
a33865efce
Fix home button being cancelled by mod select
2018-12-04 12:06:05 +09:00
Roman Kapustin
c6c255718b
Handle ModAutoplay during score construction in the Player
2018-12-03 22:37:26 +03:00
smoogipoo
6a28e8c696
Add settings to lounge
2018-12-03 18:30:26 +09:00
smoogipoo
53a54f8634
Renamespace room settings
2018-12-03 17:54:10 +09:00
smoogipoo
20b843e63c
Add create tab
2018-12-03 17:50:56 +09:00
smoogipoo
51c16867d5
Remove type conversion from LoungeTab to RoomAvailability
2018-12-03 17:50:39 +09:00
Dean Herbert
03e416cda9
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-12-01 10:03:31 +09:00
smoogipoo
b1c5b43767
Fix post-rebase errors
2018-11-30 18:46:47 +09:00
smoogipoo
10ed09521c
Add leaderboard display for local scores
2018-11-30 18:40:53 +09:00
smoogipoo
795933d1a1
CreateScoreInfo -> CreateScore
2018-11-30 18:32:08 +09:00
smoogipoo
a6b0e35b2d
Fix post-rebase issues
2018-11-30 18:31:54 +09:00
smoogipoo
a8ad7d4670
Add silent import parameter
2018-11-30 18:27:13 +09:00
smoogipoo
d07a724970
Only allow replay screen changes in menu + songselect
2018-11-30 18:25:54 +09:00
smoogipoo
4c1abdcd8c
Save score upon map completion
2018-11-30 18:25:14 +09:00
smoogipoo
8eff49bccd
Remove User from Replay
2018-11-30 18:25:14 +09:00
Dean Herbert
aa7a665317
Merge remote-tracking branch 'upstream/master' into scoredatabase
2018-11-30 17:20:23 +09:00
Dean Herbert
3727955911
Refactors/renames
2018-11-30 16:35:45 +09:00
smoogipoo
bc3fcb87b7
Use input events rather than scene graph traversals
2018-11-30 15:47:55 +09:00
Dean Herbert
831cd3ed59
ScoreInfo scoreInfo -> ScoreInfo score
2018-11-30 15:18:52 +09:00
Dan Balasescu
e83f6707bf
Merge branch 'master' into editor-keyboard-seek
2018-11-30 15:17:06 +09:00
Dean Herbert
271dcded3c
Merge branch 'master' into scoredatabase
2018-11-30 14:59:58 +09:00
Dean Herbert
ab621bd873
Toggle pause in editor with spacebar
2018-11-30 14:58:09 +09:00
Dean Herbert
0ee5a5bdb4
Add support for keyboard seeking in the editor
2018-11-30 14:57:25 +09:00
Dean Herbert
5254b07680
Merge remote-tracking branch 'upstream/master' into inter-column-movements
2018-11-30 11:57:53 +09:00
smoogipoo
a88b69ec43
Notify of existing imports
2018-11-28 20:19:35 +09:00
smoogipoo
219929eb47
Score -> ScoreInfo
2018-11-28 18:33:01 +09:00
smoogipoo
5b409a5ae5
Fix missed renames
2018-11-28 17:27:22 +09:00
smoogipoo
ed02847752
Beatmap -> BeatmapInfo + add foreign key
2018-11-28 17:26:39 +09:00
smoogipoo
2ee181daf7
Re-namespace replay-related classes
2018-11-28 17:20:37 +09:00
smoogipoo
09b79d736b
Remove unused usings
2018-11-28 16:33:42 +09:00
smoogipoo
5fd6e6ca77
Re-namespacing
2018-11-28 16:12:57 +09:00
Dean Herbert
da79292250
Merge branch 'master' into fix_idle_tracker
2018-11-26 17:41:45 +09:00
Dean Herbert
32b36f2883
Use IBindable<>
2018-11-26 17:07:30 +09:00
Dean Herbert
626048038c
Handle the null case
2018-11-26 16:50:41 +09:00
Dean Herbert
8d65d49126
Use bindable flow for checking idle time
2018-11-26 16:32:59 +09:00
smoogipoo
dea387c31e
Fix post-merge issues
2018-11-26 16:29:56 +09:00
smoogipoo
dcf740e5d3
Merge remote-tracking branch 'origin/master' into multiplayer-room-settings
2018-11-26 16:27:22 +09:00
smoogipoo
f9f300b215
Fix drag breaking if scrolling while dragging
2018-11-26 16:08:56 +09:00
Dean Herbert
fe5b043a59
Merge branch 'master' into fix_idle_tracker
2018-11-26 15:24:44 +09:00
smoogipoo
56032a4522
Merge branch 'mania-selection-movement' into inter-column-movements
...
# Conflicts:
# osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs
# osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs
2018-11-26 11:45:48 +09:00
Dean Herbert
0bc4a01a6b
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-11-24 20:03:25 +09:00
Dan Balasescu
b446a73c0c
Add brackets
...
Co-Authored-By: peppy <pe@ppy.sh>
2018-11-23 10:06:06 +09:00
Dean Herbert
1b76e2faf5
Merge branch 'master' into fix-editor-precise-scroll
2018-11-23 09:57:35 +09:00
Dean Herbert
10047e6815
Adjust tick-based wheel control to be more correct
2018-11-22 20:13:40 +09:00
Dean Herbert
a48c26d999
Fix precision scroll events being handled incorrectly by editor
2018-11-22 19:40:44 +09:00
Dean Herbert
6cd69b794d
Fix leaderboard accessing drawables in a possibly invalid state
2018-11-22 19:08:46 +09:00
Dean Herbert
f91d2e2e07
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-11-22 10:25:30 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
Roman Kapustin
3c0ce2b615
Revert "Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle""
...
This reverts commit bcdaee7d39
2018-11-19 20:48:59 +03:00
smoogipoo
bcdaee7d39
Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"
...
This reverts commit 3e2e2a7000d94801b6c6
2018-11-19 17:52:31 +09:00
smoogipoo
55edeb095d
SelectionBox -> SelectionHandler
2018-11-19 16:58:11 +09:00
Dean Herbert
970ea928ae
Fix hold for menu button occasionally disappearing
2018-11-19 12:06:47 +09:00
Roman Kapustin
ecf8a89f26
Set AccentColour and GlowColour in StandardHealthDisplay
2018-11-16 19:30:58 +03:00
Dean Herbert
d09b674fb3
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-11-16 20:36:08 +09:00
smoogipoo
4cbda97b1e
Move positional adjustment to SelectionBox
2018-11-16 17:12:24 +09:00
Roman Kapustin
37b19f78ae
Set AccentColour in concrete counters
2018-11-15 23:37:21 +03:00
smoogipoo
df7515b66f
Pass all selected hitobjects to the selection blueprints
2018-11-15 21:01:09 +09:00
Dan Balasescu
e8f34ddff0
Merge branch 'master' into return_to_large_logo_after_idle
2018-11-15 15:16:10 +09:00
Dean Herbert
b574a07f23
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-11-15 13:31:34 +09:00
Dean Herbert
30547ac064
Merge remote-tracking branch 'upstream/master' into dropdown-updates
2018-11-14 20:03:45 +09:00
Dan Balasescu
81a3170e3b
Merge branch 'master' into hold-for-menu-back
2018-11-14 19:13:07 +09:00
smoogipoo
c963fc7cd2
Reduce chaining
2018-11-14 18:34:13 +09:00
Dan Balasescu
e9b47c6233
Merge branch 'master' into hold-for-menu-back
2018-11-14 18:22:34 +09:00
smoogipoo
aff5fa6169
Update with osu!-side dropdown changes
2018-11-14 18:02:38 +09:00
Dean Herbert
93fe3ae333
Merge branch 'master' into tournament-tools
2018-11-13 17:49:12 +09:00
smoogipoo
6d43baf4bf
Make show/hide only invoked once each
2018-11-13 13:12:11 +09:00
smoogipoo
fbc20d2d4d
Hide placement when cursor is not in the playfield
2018-11-13 12:52:04 +09:00
Dean Herbert
a8b1e509e7
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-11-07 17:30:52 +09:00
smoogipoo
5d51719572
Make selection blueprints handle position adjustments
2018-11-07 16:21:32 +09:00
smoogipoo
e9e50f41fb
Use Name/NameScreen format
2018-11-07 13:04:17 +09:00
Dean Herbert
7f73fc2d39
Require holding back button to quit gameplay
...
Avoids accidental presses and streamlines logic with on-screen element.
2018-11-07 01:49:21 +09:00
smoogipoo
52f4923c8e
Remove intermediate Screens namespace
2018-11-06 18:28:22 +09:00
smoogipoo
ac25718c5a
Renamespace compose-mode components
2018-11-06 18:14:46 +09:00
smoogipoo
27d82052f4
BorderLayer -> EditorPlayfieldBorder
2018-11-06 18:10:46 +09:00
smoogipoo
85f96ad62f
Fix a few missed renames
2018-11-06 18:07:53 +09:00
smoogipoo
bd775af274
PlacementMask -> PlacementBlueprint
2018-11-06 18:04:03 +09:00
smoogipoo
11be820efe
CreateMaskFor -> CreateBlueprintFor
2018-11-06 18:03:21 +09:00
smoogipoo
90c813618a
Merge PlacementContainer into BlueprintContainer
2018-11-06 18:02:55 +09:00
smoogipoo
f2a5f28ea2
SelectionMask -> SelectionBlueprint
2018-11-06 17:56:04 +09:00
smoogipoo
ad2836a61e
MaskSelection -> SelectionBox
2018-11-06 17:52:47 +09:00
smoogipoo
65bb91dcf7
Merge MaskContainer into BlueprintContainer
2018-11-06 17:51:26 +09:00
smoogipoo
26c9390c16
HitObjectMaskLayer -> BlueprintContainer
2018-11-06 17:36:10 +09:00
smoogipoo
faab744cbd
DragLayer -> DragBox
2018-11-06 17:24:57 +09:00
Dean Herbert
43c70d354d
Merge tag '2018.1105.0' into tournament-tools
2018-11-06 00:35:21 +09:00
smoogipoo
171700cb91
Debounce editor summary timeline seeks
2018-11-05 15:59:40 +09:00
Dean Herbert
5006dc47a3
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-11-04 02:26:17 +09:00
Dean Herbert
0a0023920f
Fix not being able to drag control points mid-snake
2018-11-02 04:09:33 +09:00
Dean Herbert
0f1ffe392f
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-11-01 17:52:24 +09:00
Paul Teng
d8f97a32c7
Make sure restart on fail actually fails
2018-10-31 07:03:37 -04:00
Dean Herbert
d7f3e51050
Merge branch 'master' into editor-mask-placement
2018-10-31 15:00:38 +09:00
Kyle Chang
214ed43b81
Check if SongSelect is current screen before playing selected song
2018-10-30 23:47:54 -04:00
Dean Herbert
5eaf80ab76
Add missing newline
2018-10-31 12:07:06 +09:00
Dean Herbert
b28c0cd128
Merge branch 'master' into editor-mask-placement
2018-10-31 06:46:48 +09:00
Dean Herbert
5f5e30c378
Merge branch 'master' into mask-separation
2018-10-31 05:59:07 +09:00
Dean Herbert
6dde5e3b4a
Merge branch 'master' into auto-restart-mod-perfect
2018-10-31 03:56:08 +09:00
Dean Herbert
6f1ef3243d
Proportionally adjust width in line with change
2018-10-31 02:56:25 +09:00
Dean Herbert
4502fa39e9
Merge remote-tracking branch 'upstream/master' into reduce-handle-height
2018-10-31 02:55:38 +09:00
Paul Teng
4bc9161cd1
Leave bigger gap if replaying
2018-10-30 08:32:12 -04:00
Paul Teng
007dfedbb7
Combine RestartOnFail into FailOverride
2018-10-30 07:12:06 -04:00
smoogipoo
5712a52817
Merge remote-tracking branch 'origin/master' into mask-separation
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
2018-10-30 16:46:13 +09:00
Paul Teng
eaa035832e
Merge branch 'master' into auto-restart-mod-perfect
2018-10-29 08:15:29 -04:00
smoogipoo
619a0dfd59
Merge branch 'separate-slider-body' into editor-mask-placement
...
# Conflicts:
# osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs
2018-10-29 15:24:15 +09:00
Kyle Chang
c7e950af7f
Remove EditSelected in favor in inlining beatmapNoDebounce in Edit
2018-10-29 00:04:51 -04:00
Kyle Chang
886dd0f0d4
Remove unneeded using directive
2018-10-28 13:21:12 -04:00
Kyle Chang
2b736c3cd6
Make beatmap edit button reload beatmap without mods
2018-10-28 13:04:45 -04:00
Kyle Chang
f8a8c7cb6b
Stop transferring track when editing
2018-10-28 12:43:19 -04:00
HoLLy
cf3b4447eb
Fade only textContainer instead of entire MetadataSection
2018-10-26 13:35:51 +02:00
smoogipoo
8703db5cc1
Rename HitObjectMask -> SelectionMask
2018-10-26 13:31:23 +09:00
HoLLy
88aca46500
Fade MetadataSection back in if non-null Text is set
2018-10-24 18:53:22 +02:00
Unknown
d83ce7e4bb
don't allow null values in FilterCriteria, ensure values in test instead
2018-10-19 12:22:10 +02:00
Paul Teng
b351aae93f
Reduce height of song progress handle
2018-10-18 07:02:18 -04:00
smoogipoo
72d48aa7f5
Add xmldocs to IPlacementHandler
2018-10-18 16:46:30 +09:00
smoogipoo
0e841628b6
Implement hitobject deletion
2018-10-18 16:36:06 +09:00
smoogipoo
969477dadd
Remove placement events, make everything pass top-down
2018-10-17 17:43:16 +09:00
smoogipoo
62635c5ab8
Add container to handle placement mask
2018-10-17 16:17:49 +09:00
smoogipoo
4ea4ec0d25
Move placement handling events to a higher level
2018-10-17 15:46:30 +09:00
smoogipoo
70f1d17b7e
Merge remote-tracking branch 'origin/master' into editor-mask-placement
...
# Conflicts:
# osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs
# osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs
# osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
2018-10-16 17:28:16 +09:00
Paul Teng
fd774c6a09
Allow restarts in ModPerfect
2018-10-14 11:18:52 -04:00
Dean Herbert
eaa5ef5168
Merge branch 'master' into return_to_large_logo_after_idle
2018-10-12 22:14:23 +09:00
Dean Herbert
77055f6d5c
Merge remote-tracking branch 'upstream/master' into tournament-tools
2018-10-12 18:49:47 +09:00
Unknown
11dad7bf74
filter beatmaps by star range
2018-10-10 16:46:02 +02:00
Dean Herbert
2babdc079c
Merge pull request #3568 from smoogipoo/fix-beatmap-details
...
Fix beatmap details not displaying
2018-10-10 20:14:58 +09:00
Dean Herbert
d28b9860ff
Don't use "beatmapset" terminology
2018-10-10 19:26:35 +09:00
Dean Herbert
841b2e8692
Merge branch 'master' into consistent-terminology-format
2018-10-10 19:19:36 +09:00
Dean Herbert
3be50c2941
Merge branch 'master' into return_to_large_logo_after_idle
2018-10-09 18:02:36 +09:00
smoogipoo
6d24bde72b
Fix beatmap details not displaying
2018-10-09 17:39:27 +09:00
smoogipoo
934b687965
Fix selection masks not being added for new objects
2018-10-03 16:49:59 +09:00
smoogipoo
4cdb6dcea5
Rename HitObjectMask -> SelectionMask
2018-10-03 13:28:00 +09:00
ekrctb
68980fc477
Adjust usage of Handle(Non)PositionalInput to follow framework update
2018-10-02 14:45:33 +09:00
ekrctb
b7a2ad1aa5
Use UIEvent level getters for modifier keys.
2018-10-02 13:26:36 +09:00
ekrctb
50091252e2
Adapt signature change of event handlers
2018-10-02 12:02:55 +09:00
ekrctb
99fc04c8af
Change signature to new event handler
2018-10-02 12:02:47 +09:00
Dean Herbert
6841d5c2ec
Merge remote-tracking branch 'smoogipoo/fix-beatmapinfowedge' into update-framework
2018-09-28 18:32:59 +09:00
Roman Kapustin
baf9e028c3
Fix possible idleTracker nullref
2018-09-26 19:44:01 +03:00
Dean Herbert
a4bf21268b
Merge remote-tracking branch 'upstream/master' into update-framework
2018-09-26 19:59:18 +09:00
smoogipoo
a8f156584b
Update framework with positional/non-positional changes
2018-09-26 14:01:15 +09:00
Roman Kapustin
bdba22a576
Override Handle(UIEvent e) in IdleTracker
2018-09-25 20:11:10 +03:00
Roman Kapustin
c7b3fa51d5
Inject IdleTracker into ButtonSystem
2018-09-25 19:58:50 +03:00
UselessToucan
3c0b77658c
Merge branch 'master' into return_to_large_logo_after_idle
2018-09-25 19:48:38 +03:00
smoogipoo
cb500e80e4
Make BeatmapInfoWedge present until info is not null
2018-09-25 14:45:26 +09:00
Roman Kapustin
5c741eaa89
Fix possible game nullref
2018-09-21 17:07:46 +03:00
Paul Teng
ed0ea3ad41
Merge branch 'master' into patch-1
2018-09-21 06:31:15 -04:00
Dean Herbert
51dcfeee92
Move existing tournament resources to new project
2018-09-21 18:18:28 +09:00
smoogipoo
4380ef15bf
Fix potential exception during async load callback
2018-09-21 16:31:09 +09:00
Paul Teng
654345f380
Remove duplicate condition test
2018-09-20 22:32:24 -04:00
Paul Teng
1644719893
Update SongSelect.cs
2018-09-20 22:29:37 -04:00
Paul Teng
49fbe8443a
Test if there are beatmaps when click on delete btn
2018-09-20 22:00:20 -04:00
Dean Herbert
83bf38f4bc
Make menu background blurrable
...
Not actually blurring yet, needs further testing.
2018-09-21 03:13:34 +09:00
Dean Herbert
78d78b5510
Fade menu background a bit when menu is active
2018-09-21 03:13:15 +09:00
Dean Herbert
07a1c39fe5
Use random default background on starting the game
2018-09-21 03:12:20 +09:00
Dean Herbert
37f3035437
Merge remote-tracking branch 'upstream/master' into update-framework
2018-09-20 18:39:48 +09:00
smoogipoo
62135c39aa
Cleanup
2018-09-20 12:56:39 +09:00
smoogipoo
7b8094d731
Move text size/padding out of constructor
2018-09-20 12:53:45 +09:00
Dean Herbert
ae4c371bec
Merge branch 'update-framework-event-handling' into update-framework
2018-09-20 00:29:42 +09:00
Dean Herbert
b2cf636ab5
Merge branch 'localisation-changes' into update-framework
2018-09-20 00:29:31 +09:00
smoogipoo
38a3c2a820
Fix song select wedge sometimes not updating when localisation changes
2018-09-19 14:57:32 +09:00
smoogipoo
28f31540c4
Apply changes in-line with framework localisation changes
2018-09-19 14:07:46 +09:00
ekrctb
b790e16217
Use Click instead of now removed TriggerOnClick
2018-09-19 11:42:32 +09:00
ekrctb
a3e6973b41
Replace usage of now removed TriggerKeyPress and similar methods.
2018-09-19 11:36:55 +09:00
Dan Balasescu
d3bb78d139
Merge branch 'master' into add-rank-status
2018-09-18 14:10:42 +09:00
Joehu
f99eff1192
Use consistent terminology format
2018-09-15 07:30:11 -07:00
Dean Herbert
41be757a11
Merge branch 'master' into fix-logo-overhead
2018-09-15 18:33:22 +09:00
Dean Herbert
79b56cb35c
Make saveState private
2018-09-15 16:34:08 +09:00
Dean Herbert
65b2bceef2
Simplify implementation
2018-09-15 14:51:04 +09:00
Dean Herbert
1662575f88
Merge branch 'master' into replay_keycounter
2018-09-14 19:08:54 +09:00
Unknown
04853b8c83
don't show StatusPill without a difficulty
2018-09-13 13:49:57 +02:00
Unknown
5414ce9932
add StatusPill to BeatmapInfoWedge and DrawabelCarouselBeatmapSet
2018-09-13 10:18:20 +02:00
Roman Kapustin
749e89bd25
Introduce IdleTracker
2018-09-12 20:34:52 +03:00
Roman Kapustin
761d7629cd
Return to large logo after idle period
2018-09-12 18:09:19 +03:00
Dean Herbert
7c7f0e11e3
Merge branch 'master' into fix-logo-overhead
2018-09-11 01:22:44 +09:00
smoogipoo
92386edb32
Scale the results screen score to keep it in view
2018-09-10 18:13:44 +09:00
Dean Herbert
e6d5bbd886
Merge branch 'master' into multiplayer-room-settings
2018-09-09 22:40:08 +09:00
Dean Herbert
f149a66a4d
Use LargeTextureStore for all online texture retrieval
...
Until now, many online textures were retrieved via the default texture store, which causes them to never be removed from GPU memory. It also has a performance overhead due to mipmap generation (which will be avoided via ppy/osu-framework#1885 .
2018-09-09 02:45:37 +09:00
Dean Herbert
0f9aa834e5
Fix osu! logo being present throughout the whole game
2018-09-08 16:31:59 +09:00
Roman Kapustin
125b569ccb
Change AudioClock type to IFrameBasedClock and comment its usage
2018-09-07 21:39:41 +03:00
Roman Kapustin
dae54d252d
Remove redundant checks in RestoreState
2018-09-07 21:35:32 +03:00
Dean Herbert
cc533a05c5
Update framework
2018-09-07 19:00:43 +09:00
Dean Herbert
81da7ce298
Merge branch 'master' into add-skin-import-delete
2018-09-07 16:48:01 +09:00
Dean Herbert
a1780fddc9
DrawInfo -> DrawColourInfo
2018-09-06 18:02:04 +09:00
Dean Herbert
c23b9b61a8
Simplify implementation in line with framework improvements
2018-09-06 17:28:08 +09:00
Dean Herbert
e63f60231a
Optimise carousel memory usage by unloading off-screen panels
2018-09-06 13:31:37 +09:00
Roman Kapustin
7a1fdd9dc8
Reset KeyCounter if targetState was not found
2018-09-06 01:01:36 +03:00
Dean Herbert
5aff19eaea
Merge branch 'master' into replay_keycounter
2018-09-05 08:53:02 +09:00
Dean Herbert
fa569e5ae4
Offer to import skins on first startup
2018-09-03 10:10:39 +09:00
Dean Herbert
144e80dff6
Add "import all skins from stable" option (and mass delete)
2018-09-03 10:10:04 +09:00
Dean Herbert
03084aa04b
Revert async changes
2018-08-31 07:07:10 +09:00
Dean Herbert
919e78a89a
Attempt to fix cross-thread database usage
2018-08-29 01:42:25 +09:00
smoogipoo
e7a5816d27
Use GetAsync for all samples
2018-08-27 17:30:16 +09:00
smoogipoo
1b279d383f
Use GetAsync on all textures
2018-08-27 17:26:44 +09:00
DrabWeb
c72281d0f2
Change local bindings instead of room bindings.
2018-08-24 19:27:16 -03:00
DrabWeb
90e178821a
Limit max participants field to only numbers.
2018-08-24 19:19:16 -03:00
DrabWeb
c5f0b27544
Speedup transition.
2018-08-24 19:11:52 -03:00
Dan Balasescu
83ca3053c5
Merge branch 'master' into break-overlay-double-parallax
2018-08-24 15:10:28 +09:00
Dean Herbert
9f3f07df2e
Fix notifications appearing too early in load process
2018-08-23 11:21:56 +09:00
Dean Herbert
9cbead55d6
Add a second parallax layer to break overlay arrows
2018-08-22 17:41:13 +09:00
smoogipoo
2fb62827e2
Soft-handle errors when beatmap contains no objects
2018-08-22 16:01:58 +09:00
Dean Herbert
22dce64d6d
Merge branch 'master' into circular-button
2018-08-21 19:15:20 +09:00
Dan Balasescu
9d2c679f12
Merge branch 'master' into fix-logo-flying
2018-08-21 10:16:03 +09:00
Dean Herbert
4a68b14447
Fix crash when selecting mods after entering play mode
...
Closes #3260 .
2018-08-21 00:15:51 +09:00
Dean Herbert
39aa98d12d
Fix logo flying off-screen when exiting game
2018-08-20 14:58:02 +09:00
Dean Herbert
18aa30fcb0
Unbind song select's ruleset to avoid test failures
2018-08-20 14:27:32 +09:00
Roman Kapustin
8a9b3f6459
Remove rewinded keycounter states
2018-08-15 22:18:48 +03:00
smoogipoo
85dc42d47a
Re-namespace/rename CircularButton
2018-08-15 16:49:53 +09:00
DrabWeb
e65bb5b54b
Remove unused usings, remove unused icon variable.
2018-08-14 12:34:05 -03:00
DrabWeb
7d8c0aca72
Order usings, use inline out variable declaration.
2018-08-14 12:25:35 -03:00
DrabWeb
3d0b1b6009
Cleanup.
2018-08-14 12:08:00 -03:00
DrabWeb
ea523baa4a
Add hover animations to GameTypePicker and RoomAvailabilityPicker.
2018-08-14 11:54:35 -03:00
DrabWeb
c66578ba5b
Allow tabbing between text fields.
2018-08-14 11:36:46 -03:00
DrabWeb
af31845c83
Fix naming conflicts in RoomSettingsOverlay.
2018-08-14 11:31:20 -03:00
DrabWeb
52b157d072
Merge https://github.com/ppy/osu into multiplayer-room-settings
2018-08-14 11:16:25 -03:00
Dean Herbert
5112f9b69f
Merge branch 'master' into fix-ruleset-change
2018-08-14 14:48:09 +09:00
smoogipoo
970aa811bd
Fix mods not being reset prior to ruleset changing
2018-08-14 13:19:50 +09:00
Dean Herbert
270dc2d1be
Merge branch 'master' into judgement-rework
2018-08-14 13:16:16 +09:00
Dean Herbert
4453b5faca
Cache mods at PlaySongSelect
2018-08-08 12:43:08 +09:00
Dean Herbert
70ce9da321
Merge branch 'master' into judgement-rework
2018-08-07 18:09:06 +09:00
Dean Herbert
4cb7063801
Add automated testing of mod preservation/removal
2018-08-07 16:45:18 +09:00
Dean Herbert
7b8bd7f21c
Fix mod selection not restoring when re-entering song select
2018-08-07 14:49:44 +09:00
Dan Balasescu
12b99acb2b
Merge branch 'master' into add-loading-animation
2018-08-06 13:06:51 +09:00
Dan Balasescu
c1517e1521
Merge branch 'master' into judgement-rework
2018-08-06 12:30:46 +09:00
Dean Herbert
0c920fe486
Merge branch 'master' into mania-mask-container
2018-08-06 04:22:21 +09:00
Dean Herbert
808754a191
Merge branch 'master' into fix-fade-discrepancies
2018-08-03 21:50:03 +09:00
Dean Herbert
042e4e3966
Merge branch 'master' into add-loading-animation
2018-08-03 21:50:02 +09:00
Dean Herbert
6ee06602b8
Merge branch 'master' into mania-mask-container
2018-08-02 20:41:27 +09:00
smoogipoo
3619290c34
Split out judgement definition from judgement result
2018-08-02 20:35:54 +09:00
Dean Herbert
4bd811bd2d
Merge branch 'master' into circular-button
2018-08-02 20:25:45 +09:00
Dean Herbert
b1afcf0e5d
Add loading animation to player loader to make it more obvious when loading is complete
2018-08-02 19:47:50 +09:00
Dean Herbert
7097ecb740
Fix discrepancies in how elements of play mode fade when restarting/exiting
2018-08-02 19:08:23 +09:00
Dean Herbert
4a11f2ec2a
Improve UX when adjusting visual settings at loading screen
2018-08-02 18:18:55 +09:00
smoogipoo
10b8708d4e
Make SetupCircularButton adjust corner radius by height
2018-08-01 17:47:32 +09:00
smoogipoo
9eb47ae691
Make SetupCircularButton inherit OsuButton
2018-08-01 17:02:52 +09:00
ekrctb
ecc6d55380
Fix player loader not gets ready when multiple mouse button is down
2018-08-01 16:20:29 +09:00
Shane Woolcock
47533f83c3
Update TabControl subclasses to use AddInternal
2018-07-31 20:52:11 +09:30
smoogipoo
c9d4332846
size_x, size_y -> width, height
2018-07-31 16:44:20 +09:00
Dean Herbert
9ab56bc4ef
Make Ruleset non-public
2018-07-31 16:35:51 +09:00
smoogipoo
c5a772bbc8
Completely reuse TriangleButton
2018-07-31 15:49:04 +09:00
Dean Herbert
ddecf59cfd
Merge branch 'master' into open-downloaded-beatmas
2018-07-31 13:21:14 +09:00
Dan Balasescu
090bc592b5
Merge branch 'master' into add-skip-button-sound
2018-07-30 17:56:08 +09:00
Dean Herbert
8c3583ac54
Remove newline
2018-07-30 14:55:03 +09:00
Roman Kapustin
3134e14b37
Test KeyCounter.RestoreState
2018-07-28 23:24:03 +03:00
Roman Kapustin
8bb83a8fd9
Fix nullref in KeyCounterCollection
2018-07-28 22:16:14 +03:00
Roman Kapustin
1e6220e3c0
Call KeyCounter.RestoreState itself
2018-07-28 13:22:52 +03:00
Dean Herbert
b7de922896
Merge branch 'master' into open-downloaded-beatmas
2018-07-28 12:44:34 +09:00
phosphene47
d32a3ff052
Esc at the end of play should push to result screen
...
Closes #3060
2018-07-28 08:34:51 +10:00
AlFasGD
93cf063c97
Remove useless things
2018-07-27 12:52:33 +03:00
AlFasGD
1962797e20
Remove unnecessary using directive
2018-07-27 12:40:38 +03:00
AlFasGD
78cde95132
Privatise constants
2018-07-27 12:34:11 +03:00
AlFasGD
3ee1353976
Remove whitespace
2018-07-27 12:28:47 +03:00
AlFasGD
2a819a53c0
Prefer inheriting TriangleButton instead of Container
2018-07-27 12:26:37 +03:00
Dan Balasescu
ceaa23fbbb
Merge branch 'master' into fix-turkish-i
2018-07-26 18:06:58 +09:00
Dan Balasescu
6c290702a3
Merge branch 'master' into labelled-text-box-fixes
2018-07-25 21:21:06 +09:00
AlFasGD
c4b1ba2979
Remove padding, fix corner radiuses
2018-07-25 15:14:40 +03:00
Dean Herbert
95cca046fb
Merge branch 'master' into open-downloaded-beatmas
2018-07-25 12:38:49 +02:00
Dean Herbert
ff04527c6d
Merge branch 'master' into fix-always-skipping
2018-07-25 12:30:39 +02:00
smoogipoo
206e3686f2
Add back blue border
2018-07-25 18:38:50 +09:00
smoogipoo
127084ba74
Merge remote-tracking branch 'origin/master' into labelled-text-box
2018-07-25 18:35:04 +09:00
smoogipoo
b60e4b0728
Cleanup
2018-07-25 18:34:47 +09:00
Dan Balasescu
53e55c2f14
Merge branch 'master' into fix-always-skipping
2018-07-25 15:30:24 +09:00
Dean Herbert
38f221cd60
Merge branch 'master' into fix-turkish-i
2018-07-25 08:15:20 +02:00
Dean Herbert
da8fc0ee5d
ToLower -> ToLowerInvariant
2018-07-25 07:37:05 +02:00
AlFasGD
6675c455f3
Trim whitespace that magically appeared
2018-07-24 22:33:19 +03:00
AlFasGD
3ca112aef0
Clean code and apply requested changes
2018-07-24 22:04:02 +03:00
Dean Herbert
5364a6148a
Use ToUpperInvariant
2018-07-24 14:42:06 +02:00
Dean Herbert
ab9340f4be
Fix usage of culture local ToUpper causing incorrect display on Turkish machines
...
Closes #3098 .
2018-07-24 11:37:43 +02:00
AlFasGD
ebf14c9c93
Update framework from current master
2018-07-24 11:32:24 +03:00
AlFasGD
d304aca08f
Merge branch 'master' into circular-button
2018-07-24 11:30:56 +03:00
AlFasGD
4d0d4523ca
Add test case, rename component
2018-07-24 11:23:38 +03:00
AlFasGD
0e50e4ee34
Clean code
2018-07-24 10:10:17 +03:00
AlFasGD
765c6e4ecc
Remove custom text box
2018-07-24 09:46:24 +03:00
AlFasGD
2f452c162c
Make text colour white
2018-07-24 09:21:01 +03:00
AlFasGD
a833fa3d92
Update framework and apply suggested changes
2018-07-24 09:19:45 +03:00
AlFasGD
cd37b0df23
Merge branch 'master' into labelled-text-box
2018-07-24 09:19:22 +03:00
AlFasGD
dd56a2d95f
Apply proposed changes (untested)
2018-07-23 15:44:10 +03:00
Dean Herbert
1b456fd716
Fix a potential InvalidOperationException when entering song select
...
Closes #3052 .
2018-07-23 13:11:06 +02:00
Dean Herbert
44a2ae5f9a
Fix incorrect variable usage
2018-07-23 08:33:47 +02:00
Dean Herbert
aead4be134
Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container
2018-07-23 06:36:10 +02:00
Roman Kapustin
332ad5bb67
Move states to KeyCounter
2018-07-22 23:58:21 +03:00
Dean Herbert
479fe98335
Add more prominent sound when skipping
2018-07-22 22:57:55 +02:00
Dean Herbert
3c59ccadd0
Fix gameplay always skipping to first hitobject time
...
Regresssed with previous build
2018-07-22 22:19:58 +02:00
Roman Kapustin
ecd51d70f9
Rename Memento class
2018-07-22 23:13:06 +03:00
Roman Kapustin
d387048057
Resolve KeyCounterCollection merge conflict
2018-07-22 21:15:53 +03:00
Roman Kapustin
7f3ad37ede
Restore keycounter state on replay seek
2018-07-22 19:42:18 +03:00
Roman Kapustin
1d9bf42082
Fix clock assigning during KeyCounterCollection creation
2018-07-22 18:38:10 +03:00
Roman Kapustin
0632c59e60
Save KeyCounter state when keypress happens
2018-07-22 17:35:42 +03:00
Roman Kapustin
72959691e9
Introduce KeyCounterMemento
2018-07-22 17:16:17 +03:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21:53 +09:00
Dean Herbert
a2f744b05e
Merge remote-tracking branch 'upstream/master' into open-downloaded-beatmas
2018-07-21 00:03:17 +09:00
AlFasGD
7b4616c6c1
Add circular button file
2018-07-20 14:02:02 +03:00
AlFasGD
f200cfe40d
Add labelled text box files
2018-07-20 13:05:19 +03:00
Dean Herbert
241437c819
Remove unnecessary counting change logic
2018-07-20 17:08:25 +09:00
Dean Herbert
64ead0fdf7
Add more tests and fix one remaining issue case
2018-07-20 11:55:17 +09:00
Dean Herbert
d7f1766ee2
wip
2018-07-19 18:51:08 +09:00
Dean Herbert
c31676f8f1
Rework update methods to separate out ruleset and beatmap changes
...
Combining them was causing complexity and logic errors.
2018-07-19 18:48:40 +09:00
smoogipoo
b7721edc80
Remove more unnecessary changes
2018-07-19 18:25:28 +09:00
Dean Herbert
82ddbb3f5d
Delay key count stop
2018-07-19 01:18:07 +09:00
Dean Herbert
8414fe9d05
Add key counter exceptions for paused state
2018-07-18 22:19:32 +09:00
Dean Herbert
a01361f833
Set restart count
2018-07-18 22:05:24 +09:00
Dean Herbert
c2cdf12986
Better pause logic
2018-07-18 19:59:04 +09:00
Dean Herbert
9611292f4e
FilterTask -> PendingFilter
2018-07-18 13:18:50 +09:00
Dean Herbert
f1c3fbe644
Improve integrity of song select bind/change logic
2018-07-18 13:18:50 +09:00
smoogipoo
6437fdd9db
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-07-17 16:46:48 +09:00
smoogipoo
c51fe6a119
Remove more unused stuff
2018-07-17 16:01:47 +09:00
smoogipoo
9f730dd784
Merge branch 'editor-composer-cleanup' into mania-mask-container
...
# Conflicts:
# osu.Game/Rulesets/Edit/HitObjectComposer.cs
# osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs
2018-07-17 16:00:46 +09:00
smoogipoo
0b66f63f7d
Invert flow order of hitobjects between composer and mask layers
2018-07-17 15:35:32 +09:00
Dean Herbert
e681bd3244
Merge branch 'master' into fix-incorrect-mods
2018-07-17 15:23:21 +09:00
Dean Herbert
b967fe714b
Fix lead-in time now being long enough in many cases
2018-07-17 14:29:22 +09:00
Dan Balasescu
745d596343
Merge branch 'master' into fix-incorrect-mods
2018-07-17 13:41:02 +09:00
Dan Balasescu
7a2dc3c674
Merge branch 'master' into clickable-download-notifications
2018-07-17 13:29:16 +09:00
smoogipoo
577ff4cc7f
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
# osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game.Rulesets.Mania/UI/ManiaStage.cs
2018-07-17 13:13:57 +09:00
Dan Balasescu
e4fc3a1c65
Merge branch 'master' into fix-drawable-load-regression
2018-07-17 12:22:12 +09:00
Dean Herbert
da300baff1
Update hide logic
2018-07-17 00:06:51 +09:00
Dean Herbert
ca7b61367f
Merge branch 'master' into correctQuickFade
2018-07-17 00:02:15 +09:00
Dean Herbert
4829f4f09c
Merge branch 'master' into download-button-state
2018-07-16 03:17:26 +09:00
HoutarouOreki
453d58bcbd
Hide Content instead of particular overlays
2018-07-15 01:10:05 +02:00
HoutarouOreki
07183c0069
Hide Content instead of particular overlays
2018-07-15 00:52:15 +02:00
Berkan Diler
c8697e1743
Fix KeyCounter counting clicks when game is paused
2018-07-14 03:08:28 +02:00
Dean Herbert
4f5578245e
Fix regression causing previews to not play
2018-07-13 21:45:49 +09:00
Dean Herbert
63c40e9051
Remove unnecessary cache operations
2018-07-13 21:45:42 +09:00
Dean Herbert
a1a077398c
Merge remote-tracking branch 'upstream/master' into peppy-clickable-download-notifications
2018-07-13 21:04:17 +09:00
Dean Herbert
bbb11a4066
Fix regression in drawable rank first display
2018-07-13 19:53:29 +09:00
Dean Herbert
ee2c7c50ad
Tidy up button hierarchy
2018-07-13 16:28:18 +09:00
Dean Herbert
ac078153ae
Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods
2018-07-13 14:20:56 +09:00
Dan Balasescu
e20cdccf05
Merge branch 'master' into update-disclaimer
2018-07-12 23:41:55 +09:00
Dean Herbert
5df2df9b3a
Fix osu! logo handling non-left mouse buttons
2018-07-12 12:36:58 +09:00
HoutarouOreki
fde9df3938
Same as #3006 + hide gameplay instantly
2018-07-11 14:47:34 +02:00
HoutarouOreki
1e48582dc2
Instantly hide pause menu for quick retry
2018-07-11 13:49:37 +02:00
Dean Herbert
fbc5250bf1
Update framework
2018-07-11 17:12:01 +09:00
