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
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
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
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
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
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
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
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
Dean Herbert
8bc7c4c9a2
Add TestCase and update disclaimer screen
2018-07-11 16:30:51 +09:00
HoutarouOreki
4c6286a3ca
Fix license header
2018-07-10 22:16:08 +02:00
HoutarouOreki
ffe82aad25
Add basic quick exit functionality
2018-07-10 21:57:09 +02:00
Dean Herbert
1418d1369f
Add the ability to click completed download notifications to select beatmap
...
Closes #2731 .
2018-07-11 01:32:10 +09:00
Dan Balasescu
40ec486152
Merge branch 'master' into improve-button-system
2018-07-10 16:44:55 +09:00
Dean Herbert
9e59b4a8e2
Fix SongSelect binding to ruleset too early
...
Causes music to stop playing while at main menu.
2018-07-10 01:29:24 +09:00
Dan Balasescu
ee4607c86e
Merge branch 'master' into fix-exit-race-condition
2018-07-09 19:02:37 +09:00
Dean Herbert
49e94850b6
Fix being able to trigger player before carousel is ready
...
Causes an eventual crash.
2018-07-09 18:43:20 +09:00
Dean Herbert
09b3375a9d
Fix pressing escape too fast causing multiple exit attempts at song select
2018-07-09 18:12:23 +09:00
smoogipoo
0a67e5a274
Fix some possible null reference exceptions
2018-07-09 17:09:17 +09:00
DrabWeb
6b240280d0
Merge https://github.com/ppy/osu into multiplayer-room-settings
2018-07-07 01:10:27 -03:00
Dean Herbert
0b30e6eb6a
Merge remote-tracking branch 'upstream/master' into peppy-improve-button-system
2018-07-06 17:55:02 +09:00
Dean Herbert
c025158735
Give VisibleState a default rather than nullable
2018-07-06 17:53:06 +09:00
Dan Balasescu
8f3f872182
Merge branch 'master' into go-forward
2018-07-06 14:29:26 +09:00
Dean Herbert
e28a610757
Fix mods not correctly resetting when changing ruleset at song select
2018-07-05 13:22:52 +09:00
Dean Herbert
5fc17bacf3
Add "Select" action
...
Allows progressing forwards in the interface
2018-07-03 18:39:15 +09:00
Dean Herbert
2aae528e1c
Improve code quality of main menu button system
2018-07-03 18:23:41 +09:00
Joehu
d476842c44
Fix FooterButton clicking area
2018-07-02 22:03:17 -07:00
Dan Balasescu
118366303c
Merge branch 'master' into fix-leaderboard-placeholder
2018-07-02 17:17:40 +09:00
Dan Balasescu
e5947cc969
Merge branch 'master' into non-null-ruleset
2018-07-02 15:32:55 +09:00
smoogipoo
4070c1a888
Merge remote-tracking branch 'origin/master' into non-null-ruleset
...
# Conflicts:
# osu.Game/Screens/Select/FilterControl.cs
2018-07-02 15:05:34 +09:00
Dan Balasescu
2c19790a97
Merge branch 'master' into fix-background-screen-crash
2018-07-02 15:01:59 +09:00
Dean Herbert
2c597874bf
Fix leaderboard showing placeholder briefly when entering song select
2018-07-01 18:17:02 +09:00
Dean Herbert
b9b1e77172
Merge branch 'master' into allow-back-in-player
2018-06-29 21:54:18 +09:00
Dean Herbert
6a80a21078
Tidy up escape handling
2018-06-29 21:06:38 +09:00
smoogipoo
6d6436c8d3
Fix ruleset not getting updated if changed
2018-06-29 20:50:39 +09:00
smoogipoo
9187eb8626
SongSelect needs to recache as IBindable
2018-06-29 20:50:30 +09:00
Dean Herbert
8cf1553fd5
Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player
2018-06-29 20:30:42 +09:00
Dean Herbert
06bd3d4815
Use IBindable where possible
2018-06-29 20:28:28 +09:00
Dean Herbert
0e649b8866
Change logic
2018-06-29 20:16:24 +09:00
Dean Herbert
34fef3caba
Update exception type
2018-06-29 20:13:29 +09:00
Dean Herbert
9fce4eaccf
Merge branch 'master' into di-backed-ruleset
2018-06-29 19:33:12 +09:00
Dean Herbert
1c32951d4b
Ensure toolbar triggers updates to SongSelect's ruleset
2018-06-29 19:32:42 +09:00
Dean Herbert
6d6fcc953b
Trim lines
2018-06-29 19:25:20 +09:00
Dean Herbert
750f5a86c3
Fix catch test failing due to disabled bindable
2018-06-29 16:49:11 +09:00
Dean Herbert
be2d3d6ad4
Merge branch 'master' into fix-supporter-naming
2018-06-28 17:34:21 +09:00
Dean Herbert
a377e87bf6
Add missing licence headers
2018-06-28 17:34:04 +09:00
Dean Herbert
3b0c4ff16b
Tidy code
2018-06-28 14:08:15 +09:00
Dean Herbert
c44a81bdf5
Add word wrap support
2018-06-28 13:04:39 +09:00
smoogipoo
01b90aaffe
Fix CI not passing
2018-06-28 11:58:06 +09:00
Joehu
8518fce4a9
Fix osu!supporter naming
2018-06-27 17:57:55 -07:00
smoogipoo
b88c4464cb
Make virtual beatmap tracks approximate beatmap length
2018-06-27 16:02:49 +09:00
Dean Herbert
527d7c29f2
Merge branch 'master' into fix-background-screen-crash
2018-06-27 16:00:59 +09:00
Dean Herbert
0866dd11bd
DefaultBackAction -> BackAction, defaults to last button
...
The last button is more commonly the escape condition.
2018-06-27 12:57:26 +09:00
Dean Herbert
d7ce4ab6fd
Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player
2018-06-27 12:36:10 +09:00
Dean Herbert
4bcc05a7fc
Remove null checks on ruleset
...
Add a default ruleset to `OsuTestCase` to cover testing scenarios.
2018-06-26 18:24:34 +09:00
Dean Herbert
4dd12cedad
Fix review issues
2018-06-26 17:01:40 +09:00
Dean Herbert
13480feb4f
Remove error logging
...
Already logged to network.log with ample detail.
2018-06-26 16:38:19 +09:00
Dean Herbert
388ca5d572
Move leaderboard update scheduling to a more central method
2018-06-26 16:33:22 +09:00
Dean Herbert
b0a1b25983
Privatise game ruleset and access via DI
...
Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.
2018-06-26 16:32:32 +09:00
smoogipoo
cd74ec705e
Fix possible mis-ordering of scroll position updates
...
1. Checking whether the scroll position has changed must be done _after_ Current is updated in base.UpdateAfterChildren. This was causing the timeline to sometimes not provide smooth scrolling while the track is not running.
2. We can't just move all code to UpdateAfterChildren to fulfill (1) - we need the code to follow the track time to still run prior to base.UpdateAfterChildren, so that it modifies Current prior to base.UpdateAfterChildren changing to position.
2018-06-25 20:31:06 +09:00
Dean Herbert
e75ff1145c
Merge branch 'master' into editor-seek-snapping-fix
2018-06-25 18:27:03 +09:00
ekrctb
d6084c0b30
Adapt to new input handling changes
2018-06-22 18:10:27 +09:00
Dean Herbert
5c63b3ddac
Merge pull request #2828 from smoogipoo/improve-editor-scrolling
...
Always perform non-seeked scroll in the editor while audio is playing
2018-06-21 17:24:15 +09:00
Dean Herbert
2a42418dbf
Tidy up ReadyButton
2018-06-21 10:21:54 +09:00
Dean Herbert
4c068097c8
Change required child to use same structure as other use cases
2018-06-21 10:12:12 +09:00
Dean Herbert
96100a2200
Remove schedule logic (seems unnecessary)
2018-06-20 17:41:48 +09:00
Dean Herbert
39649747aa
Simplify and synchronise multiplayer screen transitions
2018-06-20 17:25:22 +09:00
Dean Herbert
f0c72438a3
Group ValueChanged attachment with bindings
2018-06-20 17:06:02 +09:00
Dean Herbert
3f020a2802
Merge branch 'master' into multiplayer-match
2018-06-20 14:49:32 +09:00
Dean Herbert
b95042e370
Fix background screens not supporting early-exit condition
...
Closes #2681 .
2018-06-20 12:43:48 +09:00
Dean Herbert
3819ecb2be
Update framework
2018-06-19 20:19:52 +09:00
Dean Herbert
b8f9caf418
Merge branch 'master' into multiplayer-match
2018-06-19 17:18:33 +09:00
smoogipoo
8c671f93fc
Always perform non-seeked scroll in the editor while audio is playing
2018-06-18 19:32:04 +09:00
smoogipoo
54e60d8bc2
Fix test appveyor tests failing due to lack of audio manager
2018-06-18 19:27:22 +09:00
smoogipoo
6d318d35ee
Fix not being able to seek by other means during flick-scroll
2018-06-18 18:56:54 +09:00
smoogipoo
dbc50e35d5
Fix the timeline and editor fighting over track seeking
2018-06-18 18:02:26 +09:00
Dean Herbert
b1d059a67d
Add some colours to the compose-mode timeline
2018-06-18 04:31:47 +09:00
Dean Herbert
bec6e3083e
Remove scrollbar depth change as scrollbar is hidden now
2018-06-18 03:19:21 +09:00
Dean Herbert
d58ef96a23
Merge branch 'master' into timeline-markers
2018-06-18 03:14:04 +09:00
Dean Herbert
31f9d0161d
Add a comment about precision scroll behaviour
2018-06-18 03:03:09 +09:00
Dean Herbert
ae160baa6e
Merge branch 'master' into timeline-input-adjustment
2018-06-18 02:54:25 +09:00
Dean Herbert
48613ea1f6
Merge branch 'master' into timeline-markers
2018-06-18 02:09:20 +09:00
Dean Herbert
e0ee5e2085
Merge branch 'master' into timeline-audio-scrolling
2018-06-17 19:01:16 +09:00
Dean Herbert
a7ed3ea80b
Rename alwaysVisible to explain where it comes from
2018-06-13 11:38:15 +09:00
Dean Herbert
d9e7a324c0
Revert HudOverlay to private field
2018-06-13 11:30:22 +09:00
smoogipoo
67aa52fb1d
Use bindable binding
2018-06-12 19:34:49 +09:00
smoogipoo
c70c7a476b
Always display the key counter during replay/autoplay
2018-06-12 17:59:59 +09:00
smoogipoo
3b396e38ca
Hide the scrollbar
2018-06-12 15:51:48 +09:00
smoogipoo
aaf2f66594
Make scrolling only zoom the timeline
2018-06-12 15:51:36 +09:00
smoogipoo
6ceac8ab0a
Add a centre marker to the timeline
2018-06-12 14:34:28 +09:00
smoogipoo
30b7b7961f
Merge remote-tracking branch 'origin/master' into timeline-audio-scrolling
...
# Conflicts:
# osu-framework
# osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs
2018-06-12 14:22:27 +09:00
Dean Herbert
37ea4c273b
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
2018-06-11 20:17:41 +09:00
Dean Herbert
8092d70402
Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework
2018-06-11 20:17:33 +09:00
smoogipoo
b9391b3c6b
Fix bindable not working under non-debug due to weak references
2018-06-11 18:18:24 +09:00
Aergwyn
b9b04c1b6e
move back logic into GameplayMenuOverlay
2018-06-09 09:28:02 +02:00
Aergwyn
792d3b8215
allow "go back" keybind in play
2018-06-09 09:14:58 +02:00
DrabWeb
0815e0ba83
Merge https://github.com/ppy/osu into multiplayer-room-settings
2018-06-08 01:16:22 -03:00
Dean Herbert
0b4f5af52e
Add setting to toggle standardised or exponential scoring display
...
Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.
2018-06-08 03:17:12 +09:00
smoogipoo
55475d129f
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
2018-06-07 19:19:20 +09:00
Dean Herbert
475fb06559
Use new bind method
2018-06-07 16:46:54 +09:00
Dean Herbert
e6158bc348
Merge remote-tracking branch 'upstream/master' into disallow-beatmap-change
2018-06-07 16:35:07 +09:00
smoogipoo
d1b469c1a3
Better handling of nested playfields' hitobjects
2018-06-07 16:28:21 +09:00
Dan Balasescu
ef287eaa7f
Merge branch 'master' into fix-menu-notifications
2018-06-07 15:35:30 +09:00
Dean Herbert
f3c9049660
Merge branch 'master' into disallow-beatmap-change
2018-06-07 15:34:19 +09:00
smoogipoo
485026da6f
Merge remote-tracking branch 'origin/master' into mania-mask-container
...
# Conflicts:
# osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs
2018-06-07 15:32:31 +09:00
smoogipoo
d516a0a05c
Store platform offset clock in variable for visibility
2018-06-07 13:42:31 +09:00
smoogipoo
3745f9000b
Merge remote-tracking branch 'origin/master' into remove-decoder-offset
2018-06-07 13:37:19 +09:00
DrabWeb
fb96b30555
Cleanup.
2018-06-07 00:51:27 -03:00
DrabWeb
f13f71b1e9
Move GameTypePicker label to RoomSettingsOverlay.
2018-06-07 00:39:16 -03:00
DrabWeb
5c0e40df29
Apply on commit.
2018-06-07 00:25:16 -03:00
DrabWeb
ed97d35ef7
Test steps.
2018-06-06 23:30:17 -03:00
Dean Herbert
f491a18d40
Fix notifications not showing at main osu! logo on menu
2018-06-07 01:49:34 +09:00
smoogipoo
18fc63bac2
Add back removed using
2018-06-06 20:32:37 +09:00
Dan Balasescu
c30861186b
Merge branch 'master' into disallow-beatmap-change
2018-06-06 20:26:17 +09:00
smoogipoo
e77084bec4
Give OsuScreen a mutable BindableBeatmap
2018-06-06 20:19:53 +09:00
smoogipoo
ff60f69f47
Explicitly construct local beatmaps rather than using GetBoundCopy
2018-06-06 20:19:30 +09:00
smoogipoo
72cc53aded
Rename GameBeatmap -> BindableBeatmap
2018-06-06 20:16:20 +09:00
smoogipoo
4086ff7313
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs
# osu.Game/Screens/Menu/Intro.cs
# osu.Game/Screens/Menu/MenuSideFlashes.cs
2018-06-06 18:26:51 +09:00
DrabWeb
4aff2ba2af
Move settings to subfolder.
2018-06-06 06:25:34 -03:00
DrabWeb
915a4535d0
Remove label option from SettingsTextBox.
2018-06-06 06:22:16 -03:00
Dean Herbert
9306fec498
Fix missing null checks
2018-06-06 18:21:03 +09:00
DrabWeb
766e0d1e17
AvailabilityPickerItem -> RoomAvailabilityPickerItem
2018-06-06 05:41:46 -03:00
DrabWeb
d6e3dc10e9
Fix RoomSettingsOverlay not being updated when the rooms values are.
2018-06-06 05:38:43 -03:00
DrabWeb
a81fc9eb5d
Fix field containers padding being wrong.
2018-06-06 05:20:03 -03:00
DrabWeb
fe73dbd58c
Update ApplyButton design.
2018-06-06 04:32:04 -03:00
DrabWeb
a982a4ce37
Integrate RoomSettingsOverlay into Match.
2018-06-06 04:27:53 -03:00
Dean Herbert
55921efffb
Rewrite much state logic
2018-06-06 16:17:51 +09:00
Dean Herbert
d1fd09ed47
Rename variables
2018-06-06 15:49:27 +09:00
Dean Herbert
86be1bef6b
Use UserTriggered in Player
2018-06-06 15:10:15 +09:00
DrabWeb
24ba8261a1
Add applying to RoomSettingsOverlay.
2018-06-06 02:38:09 -03:00
DrabWeb
4328223996
Add AvailabilityPicker.
2018-06-06 02:25:08 -03:00
DrabWeb
33e86cb81e
Add GameTypePicker.
2018-06-06 02:06:33 -03:00
DrabWeb
4045ab3669
Add SettingsTextBox.
2018-06-06 01:29:36 -03:00
DrabWeb
2c86293f37
Add sections and apply button.
2018-06-06 00:53:24 -03:00
DrabWeb
8c97999de9
Add empty RoomSettingsOverlay.
2018-06-06 00:29:52 -03:00
DrabWeb
b8e403f38a
Merge https://github.com/ppy/osu into multiplayer-room-settings
2018-06-06 00:19:23 -03:00
Dean Herbert
6be382aab6
Merge branch 'master' into overlay-activation
2018-06-06 10:07:22 +09:00
Dean Herbert
d2633a706d
Merge branch 'master' into score-component-tooltips
2018-06-06 09:06:22 +09:00
Dean Herbert
00c8d2ff11
Merge branch 'master' into source-link-colour
2018-06-06 08:27:28 +09:00
Dan Balasescu
b2cc7b9a5c
Merge branch 'master' into fix-beatmap-info-wedge-async
2018-06-04 20:29:29 +09:00
Dan Balasescu
566470e852
Merge branch 'master' into better-loading-logo
2018-06-04 20:06:22 +09:00
Dan Balasescu
f9b6de67b8
Merge branch 'master' into hide-flash-gap
2018-06-04 19:29:10 +09:00
Thomas Müller
88b23d4e66
Merge branch 'master' into netcoreapp2.1
2018-06-04 05:30:25 +02:00
Dean Herbert
7701cac297
Merge branch 'master' into overlay-activation
2018-06-04 11:37:14 +09:00
Dean Herbert
4b604bf055
Merge branch 'master' into disallow-beatmap-change
2018-06-04 10:53:04 +09:00
DrabWeb
a7bab14b30
Add tooltip to ScoreComponentLabel.
2018-06-03 22:26:30 -03:00
DrabWeb
db4c26e1ab
Rewrite ScoreComponentLabel.
2018-06-03 22:22:44 -03:00
Joehu
bd7c9cd8bf
Set 'Colour' when creating 'textFlow'
2018-06-03 17:41:34 -07:00
Dean Herbert
7ca437aa8e
Merge branch 'master' into fix-expand-button-colour
2018-06-04 02:16:27 +09:00
Joehu
5c713ac2ab
Use default colour in MetadataSection
2018-06-03 07:51:57 -07:00
Dean Herbert
3795a55808
Fix menu flashes not extending to the edge of screen during parallax
2018-06-03 22:26:47 +09:00
Aergwyn
2afe0feb24
remove white space
...
I think
2018-06-03 12:02:43 +02:00
Aergwyn
f0095193b3
Merge branch 'master' into overlay-activation
2018-06-03 11:52:33 +02:00
Aergwyn
707af02097
apply feedback
...
-don't directly set AllowOverlay Bindable
this should be done specifically where needed
-remove AllowOverlay Bindable from ButtonSystem
-remove unnecessary xmldoc
2018-06-03 11:31:04 +02:00
Joehu
0f13acf67e
Use updateExpanded method
2018-06-02 12:52:31 -07:00
Joehu
dc2a004c87
Remove link colours for all unlinked text
2018-06-02 12:04:58 -07:00
Dean Herbert
652e2ccaf5
Merge branch 'master' into netcoreapp2.1
2018-06-03 03:55:33 +09:00
Dean Herbert
64eda27547
Update framework
2018-06-03 03:05:53 +09:00
Dean Herbert
eb135b2e85
Merge branch 'master' into participant-count-default
2018-06-03 03:05:17 +09:00
FreezyLemon
a0c643fae5
Fix SongProgressInfo timespan formatting
2018-06-02 11:25:49 +02:00
Joehu
8d3de3affb
Use '?:' expression instead
2018-06-01 15:58:05 -07:00
Joehu
5d1421c0e9
Fix visual settings expand button colour
2018-06-01 15:31:25 -07:00
DrabWeb
da8b1f996f
Override Type in Match.
2018-06-01 17:16:35 -03:00
DrabWeb
5073057420
Cleanup.
2018-06-01 16:34:03 -03:00
DrabWeb
97b473ef30
Expose tabs and hide beatmap select button in Header.
2018-06-01 16:23:11 -03:00
DrabWeb
cc32adf51f
Move max text updating into updateMax.
2018-06-01 14:28:24 -03:00
Dean Herbert
5c2a2e394e
Fix incorrect async logic in BeatmapInfoWedge
...
Closes #2653 .
Alternative to #2657 .
2018-06-01 20:31:29 +09:00
DrabWeb
59762c0393
Change Room.Participants to an IEnumerable.
2018-06-01 06:15:23 -03:00
DrabWeb
8dd36ee1a9
Default Max to null in ParticipantCount.
2018-06-01 06:08:57 -03:00
DrabWeb
9989517ff0
Merge https://github.com/ppy/osu into multiplayer-match
2018-06-01 04:01:14 -03:00
Dean Herbert
b9c601074d
Formatting fixes
2018-06-01 15:45:09 +09:00
Dean Herbert
c5a3eff182
Merge branch 'master' into multiplayer-logic-encapsulation
2018-06-01 15:31:19 +09:00
Joehu
b4d621a2cb
Add link colour to beatmap source
2018-05-31 10:21:22 -07:00
Dean Herbert
b68a5f5eab
Tidy up Loader logic
2018-05-31 20:07:44 +09:00
Dean Herbert
42bc6b6b2e
Merge branch 'master' into updateable-beatmap-set-cover
2018-05-31 17:33:31 +09:00
Dean Herbert
dfbcf4d7b7
Add tests
2018-05-31 17:29:59 +09:00
Dean Herbert
7487c82ec1
Stop the logo from beating
2018-05-31 17:14:47 +09:00
Dean Herbert
c161d82474
Reduce the length of the fadeout animation
2018-05-31 17:14:04 +09:00
Dean Herbert
9df173b339
Merge branch 'master' into better-loading-logo
2018-05-31 15:59:04 +09:00
Dan Balasescu
29f3011f75
Merge branch 'master' into fix-osu-logo-discrepancies
2018-05-31 15:21:44 +09:00
smoogipoo
e48b17fb0d
Unindent
2018-05-31 15:17:59 +09:00
smoogipoo
4ff803d11d
Merge remote-tracking branch 'origin/master' into fix-osu-logo-discrepancies
2018-05-31 14:47:47 +09:00
Dan Balasescu
76567ae98b
Merge branch 'master' into song-selet-enumerable
2018-05-31 14:42:58 +09:00
Dan Balasescu
cd3ca68f03
Merge branch 'master' into song-selet-enumerable
2018-05-31 14:38:04 +09:00
Dan Balasescu
35d8ec8df6
Merge branch 'master' into fix-player-life-management
2018-05-31 14:34:31 +09:00
DrabWeb
ff93a54a64
Default Type to Title, use ToLower for the screen type title.
2018-05-30 23:16:54 -03:00
Dean Herbert
74c52e0a7c
Merge branch 'master' into multiplayer-screen-type
2018-05-31 00:16:43 +09:00
Dean Herbert
9ea6ab28ea
Fix intro potentially starting out-of-sync due to logo's outward animation
2018-05-30 20:22:31 +09:00
Dean Herbert
9497db0b0b
Add a delay before the loading logo is displayed
2018-05-30 20:22:26 +09:00
Dean Herbert
0caf15166e
Remove unnecessary FinishTransforms
2018-05-30 20:05:31 +09:00
Dean Herbert
0dafcf00b7
Fix some discrepancies with the main menu logo transitions
2018-05-30 19:50:00 +09:00
Dean Herbert
6d6b186fb2
Fix delayed logo animations playing even if screen has already been exited
2018-05-30 19:25:39 +09:00
Dean Herbert
a28e71995d
Offload database query to task
...
Allows song select to load a touch faster, in theory.
2018-05-30 16:15:57 +09:00
Dean Herbert
5872b61988
Fix potential double-disposal of player if PlayerLoader is finalised
2018-05-30 15:48:26 +09:00
Dean Herbert
54e53f7190
Fix player getting loaded when exiting song select
2018-05-30 15:48:20 +09:00
Dean Herbert
6000a90721
Merge branch 'master' into overlay-activation
2018-05-30 13:59:20 +09:00
DrabWeb
7b8211e6db
Add MultiplayerScreen.Type
2018-05-29 04:23:29 -03:00
DrabWeb
9a7e5a3e2c
Update TestCaseMatch.
2018-05-29 04:16:19 -03:00
DrabWeb
7edb82eb85
Add TestCaseMatchParticipants.
2018-05-29 03:53:30 -03:00
DrabWeb
b4b4a8a157
Add TestCaseMatchInfo.
2018-05-29 03:24:38 -03:00
DrabWeb
94b54a0520
Adjust design of ReadyButton.
2018-05-29 03:03:51 -03:00
DrabWeb
3915cb7f2f
Add Match Participants, change Room.Users to IEnumerable.
2018-05-29 02:42:52 -03:00
DrabWeb
77ff0640c2
Add a gradient over the cover in Header.
2018-05-29 01:53:45 -03:00
DrabWeb
c8ce34b6d4
Add Match Info.
2018-05-29 01:51:04 -03:00
DrabWeb
98819880c4
Add match screen header.
2018-05-29 01:16:39 -03:00
DrabWeb
ab3ac49a2d
Add empty Match screen.
2018-05-29 01:16:39 -03:00
DrabWeb
d090323c00
Add ParticipantCount to share with the Match screen.
2018-05-29 00:51:56 -03:00
DrabWeb
852d7ef48d
Use ?: expression instead of if/else.
2018-05-29 00:07:33 -03:00
DrabWeb
7beac3a712
Cleanup DrawableRoom.
2018-05-28 23:56:00 -03:00
DrabWeb
dcc39d96e2
BeatmapModeInfo -> BeatmapTypeInfo.
2018-05-28 23:45:59 -03:00
DrabWeb
bd9af745dd
Cleanup.
...
(cherry picked from commit fffa6a004cf074caf0cf5c8ae1408a80500859fa)
2018-05-28 23:41:50 -03:00
DrabWeb
8b8d10349e
Move RoomInspector info panel content to BeatmapModeInfo to share with Match.
...
(cherry picked from commit 257d9d13ac81d85583314f8b5dfabf05661b1572)
2018-05-28 23:41:42 -03:00
DrabWeb
8b36e1dad0
Add BeatmapTitle to encapsulate multiplayer beatmap title display logic.
...
(cherry picked from commit 58e65afb45fbc675186e470cc4a268d9eaa2a539)
2018-05-28 23:41:07 -03:00
DrabWeb
bdfb5752cd
Update existing drawables to use UpdateableBeatmapSetCover.
2018-05-28 19:31:20 -03:00
Aergwyn
2b3a630270
add OverlayActivation enum
...
+ fix Toolbar being toggleable when it shouldn't be able to
+ allow opening overlays in MenuState.Initial again
2018-05-28 13:43:47 +02:00
smoogipoo
5be46307fd
Fix results screen parallax being cut off
...
Alternative to / closes #2549 .
Didn't want to reference the toolbar as was done, also wanted to remove the awkward scaling factors so rather than scaling down the inner one, we scale up the outer one.
2018-05-28 19:43:59 +09:00
smoogipoo
a3470f9ec3
Merge remote-tracking branch 'origin/master' into disallow-beatmap-change
...
# Conflicts:
# osu.Game/Overlays/Music/PlaylistOverlay.cs
# osu.Game/Screens/OsuScreen.cs
2018-05-28 18:01:15 +09:00
Dean Herbert
ed7c860802
Adjust transitions of DrawableRoom
2018-05-28 13:30:29 +09:00
Dean Herbert
02c37ebc1f
Move screen titles to OsuScreen
2018-05-28 13:30:24 +09:00
Dean Herbert
0ca6d73f0e
Add a delay before the osu! logo appears when exiting multiplayer
2018-05-28 13:30:17 +09:00
Dean Herbert
3c3412791c
Merge remote-tracking branch 'upstream/release' into multiplayer-lounge
2018-05-28 13:30:04 +09:00
smoogipoo
3abfd4711d
Fix wrong clock being seeked when unpausing
2018-05-28 03:42:53 +09:00
smoogipoo
8ae2a3696f
Apply platform universal offset at player level
2018-05-28 03:31:46 +09:00
Dean Herbert
95315e46f0
Make drawable rooms fade in when first displayed
...
Stops filtered rooms from briefly displaying.
2018-05-27 14:12:20 +09:00
Dean Herbert
12b5ca1b0d
Merge branch 'master' into multiplayer-lounge
2018-05-27 11:15:03 +09:00
Dean Herbert
975ce82177
Ensure autoplay tests actually increase score above zero
2018-05-26 14:46:05 +09:00
Dean Herbert
699f661b02
Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix
2018-05-25 19:07:30 +09:00
Dean Herbert
28aa6faef9
Merge branch 'master' into player_loader_input_toggles
2018-05-25 18:38:12 +09:00
Dean Herbert
7961c56239
Merge remote-tracking branch 'FreezyLemon/master' into smoogipoo-disallow-beatmap-change
2018-05-25 10:55:01 +09:00
smoogipoo
b649025e86
beginUserDrag/endUserDrag
2018-05-24 14:36:48 +09:00
smoogipoo
d4f68e0b67
Fix possible NaN values due to trackvirtual infinite length
2018-05-24 14:31:31 +09:00
smoogipoo
f1ac84d95b
Fix base.CreateLocalDependencies sometimes not being called
2018-05-24 13:03:25 +09:00
Aergwyn
0c0f86fe26
fix incorrect default values keeping overlays in wrong state
2018-05-23 16:25:10 +02:00
smoogipoo
a5d2d74447
Remove whitespace
2018-05-23 19:01:27 +09:00
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
smoogipoo
a30f72b477
Add helper methods for seeking/scrolling
2018-05-23 14:32:00 +09:00
smoogipoo
6b0eeb3436
Rework seeking interactions to support smooth scrolling
2018-05-23 14:14:32 +09:00
smoogipoo
49f893d5e4
Couple the timeline to the audio
2018-05-23 12:00:11 +09:00
Aergwyn
76fbc656a1
fix disclaimer allowing notifications
2018-05-22 17:53:36 +02:00
Dean Herbert
ef40ca8805
Merge branch 'master' into respect-showoverlay-bindable
2018-05-22 19:00:42 +09:00
smoogipoo
1dfa3ff995
Merge remote-tracking branch 'origin/master' into editor-timeline-rework
2018-05-22 18:30:29 +09:00
Dan Balasescu
99163ca8ba
Merge branch 'master' into fix-main-menu-escape
2018-05-22 18:17:51 +09:00
smoogipoo
0e122468db
Fix progress easing to 0 if aborting after confirmation
2018-05-22 18:06:40 +09:00
Dean Herbert
d43e4af8ea
Fix overlap between quit button at key input overlay
2018-05-22 16:45:42 +09:00
Dean Herbert
436067c01f
Handle scale back in a nicer way
2018-05-22 16:44:37 +09:00
Dean Herbert
7b770d03c5
Use OnMouseMove instead of Update logic
2018-05-22 16:26:59 +09:00
Dean Herbert
babb7d5158
Fix white ring flash when holding button post-confirmation
2018-05-22 16:23:05 +09:00
Dean Herbert
5f8eb6d823
Fix class name
2018-05-22 16:04:36 +09:00
Dean Herbert
8fbda9d57e
Improve comment
2018-05-22 16:04:07 +09:00
Dean Herbert
58ae545747
innerCircle -> overlayCircle
2018-05-22 15:59:53 +09:00
Dean Herbert
ef55c3c197
Fix icon scale not resetting due to no implicit triggering
2018-05-22 15:58:17 +09:00
Dean Herbert
2ce2bd9788
Add comment for pendingAnimation
2018-05-22 15:58:00 +09:00
AlFasGD
2769f6c47b
Fix issues
2018-05-22 09:09:25 +03:00
DrabWeb
349b0a3322
Remove empty ctor.
2018-05-22 01:46:08 -03:00
DrabWeb
3cc5bb516e
Remove unused Match ctor param.
2018-05-22 01:39:25 -03:00
DrabWeb
662559d3c9
More test steps.
2018-05-22 01:22:23 -03:00
DrabWeb
6aac4269e6
Add filtering.
2018-05-22 00:33:41 -03:00
DrabWeb
f7a4a4eeef
Add Lounge FilterControl.
2018-05-22 00:24:39 -03:00
DrabWeb
cae09492c3
Basic Lounge functionality.
2018-05-22 00:07:04 -03:00
DrabWeb
1210368e29
Add MultiplayerScreen base class.
2018-05-21 23:00:02 -03:00
AlFasGD
d504a44dfb
Implement mask layering (incomplete)
2018-05-21 23:08:04 +03:00
Dean Herbert
5a892e4d08
This quit button don't quit
2018-05-22 02:09:52 +09:00
Dean Herbert
323aa189b6
Make on-confirmation animation more robust
2018-05-22 02:08:44 +09:00
Dean Herbert
156d7fb25a
Change depth of HUD
...
Yes, this is intentional.
2018-05-22 02:08:21 +09:00
Dean Herbert
946a75ddb2
Block hover to use UI cursor instead of gameplay cursor
2018-05-22 02:05:08 +09:00
Dean Herbert
ebda287e81
Share code with HoldToConfirm implementations elsewhere
2018-05-22 01:44:06 +09:00
Roman Kapustin
30956b64aa
Do not change Margin for player settings groups on the PlayerLoader screen
2018-05-21 18:57:01 +03:00
Dean Herbert
f9c162dee9
Adjust design and feel
2018-05-22 00:49:33 +09:00
Aergwyn
cee8d21542
hide overlays when going back to initial menu state
2018-05-21 17:24:57 +02:00
Dean Herbert
d5afccd610
Make hint text display briefly at initial display, then on hover
2018-05-22 00:02:03 +09:00
Dean Herbert
3d9d40448d
Fix incorrect syntax
2018-05-22 00:01:40 +09:00
Dean Herbert
841336a181
Merge branch 'master' into exit_replay_button
2018-05-21 23:45:06 +09:00
Dean Herbert
9820666bcf
Merge branch 'master' into respect-showoverlay-bindable
2018-05-21 23:26:34 +09:00
Dean Herbert
d109522bf7
Fix escape not working to go backwards in menus before finally exiting the game
...
Resolves #2596 .
2018-05-21 23:09:00 +09:00
Aergwyn
b7e3ea348b
expose two Bindables with split logic instead of one with mixed logic
2018-05-21 15:53:55 +02:00
AlFasGD
a54bda6ce1
Apply requested changes
2018-05-21 13:23:39 +03:00
Aergwyn
1482bca147
Rename for better understanding
...
ShowOverlays -> AllowOverlays
ShowOverlaysOnEnter -> HideOverlaysOnEnter
2018-05-21 09:42:29 +02:00
Dean Herbert
c48c62ea04
Merge branch 'master' into player_loader_input_toggles
2018-05-21 16:20:08 +09:00
Joehu
46c6c1d07e
Allow drag clicking footer and filter on song select
2018-05-20 20:25:39 -07:00
Dean Herbert
92668f07e0
Merge branch 'master' into drawable-room-improvements
2018-05-21 11:09:12 +09:00
Dean Herbert
aaca7e92b4
Avoid excessive property lookups
2018-05-21 03:56:59 +09:00
DrabWeb
9cd0ec366e
Cleanup.
2018-05-19 02:51:51 -03:00
DrabWeb
136c57b824
Don't set size in ctor.
2018-05-19 02:27:33 -03:00
DrabWeb
ad878003f7
Add null room support to RoomInspector.
2018-05-19 02:23:09 -03:00
DrabWeb
4b2b2086df
Create drawable hierarchy for RoomInspector in load, remove display* methods.
2018-05-19 01:26:39 -03:00
smoogipoo
82607b3eb3
Expose properties to control zoom
2018-05-18 17:53:09 +09:00
Dean Herbert
e2389ad7a4
Allow using back button on PlayerLoader and Replay
2018-05-18 13:32:05 +09:00
smoogipoo
bc3d195aa2
Fix line endings
2018-05-18 13:05:58 +09:00
Roman Kapustin
17d1759c37
Get rid of multiple blank lines in a row
2018-05-18 01:01:54 +03:00
Roman Kapustin
81d7e8a393
Resolve merge conflict
2018-05-18 00:25:47 +03:00
DrabWeb
ebfbe58abb
Move Header breadcrumbs to a subclass.
2018-05-17 06:19:55 -03:00
Dean Herbert
d20011ba58
Fix an endless feedback loop
2018-05-17 17:56:29 +09:00
smoogipoo
3f365c6621
Merge branch 'master' into editor-timeline-rework
...
# Conflicts:
# osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Compose.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs
# osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs
2018-05-16 18:04:24 +09:00
DrabWeb
1a78ac3d10
Add Multiplayer screen.
2018-05-15 21:14:10 -03:00
DrabWeb
1450bf64f5
Add multiplayer screen header.
2018-05-15 20:34:14 -03:00
Roman Kapustin
f2f2fb8c73
Use both OnKeyDown and GlobalAction.Back
2018-05-14 22:09:09 +03:00
Roman Kapustin
e802b722f0
Revert "Handle mouse back button using OnMouseDown override instead of using GlobalAction"
...
This reverts commit 44bbb8700e
2018-05-14 20:27:05 +03:00
Dean Herbert
28edf3bce7
Merge branch 'master' into hud-above-letterbox
2018-05-14 19:31:39 +09:00
Dean Herbert
0234bbc37f
Move definition inline
2018-05-14 19:14:17 +09:00
Dean Herbert
f14948c022
Merge branch 'master' into exit-hold-confirmation
2018-05-14 18:13:40 +09:00
smoogipoo
115c2dc239
Move hud below the skip button
2018-05-14 18:02:18 +09:00
smoogipoo
64fba5f6d1
Proxy the ruleset cursor above the break overlay
2018-05-14 15:36:56 +09:00
smoogipoo
43409127b7
Place break overlay underneath the hud
2018-05-14 15:36:42 +09:00
Dan Balasescu
d7cba000ab
Merge branch 'master' into fix-wedge-nullref
2018-05-14 13:36:07 +09:00
Dean Herbert
db0470243a
Fix nullref when changing ruleset at main menu
2018-05-13 12:55:54 +09:00
AlFasGD
2a90686da6
Simplify expression
2018-05-12 15:09:53 +03:00
DrabWeb
937ff50a5a
Remove unused using.
2018-05-11 13:56:27 -03:00
DrabWeb
41de02fc78
Make DrawableRooms select when they are clicked.
2018-05-11 13:43:53 -03:00
DrabWeb
518dec0c68
Merge https://github.com/ppy/osu into drawable-room-improvements
2018-05-11 13:41:50 -03:00
Dean Herbert
cfa18bdf1f
Fix song progress time counters wrapping after an hour
...
Resolves #2466 .
Supersedes and closes #2487 .
2018-05-11 22:10:26 +09:00
Dean Herbert
c19432dc6d
Merge branch 'master' into ruleset-beatmap-statistics
2018-05-11 17:37:50 +09:00
smoogipoo
fd9796d08c
Remove some unnecessary changes
2018-05-11 14:13:52 +09:00
smoogipoo
816ad5c426
Pass down ruleset to the buffered wedge
2018-05-11 14:10:53 +09:00
smoogipoo
73465c35fa
Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics
...
# Conflicts:
# osu.Game/Beatmaps/Beatmap.cs
2018-05-11 14:05:40 +09:00
DrabWeb
a241ff1c05
Cleanup.
2018-05-10 22:50:03 -03:00
DrabWeb
ec53927d8e
Add selection to DrawableRoom.
2018-05-10 22:48:07 -03:00
DrabWeb
d87ac5a1cb
Create the drawable hierarchy for DrawableRoom in load.
2018-05-10 22:12:25 -03:00
DrabWeb
a86843ccc9
Remove unused usings caused by multiplayer folder restructuring.
2018-05-10 20:49:42 -03:00
DrabWeb
bc9ac8f72a
Move multiplayer screens to osu.Game/Screens/Multi/Screens
2018-05-10 20:47:25 -03:00
DrabWeb
2d206d258a
Move multiplayer screen components to osu.Game/Screens/Multi/Components
2018-05-10 20:44:24 -03:00
DrabWeb
c35760fdef
Rename osu.Game/Screens/Multiplayer to Multi.
2018-05-10 20:39:05 -03:00
Roman Kapustin
86430da6d6
Update CircularProgress.FillTo calls
2018-05-10 21:08:02 +03:00
Roman Kapustin
93029fd548
Remove mouseWheelCheckbox from InputSettings player overlay
2018-05-10 20:38:55 +03:00
Dean Herbert
8a6ef0dabb
Merge branch 'master' into beatmap-conversion-rework
2018-05-10 19:10:07 +08:00
Dean Herbert
9e26bcd571
Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap
2018-05-10 19:51:52 +09:00
Dean Herbert
5df9f126d1
Implement a hold-to-confirm screen when exiting game using escape key
2018-05-10 17:07:19 +09:00
Roman Kapustin
ccf82cacb0
Show InputSettings on the PlayerLoader screen
2018-05-09 17:31:52 +03:00
Roman Kapustin
6676c55fe0
Introduce InputSettings
2018-05-09 17:22:37 +03:00
AlFasGD
e44062b77a
Fix tests and implementation
2018-05-08 16:37:06 +03:00
AlFasGD
dd9b9a18ac
Prevent user from scrolling outside the timeline in the editor
2018-05-08 16:21:54 +03:00
Roman Kapustin
44bbb8700e
Handle mouse back button using OnMouseDown override instead of using GlobalAction
2018-05-08 00:22:11 +03:00
smoogipoo
674e45d49b
Fix beatmap/ruleset being changeable while in the editor
2018-05-07 16:32:15 +09:00
smoogipoo
fbd7ccc03f
Make BeatmapInfoWedge display properly for converts
2018-05-07 15:51:08 +09:00
smoogipoo
5489976c20
Implement ruleset-specific beatmap statistics
2018-05-07 15:51:08 +09:00
smoogipoo
9128e64c9a
Rename OriginalBeatmap back to Beatmap
2018-05-07 10:29:38 +09:00
smoogipoo
4ecdea8b2e
Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer
2018-05-07 10:17:54 +09:00
smoogipoo
77e661489d
Merge branch 'i-beatmap' into beatmap-conversion-rework
2018-05-07 10:00:24 +09:00
smoogipoo
1aefd71b65
Merge remote-tracking branch 'origin/master' into i-beatmap
2018-05-07 09:58:53 +09:00
Roman Kapustin
b08b24b6da
Introduce OsuScreen.AllowBackButton property
2018-05-04 21:18:48 +03:00
Roman Kapustin
39db1e8cbb
Rename HoldToQuit to QuitButton
2018-05-03 23:50:30 +03:00
Roman Kapustin
f8630115d6
Do not expose HoldToQuit.HoldToQuitButton
2018-05-03 23:29:58 +03:00
TocoToucan
804b59ee80
Handle GlobalAction.Back
2018-04-29 20:15:09 +03:00
UselessToucan
d18a8ec9f5
Merge branch 'master' into exit_replay_button
2018-04-28 20:48:16 +03:00
TocoToucan
c78c5195f3
HoldToQuitButton cleanup
2018-04-28 20:43:41 +03:00
Dean Herbert
4f53185d43
Invert logic to match existing toggles
2018-04-25 16:18:55 +09:00
Dean Herbert
c517b73375
Merge branch 'master' into ignore_beatmap_skin
2018-04-25 15:57:39 +09:00
Dean Herbert
45810e6220
Merge branch 'master' into ignore_beatmap_skin
2018-04-24 17:15:39 +09:00
Dean Herbert
3886e75959
Fix potentially missing group headers in beatmap carousel
2018-04-24 01:52:25 +09:00
Dean Herbert
93b77d9cfe
Remove annotation
2018-04-23 22:22:31 +09:00
UselessToucan
254e9929be
Merge branch 'master' into ignore_beatmap_skin
2018-04-23 13:06:24 +03:00
Dean Herbert
2d1cef79d6
Fix instability in carousel item sorting
2018-04-23 19:01:01 +09:00
Dean Herbert
ff3d3379f0
Merge remote-tracking branch 'upstream/master' into async-screens
2018-04-23 18:29:37 +09:00
Dean Herbert
194992936d
Use exceptions
2018-04-23 17:57:47 +09:00
Dean Herbert
0709a0926b
Merge branch 'master' into misc-fixes
2018-04-23 17:46:58 +09:00
Dean Herbert
2d82c0b5cd
Fix logical regression
2018-04-23 16:41:15 +09:00
Dean Herbert
6e16f2a3c3
Add assert to appease rider/r#
2018-04-23 15:03:41 +09:00
Dean Herbert
36a671e306
Fix new detections in rider 2018.1
2018-04-23 14:56:45 +09:00
Dean Herbert
2c9b2aa0e7
Fix intro setting beatmap in background thread causing race conditions
2018-04-22 02:46:20 +09:00
TocoToucan
630980255e
Convert HoldToQuit.text to local variable
2018-04-21 20:35:24 +03:00
TocoToucan
e6d7136a92
Fix HoldToQuit appearance and set HoldToQuitButton.ExitAction
2018-04-21 20:21:09 +03:00
TocoToucan
21454d1f10
Revert "Add 'End replay' button"
...
This reverts commit c34ef42f00
2018-04-21 19:27:17 +03:00
TocoToucan
3b621db460
Implement CircularProgress filling
2018-04-21 19:25:21 +03:00
TocoToucan
633c775306
Initial HoldToQuit commit
2018-04-21 18:24:31 +03:00
TocoToucan
1ce38c7fc6
Visual settings: Ignore beatmap hitsounds
2018-04-20 18:30:41 +03:00
TocoToucan
606e088713
Visual settings: Ignore beatmap skin
2018-04-20 18:17:57 +03:00
Dean Herbert
e9e97f31d6
Merge remote-tracking branch 'upstream/master' into peppy-async-screens
2018-04-20 19:06:47 +09:00
TocoToucan
c34ef42f00
Add 'End replay' button
2018-04-20 12:50:19 +03:00
Dean Herbert
a5b0005976
Merge branch 'master' into remove-approachcircle-hax
2018-04-20 18:36:49 +09:00
smoogipoo
0dce7a5b61
Update framework + fix CI errors
2018-04-20 18:19:17 +09:00
Dean Herbert
8bf25542cb
Add PlayerLoader TestCase and fix dummy beatmap load procedure
2018-04-20 17:30:27 +09:00
Dean Herbert
de85436534
Merge remote-tracking branch 'upstream/master' into peppy-async-screens
2018-04-20 16:52:58 +09:00
Dean Herbert
c77f339444
Merge remote-tracking branch 'upstream/master' into show-beatmap-id
2018-04-20 12:41:38 +09:00
smoogipoo
03a5df84c6
Initial rework of beatmap conversion process
2018-04-19 22:04:12 +09:00
Dean Herbert
f7ca6267b1
Merge remote-tracking branch 'upstream/master' into beatmap-set-overlay-nullability
2018-04-19 20:53:06 +09:00
smoogipoo
66b3b295e7
Use IBeatmap wherever possible
2018-04-19 20:44:38 +09:00
smoogipoo
7a550e3f07
Revert unnecessary change for now
2018-04-19 20:20:56 +09:00
smoogipoo
b5a55a0dce
Make an interface for beatmaps
2018-04-19 18:58:40 +09:00
Dean Herbert
e395a47112
Changes to naming and text
2018-04-18 19:47:13 +09:00
Dean Herbert
bd834dd487
Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling
2018-04-18 19:46:59 +09:00
Dean Herbert
1728dd6502
Make BeatmapSetOverlay accept nulls everywhere
2018-04-18 16:42:09 +09:00
Dean Herbert
7e5d5a197b
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
2018-04-18 16:41:01 +09:00
Dean Herbert
1be2571d33
Make BeatmapSetOverlay accept nulls everywhere
2018-04-18 16:08:45 +09:00
Dean Herbert
f62677222c
Merge remote-tracking branch 'upstream/master' into naoey-show-beatmap-id
2018-04-18 13:08:53 +09:00
Dean Herbert
64f47daff4
Merge branch 'master' into fix-leaderboard-nullref
2018-04-18 12:05:13 +09:00
Dean Herbert
188c8ce1e7
Remove unnecessary score nulling (already happens in PlaceholderState_Set)
2018-04-18 11:58:55 +09:00
Dean Herbert
a27f39a555
Add documentation explaining intertwining logic
2018-04-18 11:57:06 +09:00
smoogipoo
9af6ef1864
Remove extra unneded safety
2018-04-16 17:48:49 +09:00
smoogipoo
b9220a1e29
Fix leaderboard placeholder sometimes disappearing indefinitely
2018-04-16 17:39:55 +09:00
smoogipoo
1b9d54a6ad
Fix various data races causing crashes or incorrect leaderboard states
2018-04-16 17:39:03 +09:00
FreezyLemon
3ece54e1c3
make buttons only accept input when expanded
...
both other states are "inactive"/invisible so should never accept keyboard input
2018-04-14 00:08:54 +02:00
Dean Herbert
81f0649e44
Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling
2018-04-13 19:50:44 +09:00
tgi74000
1a2b1d4c98
Use the already existent RightMouseScrollbar field
2018-04-13 11:32:33 +02:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
tgi74000
e3cd0ef200
Add right click scrolling in song select (and its option)
2018-04-13 11:09:49 +02:00
Endrik Tombak
d9f587edff
Merge remote-tracking branch 'upstream/master' into alt-eagerselect
2018-04-13 11:55:35 +03:00
Joehu
128446e51d
Remove composer from player loader
2018-04-12 16:46:46 -07:00
Dean Herbert
127f0d7b01
Fix smoogipoo's comments
2018-04-12 21:17:17 +09:00
Dean Herbert
0ca703beaa
Add some missing xmldoc
2018-04-12 21:04:45 +09:00
smoogipoo
a2484fbf56
Move back to DI-ing adjustable clock into SummaryTimeline
2018-04-12 13:37:02 +09:00
smoogipoo
fbc50d6030
Merge master into editor-clock
2018-04-12 13:35:53 +09:00
Dean Herbert
c33cb9c02e
Merge branch 'master' into show-beatmap-id
2018-04-10 16:05:32 +09:00
Dean Herbert
cd48cb1887
Add comment
2018-04-06 19:53:23 +09:00
smoogipoo
e59124962c
Remove re-instantiation of clock in EditorClockTestCase
2018-04-06 18:38:44 +09:00
Endrik
c7440201fb
Merge branch 'master' into alt-eagerselect
2018-04-06 12:37:16 +03:00
smoogipoo
9e8490735f
Fix Compose not binding to the editor's beat divisor
2018-04-06 18:22:24 +09:00
smoogipoo
c7abd56fc4
Give editor a custom clock to handle seeking
2018-04-06 18:11:37 +09:00
smoogipoo
f07928446d
Remove instances of "waveform"
2018-04-06 15:52:39 +09:00
smoogipoo
9b060b1bdf
Fix delay in value retrieval causing offsetting when zooming
2018-04-06 15:51:40 +09:00
Dean Herbert
5426432e46
Fix drag select crashing
2018-04-06 11:47:21 +09:00
Dean Herbert
32e8d93596
Fix selection changing when clicking overlapping hitobjects
2018-04-06 11:22:36 +09:00
Dean Herbert
24b9a8c983
Allow HitObjectMasks to handle drag events directly
2018-04-06 10:29:34 +09:00
Dean Herbert
5749e71560
Apply review fixes
2018-04-05 21:06:48 +09:00
Dean Herbert
345cfb077d
No need to sort list any more
2018-04-05 21:03:39 +09:00
smoogipoo
d9e795fb9f
TimelineContainer -> TimelineArea
2018-04-05 19:40:03 +09:00
smoogipoo
a84536d343
ScrollingTimelineContainer -> Timeline
2018-04-05 19:33:47 +09:00
smoogipoo
f41d31e1db
ScrollableTimeline -> TimelineContainer
2018-04-05 19:33:25 +09:00
smoogipoo
9a9ed1d630
Encapsulate zoom logic into a separate class
2018-04-05 19:30:54 +09:00
smoogipoo
0141cbebba
waveformContainer -> zoomedContent
2018-04-05 19:08:10 +09:00
smoogipoo
8da3c2c52a
Expose zoom publicly again, re-enable zoom buttons
2018-04-05 19:05:19 +09:00
smoogipoo
35e116cb12
Reduce ctor arguments
2018-04-05 19:04:07 +09:00
smoogipoo
eff5eddbe9
Make zoom an int again
2018-04-05 18:41:22 +09:00
smoogipoo
074dee3a83
Re-implement mousewheel zoom
2018-04-05 18:37:51 +09:00
smoogipoo
e3af32ad2f
A bit of cleanup
2018-04-05 17:07:41 +09:00
smoogipoo
9bb3e56bb3
Implement half-width overflows
2018-04-05 17:07:00 +09:00
smoogipoo
e7aa1d9c38
Temporarily remove zoom levels, simplify scrollingtimelinecontainer
2018-04-05 16:12:21 +09:00
smoogipoo
870ce8868c
Make scrollabletimeline use gridcontainer
2018-04-05 16:07:33 +09:00
naoey
7482d5986a
Add a loading state to BeatmapSetOverlay.
...
- Handle null value in header and info sections
- Add item to context menu for carousel beatmaps to show details
2018-04-04 21:46:31 +05:30
Dean Herbert
216c4629e0
Fix dragging backwards not deselecting pending selection
2018-04-04 20:44:22 +09:00
Dean Herbert
b7325d73e8
Don't inherit VisbilityContainer
2018-04-04 20:44:11 +09:00
Dean Herbert
94c3f38541
Pass down input state instead of parent lookup
2018-04-04 20:06:45 +09:00
Dean Herbert
2b15555ede
Remove MaskContainer dependency in MaskSelection
2018-04-04 20:05:01 +09:00
Dean Herbert
5c036b966b
Formatting fixes
2018-04-04 20:04:54 +09:00
Dean Herbert
31a7db0a35
Fix drag mishaps
2018-04-04 19:42:59 +09:00
Dean Herbert
bce114a37b
Make AliveMasks private
2018-04-04 18:55:17 +09:00
Dean Herbert
4d71f2084c
Move individual mask selection logic out of MaskSelection
2018-04-04 18:29:53 +09:00
Dean Herbert
b6b8c51657
Remove DragLayer dependency on MaskContainer
2018-04-04 18:20:32 +09:00
Dean Herbert
c2d371797e
Fix unbind failure
2018-04-04 17:38:34 +09:00
Dean Herbert
c712b29b5b
Rename dragBox to dragLayer
2018-04-04 16:24:27 +09:00
Dean Herbert
4196bb8c24
Move selection logic to MaskContainer
2018-04-04 16:24:13 +09:00
Dean Herbert
d453c2589a
Add an explanatory comment for weird override
2018-04-04 16:02:20 +09:00
Dean Herbert
788bfde002
Merge branch 'master' into selectionlayer-rewrite
2018-04-04 15:38:27 +09:00
smoogipoo
4f19059e55
DragBox -> DragLayer
2018-04-03 21:29:49 +09:00
Dean Herbert
ddba7254ca
Merge remote-tracking branch 'upstream/master' into linq
2018-04-03 13:05:08 +09:00
Dean Herbert
57b4cdaf85
Merge branch 'master' into selectionlayer-rewrite
2018-04-03 03:05:42 +09:00
smoogipoo
69e2d4fd22
Make CarouselRoot a nested class
2018-04-02 15:24:08 +09:00
Dan Balasescu
6f88a80bde
Merge branch 'master' into alt-eagerselect
2018-04-02 15:18:22 +09:00
smoogipoo
82a847b820
Extract random selection logic into CarouselRoot
2018-04-02 15:16:10 +09:00
Dan Balasescu
32832304a7
Merge branch 'master' into fix-songselect-exit-notimplemented
2018-04-02 13:53:41 +09:00
Huo Yaoyuan
b842f682eb
Use Linq.Append and Prepend.
2018-04-02 12:06:34 +08:00
Endrik Tombak
7e30375443
Use selectNextRandom instead
2018-03-30 10:46:46 +03:00
smoogipoo
f1f7d978ec
Add some comments
2018-03-30 16:28:59 +09:00
smoogipoo
69a7ddbf1e
Fix ordering of display/input of HitObjectMasks
2018-03-30 16:28:49 +09:00
smoogipoo
53541a5c8d
Add license header
2018-03-30 15:53:31 +09:00
smoogipoo
5d0a636cc4
Rename SelectionBox -> Selection
2018-03-30 15:51:38 +09:00
smoogipoo
1dca1663c3
Handle all selection events within SelectionBox (incl. single-mask)
2018-03-30 15:50:55 +09:00
smoogipoo
082e5e4949
Reduce iterations of DragBox
2018-03-30 15:06:52 +09:00
Dean Herbert
31ade986a7
Scren async changes in line with framework changes
...
Makes editor not stutter on load, amongst other screens.
2018-03-30 14:58:11 +09:00
Endrik Tombak
3f65e3a7e3
Make selection at random when last was null
2018-03-30 00:15:32 +03:00
smoogipoo
6b2ca36657
Add license header
2018-03-29 22:52:42 +09:00
smoogipoo
d9c5a0c6d1
Fix position editing not working
2018-03-29 22:38:44 +09:00
smoogipoo
4446aeaa0d
Commenting + cleanup of HitObjectMask/HitObjectMaskLayer
2018-03-29 22:38:28 +09:00
smoogipoo
d8f26f2260
Make HitObjectMaskLayer not iterate through all masks when deselecting
2018-03-29 22:22:42 +09:00
smoogipoo
1018711cc9
Cleanup SelectionBox
2018-03-29 22:20:56 +09:00
smoogipoo
346de77776
Cleanup DragBox
2018-03-29 22:13:28 +09:00
smoogipoo
04874bcda4
"overlay" -> "mask"
2018-03-29 22:09:22 +09:00
smoogipoo
6d4f94756e
Rewrite the way drag + click selections happen
...
The general idea here is that we need the masks to handle mouse down events, as they need to handle the drag (mousedown -> drag immediately).
I've rewritten the editor selections to use events, as there are some 3 different components that handle/trigger selections in different ways.
1. All selections/deselections now propagate through `HitObjectMask.Select()`/`HitObjectMask.Deselect()`.
2. Components that react to changes in the selection bind to the masks' `Selected`/`Deselected` events, and track them/change their states locally.
3. Masks provide a `SingleSelectionRequested` event which is invoked on the mouse-down event. Various components bind to this event to perform state changes locally in this scenario.
4. `DragBox` now handles all drag input locally. It triggers `Select`/`Deselect` on the masks it needs to.
5. `SelectionBox` handles the display of itself locally.
6. `SelectionBox` handles movement of groups of masks locally.
7. `HitObjectMasks` handles movement of itself locally.
2018-03-29 22:07:23 +09:00
smoogipoo
6314694557
Make HitObjectMaskLayer always create masks for all objects
2018-03-29 17:13:45 +09:00
FreezyLemon
46d859a660
exit player earlier if a dummy map is loaded
2018-03-25 13:25:48 +02:00
smoogipoo
097ab66182
Fix resharper error
2018-03-25 01:54:25 +09:00
Dean Herbert
0e669c9a3f
Fix many warnings
2018-03-24 18:23:22 +09:00
smoogipoo
ffa712dccb
Fix post-merge issues
2018-03-24 15:19:45 +09:00
smoogipoo
c29f7a4333
Merge remote-tracking branch 'origin/master' into netstandard
2018-03-24 14:49:46 +09:00
Dean Herbert
e47aa0edc0
Merge branch 'master' into fix-background-fade
2018-03-24 03:40:13 +09:00
Dan Balasescu
9ab3610b95
Merge branch 'master' into fix-player-disposal
2018-03-23 20:45:42 +09:00
smoogipoo
afdab7895a
Fix beatmap background fade not being updated on retry
...
Fixes #2287
2018-03-23 20:41:38 +09:00
Dean Herbert
b56eee1927
Fix background loaded player never being disposed if early exit occurs
2018-03-23 15:04:40 +09:00
Dean Herbert
d4aeb3d00b
Fix BeatmapCarousel's flush not correctly applying selection changes
...
They may have been delayed until the next Update, which is too late in this case.
2018-03-23 12:10:13 +09:00
FreezyLemon
a3d8048aca
abort loading and exit player for dummy maps
2018-03-22 21:46:35 +01:00
Dean Herbert
92d8781bf0
Merge branch 'master' into beat-snap-divisor
2018-03-22 20:14:50 +09:00
smoogipoo
2b7d22c4ea
Very slightly reduce size of slider bar to increase bottom padding
2018-03-22 20:11:55 +09:00
smoogipoo
090c78bf10
Merge remote-tracking branch 'origin/master' into fix-player-loader
2018-03-22 20:00:21 +09:00
Dan Balasescu
ab9505652b
Merge branch 'master' into skin--completion
2018-03-22 16:44:00 +09:00
Dean Herbert
dade52d15d
Fix vertical padding
2018-03-22 16:15:14 +09:00
Dean Herbert
a4804f47a9
Merge branch 'master' into beat-snap-divisor
2018-03-22 16:06:26 +09:00
Dean Herbert
5f1bb8d753
Merge branch 'master' into fix-player-loader
2018-03-22 15:46:37 +09:00
Dan Balasescu
13a3c728dc
Merge branch 'master' into fix-dummy-ruleset
2018-03-22 15:29:43 +09:00
smoogipoo
3f3f57e51e
Use cached vertexbatch add delegate
2018-03-22 15:13:38 +09:00
Dean Herbert
917334a39a
Move cancel code to exit paths for screen
2018-03-22 13:01:40 +09:00
Dean Herbert
e0b74a357a
Fix osu! logo making hover beat sounds when not visible
2018-03-22 03:31:14 +09:00
Dean Herbert
8f71d53c17
Fix retry not allowing continuing beyond PlayerLoader
...
Resolves #2265 .
2018-03-22 02:10:31 +09:00
Dean Herbert
62229300c4
Fix DummyRuleset getting selected
...
Resolves #2261 .
2018-03-22 00:26:48 +09:00
Dean Herbert
271c082606
Adjust colour assignment
2018-03-21 16:25:32 +09:00
Dean Herbert
48142602ea
Adjust text size to match design
2018-03-21 16:04:43 +09:00
Dean Herbert
63f0419d6a
Apply minor fixes
2018-03-21 15:40:43 +09:00
Dean Herbert
8ac660b0c6
Fixes for keyboard handling and general code quality
2018-03-20 22:25:15 +09:00
Dean Herbert
aa8b0d017c
Adjust colours and spacing
2018-03-20 21:59:56 +09:00
Dean Herbert
dac1ba21db
Make keyboard control work
2018-03-20 21:38:22 +09:00
Dean Herbert
045610dbfe
Adjust styling and colours
2018-03-20 21:31:17 +09:00
Dean Herbert
c2eb32c0e9
DrawableBeatDivisor -> BeatDivisorControl
2018-03-20 20:10:27 +09:00
Dean Herbert
6fd650777c
Move value change logic to bindable
...
Also add drag support
2018-03-20 20:09:55 +09:00
Dean Herbert
9ad4e9284a
Add skin source fallback chain
2018-03-20 16:40:11 +09:00
smoogipoo
50192b21e3
Give DrawableBeatDivisor a ctor
2018-03-20 13:57:25 +09:00
smoogipoo
b1d09500f2
Integrate beat snap divisor into editor seeking
2018-03-19 20:42:06 +09:00
smoogipoo
c5eab7a227
Actually rename to DrawableBeatDivisor...
2018-03-19 20:34:24 +09:00
smoogipoo
5ecbc5612c
Integrate with dependency injection
2018-03-19 20:33:58 +09:00
smoogipoo
4c0ccffe08
Merge remote-tracking branch 'origin/master' into beat-snap-divisor
2018-03-19 20:23:15 +09:00
smoogipoo
df0b8a24c5
Rename + renamespace
2018-03-19 20:21:19 +09:00
smoogipoo
879dbc75b5
Nest TickContainer in BeatSnapVisualiser
2018-03-19 20:20:29 +09:00
smoogipoo
b25c564ecb
Integrate into editor's compose screen
2018-03-19 20:14:58 +09:00
smoogipoo
32fecc6ff4
Adjust icon scale + text
2018-03-19 20:14:34 +09:00
smoogipoo
e96dad441d
Offset the icon buttons a little bit to look a bit more centered
...
Maybe it's just me, but this is really triggering me.
2018-03-19 20:14:13 +09:00
smoogipoo
c86ddb7ee3
Add slight easing to marker movements
2018-03-19 19:57:02 +09:00
smoogipoo
fbc92bfa01
Add previous/next divisor button actions
2018-03-19 19:55:49 +09:00
smoogipoo
070db63157
Privatise tick to TickContainer
2018-03-19 19:52:22 +09:00
smoogipoo
7182442b21
Add divisor text
2018-03-19 19:49:57 +09:00
smoogipoo
6b035e8c53
Add basic structure/layout for the beat snap visualiser
2018-03-19 19:46:26 +09:00
Dean Herbert
4b812279bb
Merge branch 'master' into fix-editor-clocks
2018-03-19 19:06:38 +09:00
smoogipoo
8d4c9eda48
Fix attempting to add selection boxes with no selection
...
E.g. because DrawableSpinner doesn't (currently) create an overlay, SelectionBox was being constructed with 0 hitobjects and then calculating a non-finite size for itself.
2018-03-19 18:00:11 +09:00
smoogipoo
e25d1f6982
Pass down editor clocks through DI
2018-03-19 16:27:52 +09:00
Dean Herbert
4b83278cf4
Merge branch 'master' into fix-editor-clocks
2018-03-16 23:32:54 +09:00
Dean Herbert
4411758ff7
Merge branch 'master' into fix-autoplay-button-deselect
2018-03-16 17:31:14 +09:00
smoogipoo
b27b6c7eb7
Merge branch 'master' into cursor-trail
2018-03-16 14:43:27 +09:00
smoogipoo
d05947ef48
Pass adjustable clocks to components, rather than relying on the track
2018-03-15 18:19:28 +09:00
smoogipoo
c8f6a6980b
Move clock construction to Editor
2018-03-15 17:27:37 +09:00
smoogipoo
5e742eb466
Move editor constructions to BDL load
2018-03-15 17:10:08 +09:00
Dean Herbert
cdf435aedd
Merge branch 'master' into DoNotMoveToPlayerWhileDragging
2018-03-15 11:14:30 +09:00
Dean Herbert
8d433cb4bf
Merge branch 'master' into cursor-trail
2018-03-15 11:14:21 +09:00
Dean Herbert
551b67ac16
Merge branch 'master' into fix-autoplay-button-deselect
2018-03-14 21:46:19 +09:00
Dean Herbert
a0691168cb
Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement
2018-03-14 15:35:24 +09:00
Dean Herbert
81f82d98a1
Rework a lot of naming and structure
2018-03-14 15:18:21 +09:00
Dean Herbert
ea649f9650
Avoid scheduling during non-current screen
2018-03-14 12:09:19 +09:00
Dean Herbert
ef8d595914
Apply formatting changes
2018-03-14 11:44:19 +09:00
Dean Herbert
c3a3d76b88
Merge remote-tracking branch 'upstream/master' into DoNotMoveToPlayerWhileDragging
2018-03-14 11:43:33 +09:00
Dean Herbert
13f64a1d12
Merge branch 'master' into cursor-trail
2018-03-14 11:42:40 +09:00
FreezyLemon
95c84ea7fe
remove (now) unnecessary line
2018-03-12 23:00:06 +01:00
FreezyLemon
ddc1f03a96
deselect autoplay button after ctrl-enter play
...
before, the mod was removed, but the button was still active
2018-03-12 22:35:45 +01:00
smoogipoo
33c721bcbb
Fix post-merge errors
2018-03-12 09:51:32 +09:00
smoogipoo
6e51b74890
Merge remote-tracking branch 'origin/master' into rewrite-break-overlay
2018-03-12 09:47:05 +09:00
Dean Herbert
487a03d0d7
Merge branch 'master' into cursor-trail
2018-03-11 02:07:05 +09:00
Dean Herbert
db2a663234
Use private instead of protected
2018-03-11 01:26:03 +09:00
naoey
56730247e3
Merge branch 'fix-unplayable-beatmaps' of github.com:naoey/osu into fix-unplayable-beatmaps
2018-03-09 19:40:00 +05:30
naoey
2c0488b1f1
Invert bool, add test, and handle ruleset change.
2018-03-09 19:39:28 +05:30
Dean Herbert
9ad9fc5aa9
Merge branch 'master' into fix-unplayable-beatmaps
2018-03-09 21:39:48 +09:00
naoey
d04f47718f
Make song select choose random when initial selection fails.
...
- Revert TestCasePlaySongSelect to master
2018-03-09 17:36:55 +05:30
naoey
25fb527cc7
Remove previous fix and move filtered logic to carousel.
...
- Add an optional bool parameter to SelectBeatmap to skip selecting
filtered maps
2018-03-09 15:51:00 +05:30
Dean Herbert
6d91889ca6
Move player-specific configuration bindables back to player
2018-03-08 22:16:47 +09:00
Dean Herbert
94ed4ab01b
Add debouncing to player loading
...
Allows the mouse to temporarily exit and re-enter overlay elements without triggering a load
2018-03-08 20:28:55 +09:00
Dean Herbert
d3e91024a7
Block player enter when a drag initiates from an overlaying container
2018-03-08 18:16:23 +09:00
TocoToucan
2cb197d0c4
Replace ConfigureBackgroundUpdate with OnEntering
2018-03-08 11:35:00 +03:00
Dean Herbert
8f3f886805
Merge branch 'master' into PlayerBase
2018-03-08 16:12:12 +09:00
Dean Herbert
81c1ec2005
Merge branch 'master' into fix-unplayable-beatmaps
2018-03-08 13:02:57 +09:00
Dean Herbert
91c984ed97
Merge branch 'master' into rewrite-break-overlay
2018-03-08 09:31:59 +09:00
Dean Herbert
81b778fdcf
Merge branch 'master' into cursor-trail
2018-03-08 09:31:42 +09:00
pdrapoport
3731cbe5eb
Removing "mouse wheel disabled" checkbox from visual settings gameplay menu
2018-03-07 14:20:59 +01:00
Dean Herbert
6a768e378a
Merge branch 'master' into rewrite-break-overlay
2018-03-07 17:00:34 +09:00
smoogipoo
78d73d4c11
Additional fixes for flow ordering after framework changes
2018-03-06 17:20:58 +09:00
smoogipoo
148551afa2
osu!-side changes in-line with framework layout changes
2018-03-06 14:12:37 +09:00
TocoToucan
697ad63d72
Resolve merge conflicts
2018-03-05 22:24:25 +03:00
Dean Herbert
4aafc2228e
Improve skip button behaviour when mouse buttons are down
2018-03-06 00:53:40 +09:00
Dean Herbert
d115c56742
Avoid using input blocking
2018-03-06 00:27:55 +09:00
Dean Herbert
792a3ac469
SkipButton -> SkipOverlay
2018-03-06 00:10:53 +09:00
Dean Herbert
53edfedfc8
Remove unneeded HighFrequencyMousePosition from GameplayMenuOverlay
2018-03-05 19:43:57 +09:00
Dean Herbert
7d11e55d06
Only block mouse input when the shaded portion of the SkipButton is hovered
2018-03-05 19:43:33 +09:00
Dean Herbert
c6c55c40ed
Rewrite BreakOverlay
...
No longer relies on Schedule calls (could not be rewound).
Also no longer sucks.
2018-03-04 00:51:24 +09:00
naoey
a57dc154f9
More specific tests.
2018-03-03 20:34:29 +05:30
naoey
307147a8a3
Merge remote-tracking branch 'upstream/master' into fix-unplayable-beatmaps
2018-03-03 16:10:22 +05:30
naoey
fb724ca8a7
Make song select ensure current beatmap is always playable in the active ruleset.
...
- Add a to TestCasePlaySongSelect testing this scenario
2018-03-03 16:09:24 +05:30
Dean Herbert
bd510e5356
Merge remote-tracking branch 'upstream/master' into clock-fixes
2018-03-02 21:01:53 +09:00
Dean Herbert
6dc9411a90
Don't use BufferedContainer for OsuLogo
...
Minor performance improvement. Not sure why this was done but it's not required any more.
2018-03-01 16:01:42 +09:00
Dean Herbert
bda673e6fe
Merge branch 'master' into player-reduced-parallax
2018-02-28 23:15:25 +09:00
Dan Balasescu
33a64cb497
Merge branch 'master' into fix-multiple-tracks-playing
2018-02-28 22:53:02 +09:00
Dan Balasescu
25c748ed45
Merge branch 'master' into fix-player-exit
2018-02-28 22:05:44 +09:00
Dean Herbert
f9faf8e3d8
Localise offset clock usage out of Player as much as possible
2018-02-28 22:01:52 +09:00
Dean Herbert
01fcf9c813
Update in line with framework changes
2018-02-28 22:01:48 +09:00
Dan Balasescu
b898226a91
Merge branch 'master' into fix-mod-select
2018-02-28 21:52:07 +09:00
Dan Balasescu
a3d26d7d55
Merge branch 'master' into fix-song-select-iteration
2018-02-28 21:40:25 +09:00
Dean Herbert
08497427fd
Merge branch 'master' into fix-multiple-tracks-playing
2018-02-28 15:32:16 +09:00
Dean Herbert
bc0bbd2e3b
Merge branch 'master' into reduce-transforms
2018-02-28 14:39:31 +09:00
Dean Herbert
4a52db14d1
Fix depth of already-visible panels not being updates after a sorting change
2018-02-28 14:18:25 +09:00
Dean Herbert
dd6cf1379e
Reduce parallax effect during gameplay
...
This also cleans up some shared code in OsuScreen.
2018-02-28 11:42:47 +09:00
Dean Herbert
0cd049c6b0
Rely less on zero-duration transform helpers
...
They have huge overheads.
See ppy/osu-framework#1411 .
2018-02-28 11:00:54 +09:00
Dean Herbert
510ecd7c87
Ensure selection is finalised before exiting song select
...
Resolves #2080 .
2018-02-28 00:07:28 +09:00
Dean Herbert
f64afc738d
Fix incorrect exit block conditional
...
Resolves #2130 .
2018-02-27 23:59:34 +09:00
Dean Herbert
84a8fbe0b3
Fix null ref
2018-02-27 21:26:06 +09:00
Dean Herbert
034875be47
Fix bindings not being unbound on ModSelect
...
Resolves #2018 .
Closes #2079 .
2018-02-27 20:45:32 +09:00
Dean Herbert
9b44f447ca
Fix song select iteration when all panels are filtered
...
Resolves #2069 .
2018-02-27 17:52:12 +09:00
Dean Herbert
cff17f1864
Update in line with inverse ShoudProcessClock default
2018-02-27 17:23:38 +09:00
Dean Herbert
8e78a7b114
Fix HUD using incorrect clock for time display
2018-02-27 17:23:38 +09:00
Dean Herbert
37d2a2c3cc
Rename clock types to match across classes
2018-02-27 17:23:38 +09:00
Dean Herbert
3d52ead213
Rename sourceClock
2018-02-27 17:23:38 +09:00
Dean Herbert
fee258f2f2
Rework PauseContainer to better pause
2018-02-27 17:23:38 +09:00
Dean Herbert
d4f1723ae6
Remove unnecessary secondary argument from HUDOverlay
2018-02-27 17:23:38 +09:00
Dean Herbert
0635ae2293
Include missing offset
2018-02-27 17:23:38 +09:00
Dean Herbert
9c0dfb7c8c
Avoid creating an extra framed clock in SkipButton
2018-02-27 17:23:38 +09:00
Dean Herbert
c0d983bbdf
Merge branch 'master' into PlayerBase
2018-02-23 13:51:11 +09:00
Dean Herbert
f2b3d9a0e8
Change some missed instances
2018-02-22 14:17:35 +09:00
Dan Balasescu
34f76a4136
Merge branch 'master' into storyboard-improvements
2018-02-19 15:40:09 +09:00
Dan Balasescu
5401b0dfcd
Merge branch 'master' into abstract-model-managers
2018-02-19 14:56:21 +09:00
Dean Herbert
7c43a3b4c0
Merge branch 'master' into storyboard-improvements
2018-02-19 14:54:12 +09:00
Dean Herbert
e0faf14a3e
Actually consume ReplacesBackground
2018-02-19 12:33:07 +09:00
Dean Herbert
29adedfa96
Collapse visual settings by default in player
2018-02-16 12:47:32 +09:00
Dean Herbert
9760f30ce9
Tidy things up to make more sense
2018-02-16 12:08:36 +09:00
Dean Herbert
f22f9b5de0
Merge branch 'master' into PlayerBase
2018-02-16 11:26:57 +09:00
Dean Herbert
ddf49c2e65
Fix intro not being replaced by a playable song when entering song select
2018-02-16 10:45:15 +09:00
TocoToucan
c57e8785e2
Move all storyboard loading to Player itself
2018-02-15 23:57:53 +03:00
Dean Herbert
d340509b1d
Move ArchiveReaders to a more global namespace
...
Also moves delete and action logic to a shared implementation
2018-02-15 14:22:39 +09:00
Dean Herbert
6ff63c2f0c
Move deletion to ArchiveModelImportManager
2018-02-15 14:22:39 +09:00
Dean Herbert
d8f84fcca3
Give ArchiveReader a filename
2018-02-15 14:22:39 +09:00
Dean Herbert
6f29cd35af
Merge branch 'master' into PlayerResumeHotfix
2018-02-13 20:21:45 +09:00
Shane Woolcock
d603d032d5
Inlined delete beatmap dialog
2018-02-13 16:26:05 +10:30
Shane Woolcock
8d313486b3
Add a confirmation dialog to the Delete option in the beatmap context menu
2018-02-13 00:40:34 +10:30
TocoToucan
86f200e257
Fix possible nullref
2018-02-09 22:04:39 +03:00
TocoToucan
a86a4f49cf
Resolve "Pressing escape on continuing causes the game to return to song select" problem without removing Delay
2018-02-09 21:20:49 +03:00
TocoToucan
4535e09607
Add missing license header
2018-02-09 00:36:31 +03:00
TocoToucan
a860dd7208
Preview visual settings at the “loading” screen
2018-02-09 00:06:24 +03:00
TocoToucan
d437c1d7ec
Introduce PlayerBase class
2018-02-08 23:28:42 +03:00
TocoToucan
77a8b36529
Schedule Resume method call without delay
2018-02-08 22:30:15 +03:00
smoogipoo
b500b76407
Merge branch 'master' into update-branch
2018-02-08 23:35:48 +09:00
Dean Herbert
a70989cb70
Rely on bindable's formatting rather than setting a default
2018-02-08 11:12:05 +09:00
Dean Herbert
7e83aedb86
Merge branch 'master' into slider-tooltip-precision
2018-02-08 11:00:46 +09:00
Dean Herbert
647cc4bdad
Remove in-between properties
2018-02-07 18:04:32 +09:00
smoogipoo
8e280b6b0c
Use 0.1 precision for playback speed
2018-02-07 13:28:10 +09:00
smoogipoo
bd5db6fc8d
Make playback speed sliderbar use the tooltip text as its display
2018-02-07 13:26:41 +09:00
Dean Herbert
9bfec9b233
Tidy up state change logic
2018-02-06 14:30:01 +09:00
Dean Herbert
dd8955cd90
Fix skip button not receiving screen-wide input
2018-02-06 14:29:03 +09:00
tgi74000
b0fbae9dfc
Fix PlayerSettingsOverlay not reappearing when Hidden
2018-02-01 16:07:49 +01:00
Dan Balasescu
c1d5a68e4d
Merge branch 'master' into VisualSettingsOverlay
2018-02-01 16:37:04 +09:00
Dean Herbert
df65443f07
Merge branch 'master'
...
Conflicts:
osu-framework
osu.Game/Screens/Play/Player.cs
2018-01-30 18:31:03 +09:00
Dan Balasescu
2bae22999d
Merge branch 'master' into global-mod-binding
2018-01-29 15:18:11 +09:00
Dean Herbert
6e0cb1adb3
Remove redundant arguments
2018-01-29 15:05:07 +09:00
TocoToucan
ce4122b3c4
Display visual settings overlay on PlayerLoader screen
2018-01-26 23:29:54 +03:00
TocoToucan
d82835107c
Remove autohide and clock related logic from Visual settings overlay
2018-01-26 22:20:24 +03:00
TocoToucan
615c831069
Merge from ppy/master
2018-01-26 21:56:17 +03:00
Dean Herbert
7852015db3
Remember mod selection when re-entering song select
...
Removes mod application when exiting back to main menu.
Alternative to #1968 .
Closes #1961 .
2018-01-26 19:32:57 +09:00
smoogipoo
5742e61e68
Merge remote-tracking branch 'origin/master' into ruleset-configs
2018-01-26 15:39:09 +09:00
smoogipoo
8d11596b2f
Minor cleanups
2018-01-24 17:48:42 +09:00
Dean Herbert
5a00ae36d1
Add database-based configuration for rulesets
2018-01-24 17:45:28 +09:00
smoogipoo
7f299b2533
Merge remote-tracking branch 'origin/master' into RefactorPlayerOverlaysInitialization
2018-01-24 17:44:28 +09:00
Dan Balasescu
fcea12f83d
Merge branch 'master' into allow-quick-retry-key
2018-01-23 14:59:15 +09:00
Dean Herbert
fa1f4304f6
Remove usings
2018-01-23 13:24:04 +09:00
Dean Herbert
f823650b10
Allow user choice of the quick retry hotkey
2018-01-23 13:05:07 +09:00
Michael Manis
794ae5380a
Intverted conditionals.
2018-01-22 01:06:27 -05:00
smoogipoo
b4e1872322
osu!-side changes in-line with framework BDL cache changes
2018-01-22 12:56:30 +09:00
Michael Manis
530e0afa2c
Use IsCurrentScreen instead of a bool for both checks now.
2018-01-21 22:27:15 -05:00
Michael Manis
964c6da9a4
Use IsCurrentScreen instead of a bool
2018-01-21 22:00:18 -05:00
Michael Manis
806da21760
Removed rreduntant initialization.
2018-01-21 20:24:19 -05:00
Michael Manis
ad2df8d8df
Fixed tilde-key crash at end of beatmap.
2018-01-21 20:09:44 -05:00
TocoToucan
e88f514cf4
Resolve merge conflicts
2018-01-21 18:32:21 +03:00
TocoToucan
4875443e12
Resolve merge conflicts
2018-01-21 18:11:43 +03:00
smoogipoo
a05032779f
Remove unneeded event binding
2018-01-18 00:04:33 +09:00
smoogipoo
c79603290d
Move TriggerChange to LoadComplete()
2018-01-17 21:52:57 +09:00
Dan Balasescu
be225eff90
Merge branch 'master' into fix-replays
2018-01-17 18:01:41 +09:00
smoogipoo
2ebb3d6e0e
Fix ReplayLoader not being treated as having a replay loaded
...
Player checks for HasReplayLoaded in Player.load(), but the replay is attached in ReplayPlayer.LoadComplete(), which is too late.
2018-01-17 17:37:14 +09:00
Dean Herbert
5e1cd8ddc4
Apply conditionals directly rather than using an in-between property
2018-01-16 20:34:40 +09:00
Dean Herbert
e7a0a02466
Don't limit keyboard input based on menu button scale
2018-01-16 20:34:40 +09:00
Dean Herbert
39af9321cf
Remove unnecessary overrides
2018-01-16 20:34:40 +09:00
Dean Herbert
9b33499fe7
Merge remote-tracking branch 'upstream/master' into RefactorInputQueues
2018-01-16 20:04:34 +09:00
TocoToucan
c3ca40dcff
Local functions related CI fixes
2018-01-15 23:27:00 +03:00
TocoToucan
3c11978cfa
Use local functions
2018-01-15 21:42:17 +03:00
TocoToucan
a81f32a388
PlayerGroup -> PlayerSettingsGroup
2018-01-15 20:52:52 +03:00
Dean Herbert
0796d33e66
Merge branch 'master' into fix-skipbutton-ordering
2018-01-15 15:54:18 +09:00
smoogipoo
7c41925144
ProvidesUserCursor -> ProvidingUserCursor, and update xmldoc
2018-01-15 14:07:09 +09:00
TocoToucan
d3afbdaac6
Resolve merge conflict
2018-01-13 22:32:56 +03:00
TocoToucan
43d2ae348a
Rename ReplaySomething -> PlayerSomething
2018-01-13 22:25:09 +03:00
TocoToucan
0c4fcdf6d8
Remove not used breakOverlay field
2018-01-12 23:59:36 +03:00
TocoToucan
3795411fd1
Do not assign hudOverlay's and breakOverlay's members in Player class
2018-01-12 23:33:24 +03:00
Aergwyn
ae1adfd2f2
remove unnecessary empty lines
...
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
smoogipoo
d0b177e233
Proxying isn't needed anymore
2018-01-12 19:50:09 +09:00
smoogipoo
16d739580b
IProvideLocalCursor -> IProvideCursor
2018-01-12 19:37:03 +09:00
smoogipoo
620e125fad
Fix cursor being displayed on intro/disclaimer
2018-01-12 19:34:55 +09:00
Dean Herbert
188b26472c
Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision
2018-01-12 18:54:36 +09:00
smoogipoo
a6c6523a86
Make SkipButton an OverlayContainer to use the menu cursor
2018-01-12 18:21:17 +09:00
smoogipoo
512e4d2c9f
Rewrite the way that cursor overrides are done game-wide
2018-01-12 18:13:17 +09:00
james58899
f83c84a0a6
keep BlurTo
2018-01-12 14:24:42 +08:00
james58899
61c8fd4ab9
useless using
2018-01-12 12:39:32 +08:00
smoogipoo
2e235660ad
Fix skip button appearing below osu!mania's stage
2018-01-12 13:25:49 +09:00
james58899
1985e5bdb2
fix background dim
2018-01-12 12:21:37 +08:00
TocoToucan
affbb7a847
Fix license header
2018-01-12 00:37:28 +03:00
TocoToucan
c1f756b16e
Support background blur in visual settings
2018-01-12 00:03:55 +03:00
TocoToucan
3ec93966a0
Implement VisualSettings autohiding
2018-01-11 23:39:23 +03:00
TocoToucan
98851e4a78
Stop time whenever visual settings are expanded
2018-01-11 01:24:34 +03:00
smoogipoo
d147683361
Cleanup
2018-01-10 17:39:15 +09:00
smoogipoo
c010b48b29
Remove number format specified from OsuSliderBar, override ToolTipText
...
Better/cleaner solution.
2018-01-10 17:29:16 +09:00
smoogipoo
17e7f75aca
More osu!-side bindable fixes
2018-01-10 15:41:13 +09:00
Dean Herbert
9ec8f130a6
Ensure changes are only applied when we are the current screen
2018-01-10 13:24:26 +09:00
TocoToucan
c48c7b085c
Visual settings initial commit
2018-01-10 02:24:51 +03:00
Dean Herbert
fcb197f7b6
Simplify logic
2018-01-09 22:21:15 +09:00
Dean Herbert
2518d16a77
Denote unused variable
2018-01-09 21:34:31 +09:00
Dean Herbert
c2fadcfc1f
Merge branch 'master' into background-blur
2018-01-09 21:20:05 +09:00
Dean Herbert
a3f05ca9ec
Avoid unnecessary use of linq
2018-01-09 12:43:10 +09:00
Dean Herbert
b90b1e326e
Merge branch 'master' into fix-randomizer
2018-01-09 12:00:21 +09:00
