8481 Commits

Author	SHA1	Message	Date
HoutarouOreki	39224931f8	Try satisfying AppVeyor	2018-05-25 14:25:12 +02:00
HoutarouOreki	71c04f4605	Add license header to the new file	2018-05-25 14:10:54 +02:00
HoutarouOreki	29fbdf4d92	Remove horizontal white space	2018-05-25 14:05:50 +02:00
HoutarouOreki	e3ebc849c5	Remove not removed comment	2018-05-25 14:04:12 +02:00
HoutarouOreki	3efb51e464	Create Format(), override TooltipText..	2018-05-25 14:00:32 +02:00
HoutarouOreki	a446b627da	Make TooltipText virtual	2018-05-25 13:31:12 +02:00
HoutarouOreki	05b0564381	Create DrawableJoinDate somehow and remove dateFormat argument	2018-05-25 13:30:29 +02:00
HoutarouOreki	961702aadf	Apply the format fix to the tooltip text across the board	2018-05-25 13:05:41 +02:00
ekrctb	4392c57889	Merge branch 'master' into catch-droplet-fix	2018-05-25 19:34:59 +09:00
ekrctb	22e6e016fc	Merge branch 'master' of https://github.com/ppy/osu into catch-droplet-fix	2018-05-25 19:28:36 +09:00
Dean Herbert	699f661b02	Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix	2018-05-25 19:07:30 +09:00
ekrctb	9f2e09dae4	Move PostProcessing to after control points applied and nested hit objects created.	2018-05-25 18:57:06 +09:00
Dean Herbert	cc69f07172	Merge remote-tracking branch 'upstream/master' into jorolf-open-external	2018-05-25 18:52:05 +09:00
Dean Herbert	1cb7d50407	Add and use default size (smaller than before)	2018-05-25 18:51:57 +09:00
Dean Herbert	1b5bb79fe9	Merge remote-tracking branch 'upstream/master' into jorolf-open-external	2018-05-25 18:50:30 +09:00
Dean Herbert	28aa6faef9	Merge branch 'master' into player_loader_input_toggles	2018-05-25 18:38:12 +09:00
Dean Herbert	385c2c5c86	Merge branch 'master' into musiccontroller-nullref	2018-05-25 11:01:09 +09:00
Dean Herbert	568d4882c6	Remove unnecessary null coalesce	2018-05-25 11:00:56 +09:00
Dean Herbert	7961c56239	Merge remote-tracking branch 'FreezyLemon/master' into smoogipoo-disallow-beatmap-change	2018-05-25 10:55:01 +09:00
Roman Kapustin	498244a308	Introduce PreviewTrack class	2018-05-25 00:37:53 +03:00
UselessToucan	d6076eb591	Merge branch 'master' into multiple_previews_different_overlays	2018-05-24 20:51:54 +03:00
smoogipoo	b649025e86	beginUserDrag/endUserDrag	2018-05-24 14:36:48 +09:00
smoogipoo	d4f68e0b67	Fix possible NaN values due to trackvirtual infinite length	2018-05-24 14:31:31 +09:00
smoogipoo	f1ac84d95b	Fix base.CreateLocalDependencies sometimes not being called	2018-05-24 13:03:25 +09:00
smoogipoo	5a517bad63	Move beatmap cleanup to Dispose()	2018-05-24 12:53:32 +09:00
smoogipoo	542eb848b0	Fix GetBoundCopy on IGameBeatmap not working	2018-05-24 12:42:58 +09:00
Aergwyn	0c0f86fe26	fix incorrect default values keeping overlays in wrong state	2018-05-23 16:25:10 +02:00
Jacob	a2527495ff	Merge branch 'master' into ParallaxContainerImprovement	2018-05-23 16:21:31 +02:00
smoogipoo	fb78854485	Fix audio playback getting paused if playlist changes beatmap	2018-05-23 19:41:13 +09:00
HoutarouOreki	29de8e5e2d	Document parameters more properly	2018-05-23 12:07:28 +02:00
smoogipoo	a5d2d74447	Remove whitespace	2018-05-23 19:01:27 +09:00
smoogipoo	a25462e10f	Fix testcase audio + dependency overrides not working	2018-05-23 18:52:09 +09:00
HoutarouOreki	10bc3917b5	Apply suggested changes	2018-05-23 11:17:13 +02:00
smoogipoo	8004b8af4d	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
smoogipoo	6c0c932c48	Reorder OsuGameBase methods	2018-05-23 14:56:40 +09:00
smoogipoo	f894d73501	Fix possible MusicController nullref	2018-05-23 14:36:09 +09:00
smoogipoo	a30f72b477	Add helper methods for seeking/scrolling	2018-05-23 14:32:00 +09:00
smoogipoo	6b0eeb3436	Rework seeking interactions to support smooth scrolling	2018-05-23 14:14:32 +09:00
smoogipoo	49f893d5e4	Couple the timeline to the audio	2018-05-23 12:00:11 +09:00
HoutarouOreki	8e9dde97ce	Better match join and last seen texts and tooltips with osu-web	2018-05-23 03:24:37 +02:00
HoutarouOreki	6cf227a7af	Allow formatting for DrawableDate class	2018-05-23 03:24:18 +02:00
Vidalee	7a31986812	resolving the lost code problem	2018-05-22 22:39:55 +02:00
Vidalee	08e423ac5b	code sanity	2018-05-22 21:35:17 +02:00
Vidalee	50e2871c89	why this line was ommited	2018-05-22 21:29:41 +02:00
Aergwyn	76fbc656a1	fix disclaimer allowing notifications	2018-05-22 17:53:36 +02:00
Jacob	b328957557	Merge branch 'master' into ParallaxContainerImprovement	2018-05-22 16:32:05 +02:00
jorolf	8fbda5bc59	add license header	2018-05-22 15:41:10 +02:00
jorolf	b324337fa1	Add icon next to beatmap title/username to open in browser	2018-05-22 15:29:52 +02:00
jorolf	a7bdaf75b0	Ensure badges are ordered correctly	2018-05-22 13:05:15 +02:00
Jacob	caad47b569	Merge branch 'master' into ParallaxContainerImprovement	2018-05-22 12:10:50 +02:00
Dean Herbert	ef40ca8805	Merge branch 'master' into respect-showoverlay-bindable	2018-05-22 19:00:42 +09:00
smoogipoo	1dfa3ff995	Merge remote-tracking branch 'origin/master' into editor-timeline-rework	2018-05-22 18:30:29 +09:00
Dan Balasescu	99163ca8ba	Merge branch 'master' into fix-main-menu-escape	2018-05-22 18:17:51 +09:00
smoogipoo	0e122468db	Fix progress easing to 0 if aborting after confirmation	2018-05-22 18:06:40 +09:00
Dean Herbert	d43e4af8ea	Fix overlap between quit button at key input overlay	2018-05-22 16:45:42 +09:00
Dean Herbert	436067c01f	Handle scale back in a nicer way	2018-05-22 16:44:37 +09:00
Dean Herbert	7b770d03c5	Use OnMouseMove instead of Update logic	2018-05-22 16:26:59 +09:00
Dean Herbert	babb7d5158	Fix white ring flash when holding button post-confirmation	2018-05-22 16:23:05 +09:00
Dean Herbert	5f8eb6d823	Fix class name	2018-05-22 16:04:36 +09:00
Dean Herbert	8fbda9d57e	Improve comment	2018-05-22 16:04:07 +09:00
Dean Herbert	58ae545747	innerCircle -> overlayCircle	2018-05-22 15:59:53 +09:00
Dean Herbert	ef55c3c197	Fix icon scale not resetting due to no implicit triggering	2018-05-22 15:58:17 +09:00
Dean Herbert	2ce2bd9788	Add comment for pendingAnimation	2018-05-22 15:58:00 +09:00
DrabWeb	349b0a3322	Remove empty ctor.	2018-05-22 01:46:08 -03:00
DrabWeb	3cc5bb516e	Remove unused Match ctor param.	2018-05-22 01:39:25 -03:00
DrabWeb	662559d3c9	More test steps.	2018-05-22 01:22:23 -03:00
DrabWeb	6aac4269e6	Add filtering.	2018-05-22 00:33:41 -03:00
DrabWeb	f7a4a4eeef	Add Lounge FilterControl.	2018-05-22 00:24:39 -03:00
DrabWeb	cae09492c3	Basic Lounge functionality.	2018-05-22 00:07:04 -03:00
DrabWeb	1210368e29	Add MultiplayerScreen base class.	2018-05-21 23:00:02 -03:00
Jacob	e878e65e83	Merge branch 'master' into ParallaxContainerImprovement	2018-05-21 20:31:44 +02:00
Dean Herbert	5a892e4d08	This quit button don't quit	2018-05-22 02:09:52 +09:00
Dean Herbert	323aa189b6	Make on-confirmation animation more robust	2018-05-22 02:08:44 +09:00
Dean Herbert	156d7fb25a	Change depth of HUD ... Yes, this is intentional.	2018-05-22 02:08:21 +09:00
Dean Herbert	946a75ddb2	Block hover to use UI cursor instead of gameplay cursor	2018-05-22 02:05:08 +09:00
Dean Herbert	ebda287e81	Share code with HoldToConfirm implementations elsewhere	2018-05-22 01:44:06 +09:00
Roman Kapustin	30956b64aa	Do not change Margin for player settings groups on the PlayerLoader screen	2018-05-21 18:57:01 +03:00
Dean Herbert	f9c162dee9	Adjust design and feel	2018-05-22 00:49:33 +09:00
Aergwyn	cee8d21542	hide overlays when going back to initial menu state	2018-05-21 17:24:57 +02:00
Dean Herbert	d5afccd610	Make hint text display briefly at initial display, then on hover	2018-05-22 00:02:03 +09:00
Dean Herbert	3d9d40448d	Fix incorrect syntax	2018-05-22 00:01:40 +09:00
Dean Herbert	841336a181	Merge branch 'master' into exit_replay_button	2018-05-21 23:45:06 +09:00
Dean Herbert	9820666bcf	Merge branch 'master' into respect-showoverlay-bindable	2018-05-21 23:26:34 +09:00
Dean Herbert	d109522bf7	Fix escape not working to go backwards in menus before finally exiting the game ... Resolves #2596.	2018-05-21 23:09:00 +09:00
Aergwyn	b7e3ea348b	expose two Bindables with split logic instead of one with mixed logic	2018-05-21 15:53:55 +02:00
Jacob	30ff1c4b8b	Merge branch 'master' into ParallaxContainerImprovement	2018-05-21 15:19:24 +02:00
AlFasGD	a54bda6ce1	Apply requested changes	2018-05-21 13:23:39 +03:00
Aergwyn	1482bca147	Rename for better understanding ... ShowOverlays -> AllowOverlays ShowOverlaysOnEnter -> HideOverlaysOnEnter	2018-05-21 09:42:29 +02:00
Dean Herbert	c48c62ea04	Merge branch 'master' into player_loader_input_toggles	2018-05-21 16:20:08 +09:00
Dean Herbert	9e17eb2342	Reword settings text to be ruleset agnostic	2018-05-21 16:03:08 +09:00
Dean Herbert	5ec349de78	Reorder methods and remove useless comments	2018-05-21 15:59:33 +09:00
Dean Herbert	f53164843d	Reduce spacing changes	2018-05-21 15:56:02 +09:00
Dean Herbert	cea935ea40	Merge branch 'master' into osu-hd-setting	2018-05-21 15:21:09 +09:00
Dean Herbert	c75ef7704a	Merge remote-tracking branch 'Joehuu/master' into ocboogie-ruleset-keybindings	2018-05-21 14:49:34 +09:00
Dean Herbert	42519e3723	Rewrite code for clarity ... This also uses the AvailableRulesets list rather than private IDs	2018-05-21 14:49:26 +09:00
Joehu	46c6c1d07e	Allow drag clicking footer and filter on song select	2018-05-20 20:25:39 -07:00
Dean Herbert	92668f07e0	Merge branch 'master' into drawable-room-improvements	2018-05-21 11:09:12 +09:00
Dean Herbert	9f0cc7683b	Merge branch 'master' into respect-showoverlay-bindable	2018-05-21 04:43:55 +09:00
Dean Herbert	aaca7e92b4	Avoid excessive property lookups	2018-05-21 03:56:59 +09:00
Aergwyn	4d528c4e67	fix VisualTests and Samples still playing	2018-05-20 10:57:15 +02:00
DrabWeb	9cd0ec366e	Cleanup.	2018-05-19 02:51:51 -03:00
DrabWeb	136c57b824	Don't set size in ctor.	2018-05-19 02:27:33 -03:00
DrabWeb	ad878003f7	Add null room support to RoomInspector.	2018-05-19 02:23:09 -03:00
DrabWeb	4b2b2086df	Create drawable hierarchy for RoomInspector in load, remove display* methods.	2018-05-19 01:26:39 -03:00
Dean Herbert	e5aa1a038e	Merge branch 'master' into fix-hr-application	2018-05-18 18:37:51 +09:00
smoogipoo	e6e3758304	Fix HR mod affecting original beatmap difficulty ... Fixes #2575.	2018-05-18 18:11:52 +09:00
smoogipoo	82607b3eb3	Expose properties to control zoom	2018-05-18 17:53:09 +09:00
Aergwyn	67db539172	prevent Overlays from showing in intro/outro sequences	2018-05-18 08:00:05 +02:00
Dean Herbert	d75fe4009a	Add back action support to settings back button	2018-05-18 13:40:35 +09:00
Dean Herbert	e2389ad7a4	Allow using back button on PlayerLoader and Replay	2018-05-18 13:32:05 +09:00
smoogipoo	bc3d195aa2	Fix line endings	2018-05-18 13:05:58 +09:00
Dean Herbert	1cda5f4de9	Merge branch 'master' into back_mouse_button_support	2018-05-18 12:55:52 +09:00
Dean Herbert	6c00046835	Merge branch 'master' into mania-performance-calculator	2018-05-18 12:34:49 +09:00
Dean Herbert	8e784d9104	Merge branch 'master' into fix-conversion-hitwindows	2018-05-18 11:59:16 +09:00
Roman Kapustin	17d1759c37	Get rid of multiple blank lines in a row	2018-05-18 01:01:54 +03:00
Roman Kapustin	81d7e8a393	Resolve merge conflict	2018-05-18 00:25:47 +03:00
Vidalee	2492e34d3f	resolving codefactor styling issues	2018-05-17 19:44:09 +02:00
Vidalee	6a1abf4084	Merge branch 'master' into osu-hd-setting	2018-05-17 19:39:17 +02:00
DrabWeb	ebfbe58abb	Move Header breadcrumbs to a subclass.	2018-05-17 06:19:55 -03:00
Dean Herbert	d20011ba58	Fix an endless feedback loop	2018-05-17 17:56:29 +09:00
Dean Herbert	7c9d3c9742	Merge branch 'master' into multiplayer-base-screen	2018-05-17 17:41:31 +09:00
smoogipoo	43cdbec0a3	Fix hold note hitwindow lenience	2018-05-17 13:59:04 +09:00
Jacob	1b64f86011	Merge branch 'master' into ParallaxContainerImprovement	2018-05-17 06:53:16 +02:00
smoogipoo	f67d263596	Move ruleset-specific hitwindows to post-converted hitobjects	2018-05-17 13:35:15 +09:00
Dean Herbert	d36c2686c9	Merge branch 'master' into beatmap-parsing-performance	2018-05-17 13:28:35 +09:00
smoogipoo	397d93660a	Don't deep-clone beatmapinfo/control points	2018-05-17 13:17:33 +09:00
DrabWeb	650d40f57f	Merge https://github.com/ppy/osu into multiplayer-base-screen	2018-05-17 00:34:40 -03:00
smoogipoo	c67f372560	Don't create nested hitobjects unless absolutely required	2018-05-17 12:29:33 +09:00
Jacob	98159c3ab7	Merge branch 'master' into ParallaxContainerImprovement	2018-05-16 17:46:17 +02:00
Dean Herbert	47cd9065bf	Merge branch 'master' into screen-breadcrumbs	2018-05-16 18:42:17 +09:00
smoogipoo	3f365c6621	Merge branch 'master' into editor-timeline-rework ... # Conflicts: # osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs # osu.Game/Screens/Edit/Screens/Compose/Compose.cs # osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs # osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs	2018-05-16 18:04:24 +09:00
smoogipoo	0f817d18d4	Add explanatory comment	2018-05-16 13:59:51 +09:00
Dan Balasescu	ad81357fb5	Merge branch 'master' into fix-hitobject-order	2018-05-16 13:33:27 +09:00
Dean Herbert	452564d0e0	Merge branch 'master' into screen-breadcrumbs	2018-05-16 13:31:38 +09:00
smoogipoo	cf44357bdb	Use a stable sort for hitobjects	2018-05-16 13:30:48 +09:00
smoogipoo	8d8b7e6fa2	Fix conversion tests for ruleset-specific beatmaps not working ... TRuleset was a mistake. This resulted in cases that checked whether the beatmap was for the current ruleset (TaikoBeatmapConverter and ManiaBeatmapConverter) failing due to TestXRuleset != XRuleset...	2018-05-16 13:09:48 +09:00
DrabWeb	1a78ac3d10	Add Multiplayer screen.	2018-05-15 21:14:10 -03:00
KoziLord	d2b2d3e2e0	Use the absolute value of ParallaxAmount to make sure we're not scaling things down when using a negative value for the Parallax (moving against the cursor instead of with it)	2018-05-16 01:38:46 +02:00
KoziLord	705960dabb	Fix typo	2018-05-16 01:36:26 +02:00
DrabWeb	1450bf64f5	Add multiplayer screen header.	2018-05-15 20:34:14 -03:00
KoziLord	3b708f6505	make it equal with the original codebase.	2018-05-16 01:34:08 +02:00
KoziLord	428d0f5dee	Re-implement the fix after it got deleted in the previous commit.	2018-05-16 01:30:16 +02:00
KoziLord	1e88f216f2	Revert the ParallaxContainer changes I made by accident back.	2018-05-16 01:27:18 +02:00
DrabWeb	b9d99b5f40	Fix nullref when exiting the last screen.	2018-05-15 19:42:50 -03:00
smoogipoo	de63a1b578	Remove construction of new ruleset	2018-05-16 01:43:58 +09:00
KoziLord	c44d07e9c6	Merge branch 'master' of https://github.com/ppy/osu	2018-05-15 16:02:55 +02:00
KoziLord	be1159444d	Use the absolute value of ParallaxAmount to make sure we're not scaling stuff down when using a negative ParallaxAmount	2018-05-15 15:56:49 +02:00
Dean Herbert	c0c449e453	Remove unused using	2018-05-15 22:53:33 +09:00
smoogipoo	3f67d04429	Cap CS to 10 also	2018-05-15 21:57:08 +09:00
KoziLord	567cdc7165	Merge branch 'master' of https://github.com/ppy/osu	2018-05-15 14:52:45 +02:00
smoogipoo	4101b8ddde	Merge remote-tracking branch 'origin/master' into more-diffcalc-improvements	2018-05-15 21:31:58 +09:00
smoogipoo	1acfc1bbab	Fix ModHardRock not properly clamping Drain/OD	2018-05-15 21:25:20 +09:00
Dean Herbert	28df77e838	Simplify code and remove generic	2018-05-15 21:10:26 +09:00
Dean Herbert	0325b1bd7a	Remove unused class	2018-05-15 19:42:30 +09:00
Dean Herbert	0def847f60	Merge branch 'master' into screen-breadcrumbs	2018-05-15 19:39:03 +09:00
Dean Herbert	fc192c8998	Merge remote-tracking branch 'upstream/master' into smoogipoo-disable-mouse-buttons	2018-05-15 19:23:51 +09:00
KoziLord	08386d6ca4	Merge branch 'master' of https://github.com/ppy/osu	2018-05-15 12:23:36 +02:00
Dean Herbert	6bf1092c7d	Merge branch 'master' into enable-distance-overflow	2018-05-15 18:56:51 +09:00
Dean Herbert	0e0cc8bb69	Merge branch 'master' into namespace-cleanup	2018-05-15 18:10:48 +09:00
smoogipoo	995fda9b6f	Move base classes to osu.Game.Rulesets.Difficulty namespace	2018-05-15 17:38:08 +09:00
Dean Herbert	e39af1c906	Merge branch 'master' into convert-object-hitwindows	2018-05-15 17:33:27 +09:00
Dean Herbert	6d87ff2595	Merge branch 'master' into enable-distance-overflow	2018-05-15 16:18:17 +09:00
Dean Herbert	f2580e5656	Merge branch 'master' into score-parser-deriving	2018-05-15 15:42:01 +09:00
smoogipoo	1ee68c1c54	Make LegacyScoreParser abstract	2018-05-15 15:28:46 +09:00
Dean Herbert	5fee471307	Merge branch 'master' into beatmap-delete-fix	2018-05-15 14:49:09 +09:00
smoogipoo	fe2ea17e7f	Allow subclasses of LegacyScoreParser to specify beatmap/ruleset retrieval	2018-05-15 11:42:40 +09:00
KoziLord	be56d8cb82	Change the parallax amount	2018-05-15 00:53:31 +02:00
KoziLord	ca05fde14c	Fix the Parallax Background not filling the entire Circle Container.	2018-05-15 00:47:03 +02:00
ocboogie	4055a6fc0c	Merge branch 'master' into ruleset-keybindings	2018-05-14 15:39:10 -07:00
KoziLord	95a207ef56	Fixed the parallax background missing from the space occupied by the top toolbar.	2018-05-15 00:17:42 +02:00
Roman Kapustin	f2f2fb8c73	Use both OnKeyDown and GlobalAction.Back	2018-05-14 22:09:09 +03:00
Roman Kapustin	e802b722f0	Revert "Handle mouse back button using OnMouseDown override instead of using GlobalAction" ... This reverts commit 44bbb8700e.	2018-05-14 20:27:05 +03:00
Dean Herbert	7507d18a93	Merge branch 'master' into mapping-del	2018-05-14 20:56:12 +09:00
Dean Herbert	4a92d1ddb6	Merge branch 'master' into fix-testruleset-issues	2018-05-14 20:21:49 +09:00
Dean Herbert	addb864d10	Allow help text to wrap	2018-05-14 19:56:03 +09:00
Dan Balasescu	d40efd3134	Merge branch 'master' into fix-testruleset-issues	2018-05-14 19:39:56 +09:00
smoogipoo	47cf4f27fb	Fix possibility of test rulesets being discovered from assemblies	2018-05-14 19:39:23 +09:00
Dean Herbert	28edf3bce7	Merge branch 'master' into hud-above-letterbox	2018-05-14 19:31:39 +09:00
ocboogie	d441fd53b9	Merge branch 'master' into ruleset-keybindings	2018-05-14 03:27:35 -07:00
smoogipoo	17861c2a16	Display "no key bound" when no shortcut	2018-05-14 19:20:53 +09:00
Dean Herbert	0234bbc37f	Move definition inline	2018-05-14 19:14:17 +09:00
Dean Herbert	f14948c022	Merge branch 'master' into exit-hold-confirmation	2018-05-14 18:13:40 +09:00
smoogipoo	115c2dc239	Move hud below the skip button	2018-05-14 18:02:18 +09:00
smoogipoo	027f6c3fa4	Fix instant movement not doing anything	2018-05-14 17:47:38 +09:00
smoogipoo	4ceae6ba1f	Inline method	2018-05-14 17:45:11 +09:00
smoogipoo	6eb7590ab0	Make MusicController handle all movement to previous/next tracks	2018-05-14 17:42:01 +09:00
ocboogie	bfcfeec9b9	Merge branch 'master' into ruleset-keybindings	2018-05-14 01:28:57 -07:00
Dean Herbert	fe1c1fec0d	Stop overlays from handling DragStart ... This was causing weird behaviour with the key configuration section and back button in settings.	2018-05-14 15:44:19 +09:00
smoogipoo	64fba5f6d1	Proxy the ruleset cursor above the break overlay	2018-05-14 15:36:56 +09:00
smoogipoo	43409127b7	Place break overlay underneath the hud	2018-05-14 15:36:42 +09:00
Dean Herbert	39970c831e	Merge branch 'master' into fix-diffcalc-timerates	2018-05-14 15:19:51 +09:00
smoogipoo	f5068804d5	Re-enable slider distance overflow ... Fixes #2467.	2018-05-14 15:14:29 +09:00
Dean Herbert	345e213eff	Merge branch 'master' into fix-wedge-nullref	2018-05-14 15:08:48 +09:00
Dean Herbert	5c41e7c39c	Merge pull request #2527 from peppy/fix-mousewheel-startup-crash ... Fix crash on startup when adjusting volume before volume control loaded	2018-05-14 14:23:08 +09:00
Dean Herbert	ecd8b69e5e	Merge branch 'master' into fix-diffcalc-timerates	2018-05-14 14:22:39 +09:00
Dan Balasescu	d7cba000ab	Merge branch 'master' into fix-wedge-nullref	2018-05-14 13:36:07 +09:00
Dan Balasescu	2e648a90c8	Merge branch 'master' into fix-song-progress-counters	2018-05-14 13:27:50 +09:00
smoogipoo	a81921118d	Strip whitespaces	2018-05-14 11:54:11 +09:00
ocboogie	ebd9d1a037	Resolve linting issues in ToolbarModeSelector.cs	2018-05-13 19:43:26 -07:00
ocboogie	327c7432be	Use OnKeyDown instead of a IKeyBindingHandler	2018-05-13 19:33:52 -07:00
smoogipoo	6e1d651087	Merge remote-tracking branch 'origin/master' into convert-object-hitwindows	2018-05-14 11:17:39 +09:00
smoogipoo	e1b8a1589b	Fix TimeRate not being considered for performance calculation	2018-05-14 11:15:14 +09:00
Dean Herbert	ede4d6dd11	Merge branch 'master' into mapping-del	2018-05-14 10:58:58 +09:00
Dean Herbert	db0470243a	Fix nullref when changing ruleset at main menu	2018-05-13 12:55:54 +09:00
ocboogie	26f06a9ae1	Resolve linting issues in ToolbarModeSelector.cs	2018-05-12 17:25:15 -07:00
ocboogie	76800421c4	Merge branch 'master' into ruleset-keybindings	2018-05-12 16:40:27 -07:00
ocboogie	8a5bd27c20	Add global key bindings for changing current ruleset	2018-05-12 16:30:29 -07:00
Dean Herbert	a162453e9b	Merge remote-tracking branch 'upstream/master' into joystick ... # Conflicts: # osu-framework # osu.Game/Overlays/KeyBinding/KeyBindingRow.cs	2018-05-13 00:11:17 +09:00
AlFasGD	2a90686da6	Simplify expression	2018-05-12 15:09:53 +03:00
Dean Herbert	36af7feab3	Merge branch 'master' into diffcalc-fixes	2018-05-12 21:01:58 +09:00
DrabWeb	937ff50a5a	Remove unused using.	2018-05-11 13:56:27 -03:00
DrabWeb	41de02fc78	Make DrawableRooms select when they are clicked.	2018-05-11 13:43:53 -03:00
DrabWeb	518dec0c68	Merge https://github.com/ppy/osu into drawable-room-improvements	2018-05-11 13:41:50 -03:00
Dean Herbert	a14531b9a4	Fix crash on startup when adjusting volume before volume control loaded	2018-05-11 22:57:36 +09:00
Dean Herbert	cfa18bdf1f	Fix song progress time counters wrapping after an hour ... Resolves #2466. Supersedes and closes #2487.	2018-05-11 22:10:26 +09:00
smoogipoo	7e7a5f8964	Fix score accuracy not being populated	2018-05-11 21:49:10 +09:00
smoogipoo	8ca67f63ec	Fix score statistics not being read	2018-05-11 21:49:06 +09:00
Dean Herbert	aa5d5ab2a8	Fix readonly field	2018-05-11 21:48:35 +09:00
Dean Herbert	f1fd2ae7be	Merge branch 'master' into modmouseup	2018-05-11 21:41:14 +09:00
Dean Herbert	4fc887b25f	Add a pressing effect to make mouse up response feel good	2018-05-11 21:40:36 +09:00
Dean Herbert	c19432dc6d	Merge branch 'master' into ruleset-beatmap-statistics	2018-05-11 17:37:50 +09:00
Dean Herbert	2afc0c1abd	Merge branch 'master' into breadcrumb-design-adjustments	2018-05-11 17:19:26 +09:00
DrabWeb	fa403e4e2a	Add test step to test pushing after a previous screen is made current.	2018-05-11 04:49:40 -03:00
smoogipoo	97a523584d	Make HitWindows not return null by default	2018-05-11 15:52:51 +09:00
smoogipoo	bfad101d17	Standardise naming	2018-05-11 15:42:34 +09:00
smoogipoo	5245d2d426	Add info about when CreateHitWindows is invoked	2018-05-11 15:36:53 +09:00
smoogipoo	8563291796	Add convert mania HitWindows	2018-05-11 15:32:00 +09:00
smoogipoo	c052ee71c1	Add convert osu HitWindows	2018-05-11 15:31:36 +09:00
smoogipoo	9c65d347ba	Add convert taiko HitWindows	2018-05-11 15:31:12 +09:00
smoogipoo	8216bc311a	Restructure HitWindows to allow outside setting	2018-05-11 15:30:26 +09:00
smoogipoo	fd9796d08c	Remove some unnecessary changes	2018-05-11 14:13:52 +09:00
smoogipoo	816ad5c426	Pass down ruleset to the buffered wedge	2018-05-11 14:10:53 +09:00
smoogipoo	2bab08c437	Fix post-merge errors	2018-05-11 14:08:17 +09:00
smoogipoo	73465c35fa	Merge remote-tracking branch 'origin/master' into ruleset-beatmap-statistics ... # Conflicts: # osu.Game/Beatmaps/Beatmap.cs	2018-05-11 14:05:40 +09:00
DrabWeb	a241ff1c05	Cleanup.	2018-05-10 22:50:03 -03:00
DrabWeb	ec53927d8e	Add selection to DrawableRoom.	2018-05-10 22:48:07 -03:00
DrabWeb	d87ac5a1cb	Create the drawable hierarchy for DrawableRoom in load.	2018-05-10 22:12:25 -03:00
DrabWeb	b9adeeb063	Add ScreenBreadcrumbControl.	2018-05-10 21:35:26 -03:00
DrabWeb	a86843ccc9	Remove unused usings caused by multiplayer folder restructuring.	2018-05-10 20:49:42 -03:00
DrabWeb	bc9ac8f72a	Move multiplayer screens to osu.Game/Screens/Multi/Screens	2018-05-10 20:47:25 -03:00
DrabWeb	2d206d258a	Move multiplayer screen components to osu.Game/Screens/Multi/Components	2018-05-10 20:44:24 -03:00
DrabWeb	c35760fdef	Rename osu.Game/Screens/Multiplayer to Multi.	2018-05-10 20:39:05 -03:00
DrabWeb	ecb8de29a2	Adjust BreadcrumbControl to better match the designs.	2018-05-10 20:30:03 -03:00
Roman Kapustin	86430da6d6	Update CircularProgress.FillTo calls	2018-05-10 21:08:02 +03:00
Roman Kapustin	93029fd548	Remove mouseWheelCheckbox from InputSettings player overlay	2018-05-10 20:38:55 +03:00
Dean Herbert	8a6ef0dabb	Merge branch 'master' into beatmap-conversion-rework	2018-05-10 19:10:07 +08:00
Dean Herbert	9e26bcd571	Merge remote-tracking branch 'upstream/master' into smoogipoo-i-beatmap	2018-05-10 19:51:52 +09:00
Dean Herbert	40c1b24b3d	Move IBeatmap to its own file	2018-05-10 19:51:40 +09:00
Dean Herbert	4b3c2466a4	Merge remote-tracking branch 'upstream/master' into disable-mouse-buttons	2018-05-10 19:16:52 +09:00
smoogipoo	df604c40cc	Keep shortcut padding even when there is no shortut	2018-05-10 18:49:33 +09:00
smoogipoo	c03ab9014f	Improve TestCaseOnScreenDisplay ... Now doesn't rely on framesync.	2018-05-10 18:48:48 +09:00
Dean Herbert	fadb1a5e0b	Add tests and expand functionality to ensure single fire	2018-05-10 17:31:16 +09:00
Dean Herbert	5df9f126d1	Implement a hold-to-confirm screen when exiting game using escape key	2018-05-10 17:07:19 +09:00
smoogipoo	853680ca51	Merge remote-tracking branch 'origin/master' into disable-mouse-buttons	2018-05-10 14:31:52 +09:00
Dean Herbert	2e9c91c32f	Merge branch 'master' into use-bindable-transforms	2018-05-10 11:45:29 +08:00
Dean Herbert	fff34be814	Merge branch 'master' into fix-editor-beatmap-change	2018-05-10 11:37:36 +08:00
Roman Kapustin	ccf82cacb0	Show InputSettings on the PlayerLoader screen	2018-05-09 17:31:52 +03:00
Roman Kapustin	6676c55fe0	Introduce InputSettings	2018-05-09 17:22:37 +03:00
UselessToucan	785cf306ec	Merge branch 'master' into exit_replay_button	2018-05-09 16:31:18 +03:00
Roman Kapustin	95dd2125ee	Load PlayButton.Preview asynchronously	2018-05-09 16:22:52 +03:00
Roman Kapustin	c492f62eda	Use PreviewTrackManager in the PlayButton	2018-05-09 14:52:46 +03:00
Roman Kapustin	ad50f7faf1	Make PreviewTrackManager a Component in order to use DI	2018-05-09 14:51:04 +03:00
Roman Kapustin	7cffabf7f9	Introduce PreviewTrackManager	2018-05-08 22:55:48 +03:00
AlFasGD	e44062b77a	Fix tests and implementation	2018-05-08 16:37:06 +03:00
AlFasGD	dd9b9a18ac	Prevent user from scrolling outside the timeline in the editor	2018-05-08 16:21:54 +03:00
Vidalee	16bcd6c3ed	Appvtests (#1) ... * Resolving AppVeyor's errors	2018-05-08 14:33:26 +02:00
UselessToucan	38d54f2a6c	Merge branch 'master' into back_mouse_button_support	2018-05-08 10:35:11 +03:00
Roman Kapustin	44bbb8700e	Handle mouse back button using OnMouseDown override instead of using GlobalAction	2018-05-08 00:22:11 +03:00
smoogipoo	674e45d49b	Fix beatmap/ruleset being changeable while in the editor	2018-05-07 16:32:15 +09:00
smoogipoo	fbd7ccc03f	Make BeatmapInfoWedge display properly for converts	2018-05-07 15:51:08 +09:00
smoogipoo	5489976c20	Implement ruleset-specific beatmap statistics	2018-05-07 15:51:08 +09:00
smoogipoo	9f1efeb19d	Move keybind to last in enum	2018-05-07 15:41:14 +09:00
smoogipoo	30a3f4f29f	Fix not being able to convert beatmaps with 0 hitobjects	2018-05-07 15:27:45 +09:00
Dean Herbert	1be1b10059	Merge branch 'master' into change_ruleset_via_direct_while_on_scorescreen	2018-05-07 13:32:19 +08:00
smoogipoo	68441f1ef0	Output ruleset instantiation info	2018-05-07 14:28:30 +09:00
smoogipoo	6867886f4c	Give conversion-tested beatmaps a ruleset	2018-05-07 14:04:37 +09:00
smoogipoo	ad2c2a5fe6	Restore star difficulty calculation	2018-05-07 12:25:21 +09:00
smoogipoo	794418432f	Fix incorrect method name	2018-05-07 11:22:25 +09:00
smoogipoo	db3e48c194	Rename GetBeatmap() to GetPlayableBeatmap()	2018-05-07 10:40:30 +09:00
smoogipoo	9128e64c9a	Rename OriginalBeatmap back to Beatmap	2018-05-07 10:29:38 +09:00
smoogipoo	7e83c75888	Add xmldoc	2018-05-07 10:23:32 +09:00
smoogipoo	b68ee39136	Reword beatmap conversion error	2018-05-07 10:18:47 +09:00
smoogipoo	4ecdea8b2e	Remove now-unnecessary IsForCurrentRuleset property of RulesetContainer	2018-05-07 10:17:54 +09:00
smoogipoo	77e661489d	Merge branch 'i-beatmap' into beatmap-conversion-rework	2018-05-07 10:00:24 +09:00
smoogipoo	1aefd71b65	Merge remote-tracking branch 'origin/master' into i-beatmap	2018-05-07 09:58:53 +09:00
smoogipoo	f3aa9269ff	Fix mania-specific beatmap conversion	2018-05-07 09:17:12 +09:00
miterosan	1bbeb6d70e	Make the sinceId readonly	2018-05-06 19:54:41 +02:00
miterosan	ba5861b527	Merge remote-tracking branch 'origin/master' into Private_Messages ... # Conflicts: # osu.Game/Online/API/Requests/GetMessagesRequest.cs # osu.Game/Overlays/Chat/ChatTabControl.cs	2018-05-06 19:45:33 +02:00
Vidalee	c4e45e30ef	Solving conflict	2018-05-06 13:18:12 +02:00
Vidalee	d36d9643eb	Missed one white space.. I guess my editor wasn't properly configured ... for this file	2018-05-06 13:09:46 +02:00
Vidalee	af85102277	Should be ok now	2018-05-06 13:04:20 +02:00
Vidalee	008daf9a07	White space trimmed	2018-05-06 12:57:52 +02:00
Vidalee	095f6e1530	Code sanity	2018-05-06 12:49:15 +02:00
Vidalee	393c01ba90	Made the changes requested	2018-05-06 12:38:25 +02:00
Vidalee	1c1d58e2cb	Merge branch 'master' into osu-hd-setting	2018-05-06 12:23:12 +02:00
Roman Kapustin	b08b24b6da	Introduce OsuScreen.AllowBackButton property	2018-05-04 21:18:48 +03:00
Roman Kapustin	39db1e8cbb	Rename HoldToQuit to QuitButton	2018-05-03 23:50:30 +03:00
Roman Kapustin	f8630115d6	Do not expose HoldToQuit.HoldToQuitButton	2018-05-03 23:29:58 +03:00
Roman Kapustin	33e2b91ccc	Decouple FilterControl.Ruleset from the game-wide ruleset bindable	2018-05-03 22:59:49 +03:00
Santeri Nogelainen	89db7f81cb	Selecting a mod now triggers on mouseup	2018-05-02 17:11:55 +03:00
smoogipoo	482ae2db87	Unify naming	2018-05-02 19:42:03 +09:00
smoogipoo	d4ada3000c	Add keybind to disable mouse buttons	2018-05-02 19:37:47 +09:00
smoogipoo	2d6b2d10f7	Use bindable transforms	2018-05-02 18:26:23 +09:00
Dan Balasescu	9f9447d441	Revert "Merge pull request #2470 from UselessToucan/main_track_muted_preview_overlay_closed" ... This reverts commit 67793845b0.	2018-05-02 16:39:00 +09:00
Dan Balasescu	9f327525a7	Merge branch 'master' into replay_ruleset	2018-05-02 14:57:02 +08:00
Dan Balasescu	0ad049976b	Merge branch 'master' into patch-1	2018-05-02 14:45:30 +08:00
Dan Balasescu	94926e464d	Merge branch 'master' into main_track_muted_preview_overlay_closed	2018-05-02 13:53:39 +08:00
Adonais Romero González	06c6f55995	Apply offset to end times on legacy converter	2018-04-30 00:43:32 -07:00
TocoToucan	804b59ee80	Handle GlobalAction.Back	2018-04-29 20:15:09 +03:00
TocoToucan	42aa02579b	Add 'Back' global key binding	2018-04-29 19:52:33 +03:00
TocoToucan	ca574f2345	Disable RulesetToggleButton whenever the ruleset can't be changed	2018-04-29 18:36:19 +03:00
TocoToucan	8de05450c4	Cleanup UserProfileOverlay during PopOut	2018-04-29 17:53:38 +03:00
TocoToucan	56c1c2beca	Remove redundant multiple previews handling from PaginatedBeatmapContainer	2018-04-29 15:50:02 +03:00
TocoToucan	eda9f83836	Add activeBeatmapPreview variable for tracking beatmap preview playback	2018-04-29 15:32:22 +03:00
UselessToucan	d18a8ec9f5	Merge branch 'master' into exit_replay_button	2018-04-28 20:48:16 +03:00
TocoToucan	c78c5195f3	HoldToQuitButton cleanup	2018-04-28 20:43:41 +03:00
Nobbele	ad8ba37ee3	Updated UserStatus.cs to make more sense(UNTESTED) ... Untested code, on my ipad in school so i can’t compile the code or check for refrences to stuff Modding, playing multiplayer/singleplayer, Busy, etc are all done when user is online so they may just be a class of type UserStatusOnline(used to be UserStatusAvailable but since available and online are basically the same i just made available be online). I don’t know how PM’s are handled but i assume that the client recieves the PM and then decides what to do based on your status. By doing this you can interupt the user with the message if typeof(status) != typeof(UserStatusBusy), making multiplaying, solo game, etc not interupt the user, but when typeof(status) == typeof(UserStatusBusy) show a less intrusive message box to not interupt the user	2018-04-26 12:57:24 +02:00
Dean Herbert	3de3bb31f8	Merge remote-tracking branch 'upstream/master' into aQaTL-mapping-del	2018-04-25 18:10:28 +09:00
Dean Herbert	76e58a51b9	Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting	2018-04-25 17:28:21 +09:00
Dean Herbert	6e6586909b	User pattern matching	2018-04-25 16:32:06 +09:00
Dean Herbert	4f53185d43	Invert logic to match existing toggles	2018-04-25 16:18:55 +09:00
Dean Herbert	c517b73375	Merge branch 'master' into ignore_beatmap_skin	2018-04-25 15:57:39 +09:00
Dean Herbert	0c22e2d998	Merge branch 'master' into switchable-tabs	2018-04-25 15:41:52 +09:00
tgi74000	f41006def7	Set game ruleset to the score ruleset	2018-04-24 21:17:04 +02:00
Shane Woolcock	84bda7d23f	Update framework and ensure the add channel button is not switchable	2018-04-24 20:46:44 +09:30
Dean Herbert	45810e6220	Merge branch 'master' into ignore_beatmap_skin	2018-04-24 17:15:39 +09:00
Dean Herbert	3886e75959	Fix potentially missing group headers in beatmap carousel	2018-04-24 01:52:25 +09:00
Dean Herbert	93b77d9cfe	Remove annotation	2018-04-23 22:22:31 +09:00
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