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
Dean Herbert
1de9a63ac6
Merge branch 'master' into async-screens
2018-04-23 20:50:43 +09:00
Dean Herbert
eb7fe0b9e2
Merge branch 'master' into fix-badge-container
2018-04-23 19:13:34 +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
1f73ad0da5
Merge branch 'master' into fix-intro-race-condition
2018-04-23 15:17:44 +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
0e57f685f8
Merge pull request #2429 from peppy/fix-skin-parse-errors
...
Add error handling on a per-line level in LegacyDecoder
2018-04-22 10:53:43 +09:00
Dean Herbert
64ddee5646
Change load order to ensure runner is loaded before blocking op
2018-04-22 04:26:27 +09:00
Dean Herbert
44a9aa529a
Test CI run with new changes
2018-04-22 03:51:17 +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
Dean Herbert
b16e25c3e9
Add error handling on a per-line level in LegacyDecoder
...
Resolves #2306 .
2018-04-20 18:32:24 +09:00
Dan Balasescu
cb8067539a
Merge branch 'master' into remove-approachcircle-hax
2018-04-20 18:20:51 +09:00
smoogipoo
0dce7a5b61
Update framework + fix CI errors
2018-04-20 18:19:17 +09:00
Dean Herbert
29a28387d8
Merge branch 'master' into show-beatmap-id
2018-04-20 18:07:52 +09:00
Dean Herbert
27437cfbaf
Merge branch 'master' into show-beatmap-id
2018-04-20 18:05:24 +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
0b993561d8
Fix BadgeContainer being unsable to handle null badges
...
This fixes a failing test (hidden becaues the test wasn't being run).
- [ ] Merge osu-framework#1530 first.
2018-04-20 16:05:34 +09:00
Dean Herbert
dce569c9be
Merge branch 'master' into fix-overlapping-speedchanges
2018-04-20 15:36:28 +09:00
smoogipoo
11b943c820
ComputePositions -> UpdatePositions
2018-04-20 14:22:48 +09:00
smoogipoo
52e3ffff30
Add some more commenting to lifetime calculation
2018-04-20 14:20:16 +09:00
smoogipoo
f3fddcc82c
Reorder parameter for consistency
2018-04-20 14:20:04 +09:00
smoogipoo
48b421b4b4
Add comments to SequentialSpeedChangeVisualiser
2018-04-20 14:16:30 +09:00
smoogipoo
1bab601cbc
Comments + xmldocs
2018-04-20 13:51:36 +09:00
Dean Herbert
a64ed142f0
Use a more suiting icon for discord for now
2018-04-20 13:51:30 +09:00
Dean Herbert
8649ddc68b
Make forum posts a web link
2018-04-20 13:01:23 +09:00
Dean Herbert
fe644c6909
Merge branch 'master' into profile_web_changes
2018-04-20 12:51:30 +09:00
Dean Herbert
8eefd04fcb
Don't return overlay to null until it has been completely hidden
2018-04-20 12:47:23 +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
tgi74000
64709da546
Update profile header to osu-web changes
2018-04-19 14:46:42 +02:00
Dean Herbert
0356e5e6bf
Remove unused property
2018-04-19 21:00:22 +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
e666a82e1f
Fix cloning
2018-04-19 18:59:09 +09:00
smoogipoo
ac64f9d958
Remove LegacyBeatmap
2018-04-19 18:58:45 +09:00
smoogipoo
b5a55a0dce
Make an interface for beatmaps
2018-04-19 18:58:40 +09:00
miterosan
3b68dda23e
Merge remote-tracking branch 'origin/master' into Private_Messages
2018-04-18 20:55:12 +02:00
miterosan
29e8c70ed7
Only use one tabControl (channeltabcontrol). Fix that the Channel messages did not refresh.
2018-04-18 20:46:42 +02:00
aQaTL
1dc8986c22
Switched back to switch
2018-04-18 15:06:03 +02: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
smoogipoo
d5ce618d9b
Update with framework changes
2018-04-18 15:12:48 +09:00
smoogipoo
ffbe6f2e37
Merge remote-tracking branch 'origin/master' into fix-rank-status
...
# Conflicts:
# osu.Game/Beatmaps/RankStatus.cs
# osu.Game/Online/API/Requests/SearchBeatmapSetsRequest.cs
# osu.Game/Overlays/Direct/FilterControl.cs
# osu.Game/Overlays/DirectOverlay.cs
2018-04-18 14:16:58 +09:00
Dan Balasescu
33f4f57ee3
Merge branch 'master' into replay_mods
2018-04-18 14:00:32 +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
Dean Herbert
a827fb51bc
Simplify child definition
2018-04-18 11:42:55 +09:00
jorolf
ddd59382e2
Merge branch 'profile-badges' of github.com:Jorolf/osu into profile-badges
2018-04-16 19:37:52 +02:00
jorolf
de9f15f620
add new test case and fix rotation not working
2018-04-16 19:22:11 +02:00
jorolf
046412f962
make hover lost transition instant (similar to hover transition)
2018-04-16 18:52:09 +02:00
jorolf
2a18b4c3f8
add a DRAWABLE_BADGE_SIZE const and center badges
2018-04-16 18:51:35 +02:00
jorolf
af0c49cca8
badge_size is the actual badge size now
...
also fixes rotateBadges bug when hover is lost
2018-04-16 18:27:18 +02:00
tgi74000
1feba556eb
CI: unused directive
2018-04-16 14:25:43 +02:00
tgi74000
9b36cf2066
Review changes
2018-04-16 14:14:40 +02:00
smoogipoo
ea0683adb2
Fix hitobject lengths not being calculated for overlapping speed changes
...
Fixes #2359
2018-04-16 20:34:59 +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
jorolf
af755b4a90
Merge branch 'master' into profile-badges
2018-04-15 23:50:52 +02:00
jorolf
6ca714d93b
add badges to ProfileHeader
2018-04-15 23:49:45 +02:00
tgi74000
3454ec1ca3
Set Value instead of BindTo
2018-04-15 20:23:57 +02:00
tgi74000
4c08aa3dfb
Merge remote-tracking branch 'upstream/master'
2018-04-15 20:22:16 +02:00
Dean Herbert
9eb04a5fc8
Merge branch 'master' into fix-button-kb-input
2018-04-16 02:48:51 +09:00
Dean Herbert
2eefe722f3
Move cache to a slightly more familiar place and add comment
2018-04-16 00:38:32 +09:00
Dean Herbert
96ef564f44
Remove unused field
2018-04-16 00:25:09 +09:00
Dean Herbert
c9615f837a
Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot
2018-04-16 00:20:06 +09:00
Dean Herbert
ae77c010e2
Merge remote-tracking branch 'upstream/master' into wave-container
2018-04-15 21:03:18 +09:00
Dean Herbert
fd54ae3c87
Simplify logic
2018-04-15 16:12:42 +09:00
Dean Herbert
069d48ac14
Remove unused variable
2018-04-15 15:29:00 +09:00
TocoToucan
671de4f6c2
Resolve merge conflicts
2018-04-14 15:11:28 +03:00
miterosan
142e1b8587
update the line endings
2018-04-14 13:32:48 +02:00
miterosan
5bfb386226
Merge remote-tracking branch 'origin/master' into Private_Messages
2018-04-14 13:31:03 +02:00
miterosan
1b51da70af
Create an abstraction for APIMessagesRequest
2018-04-14 13:23:16 +02: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
tgi74000
73ba8e1c87
CI: remove unused directive
2018-04-13 16:10:01 +02:00
tgi74000
b23b0a445b
Add support for replay mods
2018-04-13 15:41:35 +02:00
smoogipoo
fe77417e03
Merge remote-tracking branch 'origin/master' into ignored_input_handler
2018-04-13 22:23:33 +09:00
Dan Balasescu
258e17566c
Merge branch 'master' into update-nunit-3.10.1
2018-04-13 22:05:26 +09:00
Dean Herbert
a0f9f8d512
Update frramework again
2018-04-13 21:47:50 +09:00
smoogipoo
cf65833572
Reword xmldoc
2018-04-13 21:15:08 +09:00
smoogipoo
733f70cbd5
Merge remote-tracking branch 'origin/master' into instant-hide-screenshot
2018-04-13 21:13:09 +09:00
smoogipoo
34adb2527c
A lot more protection from outsiders
2018-04-13 21:12:33 +09:00
smoogipoo
cd594ce12b
BDL cache screenshot manager
2018-04-13 20:46:01 +09:00
FreezyLemon
4b3a129738
bump NUnit to version 3.10.1
2018-04-13 13:19:52 +02:00
Dean Herbert
9f5a52b641
Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler
2018-04-13 19:54:15 +09: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
Dean Herbert
a1a7e63646
Merge branch 'master' into ignored_input_handler
2018-04-13 18:05:12 +09:00
Endrik Tombak
d9f587edff
Merge remote-tracking branch 'upstream/master' into alt-eagerselect
2018-04-13 11:55:35 +03:00
smoogipoo
0235eba9de
Make TakeScreenshotAsync await on the internal task
2018-04-13 17:51:09 +09:00
smoogipoo
2e5bbe7074
Don't expose CursorOverrideContainer via DI + internalise access
2018-04-13 17:36:38 +09:00
smoogipoo
826a8552e5
Reword options item to include "screenshot"
2018-04-13 17:30:02 +09:00
smoogipoo
ebe36f0612
Instantly hide cursor for required frames while taking screenshot
2018-04-13 17:27:10 +09:00
Dean Herbert
f7c50dee65
Merge branch 'master' into beatmap_set_overlay_difficulties_ordering
2018-04-13 16:48:43 +09:00
Dan Balasescu
2699ad8c89
Merge branch 'master' into lowercase-back-button
2018-04-13 14:14:18 +09:00
Joehu
128446e51d
Remove composer from player loader
2018-04-12 16:46:46 -07:00
miterosan
a9f3885d28
Remove not needed using
2018-04-12 23:29:23 +02:00
miterosan
e39f5a1adf
Rename var chatmanager -> channelManager
...
Apply requested changes
2018-04-12 23:19:13 +02:00
TocoToucan
9acea6eab0
Order beatmap difficulty icons correctly
2018-04-12 19:33:30 +03:00
Joehu
61d6f52a53
Lowercase back button
2018-04-12 08:26:25 -07:00
Joehu
463b189d2f
Remove unused using directives
2018-04-12 08:13:24 -07:00
Joehu
df4b64effc
Rename rankStatus to searchCategory
2018-04-12 08:03:19 -07:00
Joehu
f18594887b
Move enum to SearchBeatmapSetsRequest
2018-04-12 07:49:23 -07:00
TocoToucan
7c3441e2d0
ActiveInputHandlers -> IgnoredInputHandler
2018-04-12 17:06:35 +03: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
Dean Herbert
b50bad0072
Merge branch 'master' into editor-clock
2018-04-12 19:29:58 +09:00
Dean Herbert
3ddf00ee74
Merge branch 'master' into high-level-xmldoc
2018-04-12 19:05:10 +09:00
Joehu
461e063f19
Rename RankStatus to BeatmapSearchCategory
2018-04-11 22:50:39 -07:00
smoogipoo
baae4427ff
Move string-token property to OAuth
2018-04-12 14:30:28 +09:00
smoogipoo
e007365916
Save OAuth token to config on every token change
2018-04-12 14:23:49 +09:00
smoogipoo
6e35910419
Remove start/stop clock logic
...
Beatmap track shouldn't be start/stopped anyway - the IAdjustableClock should be DI'd in to perform the functionality.
2018-04-12 14:06:36 +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
Dan Balasescu
9e2494c57b
Merge branch 'master' into high-level-xmldoc
2018-04-12 12:59:37 +09:00
DrabWeb
0bede52381
Move the waves portion of WaveOverlayContainer to WaveContainer to allow usage in other places.
2018-04-11 16:22:27 -03:00
miterosan
4927abfde5
Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages
2018-04-11 20:54:08 +02:00
miterosan
a5e0311253
Trim whitespaces
2018-04-11 20:53:35 +02:00
miterosan
6e81fda40e
Merge branch 'master' into Private_Messages
2018-04-11 20:48:06 +02:00
miterosan
499ecd3843
Fix the warnings
2018-04-11 20:44:35 +02:00
miterosan
c2020742b2
Actually use the fact that ChannelManager is now a component
2018-04-11 20:37:51 +02:00
miterosan
2056258def
Fix code sanity
2018-04-11 20:31:16 +02:00
miterosan
697b551f3e
Fix Selected tab beeing choosen multiple times
2018-04-11 20:27:33 +02:00
TocoToucan
d7812ab12e
CursorOverrideContainer.ShowMenuCursor
2018-04-11 21:22:52 +03:00
miterosan
3860594f40
Rename everything into channel and remove everything chat
2018-04-11 20:01:57 +02:00
miterosan
39ecc3d31d
Add Test Case, improve displaying the avatar, use a chatTabControl instead of putting both in ChatOverlay, readd shadow.
...
Requires osu-framework for a fix
2018-04-11 18:23:09 +02:00
TocoToucan
6a8f568f66
BeatmapContainer -> beatmapContainer
2018-04-11 16:32:58 +03:00
TocoToucan
6cdfaffcf7
PaginatedBeatmapContainer.BeganPlayingPreview
2018-04-11 16:19:21 +03:00
Dean Herbert
903dd7a015
Fix regression causing hard crash
...
Regressed in #2373 . My bad.
2018-04-11 19:24:19 +09:00
aQaTL
90beff83f6
Updated KeyBindingRow sprite text, adjusted KeyBindingOverlay width
2018-04-11 08:07:26 +02:00
aQaTL
38277bff35
Changed mapping of deleting key binding to shift+delete
2018-04-10 18:00:22 +02:00
naoey
d851446aca
Remove redundant anchor and use Show/Hide instead of FadeIn/Out.
2018-04-10 19:15:37 +05:30
Joseph Madamba
767ecb4422
Fix rank status
2018-04-10 00:11:53 -07:00
Dean Herbert
c33cb9c02e
Merge branch 'master' into show-beatmap-id
2018-04-10 16:05:32 +09:00
miterosan
85f736ae89
Allow opening a new chat with right click on User
...
Allow faster viewing of the usertab using lasy loading
2018-04-09 23:14:39 +02:00
miterosan
762b4412e5
Convert if to switch
2018-04-09 22:29:48 +02:00
miterosan
5512d58c1d
Remove the sealed modifier
2018-04-09 21:06:05 +02:00
UselessToucan
9225c06872
Merge branch 'master' into hide_menu_cursor
2018-04-09 21:41:54 +03:00
aQaTL
dbee936748
Allow mapping delete key via alt+delete key combination
2018-04-09 18:48:47 +02:00
smoogipoo
b97c4e8b44
Fix all possible cases of crossthread import data races
2018-04-09 12:45:44 +09:00
miterosan
aa26ea483d
remove using, remove empty agrument list
2018-04-08 22:43:01 +02:00
miterosan
2a314f052a
Trim more whitespace
2018-04-08 22:28:50 +02:00
miterosan
0a207e00d5
Trim whilespace
2018-04-08 22:24:55 +02:00
miterosan
4b7ffd09d9
Trim whitespace
2018-04-08 22:18:29 +02:00
miterosan
a48ccb5603
Implement Private chat
2018-04-08 22:12:57 +02:00
miterosan
a70b329155
Split drawing and business logic of ChatOverlay
2018-04-08 18:21:48 +02:00
miterosan
525e50e8dd
Merge remote-tracking branch 'origin/master' into Private_Messages
2018-04-08 15:23:09 +02:00
miterosan
f1696eae92
Use IEnumable instead of List
2018-04-08 15:01:14 +02:00
Dean Herbert
421e9e0641
Add xmldoc to some high-level classes to explain their separation
2018-04-08 12:58:34 +09:00
TocoToucan
640be621ac
Handle multiple song previews playing in different beatmap categories on profile
2018-04-07 13:29:46 +03:00
Dean Herbert
c2a2457160
Merge branch 'master' into manual-input-test-case
2018-04-06 20:42:08 +09:00
Dan Balasescu
1895111c75
Merge branch 'master' into dynamic-assembly-update
2018-04-06 20:16:13 +09:00
Dean Herbert
6bc319caae
Merge branch 'master' into manual-input-test-case
2018-04-06 20:07:07 +09:00
Dean Herbert
cd48cb1887
Add comment
2018-04-06 19:53:23 +09:00
smoogipoo
070e68f235
Give the test case clock an accurate IsRunning value
2018-04-06 19:14:04 +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
b238130fe4
DI beat divisors to test cases with editor clocks
2018-04-06 18:23:22 +09:00
smoogipoo
9e8490735f
Fix Compose not binding to the editor's beat divisor
2018-04-06 18:22:24 +09:00
smoogipoo
248be8e35f
HitObjectComposer no longer needs a beat divisor
2018-04-06 18:21:45 +09:00
smoogipoo
fdb3227fd7
Fix + cleanup testcases
2018-04-06 18:12:44 +09:00
smoogipoo
c7abd56fc4
Give editor a custom clock to handle seeking
2018-04-06 18:11:37 +09:00
Dean Herbert
768a5e5383
Create ManualInputManagerTestCase
...
A base class for running more input-driven tests.
2018-04-06 15:23:30 +09:00
Dean Herbert
acbdbcc3df
Update AssemblyInfo in line with framework changes
2018-04-06 13:17:26 +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
Dean Herbert
1a6dfcbc1c
Merge branch 'master' into selectionlayer-rewrite
2018-04-05 21:03:29 +09:00
Dean Herbert
37fb207abd
Remove TestTestCase
...
No longer necessary as we have restructured tests considerably.
2018-04-05 16:01:33 +09:00
Dean Herbert
0ad4b8a6f8
Remove TestTestCase
...
No longer necessary as we have restructured tests considerably.
2018-04-05 15:55:47 +09:00
naoey
ca4299c6fe
Remove unused using and fix possible nullref.
2018-04-04 22:07:24 +05:30
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
naoey
c304c1eecf
Make LinkFlowContainer handle beatmap id lookup in game.
2018-04-04 21:23:51 +05:30
Dean Herbert
6c125683d4
Merge branch 'master' into selectionlayer-rewrite
2018-04-04 20:47:36 +09:00
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
a997ec6139
Fix ShouldBeAlive state
2018-04-04 19:51:56 +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
Dan Balasescu
d418a4803f
Merge branch 'master' into colours-for-judgements
2018-04-04 15:13:52 +09:00
Dan Balasescu
bed46b1f7e
Split local variable assignment from construction of children
2018-04-04 15:13:42 +09:00
Dan Balasescu
9df525a38d
Remove extra whitespace
...
In general we don't really do this elsewhere in the codebase.
2018-04-04 15:11:16 +09:00
DrabWeb
65f0e91734
Use Interpolation function directly for resizing tab strips.
2018-04-04 03:04:26 -03:00
Dan Balasescu
b5d7a5df00
Merge branch 'master' into colours-for-judgements
2018-04-04 15:02:03 +09:00
Dan Balasescu
6dfca4b2fa
Merge branch 'master' into osu-tab-strip
2018-04-04 14:20:06 +09:00
smoogipoo
4f19059e55
DragBox -> DragLayer
2018-04-03 21:29:49 +09:00
smoogipoo
c39fb9a200
Update with framework changes
2018-04-03 20:10:26 +09:00
Dean Herbert
ddba7254ca
Merge remote-tracking branch 'upstream/master' into linq
2018-04-03 13:05:08 +09:00
Dean Herbert
d40ccbd70a
Merge branch 'master' into selectionlayer-rewrite
2018-04-03 12:03:11 +09:00
Dean Herbert
77189073b2
Merge branch 'master' into scalablecontainer-size-fix
2018-04-03 11:29:36 +09:00
Dean Herbert
57b4cdaf85
Merge branch 'master' into selectionlayer-rewrite
2018-04-03 03:05:42 +09:00
smoogipoo
e9ec544bf6
Implement joystick keybindings
2018-04-03 02:04:40 +09:00
smoogipoo
fd9480cfb6
Handle timingpoint FormatException
2018-04-02 20:08:40 +09:00
smoogipoo
d24d81d8a9
De-pluralize some methods
2018-04-02 20:07:18 +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
83dcff2907
Merge branch 'master' into fix-songselect-exit-notimplemented
2018-04-02 13:54:06 +09:00
Dan Balasescu
32832304a7
Merge branch 'master' into fix-songselect-exit-notimplemented
2018-04-02 13:53:41 +09:00
Dan Balasescu
323534c721
Merge branch 'master' into fix-file-extension-matching
2018-04-02 13:27:14 +09:00
Huo Yaoyuan
b842f682eb
Use Linq.Append and Prepend.
2018-04-02 12:06:34 +08:00
smoogipoo
551ba6ac4b
Fix ScalableContainer irrepairably altering content size
2018-04-02 13:06:06 +09:00
Joseph Madamba
ee14ca7cc5
Merge branch 'master' into score-multiplier-edits
2018-03-31 10:43:58 -07:00
Ali Rizvi
7fed8d64de
Implement Judgement Colours
2018-03-31 04:59:08 +09:00
Dean Herbert
cf3cafd9a9
Merge branch 'master' into beatmap-set-status
2018-03-30 20:55:36 +09:00
Dean Herbert
c39f056b3b
Fix skin path being ignored in extension agnostic lookups
...
Closes #2295 .
2018-03-30 18:06:18 +09:00
Endrik Tombak
7e30375443
Use selectNextRandom instead
2018-03-30 10:46:46 +03:00
Dan Balasescu
824201336a
Merge branch 'master' into hr-on-mania-is-unranked
2018-03-30 16:35:00 +09: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
Joseph Madamba
0887dafa2c
Revert changes on hard rock mod
2018-03-29 20:36:52 -07:00
Dean Herbert
e1123c5a95
Merge branch 'master' into selectionlayer-rewrite
2018-03-30 12:29:58 +09:00
Endrik Tombak
3f65e3a7e3
Make selection at random when last was null
2018-03-30 00:15:32 +03:00
DrabWeb
e3218250d5
Fix tab strip in BreadcrumbControl, allow strip height to be overriden.
2018-03-29 15:41:27 -03:00
DrabWeb
3d05798d80
Change SearchableListOverlay to use OsuTabControl strip.
2018-03-29 15:34:53 -03:00
DrabWeb
f43b009b96
Add optional strip to OsuTabControl.
2018-03-29 15:29:45 -03:00
smoogipoo
6b2ca36657
Add license header
2018-03-29 22:52:42 +09:00
smoogipoo
6767dd3d4a
Fix hitobject masks dying with no recovery
2018-03-29 22:42: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
57e4281601
Make HitObjectMasks VisibilityContainers
2018-03-29 18:44:15 +09:00
smoogipoo
6314694557
Make HitObjectMaskLayer always create masks for all objects
2018-03-29 17:13:45 +09:00
smoogipoo
187a025d36
Make hitobjects sorted by their start times
2018-03-29 16:07:31 +09:00
Joseph Madamba
af9e3a849f
Merge branch 'master' into score-multiplier-edits
2018-03-28 20:42:35 -07:00
Joseph Madamba
5457f17e79
Clean up code from reviews
2018-03-28 19:53:15 -07:00
miterosan
c937789684
Rename GetMessagesRequest to GetChannelMessagesRequest
2018-03-28 21:33:50 +02:00
miterosan
56de6c1067
Rename Channel to ChannelChat
2018-03-28 21:11:06 +02:00
Dean Herbert
9aae568bbe
Tidy up csproj further
2018-03-28 15:19:56 +09:00
Dean Herbert
94b1d3e4af
Make VisualTests/nUnit work again
2018-03-28 12:33:01 +09:00
DrabWeb
84bb96740f
Fix merge error.
2018-03-27 18:27:30 -03:00
DrabWeb
19bc6b9168
Merge https://github.com/ppy/osu into beatmap-set-status
2018-03-27 18:13:58 -03:00
DrabWeb
506e27a30e
Cleanup.
2018-03-27 17:59:58 -03:00
TocoToucan
458594d24d
Qualifier 'this.' is redundant
2018-03-27 18:03:57 +03:00
Joseph Madamba
ac9527147f
Fix transitioning of unranked label
2018-03-27 03:05:05 -07:00
Dean Herbert
1a8aa87469
Make everything better
2018-03-27 18:56:54 +09:00
Dean Herbert
988141408f
Update copyright year
2018-03-27 15:26:15 +09:00
Dean Herbert
b290d2d039
Move NUnit includes to individual projects
2018-03-27 15:07:09 +09:00
DrabWeb
eb374c5774
Add beatmap set online status and display it in direct panels and the beatmap set overlay.
2018-03-26 21:04:45 -03:00
smoogipoo
dd5bbbbd9f
Define testable projects
2018-03-26 19:11:23 +09:00
smoogipoo
5159127bce
Fix SQLite failing to initialize on test projects
2018-03-26 18:07:09 +09:00
smoogipoo
35ef9d99c6
Only compile with net461 in visual studio
2018-03-26 15:44:55 +09:00
smoogipoo
96901b6498
Add msbuild/dotnet build + launch targets
2018-03-26 10:52:54 +09:00
Joseph Madamba
90d763fda5
Apply review changes and suggestions
2018-03-25 10:00:30 -07:00
FreezyLemon
46d859a660
exit player earlier if a dummy map is loaded
2018-03-25 13:25:48 +02:00
Joseph Madamba
78a7564acd
Score multiplier edits
2018-03-24 16:00:18 -07:00
smoogipoo
4dc317d4df
Fix msbuild warnings
2018-03-25 03:38:52 +09:00
smoogipoo
097ab66182
Fix resharper error
2018-03-25 01:54:25 +09:00
smoogipoo
d28de89e50
Add net461 target to test projects for nunit discovery
...
Nunit "by design" will not run tests for NETStandard projects (see: https://github.com/nunit/dotnet-test-nunit/issues/122#issuecomment-329531632 ).
2018-03-25 01:35:50 +09:00
TocoToucan
e91d24f31a
Use ScreenshotCaptureMenuCursor in ScreenshotManager
2018-03-24 12:53:01 +03: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
76886c8e3f
Merge branch 'master' into performance-logging-toggle
2018-03-24 13:32:49 +09:00
Dean Herbert
1996698817
Fix @1x skin elements not being used
2018-03-24 11:40:45 +09:00
Dean Herbert
923f96d940
Merge branch 'master' into performance-logging-toggle
2018-03-24 11:36:20 +09:00
Dean Herbert
3844e95656
Fix one more instance of the same thing happening
2018-03-24 05:55:56 +09:00
Dean Herbert
256baf6d60
Move binding to LoadComplete
...
Previously there was a chance that it would still never get disposed, as the event was bound in async load, before it was in a state it can be recursively disposed via the PlayerLoader call.
2018-03-24 05:40:51 +09:00
Dean Herbert
b593c47809
Add setting to toggle performance logging
2018-03-24 05:07:48 +09:00
TocoToucan
dd5cc59250
Introduce 'Capture menu cursor' setting
2018-03-23 22:53:06 +03:00
Dean Herbert
e47aa0edc0
Merge branch 'master' into fix-background-fade
2018-03-24 03:40:13 +09:00
Dean Herbert
0976e83b33
Merge branch 'master' into fix-api-abort
2018-03-24 03:13:28 +09:00
Dan Balasescu
1576b31a48
Merge branch 'master' into add-perfect-mod-icon
2018-03-23 21:32:15 +09:00
Dan Balasescu
676feb3658
Merge branch 'master' into fix-mod-button-sounds
2018-03-23 21:03:42 +09:00
smoogipoo
f0c0a51108
Convert APIAccess to use cancellation tokens
2018-03-23 20:57:04 +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
b4eaaa4fd1
Merge branch 'master' into fix-circularprogress-glow
2018-03-23 19:01:28 +09:00
smoogipoo
52fa837447
Fix volume glow being cut off
...
Fixes #2285 .
2018-03-23 18:17:23 +09:00
Dean Herbert
6c4e719e0f
Fix API never stopping its thread
2018-03-23 15:46:55 +09:00
Dean Herbert
eb751fa607
Fix event unbind not being unbound correctly
2018-03-23 15:05:28 +09:00
Dean Herbert
b56eee1927
Fix background loaded player never being disposed if early exit occurs
2018-03-23 15:04:40 +09:00
Joseph Madamba
f77dad2809
Add perfect mod icon
2018-03-22 22:49:14 -07: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
fd124d2ee6
Merge branch 'master' into fix-mod-button-sounds
2018-03-22 21:55:15 +09:00
Dean Herbert
1d3c9098b8
Load component asynchronously
2018-03-22 21:42:57 +09:00
Dean Herbert
e7cb579ec4
Merge branch 'master' into take_screenshot
2018-03-22 21:34:53 +09:00
Dean Herbert
14a653aa28
Restore old auto-popout notification overlay behaviour
2018-03-22 20:55:00 +09:00
Dean Herbert
74191e1b73
Merge remote-tracking branch 'upstream/master' into take_screenshot
2018-03-22 20:49:17 +09:00
Dean Herbert
e41993ac44
Don't bother with an exception that will never happen
...
Wasn't being caught anyways
2018-03-22 20:45:26 +09:00
Dean Herbert
94847e4a23
Allow clicking notification to open screenshot folder
2018-03-22 20:44:00 +09:00
Dean Herbert
9e080028ff
Add shutter sound
2018-03-22 20:42:55 +09:00
Dean Herbert
4883e2fd5b
Merge branch 'master' into beat-snap-divisor
2018-03-22 20:24:10 +09: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
Dan Balasescu
4e2c6ccedc
Merge branch 'master' into skin-scaling
2018-03-22 20:11:30 +09:00
smoogipoo
090c78bf10
Merge remote-tracking branch 'origin/master' into fix-player-loader
2018-03-22 20:00:21 +09:00
Dean Herbert
e5f83530b8
Only allow settings or notifications to be visible at once
...
Resolves #2273 .
2018-03-22 19:49:31 +09:00
Dean Herbert
ee12d75b30
Merge branch 'master' into skin-scaling
2018-03-22 19:30:17 +09:00
Dean Herbert
2d08cee3b4
Merge branch 'master' into skin--completion
2018-03-22 19:04:22 +09:00
Dean Herbert
af65f2dd48
Move AccentColour changes local to rulesets which rely on it
2018-03-22 18:53:16 +09:00
smoogipoo
fc85bf919e
Merge remote-tracking branch 'origin/master' into focused-textbox-fix
2018-03-22 18:52:06 +09:00
smoogipoo
9f220b3b9b
Add explanatory comment
2018-03-22 18:51:03 +09:00
Dean Herbert
366b7fca65
Remove GetColour method
2018-03-22 18:50:19 +09:00
Dean Herbert
425d4aa766
Add ability to lookup arbitrary SkinConfiguration values
2018-03-22 18:10:28 +09:00
Dean Herbert
c4fe6a04c5
Use string lookups for combo colours
2018-03-22 17:32:05 +09:00
Dan Balasescu
ab9505652b
Merge branch 'master' into skin--completion
2018-03-22 16:44:00 +09:00
Dean Herbert
b8022070e8
Merge remote-tracking branch 'upstream/master' into beatmap-as-a-skin
2018-03-22 16:24:56 +09:00
Dean Herbert
dade52d15d
Fix vertical padding
2018-03-22 16:15:14 +09:00
Dan Balasescu
f872402fc4
Merge branch 'master' into accent-colour-properties
2018-03-22 16:10:52 +09:00
Dean Herbert
a4804f47a9
Merge branch 'master' into beat-snap-divisor
2018-03-22 16:06:26 +09:00
Dean Herbert
6e379f0646
Fix FocusedTextBox in line with framework changes
2018-03-22 15:54:16 +09:00
