Dean Herbert
42be7857d1
Use expression body for property get/set where possible
2019-02-28 13:58:19 +09:00
Dean Herbert
26d53d06a9
Fix remaining issues
2019-02-28 13:31:40 +09:00
Dean Herbert
80737b9ef8
Remove "silent" parameter; consolidate import logic
2019-02-25 18:24:06 +09:00
Dean Herbert
3015d40f8f
Merge branch 'master' into osu-fontusage
2019-02-22 18:09:23 +09:00
Dean Herbert
452caabd40
Apply suggestions from code review
...
Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>
2019-02-22 17:06:49 +09:00
smoogipoo
d8c55bc729
Adjust namespaces
2019-02-21 19:05:52 +09:00
smoogipoo
bca347427f
Update with framework bindable changes
2019-02-21 18:56:34 +09:00
smoogipoo
dbfa95b9e7
Made medium the default font weight
2019-02-20 16:52:36 +09:00
smoogipoo
0693ab8e7d
Merge remote-tracking branch 'origin/master' into osu-fontusage
...
# Conflicts:
# osu.Game/Screens/Multi/Components/BeatmapTitle.cs
2019-02-20 15:04:08 +09:00
smoogipoo
a2aa3ec5cb
Adjust sprite texts in-line with framework changes
2019-02-20 15:03:20 +09:00
Dean Herbert
e2e615cc5c
Merge branch 'master' into leased-bindables-dont-work
2019-02-11 16:30:12 +09:00
Roman Kapustin
4c866e7940
Add PlaylistItemHandle.HandlePositionalInput override
2019-02-01 22:37:27 +03:00
Dean Herbert
ca5c8d37d1
Use leased bindables
2019-02-01 16:44:06 +09:00
Dean Herbert
260034a80e
Don't auto-focus textboxes when on screen keyboard would cause inconvenience
2019-01-25 19:20:29 +09:00
Dean Herbert
82d944dc89
Fix textbox colours not always being set corrrectly
2019-01-25 19:20:29 +09:00
Dean Herbert
8617aaa2a7
Update licence header (and remove year)
2019-01-24 17:43:03 +09:00
smoogipoo
450e4cd223
Hook up API
2018-12-12 19:04:11 +09:00
smoogipoo
9af2b49c01
Merge remote-tracking branch 'peppy/polling-component' into timeshift-api-integration
...
# Conflicts:
# osu.Game/osu.Game.csproj
2018-12-12 16:22:14 +09:00
smoogipoo
41c7d10dff
Fix compilation issues (+ use updated framework)
2018-12-10 13:48:05 +09:00
Dean Herbert
2a2561e5c8
Update framework and otehr nuget packages
2018-12-07 19:39:54 +09:00
smoogipoo
a8ad7d4670
Add silent import parameter
2018-11-30 18:27:13 +09:00
smoogipoo
a88b69ec43
Notify of existing imports
2018-11-28 20:19:35 +09:00
Dean Herbert
7755242a43
Merge branch 'master' into osuTK
2018-11-21 18:53:11 +09:00
smoogipoo
5ad96afea0
Fix crashes when importing/deleting from model managers
2018-11-20 18:09:23 +09:00
smoogipoo
f27bd3ef3e
OpenTK -> osuTK
2018-11-20 17:14:59 +09:00
smoogipoo
aff5fa6169
Update with osu!-side dropdown changes
2018-11-14 18:02:38 +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
smoogipoo
28f31540c4
Apply changes in-line with framework localisation changes
2018-09-19 14:07:46 +09:00
Dean Herbert
0f37758314
Update framework
2018-07-21 16:21: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
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
bcdbd97da9
Merge branch 'master' into fix-playlist-pause
2018-05-27 11:00:50 +09:00
Dean Herbert
568d4882c6
Remove unnecessary null coalesce
2018-05-25 11:00:56 +09:00
smoogipoo
fb78854485
Fix audio playback getting paused if playlist changes beatmap
2018-05-23 19:41:13 +09:00
smoogipoo
8004b8af4d
Privatise the OsuGame beatmap, add local beatmap to OsuTestCase
2018-05-23 17:38:02 +09:00
smoogipoo
f894d73501
Fix possible MusicController nullref
2018-05-23 14:36:09 +09:00
smoogipoo
6eb7590ab0
Make MusicController handle all movement to previous/next tracks
2018-05-14 17:42:01 +09:00
Dean Herbert
32a74f95a5
Normalize all the line endings
2018-04-13 18:26:38 +09:00
smoogipoo
b97c4e8b44
Fix all possible cases of crossthread import data races
2018-04-09 12:45:44 +09:00
smoogipoo
78d73d4c11
Additional fixes for flow ordering after framework changes
2018-03-06 17:20:58 +09: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
f4ddc0717b
Fix incorrect PlaylistItem drag handling
2018-02-13 20:08:59 +09:00
Aergwyn
ae1adfd2f2
remove unnecessary empty lines
...
codefactor.io \(o.o)/
also one unnecessary semicolon
2018-01-12 19:30:34 +01:00
Dean Herbert
37d393bca0
Update licence headers
2018-01-05 20:21:19 +09:00
Dean Herbert
87e790080b
Remove manual audio thread synchronisation logic
...
No longer required as calls are blocking.
2017-12-21 22:22:28 +09:00
Dean Herbert
c1b607fed9
Wait until track has restarted before continuing operation
...
I removed this from my previous PR thinking it was not required, but it turned out to be required after all. Just isn't so noticeable when it fails.
2017-12-05 14:06:40 +09:00
Dean Herbert
caee6c1cf1
Use Restart instead of Start
2017-12-04 21:40:26 +09:00
Dean Herbert
a83add8540
Tidy up events
2017-12-04 20:30:56 +09:00
Aergwyn
14096c90cc
removed looping if only one song is in the list (temporarily)
...
It had one problem in relation to SongSelect disabling it when left and in general that topic belongs to another PR.
2017-12-03 16:41:21 +01:00
Aergwyn
9d13bf3602
remove redundant expression
2017-12-03 14:35:23 +01:00
Aergwyn
dfa7448716
use ?: expression
2017-12-03 14:25:12 +01:00
Aergwyn
0c9ebcd58c
fix possible NullRef
2017-12-03 14:15:08 +01:00
Aergwyn
a1dbd7916b
fixes MusicController constantly trying to start a track
...
In Detail:
It tried to start a track if the current one ended even if no BeatmapSets were present.
Also if only one BeatmapSet is present if will loop by itself now.
2017-12-03 14:03:43 +01:00
Dean Herbert
4f6263ef86
Make many internal classes and methods public
...
This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.
2017-11-21 12:06:16 +09:00
MrTheMake
89b5a6670e
Changed type of IHasFilterTerms.FilterTerms according to framework update
2017-09-13 16:18:02 +02:00
smoogipooo
1904b5edfe
Only store native position instead of input state.
2017-09-05 10:38:19 +09:00
smoogipooo
e9f0762440
Don't query GetContainingInputManager every Update.
2017-09-05 10:29:51 +09:00
smoogipooo
ad966f41f5
Fix CI error.
2017-09-04 15:26:09 +09:00
smoogipooo
722b7419d6
Clamp at the end points.
2017-09-04 15:06:21 +09:00
smoogipooo
04c3801fcc
Add scrolling points so items can be dragged beyond the list.
2017-09-04 14:58:28 +09:00
smoogipooo
2ed20f5a6f
Add better fix for items swapping erratically.
2017-09-04 14:20:40 +09:00
smoogipooo
3b575444be
Rewrite PlaylistList as CompositeDrawable and remove all backwards PlaylistList references
...
Now handles drag at a PlaylistList.ItemsScrollContainer level (private class), and PlaylistList itself is no longer a Container so it only supports adding BeatmapSets. Sorry for the rewrite x.x.
2017-09-04 13:12:12 +09:00
smoogipooo
9b0309e683
Use TakeWhile instead of reversing the list.
2017-09-04 11:28:15 +09:00
smoogipooo
9078444a62
Fix items jumping between two indices in the edge case, use a linear search for now.
2017-09-04 11:03:53 +09:00
smoogipooo
c72a9b1301
Merge remote-tracking branch 'origin/master' into pr/n1202_2yangk23
2017-09-04 09:42:24 +09:00
Kelvin
0e363fce1e
Try to fix stuttering behavior
2017-08-29 22:26:06 -07:00
Dean Herbert
39b5b04700
Don't use Bindable for AccentColour
...
Implements IHasAccentColour for conformity to rest of project. Also fixes a nullref when opening the login menu.
2017-08-29 18:17:01 +09:00
Kelvin
e5bf3f6a6a
Fix out of bounds
2017-08-29 00:46:11 -07:00
Kelvin
1eb31afd14
Get destination index using binarysearch
2017-08-29 00:39:17 -07:00
Kelvin
458c3a355f
Rearrange dragging using cheeseburger icon only
2017-08-28 23:28:58 -07:00
Kelvin
636492b9cf
Rearrange tracks in OnDrag
2017-08-28 22:59:28 -07:00
Kelvin
12be5b417d
Use MathHelper.Clamp
...
- Fix formatting
2017-08-28 22:51:26 -07:00
Kelvin
2f5d8a7f88
Fixed code style errors
2017-08-28 01:08:51 -07:00
Kelvin
97ebf38288
Use PlaylistList to manage Prev/Next tracks
2017-08-28 00:56:03 -07:00
Kelvin
5c3b7ac12c
Allow rearranging playlist tracks
2017-08-28 00:29:44 -07:00
smoogipooo
e83a554ffc
Update CollectionsDropdown in line with framework
2017-08-25 15:58:09 +09:00
Dean Herbert
143ff695ef
Remove unused using statements
2017-08-15 17:44:04 +09:00
Dean Herbert
6ded194c53
Remove all usage of DI to retrieve InputManager
...
Uses GetContainingInputManager instead, as per framework changes.
2017-08-15 14:30:50 +09:00
Dean Herbert
0d9ea97828
Allow Rulesets to create a non-FontAwesome icon
...
This also
- Renames TextAwesome to SpriteIcon.
- Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).
2017-08-03 14:36:21 +09:00
MrTheMake
4d8e5898fd
Updates according to the framework and formatting
2017-08-01 17:28:18 +02:00
Dean Herbert
209d024caa
Merge branch 'master' into musiccontroller-canbeatmapchange
2017-08-01 11:54:05 +09:00
Dean Herbert
a55586f2ad
FIx potential sequence of execution issues in PlaylistOverlay
2017-07-28 15:04:58 +09:00
Dean Herbert
e448f79154
Fix deleted beatmaps not correctly being removed from the playlist
2017-07-28 12:58:35 +09:00
Dean Herbert
5f53426a9a
*Database -> *Store
...
Welcome back BeatmapManager
2017-07-27 16:56:41 +09:00
Dean Herbert
cbe7b08642
Make BeatmapStore's BeatmapDatabase private
2017-07-27 15:34:13 +09:00
Dean Herbert
96b08b8777
Simplify and document DatabaseStore API
2017-07-27 15:06:10 +09:00
Dean Herbert
9e20a02c0a
Split out BeatmapDatabase into BeatmapStore
...
Hide database functionality at a lower level in preparation from eventually making it private.
2017-07-26 16:31:34 +09:00
Dean Herbert
fce580d717
Reshuffle namespaces
2017-07-26 13:22:46 +09:00
Dean Herbert
750d96be8f
Merge branch 'master' into playlist-beatmaplist-sync
2017-07-24 14:12:04 +09:00
Ben Pig Chu
950c55d6d0
No need to dispose/unbind the delegates
2017-07-24 13:10:51 +08:00
Ben Pig Chu
76edcb4a67
Update playlist when adding or removing beatmap set
2017-07-23 14:21:10 +08:00
Thomas Müller
e68675f970
Rename EasingTypes to Easing
2017-07-22 20:53:53 +02:00
Thomas Müller
a7dc8a892b
Update framework
2017-07-21 17:24:09 +02:00
Thomas Müller
2cd8f6b30c
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-21 11:15:26 +02:00
Dean Herbert
3bdd4d7d02
Centralise TrackManager.AddItem logic to avoid duplicate adds
2017-07-20 17:46:33 +09:00
Dean Herbert
67b95926c4
Remove usage of SetExclusive
...
Also immediately disposes WorkingBeatmaps on ValueChanged.
2017-07-20 16:45:44 +09:00
Thomas Müller
c4619f614a
Merge branch 'master' of github.com:ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
2017-07-19 19:15:51 +02:00
MrTheMake
6ff2b73c30
Merge branch 'master' of https://github.com/ppy/osu into musiccontroller-canbeatmapchange
2017-07-19 16:50:29 +02:00
Dean Herbert
59416584c1
Don't show theme song in playlist
2017-07-19 15:16:35 +09:00
Thomas Müller
4d8261fe0b
Merge branch 'master' of https://github.com/ppy/osu into better-transforms
...
# Conflicts:
# osu-framework
# osu.Game/Graphics/Cursor/OsuTooltipContainer.cs
# osu.Game/Overlays/DragBar.cs
2017-07-18 15:16:02 +03:00
Thomas Müller
a5e610a7ba
Update framework and fix compilation
...
Most issues were related to BeginLoopedSequence usage and lack of
"this." in front of transform helpers.
2017-07-14 19:18:12 +03:00
Huo Yaoyuan
6cf36da389
Merge branch 'master' into profile
2017-07-14 22:52:19 +08:00
MrTheMake
8e0d59bfed
Updated to use ppy's implementation
2017-07-14 12:08:56 +02:00
Dean Herbert
9d47dd9ff9
Add support for right mouse absolute scrolling (when enabled)
...
Will likely need to be bindable when hooked up to settings and actually used.
2017-07-12 18:57:44 +09:00
Marco Stephan
8ffd7b313b
Merge branch 'master' into musiccontroller-canbeatmapchange
2017-06-21 12:23:38 +02:00
Dean Herbert
45d3c2cd52
Merge branch 'master' into profile
2017-06-21 16:40:17 +09:00
MrTheMake
edd7fd585c
Disable beatmap changing buttons when entering a screen that disallows changing the beatmap
2017-06-21 00:51:32 +02:00
MrTheMake
354f516779
Moved load condition and simplify list selection
2017-06-20 15:19:59 +02:00
paparony03
62dee59672
Shapes namespace
...
Depends on https://github.com/ppy/osu-framework/pull/837
2017-06-20 15:54:23 +10:00
MrTheMake
03c13620c8
Filter the playlist overlay's beatmap list
2017-06-20 02:12:05 +02:00
MrTheMake
b9cf0e47ee
CI fix
2017-06-19 18:12:26 +02:00
MrTheMake
667e6a2d6b
Applied suggested changes
2017-06-19 18:06:39 +02:00
MrTheMake
aec46a57c8
Restart the current track when pressing PREVIOUS or NEXT rather than doing nothing
2017-06-19 17:33:58 +02:00
MrTheMake
15a1dd14a6
CanChangeBeatmap -> CanBeatmapChange
2017-06-19 16:45:21 +02:00
MrTheMake
73f2709a2d
Move logic into PlaylistOverlay
2017-06-19 16:30:58 +02:00
Huo Yaoyuan
fcd137ced2
Add OsuTextFlowContainer.
2017-06-13 00:51:06 +08:00
smoogipooo
ffbb46f668
Update in line with framework.
2017-06-12 12:48:47 +09:00
John Neijzen
4abad17b92
Fix Black Space after } and Symbol Spacing
2017-06-08 14:48:42 +08:00
Dean Herbert
5f537780cf
Bring framework up-to-date
2017-06-07 15:32:50 +09:00
EVAST9919
8cde50a88a
Merge branch 'master' of https://github.com/ppy/osu into ingame_options
2017-05-31 08:23:06 +03:00
Dean Herbert
8544b45443
Update in line with framework
2017-05-30 22:23:51 +09:00
Dan Balasescu
6918368afc
Merge branch 'master' into ingame_options
2017-05-29 18:12:02 +09:00
Dean Herbert
d749fc516d
Update focus handling in line with framework changes
2017-05-28 20:08:46 +09:00
EVAST9919
8c1437c51a
Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options
2017-05-21 13:44:52 +03:00
DrabWeb
7485a78128
Update framework
2017-05-20 03:14:22 -03:00
DrabWeb
139b03a1ce
Only recreate text once per unicode option change
2017-05-20 02:05:13 -03:00
DrabWeb
43bd0f686b
Fix artist being the opposite value
2017-05-20 01:25:42 -03:00
DrabWeb
48417beb81
Unused using directive
2017-05-20 01:22:33 -03:00
DrabWeb
615082d757
Remove whitespace
2017-05-20 01:17:04 -03:00
DrabWeb
dcc3dbf5e2
Make PlaylistItem use Paragraphs
2017-05-20 01:11:20 -03:00
EVAST9919
a21343da23
CI fixes
2017-05-17 17:14:09 +03:00
EVAST9919
fd2150aa49
Moved collectionsDropdown to it's own class
2017-05-17 15:32:16 +03:00
Dean Herbert
efab186384
Update namespaces in line with framework
2017-05-16 12:50:30 +09:00
Dean Herbert
fd9218b6d5
Use FirstOrDefault
2017-05-12 20:48:25 +09:00
Dean Herbert
24db423c4f
Merge remote-tracking branch 'upstream/master' into playlist-commit
2017-05-12 20:39:50 +09:00
Dean Herbert
6c117f15af
Remove unnecessary usings
2017-05-12 20:06:38 +09:00
DrabWeb
de8428c95b
Make requested changes
2017-05-07 22:23:33 -03:00
DrabWeb
81d67cbe06
Play first visible set in playlist when commiting in the search field.
2017-05-05 01:59:24 -03:00
Dean Herbert
46ae8bc86b
Use value because we need to.
2017-05-02 16:49:27 +09:00
Dean Herbert
f1d0b77d10
Base the music controller transform direction on relative indices in playlist.
2017-05-02 16:40:29 +09:00
Dean Herbert
beb98c14b6
Fix layout not being invalidated when re-filtering playlist display.
2017-05-02 16:26:11 +09:00
Dean Herbert
6074cb5979
Make playlist filtering work.
...
Also standardises searchable terms in beatmap metadata.
2017-05-02 10:45:55 +09:00
Dean Herbert
2437c416b1
Use less usings.
2017-05-01 19:56:01 +09:00
Dean Herbert
c59589eba7
Only retrieve colour once.
2017-05-01 19:32:00 +09:00
Dean Herbert
0f4ef16910
Remove custom word splitting logic, add localisation support.
2017-05-01 17:14:59 +09:00
Dean Herbert
2cfb83436d
Add placeholder logic for filtering.
2017-05-01 15:27:41 +09:00
Dean Herbert
a1f341a64f
Fix textbox focus issues (and inability to use escape).
2017-05-01 15:23:01 +09:00
Dean Herbert
c1d0aea217
Refactoring part 5.
2017-05-01 15:09:14 +09:00
