3651 Commits

Author	SHA1	Message	Date
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
smoogipoo	9a9ed1d630	Encapsulate zoom logic into a separate class	2018-04-05 19:30:54 +09:00
smoogipoo	0141cbebba	waveformContainer -> zoomedContent	2018-04-05 19:08:10 +09:00
smoogipoo	8da3c2c52a	Expose zoom publicly again, re-enable zoom buttons	2018-04-05 19:05:19 +09:00
smoogipoo	35e116cb12	Reduce ctor arguments	2018-04-05 19:04:07 +09:00
smoogipoo	eff5eddbe9	Make zoom an int again	2018-04-05 18:41:22 +09:00
smoogipoo	074dee3a83	Re-implement mousewheel zoom	2018-04-05 18:37:51 +09:00
smoogipoo	e3af32ad2f	A bit of cleanup	2018-04-05 17:07:41 +09:00
smoogipoo	9bb3e56bb3	Implement half-width overflows	2018-04-05 17:07:00 +09:00
smoogipoo	e7aa1d9c38	Temporarily remove zoom levels, simplify scrollingtimelinecontainer	2018-04-05 16:12:21 +09:00
smoogipoo	870ce8868c	Make scrollabletimeline use gridcontainer	2018-04-05 16:07:33 +09:00
naoey	7482d5986a	Add a loading state to BeatmapSetOverlay. ... - Handle null value in header and info sections - Add item to context menu for carousel beatmaps to show details	2018-04-04 21:46:31 +05:30
Dean Herbert	216c4629e0	Fix dragging backwards not deselecting pending selection	2018-04-04 20:44:22 +09:00
Dean Herbert	b7325d73e8	Don't inherit VisbilityContainer	2018-04-04 20:44:11 +09:00
Dean Herbert	94c3f38541	Pass down input state instead of parent lookup	2018-04-04 20:06:45 +09:00
Dean Herbert	2b15555ede	Remove MaskContainer dependency in MaskSelection	2018-04-04 20:05:01 +09:00
Dean Herbert	5c036b966b	Formatting fixes	2018-04-04 20:04:54 +09:00
Dean Herbert	31a7db0a35	Fix drag mishaps	2018-04-04 19:42:59 +09:00
Dean Herbert	bce114a37b	Make AliveMasks private	2018-04-04 18:55:17 +09:00
Dean Herbert	4d71f2084c	Move individual mask selection logic out of MaskSelection	2018-04-04 18:29:53 +09:00
Dean Herbert	b6b8c51657	Remove DragLayer dependency on MaskContainer	2018-04-04 18:20:32 +09:00
Dean Herbert	c2d371797e	Fix unbind failure	2018-04-04 17:38:34 +09:00
Dean Herbert	c712b29b5b	Rename dragBox to dragLayer	2018-04-04 16:24:27 +09:00
Dean Herbert	4196bb8c24	Move selection logic to MaskContainer	2018-04-04 16:24:13 +09:00
Dean Herbert	d453c2589a	Add an explanatory comment for weird override	2018-04-04 16:02:20 +09:00
Dean Herbert	788bfde002	Merge branch 'master' into selectionlayer-rewrite	2018-04-04 15:38:27 +09:00
smoogipoo	4f19059e55	DragBox -> DragLayer	2018-04-03 21:29:49 +09:00
Dean Herbert	ddba7254ca	Merge remote-tracking branch 'upstream/master' into linq	2018-04-03 13:05:08 +09:00
Dean Herbert	57b4cdaf85	Merge branch 'master' into selectionlayer-rewrite	2018-04-03 03:05:42 +09:00
smoogipoo	69e2d4fd22	Make CarouselRoot a nested class	2018-04-02 15:24:08 +09:00
Dan Balasescu	6f88a80bde	Merge branch 'master' into alt-eagerselect	2018-04-02 15:18:22 +09:00
smoogipoo	82a847b820	Extract random selection logic into CarouselRoot	2018-04-02 15:16:10 +09:00
Dan Balasescu	32832304a7	Merge branch 'master' into fix-songselect-exit-notimplemented	2018-04-02 13:53:41 +09:00
Huo Yaoyuan	b842f682eb	Use Linq.Append and Prepend.	2018-04-02 12:06:34 +08:00
Endrik Tombak	7e30375443	Use selectNextRandom instead	2018-03-30 10:46:46 +03:00
smoogipoo	f1f7d978ec	Add some comments	2018-03-30 16:28:59 +09:00
smoogipoo	69a7ddbf1e	Fix ordering of display/input of HitObjectMasks	2018-03-30 16:28:49 +09:00
smoogipoo	53541a5c8d	Add license header	2018-03-30 15:53:31 +09:00
smoogipoo	5d0a636cc4	Rename SelectionBox -> Selection	2018-03-30 15:51:38 +09:00
smoogipoo	1dca1663c3	Handle all selection events within SelectionBox (incl. single-mask)	2018-03-30 15:50:55 +09:00
smoogipoo	082e5e4949	Reduce iterations of DragBox	2018-03-30 15:06:52 +09:00
Dean Herbert	31ade986a7	Scren async changes in line with framework changes ... Makes editor not stutter on load, amongst other screens.	2018-03-30 14:58:11 +09:00
Endrik Tombak	3f65e3a7e3	Make selection at random when last was null	2018-03-30 00:15:32 +03:00
smoogipoo	6b2ca36657	Add license header	2018-03-29 22:52:42 +09:00
smoogipoo	d9c5a0c6d1	Fix position editing not working	2018-03-29 22:38:44 +09:00
smoogipoo	4446aeaa0d	Commenting + cleanup of HitObjectMask/HitObjectMaskLayer	2018-03-29 22:38:28 +09:00
smoogipoo	d8f26f2260	Make HitObjectMaskLayer not iterate through all masks when deselecting	2018-03-29 22:22:42 +09:00
smoogipoo	1018711cc9	Cleanup SelectionBox	2018-03-29 22:20:56 +09:00
smoogipoo	346de77776	Cleanup DragBox	2018-03-29 22:13:28 +09:00
smoogipoo	04874bcda4	"overlay" -> "mask"	2018-03-29 22:09:22 +09:00
smoogipoo	6d4f94756e	Rewrite the way drag + click selections happen ... The general idea here is that we need the masks to handle mouse down events, as they need to handle the drag (mousedown -> drag immediately). I've rewritten the editor selections to use events, as there are some 3 different components that handle/trigger selections in different ways. 1. All selections/deselections now propagate through `HitObjectMask.Select()`/`HitObjectMask.Deselect()`. 2. Components that react to changes in the selection bind to the masks' `Selected`/`Deselected` events, and track them/change their states locally. 3. Masks provide a `SingleSelectionRequested` event which is invoked on the mouse-down event. Various components bind to this event to perform state changes locally in this scenario. 4. `DragBox` now handles all drag input locally. It triggers `Select`/`Deselect` on the masks it needs to. 5. `SelectionBox` handles the display of itself locally. 6. `SelectionBox` handles movement of groups of masks locally. 7. `HitObjectMasks` handles movement of itself locally.	2018-03-29 22:07:23 +09:00
smoogipoo	6314694557	Make HitObjectMaskLayer always create masks for all objects	2018-03-29 17:13:45 +09:00
FreezyLemon	46d859a660	exit player earlier if a dummy map is loaded	2018-03-25 13:25:48 +02:00
smoogipoo	097ab66182	Fix resharper error	2018-03-25 01:54:25 +09:00
Dean Herbert	0e669c9a3f	Fix many warnings	2018-03-24 18:23:22 +09:00
smoogipoo	ffa712dccb	Fix post-merge issues	2018-03-24 15:19:45 +09:00
smoogipoo	c29f7a4333	Merge remote-tracking branch 'origin/master' into netstandard	2018-03-24 14:49:46 +09:00
Dean Herbert	e47aa0edc0	Merge branch 'master' into fix-background-fade	2018-03-24 03:40:13 +09:00
Dan Balasescu	9ab3610b95	Merge branch 'master' into fix-player-disposal	2018-03-23 20:45:42 +09:00
smoogipoo	afdab7895a	Fix beatmap background fade not being updated on retry ... Fixes #2287	2018-03-23 20:41:38 +09:00
Dean Herbert	b56eee1927	Fix background loaded player never being disposed if early exit occurs	2018-03-23 15:04:40 +09:00
Dean Herbert	d4aeb3d00b	Fix BeatmapCarousel's flush not correctly applying selection changes ... They may have been delayed until the next Update, which is too late in this case.	2018-03-23 12:10:13 +09:00
FreezyLemon	a3d8048aca	abort loading and exit player for dummy maps	2018-03-22 21:46:35 +01:00
Dean Herbert	92d8781bf0	Merge branch 'master' into beat-snap-divisor	2018-03-22 20:14:50 +09:00
smoogipoo	2b7d22c4ea	Very slightly reduce size of slider bar to increase bottom padding	2018-03-22 20:11:55 +09:00
smoogipoo	090c78bf10	Merge remote-tracking branch 'origin/master' into fix-player-loader	2018-03-22 20:00:21 +09:00
Dan Balasescu	ab9505652b	Merge branch 'master' into skin--completion	2018-03-22 16:44:00 +09:00
Dean Herbert	dade52d15d	Fix vertical padding	2018-03-22 16:15:14 +09:00
Dean Herbert	a4804f47a9	Merge branch 'master' into beat-snap-divisor	2018-03-22 16:06:26 +09:00
Dean Herbert	5f1bb8d753	Merge branch 'master' into fix-player-loader	2018-03-22 15:46:37 +09:00
Dan Balasescu	13a3c728dc	Merge branch 'master' into fix-dummy-ruleset	2018-03-22 15:29:43 +09:00
smoogipoo	3f3f57e51e	Use cached vertexbatch add delegate	2018-03-22 15:13:38 +09:00
Dean Herbert	917334a39a	Move cancel code to exit paths for screen	2018-03-22 13:01:40 +09:00
Dean Herbert	e0b74a357a	Fix osu! logo making hover beat sounds when not visible	2018-03-22 03:31:14 +09:00
Dean Herbert	8f71d53c17	Fix retry not allowing continuing beyond PlayerLoader ... Resolves #2265.	2018-03-22 02:10:31 +09:00
Dean Herbert	62229300c4	Fix DummyRuleset getting selected ... Resolves #2261.	2018-03-22 00:26:48 +09:00
Dean Herbert	271c082606	Adjust colour assignment	2018-03-21 16:25:32 +09:00
Dean Herbert	48142602ea	Adjust text size to match design	2018-03-21 16:04:43 +09:00
Dean Herbert	63f0419d6a	Apply minor fixes	2018-03-21 15:40:43 +09:00
Dean Herbert	8ac660b0c6	Fixes for keyboard handling and general code quality	2018-03-20 22:25:15 +09:00
Dean Herbert	aa8b0d017c	Adjust colours and spacing	2018-03-20 21:59:56 +09:00
Dean Herbert	dac1ba21db	Make keyboard control work	2018-03-20 21:38:22 +09:00
Dean Herbert	045610dbfe	Adjust styling and colours	2018-03-20 21:31:17 +09:00
Dean Herbert	c2eb32c0e9	DrawableBeatDivisor -> BeatDivisorControl	2018-03-20 20:10:27 +09:00
Dean Herbert	6fd650777c	Move value change logic to bindable ... Also add drag support	2018-03-20 20:09:55 +09:00
Dean Herbert	9ad4e9284a	Add skin source fallback chain	2018-03-20 16:40:11 +09:00
smoogipoo	50192b21e3	Give DrawableBeatDivisor a ctor	2018-03-20 13:57:25 +09:00
smoogipoo	b1d09500f2	Integrate beat snap divisor into editor seeking	2018-03-19 20:42:06 +09:00
smoogipoo	c5eab7a227	Actually rename to DrawableBeatDivisor...	2018-03-19 20:34:24 +09:00
smoogipoo	5ecbc5612c	Integrate with dependency injection	2018-03-19 20:33:58 +09:00
smoogipoo	4c0ccffe08	Merge remote-tracking branch 'origin/master' into beat-snap-divisor	2018-03-19 20:23:15 +09:00
smoogipoo	df0b8a24c5	Rename + renamespace	2018-03-19 20:21:19 +09:00
smoogipoo	879dbc75b5	Nest TickContainer in BeatSnapVisualiser	2018-03-19 20:20:29 +09:00
smoogipoo	b25c564ecb	Integrate into editor's compose screen	2018-03-19 20:14:58 +09:00
smoogipoo	32fecc6ff4	Adjust icon scale + text	2018-03-19 20:14:34 +09:00
smoogipoo	e96dad441d	Offset the icon buttons a little bit to look a bit more centered ... Maybe it's just me, but this is really triggering me.	2018-03-19 20:14:13 +09:00
smoogipoo	c86ddb7ee3	Add slight easing to marker movements	2018-03-19 19:57:02 +09:00
smoogipoo	fbc92bfa01	Add previous/next divisor button actions	2018-03-19 19:55:49 +09:00
smoogipoo	070db63157	Privatise tick to TickContainer	2018-03-19 19:52:22 +09:00
smoogipoo	7182442b21	Add divisor text	2018-03-19 19:49:57 +09:00
smoogipoo	6b035e8c53	Add basic structure/layout for the beat snap visualiser	2018-03-19 19:46:26 +09:00
Dean Herbert	4b812279bb	Merge branch 'master' into fix-editor-clocks	2018-03-19 19:06:38 +09:00
smoogipoo	8d4c9eda48	Fix attempting to add selection boxes with no selection ... E.g. because DrawableSpinner doesn't (currently) create an overlay, SelectionBox was being constructed with 0 hitobjects and then calculating a non-finite size for itself.	2018-03-19 18:00:11 +09:00
smoogipoo	e25d1f6982	Pass down editor clocks through DI	2018-03-19 16:27:52 +09:00
Dean Herbert	4b83278cf4	Merge branch 'master' into fix-editor-clocks	2018-03-16 23:32:54 +09:00
Dean Herbert	4411758ff7	Merge branch 'master' into fix-autoplay-button-deselect	2018-03-16 17:31:14 +09:00
smoogipoo	b27b6c7eb7	Merge branch 'master' into cursor-trail	2018-03-16 14:43:27 +09:00
smoogipoo	d05947ef48	Pass adjustable clocks to components, rather than relying on the track	2018-03-15 18:19:28 +09:00
smoogipoo	c8f6a6980b	Move clock construction to Editor	2018-03-15 17:27:37 +09:00
smoogipoo	5e742eb466	Move editor constructions to BDL load	2018-03-15 17:10:08 +09:00
Dean Herbert	cdf435aedd	Merge branch 'master' into DoNotMoveToPlayerWhileDragging	2018-03-15 11:14:30 +09:00
Dean Herbert	8d433cb4bf	Merge branch 'master' into cursor-trail	2018-03-15 11:14:21 +09:00
Dean Herbert	551b67ac16	Merge branch 'master' into fix-autoplay-button-deselect	2018-03-14 21:46:19 +09:00
Dean Herbert	a0691168cb	Merge remote-tracking branch 'upstream/master' into editor-hitobject-movement	2018-03-14 15:35:24 +09:00
Dean Herbert	81f82d98a1	Rework a lot of naming and structure	2018-03-14 15:18:21 +09:00
Dean Herbert	ea649f9650	Avoid scheduling during non-current screen	2018-03-14 12:09:19 +09:00
Dean Herbert	ef8d595914	Apply formatting changes	2018-03-14 11:44:19 +09:00
Dean Herbert	c3a3d76b88	Merge remote-tracking branch 'upstream/master' into DoNotMoveToPlayerWhileDragging	2018-03-14 11:43:33 +09:00
Dean Herbert	13f64a1d12	Merge branch 'master' into cursor-trail	2018-03-14 11:42:40 +09:00
FreezyLemon	95c84ea7fe	remove (now) unnecessary line	2018-03-12 23:00:06 +01:00
FreezyLemon	ddc1f03a96	deselect autoplay button after ctrl-enter play ... before, the mod was removed, but the button was still active	2018-03-12 22:35:45 +01:00
smoogipoo	33c721bcbb	Fix post-merge errors	2018-03-12 09:51:32 +09:00
smoogipoo	6e51b74890	Merge remote-tracking branch 'origin/master' into rewrite-break-overlay	2018-03-12 09:47:05 +09:00
Dean Herbert	487a03d0d7	Merge branch 'master' into cursor-trail	2018-03-11 02:07:05 +09:00
Dean Herbert	db2a663234	Use private instead of protected	2018-03-11 01:26:03 +09:00
naoey	56730247e3	Merge branch 'fix-unplayable-beatmaps' of github.com:naoey/osu into fix-unplayable-beatmaps	2018-03-09 19:40:00 +05:30
naoey	2c0488b1f1	Invert bool, add test, and handle ruleset change.	2018-03-09 19:39:28 +05:30
Dean Herbert	9ad9fc5aa9	Merge branch 'master' into fix-unplayable-beatmaps	2018-03-09 21:39:48 +09:00
naoey	d04f47718f	Make song select choose random when initial selection fails. ... - Revert TestCasePlaySongSelect to master	2018-03-09 17:36:55 +05:30
naoey	25fb527cc7	Remove previous fix and move filtered logic to carousel. ... - Add an optional bool parameter to SelectBeatmap to skip selecting filtered maps	2018-03-09 15:51:00 +05:30
Dean Herbert	6d91889ca6	Move player-specific configuration bindables back to player	2018-03-08 22:16:47 +09:00
Dean Herbert	94ed4ab01b	Add debouncing to player loading ... Allows the mouse to temporarily exit and re-enter overlay elements without triggering a load	2018-03-08 20:28:55 +09:00
Dean Herbert	d3e91024a7	Block player enter when a drag initiates from an overlaying container	2018-03-08 18:16:23 +09:00
TocoToucan	2cb197d0c4	Replace ConfigureBackgroundUpdate with OnEntering	2018-03-08 11:35:00 +03:00
Dean Herbert	8f3f886805	Merge branch 'master' into PlayerBase	2018-03-08 16:12:12 +09:00
Dean Herbert	81c1ec2005	Merge branch 'master' into fix-unplayable-beatmaps	2018-03-08 13:02:57 +09:00
Dean Herbert	91c984ed97	Merge branch 'master' into rewrite-break-overlay	2018-03-08 09:31:59 +09:00
Dean Herbert	81b778fdcf	Merge branch 'master' into cursor-trail	2018-03-08 09:31:42 +09:00
pdrapoport	3731cbe5eb	Removing "mouse wheel disabled" checkbox from visual settings gameplay menu	2018-03-07 14:20:59 +01:00
Dean Herbert	6a768e378a	Merge branch 'master' into rewrite-break-overlay	2018-03-07 17:00:34 +09:00
smoogipoo	78d73d4c11	Additional fixes for flow ordering after framework changes	2018-03-06 17:20:58 +09:00
smoogipoo	148551afa2	osu!-side changes in-line with framework layout changes	2018-03-06 14:12:37 +09:00
TocoToucan	697ad63d72	Resolve merge conflicts	2018-03-05 22:24:25 +03:00
Dean Herbert	4aafc2228e	Improve skip button behaviour when mouse buttons are down	2018-03-06 00:53:40 +09:00
Dean Herbert	d115c56742	Avoid using input blocking	2018-03-06 00:27:55 +09:00
Dean Herbert	792a3ac469	SkipButton -> SkipOverlay	2018-03-06 00:10:53 +09:00
Dean Herbert	53edfedfc8	Remove unneeded HighFrequencyMousePosition from GameplayMenuOverlay	2018-03-05 19:43:57 +09:00
Dean Herbert	7d11e55d06	Only block mouse input when the shaded portion of the SkipButton is hovered	2018-03-05 19:43:33 +09:00
Dean Herbert	c6c55c40ed	Rewrite BreakOverlay ... No longer relies on Schedule calls (could not be rewound). Also no longer sucks.	2018-03-04 00:51:24 +09:00
naoey	a57dc154f9	More specific tests.	2018-03-03 20:34:29 +05:30
naoey	307147a8a3	Merge remote-tracking branch 'upstream/master' into fix-unplayable-beatmaps	2018-03-03 16:10:22 +05:30
naoey	fb724ca8a7	Make song select ensure current beatmap is always playable in the active ruleset. ... - Add a to TestCasePlaySongSelect testing this scenario	2018-03-03 16:09:24 +05:30
Dean Herbert	bd510e5356	Merge remote-tracking branch 'upstream/master' into clock-fixes	2018-03-02 21:01:53 +09:00
Dean Herbert	6dc9411a90	Don't use BufferedContainer for OsuLogo ... Minor performance improvement. Not sure why this was done but it's not required any more.	2018-03-01 16:01:42 +09:00
Dean Herbert	bda673e6fe	Merge branch 'master' into player-reduced-parallax	2018-02-28 23:15:25 +09:00
Dan Balasescu	33a64cb497	Merge branch 'master' into fix-multiple-tracks-playing	2018-02-28 22:53:02 +09:00
Dan Balasescu	25c748ed45	Merge branch 'master' into fix-player-exit	2018-02-28 22:05:44 +09:00
Dean Herbert	f9faf8e3d8	Localise offset clock usage out of Player as much as possible	2018-02-28 22:01:52 +09:00
Dean Herbert	01fcf9c813	Update in line with framework changes	2018-02-28 22:01:48 +09:00
Dan Balasescu	b898226a91	Merge branch 'master' into fix-mod-select	2018-02-28 21:52:07 +09:00
Dan Balasescu	a3d26d7d55	Merge branch 'master' into fix-song-select-iteration	2018-02-28 21:40:25 +09:00
Dean Herbert	08497427fd	Merge branch 'master' into fix-multiple-tracks-playing	2018-02-28 15:32:16 +09:00
Dean Herbert	bc0bbd2e3b	Merge branch 'master' into reduce-transforms	2018-02-28 14:39:31 +09:00
Dean Herbert	4a52db14d1	Fix depth of already-visible panels not being updates after a sorting change	2018-02-28 14:18:25 +09:00
Dean Herbert	dd6cf1379e	Reduce parallax effect during gameplay ... This also cleans up some shared code in OsuScreen.	2018-02-28 11:42:47 +09:00
Dean Herbert	0cd049c6b0	Rely less on zero-duration transform helpers ... They have huge overheads. See ppy/osu-framework#1411.	2018-02-28 11:00:54 +09:00
Dean Herbert	510ecd7c87	Ensure selection is finalised before exiting song select ... Resolves #2080.	2018-02-28 00:07:28 +09:00
Dean Herbert	f64afc738d	Fix incorrect exit block conditional ... Resolves #2130.	2018-02-27 23:59:34 +09:00
Dean Herbert	84a8fbe0b3	Fix null ref	2018-02-27 21:26:06 +09:00
Dean Herbert	034875be47	Fix bindings not being unbound on ModSelect ... Resolves #2018. Closes #2079.	2018-02-27 20:45:32 +09:00
Dean Herbert	9b44f447ca	Fix song select iteration when all panels are filtered ... Resolves #2069.	2018-02-27 17:52:12 +09:00
Dean Herbert	cff17f1864	Update in line with inverse ShoudProcessClock default	2018-02-27 17:23:38 +09:00
Dean Herbert	8e78a7b114	Fix HUD using incorrect clock for time display	2018-02-27 17:23:38 +09:00
Dean Herbert	37d2a2c3cc	Rename clock types to match across classes	2018-02-27 17:23:38 +09:00
Dean Herbert	3d52ead213	Rename sourceClock	2018-02-27 17:23:38 +09:00
Dean Herbert	fee258f2f2	Rework PauseContainer to better pause	2018-02-27 17:23:38 +09:00
Dean Herbert	d4f1723ae6	Remove unnecessary secondary argument from HUDOverlay	2018-02-27 17:23:38 +09:00
Dean Herbert	0635ae2293	Include missing offset	2018-02-27 17:23:38 +09:00
Dean Herbert	9c0dfb7c8c	Avoid creating an extra framed clock in SkipButton	2018-02-27 17:23:38 +09:00
Dean Herbert	c0d983bbdf	Merge branch 'master' into PlayerBase	2018-02-23 13:51:11 +09:00
Dean Herbert	f2b3d9a0e8	Change some missed instances	2018-02-22 14:17:35 +09:00
Dan Balasescu	34f76a4136	Merge branch 'master' into storyboard-improvements	2018-02-19 15:40:09 +09:00
Dan Balasescu	5401b0dfcd	Merge branch 'master' into abstract-model-managers	2018-02-19 14:56:21 +09:00
Dean Herbert	7c43a3b4c0	Merge branch 'master' into storyboard-improvements	2018-02-19 14:54:12 +09:00
Dean Herbert	e0faf14a3e	Actually consume ReplacesBackground	2018-02-19 12:33:07 +09:00
Dean Herbert	29adedfa96	Collapse visual settings by default in player	2018-02-16 12:47:32 +09:00
Dean Herbert	9760f30ce9	Tidy things up to make more sense	2018-02-16 12:08:36 +09:00
Dean Herbert	f22f9b5de0	Merge branch 'master' into PlayerBase	2018-02-16 11:26:57 +09:00
Dean Herbert	ddf49c2e65	Fix intro not being replaced by a playable song when entering song select	2018-02-16 10:45:15 +09:00
TocoToucan	c57e8785e2	Move all storyboard loading to Player itself	2018-02-15 23:57:53 +03:00
Dean Herbert	d340509b1d	Move ArchiveReaders to a more global namespace ... Also moves delete and action logic to a shared implementation	2018-02-15 14:22:39 +09:00
Dean Herbert	6ff63c2f0c	Move deletion to ArchiveModelImportManager	2018-02-15 14:22:39 +09:00
Dean Herbert	d8f84fcca3	Give ArchiveReader a filename	2018-02-15 14:22:39 +09:00
Dean Herbert	6f29cd35af	Merge branch 'master' into PlayerResumeHotfix	2018-02-13 20:21:45 +09:00
Shane Woolcock	d603d032d5	Inlined delete beatmap dialog	2018-02-13 16:26:05 +10:30
Shane Woolcock	8d313486b3	Add a confirmation dialog to the Delete option in the beatmap context menu	2018-02-13 00:40:34 +10:30
TocoToucan	86f200e257	Fix possible nullref	2018-02-09 22:04:39 +03:00
TocoToucan	a86a4f49cf	Resolve "Pressing escape on continuing causes the game to return to song select" problem without removing Delay	2018-02-09 21:20:49 +03:00
TocoToucan	4535e09607	Add missing license header	2018-02-09 00:36:31 +03:00
TocoToucan	a860dd7208	Preview visual settings at the “loading” screen	2018-02-09 00:06:24 +03:00
TocoToucan	d437c1d7ec	Introduce PlayerBase class	2018-02-08 23:28:42 +03:00
TocoToucan	77a8b36529	Schedule Resume method call without delay	2018-02-08 22:30:15 +03:00
smoogipoo	b500b76407	Merge branch 'master' into update-branch	2018-02-08 23:35:48 +09:00
Dean Herbert	a70989cb70	Rely on bindable's formatting rather than setting a default	2018-02-08 11:12:05 +09:00
Dean Herbert	7e83aedb86	Merge branch 'master' into slider-tooltip-precision	2018-02-08 11:00:46 +09:00
Dean Herbert	647cc4bdad	Remove in-between properties	2018-02-07 18:04:32 +09:00
smoogipoo	8e280b6b0c	Use 0.1 precision for playback speed	2018-02-07 13:28:10 +09:00
smoogipoo	bd5db6fc8d	Make playback speed sliderbar use the tooltip text as its display	2018-02-07 13:26:41 +09:00
Dean Herbert	9bfec9b233	Tidy up state change logic	2018-02-06 14:30:01 +09:00
Dean Herbert	dd8955cd90	Fix skip button not receiving screen-wide input	2018-02-06 14:29:03 +09:00
tgi74000	b0fbae9dfc	Fix PlayerSettingsOverlay not reappearing when Hidden	2018-02-01 16:07:49 +01:00
Dan Balasescu	c1d5a68e4d	Merge branch 'master' into VisualSettingsOverlay	2018-02-01 16:37:04 +09:00
Dean Herbert	df65443f07	Merge branch 'master' ... Conflicts: osu-framework osu.Game/Screens/Play/Player.cs	2018-01-30 18:31:03 +09:00
Dan Balasescu	2bae22999d	Merge branch 'master' into global-mod-binding	2018-01-29 15:18:11 +09:00
Dean Herbert	6e0cb1adb3	Remove redundant arguments	2018-01-29 15:05:07 +09:00
TocoToucan	ce4122b3c4	Display visual settings overlay on PlayerLoader screen	2018-01-26 23:29:54 +03:00
TocoToucan	d82835107c	Remove autohide and clock related logic from Visual settings overlay	2018-01-26 22:20:24 +03:00
TocoToucan	615c831069	Merge from ppy/master	2018-01-26 21:56:17 +03:00
Dean Herbert	7852015db3	Remember mod selection when re-entering song select ... Removes mod application when exiting back to main menu. Alternative to #1968. Closes #1961.	2018-01-26 19:32:57 +09:00
smoogipoo	5742e61e68	Merge remote-tracking branch 'origin/master' into ruleset-configs	2018-01-26 15:39:09 +09:00
smoogipoo	8d11596b2f	Minor cleanups	2018-01-24 17:48:42 +09:00
Dean Herbert	5a00ae36d1	Add database-based configuration for rulesets	2018-01-24 17:45:28 +09:00
smoogipoo	7f299b2533	Merge remote-tracking branch 'origin/master' into RefactorPlayerOverlaysInitialization	2018-01-24 17:44:28 +09:00
Dan Balasescu	fcea12f83d	Merge branch 'master' into allow-quick-retry-key	2018-01-23 14:59:15 +09:00
Dean Herbert	fa1f4304f6	Remove usings	2018-01-23 13:24:04 +09:00
Dean Herbert	f823650b10	Allow user choice of the quick retry hotkey	2018-01-23 13:05:07 +09:00
Michael Manis	794ae5380a	Intverted conditionals.	2018-01-22 01:06:27 -05:00
smoogipoo	b4e1872322	osu!-side changes in-line with framework BDL cache changes	2018-01-22 12:56:30 +09:00
Michael Manis	530e0afa2c	Use IsCurrentScreen instead of a bool for both checks now.	2018-01-21 22:27:15 -05:00
Michael Manis	964c6da9a4	Use IsCurrentScreen instead of a bool	2018-01-21 22:00:18 -05:00
Michael Manis	806da21760	Removed rreduntant initialization.	2018-01-21 20:24:19 -05:00
Michael Manis	ad2df8d8df	Fixed tilde-key crash at end of beatmap.	2018-01-21 20:09:44 -05:00
TocoToucan	e88f514cf4	Resolve merge conflicts	2018-01-21 18:32:21 +03:00
TocoToucan	4875443e12	Resolve merge conflicts	2018-01-21 18:11:43 +03:00
smoogipoo	a05032779f	Remove unneeded event binding	2018-01-18 00:04:33 +09:00
smoogipoo	c79603290d	Move TriggerChange to LoadComplete()	2018-01-17 21:52:57 +09:00
Dan Balasescu	be225eff90	Merge branch 'master' into fix-replays	2018-01-17 18:01:41 +09:00
smoogipoo	2ebb3d6e0e	Fix ReplayLoader not being treated as having a replay loaded ... Player checks for HasReplayLoaded in Player.load(), but the replay is attached in ReplayPlayer.LoadComplete(), which is too late.	2018-01-17 17:37:14 +09:00
Dean Herbert	5e1cd8ddc4	Apply conditionals directly rather than using an in-between property	2018-01-16 20:34:40 +09:00
Dean Herbert	e7a0a02466	Don't limit keyboard input based on menu button scale	2018-01-16 20:34:40 +09:00
Dean Herbert	39af9321cf	Remove unnecessary overrides	2018-01-16 20:34:40 +09:00
Dean Herbert	9b33499fe7	Merge remote-tracking branch 'upstream/master' into RefactorInputQueues	2018-01-16 20:04:34 +09:00
TocoToucan	c3ca40dcff	Local functions related CI fixes	2018-01-15 23:27:00 +03:00
TocoToucan	3c11978cfa	Use local functions	2018-01-15 21:42:17 +03:00
TocoToucan	a81f32a388	PlayerGroup -> PlayerSettingsGroup	2018-01-15 20:52:52 +03:00
Dean Herbert	0796d33e66	Merge branch 'master' into fix-skipbutton-ordering	2018-01-15 15:54:18 +09:00
smoogipoo	7c41925144	ProvidesUserCursor -> ProvidingUserCursor, and update xmldoc	2018-01-15 14:07:09 +09:00
TocoToucan	d3afbdaac6	Resolve merge conflict	2018-01-13 22:32:56 +03:00
TocoToucan	43d2ae348a	Rename ReplaySomething -> PlayerSomething	2018-01-13 22:25:09 +03:00
TocoToucan	0c4fcdf6d8	Remove not used breakOverlay field	2018-01-12 23:59:36 +03:00
TocoToucan	3795411fd1	Do not assign hudOverlay's and breakOverlay's members in Player class	2018-01-12 23:33:24 +03:00
Aergwyn	ae1adfd2f2	remove unnecessary empty lines ... codefactor.io \(o.o)/ also one unnecessary semicolon	2018-01-12 19:30:34 +01:00
smoogipoo	d0b177e233	Proxying isn't needed anymore	2018-01-12 19:50:09 +09:00
smoogipoo	16d739580b	IProvideLocalCursor -> IProvideCursor	2018-01-12 19:37:03 +09:00
smoogipoo	620e125fad	Fix cursor being displayed on intro/disclaimer	2018-01-12 19:34:55 +09:00
Dean Herbert	188b26472c	Merge remote-tracking branch 'upstream/master' into sliderbar-tooltip-precision	2018-01-12 18:54:36 +09:00
smoogipoo	a6c6523a86	Make SkipButton an OverlayContainer to use the menu cursor	2018-01-12 18:21:17 +09:00
smoogipoo	512e4d2c9f	Rewrite the way that cursor overrides are done game-wide	2018-01-12 18:13:17 +09:00
james58899	f83c84a0a6	keep BlurTo	2018-01-12 14:24:42 +08:00
james58899	61c8fd4ab9	useless using	2018-01-12 12:39:32 +08:00
smoogipoo	2e235660ad	Fix skip button appearing below osu!mania's stage	2018-01-12 13:25:49 +09:00
james58899	1985e5bdb2	fix background dim	2018-01-12 12:21:37 +08:00
TocoToucan	affbb7a847	Fix license header	2018-01-12 00:37:28 +03:00
TocoToucan	c1f756b16e	Support background blur in visual settings	2018-01-12 00:03:55 +03:00
TocoToucan	3ec93966a0	Implement VisualSettings autohiding	2018-01-11 23:39:23 +03:00
TocoToucan	98851e4a78	Stop time whenever visual settings are expanded	2018-01-11 01:24:34 +03:00
smoogipoo	d147683361	Cleanup	2018-01-10 17:39:15 +09:00
smoogipoo	c010b48b29	Remove number format specified from OsuSliderBar, override ToolTipText ... Better/cleaner solution.	2018-01-10 17:29:16 +09:00
smoogipoo	17e7f75aca	More osu!-side bindable fixes	2018-01-10 15:41:13 +09:00
Dean Herbert	9ec8f130a6	Ensure changes are only applied when we are the current screen	2018-01-10 13:24:26 +09:00
TocoToucan	c48c7b085c	Visual settings initial commit	2018-01-10 02:24:51 +03:00
Dean Herbert	fcb197f7b6	Simplify logic	2018-01-09 22:21:15 +09:00
Dean Herbert	2518d16a77	Denote unused variable	2018-01-09 21:34:31 +09:00
Dean Herbert	c2fadcfc1f	Merge branch 'master' into background-blur	2018-01-09 21:20:05 +09:00
Dean Herbert	a3f05ca9ec	Avoid unnecessary use of linq	2018-01-09 12:43:10 +09:00
Dean Herbert	b90b1e326e	Merge branch 'master' into fix-randomizer	2018-01-09 12:00:21 +09:00
Aergwyn	f6c168be27	add skip cutscene as "in game" keybinding	2018-01-08 18:22:43 +01:00
Dean Herbert	9eb4eb4b36	Merge branch 'master' into sliderbar-tooltip-precision	2018-01-08 22:51:16 +09:00
TocoToucan	ae032cbf23	Support HandleKeyboardInput, HandleMouseInput, CanReceiveKeyboardInput, CanReceiveMouseInput properties	2018-01-07 23:40:00 +03:00
Aergwyn	140a09ba3d	fix requests not cancelling properly + formatting	2018-01-05 19:13:54 +01:00
Dean Herbert	a1d94d7adf	Merge branch 'master' into sliderbar-tooltip-precision	2018-01-05 20:48:30 +09:00
Dean Herbert	37d393bca0	Update licence headers	2018-01-05 20:21:19 +09:00
smoogipoo	1571c10c42	Fix up replay settings sliderbar formatting	2018-01-05 14:37:32 +09:00
smoogipoo	af86220dcc	Merge remote-tracking branch 'origin/master' into update-branch	2018-01-05 12:08:50 +09:00
smoogipoo	5eb2dc3d64	Cleanup some possible CI errors ... Not sure why these aren't being detected on master right now - they should be...	2018-01-05 01:20:24 +09:00
smoogipoo	36e9232472	Merge master into netstandard	2018-01-05 00:42:48 +09:00
Dean Herbert	9bce322682	Merge branch 'master' into wedge-unicode	2018-01-04 15:09:31 +09:00
Endrik Tombak	ce156098f6	Merge branch 'fix-randomizer' of https://github.com/LittleEndu/osu into fix-randomizer	2018-01-03 12:33:43 +02:00
Endrik Tombak	969fa65c42	Merge branch 'master' of https://github.com/ppy/osu into fix-randomizer	2018-01-03 12:31:59 +02:00
Endrik	35af5d1ce6	Merge branch 'master' into fix-randomizer	2018-01-03 12:25:07 +02:00
Dan Balasescu	2a6068f8e7	Merge branch 'master' into fix-play-song-select-tests	2018-01-03 14:12:49 +09:00
Dan Balasescu	262a7f7d19	Merge branch 'master' into large-texture-store	2018-01-03 13:56:39 +09:00
Dan Balasescu	d167663340	Merge branch 'master' into large-texture-store	2018-01-03 13:50:49 +09:00
Dean Herbert	2291053205	Merge branch 'master' into wedge-unicode	2018-01-03 13:12:42 +09:00
Dean Herbert	1c3541f18e	Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods	2018-01-02 16:58:28 +09:00
Dean Herbert	c0dd812a4c	Merge remote-tracking branch 'upstream/master' into disable-unimplemented-mods	2018-01-02 15:33:08 +09:00
Dean Herbert	4f8a830fbf	Fix potential race condition with score retrieval	2018-01-02 15:30:29 +09:00
Dean Herbert	161e8d44b4	Merge branch 'master' into supporter-leaderboards	2018-01-02 15:09:52 +09:00
Dan Balasescu	91c49913c9	Merge branch 'master' into focused-overlay-improvements	2018-01-02 12:44:09 +09:00
Felix Ang	755befdf84	Check for supporter before displaying loading spinner	2018-01-01 14:30:53 +01:00
Endrik Tombak	5abf93038b	Reset only visible sets for more randomized feel	2017-12-31 14:47:27 +02:00
Dean Herbert	2079b7239c	Merge branch 'master' into result-page-date-order	2017-12-31 13:11:55 +09:00
Dean Herbert	77f6f25ad3	Merge branch 'master' into wedge-unicode	2017-12-31 13:09:41 +09:00
Dean Herbert	dfee8e911f	Fix dummy beatmap selection not propagating to song select components	2017-12-31 12:55:53 +09:00
Dean Herbert	02514d4228	Update tests to account for correct beatmap displaying on details area	2017-12-31 12:54:27 +09:00
Endrik Tombak	987a6403da	Faster count for AppVeyor	2017-12-31 03:25:43 +02:00
Endrik Tombak	d032790e19	Doesn't allow randomizer to select invisible maps	2017-12-31 03:10:54 +02:00
Dean Herbert	f2d302f8dc	Create a LargeTextureStore for cached (but not atlased) global textures ... Also - Fixes first transition depth being incorrect. - Improves smoothness of transitions (and adds a slight delay to offset from screen switches).	2017-12-31 07:05:04 +09:00
Aergwyn	3d66b879a7	use ToShortTimeString to create a time depending on current culture	2017-12-30 22:45:28 +01:00
Aergwyn	2a0699f13c	use ToShortDateString to create a date depending on current culture	2017-12-30 22:41:01 +01:00
Aergwyn	0dad9cbe53	change date to be more friendly to read	2017-12-30 21:49:05 +01:00
Aergwyn	d6af8ad748	swap date and time in ResultsPageScore	2017-12-30 21:48:49 +01:00
Aergwyn	61bbb66996	sort resultpage hitresults descending ... HitCount was good to bad but HitResult is the opposite. To account for this just descending order on the result page.	2017-12-30 21:27:15 +01:00
Aergwyn	ccb69d16d9	move HitResult in Scoring namespace to replace HitCount	2017-12-30 21:23:18 +01:00
ColdVolcano	13900d6130	Use LocalisationEngine on BeatmapInfoWedge	2017-12-30 14:12:47 -06:00
Dean Herbert	c002d4e1d2	Merge branch 'master' into result-page-sorting	2017-12-31 04:34:48 +09:00
Dean Herbert	d9a80dae5d	Male NoFail use an applicable interface	2017-12-31 04:10:29 +09:00
Aergwyn	1ef4ff6776	order statistics before adding to resultpage	2017-12-30 18:07:53 +01:00
Aergwyn	138d78309f	add HitCount enum and replace string usage with enum	2017-12-30 18:07:30 +01:00
Dean Herbert	c8bab7d983	Merge branch 'master' into fix-push-disabled-crash	2017-12-31 01:27:41 +09:00
Aergwyn	f7fe083018	add tooltip to country flags	2017-12-30 14:59:35 +01:00
Dean Herbert	442a649c63	Make all FocusedOverlays hide on clicks outside of themselves ... Also allows wheel events to pass through around them.	2017-12-30 20:45:41 +09:00
Dean Herbert	ef683a60f5	Merge branch 'master' into fix-push-disabled-crash	2017-12-30 18:59:59 +09:00
ColdVolcano	df62ca14b7	Don't unbind when not necessary	2017-12-29 23:41:36 -06:00
ColdVolcano	3845c7ac7d	Remove bluring of storyboard	2017-12-28 14:31:34 -06:00
Dean Herbert	0cea018576	Use a more suiting (?) icon for import dialog ... Closes #1763.	2017-12-28 21:24:40 +09:00
Dean Herbert	e0f23a056a	Fix crash from being able to perform selection after entering play mode ... Closes #1757	2017-12-28 21:07:19 +09:00
Dean Herbert	e77dc368ba	Merge branch 'master' into fix-pause-overlay-selection	2017-12-28 14:01:36 +09:00
Dean Herbert	e4a8402d3c	Use better logic ... We need to still perform selection if selectedBeatmap itself is null	2017-12-28 12:38:40 +09:00
FreezyLemon	33480b85c8	fix for Drawables being empty crashing	2017-12-28 03:35:53 +01:00
FreezyLemon	998f9c090d	select pause buttons after mouse move only	2017-12-28 01:56:10 +01:00
Dan Balasescu	dcd994e65b	Merge branch 'master' into better-notification-delays	2017-12-27 23:58:04 +09:00
Dan Balasescu	3bfa6bd9fd	Merge branch 'master' into better-notification-delays	2017-12-27 23:26:57 +09:00
Dan Balasescu	3a2dadc9d3	Fix spelling error	2017-12-27 23:14:48 +09:00
Dean Herbert	07e0c423f5	Merge branch 'master' into fix-beatmap-wedge-appear	2017-12-27 22:58:50 +09:00
smoogipoo	7a793eaded	Merge master into netstandard	2017-12-27 20:48:53 +09:00
Dean Herbert	324a7d6377	Merge remote-tracking branch 'upstream/master' into better-testcase-player	2017-12-27 20:26:38 +09:00
Dan Balasescu	1af7f71c97	Merge branch 'master' into notification-verbosity	2017-12-27 15:01:28 +09:00
Dean Herbert	18d2be75d5	Fix random selection happening more than once on quick imports	2017-12-27 13:04:50 +09:00
Dean Herbert	cf9a9762f7	Fix beatmap wedge appearing with incorrect info on entering song select ... Closes #1762	2017-12-27 13:02:21 +09:00
Dean Herbert	ae9f08f387	Fix crash in editor when trying to seek on a virtual track	2017-12-27 11:47:04 +09:00
Dean Herbert	d17f6cb564	Fix crash when starting play mode with no beatmap ... Closes #1767	2017-12-27 11:46:44 +09:00
Dean Herbert	94449ed597	Merge branch 'master' into notification-verbosity	2017-12-26 20:48:59 +09:00
Dean Herbert	35ae5173cd	Merge branch 'master' into better-notification-delays	2017-12-26 20:48:41 +09:00
Dean Herbert	3182c22c7d	Merge remote-tracking branch 'upstream/master' into hide-useless-beatmap-info	2017-12-26 20:36:22 +09:00
Dean Herbert	7504cd589d	Move alpha handling to state	2017-12-26 20:18:47 +09:00
Dean Herbert	ee67e7119d	Merge remote-tracking branch 'upstream/master' into fix-info-wedge	2017-12-26 19:44:28 +09:00
Aergwyn	44fbe7859a	move anchor and origin so metadata doesn't move if it's partially empty	2017-12-26 11:34:26 +01:00
Dan Balasescu	11542b697c	Merge branch 'master' into improve-screen-offset	2017-12-26 17:53:13 +09:00
Dean Herbert	ab6c93fba4	Merge branch 'master' into notification-verbosity	2017-12-26 16:14:24 +09:00
Dean Herbert	3524ad3dc2	Merge remote-tracking branch 'upstream/master' into better-notification-delays	2017-12-26 16:10:57 +09:00
Dan Balasescu	f7a54a203b	Merge branch 'master' into beatmap-import-prompt	2017-12-26 16:00:37 +09:00
Dan Balasescu	d089e27cad	Merge branch 'master' into osu-prefixed-text	2017-12-26 15:40:29 +09:00
Dean Herbert	9ccc49c9b5	Make selection triggering more liberal	2017-12-26 15:32:39 +09:00
Dean Herbert	ed7ae4e956	Merge branch 'master' into fix-info-wedge	2017-12-26 15:08:52 +09:00
Dean Herbert	9fb958eadc	Make TestCasePlayer more usable ... No results screen crash, no unnecessary leadin time.	2017-12-26 14:23:14 +09:00
Dean Herbert	09ce24a7db	Switch to a better way of deciding on null selection ... This avoids `SelectionChanged` potentially being invoked multiple times after `selectedBeatmapSet` is already `null`.	2017-12-26 13:41:02 +09:00
ColdVolcano	044e4d0acd	Add blur to background in Player	2017-12-25 19:11:49 -06:00
FreezyLemon	c737e5245e	Removed unnecessary SelectNext() call and change to dummy map when no items present	2017-12-26 01:50:05 +01:00
Dean Herbert	798c2c6666	Add special logic to song select to avoid obvious clipping when notifications are displayed ... Not sure if we will keep this going forward (there will likely be an opaque tab control on the notifications overlay similar to options) but let's go with this for now.	2017-12-26 02:52:43 +09:00
Dean Herbert	3c8d30f8e6	Add a dialog offering to import beatmaps from stable	2017-12-26 00:52:11 +09:00
Dean Herbert	3c1654e5e4	Fix many instances of non-osu-prefixed text classes being used ... Results in incorrect default formatting.	2017-12-26 00:44:35 +09:00
Dean Herbert	71a94d6b44	Add a bindable Enabled flag to NotificationManager ... Also better handles delays before notifications are displayed.	2017-12-25 20:53:23 +09:00
Dean Herbert	6f5f4f76e5	Use Logger.Error when exceptions are involved	2017-12-25 18:21:15 +09:00
Dean Herbert	482e10966c	Ensure a selection is made on entering song select if no selection is current	2017-12-24 17:02:56 +09:00
Dean Herbert	cf316b3c51	Add tests for initial load states of PlaySongSelect	2017-12-24 15:39:25 +09:00
Dean Herbert	8e644e878a	Merge remote-tracking branch 'upstream/master' into fix-info-wedge	2017-12-23 21:40:27 +09:00
Aergwyn	1d67746d32	fix crash in SongSelect when traversing while zero beatmaps are loaded	2017-12-23 12:53:11 +01:00
Dean Herbert	117b744e37	Merge branch 'master' into fix-info-wedge	2017-12-23 20:36:24 +09:00
Dan Balasescu	7ec4d230b9	Merge branch 'master' into fix-leaderboard-placeholder	2017-12-23 20:04:05 +09:00
Dean Herbert	5026c7a95e	SoundControlPoint -> SampleControlPoint	2017-12-23 16:34:34 +09:00
Dean Herbert	77f1b59853	Merge branch 'master' into fix-info-wedge	2017-12-23 04:04:18 +09:00
Aergwyn	6a8fd74e05	fix failing tests ... 1) waiting for loading to finish so Drawables are all present to do asserts on 2) fix NullRef in ResultPage because of removed line in DummyWorkingBeatmap (author one)	2017-12-22 17:38:22 +01:00
Dean Herbert	bdda1570d1	Move Placeholder classes to own files	2017-12-22 22:44:18 +09:00
Dean Herbert	26bb3715fe	Improve state and feel of leaderboard placeholders ... Closes #1721.	2017-12-22 22:42:23 +09:00
Dean Herbert	2313ff0ddb	Fix beatmap info wedge not showing up when zero beatmaps are loaded ... Closes #1722.	2017-12-22 22:19:11 +09:00
Aergwyn	ed827d5424	more visual tests for BeatmapInfoWedge ... also fix Author showing when not wanted	2017-12-22 12:33:52 +01:00
Aergwyn	07f55a2a60	remove references to DummyWorkingBeatmap ... determine content by data that is present instead	2017-12-22 10:18:25 +01:00
Dan Balasescu	a3d947301b	Merge branch 'master' into beatmap-serialization	2017-12-22 07:38:05 +09:00
Aergwyn	214154c512	hide unnecessary lines on empty BeatmapInfoWedge ... adding back deleted line ooops meh	2017-12-21 20:23:10 +01:00
Dean Herbert	aa388885b7	Adjust animation slightly	2017-12-22 00:53:34 +09:00
Dean Herbert	5c9d484395	Adjust debounce a bit	2017-12-22 00:50:32 +09:00
Dean Herbert	40ceaf12f2	Merge branch 'master' into leaderboard-scopes	2017-12-22 00:44:24 +09:00
Dean Herbert	57fdbda16d	Remove unnecessary IsLoaded check ... We are always loaded at this point.	2017-12-21 23:48:48 +09:00
Dean Herbert	65e6206d06	Use local bindable	2017-12-21 23:48:35 +09:00
Dean Herbert	13fee5402a	Remove unnecessary using ... visual studio doesn't save	2017-12-21 23:20:11 +09:00
Dean Herbert	87e790080b	Remove manual audio thread synchronisation logic ... No longer required as calls are blocking.	2017-12-21 22:22:28 +09:00
smoogipoo	790aa8be2a	Merge master into beatmap-serialization	2017-12-21 22:13:53 +09:00
Dean Herbert	4bd2c7e95f	Fix minor formatting issue	2017-12-21 21:54:46 +09:00
Dean Herbert	abe465358c	Fix formatting	2017-12-21 21:46:57 +09:00
naoey	644aaa8167	Unsubscribe from API state change event.	2017-12-21 18:00:10 +05:30
Dean Herbert	63f2436220	Merge branch 'master' into leaderboard-scopes	2017-12-21 21:18:56 +09:00
Dean Herbert	5b596765c8	Merge branch 'master' into dev-overlay-counter	2017-12-21 21:09:40 +09:00
Seokho Song	6fbd06f967	Fix Not update retry counter on PauseOverlay ... I've find "You've retried xx time(s)" message that something weird. That is not displayed pause overlay and only see count on FailOverlay I change code that PauseContainer.Retries property can be set call-back function. Signed-off-by: Seokho Song <0xdevssh@gmail.com>	2017-12-21 20:40:31 +09:00
smoogipoo	d80079a73a	Merge remote-tracking branch 'origin/master' into beatmap-serialization	2017-12-21 20:15:01 +09:00
Dan Balasescu	50afc6e9c9	Merge branch 'master' into fix-gameplay-menu-blocking	2017-12-21 20:07:14 +09:00
smoogipoo	2fb8895e66	Add spacer to menu	2017-12-21 19:57:09 +09:00
smoogipoo	b2c0b013aa	Remove migration setting in favour of export option in the editor	2017-12-21 19:56:12 +09:00
Dean Herbert	052badc1bd	Add a right-click context option to carousel panels to view online beatmap details	2017-12-21 19:42:44 +09:00
Dean Herbert	b6fd5b0f17	Fix keyboard and mouse input not properly getting blocked by GameplayMenuOverlay	2017-12-21 19:19:08 +09:00
naoey	01c4b1e544	Maintain a placeholder state and add tests showing all the states. ... - Also don't replace placeholder if new one is same as old	2017-12-21 15:27:20 +05:30
Dean Herbert	afcb9912e4	Reorder API / logged in checks to make more sense	2017-12-21 03:11:44 +09:00
Dean Herbert	2ff351c6cb	Show retrieval failure when OnlineBeatmapID is missing	2017-12-21 03:10:09 +09:00
naoey	85dee3abac	Increase GetScoresRequest timeout & leave existing scores when API dies.	2017-12-20 20:48:30 +05:30
naoey	8d24a04641	Remove unused usings.	2017-12-20 20:26:59 +05:30
naoey	c8c8b6810a	Kill ugly retry button bounce.	2017-12-20 20:11:48 +05:30
naoey	23f4799840	Create placeholder classes instead of changing Children. ... - Add MessagePlaceholder - Use MessagePlacholder for when API is offline/user isn't a supporter - Remove unnecessary placeholderFlow field - Hook into API state changes	2017-12-20 20:00:52 +05:30
Dean Herbert	6d471da459	Remove unnecessary workaround	2017-12-20 21:52:03 +09:00
Dean Herbert	3292ef33fd	Fix test edge cases	2017-12-20 21:16:19 +09:00
Dean Herbert	1b91f24044	Simplify scope logic	2017-12-20 20:33:16 +09:00
Dean Herbert	21829ba37b	Merge branch 'master' into leaderboard-scopes	2017-12-20 20:17:11 +09:00
smoogipoo	5e111e14db	Make it possible to change the overlay actions beyond instantiation	2017-12-18 19:13:25 +09:00
smoogipoo	a17b2e4c18	Expose buttons for test cases	2017-12-18 19:13:08 +09:00
smoogipoo	918e7c9a4b	MenuOverlay -> GameplayMenuOverlay	2017-12-18 16:40:50 +09:00
smoogipoo	5f538f03ea	Comments	2017-12-18 16:34:25 +09:00
smoogipoo	59365bbdce	Make MenuOverlay support key selections	2017-12-18 16:34:17 +09:00
smoogipoo	f3a5258c5b	Reorder file (ctor + bdl)	2017-12-18 14:05:12 +09:00
Dean Herbert	6121cd3b67	Remove animating skipping and reorder file a bit	2017-12-18 12:30:39 +09:00
Dean Herbert	23e014b52d	Simplify drawable removal logic	2017-12-18 12:05:49 +09:00
Dean Herbert	b2cd32eb95	Move children to CarouselGroup	2017-12-18 11:57:13 +09:00
Dean Herbert	7173829896	Add filter checks to difficulty selection	2017-12-18 11:43:10 +09:00
Dean Herbert	4c1f00567b	Fix incorrect flush logic when starting play from non-selected difficulty using context menu	2017-12-18 11:31:38 +09:00
Dean Herbert	4e46565f6e	Remove todo	2017-12-18 11:25:02 +09:00
Dean Herbert	5bfb6d1f58	Remove unused variable	2017-12-18 11:13:51 +09:00
Dean Herbert	b21c22085d	Make more things private	2017-12-18 11:13:16 +09:00
Dean Herbert	954bc77a71	Indicate unused variable	2017-12-18 08:05:57 +09:00
Dean Herbert	dfd7787b15	Move more overhead from ctor to BDL	2017-12-18 07:58:48 +09:00
Dean Herbert	c10288541c	Avoid redundant IndexOf calls	2017-12-18 07:58:34 +09:00
Dean Herbert	482941b333	Preload drawables to force asynchronous construction	2017-12-18 06:59:32 +09:00
Dean Herbert	30a15729ec	Fix event handling from outside carousel being scheduled at the wrong level ... Was causing BeatmapSet's Set to run *after* newer events were received.	2017-12-18 02:46:53 +09:00
Dean Herbert	942054a30f	Re-fix null selection	2017-12-18 02:26:40 +09:00
Dean Herbert	19643ba5e6	Resolve scroll animation/position issues	2017-12-18 02:23:03 +09:00
Dean Herbert	54cc6fadf9	Greatly improve performance when many hidden panels are on-screen	2017-12-17 05:57:50 +09:00
Dean Herbert	5d7413f19c	Improve performance with large numbers of panels visible	2017-12-17 04:30:56 +09:00
Dean Herbert	c02ce16f47	Remove unnecessary capture	2017-12-17 03:04:57 +09:00
Dean Herbert	d27047f94d	Remove logging	2017-12-17 03:04:37 +09:00
Dean Herbert	e2710a309c	Fix panel animation and depth	2017-12-17 02:43:24 +09:00
Dean Herbert	29a8ade59f	Rename "Hidden" to "Collapsed"	2017-12-16 23:56:14 +09:00
Dean Herbert	da0940ae0b	Only apply criteria if there are items populated in the carousel	2017-12-16 23:55:55 +09:00
Dean Herbert	33f8c8419a	Fix initial beatmap selection potentially being incorrect	2017-12-16 21:25:54 +09:00
Dean Herbert	bd9056c709	Better choose new selection when multiple items are removed including current	2017-12-16 17:32:21 +09:00
Dean Herbert	59dbca2612	Fix ScrollToSelected being called in too many cases	2017-12-16 16:44:42 +09:00
Dean Herbert	df7e795aa3	Simplify and rename filter methods	2017-12-16 16:27:39 +09:00
Dean Herbert	3c406662ed	Ensure correct selection after deletion of currently selected ... Also fixes a lot of bad interactions and simplifies further.	2017-12-16 16:18:44 +09:00
Dean Herbert	a8a2c233a0	Add tests for (and fix) removal of last item in carousel	2017-12-16 00:33:09 +09:00
Dean Herbert	acfdd32783	Move DrawableCarouselBeatmap initialisation to BDL ... oops	2017-12-15 18:38:09 +09:00
Dean Herbert	59d512762e	SongSelect tidying	2017-12-15 14:44:14 +09:00
Dean Herbert	ed5b6cc16f	Add back ctrl-enter autoplay shortcut	2017-12-15 14:44:13 +09:00
Dean Herbert	192ceb5465	Avoid multiple access to selectedBeatmap during y position computation	2017-12-15 14:44:12 +09:00
Dean Herbert	2e3332e3fe	Shortcut non-visible panels to avoid adding as drawables	2017-12-15 14:44:12 +09:00
Dean Herbert	67f05977ea	Add sorting support	2017-12-15 14:36:51 +09:00
Dean Herbert	b4b2f12116	Add support for adding/removing items ... Tests accompany of course	2017-12-15 14:36:51 +09:00
Dean Herbert	7814b2df14	More renaming	2017-12-15 14:36:51 +09:00
Dean Herbert	5cbb9b9b18	Fix random and add tests ... Also exposes SelectedBeatmapSet.	2017-12-15 14:36:51 +09:00
Dean Herbert	8646d5d1e0	Add testing and fix filtering only some difficulties	2017-12-15 14:36:51 +09:00
Dean Herbert	ec4f99c92e	Clean up tests some more	2017-12-15 14:36:51 +09:00
Dean Herbert	1b85952441	Cleanup and basic TestCase	2017-12-15 14:36:51 +09:00
Dean Herbert	b9298325a3	Rename weird config setting	2017-12-15 14:36:51 +09:00
Dean Herbert	99b00143eb	More clean-ups and event bindings	2017-12-15 14:36:51 +09:00
Dean Herbert	78dd975a35	Initial carousel infrastructue changes	2017-12-15 14:36:51 +09:00
smoogipoo	33654ee5b4	Remove explicit padding on icon	2017-12-15 13:01:06 +09:00
Aergwyn	f329b1ed72	add Spinner Count to BeatmapInfoWedge ... - added Tooltips to the respective InfoLabels - made the TestCase internal like all others	2017-12-14 19:55:15 +01:00
Aergwyn	9fed972678	removed unnecessary using	2017-12-12 11:15:34 +01:00
Aergwyn	d11bf379d8	no longer select beatmapsets on import/download ... let's save some ears and eyes for now	2017-12-12 11:04:11 +01:00
Dean Herbert	b10240d7ef	Handle the case where the selected panel is no longer a valid selection better	2017-12-11 21:31:26 +09:00
Dean Herbert	fb92b3551e	Correct panel y positions when filtered panels are present	2017-12-11 21:12:06 +09:00
Dean Herbert	970e55fc4a	Update difficulty icons on headers to match filtered difficulties	2017-12-11 20:49:27 +09:00
Dean Herbert	f58c554d19	Add per-difficulty filtering support ... Filters based on selected ruleset	2017-12-11 20:22:10 +09:00
Unknown	47bd97363e	Use ShortName for mode. ... - Also set the ruleset when fetching scores in BeatmapSetOverlay	2017-12-11 15:05:12 +05:30
naoey	ccbbd09d84	Merge remote-tracking branch 'upstream/master' into leaderboard-scopes	2017-12-11 13:59:22 +05:30
Dean Herbert	04715f9a51	Merge branch 'master' into HandleInput	2017-12-11 15:24:29 +09:00
smoogipoo	ed81ed7c54	Add back HandleInput disable overrides	2017-12-11 15:19:00 +09:00
Aergwyn	e4628427cb	moved query into schedule	2017-12-10 08:15:29 +01:00
TocoToucan	219bdbc4e1	Populate HandleInput automatically	2017-12-09 22:21:17 +03:00
Aergwyn	821154d3bb	reverted Beatmaps-setter back to its former glory	2017-12-09 08:42:59 +01:00
Dean Herbert	16b8c9bd11	Merge branch 'master' into fix-crash-hidden-sets#2	2017-12-09 11:51:47 +09:00
Aergwyn	dde7678095	select beatmap on import/download	2017-12-08 13:09:30 +01:00
Aergwyn	3e417d8e30	removed specific AddBeatmap method ... the way UpdateBeatmapSet was extended it can handle all of this and better	2017-12-08 12:47:28 +01:00
Aergwyn	105d01d85b	fix crash when restoring from any non-SongSelect-screen ... removed unwanted refresh	2017-12-07 22:02:53 +01:00
Dean Herbert	44ee11e75f	Merge branch 'master' into fix-beatmap-carousel-lag	2017-12-07 15:30:50 +09:00
Dean Herbert	fb6408257a	Add shader precompile step ... Resolves https://github.com/ppy/osu-framework/issues/1180 in a way.	2017-12-05 17:41:47 +09:00
Aergwyn	12665fb8cf	remove unnecessary declaration + revert accidental formatting	2017-12-04 12:11:28 +01:00
Aergwyn	011223048b	fix crash if any amount of maps were restored from main menu ... also fixes preview not playing if an entire set is restored	2017-12-04 11:47:27 +01:00
Dean Herbert	d75db5046b	Merge branch 'master' into editor-composer	2017-12-04 12:41:40 +09:00
smoogipoo	5f9de399e4	Add keydown override	2017-12-04 11:30:25 +09:00
Dean Herbert	7957e55710	Merge branch 'master' into editor-composer	2017-12-03 14:47:07 +09:00
smoogipoo	2852337b04	Remove unused using	2017-12-02 20:35:47 +09:00
smoogipoo	cd20d6df16	Apply suggested changes	2017-12-02 20:31:15 +09:00
smoogipoo	c14d68e685	Use OsuColour for radio buttons	2017-12-02 20:30:18 +09:00
Dean Herbert	70b29b8b62	Merge branch 'master' into fix-set-hidden-crash	2017-12-01 23:35:48 +09:00
smoogipoo	a30270658d	Merge remote-tracking branch 'origin/master' into netstandard	2017-12-01 18:50:28 +09:00
smoogipoo	5be00cb0ec	Add todo	2017-12-01 18:40:55 +09:00
smoogipoo	0b95e36675	Fix RelativeChildSize error temporarily	2017-12-01 18:00:20 +09:00
Aergwyn	016057ab01	readd storyboard to beatmap + minor cleanup	2017-11-30 16:49:53 +01:00
smoogipoo	89772f4efd	A few resharper fixes	2017-11-30 19:54:58 +09:00
smoogipoo	e9cbef88f1	Improve selection/deselection behaviour of RadioButtonCollections	2017-11-30 19:50:07 +09:00
smoogipoo	efa39f38ca	CI fixes	2017-11-30 18:49:08 +09:00
smoogipoo	e5353bb53e	Add border to playfield, add shadow to toolbox buttons	2017-11-30 17:38:55 +09:00
smoogipoo	456bbe25f3	Implement toolbox into HitObjectComposer	2017-11-30 16:58:14 +09:00
smoogipoo	73e41f9dde	Add constructors to RadioButton	2017-11-30 16:57:30 +09:00
smoogipoo	ead7456978	Add compose radio buttons + testcase	2017-11-30 15:43:19 +09:00
smoogipoo	abd6125691	Make sure that composerContainer is cleared for testing purposes	2017-11-30 14:00:17 +09:00
smoogipoo	a7a9569aee	Don't exit when we don't have composer for now	2017-11-30 13:53:57 +09:00
smoogipoo	fd3049fd65	Merge remote-tracking branch 'origin/master' into editor-composer	2017-11-30 13:47:47 +09:00
Aergwyn	acb2cafa58	fix wedge not appearing	2017-11-29 21:09:08 +01:00
smoogipoo	267bb75458	Merge remote-tracking branch 'Aergwyn/master' into netstandard	2017-11-29 23:45:29 +09:00
Dean Herbert	28d925dc1d	Merge branch 'master' into random-song-fix	2017-11-29 20:32:10 +09:00
Dean Herbert	b2fc50247c	Hide metadata by default to avoid initial jump when no data present	2017-11-29 20:13:00 +09:00
Dean Herbert	2b7bf285e4	Improve code quality	2017-11-29 20:07:00 +09:00
mattiapette	6dd6f08bd0	Random song selection when entering the select menu with default osu theme or invalid beatmap	2017-11-29 11:51:56 +01:00
Dean Herbert	d4c1359a49	Merge branch 'master' into update-statistics-async	2017-11-29 19:27:22 +09:00
smoogipoo	ee35422efc	Handle rulesets that don't support composition a bit better	2017-11-29 18:38:12 +09:00
smoogipoo	309eb4edd7	Integrate HitObjectComposer into Compose ... Also removes the other rulesets' HitObjectComposers for now.	2017-11-29 17:46:21 +09:00
smoogipoo	f586cbac32	Restructure Compose to use grids and eventually support HitObjectContainer	2017-11-29 16:47:52 +09:00
Aergwyn	3bdf82d8df	refactor newly added code to be less redundant	2017-11-28 21:38:11 +01:00
Aergwyn	6a4cc93360	fixes crash if all beatmaps of a set are hidden	2017-11-28 21:26:13 +01:00
Unknown	a30cd42ba2	Make retry button not look drunk.	2017-11-28 14:38:35 +05:30
Unknown	e832f163e7	Add failure test case. ... - Only show failure if request wasn't cancelled	2017-11-28 12:09:32 +05:30
Unknown	ac1fb5118c	Fix line endings and derp that was causing request failures.	2017-11-28 11:35:39 +05:30
Dean Herbert	96d42b3e5b	Fix redundant string interpolation	2017-11-27 18:20:13 +09:00
Dean Herbert	7877f42763	Merge remote-tracking branch 'upstream/master' into new-sounds-and-more	2017-11-27 17:59:24 +09:00
FreezyLemon	82a9b57277	Removed unnecessary "using" statement	2017-11-27 08:58:09 +01:00
FreezyLemon	b4513497d6	Added a textContainer reference to MetadataSection so casting is no longer required for setting new text	2017-11-27 08:52:26 +01:00
FreezyLemon	507da0dfb7	Renamed addTextAsync to setTextAsync	2017-11-27 08:48:47 +01:00
FreezyLemon	ac0942df86	Removed unnecessary private method to update the metadata	2017-11-27 08:48:12 +01:00
FreezyLemon	d49ee295d9	Removed unnecessary schedule and null checks	2017-11-27 08:47:36 +01:00
FreezyLemon	b34e724b8d	Changed MetadataSection so that the Text setter loads the new text in async before displaying it.	2017-11-27 08:18:09 +01:00
Dan Balasescu	a574b092f6	Merge branch 'master' into change-transition-blur-rate	2017-11-27 10:42:32 +09:00
Dan Balasescu	77bfc6037d	Merge branch 'master' into fix-stuck-in-play	2017-11-27 10:06:34 +09:00
Dan Balasescu	55741f3898	Merge branch 'master' into show-converts-toggle	2017-11-27 09:41:30 +09:00
Unknown	ae201f0ef5	R#	2017-11-26 15:03:49 +05:30
Dean Herbert	5aa6615107	Add confirm-selection sound in song select	2017-11-26 17:21:22 +09:00
Dean Herbert	af499df6dd	Make a base OsuButton class to handle default samples	2017-11-26 17:17:48 +09:00
Dean Herbert	ae48b85827	Don't play logo select sample when actions are playing their own	2017-11-26 17:17:47 +09:00
Dean Herbert	07d6a70028	New sound effects with better names	2017-11-26 17:17:46 +09:00
Dean Herbert	69e388dd52	Adjust background blur rate	2017-11-26 17:08:14 +09:00
Unknown	4212315504	Use a single placeholder container for empty and retry.	2017-11-26 12:50:20 +05:30
Unknown	b261d32588	Put retry button in a BeatSyncedContainer and change error message.	2017-11-26 12:25:48 +05:30
Unknown	f4f732ca43	Remove unnecessary null check and tweak transform a bit.	2017-11-26 11:19:42 +05:30
Unknown	7be55df790	fix being stuck in gameplay if exit is pressed too fast ... The reliance on `pauseOverlay.Alpha == 1` created a race condition that, when you pressed Exit while the pauseoverlay is still fading in, could get you stuck in gameplay. The game wants to show the pause overlay but also thinks it's already paused and returns early.	2017-11-25 19:09:05 +01:00
Unknown	ae9ce2f122	Unbind ruleset event from leaderboard.	2017-11-25 21:23:36 +05:30
Unknown	0b3f75505e	Don't break VisualTests and add a real beatmap step.	2017-11-25 20:59:03 +05:30
Huo Yaoyuan	d955229ee5	Handle user rating metrics when no maps by using more linq.	2017-11-25 21:29:23 +08:00
Unknown	e723e66850	Merge remote-tracking branch 'upstream/master' into leaderboard-scopes	2017-11-24 19:14:50 +05:30
Unknown	c5a78e54e9	Add a retry button for when scores request fails.	2017-11-24 18:40:52 +05:30
Dean Herbert	09facdc838	Add a setting to toggle showing converted beatmaps	2017-11-24 18:34:20 +09:00
smoogipoo	3d8432aecf	Merge branch 'master' into fix-player-testcases	2017-11-24 13:23:42 +09:00
Dean Herbert	c7a5a7cd93	Merge remote-tracking branch 'upstream/master' into fix-player-testcases	2017-11-23 23:42:19 +09:00
Dean Herbert	6ddefa5f8c	Merge branch 'master' into improve-user-ratings-calculations	2017-11-23 23:33:05 +09:00
Dean Herbert	dbb03bcff2	Handle the case where a map hasn't been rated yet	2017-11-23 23:30:57 +09:00
Dan Balasescu	dd78479a1a	Merge branch 'master' into fix-ef-issues	2017-11-23 21:18:20 +09:00
Dean Herbert	2f3e4a27c6	Merge branch 'master' into improve-user-ratings-calculations	2017-11-23 20:55:55 +09:00
Dean Herbert	9565a9c352	Fix TestCasePlayer not working as expected	2017-11-23 20:42:07 +09:00
FreezyLemon	00830c190c	Merge branch 'master' of https://github.com/ppy/osu	2017-11-23 12:39:36 +01:00
FreezyLemon	a60e53c382	Changed the text updates into a scheduled (async) operation, and implemented this in the updateStatistics and clearStats methods	2017-11-23 12:31:18 +01:00
Dean Herbert	9db6ef6657	Fix unfixed regressions	2017-11-23 20:23:47 +09:00
Dean Herbert	4986ad73f7	Merge remote-tracking branch 'upstream/master' into load-optimization	2017-11-23 18:44:17 +09:00
Dean Herbert	d93911ae97	Improve user ratings calculations to make more sense ... Closes #1552.	2017-11-23 18:10:08 +09:00
naoey	b6de1ce5b6	Handle query params better.	2017-11-23 14:36:12 +05:30
Unknown	096e98b5d3	Add game mode query to request. ... - Also update scores when game mode is changed	2017-11-23 14:36:12 +05:30
naoey	487483eadd	Move loader hiding to a better place.	2017-11-23 14:36:12 +05:30
naoey	a58bd72c6e	Add placeholder when there are no scores.	2017-11-23 14:36:12 +05:30
naoey	fe559f4b62	Add respective query params to GetScoreRequest based on selected tab.	2017-11-23 14:36:12 +05:30
FreezyLemon	2cc2323791	Style changes (removing newline from before second constructor parameter)	2017-11-23 09:12:23 +01:00
Dean Herbert	1824540325	Schedule calls to correct thread ... These could be fired from an async worker thread (for instance, maintenance operations).	2017-11-23 17:02:54 +09:00
FreezyLemon	18b0b77f0a	Added requested changes. Mainly changing lambdas to direct function references.	2017-11-22 21:41:50 +01:00
FreezyLemon	7d428875b8	Changed LoadWrapper back to DelayedLoadWrapper and fixed the implementation (dependent on framework change, delay now in ctor)	2017-11-22 15:46:04 +01:00
smoogipoo	de7c571be3	Merge remote-tracking branch 'origin/master' into netstandard	2017-11-22 19:46:17 +09:00
Dean Herbert	517a9ec40f	Merge branch 'master' into async-beatmap-panels	2017-11-22 19:05:42 +09:00
Dean Herbert	36d45f633d	Reorder methods	2017-11-22 11:57:09 +09:00
Dean Herbert	e3c5a599b6	Tidy some regressions	2017-11-22 11:36:29 +09:00
Dean Herbert	27fb598352	Update colours to match design	2017-11-22 11:34:54 +09:00
Dean Herbert	0f8499c580	Rename to PlaybackControl and add a TestCase	2017-11-22 11:22:46 +09:00
Dean Herbert	ff5404e57f	Remove need for AlwaysPresent ... Also self-contains the tab options inside the tab control.	2017-11-22 11:21:48 +09:00
Dean Herbert	855acc9401	Fix leading space before percent sign	2017-11-22 11:17:10 +09:00
Dean Herbert	c06d6d0bbb	Rename weird method	2017-11-22 10:59:31 +09:00
Dean Herbert	461c8e8be0	Clean up state change logic	2017-11-22 10:55:06 +09:00
Dean Herbert	63d366ea4b	Bindables should be readonly	2017-11-22 10:54:33 +09:00
FreezyLemon	1d41e7cc8a	Removed newline at end	2017-11-21 20:15:42 +01:00
FreezyLemon	2203a84300	Small fixes and style corrections	2017-11-21 19:16:44 +01:00
FreezyLemon	870807c265	Switched over to the new LoadWrapper class for all delayed loading.	2017-11-21 16:17:33 +01:00
FreezyLemon	a033eb46d3	Changed to LoadComponentAsync call instead of adding an AsyncLoadWrapper instance.	2017-11-21 16:12:23 +01:00
Dean Herbert	2603219350	Load beatmap carousel panels asynchronously	2017-11-21 22:30:09 +09:00
Dean Herbert	aff217cd03	Fix early access to beatmap in LogoVisualisation ... Missed this one..	2017-11-21 19:47:12 +09:00
Dean Herbert	7b916806f9	Merge branch 'master' into fix-info-wedge	2017-11-21 19:12:19 +09:00
Dean Herbert	c2fcb2f9c7	Fix info wedge not displaying	2017-11-21 18:45:12 +09:00
EVAST9919	10f730a004	Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed	2017-11-21 12:39:14 +03:00
EVAST9919	41498ffad3	Apply suggestions	2017-11-21 12:22:19 +03:00
smoogipoo	0d1b5ae44f	Adjust bottom bar sizing as suggested	2017-11-21 17:51:07 +09:00
smoogipoo	238756ec5d	Merge remote-tracking branch 'origin/master' into editor-playback-speed	2017-11-21 17:41:16 +09:00
Dan Balasescu	c39e76fdea	Merge branch 'master' into sudden-death	2017-11-21 17:37:40 +09:00
Dan Balasescu	142b74cc47	Merge branch 'master' into sudden-death	2017-11-21 17:32:31 +09:00
smoogipoo	c30d31e037	Remove extra alternateFailConditions function in Player	2017-11-21 17:30:19 +09:00
smoogipoo	b3bf6e7bee	Merge master into netstandard	2017-11-21 16:39:21 +09:00
Dean Herbert	66f72baa39	Avoid LogoVisualisation accessing the track before it's loaded	2017-11-21 12:42:28 +09:00
Dean Herbert	bd616c1307	Simplify some property access	2017-11-21 12:42:28 +09:00
Dean Herbert	be9c99ade3	Remove AsyncLoadWrapper dependence	2017-11-21 12:42:28 +09:00
Dean Herbert	e7654254d2	Remove unused code	2017-11-21 12:42:28 +09:00
Dean Herbert	5db2d383ed	Remove temporary variable in beatmap background update	2017-11-21 12:42:28 +09:00
Dean Herbert	4f6263ef86	Make many internal classes and methods public ... This is important when using dynamic compiling to rapidly iterate. Until we actually split projects out into pieces (like the abstract ruleset project we have talked about) there is no advantage to using internal in the osu! game code.	2017-11-21 12:06:16 +09:00
smoogipoo	aac41d2de6	Disable resharper inspections on case-by-case basis	2017-11-20 18:55:48 +09:00
Dan Balasescu	a2e45293d6	Merge branch 'master' into fix-result-screen	2017-11-20 18:18:08 +09:00
Brayzure	da30d76f9b	Implement Score Processor Mod Interface ... - Add a delegate whenever we want to register an additional fail condition	2017-11-20 02:15:29 -05:00
EVAST9919	ecc2877be6	Fix possible null and adjust timeline width	2017-11-20 09:29:26 +03:00
EVAST9919	9fe7ebc0ce	Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed	2017-11-20 09:18:22 +03:00
Aergwyn	0b5614e4ee	fix result screen not showing name of mapper	2017-11-18 22:12:15 +01:00
Dean Herbert	9325730f5d	Fix leaderboard fadeout causing constant flow changes ... Also cleans up logic significantly.	2017-11-19 00:53:59 +09:00
Dean Herbert	60778593c3	Make pressing space twice at main menu a bit smoother	2017-11-18 22:24:51 +09:00
Dean Herbert	b835f1b708	Merge branch 'master' into fix-main-menu-osu-logo	2017-11-18 21:53:04 +09:00
Brayzure	de4d8eb196	Implement Sudden Death and Perfect ... - Two additional fail conditions	2017-11-18 01:28:09 -05:00
EVAST9919	4ee3a89c12	Remove using	2017-11-18 08:35:00 +03:00
EVAST9919	34d8f94f99	Add track timer	2017-11-18 08:24:09 +03:00
Dean Herbert	c2d1de34fc	Fix logo not always returning to the correct state when rapidly changing menus ... Fixes #1005 for real	2017-11-18 11:19:15 +09:00
EVAST9919	a741d6cea7	Fix incorrect score indexes in leaderboard	2017-11-18 04:46:02 +03:00
Dean Herbert	322dd1bd05	Rename variables to make more sense	2017-11-18 10:35:17 +09:00
Dean Herbert	f6ea5b0590	Remove duplicated code	2017-11-18 10:34:17 +09:00
Dean Herbert	c2b6e958f7	Merge remote-tracking branch 'upstream/master' into fix-main-menu-osu-logo	2017-11-18 10:28:00 +09:00
EVAST9919	58e7263108	CI fixes	2017-11-18 03:09:09 +03:00
EVAST9919	0b8fed4e5a	Remove useless Dimention params	2017-11-18 01:51:23 +03:00
EVAST9919	7492ab6495	Use GridContainer to place the bottom bar objects	2017-11-18 01:48:50 +03:00
EVAST9919	0cad5a5ca3	Merge remote-tracking branch 'refs/remotes/ppy/master' into editor-playback-speed	2017-11-18 01:15:50 +03:00
EVAST9919	07e0aba01c	Remove using	2017-11-17 14:10:13 +03:00
EVAST9919	1680c0905f	Fix track tempo could be less than 1 on exiting the editor	2017-11-17 14:02:07 +03:00
EVAST9919	cc04d5bc61	Add all the objects to the PlaybackContainer	2017-11-17 13:35:41 +03:00
EVAST9919	d62da4334e	Add and place all the bottom bar objects	2017-11-17 12:26:13 +03:00
Dean Herbert	8bd59ff0b3	Fix osu! logo occasionally being in the wrong state on entering the main menu	2017-11-17 17:40:10 +09:00
Dean Herbert	6c40cf08cc	Optimise leaderboard display ... Adds async loading support and cleans up the code quite a bit in the process.	2017-11-16 23:22:25 +09:00
Dean Herbert	62358c0b53	Merge branch 'master' into beatmap_scores	2017-11-16 00:45:17 +09:00
Dean Herbert	f912744acc	Fix sizing of ModIcon	2017-11-16 00:15:27 +09:00
Dean Herbert	8011048540	Fix hard crash when clicking play button with no map selected ... Resolves #1507.	2017-11-15 20:03:18 +09:00
Dean Herbert	eaf1a60fe1	Merge branch 'master' into beatmap_scores	2017-11-15 17:58:07 +09:00
EVAST9919	ea2fa5fa00	Fix wrong ratings calculations	2017-11-15 09:48:40 +03:00
EVAST9919	8688afecde	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores	2017-11-14 20:13:07 +03:00
smoogipoo	9344502b71	More warning fixes	2017-11-14 18:05:07 +09:00
smoogipoo	bd7a6a90f5	Remove unused fields	2017-11-14 17:43:19 +09:00
smoogipoo	cd8d7af9db	Clean up a few warnings in preparation for net-standard	2017-11-14 13:06:25 +09:00
EVAST9919	d157e6baf1	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores	2017-11-13 16:02:44 +03:00
Dean Herbert	a2cb9d4086	Fix audio not playing during player loading ... Regression due to changed audio initialisation logic.	2017-11-13 19:43:00 +09:00
Dean Herbert	49a5af60e2	Fix multiple order-of-execution issues with osu! logo ... Also sets better defaults.	2017-11-13 18:43:16 +09:00
Dean Herbert	ee3a5b38f4	Merge branch 'master' into performance-improvements	2017-11-13 13:50:57 +09:00
EVAST9919	51adea2a60	Convert text to a local variable	2017-11-13 05:58:19 +03:00
EVAST9919	89e9f84753	Add padding to the text container	2017-11-13 05:52:05 +03:00
EVAST9919	ec75837965	Replay speed setting visual improvements	2017-11-13 05:04:21 +03:00
Dean Herbert	11077546d1	Load logo async	2017-11-13 09:50:37 +09:00
EVAST9919	072e5db6ef	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap_scores	2017-11-11 07:16:26 +03:00
Dean Herbert	7d4e1b6f22	Don't require a local storage variable for restoring playback speed	2017-11-11 13:03:46 +09:00
Dean Herbert	3142832693	Add precision to playback speed	2017-11-11 13:00:29 +09:00
EVAST9919	5bf756c3c6	Add DrawableTopScore	2017-11-11 06:54:52 +03:00
Dean Herbert	3d1d66d886	Merge branch 'master' into replay_speed	2017-11-11 10:41:38 +09:00
EVAST9919	4b21c83f35	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-11-10 17:24:26 +03:00
smoogipoo	5816d25358	Merge remote-tracking branch 'origin/master' into replay-rewinding	2017-11-10 22:19:17 +09:00
Dan Balasescu	89fd92c15b	Merge branch 'master' into menu-select-transition-improvements	2017-11-10 21:03:24 +09:00
Dean Herbert	49731f4c05	Remove unused parmeter	2017-11-10 19:32:09 +09:00
Dean Herbert	bd2de89918	Why weren't these fixed previously	2017-11-10 19:26:25 +09:00
Dean Herbert	4a5a293376	Merge branch 'master' into replay-rewinding	2017-11-10 19:08:13 +09:00
Dean Herbert	bc54d4dd4f	Ensure we wait for audio track reset before proceeding with player execution	2017-11-10 18:32:15 +09:00
Dean Herbert	9e82fc21ac	Improve transition when exiting song select ... Reduces the delay before the main menu appears, but also synchronises the full main menu appearance animation with the logo's apperance.	2017-11-10 01:10:44 +09:00
Dean Herbert	5eb94f7e68	Fix loader pushing children screens before it is displayed itself	2017-11-09 23:29:56 +09:00
Dean Herbert	724540ceaa	Fix toolbar not appearing at main menu	2017-11-09 20:38:34 +09:00
Dean Herbert	598e1652dc	Adjust timings	2017-11-09 18:12:33 +09:00
Dean Herbert	6d56b3c2df	Hide triangles during outro	2017-11-09 17:52:38 +09:00
Dean Herbert	e3a868744e	Merge branch 'master' into intro-v2	2017-11-09 17:48:42 +09:00
Dean Herbert	4874371dbf	Rename methods back	2017-11-09 17:38:20 +09:00
Dean Herbert	e2005c4431	Add comment explaining necessity of AlwaysPresent for now	2017-11-08 20:36:18 +09:00
Dean Herbert	df6c808d28	Adjust animation to designer-san's liking	2017-11-08 17:04:36 +09:00
Dean Herbert	cabb22b6d1	Merge branch 'single-osu-logo' into intro-v2	2017-11-08 16:43:07 +09:00
Dean Herbert	c2d4a213b1	Rename logo-related methods	2017-11-08 16:34:03 +09:00
Dean Herbert	a8bacd1ed4	Remove unnecessary private method /shrug	2017-11-08 14:46:47 +09:00
Dean Herbert	7ad498cb29	Remove unused puzzle pieces	2017-11-08 14:45:01 +09:00
Dean Herbert	90fec5f370	Merge branch 'master' into single-osu-logo	2017-11-08 14:37:20 +09:00
Dean Herbert	41fcecf759	Add intro in to actual game	2017-11-08 14:31:11 +09:00
Dean Herbert	d8d7165164	Add a test case which starts the game	2017-11-08 13:52:44 +09:00
Dean Herbert	713d730d10	Simplify restart process and defaults initialisation	2017-11-08 13:32:03 +09:00
Dean Herbert	1771e003f7	Simplify more	2017-11-08 12:13:30 +09:00
Dean Herbert	419f041291	Fix text alignment	2017-11-08 12:12:27 +09:00
Dean Herbert	f83c095269	Simplify more	2017-11-08 12:10:32 +09:00
Dean Herbert	89426e1c11	Simplify lines	2017-11-08 12:07:52 +09:00
Dean Herbert	7dcdf78608	Make bars and circles better	2017-11-08 12:06:22 +09:00
Dean Herbert	a72e798b85	bar -> line	2017-11-08 11:21:50 +09:00
Dean Herbert	97b238d084	Simplify intro sequence a bit more	2017-11-08 11:20:21 +09:00
Dean Herbert	552a361a24	Merge remote-tracking branch 'upstream/master' into intro-v2	2017-11-08 11:08:42 +09:00
Dean Herbert	5af2cc29f5	Merge branch 'master' into song_select_delete	2017-11-07 16:42:40 +09:00
smoogipoo	2fbd490626	Make RemainingTimeCounter into a Counter	2017-11-06 14:58:05 +09:00
EVAST9919	1afe2c18be	Fix osu! deleting beatmaps on startup if MenuMusic is disabled	2017-11-04 19:42:28 +03:00
smoogipoo	3b189c1ffe	Fix BreakOverlay not properly working with rewinding ... In various ways: * It wouldn't show up if rewound after the break was complete. * The time would increase backwards if rewind happened during a break. * Etc. * Basically the fix is to use transformations everywhere. BreakOverlay could be refactored further, but this is enough to make it work for now.	2017-11-03 21:20:36 +09:00
Dean Herbert	3adcfa8c38	Many fixes	2017-11-03 17:54:35 +09:00
Dean Herbert	2f205d1f63	Merge branch 'single-osu-logo' into intro-v2	2017-11-03 15:37:24 +09:00
Dean Herbert	6a206c616b	Update in line with framework changes	2017-11-03 14:34:12 +09:00
Dean Herbert	8f78d84ad6	Make intro resume slower	2017-11-02 21:52:23 +09:00
Dean Herbert	c99ffb4aa3	Fix potential nullref	2017-11-02 21:52:12 +09:00
Dean Herbert	9b2d41f4eb	Fix quick retry looking bad	2017-11-02 21:52:01 +09:00
Dean Herbert	b8b05fe8d2	Make the osu! logo shared game-wide ... There should only ever be one osu! logo. It is now passed around between screens in a superfluous manner.	2017-11-02 20:38:02 +09:00
Dean Herbert	6fa02ce9bb	Use internal less ... Allows for more dynamic compilation to succeed. No reason for using internal here anyways.	2017-11-01 17:10:54 +09:00
Dean Herbert	27156aeb93	Fix the shit	2017-11-01 17:07:03 +09:00
Dean Herbert	15197b9a76	Use internal less ... Allows for more dynamic compilation to succeed. No reason for using internal here anyways.	2017-11-01 16:57:59 +09:00
smoogipoo	04b271cce9	Migrate osu.Game project to VS2017 project structure	2017-10-30 22:24:11 +09:00
Dean Herbert	f486ab1f6c	Merge branch 'master' into song_select_delete	2017-10-30 21:07:02 +09:00
EVAST9919	a7bcae4869	Add startup value for the slider	2017-10-26 15:18:06 +03:00
EVAST9919	08637253df	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-10-26 15:04:44 +03:00
EVAST9919	189b51551d	Merge remote-tracking branch 'refs/remotes/ppy/master' into intro	2017-10-26 14:40:40 +03:00
Dean Herbert	5001e9f264	Fix Hide/Restore/Delete etc.	2017-10-25 22:08:34 +09:00
Dean Herbert	26d8b67f25	Merge branch 'master' into config-slider-keyboardstep	2017-10-24 08:14:56 +09:00
Dean Herbert	dc9c474033	Move all TestCases to Testing project ... This allows tests to successfully retrieve rulesets, as they are referenced.	2017-10-23 19:32:02 +09:00
Shane Woolcock	ea2934d92c	Add KeyboardStep values for configuration options	2017-10-23 16:06:08 +10:30
Dean Herbert	f69fa0cf1f	Fix selection after hiding all difficulties in a set	2017-10-20 11:16:56 +09:00
Dean Herbert	5d5ea5fb2e	Fix all remaining db structure issues	2017-10-19 14:05:11 +09:00
Dean Herbert	a85de09c0f	Fix beatmap carousel interactions with deletion when not yet displayed	2017-10-18 18:36:35 +09:00
Dean Herbert	2f3319552d	Merge remote-tracking branch 'upstream/master' into EfCore	2017-10-18 11:43:37 +09:00
EVAST9919	bae91d7de7	Simplify gradient usage in Letterbox Overlay	2017-10-18 05:06:17 +03:00
Dean Herbert	31dc5c97f2	Fix intro and duplicate inserts	2017-10-17 11:22:42 +09:00
Huo Yaoyuan	c2836a8393	Use format string for double instead of Math.Round.	2017-10-16 12:59:59 +09:00
Huo Yaoyuan	9b3676c562	Use format string for double instead of Math.Round.	2017-10-15 16:44:15 +08:00
EVAST9919	e3ce641ea0	Merge remote-tracking branch 'refs/remotes/ppy/master' into intro	2017-10-15 00:15:25 +03:00
EVAST9919	f4428980a6	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-10-15 00:10:15 +03:00
EVAST9919	24ca7a5119	Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete	2017-10-15 00:09:50 +03:00
smoogipoo	9924f518b7	Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore ... # Conflicts: # osu-framework # osu.Game/Beatmaps/BeatmapMetadata.cs # osu.Game/osu.Game.csproj # osu.Game/packages.config	2017-10-14 16:36:37 +09:00
smoogipoo	b178be21d1	Let's not rename columns yet	2017-10-14 14:30:58 +09:00
smoogipoo	b83d7cd4df	Merge remote-tracking branch 'origin/master' into UselessToucan/EfCore ... # Conflicts: # osu-framework # osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs # osu.Game/Beatmaps/BeatmapInfo.cs # osu.Game/Online/API/Requests/GetBeatmapSetsResponse.cs	2017-10-14 12:38:59 +09:00
Dean Herbert	cd722e4abb	Fix beatmap author being stored in two different places	2017-10-14 11:39:55 +09:00
EVAST9919	6711331f66	Merge remote-tracking branch 'refs/remotes/ppy/master' into intro	2017-10-14 05:18:03 +03:00
EVAST9919	7a72f2e3f5	Make sure we restore the clock rate on exiting	2017-10-14 05:15:18 +03:00
EVAST9919	bdcc70e0bb	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-10-14 05:06:36 +03:00
EVAST9919	502940ddf3	Fix deleting last visible beatmap doesn't trigger selecting null beatmap	2017-10-14 05:05:38 +03:00
EVAST9919	583f8358b6	Merge remote-tracking branch 'refs/remotes/ppy/master' into song_select_delete	2017-10-14 04:32:12 +03:00
Dean Herbert	c0d64bf409	Use Gray instead of FromHex for grays	2017-10-12 22:19:29 +09:00
Dean Herbert	37fc69b9f7	Set a default zoom level that isn't the whole track	2017-10-12 22:19:02 +09:00
Dean Herbert	37b88d834e	Adjust padding slightly	2017-10-12 22:10:37 +09:00
smoogipoo	ab62390336	Make TimelineButtons combined take up the full height of the timeline	2017-10-12 18:32:39 +09:00