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
|
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 |
|
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
|
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 |
|
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 |
|