9204 Commits

Author	SHA1	Message	Date
smoogipoo	9a1e92800b	Adjust with framework-side screenchanges	2018-08-17 14:30:44 +09:00
Dan Balasescu	e7e14cc76c	Merge branch 'master' into log-display-fix	2018-08-17 14:15:14 +09:00
Dean Herbert	5ddef1afed	Merge pull request #3245 from smoogipoo/import-output ... Output the currently importing model	2018-08-17 13:57:57 +09:00
smoogipoo	83bda313d1	Output the currently importing model	2018-08-17 13:50:27 +09:00
smoogipoo	16d30f6756	Add explanatory comments	2018-08-17 13:31:12 +09:00
Dean Herbert	7a8aabc402	Fix notifications suggesting automatic reporting in non-deployed builds	2018-08-17 13:18:48 +09:00
Dean Herbert	49f455e55d	Merge branch 'master' into spinner-combo-fix	2018-08-17 12:59:36 +09:00
Dean Herbert	0ae487b9c9	Add back missing statement	2018-08-17 12:27:36 +09:00
Dean Herbert	4aedd252fb	Merge branch 'master' into spinner-combo-fix	2018-08-17 12:07:37 +09:00
Dean Herbert	83dc01d07c	Fix multiple sentry reports arriving for similar exceptions	2018-08-17 12:05:21 +09:00
smoogipoo	eb6f1ae72c	Fix spinners providing one extra combo	2018-08-17 09:16:28 +09:00
Dean Herbert	9f5a6457f2	Don't forward errors to sentry for local builds	2018-08-17 09:08:58 +09:00
Dean Herbert	12b81df2f3	Fix unhandled exception on startup when arguments are present	2018-08-16 22:01:04 +09:00
Dean Herbert	ff0dfa7acf	Merge branch 'master' into relax	2018-08-16 17:36:24 +09:00
Dean Herbert	6297ad95aa	Remove test exception	2018-08-16 16:49:06 +09:00
Dean Herbert	9f55afe569	Let user know automatic reporting happened	2018-08-16 16:44:12 +09:00
Dean Herbert	9fc0a75b71	Merge branch 'master' into sentry-logging	2018-08-16 13:33:24 +09:00
ekrctb	cf4cb934cf	Merge branch 'master' into fix-combo-colours	2018-08-16 10:45:54 +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
smoogipoo	add78508e0	Update framework	2018-08-15 15:54:26 +09:00
smoogipoo	767c284793	Fix import not working	2018-08-15 15:49:55 +09:00
smoogipoo	4dfb63023f	Update with recent changes	2018-08-15 15:49:48 +09:00
smoogipoo	d0c9e2257b	Merge remote-tracking branch 'origin/master' into framework-storage-update	2018-08-15 14:54:09 +09:00
smoogipoo	539dd3134f	Fix beatmap processor not setting combo index on first object	2018-08-15 11:48:50 +09:00
smoogipoo	4c3e551295	Fix first object not receiving new combo ... Note: If a normal catch fruit is the first object, it does not receive a new combo...	2018-08-15 11:48:28 +09:00
smoogipoo	31f324945e	Implement combo offsets	2018-08-15 11:47:31 +09:00
smoogipoo	da3e2cfee2	Catch/osu! spinners should have combo	2018-08-15 11:13:23 +09:00
smoogipoo	4f0305ffeb	Taiko convert hitobjects should not have combo	2018-08-15 10:58:59 +09:00
smoogipoo	83f75ac896	Mania convert hitobjects should not have combo	2018-08-15 10:57:11 +09:00
smoogipoo	8faf12579a	Fix field not being set correctly	2018-08-15 10:53:25 +09:00
smoogipoo	d2709613bc	Add combo offset to ConvertHitObjectParser	2018-08-15 10:49:45 +09:00
smoogipoo	ce77473910	Simplify usage of ConvertHitObjectParser	2018-08-15 10:24:56 +09:00
Dean Herbert	9cdaefb64b	Merge branch 'master' into extend-modoverlay	2018-08-15 09:23:44 +09:00
smoogipoo	aa3f6337a2	Add comment	2018-08-15 09:14:07 +09:00
Dean Herbert	607769c9ce	Merge branch 'master' into fix-rewinding	2018-08-15 08:45:34 +09:00
smoogipoo	e04b2f4fa9	Fix hitobject results not rewinding	2018-08-14 18:31:32 +09:00
smoogipoo	e360985d73	Replace variables into the entire line	2018-08-14 18:15:09 +09:00
smoogipoo	f69bc23ab8	Overflow mod select to account for parallax	2018-08-14 17:26:25 +09: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
smoogipoo	b8824a41b5	Fix certain control points not being replaced	2018-08-14 11:44:53 +09:00
smoogipoo	2a5b9f79ff	Indent	2018-08-08 15:49:27 +09:00
smoogipoo	ee0cefdd5b	Merge remote-tracking branch 'origin/master' into direct-list-view	2018-08-08 15:48:34 +09:00
smoogipoo	bfbe00e6ec	Remove multiple caching	2018-08-08 15:38:09 +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
Dean Herbert	7233e863db	Update framework	2018-08-07 01:07:50 +09:00
Dan Balasescu	12b99acb2b	Merge branch 'master' into add-loading-animation	2018-08-06 13:06:51 +09:00
smoogipoo	60c94a8ea3	Fix ScoreProcessor.ApplyBeatmap never being called	2018-08-06 12:42:54 +09:00
Dan Balasescu	c1517e1521	Merge branch 'master' into judgement-rework	2018-08-06 12:30:46 +09:00
smoogipoo	2a54b5b78d	ResetResult -> RevertResult	2018-08-06 12:29:22 +09:00
smoogipoo	c48a4d9993	Add exception	2018-08-06 12:29:12 +09:00
smoogipoo	3a7488767c	Make HitObject not store the judgement	2018-08-06 11:50:18 +09:00
smoogipoo	0d6a8a2bf5	More xmldocs	2018-08-06 11:31:54 +09:00
smoogipoo	741ec0021e	Rename more judgement-related methods to "result"	2018-08-06 11:31:46 +09:00
smoogipoo	ab642b563f	CreateJudgementResult -> CreateResult	2018-08-06 11:07:41 +09:00
smoogipoo	754f3c8621	Move result creation to load(), add exceptions	2018-08-06 11:07:05 +09:00
smoogipoo	b35817c877	More xmldocs to hitobject/drawablehitobject	2018-08-06 10:55:38 +09:00
smoogipoo	5fd4ed2f4e	Rename judgement-related methods/events + commenting	2018-08-06 10:55:25 +09:00
Dean Herbert	0c920fe486	Merge branch 'master' into mania-mask-container	2018-08-06 04:22:21 +09:00
tgi74000	b1d1a2400b	Remove IUpdatableByHitObject completely	2018-08-05 09:52:19 +02:00
Dean Herbert	6d6fea47ab	Reduce animations of osu!direct list mode ... The panels' content was flying around and felt really shocking. This fixes elements in place to provide a better experience.	2018-08-05 14:36:09 +09:00
tgi74000	07d6a75e23	Rename variables to be human readable	2018-08-04 00:18:09 +02:00
Dan Balasescu	1981b94e32	Merge branch 'master' into fix-fade-discrepancies	2018-08-04 00:21:48 +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	46b3ba9edb	Merge branch 'master' into scroll-chat-on-message	2018-08-03 21:50:00 +09:00
Dean Herbert	8d98826f69	Update framework	2018-08-03 21:17:17 +09:00
tgi74000	7310c38df9	Add relax mod	2018-08-03 14:03:11 +02:00
Dean Herbert	fc8526d8ba	Merge branch 'master' into scroll-chat-on-message	2018-08-03 20:09:54 +09:00
Dean Herbert	b4ef3dd4dd	Add LocalMessage	2018-08-03 20:03:43 +09:00
Dean Herbert	4c57e629ff	Use private implementation	2018-08-03 19:32:34 +09:00
Dan Balasescu	e3490b1270	Merge branch 'master' into improve-visual-settings-preview	2018-08-03 19:29:12 +09:00
Dean Herbert	2ea90ef98a	Add sentry logging	2018-08-03 19:25:55 +09:00
Dan Balasescu	3460fd6e71	Merge branch 'master' into split-mod-sections	2018-08-03 18:48:31 +09:00
smoogipoo	482526135f	Make IsHit not consider nested hitobjects	2018-08-03 16:07:20 +09:00
smoogipoo	2a4994e5ce	Make hitobjects only have one judgement + result	2018-08-03 15:38:48 +09:00
jorolf	123f304cf1	update storage usages	2018-08-02 19:24:17 +02:00
smoogipoo	35b4ab5456	Introduce the concept of a "MainResult"	2018-08-02 21:07:40 +09:00
smoogipoo	8d81e66f88	Fix osu score processor crashing	2018-08-02 21:07:11 +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
Dean Herbert	9fdba887e4	Merge branch 'master' into fix-playerloader-ready-check	2018-08-02 11:37:45 +09:00
Dean Herbert	70ee7e4afd	Scroll chat to end of buffer when posting a new message	2018-08-02 08:00:14 +09:00
smoogipoo	d51d0e8547	Initial structure for new hitobject judgement system	2018-08-01 21:45:59 +09:00
smoogipoo	41512667a8	Require all judgements to be present for map completion	2018-08-01 19:51:24 +09:00
Dean Herbert	6ce32bd431	Update remaining nuget deps	2018-08-01 19:17:16 +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
smoogipoo	b9814b64ed	Move default button implementation from TriangleButton to OsuButton	2018-08-01 17:02:38 +09:00
Dean Herbert	4224d35a75	Use forked squirrel ... Allows for updating SharpCompress, too.	2018-08-01 16:56:36 +09:00
ekrctb	ecc6d55380	Fix player loader not gets ready when multiple mouse button is down	2018-08-01 16:20:29 +09:00
Dean Herbert	3d136bf207	Remove unused nuspec	2018-08-01 03:37:59 +09:00
Shane Woolcock	4fdca2b198	Update framework	2018-07-31 21:21:26 +09:30
Shane Woolcock	47533f83c3	Update TabControl subclasses to use AddInternal	2018-07-31 20:52:11 +09:30
Dean Herbert	582bc58715	Remove unused colour propagation	2018-07-31 18:05:14 +09:00
Dean Herbert	3c06655672	Split out Special mods into Automation and Conversion	2018-07-31 18:00:42 +09:00
Dean Herbert	bcc23f10c5	Merge branch 'master' into disable-download-button	2018-07-31 17:03:41 +09:00
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
smoogipoo	ec31028f14	Add tooltip	2018-07-31 14:50:57 +09:00
smoogipoo	70338e087a	Disable beatmap download button if not supporter	2018-07-31 14:41:31 +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	4abdca92e1	Merge remote-tracking branch 'upstream/master' into phosphene47-player-esc-result	2018-07-30 14:57:04 +09:00
Dean Herbert	8c3583ac54	Remove newline	2018-07-30 14:55:03 +09:00
Dean Herbert	f57ba4ffb1	Update framework	2018-07-30 14:14:16 +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
smoogipoo	464333cf0b	Merge remote-tracking branch 'origin/master'	2018-07-26 21:28:31 +09: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
Dean Herbert	425b5e4119	Merge remote-tracking branch 'upstream/master' into peppy-fix-turkish-i	2018-07-25 07:36:24 +02:00
Dan Balasescu	affecccabc	Merge branch 'master' into fix-invalid-operation	2018-07-25 14:35:36 +09: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	e7591a9214	Merge branch 'master' into replay_keycounter	2018-07-24 12:21:51 +02:00
Dean Herbert	1d86083981	Hide unnecessary log output	2018-07-24 12:13:48 +02:00
Dean Herbert	b38da34da9	Fix resetting database failing due to incorrect disposal logic	2018-07-24 12:13:48 +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	2169a47325	Prevent fatal failures on delete failures	2018-07-23 10:39:43 +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	6fa70ed696	Merge branch 'master' into centralise-judgement-display	2018-07-23 05:23:52 +09: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
Dean Herbert	d561f54282	Merge branch 'master' into per-object-css	2018-07-23 03:01:17 +09:00
Dean Herbert	d868d81b59	Merge branch 'master' into centralise-judgement-display	2018-07-23 02:58:49 +09: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
Dean Herbert	77da100c0f	Merge branch 'master' into fix-model-import	2018-07-20 23:30:41 +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	3fc7f33e90	Merge branch 'master' into centralise-judgement-display	2018-07-20 17:29:15 +09:00
Dean Herbert	7cc999027d	Merge branch 'master' into pause-input-fixes	2018-07-20 17:20:19 +09:00
Dean Herbert	241437c819	Remove unnecessary counting change logic	2018-07-20 17:08:25 +09:00
smoogipoo	1139f0dbf2	Centralise method of disabling playfield judgements	2018-07-20 17:04:33 +09:00
Dean Herbert	fc6deb6ab5	Merge remote-tracking branch 'upstream/master' into peppy-fix-model-import	2018-07-20 16:42:46 +09:00
Dean Herbert	7fea2b3a8b	Add ToList	2018-07-20 16:38:02 +09:00
Dean Herbert	92fe996a8b	Merge branch 'master' into fix-model-import	2018-07-20 16:17:39 +09:00
Dean Herbert	0e7bb3b548	Merge branch 'master' into no-more-memory-sqlite	2018-07-20 16:17:36 +09:00
smoogipoo	c087a73f40	Implement per-hitobject custom sample banks	2018-07-20 15:12:44 +09:00
smoogipoo	de8d05bb0c	Remove unnecessary setting of sample name to same value	2018-07-20 15:12:21 +09:00
Dean Herbert	64ead0fdf7	Add more tests and fix one remaining issue case	2018-07-20 11:55:17 +09:00
David V	9eb69a1e76	Restructure + corrects converting to support all systems	2018-07-19 17:47:55 +02:00
David V	4e72794101	Converts float to int.	2018-07-19 15:55:38 +02:00
Dan Balasescu	5dba048c46	Merge branch 'master' into mania-mask-container	2018-07-19 19:38:43 +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
Dean Herbert	693ba8e994	Add more ToString output	2018-07-19 18:43:11 +09:00
smoogipoo	b7721edc80	Remove more unnecessary changes	2018-07-19 18:25:28 +09:00
Dean Herbert	332c62f110	Merge branch 'fix-model-import' into open-downloaded-beatmas ... # Conflicts: # osu.Game/Beatmaps/BeatmapManager.cs # osu.Game/Database/SingletonContextFactory.cs	2018-07-19 14:11:31 +09:00
Dean Herbert	7be3a5d466	Centralise test storage logic	2018-07-19 14:07:55 +09:00
Dean Herbert	68614f1512	Ensure online IDs are validated for imports that don't have an associated archive too	2018-07-19 13:41:34 +09:00
Dean Herbert	82ddbb3f5d	Delay key count stop	2018-07-19 01:18:07 +09:00
Dean Herbert	41441771ae	Remove unnecessary cast	2018-07-18 22:22:28 +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	0c24244340	Remove SingletonContextFactory ... It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution. # Conflicts: # osu.Game/Database/SingletonContextFactory.cs	2018-07-18 16:50:56 +09:00
Dean Herbert	1d52231d4f	Remove SingletonContextFactory ... It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.	2018-07-18 16:44:47 +09:00
Dean Herbert	90840c9384	Fix ArchiveModelManager's model import method not running import logic	2018-07-18 13:18:50 +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
Dean Herbert	5fe634a3b6	Click download button to load beatmap	2018-07-18 13:18:50 +09:00
Dean Herbert	e3fb781a5a	Fix ArchiveModelManager's model import method not running import logic	2018-07-18 12:59:22 +09:00
Dean Herbert	aa2f2f3e94	Merge pull request #3034 from peppy/reduce-panel-width ... Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions	2018-07-17 19:14:48 +09:00
smoogipoo	9b7d01397b	Add ruleset config to HitObjectComposer	2018-07-17 16:53:32 +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
Dan Balasescu	64cde1ebad	Merge branch 'master' into use-switch-over-if	2018-07-17 16:44:57 +09:00
Dean Herbert	97e71245e9	Merge branch 'master' into reduce-panel-width	2018-07-17 16:36:05 +09:00
Dean Herbert	9f933187e9	Apply review feedback	2018-07-17 16:33:08 +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	3905a9105c	Add a playfield method to retrieve all hitobjects	2018-07-17 15:51:10 +09:00
smoogipoo	48190e3b5a	Make NestedPlayfields non-null	2018-07-17 15:48:51 +09:00
Dean Herbert	569d0f7993	Merge branch 'master' into scrolldirection-cleanup	2018-07-17 15:39:13 +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
smoogipoo	827c5c4939	Remove scroll direction from ScrolingPlayfield constructor	2018-07-17 15:14:03 +09:00
Dean Herbert	825941aff1	Use switch with type matching in place of if-else where possible	2018-07-17 14:35:09 +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	61f58ed08a	Merge branch 'master' into reduce-panel-width	2018-07-17 12:51:16 +09:00
Dan Balasescu	e4fc3a1c65	Merge branch 'master' into fix-drawable-load-regression	2018-07-17 12:22:12 +09:00
Dean Herbert	4f1b7c8065	Merge branch 'master' into reduce-panel-width	2018-07-17 04:20:40 +09:00
Dean Herbert	84c13174d9	Merge branch 'master' into use-has-flags	2018-07-17 03:50:40 +09:00
Dean Herbert	40a1f8313e	Merge branch 'master' into make-notifications-quieter	2018-07-17 03:24:47 +09:00
Dean Herbert	f4591c6d0b	Merge branch 'master' into fix_color_parsing	2018-07-17 00:25:32 +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
morguldir	fc77e01ba9	Fix formatting, make StripComments protected ... Don't strip comments when calling ParseLine	2018-07-16 16:35:55 +02:00
Dean Herbert	58fe434dd0	Don't use in invalidation logic to avoid incorrect execution	2018-07-16 16:39:52 +09:00
Dean Herbert	98cddc0c04	Fix some legacy cases	2018-07-16 16:26:37 +09:00
Dean Herbert	dbc538abbe	Use Enum.HasFlag ... With .NET core 2.0+ this is as efficient as the ugly code we've been using.	2018-07-16 16:18:46 +09:00
Dean Herbert	a117b323e2	Merge branch 'master' into make-notifications-quieter	2018-07-16 13:15:07 +09:00
Dean Herbert	a12c47536b	Change default to being important	2018-07-16 13:00:21 +09:00
morguldir	429306aa87	Fix casing, use ordinal string comparison when stripping comments	2018-07-16 01:54:20 +02:00
morguldir	87a4bf3d92	Remove using directive for regex in LegacyDecoder	2018-07-16 01:08:30 +02:00
morguldir	6c861a1638	Strip comments from everything except metadata	2018-07-16 01:04:41 +02: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	730eb2daa2	Reduce osu!direct panel width to allow three panels displayed at 16:9 resolutions	2018-07-14 03:47:56 +09:00
Dean Herbert	81e5a37d6d	Enlist a few more important notifications	2018-07-14 03:31:19 +09:00
Dean Herbert	e0bcd6988a	Merge branch 'master' into lesserSideKeys	2018-07-13 23:32:44 +09:00
Dean Herbert	d63611a9b3	Merge branch 'master' into fix-incorrect-mods	2018-07-13 22:08:21 +09:00
Dean Herbert	6698f320fb	Merge branch 'master' into download-button-state	2018-07-13 22:05:26 +09: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	ac35e8bd99	Remove redundant empty statement	2018-07-13 21:27:09 +09:00
Dean Herbert	ac4f25c5bc	Make notifications less noisy	2018-07-13 21:25:08 +09:00
Dean Herbert	fc3aff6689	Fix initial colour	2018-07-13 21:19:10 +09:00
Dean Herbert	6d8923a37c	Use better logic	2018-07-13 21:08:41 +09:00
Dan Balasescu	ce804461e8	Merge branch 'master' into focused-overlay-blocks-select	2018-07-13 21:06:59 +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	95f314d949	Fix crash when clicking notification from player	2018-07-13 21:04:10 +09:00
Dean Herbert	b33a0f772e	Don't close toolbar	2018-07-13 21:00:52 +09:00
Dean Herbert	67e7e371cc	Also block keyboard completely	2018-07-13 20:40:49 +09:00
Dean Herbert	3308f8f823	Fix focused overlays not blocking select action	2018-07-13 20:37:49 +09:00
Dean Herbert	96eb44425b	Fix informational overlays not hiding when user toggles other overlay views ... Closes #3014.	2018-07-13 20:34:41 +09:00
Dean Herbert	bbb11a4066	Fix regression in drawable rank first display	2018-07-13 19:53:29 +09:00
Dan Balasescu	6cc0a69413	Merge branch 'master' into remove-migration-notice	2018-07-13 19:31:20 +09:00
Dean Herbert	cd31df7c2e	Merge pull request #2903 from smoogipoo/storyboard-samples ... Implement storyboard sample playback	2018-07-13 18:48:05 +09:00
Dean Herbert	c160a61fb7	Merge branch 'master' into storyboard-samples	2018-07-13 18:34:51 +09:00
Dean Herbert	3f44f5c60e	Remove migration log output	2018-07-13 18:34:38 +09:00
Dan Balasescu	69acb4f10e	Merge branch 'master' into improve-difficulty-icons	2018-07-13 18:27:43 +09:00
Dean Herbert	2d602c0e3c	Add todo regarding playback skip logic	2018-07-13 18:23:12 +09:00
Dean Herbert	b5a05a13ab	Merge branch 'master' into fix-ugly-line	2018-07-13 18:19:03 +09:00
Dan Balasescu	3d136ef0f9	Merge branch 'master' into fix-ugly-line	2018-07-13 18:08:55 +09:00
Dan Balasescu	1a5e77ab40	Merge branch 'master' into fix-weird-import-fail	2018-07-13 17:58:35 +09:00
Dean Herbert	159b26509b	Improve visuals of difficulty icons	2018-07-13 17:15:06 +09:00
Dean Herbert	ee2c7c50ad	Tidy up button hierarchy	2018-07-13 16:28:18 +09:00
Dean Herbert	0676919496	Fix incorrect corner radius	2018-07-13 14:56:44 +09:00
Dean Herbert	09be9c2ed2	Merge remote-tracking branch 'upstream/master' into naoey-download-button-state	2018-07-13 14:52:10 +09:00
Dean Herbert	ac078153ae	Merge remote-tracking branch 'upstream/master' into peppy-fix-incorrect-mods	2018-07-13 14:20:56 +09:00
Criminalllz	a9f8c2acb8	Use Regex to only care about colors and commas when parsing a color.	2018-07-12 20:36:57 +02:00
Dan Balasescu	3a9929d466	Merge branch 'master' into fix-tooltip-behaviour	2018-07-12 23:54:24 +09:00
Dan Balasescu	e20cdccf05	Merge branch 'master' into update-disclaimer	2018-07-12 23:41:55 +09:00
Dean Herbert	4eb0e207b2	Merge branch 'master' into fix-tooltip-behaviour	2018-07-12 20:18:04 +09:00
Dean Herbert	20b805f9eb	Merge branch 'master' into fix-key-binding-row	2018-07-12 20:06:47 +09:00
Dean Herbert	6bcc8d1cbc	Update framework	2018-07-12 19:56:41 +09:00
Dean Herbert	68fa6f03f0	Merge remote-tracking branch 'upstream/master' into peppy-fix-tooltip-behaviour	2018-07-12 19:55:24 +09:00
Dean Herbert	c67e11b2c7	Restore old tooltip appear delay behaviour	2018-07-12 15:27:17 +09:00
Dean Herbert	5df2df9b3a	Fix osu! logo handling non-left mouse buttons	2018-07-12 12:36:58 +09:00
HoutarouOreki	1e48582dc2	Instantly hide pause menu for quick retry	2018-07-11 13:49:37 +02:00
Dean Herbert	24054246b8	Fix DI regression	2018-07-11 17:54:01 +09:00
Dean Herbert	fbc5250bf1	Update framework	2018-07-11 17:12:01 +09:00
Dean Herbert	96ef526474	Merge remote-tracking branch 'upstream/master' into ekrctb-fix-disable-mouse	2018-07-11 17:02:01 +09:00
Dean Herbert	8bc7c4c9a2	Add TestCase and update disclaimer screen	2018-07-11 16:30:51 +09:00
ekrctb	55e0cd770d	Use BypassAutoSizeAxes	2018-07-11 11:24:43 +09:00
Roman Kapustin	8f9bf4bd3e	Remove redundant DesktopGameWindow cast	2018-07-10 22:07:32 +03:00
Dean Herbert	7157428882	Fix import failure of beatmap sets containing duplicate beatmap difficulties	2018-07-11 02:59:00 +09:00
Dean Herbert	1418d1369f	Add the ability to click completed download notifications to select beatmap ... Closes #2731.	2018-07-11 01:32:10 +09:00
HoutarouOreki	dd20663192	Lesser keyboard steps	2018-07-10 17:28:56 +02:00
Dean Herbert	2150cb1028	Update framework and other packages	2018-07-10 20:31:04 +09:00
Dan Balasescu	f5504914cc	Merge branch 'master' into fix-hitsound-fallback	2018-07-10 17:19:16 +09:00
Dan Balasescu	40ec486152	Merge branch 'master' into improve-button-system	2018-07-10 16:44:55 +09:00
Dan Balasescu	ce219cda53	Merge branch 'master' into fix-beatmap-links	2018-07-10 16:20:59 +09:00
smoogipoo	bf1ce8cdd8	Fix linking still being broken	2018-07-10 16:02:13 +09:00
smoogipoo	0f649cd231	Merge remote-tracking branch 'origin/master' into fix-beatmap-links	2018-07-10 16:01:56 +09:00
Dan Balasescu	8cc042bd5a	Merge branch 'master' into fix-beatmap-id-conflicts	2018-07-10 15:49:30 +09:00
Dean Herbert	6dffb1147c	Merge branch 'master' into fix-right-mouse-absolute	2018-07-10 15:34:03 +09:00
Dan Balasescu	ede95b6954	Merge branch 'master' into fix-hitsound-fallback	2018-07-10 15:31:15 +09:00
Dean Herbert	14c3cc70b1	Prefer namespace lookups first	2018-07-10 15:23:47 +09:00
Dean Herbert	7f315d79c2	Fix pixel gap in user profile when scrolling	2018-07-10 13:06:03 +09:00
Roman Kapustin	699702f8d0	Use DesktopGameWindow.GetCurrentDisplay method	2018-07-09 21:57:31 +03:00
Roman Kapustin	3dbdfcc1e2	Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode	2018-07-09 21:31:46 +03:00
Dean Herbert	ba258b8a05	Fix lack of fallback logic for custom bank samples ... Closes #2966. --- Was causing some beatmaps to not play all of their hitsounds	2018-07-10 02:56:22 +09:00
Dean Herbert	9e59b4a8e2	Fix SongSelect binding to ruleset too early ... Causes music to stop playing while at main menu.	2018-07-10 01:29:24 +09:00
Dean Herbert	974c4f5185	ToolbarMode* -> ToolbarRuleset*	2018-07-10 01:20:21 +09:00
Dean Herbert	abfebbddd9	Update framework	2018-07-09 23:50:45 +09:00
Dean Herbert	1670f4fe31	Merge branch 'master' into fix-osd-fade-in	2018-07-09 19:10:57 +09:00
Dan Balasescu	ee4607c86e	Merge branch 'master' into fix-exit-race-condition	2018-07-09 19:02:37 +09:00
Dean Herbert	49e94850b6	Fix being able to trigger player before carousel is ready ... Causes an eventual crash.	2018-07-09 18:43:20 +09:00
Dean Herbert	09b3375a9d	Fix pressing escape too fast causing multiple exit attempts at song select	2018-07-09 18:12:23 +09:00
Dean Herbert	df67c0498d	Fix OSD fade-in not correctly debouncing ... It could potentially never fade in on quick presses.	2018-07-09 17:53:39 +09:00
Dean Herbert	6ced51bb67	Merge branch 'master' into removeAge	2018-07-09 17:43:23 +09:00
HoutarouOreki	10aae3b0ee	Remove age from User class	2018-07-09 10:33:46 +02:00
HoutarouOreki	930667d0f9	Remove unused age display code	2018-07-09 10:12:10 +02:00
smoogipoo	0a67e5a274	Fix some possible null reference exceptions	2018-07-09 17:09:17 +09:00
Dean Herbert	b20afb915d	Fix right mouse activated absolute scroll not working	2018-07-09 15:26:22 +09:00
Dean Herbert	e223074876	Fix import failures if single set has multiple conflicting OnlineBeatmapIDs ... Resolves #2970.	2018-07-09 00:24:55 +09:00
Dean Herbert	91777b04d8	Merge branch 'master' into download-button-state	2018-07-08 14:15:47 +09:00
Dean Herbert	ad51d95c1a	Merge branch 'master' into more-mania-conversion-fixes	2018-07-08 01:44:06 +09:00
Dean Herbert	7bfd82a417	Merge branch 'master' into hit-shake	2018-07-06 18:42:18 +09:00
Dean Herbert	f872c56deb	Merge branch 'master' into improve-button-system	2018-07-06 18:25:34 +09:00
Dean Herbert	0b30e6eb6a	Merge remote-tracking branch 'upstream/master' into peppy-improve-button-system	2018-07-06 17:55:02 +09:00
Dean Herbert	c025158735	Give VisibleState a default rather than nullable	2018-07-06 17:53:06 +09:00
Dean Herbert	c4952569cc	Merge branch 'master' into fix-menu-cursor-animation	2018-07-06 17:46:29 +09:00
Dean Herbert	54db287791	Remove casting	2018-07-06 17:45:39 +09:00
Dean Herbert	79af5cb0a0	Limit shake duration to ensure it doesn't overlap miss window	2018-07-06 17:24:30 +09:00
Dan Balasescu	8f3f872182	Merge branch 'master' into go-forward	2018-07-06 14:29:26 +09:00
Dan Balasescu	290812cf65	Merge branch 'master' into more-mania-conversion-fixes	2018-07-06 13:29:16 +09:00
Dean Herbert	98410dbb6d	Reduce shake transform count by one for more aesthetic behaviour	2018-07-06 13:24:02 +09:00
Dean Herbert	48d90a67ae	xmldoc and formatting	2018-07-06 12:13:23 +09:00
Dean Herbert	0ecbc5945f	Adjust transform to look better	2018-07-06 12:07:39 +09:00
Dean Herbert	aa96d91762	Merge remote-tracking branch 'upstream/master' into tgi74-hit-shake	2018-07-06 11:57:32 +09:00
Dean Herbert	dffe6af5d9	Merge branch 'master' into fix-menu-cursor-animation	2018-07-06 11:29:53 +09:00
tgi74000	558b2622a7	Move the Shake logic to a new ShakeContainer	2018-07-05 15:48:54 +02:00
Dean Herbert	7e28a993f7	Update framework	2018-07-05 21:08:53 +09:00
Dean Herbert	e5001b84bd	Merge remote-tracking branch 'upstream/master' into ekrctb-fix-volme-meter	2018-07-05 21:04:19 +09:00
Dean Herbert	5f5790f566	Merge branch 'master' into fix-menu-cursor-animation	2018-07-05 21:04:06 +09:00
Dean Herbert	625b9ead4c	Fix links from profile top scores to beatmaps not working correctly	2018-07-05 21:00:23 +09:00