2978 Commits

Author	SHA1	Message	Date
smoogipoo	55475d129f	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs	2018-06-07 19:19:20 +09:00
Dean Herbert	475fb06559	Use new bind method	2018-06-07 16:46:54 +09:00
Dean Herbert	e6158bc348	Merge remote-tracking branch 'upstream/master' into disallow-beatmap-change	2018-06-07 16:35:07 +09:00
smoogipoo	d1b469c1a3	Better handling of nested playfields' hitobjects	2018-06-07 16:28:21 +09:00
Dan Balasescu	ef287eaa7f	Merge branch 'master' into fix-menu-notifications	2018-06-07 15:35:30 +09:00
Dean Herbert	f3c9049660	Merge branch 'master' into disallow-beatmap-change	2018-06-07 15:34:19 +09:00
smoogipoo	485026da6f	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs	2018-06-07 15:32:31 +09:00
smoogipoo	d516a0a05c	Store platform offset clock in variable for visibility	2018-06-07 13:42:31 +09:00
smoogipoo	3745f9000b	Merge remote-tracking branch 'origin/master' into remove-decoder-offset	2018-06-07 13:37:19 +09:00
Dean Herbert	f491a18d40	Fix notifications not showing at main osu! logo on menu	2018-06-07 01:49:34 +09:00
smoogipoo	18fc63bac2	Add back removed using	2018-06-06 20:32:37 +09:00
Dan Balasescu	c30861186b	Merge branch 'master' into disallow-beatmap-change	2018-06-06 20:26:17 +09:00
smoogipoo	e77084bec4	Give OsuScreen a mutable BindableBeatmap	2018-06-06 20:19:53 +09:00
smoogipoo	ff60f69f47	Explicitly construct local beatmaps rather than using GetBoundCopy	2018-06-06 20:19:30 +09:00
smoogipoo	72cc53aded	Rename GameBeatmap -> BindableBeatmap	2018-06-06 20:16:20 +09:00
smoogipoo	4086ff7313	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs # osu.Game/Screens/Menu/Intro.cs # osu.Game/Screens/Menu/MenuSideFlashes.cs	2018-06-06 18:26:51 +09:00
Dean Herbert	9306fec498	Fix missing null checks	2018-06-06 18:21:03 +09:00
Dean Herbert	55921efffb	Rewrite much state logic	2018-06-06 16:17:51 +09:00
Dean Herbert	d1fd09ed47	Rename variables	2018-06-06 15:49:27 +09:00
Dean Herbert	86be1bef6b	Use UserTriggered in Player	2018-06-06 15:10:15 +09:00
Dean Herbert	6be382aab6	Merge branch 'master' into overlay-activation	2018-06-06 10:07:22 +09:00
Dean Herbert	d2633a706d	Merge branch 'master' into score-component-tooltips	2018-06-06 09:06:22 +09:00
Dean Herbert	00c8d2ff11	Merge branch 'master' into source-link-colour	2018-06-06 08:27:28 +09:00
Dan Balasescu	b2cc7b9a5c	Merge branch 'master' into fix-beatmap-info-wedge-async	2018-06-04 20:29:29 +09:00
Dan Balasescu	566470e852	Merge branch 'master' into better-loading-logo	2018-06-04 20:06:22 +09:00
Dan Balasescu	f9b6de67b8	Merge branch 'master' into hide-flash-gap	2018-06-04 19:29:10 +09:00
Thomas Müller	88b23d4e66	Merge branch 'master' into netcoreapp2.1	2018-06-04 05:30:25 +02:00
Dean Herbert	7701cac297	Merge branch 'master' into overlay-activation	2018-06-04 11:37:14 +09:00
Dean Herbert	4b604bf055	Merge branch 'master' into disallow-beatmap-change	2018-06-04 10:53:04 +09:00
DrabWeb	a7bab14b30	Add tooltip to ScoreComponentLabel.	2018-06-03 22:26:30 -03:00
DrabWeb	db4c26e1ab	Rewrite ScoreComponentLabel.	2018-06-03 22:22:44 -03:00
Joehu	bd7c9cd8bf	Set 'Colour' when creating 'textFlow'	2018-06-03 17:41:34 -07:00
Dean Herbert	7ca437aa8e	Merge branch 'master' into fix-expand-button-colour	2018-06-04 02:16:27 +09:00
Joehu	5c713ac2ab	Use default colour in MetadataSection	2018-06-03 07:51:57 -07:00
Dean Herbert	3795a55808	Fix menu flashes not extending to the edge of screen during parallax	2018-06-03 22:26:47 +09:00
Aergwyn	2afe0feb24	remove white space ... I think	2018-06-03 12:02:43 +02:00
Aergwyn	f0095193b3	Merge branch 'master' into overlay-activation	2018-06-03 11:52:33 +02:00
Aergwyn	707af02097	apply feedback ... -don't directly set AllowOverlay Bindable this should be done specifically where needed -remove AllowOverlay Bindable from ButtonSystem -remove unnecessary xmldoc	2018-06-03 11:31:04 +02:00
Joehu	0f13acf67e	Use updateExpanded method	2018-06-02 12:52:31 -07:00
Joehu	dc2a004c87	Remove link colours for all unlinked text	2018-06-02 12:04:58 -07:00
Dean Herbert	652e2ccaf5	Merge branch 'master' into netcoreapp2.1	2018-06-03 03:55:33 +09:00
Dean Herbert	64eda27547	Update framework	2018-06-03 03:05:53 +09:00
Dean Herbert	eb135b2e85	Merge branch 'master' into participant-count-default	2018-06-03 03:05:17 +09:00
FreezyLemon	a0c643fae5	Fix SongProgressInfo timespan formatting	2018-06-02 11:25:49 +02:00
Joehu	8d3de3affb	Use '?:' expression instead	2018-06-01 15:58:05 -07:00
Joehu	5d1421c0e9	Fix visual settings expand button colour	2018-06-01 15:31:25 -07:00
DrabWeb	da8b1f996f	Override Type in Match.	2018-06-01 17:16:35 -03:00
DrabWeb	5073057420	Cleanup.	2018-06-01 16:34:03 -03:00
DrabWeb	97b473ef30	Expose tabs and hide beatmap select button in Header.	2018-06-01 16:23:11 -03:00
DrabWeb	cc32adf51f	Move max text updating into updateMax.	2018-06-01 14:28:24 -03:00
Dean Herbert	5c2a2e394e	Fix incorrect async logic in BeatmapInfoWedge ... Closes #2653. Alternative to #2657.	2018-06-01 20:31:29 +09:00
DrabWeb	59762c0393	Change Room.Participants to an IEnumerable.	2018-06-01 06:15:23 -03:00
DrabWeb	8dd36ee1a9	Default Max to null in ParticipantCount.	2018-06-01 06:08:57 -03:00
DrabWeb	9989517ff0	Merge https://github.com/ppy/osu into multiplayer-match	2018-06-01 04:01:14 -03:00
Dean Herbert	b9c601074d	Formatting fixes	2018-06-01 15:45:09 +09:00
Dean Herbert	c5a3eff182	Merge branch 'master' into multiplayer-logic-encapsulation	2018-06-01 15:31:19 +09:00
Joehu	b4d621a2cb	Add link colour to beatmap source	2018-05-31 10:21:22 -07:00
Dean Herbert	b68a5f5eab	Tidy up Loader logic	2018-05-31 20:07:44 +09:00
Dean Herbert	42bc6b6b2e	Merge branch 'master' into updateable-beatmap-set-cover	2018-05-31 17:33:31 +09:00
Dean Herbert	dfbcf4d7b7	Add tests	2018-05-31 17:29:59 +09:00
Dean Herbert	7487c82ec1	Stop the logo from beating	2018-05-31 17:14:47 +09:00
Dean Herbert	c161d82474	Reduce the length of the fadeout animation	2018-05-31 17:14:04 +09:00
Dean Herbert	9df173b339	Merge branch 'master' into better-loading-logo	2018-05-31 15:59:04 +09:00
Dan Balasescu	29f3011f75	Merge branch 'master' into fix-osu-logo-discrepancies	2018-05-31 15:21:44 +09:00
smoogipoo	e48b17fb0d	Unindent	2018-05-31 15:17:59 +09:00
smoogipoo	4ff803d11d	Merge remote-tracking branch 'origin/master' into fix-osu-logo-discrepancies	2018-05-31 14:47:47 +09:00
Dan Balasescu	76567ae98b	Merge branch 'master' into song-selet-enumerable	2018-05-31 14:42:58 +09:00
Dan Balasescu	cd3ca68f03	Merge branch 'master' into song-selet-enumerable	2018-05-31 14:38:04 +09:00
Dan Balasescu	35d8ec8df6	Merge branch 'master' into fix-player-life-management	2018-05-31 14:34:31 +09:00
DrabWeb	ff93a54a64	Default Type to Title, use ToLower for the screen type title.	2018-05-30 23:16:54 -03:00
Dean Herbert	74c52e0a7c	Merge branch 'master' into multiplayer-screen-type	2018-05-31 00:16:43 +09:00
Dean Herbert	9ea6ab28ea	Fix intro potentially starting out-of-sync due to logo's outward animation	2018-05-30 20:22:31 +09:00
Dean Herbert	9497db0b0b	Add a delay before the loading logo is displayed	2018-05-30 20:22:26 +09:00
Dean Herbert	0caf15166e	Remove unnecessary FinishTransforms	2018-05-30 20:05:31 +09:00
Dean Herbert	0dafcf00b7	Fix some discrepancies with the main menu logo transitions	2018-05-30 19:50:00 +09:00
Dean Herbert	6d6b186fb2	Fix delayed logo animations playing even if screen has already been exited	2018-05-30 19:25:39 +09:00
Dean Herbert	a28e71995d	Offload database query to task ... Allows song select to load a touch faster, in theory.	2018-05-30 16:15:57 +09:00
Dean Herbert	5872b61988	Fix potential double-disposal of player if PlayerLoader is finalised	2018-05-30 15:48:26 +09:00
Dean Herbert	54e53f7190	Fix player getting loaded when exiting song select	2018-05-30 15:48:20 +09:00
Dean Herbert	6000a90721	Merge branch 'master' into overlay-activation	2018-05-30 13:59:20 +09:00
DrabWeb	7b8211e6db	Add MultiplayerScreen.Type	2018-05-29 04:23:29 -03:00
DrabWeb	9a7e5a3e2c	Update TestCaseMatch.	2018-05-29 04:16:19 -03:00
DrabWeb	7edb82eb85	Add TestCaseMatchParticipants.	2018-05-29 03:53:30 -03:00
DrabWeb	b4b4a8a157	Add TestCaseMatchInfo.	2018-05-29 03:24:38 -03:00
DrabWeb	94b54a0520	Adjust design of ReadyButton.	2018-05-29 03:03:51 -03:00
DrabWeb	3915cb7f2f	Add Match Participants, change Room.Users to IEnumerable.	2018-05-29 02:42:52 -03:00
DrabWeb	77ff0640c2	Add a gradient over the cover in Header.	2018-05-29 01:53:45 -03:00
DrabWeb	c8ce34b6d4	Add Match Info.	2018-05-29 01:51:04 -03:00
DrabWeb	98819880c4	Add match screen header.	2018-05-29 01:16:39 -03:00
DrabWeb	ab3ac49a2d	Add empty Match screen.	2018-05-29 01:16:39 -03:00
DrabWeb	d090323c00	Add ParticipantCount to share with the Match screen.	2018-05-29 00:51:56 -03:00
DrabWeb	852d7ef48d	Use ?: expression instead of if/else.	2018-05-29 00:07:33 -03:00
DrabWeb	7beac3a712	Cleanup DrawableRoom.	2018-05-28 23:56:00 -03:00
DrabWeb	dcc39d96e2	BeatmapModeInfo -> BeatmapTypeInfo.	2018-05-28 23:45:59 -03:00
DrabWeb	bd9af745dd	Cleanup. ... (cherry picked from commit fffa6a004cf074caf0cf5c8ae1408a80500859fa)	2018-05-28 23:41:50 -03:00
DrabWeb	8b8d10349e	Move RoomInspector info panel content to BeatmapModeInfo to share with Match. ... (cherry picked from commit 257d9d13ac81d85583314f8b5dfabf05661b1572)	2018-05-28 23:41:42 -03:00
DrabWeb	8b36e1dad0	Add BeatmapTitle to encapsulate multiplayer beatmap title display logic. ... (cherry picked from commit 58e65afb45fbc675186e470cc4a268d9eaa2a539)	2018-05-28 23:41:07 -03:00
DrabWeb	bdfb5752cd	Update existing drawables to use UpdateableBeatmapSetCover.	2018-05-28 19:31:20 -03:00
Aergwyn	2b3a630270	add OverlayActivation enum ... + fix Toolbar being toggleable when it shouldn't be able to + allow opening overlays in MenuState.Initial again	2018-05-28 13:43:47 +02:00
smoogipoo	5be46307fd	Fix results screen parallax being cut off ... Alternative to / closes #2549. Didn't want to reference the toolbar as was done, also wanted to remove the awkward scaling factors so rather than scaling down the inner one, we scale up the outer one.	2018-05-28 19:43:59 +09:00
smoogipoo	a3470f9ec3	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game/Overlays/Music/PlaylistOverlay.cs # osu.Game/Screens/OsuScreen.cs	2018-05-28 18:01:15 +09:00
Dean Herbert	ed7c860802	Adjust transitions of DrawableRoom	2018-05-28 13:30:29 +09:00
Dean Herbert	02c37ebc1f	Move screen titles to OsuScreen	2018-05-28 13:30:24 +09:00
Dean Herbert	0ca6d73f0e	Add a delay before the osu! logo appears when exiting multiplayer	2018-05-28 13:30:17 +09:00
Dean Herbert	3c3412791c	Merge remote-tracking branch 'upstream/release' into multiplayer-lounge	2018-05-28 13:30:04 +09:00
smoogipoo	3abfd4711d	Fix wrong clock being seeked when unpausing	2018-05-28 03:42:53 +09:00
smoogipoo	8ae2a3696f	Apply platform universal offset at player level	2018-05-28 03:31:46 +09:00
Dean Herbert	95315e46f0	Make drawable rooms fade in when first displayed ... Stops filtered rooms from briefly displaying.	2018-05-27 14:12:20 +09:00
Dean Herbert	12b5ca1b0d	Merge branch 'master' into multiplayer-lounge	2018-05-27 11:15:03 +09:00
Dean Herbert	975ce82177	Ensure autoplay tests actually increase score above zero	2018-05-26 14:46:05 +09:00
Dean Herbert	699f661b02	Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix	2018-05-25 19:07:30 +09:00
Dean Herbert	28aa6faef9	Merge branch 'master' into player_loader_input_toggles	2018-05-25 18:38:12 +09:00
Dean Herbert	7961c56239	Merge remote-tracking branch 'FreezyLemon/master' into smoogipoo-disallow-beatmap-change	2018-05-25 10:55:01 +09: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
Aergwyn	0c0f86fe26	fix incorrect default values keeping overlays in wrong state	2018-05-23 16:25:10 +02:00
smoogipoo	a5d2d74447	Remove whitespace	2018-05-23 19:01:27 +09:00
smoogipoo	8004b8af4d	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +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
Aergwyn	76fbc656a1	fix disclaimer allowing notifications	2018-05-22 17:53:36 +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
AlFasGD	2769f6c47b	Fix issues	2018-05-22 09:09:25 +03: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
AlFasGD	d504a44dfb	Implement mask layering (incomplete)	2018-05-21 23:08:04 +03: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
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
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	aaca7e92b4	Avoid excessive property lookups	2018-05-21 03:56:59 +09: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
smoogipoo	82607b3eb3	Expose properties to control zoom	2018-05-18 17:53:09 +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
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
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
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
DrabWeb	1a78ac3d10	Add Multiplayer screen.	2018-05-15 21:14:10 -03:00
DrabWeb	1450bf64f5	Add multiplayer screen header.	2018-05-15 20:34:14 -03: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	28edf3bce7	Merge branch 'master' into hud-above-letterbox	2018-05-14 19:31:39 +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	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
Dan Balasescu	d7cba000ab	Merge branch 'master' into fix-wedge-nullref	2018-05-14 13:36:07 +09:00
Dean Herbert	db0470243a	Fix nullref when changing ruleset at main menu	2018-05-13 12:55:54 +09:00
AlFasGD	2a90686da6	Simplify expression	2018-05-12 15:09:53 +03: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	cfa18bdf1f	Fix song progress time counters wrapping after an hour ... Resolves #2466. Supersedes and closes #2487.	2018-05-11 22:10:26 +09:00
Dean Herbert	c19432dc6d	Merge branch 'master' into ruleset-beatmap-statistics	2018-05-11 17:37:50 +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	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	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
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	5df9f126d1	Implement a hold-to-confirm screen when exiting game using escape key	2018-05-10 17:07:19 +09: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
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
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	9128e64c9a	Rename OriginalBeatmap back to Beatmap	2018-05-07 10:29:38 +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
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
TocoToucan	804b59ee80	Handle GlobalAction.Back	2018-04-29 20:15:09 +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
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	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
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	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	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
smoogipoo	0dce7a5b61	Update framework + fix CI errors	2018-04-20 18:19:17 +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	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
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	b5a55a0dce	Make an interface for beatmaps	2018-04-19 18:58:40 +09: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
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
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
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
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
Endrik Tombak	d9f587edff	Merge remote-tracking branch 'upstream/master' into alt-eagerselect	2018-04-13 11:55:35 +03:00
Joehu	128446e51d	Remove composer from player loader	2018-04-12 16:46:46 -07: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
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
Dean Herbert	c33cb9c02e	Merge branch 'master' into show-beatmap-id	2018-04-10 16:05:32 +09:00
Dean Herbert	cd48cb1887	Add comment	2018-04-06 19:53:23 +09:00
smoogipoo	e59124962c	Remove re-instantiation of clock in EditorClockTestCase	2018-04-06 18:38:44 +09:00
Endrik	c7440201fb	Merge branch 'master' into alt-eagerselect	2018-04-06 12:37:16 +03:00
smoogipoo	9e8490735f	Fix Compose not binding to the editor's beat divisor	2018-04-06 18:22:24 +09:00
smoogipoo	c7abd56fc4	Give editor a custom clock to handle seeking	2018-04-06 18:11:37 +09:00
smoogipoo	f07928446d	Remove instances of "waveform"	2018-04-06 15:52:39 +09:00
smoogipoo	9b060b1bdf	Fix delay in value retrieval causing offsetting when zooming	2018-04-06 15:51:40 +09:00
Dean Herbert	5426432e46	Fix drag select crashing	2018-04-06 11:47:21 +09:00
Dean Herbert	32e8d93596	Fix selection changing when clicking overlapping hitobjects	2018-04-06 11:22:36 +09:00
Dean Herbert	24b9a8c983	Allow HitObjectMasks to handle drag events directly	2018-04-06 10:29:34 +09:00
Dean Herbert	5749e71560	Apply review fixes	2018-04-05 21:06:48 +09:00
Dean Herbert	345cfb077d	No need to sort list any more	2018-04-05 21:03:39 +09:00
smoogipoo	d9e795fb9f	TimelineContainer -> TimelineArea	2018-04-05 19:40:03 +09:00
smoogipoo	a84536d343	ScrollingTimelineContainer -> Timeline	2018-04-05 19:33:47 +09:00
smoogipoo	f41d31e1db	ScrollableTimeline -> TimelineContainer	2018-04-05 19:33:25 +09:00