3288 Commits

Author	SHA1	Message	Date
smoogipoo	4cbda97b1e	Move positional adjustment to SelectionBox	2018-11-16 17:12:24 +09:00
Roman Kapustin	37b19f78ae	Set AccentColour in concrete counters	2018-11-15 23:37:21 +03:00
smoogipoo	df7515b66f	Pass all selected hitobjects to the selection blueprints	2018-11-15 21:01:09 +09:00
Dan Balasescu	e8f34ddff0	Merge branch 'master' into return_to_large_logo_after_idle	2018-11-15 15:16:10 +09:00
Dean Herbert	30547ac064	Merge remote-tracking branch 'upstream/master' into dropdown-updates	2018-11-14 20:03:45 +09:00
Dan Balasescu	81a3170e3b	Merge branch 'master' into hold-for-menu-back	2018-11-14 19:13:07 +09:00
smoogipoo	c963fc7cd2	Reduce chaining	2018-11-14 18:34:13 +09:00
Dan Balasescu	e9b47c6233	Merge branch 'master' into hold-for-menu-back	2018-11-14 18:22:34 +09:00
smoogipoo	aff5fa6169	Update with osu!-side dropdown changes	2018-11-14 18:02:38 +09:00
smoogipoo	6d43baf4bf	Make show/hide only invoked once each	2018-11-13 13:12:11 +09:00
smoogipoo	fbc20d2d4d	Hide placement when cursor is not in the playfield	2018-11-13 12:52:04 +09:00
smoogipoo	5d51719572	Make selection blueprints handle position adjustments	2018-11-07 16:21:32 +09:00
smoogipoo	e9e50f41fb	Use Name/NameScreen format	2018-11-07 13:04:17 +09:00
Dean Herbert	7f73fc2d39	Require holding back button to quit gameplay ... Avoids accidental presses and streamlines logic with on-screen element.	2018-11-07 01:49:21 +09:00
smoogipoo	52f4923c8e	Remove intermediate Screens namespace	2018-11-06 18:28:22 +09:00
smoogipoo	ac25718c5a	Renamespace compose-mode components	2018-11-06 18:14:46 +09:00
smoogipoo	27d82052f4	BorderLayer -> EditorPlayfieldBorder	2018-11-06 18:10:46 +09:00
smoogipoo	85f96ad62f	Fix a few missed renames	2018-11-06 18:07:53 +09:00
smoogipoo	bd775af274	PlacementMask -> PlacementBlueprint	2018-11-06 18:04:03 +09:00
smoogipoo	11be820efe	CreateMaskFor -> CreateBlueprintFor	2018-11-06 18:03:21 +09:00
smoogipoo	90c813618a	Merge PlacementContainer into BlueprintContainer	2018-11-06 18:02:55 +09:00
smoogipoo	f2a5f28ea2	SelectionMask -> SelectionBlueprint	2018-11-06 17:56:04 +09:00
smoogipoo	ad2836a61e	MaskSelection -> SelectionBox	2018-11-06 17:52:47 +09:00
smoogipoo	65bb91dcf7	Merge MaskContainer into BlueprintContainer	2018-11-06 17:51:26 +09:00
smoogipoo	26c9390c16	HitObjectMaskLayer -> BlueprintContainer	2018-11-06 17:36:10 +09:00
smoogipoo	faab744cbd	DragLayer -> DragBox	2018-11-06 17:24:57 +09:00
smoogipoo	171700cb91	Debounce editor summary timeline seeks	2018-11-05 15:59:40 +09:00
Dean Herbert	0a0023920f	Fix not being able to drag control points mid-snake	2018-11-02 04:09:33 +09:00
Dean Herbert	d7f3e51050	Merge branch 'master' into editor-mask-placement	2018-10-31 15:00:38 +09:00
Kyle Chang	214ed43b81	Check if SongSelect is current screen before playing selected song	2018-10-30 23:47:54 -04:00
Dean Herbert	5eaf80ab76	Add missing newline	2018-10-31 12:07:06 +09:00
Dean Herbert	b28c0cd128	Merge branch 'master' into editor-mask-placement	2018-10-31 06:46:48 +09:00
Dean Herbert	5f5e30c378	Merge branch 'master' into mask-separation	2018-10-31 05:59:07 +09:00
Dean Herbert	6f1ef3243d	Proportionally adjust width in line with change	2018-10-31 02:56:25 +09:00
Dean Herbert	4502fa39e9	Merge remote-tracking branch 'upstream/master' into reduce-handle-height	2018-10-31 02:55:38 +09:00
Paul Teng	4bc9161cd1	Leave bigger gap if replaying	2018-10-30 08:32:12 -04:00
smoogipoo	5712a52817	Merge remote-tracking branch 'origin/master' into mask-separation ... # Conflicts: # osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs	2018-10-30 16:46:13 +09:00
smoogipoo	619a0dfd59	Merge branch 'separate-slider-body' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Osu/Edit/Layers/Selection/Overlays/SliderMask.cs	2018-10-29 15:24:15 +09:00
Kyle Chang	c7e950af7f	Remove EditSelected in favor in inlining beatmapNoDebounce in Edit	2018-10-29 00:04:51 -04:00
Kyle Chang	886dd0f0d4	Remove unneeded using directive	2018-10-28 13:21:12 -04:00
Kyle Chang	2b736c3cd6	Make beatmap edit button reload beatmap without mods	2018-10-28 13:04:45 -04:00
Kyle Chang	f8a8c7cb6b	Stop transferring track when editing	2018-10-28 12:43:19 -04:00
HoLLy	cf3b4447eb	Fade only textContainer instead of entire MetadataSection	2018-10-26 13:35:51 +02:00
smoogipoo	8703db5cc1	Rename HitObjectMask -> SelectionMask	2018-10-26 13:31:23 +09:00
HoLLy	88aca46500	Fade MetadataSection back in if non-null Text is set	2018-10-24 18:53:22 +02:00
Paul Teng	b351aae93f	Reduce height of song progress handle	2018-10-18 07:02:18 -04:00
smoogipoo	72d48aa7f5	Add xmldocs to IPlacementHandler	2018-10-18 16:46:30 +09:00
smoogipoo	0e841628b6	Implement hitobject deletion	2018-10-18 16:36:06 +09:00
smoogipoo	969477dadd	Remove placement events, make everything pass top-down	2018-10-17 17:43:16 +09:00
smoogipoo	62635c5ab8	Add container to handle placement mask	2018-10-17 16:17:49 +09:00
smoogipoo	4ea4ec0d25	Move placement handling events to a higher level	2018-10-17 15:46:30 +09:00
smoogipoo	70f1d17b7e	Merge remote-tracking branch 'origin/master' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs # osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs # osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs # osu.Game/Rulesets/UI/RulesetContainer.cs	2018-10-16 17:28:16 +09:00
Dean Herbert	eaa5ef5168	Merge branch 'master' into return_to_large_logo_after_idle	2018-10-12 22:14:23 +09:00
Dean Herbert	2babdc079c	Merge pull request #3568 from smoogipoo/fix-beatmap-details ... Fix beatmap details not displaying	2018-10-10 20:14:58 +09:00
Dean Herbert	d28b9860ff	Don't use "beatmapset" terminology	2018-10-10 19:26:35 +09:00
Dean Herbert	841b2e8692	Merge branch 'master' into consistent-terminology-format	2018-10-10 19:19:36 +09:00
Dean Herbert	3be50c2941	Merge branch 'master' into return_to_large_logo_after_idle	2018-10-09 18:02:36 +09:00
smoogipoo	6d24bde72b	Fix beatmap details not displaying	2018-10-09 17:39:27 +09:00
smoogipoo	934b687965	Fix selection masks not being added for new objects	2018-10-03 16:49:59 +09:00
smoogipoo	4cdb6dcea5	Rename HitObjectMask -> SelectionMask	2018-10-03 13:28:00 +09:00
ekrctb	68980fc477	Adjust usage of Handle(Non)PositionalInput to follow framework update	2018-10-02 14:45:33 +09:00
ekrctb	b7a2ad1aa5	Use UIEvent level getters for modifier keys.	2018-10-02 13:26:36 +09:00
ekrctb	50091252e2	Adapt signature change of event handlers	2018-10-02 12:02:55 +09:00
ekrctb	99fc04c8af	Change signature to new event handler	2018-10-02 12:02:47 +09:00
Dean Herbert	6841d5c2ec	Merge remote-tracking branch 'smoogipoo/fix-beatmapinfowedge' into update-framework	2018-09-28 18:32:59 +09:00
Roman Kapustin	baf9e028c3	Fix possible idleTracker nullref	2018-09-26 19:44:01 +03:00
Dean Herbert	a4bf21268b	Merge remote-tracking branch 'upstream/master' into update-framework	2018-09-26 19:59:18 +09:00
smoogipoo	a8f156584b	Update framework with positional/non-positional changes	2018-09-26 14:01:15 +09:00
Roman Kapustin	bdba22a576	Override Handle(UIEvent e) in IdleTracker	2018-09-25 20:11:10 +03:00
Roman Kapustin	c7b3fa51d5	Inject IdleTracker into ButtonSystem	2018-09-25 19:58:50 +03:00
UselessToucan	3c0b77658c	Merge branch 'master' into return_to_large_logo_after_idle	2018-09-25 19:48:38 +03:00
smoogipoo	cb500e80e4	Make BeatmapInfoWedge present until info is not null	2018-09-25 14:45:26 +09:00
Roman Kapustin	5c741eaa89	Fix possible game nullref	2018-09-21 17:07:46 +03:00
Paul Teng	ed0ea3ad41	Merge branch 'master' into patch-1	2018-09-21 06:31:15 -04:00
smoogipoo	4380ef15bf	Fix potential exception during async load callback	2018-09-21 16:31:09 +09:00
Paul Teng	654345f380	Remove duplicate condition test	2018-09-20 22:32:24 -04:00
Paul Teng	1644719893	Update SongSelect.cs	2018-09-20 22:29:37 -04:00
Paul Teng	49fbe8443a	Test if there are beatmaps when click on delete btn	2018-09-20 22:00:20 -04:00
Dean Herbert	83bf38f4bc	Make menu background blurrable ... Not actually blurring yet, needs further testing.	2018-09-21 03:13:34 +09:00
Dean Herbert	78d78b5510	Fade menu background a bit when menu is active	2018-09-21 03:13:15 +09:00
Dean Herbert	07a1c39fe5	Use random default background on starting the game	2018-09-21 03:12:20 +09:00
Dean Herbert	37f3035437	Merge remote-tracking branch 'upstream/master' into update-framework	2018-09-20 18:39:48 +09:00
smoogipoo	62135c39aa	Cleanup	2018-09-20 12:56:39 +09:00
smoogipoo	7b8094d731	Move text size/padding out of constructor	2018-09-20 12:53:45 +09:00
Dean Herbert	ae4c371bec	Merge branch 'update-framework-event-handling' into update-framework	2018-09-20 00:29:42 +09:00
Dean Herbert	b2cf636ab5	Merge branch 'localisation-changes' into update-framework	2018-09-20 00:29:31 +09:00
smoogipoo	38a3c2a820	Fix song select wedge sometimes not updating when localisation changes	2018-09-19 14:57:32 +09:00
smoogipoo	28f31540c4	Apply changes in-line with framework localisation changes	2018-09-19 14:07:46 +09:00
ekrctb	b790e16217	Use Click instead of now removed TriggerOnClick	2018-09-19 11:42:32 +09:00
ekrctb	a3e6973b41	Replace usage of now removed TriggerKeyPress and similar methods.	2018-09-19 11:36:55 +09:00
Dan Balasescu	d3bb78d139	Merge branch 'master' into add-rank-status	2018-09-18 14:10:42 +09:00
Joehu	f99eff1192	Use consistent terminology format	2018-09-15 07:30:11 -07:00
Dean Herbert	41be757a11	Merge branch 'master' into fix-logo-overhead	2018-09-15 18:33:22 +09:00
Dean Herbert	79b56cb35c	Make saveState private	2018-09-15 16:34:08 +09:00
Dean Herbert	65b2bceef2	Simplify implementation	2018-09-15 14:51:04 +09:00
Dean Herbert	1662575f88	Merge branch 'master' into replay_keycounter	2018-09-14 19:08:54 +09:00
Unknown	04853b8c83	don't show StatusPill without a difficulty	2018-09-13 13:49:57 +02:00
Unknown	5414ce9932	add StatusPill to BeatmapInfoWedge and DrawabelCarouselBeatmapSet	2018-09-13 10:18:20 +02:00
Roman Kapustin	749e89bd25	Introduce IdleTracker	2018-09-12 20:34:52 +03:00
Roman Kapustin	761d7629cd	Return to large logo after idle period	2018-09-12 18:09:19 +03:00
Dean Herbert	7c7f0e11e3	Merge branch 'master' into fix-logo-overhead	2018-09-11 01:22:44 +09:00
smoogipoo	92386edb32	Scale the results screen score to keep it in view	2018-09-10 18:13:44 +09:00
Dean Herbert	e6d5bbd886	Merge branch 'master' into multiplayer-room-settings	2018-09-09 22:40:08 +09:00
Dean Herbert	f149a66a4d	Use LargeTextureStore for all online texture retrieval ... Until now, many online textures were retrieved via the default texture store, which causes them to never be removed from GPU memory. It also has a performance overhead due to mipmap generation (which will be avoided via ppy/osu-framework#1885.	2018-09-09 02:45:37 +09:00
Dean Herbert	0f9aa834e5	Fix osu! logo being present throughout the whole game	2018-09-08 16:31:59 +09:00
Roman Kapustin	125b569ccb	Change AudioClock type to IFrameBasedClock and comment its usage	2018-09-07 21:39:41 +03:00
Roman Kapustin	dae54d252d	Remove redundant checks in RestoreState	2018-09-07 21:35:32 +03:00
Dean Herbert	cc533a05c5	Update framework	2018-09-07 19:00:43 +09:00
Dean Herbert	81da7ce298	Merge branch 'master' into add-skin-import-delete	2018-09-07 16:48:01 +09:00
Dean Herbert	a1780fddc9	DrawInfo -> DrawColourInfo	2018-09-06 18:02:04 +09:00
Dean Herbert	c23b9b61a8	Simplify implementation in line with framework improvements	2018-09-06 17:28:08 +09:00
Dean Herbert	e63f60231a	Optimise carousel memory usage by unloading off-screen panels	2018-09-06 13:31:37 +09:00
Roman Kapustin	7a1fdd9dc8	Reset KeyCounter if targetState was not found	2018-09-06 01:01:36 +03:00
Dean Herbert	5aff19eaea	Merge branch 'master' into replay_keycounter	2018-09-05 08:53:02 +09:00
Dean Herbert	fa569e5ae4	Offer to import skins on first startup	2018-09-03 10:10:39 +09:00
Dean Herbert	144e80dff6	Add "import all skins from stable" option (and mass delete)	2018-09-03 10:10:04 +09:00
Dean Herbert	03084aa04b	Revert async changes	2018-08-31 07:07:10 +09:00
Dean Herbert	919e78a89a	Attempt to fix cross-thread database usage	2018-08-29 01:42:25 +09:00
smoogipoo	e7a5816d27	Use GetAsync for all samples	2018-08-27 17:30:16 +09:00
smoogipoo	1b279d383f	Use GetAsync on all textures	2018-08-27 17:26:44 +09:00
DrabWeb	c72281d0f2	Change local bindings instead of room bindings.	2018-08-24 19:27:16 -03:00
DrabWeb	90e178821a	Limit max participants field to only numbers.	2018-08-24 19:19:16 -03:00
DrabWeb	c5f0b27544	Speedup transition.	2018-08-24 19:11:52 -03:00
Dan Balasescu	83ca3053c5	Merge branch 'master' into break-overlay-double-parallax	2018-08-24 15:10:28 +09:00
Dean Herbert	9f3f07df2e	Fix notifications appearing too early in load process	2018-08-23 11:21:56 +09:00
Dean Herbert	9cbead55d6	Add a second parallax layer to break overlay arrows	2018-08-22 17:41:13 +09:00
smoogipoo	2fb62827e2	Soft-handle errors when beatmap contains no objects	2018-08-22 16:01:58 +09:00
Dean Herbert	22dce64d6d	Merge branch 'master' into circular-button	2018-08-21 19:15:20 +09:00
Dan Balasescu	9d2c679f12	Merge branch 'master' into fix-logo-flying	2018-08-21 10:16:03 +09:00
Dean Herbert	4a68b14447	Fix crash when selecting mods after entering play mode ... Closes #3260.	2018-08-21 00:15:51 +09:00
Dean Herbert	39aa98d12d	Fix logo flying off-screen when exiting game	2018-08-20 14:58:02 +09:00
Dean Herbert	18aa30fcb0	Unbind song select's ruleset to avoid test failures	2018-08-20 14:27:32 +09:00
Roman Kapustin	8a9b3f6459	Remove rewinded keycounter states	2018-08-15 22:18:48 +03:00
smoogipoo	85dc42d47a	Re-namespace/rename CircularButton	2018-08-15 16:49:53 +09:00
DrabWeb	e65bb5b54b	Remove unused usings, remove unused icon variable.	2018-08-14 12:34:05 -03:00
DrabWeb	7d8c0aca72	Order usings, use inline out variable declaration.	2018-08-14 12:25:35 -03:00
DrabWeb	3d0b1b6009	Cleanup.	2018-08-14 12:08:00 -03:00
DrabWeb	ea523baa4a	Add hover animations to GameTypePicker and RoomAvailabilityPicker.	2018-08-14 11:54:35 -03:00
DrabWeb	c66578ba5b	Allow tabbing between text fields.	2018-08-14 11:36:46 -03:00
DrabWeb	af31845c83	Fix naming conflicts in RoomSettingsOverlay.	2018-08-14 11:31:20 -03:00
DrabWeb	52b157d072	Merge https://github.com/ppy/osu into multiplayer-room-settings	2018-08-14 11:16:25 -03:00
Dean Herbert	5112f9b69f	Merge branch 'master' into fix-ruleset-change	2018-08-14 14:48:09 +09:00
smoogipoo	970aa811bd	Fix mods not being reset prior to ruleset changing	2018-08-14 13:19:50 +09:00
Dean Herbert	270dc2d1be	Merge branch 'master' into judgement-rework	2018-08-14 13:16:16 +09:00
Dean Herbert	4453b5faca	Cache mods at PlaySongSelect	2018-08-08 12:43:08 +09:00
Dean Herbert	70ce9da321	Merge branch 'master' into judgement-rework	2018-08-07 18:09:06 +09:00
Dean Herbert	4cb7063801	Add automated testing of mod preservation/removal	2018-08-07 16:45:18 +09:00
Dean Herbert	7b8bd7f21c	Fix mod selection not restoring when re-entering song select	2018-08-07 14:49:44 +09:00
Dan Balasescu	12b99acb2b	Merge branch 'master' into add-loading-animation	2018-08-06 13:06:51 +09:00
Dan Balasescu	c1517e1521	Merge branch 'master' into judgement-rework	2018-08-06 12:30:46 +09:00
Dean Herbert	0c920fe486	Merge branch 'master' into mania-mask-container	2018-08-06 04:22:21 +09:00
Dean Herbert	808754a191	Merge branch 'master' into fix-fade-discrepancies	2018-08-03 21:50:03 +09:00
Dean Herbert	042e4e3966	Merge branch 'master' into add-loading-animation	2018-08-03 21:50:02 +09:00
Dean Herbert	6ee06602b8	Merge branch 'master' into mania-mask-container	2018-08-02 20:41:27 +09:00
smoogipoo	3619290c34	Split out judgement definition from judgement result	2018-08-02 20:35:54 +09:00
Dean Herbert	4bd811bd2d	Merge branch 'master' into circular-button	2018-08-02 20:25:45 +09:00
Dean Herbert	b1afcf0e5d	Add loading animation to player loader to make it more obvious when loading is complete	2018-08-02 19:47:50 +09:00
Dean Herbert	7097ecb740	Fix discrepancies in how elements of play mode fade when restarting/exiting	2018-08-02 19:08:23 +09:00
Dean Herbert	4a11f2ec2a	Improve UX when adjusting visual settings at loading screen	2018-08-02 18:18:55 +09:00
smoogipoo	10b8708d4e	Make SetupCircularButton adjust corner radius by height	2018-08-01 17:47:32 +09:00
smoogipoo	9eb47ae691	Make SetupCircularButton inherit OsuButton	2018-08-01 17:02:52 +09:00
ekrctb	ecc6d55380	Fix player loader not gets ready when multiple mouse button is down	2018-08-01 16:20:29 +09:00
Shane Woolcock	47533f83c3	Update TabControl subclasses to use AddInternal	2018-07-31 20:52:11 +09:30
smoogipoo	c9d4332846	size_x, size_y -> width, height	2018-07-31 16:44:20 +09:00
Dean Herbert	9ab56bc4ef	Make Ruleset non-public	2018-07-31 16:35:51 +09:00
smoogipoo	c5a772bbc8	Completely reuse TriangleButton	2018-07-31 15:49:04 +09:00
Dean Herbert	ddecf59cfd	Merge branch 'master' into open-downloaded-beatmas	2018-07-31 13:21:14 +09:00
Dan Balasescu	090bc592b5	Merge branch 'master' into add-skip-button-sound	2018-07-30 17:56:08 +09:00
Dean Herbert	8c3583ac54	Remove newline	2018-07-30 14:55:03 +09:00
Roman Kapustin	3134e14b37	Test KeyCounter.RestoreState	2018-07-28 23:24:03 +03:00
Roman Kapustin	8bb83a8fd9	Fix nullref in KeyCounterCollection	2018-07-28 22:16:14 +03:00
Roman Kapustin	1e6220e3c0	Call KeyCounter.RestoreState itself	2018-07-28 13:22:52 +03:00
Dean Herbert	b7de922896	Merge branch 'master' into open-downloaded-beatmas	2018-07-28 12:44:34 +09:00
phosphene47	d32a3ff052	Esc at the end of play should push to result screen ... Closes #3060	2018-07-28 08:34:51 +10:00
AlFasGD	93cf063c97	Remove useless things	2018-07-27 12:52:33 +03:00
AlFasGD	1962797e20	Remove unnecessary using directive	2018-07-27 12:40:38 +03:00
AlFasGD	78cde95132	Privatise constants	2018-07-27 12:34:11 +03:00
AlFasGD	3ee1353976	Remove whitespace	2018-07-27 12:28:47 +03:00
AlFasGD	2a819a53c0	Prefer inheriting TriangleButton instead of Container	2018-07-27 12:26:37 +03:00
Dan Balasescu	ceaa23fbbb	Merge branch 'master' into fix-turkish-i	2018-07-26 18:06:58 +09:00
Dan Balasescu	6c290702a3	Merge branch 'master' into labelled-text-box-fixes	2018-07-25 21:21:06 +09:00
AlFasGD	c4b1ba2979	Remove padding, fix corner radiuses	2018-07-25 15:14:40 +03:00
Dean Herbert	95cca046fb	Merge branch 'master' into open-downloaded-beatmas	2018-07-25 12:38:49 +02:00
Dean Herbert	ff04527c6d	Merge branch 'master' into fix-always-skipping	2018-07-25 12:30:39 +02:00
smoogipoo	206e3686f2	Add back blue border	2018-07-25 18:38:50 +09:00
smoogipoo	127084ba74	Merge remote-tracking branch 'origin/master' into labelled-text-box	2018-07-25 18:35:04 +09:00
smoogipoo	b60e4b0728	Cleanup	2018-07-25 18:34:47 +09:00
Dan Balasescu	53e55c2f14	Merge branch 'master' into fix-always-skipping	2018-07-25 15:30:24 +09:00
Dean Herbert	38f221cd60	Merge branch 'master' into fix-turkish-i	2018-07-25 08:15:20 +02:00
Dean Herbert	da8fc0ee5d	ToLower -> ToLowerInvariant	2018-07-25 07:37:05 +02:00
AlFasGD	6675c455f3	Trim whitespace that magically appeared	2018-07-24 22:33:19 +03:00
AlFasGD	3ca112aef0	Clean code and apply requested changes	2018-07-24 22:04:02 +03:00
Dean Herbert	5364a6148a	Use ToUpperInvariant	2018-07-24 14:42:06 +02:00
Dean Herbert	ab9340f4be	Fix usage of culture local ToUpper causing incorrect display on Turkish machines ... Closes #3098.	2018-07-24 11:37:43 +02:00
AlFasGD	ebf14c9c93	Update framework from current master	2018-07-24 11:32:24 +03:00
AlFasGD	d304aca08f	Merge branch 'master' into circular-button	2018-07-24 11:30:56 +03:00
AlFasGD	4d0d4523ca	Add test case, rename component	2018-07-24 11:23:38 +03:00
AlFasGD	0e50e4ee34	Clean code	2018-07-24 10:10:17 +03:00
AlFasGD	765c6e4ecc	Remove custom text box	2018-07-24 09:46:24 +03:00
AlFasGD	2f452c162c	Make text colour white	2018-07-24 09:21:01 +03:00
AlFasGD	a833fa3d92	Update framework and apply suggested changes	2018-07-24 09:19:45 +03:00
AlFasGD	cd37b0df23	Merge branch 'master' into labelled-text-box	2018-07-24 09:19:22 +03:00
AlFasGD	dd56a2d95f	Apply proposed changes (untested)	2018-07-23 15:44:10 +03:00
Dean Herbert	1b456fd716	Fix a potential InvalidOperationException when entering song select ... Closes #3052.	2018-07-23 13:11:06 +02:00
Dean Herbert	44a2ae5f9a	Fix incorrect variable usage	2018-07-23 08:33:47 +02:00
Dean Herbert	aead4be134	Merge remote-tracking branch 'upstream/master' into AlFasGD-mania-mask-container	2018-07-23 06:36:10 +02:00
Roman Kapustin	332ad5bb67	Move states to KeyCounter	2018-07-22 23:58:21 +03:00
Dean Herbert	479fe98335	Add more prominent sound when skipping	2018-07-22 22:57:55 +02:00
Dean Herbert	3c59ccadd0	Fix gameplay always skipping to first hitobject time ... Regresssed with previous build	2018-07-22 22:19:58 +02:00
Roman Kapustin	ecd51d70f9	Rename Memento class	2018-07-22 23:13:06 +03:00
Roman Kapustin	d387048057	Resolve KeyCounterCollection merge conflict	2018-07-22 21:15:53 +03:00
Roman Kapustin	7f3ad37ede	Restore keycounter state on replay seek	2018-07-22 19:42:18 +03:00
Roman Kapustin	1d9bf42082	Fix clock assigning during KeyCounterCollection creation	2018-07-22 18:38:10 +03:00
Roman Kapustin	0632c59e60	Save KeyCounter state when keypress happens	2018-07-22 17:35:42 +03:00
Roman Kapustin	72959691e9	Introduce KeyCounterMemento	2018-07-22 17:16:17 +03:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
Dean Herbert	a2f744b05e	Merge remote-tracking branch 'upstream/master' into open-downloaded-beatmas	2018-07-21 00:03:17 +09:00
AlFasGD	7b4616c6c1	Add circular button file	2018-07-20 14:02:02 +03:00
AlFasGD	f200cfe40d	Add labelled text box files	2018-07-20 13:05:19 +03:00
Dean Herbert	241437c819	Remove unnecessary counting change logic	2018-07-20 17:08:25 +09:00
Dean Herbert	64ead0fdf7	Add more tests and fix one remaining issue case	2018-07-20 11:55:17 +09:00
Dean Herbert	d7f1766ee2	wip	2018-07-19 18:51:08 +09:00
Dean Herbert	c31676f8f1	Rework update methods to separate out ruleset and beatmap changes ... Combining them was causing complexity and logic errors.	2018-07-19 18:48:40 +09:00
smoogipoo	b7721edc80	Remove more unnecessary changes	2018-07-19 18:25:28 +09:00
Dean Herbert	82ddbb3f5d	Delay key count stop	2018-07-19 01:18:07 +09:00
Dean Herbert	8414fe9d05	Add key counter exceptions for paused state	2018-07-18 22:19:32 +09:00
Dean Herbert	a01361f833	Set restart count	2018-07-18 22:05:24 +09:00
Dean Herbert	c2cdf12986	Better pause logic	2018-07-18 19:59:04 +09:00
Dean Herbert	9611292f4e	FilterTask -> PendingFilter	2018-07-18 13:18:50 +09:00
Dean Herbert	f1c3fbe644	Improve integrity of song select bind/change logic	2018-07-18 13:18:50 +09:00
smoogipoo	6437fdd9db	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs	2018-07-17 16:46:48 +09:00
smoogipoo	c51fe6a119	Remove more unused stuff	2018-07-17 16:01:47 +09:00
smoogipoo	9f730dd784	Merge branch 'editor-composer-cleanup' into mania-mask-container ... # Conflicts: # osu.Game/Rulesets/Edit/HitObjectComposer.cs # osu.Game/Screens/Edit/Screens/Compose/Layers/HitObjectMaskLayer.cs	2018-07-17 16:00:46 +09:00
smoogipoo	0b66f63f7d	Invert flow order of hitobjects between composer and mask layers	2018-07-17 15:35:32 +09:00
Dean Herbert	e681bd3244	Merge branch 'master' into fix-incorrect-mods	2018-07-17 15:23:21 +09:00
Dean Herbert	b967fe714b	Fix lead-in time now being long enough in many cases	2018-07-17 14:29:22 +09:00
Dan Balasescu	745d596343	Merge branch 'master' into fix-incorrect-mods	2018-07-17 13:41:02 +09:00
Dan Balasescu	7a2dc3c674	Merge branch 'master' into clickable-download-notifications	2018-07-17 13:29:16 +09:00
smoogipoo	577ff4cc7f	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs # osu.Game.Rulesets.Mania/UI/ManiaPlayfield.cs # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs # osu.Game.Rulesets.Mania/UI/ManiaStage.cs	2018-07-17 13:13:57 +09:00
Dan Balasescu	e4fc3a1c65	Merge branch 'master' into fix-drawable-load-regression	2018-07-17 12:22:12 +09:00
Dean Herbert	da300baff1	Update hide logic	2018-07-17 00:06:51 +09:00
Dean Herbert	ca7b61367f	Merge branch 'master' into correctQuickFade	2018-07-17 00:02:15 +09:00
Dean Herbert	4829f4f09c	Merge branch 'master' into download-button-state	2018-07-16 03:17:26 +09:00
HoutarouOreki	453d58bcbd	Hide Content instead of particular overlays	2018-07-15 01:10:05 +02:00
Berkan Diler	c8697e1743	Fix KeyCounter counting clicks when game is paused	2018-07-14 03:08:28 +02:00
Dean Herbert	4f5578245e	Fix regression causing previews to not play	2018-07-13 21:45:49 +09:00
Dean Herbert	63c40e9051	Remove unnecessary cache operations	2018-07-13 21:45:42 +09:00
Dean Herbert	a1a077398c	Merge remote-tracking branch 'upstream/master' into peppy-clickable-download-notifications	2018-07-13 21:04:17 +09:00
Dean Herbert	bbb11a4066	Fix regression in drawable rank first display	2018-07-13 19:53:29 +09:00
Dean Herbert	ee2c7c50ad	Tidy up button hierarchy	2018-07-13 16:28:18 +09:00