3651 Commits

Author	SHA1	Message	Date
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
smoogipoo	a6901c0a27	Change TimelineButton icon colour to white when hovered	2017-10-12 18:17:36 +09:00
smoogipoo	5ccfc1918e	Hook up more bindables for hitobjects/hitsounds	2017-10-12 17:51:01 +09:00
smoogipoo	db672becbc	Implement waveform checkbox	2017-10-12 17:50:51 +09:00
smoogipoo	3c35a7a6ae	graph -> waveform	2017-10-12 17:37:40 +09:00
smoogipoo	4586877239	Implement magnification buttons	2017-10-12 17:31:21 +09:00
smoogipoo	de8f9325a3	Implement TimelineButton and use for the magnification buttons	2017-10-12 16:10:33 +09:00
smoogipoo	2844764e3c	Hit Objects/Hit Sounds -> Hitobjects/Hitsounds	2017-10-12 15:37:45 +09:00
smoogipoo	e12fa49436	Integrate timeline into Compose	2017-10-12 15:37:00 +09:00
smoogipoo	6fbf52c3eb	Remove unused usings	2017-10-12 15:32:18 +09:00
EVAST9919	7cff413ab0	Fix wrong beatmap selection in song-select menu on deleting selected beatmap	2017-10-11 20:25:12 +03:00
TocoToucan	4653470779	Fix RulesetStore preparation	2017-10-10 22:29:16 +03:00
TocoToucan	8b01f8671f	Merge from ppy/master	2017-10-10 21:07:36 +03:00
EVAST9919	28a594179f	CI fixes	2017-10-10 21:03:35 +03:00
EVAST9919	15160f5116	Simplify the code by using more delayed sequences	2017-10-10 20:43:07 +03:00
EVAST9919	d3a62082b4	Final adjustments	2017-10-10 20:20:49 +03:00
EVAST9919	a58e828f54	Timing adjustments	2017-10-10 20:06:18 +03:00
EVAST9919	10a3f7c1d0	Use constants instead of magic numbers	2017-10-10 18:30:46 +03:00
EVAST9919	c34b9aef98	No need to put a lot of stuff inside the big circular container	2017-10-10 15:29:29 +03:00
EVAST9919	67a6da44f9	Rings timing adjustment	2017-10-10 15:02:43 +03:00
smoogipoo	1cf8c0284a	Re-namespace a few classes	2017-10-10 15:22:39 +09:00
smoogipoo	166194e6b6	Further logic simplification	2017-10-10 15:09:26 +09:00
EVAST9919	9cad0ce2e9	Group transforms using delayed sequence ... And some timing adjustments	2017-10-10 07:07:09 +03:00
smoogipoo	074a1db4a1	Implement scrolling and better zoom	2017-10-10 12:45:27 +09:00
EVAST9919	6fb8755a95	Use less masking for the ring	2017-10-10 06:06:09 +03:00
EVAST9919	19723b82f7	Remove ring's background field and adjust some timings	2017-10-10 04:12:01 +03:00
EVAST9919	e2d6659d48	Change Ring type, use RelativeSizeAxes for Background/Foreground	2017-10-10 03:57:15 +03:00
EVAST9919	59a0343c01	CI fixes	2017-10-10 01:36:40 +03:00
EVAST9919	0baceaaf0d	Merge remote-tracking branch 'refs/remotes/ppy/master' into intro	2017-10-10 00:56:54 +03:00
smoogipoo	cb58a1371e	Merge branch 'editor-waveform' into editor-waveform-timeline ... # Conflicts: # osu.Game/osu.Game.csproj	2017-10-09 18:10:52 +09:00
smoogipoo	b97b575b27	Merge remote-tracking branch 'origin/master' into editor-waveform ... # Conflicts: # osu-framework	2017-10-09 17:20:24 +09:00
smoogipoo	19b38983df	Update in-line with framework	2017-10-09 17:18:11 +09:00
TocoToucan	81b9e08fb6	Fix foreign key constraint failure	2017-10-09 00:30:52 +03:00
EVAST9919	402531d04c	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-10-06 20:37:59 +03:00
smoogipoo	10abaa866b	Put screens below the top and bottom bars of the editor	2017-10-07 01:56:11 +09:00
smoogipoo	c0b394811f	Make compose mode the default ... Hopefully we can keep this at a ScreenSelectionTabControl level, but it may need to be moved to the Editor at some point. I'm leaving that for a future change however, if it's needed.	2017-10-07 01:46:54 +09:00
smoogipoo	d432ab7510	Reorder screen tab control items	2017-10-07 01:44:20 +09:00
smoogipoo	38ae9d905e	Fix bindable binding to make the editor load a screen by default again	2017-10-07 01:42:45 +09:00
smoogipoo	837d1ba12e	Remove rounded corners on the editor menu bar	2017-10-07 01:38:13 +09:00
smoogipoo	d3109a5950	Hook up BeatmapPanel "Edit" item	2017-10-07 00:59:14 +09:00
smoogipoo	a154ee3a89	Add File -> Exit to editor menu	2017-10-07 00:51:30 +09:00
smoogipoo	fc99860f4e	Remove EditorMenuBarItem	2017-10-07 00:51:20 +09:00
Dean Herbert	19c663da11	Remove scale effect on editor screen switches	2017-10-06 23:41:49 +08:00
Dean Herbert	55267abe67	Merge branch 'master' into editor-screens	2017-10-06 23:19:16 +08:00
EVAST9919	0ec7d2dcf6	Merge remote-tracking branch 'refs/remotes/ppy/master' into replay_speed	2017-10-06 15:56:08 +03:00
EVAST9919	95ac4e9265	Remove useless using	2017-10-06 04:57:46 +03:00
EVAST9919	96fcc095eb	Apply suggested shrinking bar changes	2017-10-06 04:49:16 +03:00
TocoToucan	887aa7496b	Rework EF Core usage in model classes	2017-10-06 00:23:26 +03:00
EVAST9919	f8830e1b7c	Animation adjustments	2017-10-05 21:37:37 +03:00
smoogipoo	0a9d23b4ba	Update with framework changes (removal of WaveformDisplay)	2017-10-05 14:33:39 +09:00
EVAST9919	5caca1d328	Don't use '#' in RankDisplay for now	2017-10-05 05:27:52 +03:00
EVAST9919	cb0dbc6d9e	Fix shrinking bar lingering on the screen for too long	2017-10-05 05:23:18 +03:00
EVAST9919	cc99678a96	Remove useless usings	2017-10-05 05:09:23 +03:00
Dean Herbert	20bf0502ab	Use scheduling rather than raw transform delays	2017-10-05 10:03:48 +08:00
EVAST9919	22a59d753b	Make all the overlays IStateful	2017-10-05 04:38:13 +03:00
EVAST9919	cafacf20ff	Add all the needed objects	2017-10-05 02:50:13 +03:00
EVAST9919	6fa45aafc6	Basic logic	2017-10-04 23:06:31 +03:00
TocoToucan	6a4198d0d6	Initial EF Core commit	2017-10-04 22:52:12 +03:00
smoogipoo	dcd5cc6753	Merge branch 'editor-waveform' into editor-waveform-timeline	2017-10-04 22:00:44 +09:00
smoogipoo	8427bb44d1	Implement basic layout for the compose screen ScrollableTimeline	2017-10-04 22:00:42 +09:00
smoogipoo	ea45452993	Allow resolution > 1	2017-10-04 21:57:46 +09:00
smoogipoo	1377f73b46	Multiply resolution before clamping	2017-10-04 21:57:29 +09:00
smoogipoo	8bc20a2545	Merge branch 'editor-waveform' into editor-waveform-timeline	2017-10-04 19:49:23 +09:00
smoogipoo	8a52fdc8fa	Use a bindable for the current screen in EditorMenuBar ... Replaces the current Action.	2017-10-04 19:37:17 +09:00
smoogipoo	34eede0d04	Re-namespace EditorScreenMode	2017-10-04 19:36:55 +09:00
smoogipoo	e2824d4732	Reduce harshness of scale for now ... Though I don't feel like we should worry about this much just yet until we have actual designs and can see how it looks. It's very well possible that we use different transitions here...	2017-10-04 19:26:26 +09:00
smoogipoo	357a467337	Implement design mode	2017-10-04 19:24:19 +09:00
smoogipoo	5ca4a2d2c8	Add some nullchecks to WaveformDisplay	2017-10-04 19:09:39 +09:00
smoogipoo	81960c7b48	CI fixes	2017-10-04 19:03:02 +09:00
smoogipoo	80e984f72d	Update in-line with framework	2017-10-04 18:55:38 +09:00
smoogipoo	01c839eda7	Move WaveformDisplay into separate class and add some commenting	2017-10-04 17:51:28 +09:00
smoogipoo	cf44868bcd	Give EditorScreen a Beatmap	2017-10-04 15:02:11 +09:00
EVAST9919	1c132938df	Allow visibility can be toggled only if replay is loaded	2017-10-03 20:26:53 +03:00
EVAST9919	feb0b1852f	Remove the dangerous function	2017-10-03 20:05:50 +03:00
EVAST9919	b94c78e993	Hide/Show Replay settings on pressing Ctrl+H	2017-10-02 19:33:58 +03:00
EVAST9919	4a298098c5	CI fixes	2017-10-02 18:19:55 +03:00
EVAST9919	c34cc07fda	Remove default bindable from the config manager	2017-10-02 18:09:00 +03:00
EVAST9919	b6ed977e1e	Fix hard crash and fix breaks have been initialized twice	2017-10-02 09:04:03 +03:00
EVAST9919	7052462863	Update inline with framework	2017-10-02 08:51:00 +03:00
EVAST9919	c2f487aa3e	Add Rank as a property to the Score Processor	2017-10-02 05:56:38 +03:00
EVAST9919	5ce2723719	Don't use linq query	2017-10-02 05:12:56 +03:00
EVAST9919	6d97da8b19	Add replay speed adjustment	2017-10-02 04:42:38 +03:00
smoogipoo	7211dd2015	Remove unnecessary usings	2017-10-02 10:11:43 +09:00
smoogipoo	69b61a62a5	Implement base Compose screen	2017-10-02 10:09:21 +09:00
smoogipoo	af4c6276e4	Adjust transforms of EditorScreen	2017-10-02 10:09:10 +09:00
smoogipoo	91cede79c2	Mask the editor screens	2017-10-02 10:07:34 +09:00
smoogipoo	6018b4e5e4	Make EditorScreen a Container	2017-10-02 09:34:51 +09:00
smoogipoo	2a310f02bc	modeContainer -> screenContainer	2017-10-02 09:27:27 +09:00
smoogipoo	c2d63eb0bd	Add EditorScreen + screen changing functionality	2017-10-02 09:26:52 +09:00
smoogipoo	221902f4fe	Restructure Editor construction	2017-10-02 09:26:16 +09:00
smoogipoo	7b1ef53f36	Expose a mode change event from EditorMenuBar	2017-10-02 09:24:25 +09:00
smoogipoo	8ed23a60e9	Remove items from the editor menu bar	2017-10-02 09:10:40 +09:00
EVAST9919	ac6c323f93	Clear all tasks and transforms when resetting Breaks	2017-10-02 00:44:57 +03:00
EVAST9919	b62f2437ac	Don't allow counter became 0	2017-10-01 23:38:11 +03:00
EVAST9919	2f852d705e	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-10-01 23:10:49 +03:00
smoogipoo	21c6a63fa1	Use using for Description	2017-09-29 20:03:09 +09:00
smoogipoo	7b4348254c	Don't use new	2017-09-29 20:02:55 +09:00
Dean Herbert	eed358a2c1	Merge branch 'master' into editor-screen-selection	2017-09-29 18:24:46 +08:00
smoogipoo	775e8bada5	Make the background bottom corners look nice with the new hover functionality	2017-09-29 15:13:38 +09:00
smoogipoo	b2eab1f435	Set the hover background colour as dictated by flyte	2017-09-29 15:09:56 +09:00
smoogipoo	6bb5210c7c	Remove the parentSizedBox	2017-09-29 15:09:28 +09:00
EVAST9919	e7632b6e6f	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-09-28 14:44:31 +03:00
Dean Herbert	4eaf6b4b94	Remove single usage of dynamic and stop referencing Microsoft.CSharp.dll	2017-09-28 00:14:04 +08:00
smoogipoo	95364d0173	No more box background	2017-09-27 22:15:11 +09:00
smoogipoo	ba8bf6cbd5	Add ScreenSelectionTabControl to EditorMenuBar	2017-09-27 22:01:53 +09:00
smoogipoo	545c375199	Update design of EditorMenuBar to match flyte's design more closely	2017-09-27 22:01:03 +09:00
Dean Herbert	e64860ad45	Fix test case not working as expected	2017-09-27 12:46:34 +08:00
Dean Herbert	faad3fc7d3	Arbitrarily move colour assignment	2017-09-27 12:40:32 +08:00
Dean Herbert	d5ed218488	Fix timeline sizes being updated potentially before the track has a length	2017-09-27 11:07:43 +08:00
Dean Herbert	7ad21d9a6d	Simplify marker part construction	2017-09-27 11:07:23 +08:00
Dean Herbert	eae29820c0	Fix marker being cleared each beatmap change	2017-09-27 11:07:17 +08:00
Dean Herbert	708632bca8	Remove second unnecessary colour set	2017-09-27 10:06:36 +08:00
EVAST9919	c696f74578	Fix broken testcase and apply suggested changes	2017-09-27 01:10:48 +03:00
EVAST9919	3cd6319ffa	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-09-27 00:32:38 +03:00
Dean Herbert	7c70d3d2cb	Merge branch 'master' into storyboard_integration	2017-09-26 20:19:26 +08:00
smoogipoo	10dbd68c1e	Simplify null check	2017-09-26 20:11:45 +09:00
smoogipoo	c578509a20	Bind to the screen Beatmap instead of the game-wide Beatmap	2017-09-26 17:58:40 +09:00
smoogipoo	3937ebdc3d	Add missing license headers	2017-09-26 15:58:30 +09:00
Dan Balasescu	b8b54e95a5	Merge branch 'master' into editor-timing-timeline	2017-09-26 15:54:01 +09:00
smoogipoo	10e5fe40b2	A bit of cleanup	2017-09-26 15:51:45 +09:00
smoogipoo	5953c1084e	Re-namespace SummaryTimeline	2017-09-26 15:45:27 +09:00
smoogipoo	85cb541fef	Implement MarkerPart for the marker	2017-09-26 15:45:08 +09:00
smoogipoo	a1f88a17b1	Re-namespace and split out timeline parts from the SummaryTimeline	2017-09-26 15:44:40 +09:00
Dean Herbert	f129902ee0	Avoid nullrefs when data is not present	2017-09-25 23:35:02 +08:00
Damnae	2d4616fd43	Apply beatmap settings when creating the DrawableStoryboard.	2017-09-25 11:03:57 +02:00
smoogipoo	d787c740fa	Fix bookmarks not working ... We should be dealing with the array in every situation, with the exception of the database.	2017-09-25 17:46:51 +09:00
Damnae	0996867112	Move StoryboardReplacesBackground and StoryboardAspect properties to Storyboard.	2017-09-25 10:40:22 +02:00
smoogipoo	7fb8008e44	Merge remote-tracking branch 'origin/master' into editor-timing-timeline ... # Conflicts: # osu-framework	2017-09-25 17:20:55 +09:00
Dean Herbert	0aebfdd578	Merge branch 'master' into icons_jumping_fix	2017-09-25 12:07:25 +08:00
EVAST9919	94269e119e	Reset text only if it has been changed	2017-09-23 19:59:34 +03:00
EVAST9919	0615f375e1	Show current grade	2017-09-23 19:52:44 +03:00
EVAST9919	a69bef8ec0	Use existing enum instead of my own	2017-09-23 16:51:31 +03:00
EVAST9919	2da3ea00b6	Bind break overlay to accuracy	2017-09-23 16:42:18 +03:00
EVAST9919	2290c3d5d5	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-09-23 15:48:29 +03:00
Huo Yaoyuan	442259d9e0	Fix overlay toggling in song select.	2017-09-23 19:47:23 +08:00
EVAST9919	ced6204219	oops	2017-09-22 22:10:05 +03:00
EVAST9919	d73b40768e	More arrow adjustments to match the design	2017-09-22 21:12:58 +03:00
EVAST9919	92eb8e4fa9	Move blurred icons to a parallax container	2017-09-22 21:00:45 +03:00
EVAST9919	6fe2b64abd	Start breakOut animation a bit earlier	2017-09-22 20:50:00 +03:00
EVAST9919	d58e5a6130	Arrows improvements	2017-09-22 20:43:51 +03:00
EVAST9919	3202d35a79	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-09-22 17:36:37 +03:00
EVAST9919	56bde64839	Add arrows overlay	2017-09-22 01:16:05 +03:00
EVAST9919	5383e33f3d	Remove useless clock assignment	2017-09-21 22:58:49 +03:00
EVAST9919	22ab2c5e5d	Apply suggested changes	2017-09-21 22:54:46 +03:00
EVAST9919	9667270336	Remove using	2017-09-21 01:56:50 +03:00
EVAST9919	e051bcc6df	Fix wrong arrows position on startup	2017-09-21 01:51:40 +03:00
EVAST9919	c79568135a	Add arrows	2017-09-21 01:44:30 +03:00
EVAST9919	18a714df74	Move every class to it's own file	2017-09-20 22:33:07 +03:00
EVAST9919	581689a84d	CI fixes	2017-09-20 20:58:20 +03:00
EVAST9919	4699a44608	Add info container	2017-09-20 20:50:14 +03:00
EVAST9919	8d7db52200	Add remaining time counter	2017-09-20 19:45:38 +03:00
EVAST9919	0f04d8c6a7	Add remaining time container	2017-09-20 15:58:28 +03:00
smoogipooo	e65a17ad96	Remove redundant usings	2017-09-20 18:40:41 +09:00
smoogipooo	7168e8fd99	Improve layout of bottom bar in the Editor	2017-09-20 18:16:03 +09:00
smoogipooo	7588f1b6ca	Add SummaryTimeline to Editor	2017-09-20 17:09:38 +09:00
smoogipooo	f9568619e7	Move SummaryTimeline into /Edit/Components/SummaryTimeline	2017-09-20 16:59:03 +09:00
Dean Herbert	120446e4a7	Ensure only one dialog is being displayed by the SongSelect footer at a time ... Fixes #1208	2017-09-20 14:32:15 +09:00
Damnae	fcaabf7fdf	Merge branch 'master' into storyboard_integration	2017-09-19 17:36:29 +02:00
EVAST9919	1b0ab414fa	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-09-19 17:23:10 +03:00
EVAST9919	1de8bca7f6	Merge remote-tracking branch 'refs/remotes/ppy/master' into icons_jumping_fix	2017-09-19 17:08:32 +03:00
Dean Herbert	6d3d485565	And then everything became one	2017-09-19 16:06:58 +09:00
Dan Balasescu	02ccea1c4e	Merge branch 'master' into scores-lookup-requires-id	2017-09-16 08:43:59 +09:00
EVAST9919	429e7723b3	Merge remote-tracking branch 'refs/remotes/ppy/master' into break_overlay_take_three	2017-09-15 19:40:30 +03:00
EVAST9919	740e766201	BreakOverlay and LetterboxOverlay implementation	2017-09-15 19:39:55 +03:00
Damnae	757a159516	Display a non-parallax background at the appropriate size when storyboards do not replace it.	2017-09-15 14:31:54 +02:00
Damnae	f5368505ab	Load the storyboard asynchronously if it wasn't loaded with the beatmap.	2017-09-15 11:58:37 +02:00
Damnae	4a15762139	Don't create drawables for hidden storyboards.	2017-09-15 11:58:37 +02:00
Damnae	c8cdf6787e	Better property name.	2017-09-15 11:58:31 +02:00
Damnae	7c3ce7e830	Unbind events affecting the background after gameplay has ended.	2017-09-15 09:16:56 +02:00
Damnae	cb8029af9e	Add a setting to hide storyboards.	2017-09-15 09:16:56 +02:00
Damnae	ddaf28d7f6	Integrate storyboards with gameplay.	2017-09-15 09:16:56 +02:00
Damnae	010a6ec252	Fix player loading.	2017-09-15 09:06:27 +02:00
EVAST9919	e7c9ad245e	Fix icons in main button system jumps on one side for a long time	2017-09-15 09:24:31 +03:00
Dean Herbert	b72921b30e	Ensure an OnlineBeatmapID is present before attempting API requests	2017-09-15 12:44:48 +09:00
Dean Herbert	6ea22cc6c7	Add missing return to PlayerLoader ... was being a bit too eager previously	2017-09-15 08:15:23 +09:00
Dean Herbert	396a56ddf4	Remove global OsuContextMenuContainer	2017-09-14 15:41:32 +09:00
Dean Herbert	d330b39db4	Remove max	2017-09-14 13:47:25 +09:00
Dean Herbert	4f09f30b7a	Fix incorrect exception	2017-09-14 13:13:54 +09:00
Dean Herbert	b1145272d1	Update code to support new inspectcode analysis rules	2017-09-14 12:58:32 +09:00
Dean Herbert	b78c516b74	Merge branch 'master' into scoring-revamp	2017-09-13 20:47:14 +09:00
Dean Herbert	fb7740a3ab	Update all dependencies in line with framework	2017-09-13 20:25:40 +09:00
smoogipooo	2e0218f388	Move AllObjectsJudged into ScoreProcessor as AllJudged ... Changes to OsuScoreProcessor were required to make sure that ticks and slider heads weren't ignored.	2017-09-12 22:01:08 +09:00
Shane Woolcock	262aea8b6b	Fix osu! logo triangles going super fast when the track is paused	2017-09-11 19:16:44 +09:30
smoogipooo	58c875bdca	Merge remote-tracking branch 'origin/master' into blending-equations ... # Conflicts: # osu-framework	2017-09-11 15:02:12 +09:00
Dean Herbert	adba5b5ba6	Merge branch 'master' into beatmap-details-rewrite	2017-09-11 12:30:32 +09:00
Dean Herbert	eedfbdc0e8	Add nullref check in KeyCounterCollection's Add method	2017-09-11 11:41:09 +09:00
smoogipooo	cde22865b9	Merge remote-tracking branch 'origin/master' into blending-equations ... # Conflicts: # osu-framework	2017-09-11 02:42:23 +09:00
Dean Herbert	6d33e39c5e	Merge branch 'master' into beatmap-details-rewrite	2017-09-10 11:26:00 +09:00
DrabWeb	d95940ed5e	CI fixes.	2017-09-08 14:25:41 -03:00
DrabWeb	ce68b6661e	Update visual test.	2017-09-08 14:15:28 -03:00
DrabWeb	55e8bdfb05	CI fixes.	2017-09-07 15:38:23 -03:00
DrabWeb	109531b66c	Cleanup, remove unneeded files.	2017-09-07 15:21:18 -03:00
DrabWeb	2153865de5	Adjust fail on missing logic to match original.	2017-09-07 15:09:50 -03:00
DrabWeb	fd2700a5b4	Fix .00 being displayed for star difficulty when the value is 0.	2017-09-07 15:01:31 -03:00
DrabWeb	5e685ff5b1	Rewrite BeatmapDetails to be more modular for future code sharing.	2017-09-07 14:53:53 -03:00
MrTheMake	a7f874e5b6	Merge branch 'master' into leaderboard-scores	2017-09-07 18:25:33 +02:00
Dean Herbert	b9bec6a983	CI fixes	2017-09-07 23:06:35 +09:00
smoogipooo	19db7a8f72	Update in line with framework changes.	2017-09-07 22:46:21 +09:00
Dean Herbert	41398f57d6	Changes in line with framework	2017-09-07 20:36:32 +09:00
smoogipooo	06fac913bf	Re-implement EditorMenuBar.	2017-09-06 21:14:29 +09:00
smoogipooo	df79d8918d	Merge branch 'master' into menu-bar	2017-09-06 18:26:18 +09:00
smoogipooo	5508fa0fd9	Merge remote-tracking branch 'origin/master' into new-menus	2017-09-05 19:14:42 +09:00
smoogipooo	57678a13d9	Update in-line with framework changes.	2017-09-04 09:32:35 +09:00
Dean Herbert	543a71efcc	Fix ObjectDisposal exceptions due to lingering event binds	2017-09-04 08:21:07 +09:00
Dean Herbert	dd26c80837	Delete -> Hide	2017-09-04 07:59:32 +09:00
Dan Balasescu	19ad5d5328	Merge branch 'master' into song-select-context-menus	2017-09-04 07:56:31 +09:00
Dean Herbert	3ede685ee9	Fix crash on random selection from a previously null selection	2017-09-01 18:44:51 +09:00
Dean Herbert	3d61cde266	Correctly delay loading of PlaySongSelect-specific components	2017-09-01 18:22:38 +09:00
Dean Herbert	f9d02afb00	Don't allow selection of a hidden beatmap	2017-09-01 18:13:21 +09:00
Dean Herbert	1f646e6d54	Add hiding support for beatmap difficulties	2017-09-01 17:57:12 +09:00
Dean Herbert	3b4b4b669b	Add framework for deleting difficulties	2017-08-30 21:12:46 +09:00
Dean Herbert	2fb4126ffc	Use BeatmapSetInfo instead of WorkingBeatmap	2017-08-30 20:53:33 +09:00
Dean Herbert	07da29ea1c	Add context menu to beatmap set header	2017-08-30 20:41:41 +09:00
Dan Balasescu	cabf671811	Merge branch 'master' into menu-bar	2017-08-30 12:31:12 +09:00
Huo Yaoyuan	4aa5ce8b41	Always load background and info wedge when no beatmap available.	2017-08-28 17:53:57 +08:00
smoogipooo	b17d9ac06e	Move EditorMenuBar into the Edit namespace, and fix a minor styling issue.	2017-08-28 17:55:50 +09:00
Dean Herbert	189988236b	Move PlayerInputManager logic inside RulesetInputManager	2017-08-24 15:23:17 +09:00
Dean Herbert	c5a20e3372	Remove permitNulls	2017-08-22 18:28:32 +09:00
Dean Herbert	803cbddfe2	Ensure score's user is set directly from API ... Previously would fail in visualtests due to `OsuGame` case.	2017-08-22 16:59:54 +09:00
Dean Herbert	09dd0cabd6	Move beatmap/ruleset change restrictions to OsuGame ... Allows test cases to more freely exist	2017-08-22 15:59:32 +09:00
Dean Herbert	16e96888ab	Update KeyCounterCollection to support action-based buttons	2017-08-21 12:39:22 +09:00
MrTheMake	6d401b5f21	Merge branch 'master' into leaderboard-scores	2017-08-19 00:00:40 +02:00
Shane Woolcock	4901ac9e35	Add some comments explaining why the Track is being forcefully added to the TrackManager	2017-08-18 18:01:18 +09:30
Dean Herbert	ffc8f763e5	Merge branch 'master' into fix-track-not-resetting	2017-08-18 17:24:22 +09:00
Dan Balasescu	cc6a5824f0	Merge branch 'master' into fix-ruleset-changing	2017-08-18 13:40:52 +09:00
Dean Herbert	7e21ddb5eb	Remove usage of HideOnEscape	2017-08-16 22:56:32 +09:00
Dean Herbert	2c7f0629ef	Merge remote-tracking branch 'upstream/master' into is-alive	2017-08-16 12:11:32 +09:00
MrTheMake	105048500a	Made modString private and moved the beatmap assignment inside GetScoresRequest	2017-08-15 15:30:53 +02:00
Dean Herbert	6ded194c53	Remove all usage of DI to retrieve InputManager ... Uses GetContainingInputManager instead, as per framework changes.	2017-08-15 14:30:50 +09:00
Dean Herbert	97ac8e1a64	Update usages of IsAlive/IsLoaded in line with framework changes	2017-08-15 13:57:48 +09:00
Dean Herbert	70f148f0b4	Fix icons on skip button	2017-08-15 09:30:46 +09:00
MrTheMake	920710e7d0	Assign a score's beatmap and cleanup to the Score class	2017-08-14 13:30:54 +02:00
Dean Herbert	9e1ffa27dc	Fix leaderboard icons not displaying correctly	2017-08-14 12:52:20 +09:00
MrTheMake	6b1184e8af	General formatting	2017-08-14 00:27:54 +02:00
MrTheMake	d9c26f98c7	Suggested changes	2017-08-13 19:54:07 +02:00
MrTheMake	e1e4eb78e3	Fix nullref in the leaderboard's test case	2017-08-13 18:00:53 +02:00
MrTheMake	4c2d7bf343	Parse the mods of a leaderboard's score	2017-08-13 17:41:13 +02:00
Dean Herbert	94b8d1de8b	Merge branch 'master' into fix-ruleset-changing	2017-08-13 11:14:41 +09:00
Dean Herbert	fe2911f165	Fix some formatting issues	2017-08-13 10:36:57 +09:00
Shane Woolcock	096e574401	Selecting a beatmap set no longer updates the ruleset to the first map of that set (since it causes the carousel to refilter)	2017-08-12 19:52:09 +09:30
Shane Woolcock	e48c5898bd	Ensure the Track for the selected beatmap is added to the TrackManager. Fixes the problem where a beatmap would be stuck at 100% if it is replayed.	2017-08-11 17:26:30 +09:30
Dean Herbert	48d4ed55e9	Move a lot of code to framework	2017-08-11 16:11:46 +09:00
Dean Herbert	723e27353c	HitRenderer -> RulesetContainer	2017-08-09 13:28:29 +09:00
Dean Herbert	b88f37de45	Add custom actions for Catch ... Reworks input management for rulesets	2017-08-09 11:50:34 +09:00
Dean Herbert	e75f438c29	Add difficulty application mods ... Also fixes circular references when using IJsonSerializable.	2017-08-07 08:54:54 +09:00
Dean Herbert	224de9cc1e	Implement NoFail mod	2017-08-07 08:54:54 +09:00
Dean Herbert	e8021c2b92	Move line inside if	2017-08-04 17:20:05 +09:00
Huo Yaoyuan	74facb32b4	Use removeAutoModOnResume as a field.	2017-08-04 15:34:11 +08:00
Huo Yaoyuan	62b3540fd6	Merge branch 'master' into fixes	2017-08-04 13:49:03 +08:00
Huo Yaoyuan	eb9972581e	Provide Autoplay mod in Ruleset.	2017-08-04 00:25:24 +08:00
Huo Yaoyuan	44fd0eb78b	Pass input state in OnSelected.	2017-08-04 00:09:41 +08:00
Dean Herbert	0d9ea97828	Allow Rulesets to create a non-FontAwesome icon ... This also - Renames TextAwesome to SpriteIcon. - Removes the default size of "20" from SpriteIcon (now defaults to the underlying texture size).	2017-08-03 14:36:21 +09:00
Dean Herbert	c8b5c1b8a5	Merge branch 'master' into scroll_to_selected	2017-08-01 11:06:32 +09:00
EVAST9919	700c7753c3	Applied suggestions	2017-07-31 14:20:12 +03:00
EVAST9919	1ce4966644	Merge remote-tracking branch 'refs/remotes/ppy/master' into scroll_to_selected	2017-07-31 14:08:15 +03:00
Huo Yaoyuan	df3f75b842	Merge branch 'master' into fixes	2017-07-31 17:51:34 +08:00
Dean Herbert	57d45b180c	Merge remote-tracking branch 'upstream/master' into import-from-stable	2017-07-31 17:31:10 +09:00
EVAST9919	62365090ad	Removed useless variable	2017-07-29 17:51:11 +03:00
EVAST9919	6b3a81f567	Fix hard crash when pressing random if no beatmaps avaliable	2017-07-29 17:42:32 +03:00
EVAST9919	e121b119be	Added "scroll to" container	2017-07-29 17:33:20 +03:00
EVAST9919	8458622c4d	Add ScrollToSelected method	2017-07-29 16:03:17 +03:00
Dean Herbert	e691dd12c5	Fix potential sequen of execution issues in BeatmapCarousel	2017-07-28 15:05:08 +09:00
Dean Herbert	f705589bf2	Rename NotificationManager to NotificationOverlay	2017-07-28 15:03:42 +09:00
Dean Herbert	6f4efbeda6	Merge remote-tracking branch 'upstream/master' into database-tidy	2017-07-27 17:41:29 +09:00
Dean Herbert	5f53426a9a	*Database -> *Store ... Welcome back BeatmapManager	2017-07-27 16:56:41 +09:00
Dean Herbert	cbe7b08642	Make BeatmapStore's BeatmapDatabase private	2017-07-27 15:34:13 +09:00
Dean Herbert	96b08b8777	Simplify and document DatabaseStore API	2017-07-27 15:06:10 +09:00
Dean Herbert	31bfa00d60	Schedule API callback to own scheduler ... Fixes race condition when API returns a failure after exiting song select. Note that the API does also schedule to the correct thread, but this schedule ensures the callback is never run, which is what we want in this case.	2017-07-27 12:55:14 +09:00
Dean Herbert	898a601098	Introduce a reference counting file store	2017-07-26 20:22:02 +09:00
Dean Herbert	9e20a02c0a	Split out BeatmapDatabase into BeatmapStore ... Hide database functionality at a lower level in preparation from eventually making it private.	2017-07-26 16:31:34 +09:00
Dean Herbert	fce580d717	Reshuffle namespaces	2017-07-26 13:22:46 +09:00
Dean Herbert	3c7546e2c1	Merge remote-tracking branch 'upstream/master' into no-more-colourinfo	2017-07-25 10:14:48 +09:00
Dean Herbert	b528568547	Merge branch 'master' into drawableflag-ctor	2017-07-25 09:46:27 +09:00
Huo Yaoyuan	47b4ef5cd2	Handle control key with OnKeyUp/OnKeyDown.	2017-07-24 22:14:21 +08:00
Huo Yaoyuan	c2e5788ed1	Make OsuScreen.Ruleset protected.	2017-07-24 21:47:31 +08:00
Huo Yaoyuan	e0b1057b87	Merge branch 'master' into fixes	2017-07-24 20:50:33 +08:00
Dean Herbert	84f12c722f	Merge branch 'master' into master	2017-07-24 18:23:36 +09:00
tgi74000	d0e99f0c95	check removed beatmap being null, check promptdelete beatmap being default	2017-07-24 10:25:33 +02:00
tgi74000	5d30efc090	Do not trigger Random if no Beatmaps are imported	2017-07-24 09:57:12 +02:00
Nabile Rahmani	c80f5c708a	Less verbose DrawableFlag constructor.	2017-07-24 09:25:49 +02:00
Dean Herbert	64f2e2dc32	Use Colour instead of ColourInfo	2017-07-23 13:06:16 +02:00
EVAST9919	d9e9ab22db	Merge remote-tracking branch 'refs/remotes/ppy/master' into scrollable_carousel	2017-07-23 13:27:03 +03:00
Dean Herbert	831bd24b00	Merge branch 'master' into easing	2017-07-23 13:46:35 +09:00
Dean Herbert	c6250e1da5	Supress compiler warning ... I don't think this is a sustainable solution if we start doing this in more places.	2017-07-23 11:34:09 +09:00
Thomas Müller	e68675f970	Rename EasingTypes to Easing	2017-07-22 20:53:53 +02:00
Thomas Müller	750fc0db0e	Merge branch 'prevent-dependency-pollution' of github.com:Tom94/osu into better-transforms	2017-07-22 11:34:27 +02:00
Thomas Müller	598b3f051e	Address CI concerns and update framework	2017-07-22 11:15:45 +02:00
Thomas Müller	dae0f61b2b	Don't obtain DependencyContainer via DI	2017-07-22 11:09:13 +02:00
Thomas Müller	e469a114a6	Update dependency caching according to framework	2017-07-21 19:03:43 +02:00
Thomas Müller	a7dc8a892b	Update framework	2017-07-21 17:24:09 +02:00
EVAST9919	388fcfb295	Make BeatmapCarousel inherit from OsuScrollContainer	2017-07-21 13:13:53 +03:00
Thomas Müller	2cd8f6b30c	Merge branch 'master' of github.com:ppy/osu into better-transforms ... # Conflicts: # osu-framework	2017-07-21 11:15:26 +02:00
Dean Herbert	9a33e77d63	Merge branch 'master' into fix-carousel-debounce-race	2017-07-21 17:44:04 +09:00
Thomas Müller	3a086534f8	Merge branch 'master' into fix-selection-changing	2017-07-21 10:22:11 +02:00
Dean Herbert	12b6b80d5c	Make method to flush filter requests	2017-07-21 17:20:52 +09:00
Dean Herbert	bf254bf5cf	Merge branch 'master' into fix-songprogress-endtime	2017-07-21 16:46:41 +09:00
Dean Herbert	6bdf6bb675	Merge branch 'master' into previewtime-seeking	2017-07-21 15:06:18 +09:00
Dean Herbert	f7b64a458a	Fix incorrect end time calculation in SongProgressGraph	2017-07-21 10:10:25 +09:00
Dean Herbert	b4dddc98ee	Fix selection changing on entering song select ... Conditional was backwards, easy fix.	2017-07-21 06:15:44 +09:00
Dean Herbert	fb2f1224b3	Fix carousel filter debounce causing a race condition ... Clicking a ruleset button on toolbar would schedule a delayed filter of carousel, which could in turn trigger a beatmap change after pushing a Player. This resolves that by forcing any pending operations to complete.	2017-07-21 05:58:58 +09:00
Thomas Müller	e84d8cc020	Merge branch 'master' into fix-empty-carousel	2017-07-20 21:15:58 +02:00
Thomas Müller	4e33efd41f	Merge branch 'master' into fix-empty-carousel	2017-07-20 21:04:45 +02:00
Thomas Müller	518a7c460e	Merge branch 'master' into fix-beatmap-select-race	2017-07-20 21:04:40 +02:00
Thomas Müller	ed6478be8b	Merge branch 'master' into always-load-storyboard	2017-07-20 20:54:16 +02:00
Thomas Müller	e21822cdeb	Merge branch 'master' into fix-working-beatmap-double-load	2017-07-20 20:35:31 +02:00
Thomas Müller	01ff7e8f4b	Merge branch 'master' into fix-empty-carousel	2017-07-20 20:31:06 +02:00
MrTheMake	22f3e97241	Small optimization to the main menu intro seeking.	2017-07-20 17:15:39 +02:00
Dean Herbert	c1a3e4a008	Remove unnecessary using	2017-07-20 20:06:24 +09:00
Dean Herbert	451f92772a	Merge branch 'master' into fixes	2017-07-20 19:46:50 +09:00
Thomas Müller	8108f3e78d	Merge branch 'master' into no-set-exclusive	2017-07-20 12:11:32 +02:00
Dean Herbert	6e0b7b81f8	Switch to correct ruleset when changing beatmap ... This is only really noticeable when using the MusicController to change tracks while at song select.	2017-07-20 19:10:20 +09:00
Dean Herbert	577740d329	Fix footer button light fading incorrectly ... Logic was reliant on HoverLost coming before Hover events, which has since changed. Was also able to tidy this code up a bit in the process.	2017-07-20 18:08:51 +09:00
Dean Herbert	3bdd4d7d02	Centralise TrackManager.AddItem logic to avoid duplicate adds	2017-07-20 17:46:33 +09:00
Dean Herbert	67b95926c4	Remove usage of SetExclusive ... Also immediately disposes WorkingBeatmaps on ValueChanged.	2017-07-20 16:45:44 +09:00
Dean Herbert	4f10256182	Remove unnecessary count check	2017-07-20 15:34:44 +09:00
Dean Herbert	61c665f239	Add required null check	2017-07-20 15:16:07 +09:00
Dean Herbert	a59557f039	Fix selection not being reset correct when changing between rulesets ... Carousels filtered to results with no maps visible were not being handled correctly in a few different ways. This covers all those scenarios.	2017-07-20 15:12:20 +09:00
Dean Herbert	c130981184	Fix WorkingBeatmap being loaded twice when using MusicController at SongSelect	2017-07-20 14:06:09 +09:00
Dean Herbert	15eb6954da	Fix hitting down and enter at song select causing a hard-crash ... Carousel was not aware of the disabled beatmap change state. Also it was being set too late (in an async load) so wasn't useful. It's now pre-emptively set in PlaySongSelect before loading Player.	2017-07-20 11:50:52 +09:00
Dean Herbert	d6968ca09c	Remove FullyLoaded logic ... Always parse storyboards for now. Let's not optimise this until it is necessary. It was leading to weird threading problems due to the load call in Player's async load method.	2017-07-20 11:01:50 +09:00
Dean Herbert	b00fc857dd	Merge branch 'master' into fix-beatmap-null	2017-07-20 09:33:14 +09:00
Dean Herbert	8d727b898f	Don't rely on BeatmapSetInfo being present	2017-07-20 09:23:11 +09:00
Dean Herbert	d69470f2ae	Fix TestWorkingBeatmap broken by attempting to load storyboard	2017-07-20 09:22:39 +09:00
MrTheMake	fd518e2294	Don't start a beatmap's track until the intro is done playing	2017-07-20 01:57:46 +02:00
Thomas Müller	c4619f614a	Merge branch 'master' of github.com:ppy/osu into better-transforms ... # Conflicts: # osu-framework	2017-07-19 19:15:51 +02:00
smoogipooo	d75e439f94	Fix Player crashing due to null BeatmapInfo (now unused).	2017-07-20 01:27:27 +09:30
Dean Herbert	38431f8555	Fix remaining test case issues	2017-07-19 19:10:04 +09:00
Dean Herbert	8ce71ef235	Fix broken test case	2017-07-19 18:48:27 +09:00
Dean Herbert	da92fccdb0	Merge branch 'master' into non-null-beatmap	2017-07-19 18:32:42 +09:00
Dean Herbert	35157ca6b8	Make DefaultBeatmap private get.	2017-07-19 18:09:59 +09:00
Dean Herbert	c34856922c	Gratify CI	2017-07-19 16:34:18 +09:00
Dean Herbert	2a2f4e2a8b	Ensure side flashes are not visible during moving transitions	2017-07-19 16:13:01 +09:00
Dean Herbert	2b1e19814c	Side flashes should not be affected by parallax	2017-07-19 16:07:11 +09:00
Dean Herbert	c8593a38c8	Remove incorrect looping reset behaviour ... Note that tracks' looping is never restored now. There's unfortunately no easy way around this, but it shouldn't have any side-effects for now.	2017-07-19 15:55:16 +09:00
Dean Herbert	64ebc01a3b	Remove many now unnecessary null-checks	2017-07-19 15:45:23 +09:00
Dean Herbert	8e8767cd37	Give song select a better default background whecn the beatmap's can't be loaded	2017-07-19 15:16:55 +09:00
Dean Herbert	d0dea33faa	Make Beatmap (bindable) non-nullable.	2017-07-19 15:16:53 +09:00
Dean Herbert	0846414c5b	Simplify state changes	2017-07-19 15:16:51 +09:00
Dean Herbert	632d2e8ba5	Dummy beatmap has dummy ruleset	2017-07-19 15:16:48 +09:00
Dean Herbert	f168ee660c	Move dummy to BeatmapDatabase	2017-07-19 15:16:43 +09:00
Dean Herbert	3289d93f22	Give the dummy beatmap a background	2017-07-19 15:16:42 +09:00
Dean Herbert	21984ba764	Move DummyWorkingBeatmap to a more global level (OsuScreen)	2017-07-19 15:16:39 +09:00
Dean Herbert	df60fc0f0a	Stop playing previous beatmap even if new beatmap has no track	2017-07-19 15:16:36 +09:00
Dean Herbert	e47faf4e85	Add a dummy beatmap provider for use in BeatmapInfoWedge	2017-07-19 15:16:33 +09:00
Thomas Müller	3ba119c115	Ensure toolbar disappears when osu logo transition is cancelled	2017-07-18 17:09:53 +03:00
Thomas Müller	b40c897dbd	Fix osu logo shockwave playing when transition is aborted ... This is a very nice use-case scenario for TransformSequence.OnComplete	2017-07-18 15:28:56 +03:00
Thomas Müller	4d8261fe0b	Merge branch 'master' of https://github.com/ppy/osu into better-transforms ... # Conflicts: # osu-framework # osu.Game/Graphics/Cursor/OsuTooltipContainer.cs # osu.Game/Overlays/DragBar.cs	2017-07-18 15:16:02 +03:00
Huo Yaoyuan	9cd895c249	Implement Ctrl+Enter in PlaySongSelect.	2017-07-18 15:55:21 +08:00
Dean Herbert	c5d23daa6b	Merge remote-tracking branch 'upstream/master' into remove-dragbar ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-07-18 13:44:23 +09:00
Huo Yaoyuan	cd7c04c54d	Simplify misc null-coalescing expression.	2017-07-18 12:30:10 +08:00
Dean Herbert	b5035ec245	Merge branch 'master' into songselect-preview-fix	2017-07-18 13:05:03 +09:00
Thomas Müller	87bcd526f3	Get rid of raw AddDelay calls within osu.Game	2017-07-17 16:51:21 +03:00
Thomas Müller	19fb03e737	Try different formatting style	2017-07-16 18:28:20 +03:00
Thomas Müller	032e9df67b	ApplyDelay -> AddDelay	2017-07-16 17:47:29 +03:00
Thomas Müller	99221260c4	Replace several usages of BeginDelayedSequence with LINQ-style	2017-07-16 17:42:01 +03:00
Thomas Müller	71105bb9ee	Delay -> ApplyDelay; DelayReset -> ResetDelay	2017-07-16 14:06:46 +03:00
Thomas Müller	6063219b72	Update framework	2017-07-16 13:59:26 +03:00
Thomas Müller	a5e610a7ba	Update framework and fix compilation ... Most issues were related to BeginLoopedSequence usage and lack of "this." in front of transform helpers.	2017-07-14 19:18:12 +03:00
Thomas Müller	fd58c6e835	Nicer generic rolling counters	2017-07-14 19:14:07 +03:00
Thomas Müller	b5fbb26f8f	Merge branch 'master' of https://github.com/ppy/osu into better-transforms	2017-07-14 16:46:18 +03:00
Thomas Müller	c73a1ae058	Use TransformTo in rolling counters	2017-07-14 16:46:00 +03:00
Dan Balasescu	c13dc943f8	Merge branch 'master' into fix-track-rotation	2017-07-14 19:25:54 +10:00
Dan Balasescu	3914b3ba13	Merge branch 'master' into right-mouse-scrollbar	2017-07-14 19:15:00 +10:00
Dean Herbert	95a40e39ec	Merge branch 'master' into mods_overlay_fix	2017-07-14 17:31:52 +09:00
Dean Herbert	3aeed86392	Merge branch 'master' into drawable-room-update	2017-07-14 15:29:27 +09:00
Dean Herbert	6c9219856d	Add comment	2017-07-14 09:39:40 +09:00
Nabile Rahmani	840cc918ea	Use Enabled instead of a private field.	2017-07-13 23:35:19 +02:00
Dean Herbert	ce204b8e7b	Merge remote-tracking branch 'ppy/master' into right-mouse-scrollbar	2017-07-14 06:23:07 +09:00
Nabile Rahmani	8014cd55a2	Make the skip button clickable only once.	2017-07-13 21:59:17 +02:00
Dean Herbert	de46f3ab07	Remove all unnecessary parenthesis where object initialisers are used ... Enforces at CI.	2017-07-13 15:11:33 +09:00
DrabWeb	b196b1d3c6	CI fixes, switch RoomInspector to use BeatmapSetCover.	2017-07-13 01:24:59 -03:00
DrabWeb	fea40ccc1a	Share BeatmapSet cover sprite code.	2017-07-13 01:17:47 -03:00
DrabWeb	0624f578eb	Update with online beatmap changes.	2017-07-13 01:06:46 -03:00
DrabWeb	dc5ec319a2	Merge https://github.com/ppy/osu into drawable-room-update	2017-07-13 01:00:32 -03:00
Dean Herbert	2c1f3de47a	Rename 2X resources to be defaults	2017-07-13 10:27:39 +09:00
Dean Herbert	56c817e4b6	Merge branch 'master' into osu-direct-search	2017-07-13 10:16:27 +09:00
Dean Herbert	9d47dd9ff9	Add support for right mouse absolute scrolling (when enabled) ... Will likely need to be bindable when hooked up to settings and actually used.	2017-07-12 18:57:44 +09:00
EVAST9919	0b1db1502d	removed useless bool	2017-07-12 09:42:38 +03:00
EVAST9919	ab8fb2edab	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix	2017-07-12 09:31:56 +03:00
Dean Herbert	04e99d1369	Only apply disable rules when in a screen stack.	2017-07-12 13:40:17 +09:00
Dean Herbert	54f6befd67	Merge branch 'master' into fix-track-rotation	2017-07-12 13:18:16 +09:00
Dean Herbert	0322e66c25	Merge remote-tracking branch 'upstream/master' into container-collection-readonlylist	2017-07-12 13:07:23 +09:00
Thomas Müller	9d523ea012	Update framework	2017-07-12 11:06:13 +09:00
Seth	b30721edbe	Merge branch 'master' into drawable-room-update	2017-07-11 20:42:44 -03:00
Thomas Müller	4045083dcd	Update sorting comparers in line with framework changes	2017-07-11 21:21:58 +03:00
Dean Herbert	9bbcc0526d	Disable beatmap changes in specified screens	2017-07-11 18:39:10 +09:00
DrabWeb	b448603d6c	CI fixes.	2017-07-11 01:42:51 -03:00
Dean Herbert	a9c50786b2	Fix osu! logo on main menu ending up in the wrong place ... Also switch to using BeginDelayedSequence where possible.	2017-07-11 13:27:45 +09:00
DrabWeb	c449491c04	Fix RoomInspector covers.	2017-07-11 01:18:16 -03:00
DrabWeb	84701846ec	Merge https://github.com/ppy/osu into osu-direct-search	2017-07-11 00:26:49 -03:00
Thomas Müller	c4e378571b	Update framework	2017-07-10 11:54:23 +03:00
Dean Herbert	0e0c32008b	More changes	2017-07-10 15:40:40 +09:00
Dean Herbert	0e2dc9388a	More changes in-line with framework changes.	2017-07-10 12:55:47 +09:00
Dean Herbert	2c8b8c3f9c	Update loop logic in line with framework changes	2017-07-09 18:23:34 +09:00
EVAST9919	33206fcf0e	Use Hide instead of FadeTo(0)	2017-07-08 12:34:24 +03:00
EVAST9919	adb88a8d49	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_overlay_fix	2017-07-08 12:28:41 +03:00
Thomas Müller	178685292a	Merge branch 'master' of https://github.com/ppy/osu into better-fill-mode	2017-07-08 12:25:08 +03:00
Dean Herbert	3c425dd07f	Fix CI issue	2017-07-08 18:06:59 +09:00
Thomas Müller	22a987f6cc	Update test cases to new framework and fix old crashes	2017-07-07 15:05:55 +03:00
Thomas Müller	6de9776e05	Update framework with tooltip changes	2017-07-07 08:59:17 +03:00
Jai Sharma	6eaeba5a92	Merge branch 'master' into remove-dragbar	2017-07-06 20:14:08 +01:00
Dean Herbert	724e5aa99e	Merge master into better-input	2017-07-05 13:59:40 -07:00
Thomas Müller	2d7eefa6fe	Update Cached usage according to framework	2017-07-02 13:00:02 +03:00
Dean Herbert	3a82d77e5b	Add missing tab	2017-07-01 07:10:04 -07:00
Thomas Müller	bb15bc0467	Use ReceiveMouseInputAt whenever possible	2017-06-30 09:54:03 +03:00
Dean Herbert	f3f3952ba5	More unused usings	2017-06-29 12:20:05 -07:00
Dean Herbert	6865f9b231	Remove unused parameters	2017-06-29 12:05:37 -07:00
Dean Herbert	1e50840a8e	Fix unused usings	2017-06-29 12:04:04 -07:00
Dean Herbert	7469d0e3ba	Merge remote-tracking branch 'upstream/master' into new-samples	2017-06-29 11:51:51 -07:00
Dean Herbert	ee96d39b93	Shuffle sound samples around and make more conformant	2017-06-28 10:19:04 -07:00
Dean Herbert	28f0da606a	Add OsuFocusedOverlayContainer with predefined sounds.	2017-06-28 10:18:12 -07:00
Thomas Müller	40225238d9	Set RelativeSizeAxes for updated FillMode behavior	2017-06-28 12:24:23 +03:00
DrabWeb	24283b9500	Remove animation from ModeTypeInfo layout (was causing visual issues).	2017-06-27 22:22:14 -03:00
Dean Herbert	480cdba023	Add OsuClickableContainer with generic sounds	2017-06-27 21:05:49 +09:00
EVAST9919	2ad6d3fa77	Simplify property	2017-06-27 05:41:24 +03:00
EVAST9919	714d53f329	Hide "Unranked" text in ModDisplay if play is ranked	2017-06-27 05:17:21 +03:00
Dan Balasescu	803bb3c780	Cleanup.	2017-06-26 23:05:35 +09:00
Dean Herbert	cbf188c293	Add new main menu backgrounds	2017-06-26 19:10:13 +09:00
EVAST9919	127c473f3b	Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random	2017-06-25 23:38:39 +03:00
Dean Herbert	df74a84b35	Merge branch 'master' into drawable-room-update	2017-06-25 15:55:36 +09:00
Dean Herbert	ec99d83f6d	Merge branch 'master' into fix_logo_sound	2017-06-25 15:13:57 +09:00
Dean Herbert	7baa2b7421	Fix CI issues	2017-06-25 14:46:59 +09:00
DrabWeb	5e1cb14e62	Use Vertical instead of Top and Bottom.	2017-06-24 19:11:02 -03:00
DrabWeb	091d786d47	Split long MarginPadding onto multiple lines.	2017-06-24 18:37:28 -03:00
Thomas Müller	1bca9ca0e9	Update framework with better children list	2017-06-24 12:56:35 +02:00
DrabWeb	68915d79a6	Remove unused fields.	2017-06-24 06:03:40 -03:00
DrabWeb	9f417743b6	Cleanup.	2017-06-24 05:54:00 -03:00
DrabWeb	bcd82a02f4	Licenses.	2017-06-24 05:45:34 -03:00
DrabWeb	fe875957a7	Share ruleset and type displaying, fix tag team icon.	2017-06-24 05:43:52 -03:00
DrabWeb	35951ffc40	Line endings.	2017-06-24 05:23:31 -03:00
DrabWeb	05b5fe8ae7	Share host/participant info displaying.	2017-06-24 05:21:42 -03:00
Jai Sharma	a0262e32b1	CI Fixes	2017-06-24 09:15:53 +01:00
DrabWeb	0de55776c0	Update DrawableRoom design.	2017-06-24 05:05:48 -03:00
Jai Sharma	e073100498	Merge branch 'master' into remove-dragbar	2017-06-24 08:55:02 +01:00
Thomas Müller	e3489928b7	Remove now obsolete InternalContains	2017-06-24 09:21:08 +02:00
EVAST9919	817d2c3da1	Fixed logo heartbeat playing even without beating	2017-06-23 23:57:57 +03:00
Jai Sharma	de50a1694f	Merge branch 'master' into remove-dragbar	2017-06-23 19:26:47 +01:00
Jai Sharma	a327f49d68	Updating progressBar.EndTime is more thread safe	2017-06-23 18:24:46 +01:00
Thomas Müller	f5829860a2	Get rid of AlwaysReceiveInput	2017-06-23 18:02:24 +02:00
Dean Herbert	1a8f207db3	Code formatting	2017-06-23 22:19:41 +09:00
Dean Herbert	81de1bd5a7	Merge branch 'master' into multiplayer-room-inspector	2017-06-23 21:55:18 +09:00
Jai Sharma	73c004fb71	Removed DragBar from song progress	2017-06-22 17:42:29 +01:00
EVAST9919	be94163d21	Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random	2017-06-22 04:28:47 +03:00
ColdVolcano	c619de7f9b	Rename const in all of the code	2017-06-21 18:55:44 -05:00
ColdVolcano	1978a4e8a6	Boost visualiser performance ... Also fixes amplitudes being set wrongly if kiai was false.	2017-06-21 18:32:31 -05:00
Dean Herbert	d0d0f11857	Merge branch 'master' into heartbeat	2017-06-21 15:35:54 +09:00
smoogipooo	fc0e44b214	Update framework.	2017-06-21 11:28:27 +09:00
paparony03	c8720bc5d5	Oops	2017-06-20 16:00:09 +10:00
paparony03	62dee59672	Shapes namespace ... Depends on https://github.com/ppy/osu-framework/pull/837	2017-06-20 15:54:23 +10:00
EVAST9919	a991cff908	OsuLogo beat sound	2017-06-19 17:37:00 +03:00
Dean Herbert	17cb043cb2	Visualiser	2017-06-19 18:41:35 +09:00
Dean Herbert	a1b9499480	More documentation and constants	2017-06-19 18:41:11 +09:00
Dean Herbert	8c063fe2b8	Simplify AccentColour property for now	2017-06-19 18:38:39 +09:00
Dean Herbert	e269bdbad7	Use additive colour; adjust constants a bit	2017-06-19 18:30:13 +09:00
Dean Herbert	359cb4c083	Add kiai support	2017-06-19 18:29:44 +09:00
ColdVolcano	77ca48c1bd	CI Fixes	2017-06-18 23:52:42 -05:00
ColdVolcano	84aa17dea3	Attempt to fix possible loss of fraction	2017-06-18 23:08:27 -05:00
ColdVolcano	63aabc162b	Fix TestCaseMenuButtonSystem not starting up	2017-06-18 22:34:45 -05:00
ColdVolcano	3764c1d799	Make bar length and visualizer count floats	2017-06-18 22:28:18 -05:00
ColdVolcano	cea8dc5602	Fix possible loss of fraction	2017-06-18 22:13:21 -05:00
ColdVolcano	d3662636d6	CI fixes	2017-06-18 22:01:07 -05:00
ColdVolcano	ccac2e9a75	Add a visualizer around the logo	2017-06-18 19:33:50 -05:00
MrTheMake	a399b18837	Removed debug line	2017-06-19 00:11:47 +02:00
MrTheMake	3b3cc59471	Fix NullReferenceException	2017-06-18 20:21:24 +02:00
MrTheMake	23d1c89a67	Fix not applying song select preview seek	2017-06-18 20:12:28 +02:00
Dean Herbert	ae79ba48be	Merge branch 'master' into numpad-enter	2017-06-16 15:32:52 +09:00
MrTheMake	06089a74e3	Handle the numpad's Enter in cases where only the normal Enter was handled	2017-06-15 23:06:28 +02:00
EVAST9919	5117baae66	Make random works with panels too	2017-06-15 06:37:20 +03:00
Dan Balasescu	5a1edaa93c	Merge branch 'master' into cancel-select-random	2017-06-14 14:11:45 +09:00
smoogipooo	99a93d98dc	Merge remote-tracking branch 'origin/master' into fix-hacky-tabs	2017-06-13 19:46:01 +09:00
Dean Herbert	3ca80eb149	Add readonly	2017-06-13 15:54:26 +09:00
Dean Herbert	3efe8629d6	Fix hacky tabs	2017-06-12 18:39:22 +09:00
Dean Herbert	e94425f311	Improve the loading animation and use it in multiple places ... - Supersedes https://github.com/ppy/osu/pull/926. - [ ] Depends on https://github.com/ppy/osu-framework/pull/817.	2017-06-12 17:04:42 +09:00
smoogipooo	ffbb46f668	Update in line with framework.	2017-06-12 12:48:47 +09:00
EVAST9919	e552c39444	change function to a property	2017-06-11 22:04:35 +03:00
EVAST9919	c3f4b1b3cb	Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random	2017-06-11 21:56:55 +03:00
Dean Herbert	a454ca606f	Merge remote-tracking branch 'upstream/master' into johnneijzen-master	2017-06-08 20:33:39 +09:00
Dean Herbert	e3403c619c	Merge branch 'better-invalidations' into update-framework	2017-06-08 19:46:19 +09:00
Dean Herbert	64682a741c	Update framework	2017-06-08 17:05:25 +09:00
Tom94	5f7270ee4b	Use new invalidation rules	2017-06-08 09:53:45 +02:00
John Neijzen	2f7d9655fd	More Clean up	2017-06-08 15:27:35 +08:00
John Neijzen	4abad17b92	Fix Black Space after } and Symbol Spacing	2017-06-08 14:48:42 +08:00
John Neijzen	431d225a60	Keyword Spacing and Brackets Fixing	2017-06-08 14:35:10 +08:00
John Neijzen	aa3a231763	Review Changes	2017-06-07 22:00:14 +08:00
John Neijzen	f9c466eee9	bit more readable	2017-06-07 20:12:16 +08:00
John Neijzen	23a7045eef	More Clean UP	2017-06-07 20:07:18 +08:00
John Neijzen	9b0e1c26a3	Clean Up Code	2017-06-07 19:53:37 +08:00
EVAST9919	78500eec21	Applied suggested changes	2017-06-05 12:24:28 +03:00
EVAST9919	6b9d5afc4b	Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random	2017-06-05 11:51:45 +03:00
Dean Herbert	5568df1aee	Remove StandardHUDOverlay ... This class hierarchy was originally when we had different HUDs for rulesets, but this is no longer the case. Skins will be able to build off the base (new) HUDOverlay without issue, so there is no real need for the abstract class for now. We can add it back if a need for it arises; for the moment I'd like to avoid as many Standard* classes as possible.	2017-06-05 17:18:07 +09:00
Dean Herbert	2712f49545	Remove bad	2017-06-05 17:06:47 +09:00
Dean Herbert	958cd9f8d8	Don't display in-game ... Nothing does anything yet, so we can't display this. Make it functional before adding to game project.	2017-06-05 16:52:09 +09:00
Dean Herbert	af6f8bbd89	Fix namespaces and class names	2017-06-05 16:47:42 +09:00
Dean Herbert	c3c56820fa	Fix lots of small issues	2017-06-05 16:43:23 +09:00
Dean Herbert	0cb1df35e9	Merge remote-tracking branch 'upstream/master' into ingame_options	2017-06-05 14:53:37 +09:00
EVAST9919	a42c67ee97	Cancel beatmap random selection	2017-06-01 20:54:42 +03:00
Patrick Andersson	94294e4b45	Changed default selection type and added suggestions from PR feedback	2017-06-01 08:54:48 +02:00
Patrick Andersson	a3945bb11d	Added suggestions by code inspector	2017-05-31 22:04:29 +02:00
Patrick Andersson	9592e9778b	Trim whitespace	2017-05-31 20:31:05 +02:00
Patrick Andersson	1dd85b5986	Add alternative for random beatmap selection ... "Never repeat" will not repeat until all songs have been seen by repeatedly pressing F2/Random button	2017-05-31 20:11:26 +02:00
EVAST9919	8cde50a88a	Merge branch 'master' of https://github.com/ppy/osu into ingame_options	2017-05-31 08:23:06 +03:00