Damnae
9eaa1cb5cd
Fix sprites not being visible when all their commands are inside loops.
2017-09-11 12:06:00 +02:00
Shane Woolcock
262aea8b6b
Fix osu! logo triangles going super fast when the track is paused
2017-09-11 19:16:44 +09:30
Dean Herbert
ba4b9e3411
Merge branch 'master' into mania-hit-explosions
2017-09-11 18:32:36 +09:00
Dean Herbert
18ad0956b4
Merge branch 'master' into maybefix
2017-09-11 18:23:00 +09:00
Dean Herbert
7b92bbfa86
Merge branch 'master' into mania-hit-explosions
2017-09-11 17:34:14 +09:00
Dean Herbert
838fcca9c4
Merge branch 'master' into mania-hit-explosions
2017-09-11 15:14:35 +09:00
smoogipooo
f3c6f6f959
Merge branch 'blending-equations' into mania-holdnote-niceness
2017-09-11 15:09:01 +09:00
smoogipooo
58c875bdca
Merge remote-tracking branch 'origin/master' into blending-equations
...
# Conflicts:
# osu-framework
2017-09-11 15:02:12 +09:00
DrabWeb
4be8899fb2
Move Length to BeatmapOnlineInfo.
2017-09-11 02:55:32 -03:00
DrabWeb
43fa314fe0
Details and more data displaying.
2017-09-11 02:48:48 -03:00
smoogipooo
4683319156
Merge remote-tracking branch 'origin/master' into mania-hit-explosions
2017-09-11 14:48:40 +09:00
Dean Herbert
5ce76d8023
Merge remote-tracking branch 'upstream/master' into judgement-revamp
2017-09-11 14:36:51 +09:00
Dean Herbert
512232c1c8
Fix regression causing autoplay to fail
2017-09-11 14:25:01 +09:00
smoogipooo
0cadee998c
Set default AccentColour for hit objects
2017-09-11 13:44:05 +09:00
DrabWeb
e61ab72c0d
Merge https://github.com/ppy/osu into online-beatmap-set-overlay
2017-09-11 01:24:52 -03:00
DrabWeb
54172ac6ad
Move header button and details components to own files.
2017-09-11 01:21:53 -03:00
Dean Herbert
7170fbd087
Target .NET 4.6.1
2017-09-11 12:39:00 +09:00
Dean Herbert
adba5b5ba6
Merge branch 'master' into beatmap-details-rewrite
2017-09-11 12:30:32 +09:00
Dan Balasescu
24f7b6823e
Merge branch 'master' into nullref-fix
2017-09-11 12:13:43 +09:00
Dean Herbert
eedfbdc0e8
Add nullref check in KeyCounterCollection's Add method
2017-09-11 11:41:09 +09:00
Dean Herbert
8d919e42c9
Fix nullref when loading MusicController VisualTest after Player VisualTest
2017-09-11 11:18:53 +09:00
Dean Herbert
cb24b5c436
Merge branch 'master' into beatmap-details-rewrite
2017-09-11 10:18:34 +09:00
Dean Herbert
f33bd700c5
Fix individual volume controls not being adjustable via wheel
...
They were blocking each others' input unnecessarily.
2017-09-11 08:27:29 +09:00
smoogipooo
2086ed209d
Fix hold note tick input.
2017-09-11 04:51:44 +09:00
Damnae
59d9dc5ee7
Ignore storyboard sprites with invalid positions.
2017-09-10 20:08:56 +02:00
smoogipooo
cde22865b9
Merge remote-tracking branch 'origin/master' into blending-equations
...
# Conflicts:
# osu-framework
2017-09-11 02:42:23 +09:00
Dean Herbert
ea35b69f2f
Merge branch 'master' into fix-mono-crash
2017-09-10 11:49:20 +09:00
Dean Herbert
6d33e39c5e
Merge branch 'master' into beatmap-details-rewrite
2017-09-10 11:26:00 +09:00
DrabWeb
aa9dfcc082
BeatmapPicker logic.
2017-09-09 19:05:22 -03:00
DrabWeb
cbd9c07aed
BeatmapPicker design.
2017-09-09 18:19:43 -03:00
Damnae
bc01d9a1b0
Animate Additive / FlipH and FlipV.
2017-09-09 15:41:56 +02:00
Damnae
8d55cb7f92
Improve command sorting.
2017-09-09 11:00:58 +02:00
naoey
0c2bad1de4
Get rid of some properties and todos.
2017-09-09 12:44:27 +05:30
naoey
d12a5e927a
Rename property.
2017-09-09 11:03:25 +05:30
naoey
e67606e203
Return existing download if it exists.
2017-09-09 10:25:28 +05:30
naoey
5f5dd54f9d
Use a List instead of a Dictionary.
2017-09-09 09:56:01 +05:30
DrabWeb
ecd6994d74
Added favourite/download buttons and author info.
2017-09-08 19:17:39 -03:00
DrabWeb
1d3139d3c3
Basic layout.
2017-09-08 18:32:07 -03:00
naoey
20becbe576
Use the specifically created progress action, add license header.
2017-09-09 01:53:42 +05:30
Damnae
12de737084
Merge branch 'master' into storyboards
...
# Conflicts:
# osu.Game/Beatmaps/Beatmap.cs
2017-09-08 21:46:34 +02:00
Damnae
57e53ff03a
Fix diff-specific storyboard content being lost after loading.
2017-09-08 21:36:30 +02:00
naoey
5a3814b02e
XMLdoc fixes and a cautionary check.
2017-09-09 01:04:55 +05:30
naoey
0e4973020a
Resharper and test case fixes.
2017-09-09 00:58:54 +05:30
naoey
00306b6e38
Maintain download progress between switching result views.
...
- Check for existing download requests on creating DirectPanel
- Actually remove downloaded beatmap from results
2017-09-09 00:57:48 +05:30
naoey
31a507372a
Don't show beatmaps that are already added.
2017-09-09 00:57:48 +05:30
naoey
20f93c83d6
Make downloads happen in BeatmapManager.
2017-09-09 00:57:40 +05:30
Damnae
4ab243d885
CI fixes.
2017-09-08 21:23:24 +02:00
Damnae
e8ab853f6f
Make storyboard loops work.
2017-09-08 21:07:40 +02:00
Damnae
e4a2ad5eb5
Fix storyboard sprite flipping.
2017-09-08 20:39:17 +02:00
Dean Herbert
386147cc77
Merge branch 'master' into channelselection-minimum-size
2017-09-09 02:51:47 +09:00
DrabWeb
d95940ed5e
CI fixes.
2017-09-08 14:25:41 -03:00
DrabWeb
ce68b6661e
Update visual test.
2017-09-08 14:15:28 -03:00
MrTheMake
15dd8d9071
Mind the minimum size of the channel selection overlay
2017-09-08 18:21:42 +02:00
Damnae
3f2598543c
Fix CommandLoop start and end time.
2017-09-08 18:03:04 +02:00
MrTheMake
5c125737cb
Fix wrong initial topic color of not joined channels in the channel selection
2017-09-08 17:47:23 +02:00
Dean Herbert
9b790157d8
Merge branch 'master' into non-null-beatmap
2017-09-08 23:33:03 +09:00
Dan Balasescu
3166394a59
Merge branch 'master' into home-hides-overlays
2017-09-08 23:23:20 +09:00
Damnae
e63fb5720c
Make CI happy.
2017-09-08 13:04:53 +02:00
Damnae
6cde687d87
Fix V commands parsing.
2017-09-08 12:36:13 +02:00
MrTheMake
0b1403683b
Moved OnlineScore inside GetScoresRequest.cs
2017-09-08 12:21:35 +02:00
MrTheMake
526ee107b8
Use a method to apply a beatmap, its ruleset and the mods.
2017-09-08 12:17:16 +02:00
Damnae
e02b481c69
An attempt at implementing storyboard loops.
2017-09-08 12:11:57 +02:00
Damnae
13322b4293
Improve compatibility with older storyboards.
2017-09-08 12:09:45 +02:00
Dean Herbert
a528173943
Ensure that WorkingBeatmap's Beatmap is never null
...
Also ensures some extra fields inside Beatmap have non-null defaults.
2017-09-08 19:05:14 +09:00
Dean Herbert
80c35801a6
Hide all overlays when home button is pressed
2017-09-08 16:18:57 +09:00
Damnae
e547416193
Storyboards implementation.
2017-09-08 09:08:52 +02:00
MrTheMake
01553fc9ef
Moved all online related score parsing to its class
2017-09-08 02:46:54 +02:00
DrabWeb
55e8bdfb05
CI fixes.
2017-09-07 15:38:23 -03:00
DrabWeb
109531b66c
Cleanup, remove unneeded files.
2017-09-07 15:21:18 -03:00
DrabWeb
2153865de5
Adjust fail on missing logic to match original.
2017-09-07 15:09:50 -03:00
DrabWeb
fd2700a5b4
Fix .00 being displayed for star difficulty when the value is 0.
2017-09-07 15:01:31 -03:00
DrabWeb
5e685ff5b1
Rewrite BeatmapDetails to be more modular for future code sharing.
2017-09-07 14:53:53 -03:00
MrTheMake
e71f907f89
CI fix
2017-09-07 18:36:16 +02:00
MrTheMake
a7f874e5b6
Merge branch 'master' into leaderboard-scores
2017-09-07 18:25:33 +02:00
MrTheMake
709aa1ed3d
Moved all online score related parsing to its own class
2017-09-07 18:20:14 +02:00
Dean Herbert
b9bec6a983
CI fixes
2017-09-07 23:06:35 +09:00
Dean Herbert
b135dc1f18
Merge remote-tracking branch 'upstream/master' into menu-bar
2017-09-07 22:58:41 +09:00
smoogipooo
19db7a8f72
Update in line with framework changes.
2017-09-07 22:46:21 +09:00
Dean Herbert
41398f57d6
Changes in line with framework
2017-09-07 20:36:32 +09:00
smoogipooo
871ca7520f
Merge remote-tracking branch 'origin/master' into menu-bar
2017-09-07 15:32:01 +09:00
Dean Herbert
5822a6cc96
Merge branch 'master' into ranks-section
2017-09-07 15:11:07 +09:00
Dean Herbert
af0eaab78c
maybe fix
2017-09-07 01:46:07 +09:00
naoey
69ff4bfa46
Fix startup crash on mono.
2017-09-06 20:04:21 +05:30
Dean Herbert
13c3ef65a8
Merge branch 'master' into fix-mania-input
2017-09-06 23:18:23 +09:00
Dean Herbert
e5308b6247
Method rename
2017-09-06 23:12:32 +09:00
Dean Herbert
da294c9605
Don't use base call when we don't have to
2017-09-06 23:10:08 +09:00
Dean Herbert
4f49a0c183
Simplify action
2017-09-06 22:58:21 +09:00
Dean Herbert
a7fa66b9f9
Fix CI issue
2017-09-06 22:41:03 +09:00
Dean Herbert
940c45b6d1
Fix visual styling and code styling
2017-09-06 21:43:20 +09:00
Dean Herbert
c6fa899b15
Merge remote-tracking branch 'upstream/master' into quit-chat-channels
2017-09-06 21:43:03 +09:00
smoogipooo
06fac913bf
Re-implement EditorMenuBar.
2017-09-06 21:14:29 +09:00
Dean Herbert
e834e0e958
Fix incorrect initialisation order causing mania key bindings to not work
2017-09-06 21:07:57 +09:00
Dean Herbert
4f4b0a1f35
Allow posting to chat in all channels
2017-09-06 20:26:01 +09:00
smoogipooo
df79d8918d
Merge branch 'master' into menu-bar
2017-09-06 18:26:18 +09:00
smoogipooo
0cc443e618
Remove all generic judgements.
2017-09-06 18:05:51 +09:00
smoogipooo
e85d511645
No more partial judgements.
2017-09-06 17:48:01 +09:00
smoogipooo
63b61ce669
Make TimeOffset internal set.
2017-09-06 17:20:51 +09:00
smoogipooo
f158ce814c
Fix state never getting set.
2017-09-06 17:20:41 +09:00
smoogipooo
ac8ec31b61
Make judgements able to be "added" plus make everything compile and run.
2017-09-06 17:02:13 +09:00
Dean Herbert
84c22df3f5
Combine Judgement.HitResults into one.
2017-09-06 17:01:48 +09:00
Dean Herbert
968c61902a
Merge branch 'master' into new-menus
2017-09-05 23:42:33 +09:00
Tom
05f5dfba81
Change difficulty colors and add ExpertPlus
...
ExpertPlus is for beatmaps above 6.75*
2017-09-05 13:57:30 +02:00
smoogipooo
b871323ed8
Fix BeatmapGroup initialization not correctly setting panels to Hidden.
2017-09-05 19:26:28 +09:00
smoogipooo
5508fa0fd9
Merge remote-tracking branch 'origin/master' into new-menus
2017-09-05 19:14:42 +09: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
smoogipooo
2a64bcda85
Fix resizing bug(?).
2017-09-04 09:32:44 +09:00
smoogipooo
57678a13d9
Update in-line with framework changes.
2017-09-04 09:32:35 +09:00
Dean Herbert
543a71efcc
Fix ObjectDisposal exceptions due to lingering event binds
2017-09-04 08:21:07 +09:00
Dean Herbert
dd26c80837
Delete -> Hide
2017-09-04 07:59:32 +09:00
Dan Balasescu
19ad5d5328
Merge branch 'master' into song-select-context-menus
2017-09-04 07:56:31 +09:00
Dean Herbert
d7d0e96e6b
Merge branch 'master' into ranks-section
2017-09-01 18:46:53 +09:00
Dean Herbert
3ede685ee9
Fix crash on random selection from a previously null selection
2017-09-01 18:44:51 +09:00
Dean Herbert
8e0d18d36f
Add a button to restore all hidden difficulties
2017-09-01 18:26:01 +09:00
Dean Herbert
3d61cde266
Correctly delay loading of PlaySongSelect-specific components
2017-09-01 18:22:38 +09:00
Dean Herbert
f9d02afb00
Don't allow selection of a hidden beatmap
2017-09-01 18:13:21 +09:00
Dean Herbert
1f646e6d54
Add hiding support for beatmap difficulties
2017-09-01 17:57:12 +09:00
Dean Herbert
5a58489adf
Hook up play and edit (kinda)
2017-08-30 21:12:58 +09:00
Dean Herbert
3b4b4b669b
Add framework for deleting difficulties
2017-08-30 21:12:46 +09:00
Dean Herbert
2fb4126ffc
Use BeatmapSetInfo instead of WorkingBeatmap
2017-08-30 20:53:33 +09:00
Dean Herbert
8619f28ced
Add context menu to beatmap difficulty (wip)
2017-08-30 20:41:53 +09:00
Dean Herbert
07da29ea1c
Add context menu to beatmap set header
2017-08-30 20:41:41 +09:00
Kelvin
0e363fce1e
Try to fix stuttering behavior
2017-08-29 22:26:06 -07:00
Dan Balasescu
cabf671811
Merge branch 'master' into menu-bar
2017-08-30 12:31:12 +09:00
Dean Herbert
dba3c9a0e2
Merge branch 'master' into menu-mvvm
2017-08-29 18:37:21 +09:00
Dan Balasescu
0431a9afdd
Merge branch 'master' into menu-mvvm
2017-08-29 18:36:41 +09:00
Dean Herbert
24a2dc3d1e
Don't use child
2017-08-29 18:31:51 +09:00
Dan Balasescu
adfc304a22
Merge branch 'master' into caps-warning
2017-08-29 18:19:50 +09:00
smoogipooo
2535313f4f
Use using.
2017-08-29 18:18:36 +09: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
smoogipooo
5b8349f90e
Revert DummyWorkingBeatmap changes.
2017-08-29 18:05:27 +09:00
Huo Yaoyuan
fb3ba4fe0c
Add comment for DeletePending.
2017-08-29 16:18:50 +08: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
Dean Herbert
e53f2cb359
Merge branch 'master' into menu-mvvm
2017-08-29 15:57:19 +09:00
Kelvin
458c3a355f
Rearrange dragging using cheeseburger icon only
2017-08-28 23:28:58 -07:00
Dean Herbert
85f876a934
Remove unused using statement
2017-08-29 15:23:32 +09: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
Huo Yaoyuan
4aa5ce8b41
Always load background and info wedge when no beatmap available.
2017-08-28 17:53:57 +08:00
Huo Yaoyuan
1617189475
Set DummyWorkingBeatmap's DeletePending to true.
2017-08-28 17:53:03 +08:00
smoogipooo
b17d9ac06e
Move EditorMenuBar into the Edit namespace, and fix a minor styling issue.
2017-08-28 17:55:50 +09: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
83fe8514a4
Remove unnecessary exception, replace with default value.
2017-08-28 15:44:05 +09:00
smoogipooo
7bf6d4aa65
Rename DrawableOsuContextMenuItem -> DrawableOsuMenuItem, and move to OsuMenu.
2017-08-28 15:33:24 +09:00
smoogipooo
fc6c682d88
Update in-line with framework changes.
2017-08-28 14:42:52 +09:00
smoogipooo
66db3389f6
Update in line with framework changes.
2017-08-28 12:49:33 +09:00
smoogipooo
b5c1c05af5
Remove poop.
2017-08-28 11:03:51 +09:00
smoogipooo
4385edeb45
Update usages of Menu to reflect ValueChanged events.
2017-08-28 11:01:53 +09:00
Jorolf
9374bf925e
only show warning when focused
2017-08-25 16:39:49 +02:00
Jorolf
26323caf6f
Merge branch 'master' of git://github.com/ppy/osu into caps-warning
2017-08-25 16:33:29 +02:00
Dean Herbert
ee85515d95
Changes in line with framework changes
2017-08-25 19:18:07 +09:00
smoogipooo
3ffc467704
Fix crappy resizing.
2017-08-25 16:27:01 +09:00
smoogipooo
9f02000174
Update FilterControl using new AccentColour definition
2017-08-25 15:58:42 +09:00
smoogipooo
ce644138b9
Update OsuTabControl in line with framework
2017-08-25 15:58:30 +09:00
smoogipooo
a3a5a89636
Update OsuDropdown in line with framework
2017-08-25 15:58:21 +09:00
smoogipooo
e83a554ffc
Update CollectionsDropdown in line with framework
2017-08-25 15:58:09 +09:00
smoogipooo
923ffae42c
Update SlimEnumDropdown in line with framework
2017-08-25 15:57:55 +09:00
smoogipooo
b42c9d21fe
Update LoginSettings in line with framework.
2017-08-25 15:57:43 +09:00
smoogipooo
4fb9570618
Create IHasOsuContextMenu and update OsuContextMenuContainer in line with framework.
2017-08-25 15:10:29 +09:00
smoogipooo
7467d24d35
Update OsuContextMenu in line with framework.
2017-08-25 15:10:12 +09:00
smoogipooo
06c392d6f2
Update OsuMenu in line with framework.
2017-08-25 15:09:07 +09:00
Dean Herbert
782ab81a88
Merge branch 'master' into update-edge-effect-fades
2017-08-25 15:01:01 +09:00
Dean Herbert
70154d1036
Update usage of FadeEdgeEffect
...
Improves the visual appearance of DirectPanels' shadows too.
2017-08-25 14:58:19 +09:00
Dean Herbert
c0cf26ed21
Merge branch 'master' into concurrent-overlay-limits
2017-08-25 14:50:45 +09:00
Dan Balasescu
0d7592d9a6
Merge branch 'master' into beatmap-background-disposal-fix
2017-08-25 13:35:38 +09:00
Dean Herbert
72a16e31dd
Remove unnecessary old code
2017-08-25 13:07:10 +09:00
Dan Balasescu
ebf3300cb6
Merge branch 'master' into beatmap-background-disposal-fix
2017-08-25 13:06:33 +09:00
Dan Balasescu
1385a6a969
Merge branch 'master' into correct-direct-toolbar-icon
2017-08-25 13:05:47 +09:00
Dean Herbert
67b3cbce2f
Fix beatmap background being disposed too early
...
Causes weird transitions on the music controller
2017-08-25 13:04:32 +09:00
Dean Herbert
86bde4b6b2
Use the correct icon for osu!direct in the toolbar
2017-08-25 13:03:34 +09:00
Dean Herbert
7055cb581d
Load direct panels more asynchronously to avoid stutter
2017-08-25 11:54:35 +09:00
Dean Herbert
ca0d1b79b2
Disallow multiple download requests for the same panel
2017-08-25 11:54:18 +09:00
Dean Herbert
7f617e2c36
Remove downloaded beatmap panels from osu!direct
2017-08-25 11:53:41 +09:00
Dean Herbert
2dd3e51373
Ensure other full-screen overlays are closed when direct is open (and vice-versa)
2017-08-25 10:51:28 +09:00
Jorolf
f8cc4238ff
cleanup code
2017-08-24 22:13:20 +02:00
Dean Herbert
307c4dd392
Merge branch 'master' into direct-downloads
2017-08-24 21:30:38 +09:00
Dean Herbert
febf0348be
Permit nulls to allow test cases to run successfully
2017-08-24 21:26:50 +09:00
Dean Herbert
2b667cf789
Fix typos
2017-08-24 20:32:55 +09:00
Dean Herbert
c9f90efb8a
Add more checks and remove direct cast
2017-08-24 20:31:57 +09:00
Dean Herbert
0082640548
Add missing licence header
2017-08-24 20:25:18 +09:00
Dean Herbert
9adff5f697
Add osu!direct toggle to toolbar
2017-08-24 20:18:47 +09:00
Dean Herbert
32a23c7fe4
Add initial osu!direct beatmap download and import process
2017-08-24 20:16:03 +09:00
Dean Herbert
9c82593c9e
Add cancel event to ProgressNotification
2017-08-24 20:15:45 +09:00
Dean Herbert
3c10b2d3d9
Populate set IDs in GetBeatmapSetsResponse
2017-08-24 20:14:35 +09:00
Dean Herbert
314108146a
Add a download API request
2017-08-24 20:14:17 +09:00
Dean Herbert
cacf256aad
Add placeholder download method with progress bar
2017-08-24 18:51:50 +09:00
Dean Herbert
36629f5207
Make ProgressBar usable in more places than just MusicController
2017-08-24 18:51:34 +09:00
Dean Herbert
a2549157ca
Add hover effects
2017-08-24 18:18:03 +09:00
Dean Herbert
4e1cf329c8
Move background logic to base class; reduce overdraw after set fades in
2017-08-24 17:39:39 +09:00
Dean Herbert
76a95495d3
Move shared code to base class
2017-08-24 17:30:10 +09:00
Dean Herbert
f0635af40d
Add documentation and regions to RulesetInputManager
2017-08-24 15:51:31 +09:00
Dean Herbert
a7a7e0323f
Update autoplay and replay handling to result in actions, not keys
2017-08-24 15:36:42 +09:00
Dean Herbert
189988236b
Move PlayerInputManager logic inside RulesetInputManager
2017-08-24 15:23:17 +09:00
naoey
6291bd5ced
Handle null current channel in setter, update framework.
2017-08-24 10:40:42 +05:30
naoey
3f403ba524
Merge remote-tracking branch 'upstream/master' into quit-chat-channels
2017-08-24 10:06:29 +05:30
naoey
2cace0e1ab
Don't use virtual methods in ctor, always create closeButton.
2017-08-24 09:48:53 +05:30
Dean Herbert
7c3ef81d9c
Merge branch 'master' into mania_reversing
2017-08-23 22:02:25 +09:00
smoogipooo
115e5c95af
Make ScrollingPlayfield.Reversed protected; make ManiaPlayfield 'invertible'.
2017-08-23 20:50:03 +09:00
Dean Herbert
c99ed6fd44
Add reset button
...
Also fixes a regression causing multiple rows to be displayed for a single action
2017-08-23 19:26:49 +09:00
Dean Herbert
e9dde822a1
Expose triangles in OsuButton for further customisation
2017-08-23 19:25:40 +09:00
Dan Balasescu
a18507b3b4
Merge branch 'master' into fix-incorrect-notification-count
2017-08-23 17:22:39 +09:00
Dean Herbert
1f04995a73
Merge branch 'master' into hardrock-flipping
2017-08-23 17:00:41 +09:00
smoogipooo
8ddc13e394
Fix replays not loading.
2017-08-23 16:48:13 +09:00
Dean Herbert
efdd5eb152
Fix global key bindings being fetched with a non-null variant
2017-08-23 16:10:31 +09:00
smoogipooo
7639e096d8
No longer flip legacy replay mouse positions.
2017-08-23 15:30:17 +09:00
smoogipooo
68e7cf854f
Add variant names.
2017-08-23 14:19:14 +09:00
smoogipooo
84dd1283de
Fix nullref.
2017-08-23 13:39:51 +09:00
smoogipooo
c1860f2ce2
Make KeyBindingOverlay support variants as settings sub sections.
2017-08-23 12:49:30 +09:00
smoogipooo
38a4c84163
Load SettingsSubsection in load()
...
Fixes header not being displayed with variant bindings. This follows what SettingsSection does.
2017-08-23 12:48:53 +09:00
smoogipooo
be96fb32b3
Make RulesetContainer load KeyBindingInputManager in load()
2017-08-23 12:47:47 +09:00
Dean Herbert
b2db550cb4
Fix notification count including fading (already closed) notifications
2017-08-23 12:47:20 +09:00
smoogipooo
a6266850d6
Make KeyBindingRow take a non-action enum.
2017-08-23 12:46:28 +09:00
smoogipooo
fd3239ad15
Fix KeyBindingStore not getting correct defaults for variants.
2017-08-23 12:36:53 +09:00
Dean Herbert
630d67405f
Merge branch 'master' into update-changelog-notification
2017-08-23 00:12:59 +09:00
Dean Herbert
ef2d9ffede
Fix redundant initialiser
2017-08-22 23:43:10 +09:00
Dean Herbert
6f8e85c2e1
Merge branch 'master' into fix_taiko_sizing
2017-08-22 23:19:41 +09:00
Dean Herbert
83bd430f89
Merge branch 'master' into fix-speed-adjustments
2017-08-22 23:07:42 +09:00
Dean Herbert
a257c6846e
Merge branch 'master' into zero-notifications-closes
2017-08-22 22:45:52 +09:00
Jorolf
d81956e974
use GameHost to check if caps lock is enabled
2017-08-22 15:43:45 +02:00
smoogipooo
f8576d44b1
Add some more xmldoc.
2017-08-22 21:08:27 +09:00
smoogipooo
d080a7e970
Determine size of ScrollingContainer a bit better to avoid taiko weirdness
2017-08-22 20:53:19 +09:00
smoogipooo
db27551709
Make hit objects put in ScrollingContainers strictly ordered by start time
...
This won't change anything as is since all hit objects are given a depth at the moment.
2017-08-22 20:51:20 +09:00
Jorolf
c29d3437ba
fix merge changes
2017-08-22 13:35:49 +02:00
Jorolf
2ccd6c6128
Merge branch 'master' of git://github.com/ppy/osu into caps-warning
...
# Conflicts:
# osu.Game/Graphics/UserInterface/OsuPasswordTextBox.cs
2017-08-22 13:29:42 +02:00
Dan Balasescu
7689c06471
Merge branch 'master' into cursor-rotation-delay
2017-08-22 20:28:28 +09:00
jorolf
3025fcdb25
Merge branch 'master' into ranks-section
2017-08-22 13:19:03 +02:00
Dean Herbert
9f52ecbb8a
Merge branch 'master' into mania-key-conversion
2017-08-22 20:08:39 +09:00
Dan Balasescu
f371ca73f1
Merge branch 'master' into cursor-rotation-delay
2017-08-22 19:54:10 +09:00
Dean Herbert
480d839d67
Allow the notification overlay to close when all notifications are dismissed
2017-08-22 19:51:42 +09:00
smoogipooo
4c66a20d4e
Merge remote-tracking branch 'origin/master' into fix-speed-adjustments
2017-08-22 19:50:48 +09:00
Dean Herbert
9f69aa9082
Show a notification after a successful update
...
Allows access to the github changelog
2017-08-22 19:41:39 +09:00
Dean Herbert
ab0e3ccc55
Make SimpleNotifications support word wrap
2017-08-22 19:33:18 +09:00
smoogipooo
322dfe0250
Fix ScrollingContainer possibly not getting the correct size to cover hit objects.
2017-08-22 19:17:26 +09:00
Dean Herbert
9e96ee989d
Merge branch 'master' into volume-control-fixes
2017-08-22 18:59:02 +09:00
Dean Herbert
2f915fce40
Merge branch 'master' into cursor-rotation-delay
2017-08-22 18:58:57 +09:00
smoogipooo
ad63cbf455
Fix default comparator being inverted.
2017-08-22 18:54:41 +09:00
smoogipooo
1964bc72e5
Should be FirstOrDefault for hit objects occuriung before the first control point.
2017-08-22 18:39:09 +09:00
smoogipooo
e5d985838f
Set ScrollingAxes and RelativeChildOffset a bit more safely.
2017-08-22 18:37:49 +09:00
smoogipooo
137964b792
Fix hit objects not getting added to the correct speed adjustment container.
2017-08-22 18:37:10 +09:00
smoogipooo
b46a51fd8b
Make the speed adjustment containers ordered decreasingly by their control point start time.
2017-08-22 18:36:32 +09:00
Dean Herbert
c5a20e3372
Remove permitNulls
2017-08-22 18:28:32 +09:00
Dean Herbert
97acff535d
Tidy up conditionals
2017-08-22 18:21:00 +09:00
Dean Herbert
acf5442ca3
Merge branch 'master' into nullref-fix
2017-08-22 18:19:15 +09:00
Dean Herbert
fc076eaff3
Merge branch 'master' into move-screen-restrictions
2017-08-22 17:52:59 +09:00
Dean Herbert
d8de6e289c
Don't start rotating the cursor until it has travelled a minimum disatnce
...
Some people, myself included, were annoyed by the rotation starting too soon (especially when dragging up and left one pixel).
2017-08-22 17:38:51 +09:00
smoogipooo
790e0561df
Merge remote-tracking branch 'peppy/move-screen-restrictions' into fix-speed-adjustments
2017-08-22 17:25:24 +09:00
Dean Herbert
8f32fd28c9
Fix backwards conditional
2017-08-22 17:21:19 +09:00
Dean Herbert
8df72e0fec
Merge branch 'master' into fix-speed-adjustments
2017-08-22 17:07:31 +09:00
Dean Herbert
803cbddfe2
Ensure score's user is set directly from API
...
Previously would fail in visualtests due to `OsuGame` case.
2017-08-22 16:59:54 +09:00
smoogipooo
0189f01402
Explicitly store defaultSpeedAdjustment, and make it un-removable
2017-08-22 16:15:50 +09:00
smoogipooo
5a3c0de7ad
Fix further incorrect comparison.
2017-08-22 16:10:58 +09:00
smoogipooo
a737f5fe0d
CI fixes.
2017-08-22 16:06:25 +09:00
smoogipooo
d20ea97e7f
Add NUnit test for ScrollingHitObjectContainer
...
Tests ordering of SpeedAdjustmentContainers and DrawableHitObjects added to the ScrollingHitObjectContainer.
2017-08-22 16:06:19 +09:00
smoogipooo
c3cfad4eb5
Add RemoveSpeedAdjustment
2017-08-22 16:06:14 +09:00
smoogipooo
4fc77be624
Fix incorrect sorting of hit objects into SpeedAdjustmentContainers
2017-08-22 16:06:09 +09:00
smoogipooo
6f662d721c
Fix possible CollectionModifiedException while adding new SpeedAdjustmentContainers
2017-08-22 16:06:04 +09:00
smoogipooo
b7b8d8b764
Let's not construct scrolling containers in load() for now
...
This isn't utilized at the moment, and we should be avoiding this here in the first place.
2017-08-22 16:05:59 +09:00
smoogipooo
5fcd94880d
Fix incorrect inequality with multiple speed adjustments at the same start time.
2017-08-22 16:05:53 +09:00
Dean Herbert
09dd0cabd6
Move beatmap/ruleset change restrictions to OsuGame
...
Allows test cases to more freely exist
2017-08-22 15:59:32 +09:00
Dean Herbert
18645fcf29
Update volume control logic to use key bindings
...
Fixes them not working at all, too.
2017-08-22 14:48:04 +09:00
Dean Herbert
ff8ad30127
Add support for binding mousewheel actions
2017-08-22 14:44:34 +09:00
smoogipooo
68c7226d12
Fix cherry pick issues.
2017-08-22 14:18:17 +09:00
smoogipooo
88151eff3f
Fix dofficulty calculators not working and make mania set the correct key count for non-mania specific maps.
2017-08-22 14:07:39 +09:00
smoogipooo
4eec59f669
Only set the number of availableColumns once, at ManiaRulesetContainer level.
...
# Conflicts:
# osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs
# osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
# osu.Game/Rulesets/UI/RulesetContainer.cs
2017-08-22 14:07:37 +09:00
smoogipooo
964982e2e6
Remove now unneeded ApplyBeatmap.
2017-08-22 14:05:28 +09:00
Dean Herbert
250fb33fbc
Merge branch 'master' into ranks-section
2017-08-22 12:46:28 +09:00
Dean Herbert
31bb1ebe0e
Add comment and index on column
2017-08-22 12:42:35 +09:00
Dean Herbert
881eecb528
Merge branch 'master' into master
2017-08-22 12:35:36 +09:00
Dean Herbert
7693fc1382
Merge branch 'master' into mask-settings-overlay
2017-08-22 00:22:39 +09:00
Dean Herbert
a9fe1d94f7
Remove unnecessary using
2017-08-21 23:41:51 +09:00
Dean Herbert
7d1c270126
Review fixes
2017-08-21 23:34:08 +09:00
Dean Herbert
1d0b89d592
Restore usage of AddRange
2017-08-21 18:51:14 +09:00
Dean Herbert
102caf4b91
Merge branch 'master' into chat-local-echo-v2
2017-08-21 18:27:32 +09:00
Dean Herbert
7903f49d27
Merge branch 'master' into action-key-counter
2017-08-21 17:47:19 +09:00
Dean Herbert
9ba2258f80
Add spaces for smoogipoo
2017-08-21 17:44:39 +09:00
Dean Herbert
877c69d5fe
Add local chat echo support
2017-08-21 17:43:26 +09:00
Dean Herbert
52dadad1e1
Merge branch 'master' into fix-taiko-barlines
2017-08-21 16:46:25 +09:00
Dean Herbert
ea450fecf5
Merge branch 'master' into action-key-counter
2017-08-21 16:25:44 +09:00
smoogipooo
6e0d2182cb
CI.
2017-08-21 16:24:16 +09:00
smoogipooo
5d13efa76d
Remove the concept of "queued hit objects", add a default speed adjustment.
2017-08-21 16:17:00 +09:00
Dean Herbert
ced919edd3
Merge branch 'master' into fix-speed-multipliers
2017-08-21 15:55:52 +09:00
Dean Herbert
be8bc5bdc8
Merge branch 'master' into action-key-counter
2017-08-21 15:54:54 +09:00
smoogipooo
7a5708ce92
Further support for null judgements.
2017-08-21 15:35:16 +09:00
Dean Herbert
e7c9aec1b1
Ensure the sqlite connection is correctly closed before the game ends
...
Hopefully fixes CI race conditions between consecutive tests.
2017-08-21 13:05:47 +09:00
Dean Herbert
a63923a497
Remove type check for now
2017-08-21 12:50:48 +09:00
Dean Herbert
16e96888ab
Update KeyCounterCollection to support action-based buttons
2017-08-21 12:39:22 +09:00
smoogipooo
6a7b410bc3
Make DifficultyControlPoint.SpeedMultiplier actually increase with an increasing speed. Fixes #1147
2017-08-21 11:58:54 +09:00
Jorolf
9b20da94e7
change Query to AllRulesets
2017-08-19 22:07:03 +02:00
Jorolf
bae1340b50
mask the settings overlay
2017-08-19 17:00:01 +02:00
smoogipooo
3ea7be1ccf
Fix selecting unranked beatmaps in song select crashing the game. Fixes #1134 .
2017-08-19 12:28:54 +09:00
MrTheMake
f831832c59
CI fix
2017-08-19 00:13:06 +02:00
MrTheMake
6d401b5f21
Merge branch 'master' into leaderboard-scores
2017-08-19 00:00:40 +02:00
Dean Herbert
86d97aa16b
Merge branch 'master' into taiko-timingchanges-2
2017-08-18 22:44:36 +09:00
Dean Herbert
c34033c94a
Merge branch 'master' into fix-track-not-resetting
2017-08-18 22:31:59 +09:00
Dean Herbert
bc7621607a
Merge upstream/master in.
2017-08-18 22:20:45 +09:00
Dean Herbert
d6249e7a63
Add support for binding mouse buttons to actions
2017-08-18 20:01:41 +09:00
Shane Woolcock
4901ac9e35
Add some comments explaining why the Track is being forcefully added to the TrackManager
2017-08-18 18:01:18 +09:30
Dean Herbert
ffc8f763e5
Merge branch 'master' into fix-track-not-resetting
2017-08-18 17:24:22 +09:00
naoey
7ad4c046db
Make current value behaviour between channels and tabs consistent.
...
- Trim whitespace
2017-08-18 13:35:48 +05:30
smoogipooo
90885a31ae
Round 2 of CI fixes.
2017-08-18 15:09:54 +09:00
smoogipooo
a47b6526a2
Fix CI issues.
2017-08-18 14:40:36 +09:00
Dan Balasescu
68303accef
Merge branch 'master' into make-rulesetinfo-iequatable
2017-08-18 14:28:42 +09:00
Dan Balasescu
0f635c77b3
Merge branch 'master' into fix-ruleset-changing
2017-08-18 13:42:29 +09:00
Dan Balasescu
cc6a5824f0
Merge branch 'master' into fix-ruleset-changing
2017-08-18 13:40:52 +09:00
Dan Balasescu
243a6ca774
Update OsuLegacyDecoder.cs
2017-08-18 13:27:16 +09:00
Dan Balasescu
5a9375f336
Merge branch 'master' into fix-duplicate-difficulty-control-points
2017-08-18 13:12:00 +09:00
Dan Balasescu
f5c3af2f20
Merge branch 'master' into fix-nullref
2017-08-18 12:38:20 +09:00
Dean Herbert
02aa38d1c2
Merge branch 'master' into toolbar-button-swap
2017-08-18 11:18:19 +09:00
Dean Herbert
d919d8b0a3
Merge branch 'master' into onscreendisplay-fix
2017-08-18 11:06:12 +09:00
Dean Herbert
e4b832e8a6
Fix a possible nullref when login fails
2017-08-18 10:49:41 +09:00
PoULkY
cc39aad7f8
Fix OsuButton doesn't implement IFilterable
2017-08-18 01:23:44 +07:00
MrTheMake
6118209200
Fix unlit initial state of the OnScreenDisplay
2017-08-17 18:46:16 +02:00
Shane Woolcock
df683d9114
Fix multiple difficulty control points sharing the same time and thus confusing slider velocity calculations
2017-08-17 23:28:26 +09:30
tgi74000
dc31a0f0ac
Merged ppy/master
2017-08-17 13:01:42 +02:00
MrTheMake
586a652b08
Changed Mods to be a property
2017-08-17 12:24:22 +02:00
Dean Herbert
f459794665
Update MainSettings.cs
2017-08-17 18:11:15 +09:00
Dean Herbert
58b1e9c954
Remove unused DI retrieval
2017-08-17 17:47:55 +09:00
Dean Herbert
a44ff5a2c2
Fix regression causing global hotkeys to no longer work
2017-08-17 17:47:44 +09:00
Dean Herbert
a19fc28cff
Visually improve settings transitions and back button
2017-08-17 17:31:14 +09:00
naoey
4f7ae1ed8b
Clear messages when the current channel is removed.
...
- Stop using TabContainer.Children
2017-08-17 09:00:45 +05:30
smoogipooo
cceeb864d5
Fix hitobjects in TestCaseHitObjects not receiving actions.
2017-08-17 12:16:33 +09:00
Dan Balasescu
69a3251f61
Merge branch 'master' into toolbar-button-swap
2017-08-17 10:39:02 +09:00
Thomas Müller
4ef1be3080
More localised key binding hover colour logic
2017-08-17 08:43:45 +09:00
MrTheMake
94d664a626
Swap the order of the social and chat toolbar buttons
2017-08-16 17:00:30 +02:00
Dean Herbert
0c19202b9a
Add basic back button
2017-08-16 23:20:18 +09:00
Dean Herbert
09089a3126
Fix potential nullref
2017-08-16 23:20:08 +09:00
Dean Herbert
e64f455ff7
Escape to cancel, again
2017-08-16 23:01:10 +09:00
Dean Herbert
c41ba7b704
Update with latest framework changes
2017-08-16 22:56:32 +09:00
Dean Herbert
71f83dbdfa
Add null check for safety
2017-08-16 22:56:32 +09:00
Dean Herbert
5ebec53970
Integrate key binding config with main settings
2017-08-16 22:56:32 +09:00
Dean Herbert
7e21ddb5eb
Remove usage of HideOnEscape
2017-08-16 22:56:32 +09:00
Thomas Müller
16372d9b45
Merge branch 'master' into key-config-settings
2017-08-16 17:48:00 +09:00
Dean Herbert
7e1fc47b76
Fix forgotten rename
2017-08-16 17:43:01 +09:00
Dean Herbert
3df51540e1
Code review fixes
2017-08-16 17:39:57 +09:00
Dean Herbert
54698f2d8f
Use IntAction instead of new
2017-08-16 17:27:09 +09:00
Dean Herbert
dc82a88bb8
Improve namespaces of key bindings
2017-08-16 17:24:01 +09:00
Dean Herbert
25a3835c3c
Cancel pending sidebar expansion when a button is clicked
2017-08-16 17:06:20 +09:00
Dean Herbert
89987229de
Merge remote-tracking branch 'origin/is-alive' into key-config-settings
2017-08-16 15:49:43 +09:00
Dean Herbert
a5007fc64f
Fix some remaining usage of local InputManager instances
2017-08-16 13:07:18 +09:00
Dean Herbert
2c7f0629ef
Merge remote-tracking branch 'upstream/master' into is-alive
2017-08-16 12:11:32 +09:00
Dean Herbert
c221472d6e
Code tidy-ups
2017-08-16 01:19:21 +09:00
Dean Herbert
72eb082f91
Use .Equals
2017-08-16 01:14:37 +09:00
Dean Herbert
9c75df884f
Add initial implementation of KeyConfiguration overlay
2017-08-16 00:17:33 +09:00
Dean Herbert
2bd0981738
Improve default key binding logic
...
Defaults will be added to the database as long as the database has unbalanced counts for any actions.
2017-08-15 23:59:58 +09:00
Dean Herbert
3bee36f6a2
Add index to Action column
...
Is used for default assignment
2017-08-15 23:59:06 +09:00
MrTheMake
105048500a
Made modString private and moved the beatmap assignment inside GetScoresRequest
2017-08-15 15:30:53 +02:00
MrTheMake
2c287e1348
CI and comment fix
2017-08-15 12:27:51 +02:00
MrTheMake
21ced32297
Formatted and commented the GetAllMods() function
2017-08-15 12:03:43 +02: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
97ac8e1a64
Update usages of IsAlive/IsLoaded in line with framework changes
2017-08-15 13:57:48 +09:00
Dean Herbert
70f148f0b4
Fix icons on skip button
2017-08-15 09:30:46 +09:00
MrTheMake
e908a3675e
Formatted the GetAllMods() function
2017-08-14 18:24:54 +02:00
Dean Herbert
46bfa4db29
Load defaults, pass around live IEnumerable, add PK for updating
2017-08-14 22:31:23 +09:00
MrTheMake
5ed717ef86
Shortened GetAllMods() using LINQ
2017-08-14 15:16:22 +02:00
MrTheMake
920710e7d0
Assign a score's beatmap and cleanup to the Score class
2017-08-14 13:30:54 +02:00
Dean Herbert
7c9d6c9c83
Initial refactoring of key binding logic
2017-08-14 20:19:25 +09:00
Dean Herbert
dccefe1c0e
Make the settings sidebar optional
...
Also removes an unnecessary secondary list of SidebarButtons by using generic containers.
2017-08-14 14:40:48 +09:00
naoey
381c709639
Fix selectorTab Depth if it's wonky when new tabs are added.
2017-08-14 10:11:34 +05:30
naoey
8dbbc623c7
Add next tab selection logic in game, make IsRemovable public.
...
- Don't clear DrawableChannel when unjoined
2017-08-14 10:11:30 +05:30
naoey
3b6ffadcc7
Renaming to match framework changes.
...
- IsClosable -> IsRemovable
- EasingTypes -> Easing
- Also remove all messages on a channel being un-joined
2017-08-14 10:11:25 +05:30
naoey
2ae3ce8b91
Add ability to close chat tabs.
2017-08-14 10:11:14 +05:30
Dean Herbert
66fa84a451
Make settings more modular
2017-08-14 13:09:59 +09:00
Dean Herbert
c57c106b9d
Merge branch 'master' into fix-leaderboard-icons
2017-08-14 12:54:54 +09:00
Dean Herbert
9e1ffa27dc
Fix leaderboard icons not displaying correctly
2017-08-14 12:52:20 +09:00
Dan Balasescu
bdf064e6ee
Merge branch 'master' into MillhioreF/fix_stable_import_errors
2017-08-14 12:40:35 +09:00
MrTheMake
6b1184e8af
General formatting
2017-08-14 00:27:54 +02:00
MrTheMake
e54f659916
Suggested changes
2017-08-13 22:37:39 +02:00
MrTheMake
2f89fc432b
Removed unused function
2017-08-13 20:28:30 +02:00
MrTheMake
81289db33b
CI fix, fixed nullref and removed abstraction of GetAutoplayMod
2017-08-13 20:12:01 +02:00
MrTheMake
d9c26f98c7
Suggested changes
2017-08-13 19:54:07 +02:00
MrTheMake
e1e4eb78e3
Fix nullref in the leaderboard's test case
2017-08-13 18:00:53 +02:00
MrTheMake
997d0c9053
CI fix
2017-08-13 17:45:46 +02:00
MrTheMake
4c2d7bf343
Parse the mods of a leaderboard's score
2017-08-13 17:41:13 +02:00
MillhioreF
e216bfcf10
Recommended fixes (obsolete try/catch, fix infinite loop during variable parsing in a better way)
2017-08-13 00:40:05 -05:00
Shane Woolcock
d19c8f56be
Make RulesetInfo implement IEquatable since EqualityComparer was sometimes giving false negatives and causing Bindable observers to fire
2017-08-13 15:03:01 +09:30
Dean Herbert
94b8d1de8b
Merge branch 'master' into fix-ruleset-changing
2017-08-13 11:14:41 +09:00
Dean Herbert
fe2911f165
Fix some formatting issues
2017-08-13 10:36:57 +09:00
Dean Herbert
b6fb68c6e2
Update framework
2017-08-12 22:13:40 +09:00
Dean Herbert
99458aab48
Propagate framework updates
2017-08-12 19:54:07 +09:00
Shane Woolcock
096e574401
Selecting a beatmap set no longer updates the ruleset to the first map of that set (since it causes the carousel to refilter)
2017-08-12 19:52:09 +09:30
Shane Woolcock
e48c5898bd
Ensure the Track for the selected beatmap is added to the TrackManager. Fixes the problem where a beatmap would be stuck at 100% if it is replayed.
2017-08-11 17:26:30 +09:30
Dean Herbert
48d4ed55e9
Move a lot of code to framework
2017-08-11 16:11:46 +09:00
Dean Herbert
8ae010f62b
Don't pass through repeat events if we've already handled an action
2017-08-11 11:46:21 +09:00
Dean Herbert
a93a92a2bb
Remove GlobalHotkeys
2017-08-10 19:52:45 +09:00
Dean Herbert
641b3bd27e
Improve documentation
2017-08-10 19:36:47 +09:00
Dean Herbert
798fff00b2
Remove shortcomings, remove InputState.Data usage, make everything amazing
...
No more casting!
2017-08-10 19:28:24 +09:00
Dean Herbert
1fe273cbc0
Move GameplayCursor to osu! ruleset and make work with OsuActions
2017-08-10 18:37:41 +09:00
Dean Herbert
e9a11ebc9f
Use new population methods and implement osu! ruleset actions
2017-08-10 18:31:12 +09:00
Dean Herbert
b6bb07c0b5
Add ConcurrentActionModes to support osu! gameplay more easily
2017-08-10 18:28:22 +09:00
Dean Herbert
c82db54fb5
Rename OsuAction to GlobalAction
2017-08-10 17:22:08 +09:00
Dean Herbert
6ba5bdf1e6
Add description attributes to all actions
2017-08-10 17:14:30 +09:00
Dean Herbert
da50101c25
Don't match on partial key chords when concurrent is disallowed
2017-08-10 16:45:33 +09:00
Dean Herbert
d9e36237c7
Move all OsuGame events to OsuAction
2017-08-10 16:45:10 +09:00
Dean Herbert
30bd1d70b5
ActionMapping doesn't support concurrent actions by default
...
But can when required. Also supports key combination bindings now.
2017-08-10 16:08:43 +09:00
MillhioreF
e42c279229
More generic catching for broken hitobject strings
2017-08-10 01:50:20 -05:00
MillhioreF
2e5a7374a8
Actually use mapName whoops
2017-08-10 01:49:34 -05:00
MillhioreF
f819ffce2b
Make the legacy decoder more resilient against leading linebreaks
2017-08-10 00:08:39 -05:00
MillhioreF
c16dbc05aa
Add new error for malformed (too many variables) hit objects during import
2017-08-09 23:41:22 -05:00
MillhioreF
64d92c1557
Fix infinite loop when importing maps that have storyboard elements with '$' in the filename
2017-08-09 23:31:18 -05:00
MillhioreF
a8cf7ff93a
Add a better error message for corrupt maps with no .osu files
2017-08-09 23:27:13 -05:00
MillhioreF
10321497ca
Add decoder entries for v3/4
2017-08-09 21:21:43 -05:00
Jorolf
15e4e487e2
I hope this works
2017-08-09 22:58:06 +02:00
Jorolf
acc9b20b0f
move another thing to LoadComplete instead of the constructor
2017-08-09 22:37:05 +02:00
Jorolf
c877a5a8b7
update TestCase
2017-08-09 19:26:27 +02:00
Jorolf
c2c9095b02
fix CI issues
2017-08-09 18:57:55 +02:00
Jorolf
7f5270b4e1
Merge branch 'ranks-section' of github.com:Jorolf/osu into ranks-section
2017-08-09 18:51:05 +02:00
Jorolf
8631c469fc
add license header
2017-08-09 18:50:44 +02:00
jorolf
934c2a1dc8
Merge branch 'master' into ranks-section
2017-08-09 18:47:25 +02:00
Jorolf
274ebbd1f7
remove duplicated code and "simplify" ShowMore logic
2017-08-09 18:45:37 +02:00
Jorolf
9f005488f7
make it work again after merge
2017-08-09 17:32:09 +02:00
tgi74000
8dd4f513e7
Symplified migration using MigrateTable<> instead of commands
2017-08-09 11:55:36 +02:00
tgi74000
c0642ad6d3
Added database migration
2017-08-09 10:54:03 +02:00
Dean Herbert
720bd38d8e
Fix CI issues
2017-08-09 17:30:37 +09:00
Dean Herbert
34b12fbfa4
Add global actions; improve default assignment
2017-08-09 17:10:32 +09:00
smoogipooo
d83c218e08
Remove various scrolling container optimisations (removing when not alive).
2017-08-09 16:19:09 +09:00
tgi74000
b00d1cd077
Merged ppy:master
2017-08-09 08:49:29 +02:00
tgi74000
a751c19cf7
Moved JsonProperty file_md5 and added file_sha2
2017-08-09 08:36:15 +02:00
Dean Herbert
3b48a6c668
Fix CI issues
2017-08-09 15:15:41 +09:00
Dean Herbert
976cff9af6
Merge remote-tracking branch 'upstream/master' into catch
...
# Conflicts:
# osu.Desktop.Tests/Visual/TestCaseScrollingPlayfield.cs
2017-08-09 15:08:43 +09:00
smoogipooo
2715324a76
Fix possible incorrect reversing behavior for horizontal playfields.
2017-08-09 14:50:52 +09:00
Dean Herbert
c70f96a9cd
Add basic documentation and split out classes.
2017-08-09 14:50:10 +09:00
smoogipooo
f70c00423a
Missed one.
2017-08-09 14:25:49 +09:00
smoogipooo
346aebebc0
Fix origins not being set correctly when reverting from reversed playfield.
2017-08-09 14:24:48 +09:00
smoogipooo
a20753abc6
Applied suggested changes.
2017-08-09 14:24:47 +09:00
smoogipooo
431a9649a4
Remove unused using.
2017-08-09 13:38:12 +09:00
Dean Herbert
723e27353c
HitRenderer -> RulesetContainer
2017-08-09 13:28:29 +09:00
Dean Herbert
f21b370f4e
Add variant for rulesets with more than one possible key layout
2017-08-09 13:23:23 +09:00
Dean Herbert
7c0e7ebcd0
Give HitRenderer a reference to Ruleset
...
Used to get correct bindings for a mode (ActionMappingInputManager).
2017-08-09 13:05:52 +09:00
smoogipooo
1c5584f068
Make ScrollingPlayfield store a list of SpeedAdjustments instead of a Container.
...
Because they're removed from the container when they're not alive, and any further adding methods fail.
2017-08-09 12:45:50 +09:00
Dean Herbert
eee6404986
Store bindings to database
2017-08-09 12:37:47 +09:00
smoogipooo
dfb47b571a
Make HitRenderer's Playfield public so it can be used in testing.
2017-08-09 12:24:38 +09:00
Dean Herbert
b88f37de45
Add custom actions for Catch
...
Reworks input management for rulesets
2017-08-09 11:50:34 +09:00
Jorolf
7d7cfe5d92
Merge branch 'master' of git://github.com/ppy/osu into ranks-section
2017-08-08 23:13:25 +02:00
Jorolf
1c2329f111
generalize the hover code
2017-08-08 23:11:46 +02:00
tgi74000
3d4db427ff
Pass RuleSet to ScoreStore, compute and store MD5 for legacy replays compatibility
2017-08-08 17:17:53 +02:00
smoogipooo
cae21869d0
Use CompositeDrawable for HitObjectContainer. Removes a looooooot of generics 👍 .
2017-08-08 17:37:11 +09:00
smoogipooo
25202b522d
Fix not setting Origin + Anchors properly when reversing.
2017-08-08 14:10:26 +09:00
smoogipooo
e54abe8d0a
Fix not removing queued hit objects.
2017-08-08 13:23:46 +09:00
Dean Herbert
a95aa90adc
Allow DrawableHitObjects to be removed from a Playfield
...
(cherry picked from commit 3926238be9
2017-08-08 13:02:51 +09:00
Dean Herbert
ee7bb1b4f5
Don't set RelativePositionAxes when setting ScrollingAxes
...
(cherry picked from commit debe13629f
2017-08-08 13:02:23 +09:00
smoogipooo
c5ce86b9f3
Add reversing capability to ScrollingPlayfield.
2017-08-08 12:59:50 +09:00
smoogipooo
bd2ef4dc6b
Line endings + license headers.
2017-08-07 18:03:44 +09:00
smoogipooo
62ee613da3
Merge remote-tracking branch 'origin/master' into timingchange-improvements
2017-08-07 17:35:53 +09:00
smoogipooo
f3c05fe232
CI fixes.
2017-08-07 17:34:57 +09:00
smoogipooo
9c0a0b1e2c
Rewrite/add comments.
2017-08-07 17:27:50 +09:00
smoogipooo
933740664c
SpeedAdjustedHitRenderer -> ScrollingHitRenderer for consistent naming.
2017-08-07 16:43:54 +09:00
smoogipooo
fc252f8888
Remove exception (this is set in SpeedAdjustmentContainer).
2017-08-07 16:24:51 +09:00
smoogipooo
a3efca9c35
Reduce implementation overhead in actually positioning hitobjects and making them scroll.
2017-08-07 16:02:38 +09:00
smoogipooo
068dfcb19a
Default CreateSpeedAdjustmentContainer implementation.
2017-08-07 15:22:31 +09:00
smoogipooo
c6447e40f9
Reduce implementation overhead for nested playfields (e.g. playfield + columns).
2017-08-07 14:56:26 +09:00
Dean Herbert
2ce30474ca
Merge branch 'master' into spriteicon-invalidation-fix
2017-08-07 14:49:09 +09:00
smoogipooo
376f99c1e3
Make VisibleTimeRange transform work again.
2017-08-07 14:32:55 +09:00
smoogipooo
d0906d8232
Adjust xmldocs to conform to TransformableExtensions.
2017-08-07 14:20:56 +09:00
smoogipooo
2221797273
Add transform sequence support to IHasAccentColour.
2017-08-07 14:12:05 +09:00
smoogipooo
e1dfe364b2
Fix lifetime performance regression.
2017-08-07 14:07:49 +09:00
smoogipooo
ce7d391f06
These method calls are impure.
2017-08-07 13:37:07 +09:00
smoogipooo
953cf5af58
Fix SpriteIcon invalidation causing game breakness.
2017-08-07 13:26:54 +09:00
Dean Herbert
eb190d83bd
Adjust CS multiplier to match stable
2017-08-07 10:43:33 +09:00
Dean Herbert
8941c8658c
Use nested containers for shadow
2017-08-07 09:50:04 +09:00
Dean Herbert
de3b65e1fa
Fix StoredBookmarks not being serialized
2017-08-07 09:45:44 +09:00
Dean Herbert
6f93aa6131
Fix incomplete comment
2017-08-07 09:01:47 +09:00
Dean Herbert
e75f438c29
Add difficulty application mods
...
Also fixes circular references when using IJsonSerializable.
2017-08-07 08:54:54 +09:00
Dean Herbert
224de9cc1e
Implement NoFail mod
2017-08-07 08:54:54 +09:00
Dean Herbert
3416925233
Fix alignment of icons on mod buttons
2017-08-07 08:54:53 +09:00
Dean Herbert
d7fede96ef
Fix shadow on SpriteIcon being a bit off
2017-08-07 08:54:53 +09:00
Huo Yaoyuan
8843d97895
Remove depth setting in SectionsContainer and profile.
2017-08-05 18:01:10 +08:00
smoogipooo
b1d25ed388
Implement ScrollingPlayfield, now containing ScrollingHitObjectContainer (prev. SpeedAdjustmentCollection).
...
Also removing a lot of mania code relating to gravity mod for now.
2017-08-04 23:07:08 +09:00
smoogipooo
54503eef71
Rename *ScrollingDrawableTimingSection -> *ScrollingContainer, move LinearScrollingContainer to osu.Game, make SpeedAdjustmentContainer non-abstract.
2017-08-04 22:50:29 +09:30
smoogipooo
4a9f3aa70d
Merge remote-tracking branch 'origin/master' into timingchange-improvements
2017-08-04 20:11:24 +09:30
smoogipooo
0f901c99a0
Implement SpeedAdjustedPlayfield and a new HitRenderer derivation.
2017-08-04 20:11:18 +09:30
Dean Herbert
083248872b
Revert all changes on OsuGame
2017-08-04 17:36:31 +09:00
Dean Herbert
e8021c2b92
Move line inside if
2017-08-04 17:20:05 +09:00
Huo Yaoyuan
74facb32b4
Use removeAutoModOnResume as a field.
2017-08-04 15:34:11 +08:00
Huo Yaoyuan
62b3540fd6
Merge branch 'master' into fixes
2017-08-04 13:49:03 +08:00
Huo Yaoyuan
eb9972581e
Provide Autoplay mod in Ruleset.
2017-08-04 00:25:24 +08:00
Huo Yaoyuan
44fd0eb78b
Pass input state in OnSelected.
2017-08-04 00:09:41 +08:00
Dean Herbert
248486f8f9
Merge branch 'master' into osulegacydecoder-parser
2017-08-03 16:30:37 +09:00
Dean Herbert
a5a5c1a315
Remove debug code
2017-08-03 15:50:59 +09:00
Dean Herbert
91f3d8deb4
Improve class xmldoc
2017-08-03 15:48:06 +09:00
Dean Herbert
bb032508bd
Add comment explaining why we use scale
2017-08-03 15:47:26 +09:00
Dean Herbert
c7f5b83e9e
Derive from CompositeDrawable instead
...
We need to expose EdgeEffect as it's used in places.
2017-08-03 15:45:59 +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
be3c7ec5f8
Added missing space
2017-08-02 16:17:33 +02:00
MrTheMake
79724e8018
Fix OsuLegacyDecoder's parser being NULL if no ruleset was specified
2017-08-02 16:05:09 +02:00
Dan Balasescu
1f205d87f8
Merge branch 'master' into import-from-stable-part-two
2017-08-02 17:05:46 +09:30
Dean Herbert
7cb87c7145
Run each import in a single transaction
...
Improves performance substantially.
2017-08-02 14:18:35 +09:00
Dean Herbert
256daeaf68
Rename variable
2017-08-02 11:56:29 +09:00
MrTheMake
4d8e5898fd
Updates according to the framework and formatting
2017-08-01 17:28:18 +02:00
Dean Herbert
6eb960010f
Speed up startup cleanup operations.
2017-08-01 17:58:21 +09:00
Dean Herbert
3b1166d1e6
Optimise file lookups and other database operations
...
FirstOrDefault when called on a TableQuery with a predicate doesn't use table indices
2017-08-01 17:37:21 +09:00
Dean Herbert
941f3f0934
Tidy up osu-stable import process
...
Now can locate any osu-stable installation using registry lookup (with ample fallbacks). Also uses a much more controlled access method via StableStorage.
2017-08-01 15:12:38 +09:00
Dean Herbert
209d024caa
Merge branch 'master' into musiccontroller-canbeatmapchange
2017-08-01 11:54:05 +09:00
Dean Herbert
fc7f9cbae2
Merge branch 'master' into master
2017-08-01 11:34:59 +09:00
Alex Park (박상희)
bb3a8a29ea
Hide Notification when playing osu
...
Hide Notification Overlay when playing osu
2017-08-01 11:31:11 +09:00
Dean Herbert
024a34a9b3
Merge branch 'master' into scroll_to_selected
2017-08-01 11:17:16 +09:00
Dean Herbert
c8b5c1b8a5
Merge branch 'master' into scroll_to_selected
2017-08-01 11:06:32 +09:00
Dean Herbert
b4acdd5f90
Merge remote-tracking branch 'upstream/master' into fix-file-references
2017-08-01 11:05:38 +09:00
Dean Herbert
9d630e446e
Use new storage methods to reset FileStore
...
Guarantees that backing files are cleaned up correctly. Also handles lingering "beatmaps" directory from older builds.
2017-08-01 10:57:46 +09:00
Dean Herbert
821f65c381
Actually delete files
2017-08-01 10:24:12 +09:00
Dean Herbert
c73e139954
Add "migration"
...
Also simplify initial migration for BeatmapStore by just nuking everything.
2017-08-01 10:24:04 +09:00
Dean Herbert
c060d32765
Separate out startup tasks to ensure they run after migrations
2017-08-01 10:24:00 +09:00
Dean Herbert
ed3e78452e
Lock beatmaps for good measure
2017-08-01 09:38:43 +09:00
Dean Herbert
6af0629cc0
Remove unnecessary newline
2017-08-01 09:37:33 +09:00
Dean Herbert
404497fa10
Allow a single beatmap to reference the same file multiple times
...
This fixes incorrect reference counts causing database desync.
2017-07-31 21:49:57 +09:00
EVAST9919
700c7753c3
Applied suggestions
2017-07-31 14:20:12 +03:00
EVAST9919
1ce4966644
Merge remote-tracking branch 'refs/remotes/ppy/master' into scroll_to_selected
2017-07-31 14:08:15 +03:00
Dean Herbert
f67822a59b
Add progress for deleting all maps
2017-07-31 18:52:59 +09:00
Huo Yaoyuan
df3f75b842
Merge branch 'master' into fixes
2017-07-31 17:51:34 +08:00
Dean Herbert
bc8f8de049
Make QueryAndPopulate's filter non-optional (you basically *never* want this missing)
2017-07-31 18:41:54 +09:00
Dean Herbert
92b3c7ac08
Fix the whole database being retrieved when importing each beatmap
2017-07-31 18:38:42 +09:00
Dean Herbert
df5094c0d4
Rework how notifications are distributed
2017-07-31 18:03:55 +09:00
Dean Herbert
57d45b180c
Merge remote-tracking branch 'upstream/master' into import-from-stable
2017-07-31 17:31:10 +09:00
Dean Herbert
502ccae0ca
Merge branch 'master' into notification-improvements
2017-07-31 17:12:11 +09:00
Dean Herbert
063add6d10
Merge branch 'master' into fix-notification-threading
2017-07-31 16:39:53 +09:00
Dean Herbert
fcd502642d
Merge branch 'master' into button-visually-disables
2017-07-31 16:38:33 +09:00
Dean Herbert
17c5bdbc92
Merge branch 'master' into fix-notification-threading
2017-07-31 16:33:34 +09:00
EVAST9919
62365090ad
Removed useless variable
2017-07-29 17:51:11 +03:00
EVAST9919
6b3a81f567
Fix hard crash when pressing random if no beatmaps avaliable
2017-07-29 17:42:32 +03:00
EVAST9919
e121b119be
Added "scroll to" container
2017-07-29 17:33:20 +03:00
Jorolf
02a22e3f77
remove empty argument list
2017-07-29 15:16:31 +02:00
Jorolf
cca49d6ed5
some renaming, a show more button and a placeholder if no scores exist
2017-07-29 15:06:46 +02:00
EVAST9919
8458622c4d
Add ScrollToSelected method
2017-07-29 16:03:17 +03:00
Jorolf
4720a47363
Merge branch 'master' of git://github.com/ppy/osu into ranks-section
2017-07-29 00:45:14 +02:00
Jorolf
88f206cfe4
rename file
2017-07-29 00:39:47 +02:00
Jorolf
0fc36065f4
replace Play with Score
2017-07-29 00:31:52 +02:00
Dean Herbert
b45f1e5381
Merge branch 'master' into transaction-on-import
2017-07-28 17:43:18 +09:00
Thomas Müller
88265c3223
Merge branch 'master' into store-migration
2017-07-28 10:34:22 +02:00
Dean Herbert
6807caa752
Use a transaction when adding a beatmap
...
Fixes flakey unit test.
2017-07-28 17:31:50 +09:00
Dean Herbert
4bb8f40b49
AutoSize notifications (and add animation)
2017-07-28 17:00:30 +09:00
Dean Herbert
74044baeff
Don't cancel a ProgressNotification when clicking by default
2017-07-28 17:00:27 +09:00
Dean Herbert
b3e3c4a226
Fix setting a ProgressNotification's progress too early crashing
2017-07-28 17:00:24 +09:00
Dean Herbert
5dfed1dba5
Add word-wrap functionality of ProgressNotification
...
Fixes a potential threading issue when updating Text.
2017-07-28 17:00:20 +09:00
Dean Herbert
0d332d4754
Fix NotificationOverlay no longer automatically displaying
2017-07-28 16:59:42 +09:00
Dean Herbert
c48bf3940e
Add a progress notification when importing beatmaps
2017-07-28 16:57:33 +09:00
Dean Herbert
f5b0253e82
Apply CI fixes
2017-07-28 15:36:23 +09:00
Dean Herbert
d93d9e6190
Tidy up file deletion after import
2017-07-28 15:08:56 +09:00
Dean Herbert
6616721e37
Don't block imports and BeatmapStore operations using the same lock
2017-07-28 15:05:12 +09:00
Dean Herbert
e691dd12c5
Fix potential sequen of execution issues in BeatmapCarousel
2017-07-28 15:05:08 +09:00
