9790 Commits

Author	SHA1	Message	Date
smoogipoo	50b8daf939	Fix threads being cross-disposed from DatabaseContextFactory	2018-08-22 14:07:52 +09:00
smoogipoo	ce367bcc42	Fix invalid GC latency mode being set	2018-08-22 12:02:14 +09:00
Dean Herbert	859e2504c0	Merge pull request #3268 from peppy/update-framework ... Update framework	2018-08-21 21:13:08 +09:00
Dean Herbert	4cd21fabf3	Remove extra newlines	2018-08-21 19:16:07 +09:00
Dean Herbert	22dce64d6d	Merge branch 'master' into circular-button	2018-08-21 19:15:20 +09:00
Dean Herbert	c97548804e	Update framework	2018-08-21 18:46:44 +09:00
Dan Balasescu	c4264794e0	Merge branch 'master' into relax	2018-08-21 12:11:10 +09:00
smoogipoo	fcf98390f5	Cleanup	2018-08-21 12:10:00 +09:00
smoogipoo	541c4daa81	Use ordinal string comparison in hot paths	2018-08-21 11:10:54 +09:00
Dan Balasescu	1d50dacacd	Merge branch 'master' into catch-cancelled	2018-08-21 10:24:11 +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	7add4a8cc7	Update framework	2018-08-20 18:26:34 +09:00
Dean Herbert	295ccabf64	Expand out on to multiple lines	2018-08-20 16:06:12 +09:00
Dean Herbert	39aa98d12d	Fix logo flying off-screen when exiting game	2018-08-20 14:58:02 +09:00
Dean Herbert	65dc9f44e5	Catch OperationCanceledException in single file load sequence	2018-08-20 14:42:37 +09:00
Dean Herbert	18aa30fcb0	Unbind song select's ruleset to avoid test failures	2018-08-20 14:27:32 +09:00
Dean Herbert	e982901205	Merge remote-tracking branch 'smoogipoo/screenshot-fix' into update-framework	2018-08-20 13:38:07 +09:00
Dean Herbert	6b0ed4a68d	Update framework	2018-08-20 13:37:59 +09:00
Dean Herbert	6a4ff19c90	Merge branch 'master' into relax	2018-08-17 23:17:07 +09:00
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
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
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
miterosan	cc640893c2	Merge branch 'master' into Private_Messages	2018-08-04 00:33:46 +02: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
Dean Herbert	6bb7f9ce9c	Merge branch 'master' into Private_Messages	2018-07-31 11:45:06 +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
miterosan	b1e9a4fd24	Merge branch 'master' of https://github.com/ppy/osu into Private_Messages	2018-07-29 23:28:34 +02:00
miterosan	8c0bcb8e3c	Fix drawable crash and lload the inital messages of newly joined channels	2018-07-29 21:40:43 +02:00
miterosan	95cb21299a	Remove chatTabControl and transfer the logic into ChannelTabControl.	2018-07-29 21:18:37 +02: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	7b653fab17	Pass in lastMessageId instead of self referencing	2018-07-24 18:01:28 +02:00
Dean Herbert	6937cf27a7	Tidy up channel join logic	2018-07-24 17:51:20 +02:00
Dean Herbert	090d197b21	Remove unnecessary using	2018-07-24 17:35:08 +02:00
Dean Herbert	2d861f5897	Remove unnecessary inject	2018-07-24 15:26:02 +02:00
Dean Herbert	da730269a9	Formatting and ctor usage for required parameters	2018-07-24 15:25:47 +02:00
Dean Herbert	53f556de9a	Trim whitespace	2018-07-24 15:10:55 +02: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
miterosan	42df0c974f	Rename UserChannel to private channel.	2018-07-24 05:17:57 +02:00
miterosan	9bc225e14b	rename user to private	2018-07-24 05:14:47 +02:00
miterosan	e769c15d28	Provide XML doc in Channel.cs and ChannelManager.cs and ChatTabControl.cs	2018-07-24 05:14:33 +02:00
miterosan	3df1842e1c	Fix that in some timing specific cases the fetched channels are not getting an visual representation. ... Sadly there is not a nice way of fixing this.	2018-07-24 04:58:40 +02:00
miterosan	55f0cbf63e	Finding peace with the UI thread. ... There is the issue that in some cases that the ui thread blocked.	2018-07-24 04:56:34 +02:00
miterosan	16db81e9b5	Extract the message hadling logic into IncomingMessagesHandler	2018-07-24 04:54:11 +02:00
miterosan	9a6d92bb22	Rename fetchMsgReq to fetchMessageReq in ChannelManager.cs	2018-07-23 22:09:05 +02:00
miterosan	2ae890366a	Nicefy the errormessage in the constructor of GetMessagesRequest	2018-07-23 22:08:37 +02:00
miterosan	d9611dcffb	Instead of Doing nothing at LinkFlowContainer if no link was found, we log it as an error.	2018-07-23 22:06:40 +02:00
Dean Herbert	1ab75529a1	Simplify user channel message population code	2018-07-23 21:15:52 +02:00
Dean Herbert	0aacde836a	Move private channel constructor to own class	2018-07-23 20:46:44 +02:00
miterosan	2726d91594	Remove unessary usings	2018-07-23 16:05:39 +02:00
miterosan	344ec40a27	Readd usings I removed with my merge	2018-07-23 15:48:48 +02:00
miterosan	9f43e0c900	Merge branch 'master' of https://github.com/ppy/osu into Private_Messages ... # Conflicts: # osu.Game/Overlays/Chat/ChatTabControl.cs # osu.Game/Overlays/ChatOverlay.cs	2018-07-23 15:45:54 +02: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
miterosan	d03367ef9e	Fix the start animations of username and the closeButton	2018-07-09 23:12:41 +02:00
miterosan	9f9444d65a	Uppercase shear... wtf	2018-07-09 22:59:29 +02:00
miterosan	73a87914f2	Rename uppcase shear width to lowercase shearwidth	2018-07-09 22:52:14 +02:00
miterosan	ad96338af7	Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages	2018-07-09 22:47:34 +02:00
miterosan	8e93269885	Remove whitespace	2018-07-09 22:47:01 +02:00
miterosan	ea597916ca	Code cleanups	2018-07-09 22:41:53 +02:00
miterosan	ae093d2619	Merge branch 'master' into Private_Messages	2018-07-09 22:15:36 +02:00
miterosan	72ea3128fa	Use the AT (@) symbol for the background	2018-07-09 22:14:47 +02:00
miterosan	3140b2e15c	Fix duplicate messages appearing	2018-07-09 22:14:21 +02:00
miterosan	290b6e5f1d	Fix the crash in the visual testcase	2018-07-09 22:09:27 +02:00
miterosan	ec914a5095	Fix crash when the local echo is send to the wrong channel.	2018-07-09 21:00:39 +02:00
Roman Kapustin	699702f8d0	Use DesktopGameWindow.GetCurrentDisplay method	2018-07-09 21:57:31 +03:00
miterosan	f681ef41ac	Rename MAX_HISTORY to MaxHistory, added some logging on failures, use a lamda in ChatOverlay instead of a method pointer.	2018-07-09 20:39:16 +02:00
Roman Kapustin	3dbdfcc1e2	Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode	2018-07-09 21:31:46 +03:00
miterosan	d4f9bcdee1	Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages	2018-07-09 20:14:16 +02:00
miterosan	f22f62ef40	Rename the currentChatChanged to currentChannelContainer, move drawing specific part into from chatoverlay to ChannelSelectionOverlay	2018-07-09 20:13:34 +02: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
miterosan	0c62726fd7	Rename UserTabItem to UserChannelTabItem	2018-07-09 19:48:05 +02:00
miterosan	1589b65494	Move tab related stuff to /tabs, move selection related stuff to /selection, remove channeltabcontrol	2018-07-09 19:42:57 +02:00
miterosan	16d3815a59	Clean Channel up and reword two comments	2018-07-09 18:58:33 +02:00
miterosan	66378d5847	Remove the highlight from "Start Chat"	2018-07-09 18:58:10 +02:00
miterosan	4b638db475	Reorder the properties and fields on Channel. ... Make MAX_HISTORY because cause can not be public.	2018-07-09 18:52:28 +02:00
miterosan	263e68de91	Use a custom channel not found exception.	2018-07-09 18:45:11 +02:00
miterosan	5e95995429	Rename chat to channel	2018-07-09 18:30:41 +02: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
miterosan	709d134f49	Rename DrawableChat to DrawableChannel	2018-07-09 18:23:40 +02: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
miterosan	c56a4ea893	Merge branch 'master' into Private_Messages	2018-07-08 19:29:33 +02: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
DrabWeb	6b240280d0	Merge https://github.com/ppy/osu into multiplayer-room-settings	2018-07-07 01:10:27 -03: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
Dean Herbert	8f04acc506	Add missing xmldoc	2018-07-05 20:16:55 +09:00
Dean Herbert	4f894969df	Merge branch 'master' into hitobject-samples	2018-07-05 19:43:19 +09:00
ekrctb	bbceac6cda	Apply renaming of wheel -> scroll	2018-07-05 16:50:04 +09:00
Dean Herbert	44aecdc3a0	Rename method to EquivalentTo	2018-07-05 15:00:02 +09:00
Dean Herbert	d11ba2df0e	Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks	2018-07-05 14:53:31 +09:00
Dean Herbert	aea1299762	Merge branch 'master' into fix-footer-clicking-area	2018-07-05 13:39:53 +09:00
Dean Herbert	e28a610757	Fix mods not correctly resetting when changing ruleset at song select	2018-07-05 13:22:52 +09:00
Jacob Odgård Tørring	2979cb96a6	attemptSeek accesses beatmap Disabled directly	2018-07-04 21:09:28 +02:00
Jacob Odgård Tørring	9248340df8	Merge branch 'master' into master	2018-07-04 20:51:05 +02:00
Dan Balasescu	7a4d3f9ffa	Merge branch 'master' into fix-popup-dialog-regression	2018-07-04 11:15:18 +09:00
naoey	6ea6a10def	Reduce size of download button in list view to fit hover effect	2018-07-03 20:26:49 +05:30
naoey	2a0b1f3615	Update direct panel download button for new design ... - Add a download failed event to BeatmapManager - Make DownloadButton aware of all 3 possible download states - Change button appearance based on each state	2018-07-03 20:18:09 +05:30
ekrctb	d71b61c122	Rewrite disable mouse buttons logic	2018-07-03 20:04:15 +09:00
Dean Herbert	1e1ff8339e	Merge branch 'master' into non-null-nestedobjects	2018-07-03 19:43:46 +09:00
Dean Herbert	5fc17bacf3	Add "Select" action ... Allows progressing forwards in the interface	2018-07-03 18:39:15 +09:00
Dean Herbert	b33206c212	Fix selecting a button on a dialog causing both that button and exit to animate	2018-07-03 18:35:09 +09:00
Dean Herbert	2aae528e1c	Improve code quality of main menu button system	2018-07-03 18:23:41 +09:00
smoogipoo	73851fb194	Fix beatmap details not working for unranked beatmaps	2018-07-03 15:57:05 +09:00
ekrctb	f9f192ce34	Modify MenuCursor hightlight animation	2018-07-03 15:15:03 +09:00
miterosan	d791216505	Merge branch 'master' into Private_Messages	2018-07-03 07:58:15 +02:00
Joehu	d476842c44	Fix FooterButton clicking area	2018-07-02 22:03:17 -07:00
Dean Herbert	627a5deff9	Merge branch 'master' into fix-menu-cursor-crash	2018-07-02 18:09:11 +09:00
Dean Herbert	6c848f135c	Add comment about last button invocation	2018-07-02 17:48:16 +09:00
Dan Balasescu	e99c05c85e	Merge branch 'master' into fix-dialog-popups	2018-07-02 17:41:16 +09:00
Dan Balasescu	6abb3fa62c	Merge branch 'master' into add-scroll-speed-keybinds	2018-07-02 17:26:05 +09:00
smoogipoo	f0ec117bcb	Merge remote-tracking branch 'origin/master' into add-scroll-speed-keybinds ... # Conflicts: # osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs	2018-07-02 17:21:18 +09:00
Dan Balasescu	118366303c	Merge branch 'master' into fix-leaderboard-placeholder	2018-07-02 17:17:40 +09:00
smoogipoo	9f405b0894	Don't hard-bail if config skin doesn't exist anymore	2018-07-02 16:49:07 +09:00
ekrctb	ae6fdd8e29	whitespace	2018-07-02 16:20:44 +09:00
smoogipoo	45a4187923	Tidy up lookups to NestedHitObjects	2018-07-02 16:10:56 +09:00
ekrctb	63746876c2	typo	2018-07-02 16:09:33 +09:00
ekrctb	341ffa4667	Fix MenuCursor crash	2018-07-02 16:07:52 +09:00
Dan Balasescu	e5947cc969	Merge branch 'master' into non-null-ruleset	2018-07-02 15:32:55 +09:00
smoogipoo	b61fe10f62	Adapt to IBindables	2018-07-02 15:07:18 +09:00
smoogipoo	4070c1a888	Merge remote-tracking branch 'origin/master' into non-null-ruleset ... # Conflicts: # osu.Game/Screens/Select/FilterControl.cs	2018-07-02 15:05:34 +09:00
Dan Balasescu	2c19790a97	Merge branch 'master' into fix-background-screen-crash	2018-07-02 15:01:59 +09:00
Dan Balasescu	50f561fbc2	Merge branch 'master' into allow-back-in-player	2018-07-02 14:44:58 +09:00
smoogipoo	189194ee8d	Don't include empty namespace in sample lookup	2018-07-02 14:35:03 +09:00
smoogipoo	7f832e34c0	Reorder sample bank property setters	2018-07-02 14:29:18 +09:00
Dean Herbert	596787c941	Standardise input handling of popup dialogs	2018-07-02 14:25:12 +09:00
smoogipoo	73fac2115a	Implement hitobject sample files	2018-07-02 14:20:35 +09:00
smoogipoo	310c4a7d6c	Make SampleInfo choose its own lookup name	2018-07-02 14:18:41 +09:00
smoogipoo	8b0c6a4c85	Make SampleControlPoint clone the existing SampleInfo	2018-07-02 14:17:19 +09:00
Dan Balasescu	37495c34fa	Fix possible nullreference	2018-07-02 13:51:47 +09:00
miterosan	34f33a08cb	Merge branch 'master' into Private_Messages	2018-07-02 06:47:33 +02:00
smoogipoo	b664d3ef81	Fix time being a part of controlpoint change comparisons	2018-07-02 13:34:25 +09:00
smoogipoo	aea50e770b	Use .Equals everywhere	2018-07-02 13:34:14 +09:00
Dean Herbert	812929fa05	Merge remote-tracking branch 'upstream/master' into smoogipoo-beatmap-preprocess	2018-07-02 13:10:42 +09:00
Dean Herbert	b7893bc994	Remove unnecessary comments	2018-07-02 13:07:44 +09:00
smoogipoo	9f85c55915	Merge remote-tracking branch 'origin/master' into legacy-custom-banks	2018-07-02 12:34:51 +09:00
Dean Herbert	6a459efd8f	Don't allow Key.Escape	2018-07-02 11:04:40 +09:00
Dean Herbert	2c597874bf	Fix leaderboard showing placeholder briefly when entering song select	2018-07-01 18:17:02 +09:00
Dean Herbert	98fb2e03c0	Fix rulesets not loading in debug builds after running a release build	2018-07-01 18:03:15 +09:00
Dean Herbert	b1403d837e	Add back support for closing focused overlays using back key	2018-07-01 15:52:47 +09:00
Dean Herbert	7028767e50	Fix regression in HoldFocus behaviour	2018-07-01 14:08:34 +09:00
Roman Kapustin	4af45b7518	Do not display resolutions lower than 800x600	2018-06-30 20:06:11 +03:00
Dean Herbert	00fd5c8dbc	Fix regression causing binding settings to fail	2018-06-30 23:51:27 +09:00
miterosan	621f4218a3	Merge branch 'master' into Private_Messages	2018-06-30 16:17:56 +02:00
Roman Kapustin	101f18821a	Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode	2018-06-30 17:05:25 +03:00
Dean Herbert	754e072e01	Don't handle all actions	2018-06-29 23:35:14 +09:00
Dean Herbert	fb90a4924b	Only clear text in FocusedTextBox	2018-06-29 23:28:15 +09:00
Dean Herbert	7c0547b4ee	Replace todo	2018-06-29 23:16:05 +09:00
Dean Herbert	b9b1e77172	Merge branch 'master' into allow-back-in-player	2018-06-29 21:54:18 +09:00
Dean Herbert	ad28f88498	Fix protection change	2018-06-29 21:25:51 +09:00
Dean Herbert	cd47bd2cf8	Update framework	2018-06-29 21:06:43 +09:00
Dean Herbert	6a80a21078	Tidy up escape handling	2018-06-29 21:06:38 +09:00
smoogipoo	6d6436c8d3	Fix ruleset not getting updated if changed	2018-06-29 20:50:39 +09:00
smoogipoo	9187eb8626	SongSelect needs to recache as IBindable	2018-06-29 20:50:30 +09:00
Dean Herbert	8cf1553fd5	Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player	2018-06-29 20:30:42 +09:00
Dean Herbert	06bd3d4815	Use IBindable where possible	2018-06-29 20:28:28 +09:00
Dean Herbert	0e649b8866	Change logic	2018-06-29 20:16:24 +09:00
Dean Herbert	34fef3caba	Update exception type	2018-06-29 20:13:29 +09:00
Dean Herbert	9fce4eaccf	Merge branch 'master' into di-backed-ruleset	2018-06-29 19:33:12 +09:00
Dean Herbert	1c32951d4b	Ensure toolbar triggers updates to SongSelect's ruleset	2018-06-29 19:32:42 +09:00
Dean Herbert	182ac80881	Cache also as IBindable	2018-06-29 19:25:28 +09:00
Dean Herbert	6d6fcc953b	Trim lines	2018-06-29 19:25:20 +09:00
Dan Balasescu	513129d4a8	Merge branch 'master' into fix-dialog-overlay-sounds	2018-06-29 18:45:37 +09:00
smoogipoo	1e696d247e	Re-privatise	2018-06-29 18:33:28 +09:00
Dan Balasescu	8abcf68188	Merge branch 'master' into fix-negative-online-set-id	2018-06-29 18:29:36 +09:00
Dean Herbert	4212a9d0d7	Fix incorrect migration conditional	2018-06-29 18:23:53 +09:00
Dan Balasescu	f149289c83	Merge branch 'master' into fix-delta-patching	2018-06-29 18:01:56 +09:00
Dean Herbert	23aa2a2361	Merge branch 'master' into catch-scoring	2018-06-29 17:29:15 +09:00
Dean Herbert	e12ce3c2a8	Adjust xmldoc	2018-06-29 17:21:55 +09:00
Dean Herbert	098aeabc9e	Merge branch 'master' into catch-scoring	2018-06-29 17:16:14 +09:00
Dan Balasescu	845d1400dc	Merge branch 'master' into beatmap-defaults	2018-06-29 17:14:40 +09:00
Dean Herbert	c0b65a6a73	Change default IsBonus definition and remove unnecessary overrides	2018-06-29 17:07:08 +09:00
Dean Herbert	750f5a86c3	Fix catch test failing due to disabled bindable	2018-06-29 16:49:11 +09:00
Dean Herbert	0940715631	Merge branch 'master' into catch-scoring	2018-06-29 14:59:15 +09:00
smoogipoo	99068debc4	Split out into separate interface + add xmldocs	2018-06-29 13:24:33 +09:00
smoogipoo	756cabd5d0	Add a preprocess method to BeatmapProcessor	2018-06-29 12:45:48 +09:00
Dean Herbert	70a119dde7	Remove unused/duplicate interface	2018-06-29 12:20:53 +09:00
Dean Herbert	8742f41b7d	Revert SharpCompress library to fix delta patching regression	2018-06-29 11:34:52 +09:00
miterosan	884ac71874	Merge branch 'master' into Private_Messages	2018-06-28 21:04:02 +02:00
tgi74000	b0739023ce	Add BeatmapInfo's stable defaults to fix compatibility with old maps	2018-06-28 19:02:38 +02:00
Dean Herbert	8ba2ac922f	Move to local components namespace	2018-06-28 19:23:56 +09:00
Dean Herbert	0ef5b8f464	Tidy up code, remove unnecessary string.Formats	2018-06-28 19:19:00 +09:00
Dean Herbert	98fec94693	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-unifyDates	2018-06-28 19:14:47 +09:00
smoogipoo	94f1b2eeb8	Only custom sample banks > 1 modify the filename	2018-06-28 18:29:17 +09:00
smoogipoo	3a9a82c80c	Add back legacy custom sample banks	2018-06-28 18:29:12 +09:00
smoogipoo	781095b96b	Encapsulate the method to apply SampleControlPoints to SampleInfos	2018-06-28 18:29:07 +09:00
smoogipoo	2882981f9c	Implement and use equality comparers for ControlPoint	2018-06-28 18:28:59 +09:00
Dean Herbert	be2d3d6ad4	Merge branch 'master' into fix-supporter-naming	2018-06-28 17:34:21 +09:00
Dean Herbert	a377e87bf6	Add missing licence headers	2018-06-28 17:34:04 +09:00
Dean Herbert	b1a3f01212	Fix mania maps not being treated as mania maps in release builds	2018-06-28 17:10:30 +09:00
Dean Herbert	3b0c4ff16b	Tidy code	2018-06-28 14:08:15 +09:00
smoogipoo	d879b96d9f	Implement storyboard samples	2018-06-28 13:43:56 +09:00
Dean Herbert	c44a81bdf5	Add word wrap support	2018-06-28 13:04:39 +09:00
smoogipoo	01b90aaffe	Fix CI not passing	2018-06-28 11:58:06 +09:00
smoogipoo	2f2bd59844	Remove editor functionality from VirtualBeatmapTrack ... /shrug	2018-06-28 11:47:41 +09:00
smoogipoo	87e8074cd2	Use a const for excess length	2018-06-28 11:46:56 +09:00
smoogipoo	c0c94e24b9	Use VirtualBeatmapTrack in testcases	2018-06-28 11:45:48 +09:00
Dean Herbert	ac7ee59d50	Add migration for previous incorrectly imported beatmaps	2018-06-28 10:48:01 +09:00
Dean Herbert	5ad122bfec	Fix beatmaps importing with -1 as online set ID	2018-06-28 10:28:35 +09:00
Joehu	8518fce4a9	Fix osu!supporter naming	2018-06-27 17:57:55 -07:00
ekrctb	1ed6a672f2	Update volme control ... Use IMouseWheelBindingHandler for volume VolumeControlReceptor. VolumeMeter is no longer an IKeyBindingHandler because it is unused.	2018-06-27 18:43:29 +09:00
smoogipoo	5640385f48	Update the length once during construction	2018-06-27 16:12:49 +09:00
smoogipoo	b4b28f8ae8	Make GetWaveform() not hard bail if errors occur	2018-06-27 16:07:18 +09:00
smoogipoo	b88c4464cb	Make virtual beatmap tracks approximate beatmap length	2018-06-27 16:02:49 +09:00
Dean Herbert	527d7c29f2	Merge branch 'master' into fix-background-screen-crash	2018-06-27 16:00:59 +09:00
smoogipoo	f8acd9e451	Cleanup	2018-06-27 12:59:19 +09:00
Dean Herbert	0866dd11bd	DefaultBackAction -> BackAction, defaults to last button ... The last button is more commonly the escape condition.	2018-06-27 12:57:26 +09:00
smoogipoo	ede59f63f6	Merge remote-tracking branch 'origin/master' into make-loading-more-visible	2018-06-27 12:52:06 +09:00
Dean Herbert	d7ce4ab6fd	Merge remote-tracking branch 'upstream/master' into Aergwyn-allow-back-in-player	2018-06-27 12:36:10 +09:00
Dean Herbert	bebf47d0d5	Merge branch 'master' into fix-dialog-overlay-sounds	2018-06-27 12:21:29 +09:00
smoogipoo	80501de4b9	Add legacy slider offsets	2018-06-27 12:09:21 +09:00
Dean Herbert	ac1bf3b092	Merge branch 'master' into editor-seek-snapping-fix	2018-06-27 11:08:19 +09:00
Dean Herbert	1b050ca68e	Merge branch 'master' into fix-unauthorized-request	2018-06-26 22:25:19 +09:00
Dan Balasescu	830ce0da4c	Merge branch 'master' into update-framework	2018-06-26 20:41:08 +09:00
smoogipoo	8a81fba1ea	Other input states need to be considered for wheel bindings	2018-06-26 20:34:22 +09:00
smoogipoo	f1dfe04bd9	Fix broken conditional	2018-06-26 20:13:44 +09:00
smoogipoo	02b733a42e	Merge remote-tracking branch 'origin/master' into fix-unauthorized-request	2018-06-26 19:58:51 +09:00
Dean Herbert	f7f17bab78	Merge branch 'master' into catch-droplet-fix	2018-06-26 19:29:15 +09:00
Dean Herbert	018dcc98b4	Fix failing tests	2018-06-26 19:17:34 +09:00
Dean Herbert	4bcc05a7fc	Remove null checks on ruleset ... Add a default ruleset to `OsuTestCase` to cover testing scenarios.	2018-06-26 18:24:34 +09:00
Dean Herbert	4dd12cedad	Fix review issues	2018-06-26 17:01:40 +09:00
Dean Herbert	13480feb4f	Remove error logging ... Already logged to network.log with ample detail.	2018-06-26 16:38:19 +09:00
Dean Herbert	388ca5d572	Move leaderboard update scheduling to a more central method	2018-06-26 16:33:22 +09:00
Dean Herbert	b0a1b25983	Privatise game ruleset and access via DI ... Also decouples the bindable at SongSelect, where it is debounced in line with the carousel being updated.	2018-06-26 16:32:32 +09:00
Dean Herbert	563cb46b4a	Update framework and other nuget dependencies	2018-06-26 12:10:56 +09:00
smoogipoo	cd74ec705e	Fix possible mis-ordering of scroll position updates ... 1. Checking whether the scroll position has changed must be done _after_ Current is updated in base.UpdateAfterChildren. This was causing the timeline to sometimes not provide smooth scrolling while the track is not running. 2. We can't just move all code to UpdateAfterChildren to fulfill (1) - we need the code to follow the track time to still run prior to base.UpdateAfterChildren, so that it modifies Current prior to base.UpdateAfterChildren changing to position.	2018-06-25 20:31:06 +09:00
Dean Herbert	594cc0d21d	Merge branch 'master' into mania-playfield-inversions	2018-06-25 18:36:23 +09:00
Dean Herbert	e75ff1145c	Merge branch 'master' into editor-seek-snapping-fix	2018-06-25 18:27:03 +09:00
smoogipoo	97057ced85	Merge remote-tracking branch 'origin/master' into full-mania-fix	2018-06-25 12:43:49 +09:00
miterosan	6049303c40	Merge branch 'master' into Private_Messages	2018-06-23 20:44:43 +02:00
Roman Kapustin	5076fe4c20	LayoutSettings: inject OsuGameBase instead of OsuGame	2018-06-23 12:45:13 +03:00
ekrctb	d6084c0b30	Adapt to new input handling changes	2018-06-22 18:10:27 +09:00
Dean Herbert	78ccbcabf3	Fix API getting stuck in an endless loop under a certain unauthorized scenario	2018-06-22 17:34:29 +09:00
Dean Herbert	51600dd0ae	Improve PlayButton's loading	2018-06-22 14:27:36 +09:00
Dean Herbert	3824354cb8	Lengthen PopIn transition slightly	2018-06-22 14:26:24 +09:00
Dean Herbert	fccd4f965c	Merge remote-tracking branch 'upstream/master' into make-loading-more-visible	2018-06-22 14:21:01 +09:00
Dean Herbert	99cc406b97	Merge branch 'master' into improve-volume-controls	2018-06-22 13:39:48 +09:00
smoogipoo	8d3c2d54f3	Merge remote-tracking branch 'origin/master' into improve-volume-controls	2018-06-22 13:33:07 +09:00
smoogipoo	67a067ffa5	Fix overlay not disappearing when losing hover from the last pixel ... OnMouseMove isn't invoked when hover is lost.	2018-06-22 13:32:32 +09:00
smoogipoo	72aee8344e	Always call schedulePopOut	2018-06-22 13:32:00 +09:00
smoogipoo	206f913a4c	Make mute button not handle hover	2018-06-22 13:31:32 +09:00
Dean Herbert	5d3b51b8d4	Merge branch 'master' into api-offline-early-return	2018-06-22 13:16:30 +09:00
Dean Herbert	eb6d6dc2de	Improve the visibility of the global loading animation ... Updates design to match new `osu-web` design. Adds TestCase for visual testing.	2018-06-22 13:14:43 +09:00
Dean Herbert	73e13e2d63	Rename Stop to StopAnyPlaying for clarity	2018-06-22 12:35:43 +09:00
Dean Herbert	4b2b1f51f9	Apply some code review	2018-06-22 12:33:30 +09:00
Dean Herbert	de10480e95	Merge branch 'master' into multiple_previews_different_overlays	2018-06-22 10:44:36 +09:00
Roman Kapustin	5d26d5d4ed	Fix resolutionDropdown	2018-06-21 20:42:22 +03:00
Roman Kapustin	2ecf78e3d2	Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode	2018-06-21 19:44:29 +03:00
Dan Balasescu	465342c636	Merge branch 'master' into notification-usability	2018-06-21 19:48:16 +09:00
smoogipoo	1932399521	Add testcases	2018-06-21 19:31:07 +09:00
smoogipoo	63a6fc2596	XMLDoc all the things	2018-06-21 18:54:50 +09:00
smoogipoo	40ed3fdd05	Fix possible incorrect order of events due to threaded load	2018-06-21 18:45:32 +09:00
smoogipoo	b2066c5d73	Rework preview tracks to reduce usage complexities	2018-06-21 18:40:27 +09:00
Dean Herbert	5c63b3ddac	Merge pull request #2828 from smoogipoo/improve-editor-scrolling ... Always perform non-seeked scroll in the editor while audio is playing	2018-06-21 17:24:15 +09:00
Dean Herbert	a2fa55c426	Fix dialog overlay playing double samples on show/hide	2018-06-21 16:47:05 +09:00
Dean Herbert	6ec0aaee91	Split out logic for subsequent log message and apply action to only itself	2018-06-21 14:50:42 +09:00
Dean Herbert	87d94591e4	Start displaying notifications earlier ... Also show important notifications and more in total.	2018-06-21 14:43:38 +09:00
Dean Herbert	ed17a241f5	Decrease notification font size	2018-06-21 14:43:02 +09:00
Dean Herbert	6aa0ca5cc9	Add (one-way) migration for existing users	2018-06-21 14:22:25 +09:00
smoogipoo	ab2889da1f	Merge remote-tracking branch 'origin/master' into multiple_previews_different_overlays	2018-06-21 13:24:02 +09:00
Dean Herbert	74f732038f	Add documentation for negative values of ParallaxAmount	2018-06-21 12:49:07 +09:00
Dean Herbert	5f2d1d4a1e	Dim TestCase background a bit	2018-06-21 12:48:44 +09:00
Dean Herbert	733b7d1177	Merge branch 'master' into ParallaxContainerImprovement	2018-06-21 12:10:10 +09:00
Dean Herbert	65487d1610	Merge branch 'master' into improve-volume-controls	2018-06-21 11:56:56 +09:00
Dean Herbert	285062d93e	Merge branch 'master' into master	2018-06-21 11:40:37 +09:00
Dean Herbert	5157a069bc	Merge branch 'master' into Private_Messages	2018-06-21 11:37:19 +09:00
Dean Herbert	2a42418dbf	Tidy up ReadyButton	2018-06-21 10:21:54 +09:00
Dean Herbert	4c068097c8	Change required child to use same structure as other use cases	2018-06-21 10:12:12 +09:00
Dean Herbert	96100a2200	Remove schedule logic (seems unnecessary)	2018-06-20 17:41:48 +09:00
Dean Herbert	39649747aa	Simplify and synchronise multiplayer screen transitions	2018-06-20 17:25:22 +09:00
Dean Herbert	f0c72438a3	Group ValueChanged attachment with bindings	2018-06-20 17:06:02 +09:00
Dean Herbert	3f020a2802	Merge branch 'master' into multiplayer-match	2018-06-20 14:49:32 +09:00
Dean Herbert	ee0950a845	Merge branch 'master' into select_resolution_in_fullscreen_mode	2018-06-20 13:19:39 +09:00
Dean Herbert	b95042e370	Fix background screens not supporting early-exit condition ... Closes #2681.	2018-06-20 12:43:48 +09:00
Dean Herbert	3eb0a17978	Merge remote-tracking branch 'upstream/master' into ThePyrotechnic-ShowMorePadding	2018-06-20 10:45:43 +09:00
Dean Herbert	d7f65d62e0	Use vertical/horizontal pair instead	2018-06-20 10:45:35 +09:00
Dan Balasescu	77e03a59a9	Merge branch 'master' into ruleset-container	2018-06-19 21:47:10 +09:00
Tom Arrow	ad883e087a	RulesetContainer<TObject> cannot be derived	2018-06-19 14:31:24 +02:00
Dean Herbert	3819ecb2be	Update framework	2018-06-19 20:19:52 +09:00
Dean Herbert	b8f9caf418	Merge branch 'master' into multiplayer-match	2018-06-19 17:18:33 +09:00
Michael Manis	a0f1143287	Add padding to 'show more' button	2018-06-18 19:14:44 -04:00
smoogipoo	8c671f93fc	Always perform non-seeked scroll in the editor while audio is playing	2018-06-18 19:32:04 +09:00
smoogipoo	54e60d8bc2	Fix test appveyor tests failing due to lack of audio manager	2018-06-18 19:27:22 +09:00
smoogipoo	6d318d35ee	Fix not being able to seek by other means during flick-scroll	2018-06-18 18:56:54 +09:00
smoogipoo	dbc50e35d5	Fix the timeline and editor fighting over track seeking	2018-06-18 18:02:26 +09:00
Dean Herbert	c74c059044	Merge branch 'master' into multiple_previews_different_overlays	2018-06-18 05:05:27 +09:00
Dean Herbert	1d9d240454	Merge branch 'master' into mania-playfield-inversions	2018-06-18 04:41:17 +09:00
Dean Herbert	b1d059a67d	Add some colours to the compose-mode timeline	2018-06-18 04:31:47 +09:00
Dean Herbert	bec6e3083e	Remove scrollbar depth change as scrollbar is hidden now	2018-06-18 03:19:21 +09:00
Dean Herbert	d58ef96a23	Merge branch 'master' into timeline-markers	2018-06-18 03:14:04 +09:00
Dean Herbert	31f9d0161d	Add a comment about precision scroll behaviour	2018-06-18 03:03:09 +09:00
Dean Herbert	ae160baa6e	Merge branch 'master' into timeline-input-adjustment	2018-06-18 02:54:25 +09:00
Dean Herbert	48613ea1f6	Merge branch 'master' into timeline-markers	2018-06-18 02:09:20 +09:00
miterosan	cd0fe6a09e	Merge branch 'master' of https://github.com/ppy/osu into Private_Messages ... # Conflicts: # osu.Game.Tests/Visual/TestCaseChatLink.cs	2018-06-17 14:15:14 +02:00
Dean Herbert	a20ec0d4cc	Merge branch 'master' into timeline-audio-scrolling	2018-06-17 19:01:21 +09:00
Dean Herbert	e0ee5e2085	Merge branch 'master' into timeline-audio-scrolling	2018-06-17 19:01:16 +09:00
HoutarouOreki	faff7feef1	Remove unnecessary white space change	2018-06-15 15:03:09 +02:00
HoutarouOreki	6938adc148	Unify join time text's visual format with the web	2018-06-15 15:00:41 +02:00
HoutarouOreki	38feb7651c	Set text at updateTime	2018-06-15 14:34:01 +02:00
HoutarouOreki	d122547c1e	DrawableJoinDate handles "Here since the beginning" text	2018-06-15 14:28:49 +02:00
HoutarouOreki	f0fbc04d92	Adjust formats to be EN-UK	2018-06-15 14:11:21 +02:00
smoogipoo	47ae962099	Output only one mapping failure per mapping	2018-06-15 18:36:22 +09:00
Dean Herbert	57011ff13b	Merge branch 'master' into mania-playfield-inversions	2018-06-15 18:33:40 +09:00
Dean Herbert	a6437c005c	Merge branch 'master' into diffcalc-rework	2018-06-15 18:02:18 +09:00
smoogipoo	e945186978	Expose the beatmap converter	2018-06-15 17:59:52 +09:00
Dean Herbert	5d105cd08d	Avoid errors being logged when importing beatmaps while logged out	2018-06-15 17:23:03 +09:00
Dan Balasescu	234ed04cdd	Merge branch 'master' into remove-migrate-exception	2018-06-15 17:22:34 +09:00
Dean Herbert	db9141a6cf	Merge branch 'master' into fix-music-controller-drag	2018-06-15 17:08:01 +09:00
Dan Balasescu	aaf3ef240e	Remove easily-confused comment	2018-06-15 17:07:07 +09:00
Dean Herbert	8b5a9c3236	Merge branch 'master' into fix-volume-pixellation	2018-06-15 16:45:15 +09:00
Dean Herbert	a2950b1d80	Fix incorrect comment	2018-06-15 16:12:18 +09:00
Dean Herbert	1c27ef644a	Fix music controller drag activating from anywhere on the screen	2018-06-15 16:12:11 +09:00
Dean Herbert	2ff7b4cdcf	Merge branch 'master' into catch-droplet-fix	2018-06-15 14:34:01 +09:00
Dean Herbert	036c57833b	Merge branch 'master' into conversion-test-improvements	2018-06-15 14:26:37 +09:00
Joehu	069d939e29	Remove "from" prefix from sources on direct panels	2018-06-14 21:53:01 -07:00
Dan Balasescu	98cafa106f	Merge branch 'master' into fix-volume-pixellation	2018-06-15 13:44:18 +09:00
Dean Herbert	4a19f22b3d	Remove custom migration exception ... This was hiding the true error message from ever hitting logs. Made to help disagnose #2711.	2018-06-15 13:38:42 +09:00
smoogipoo	b63e9f29d4	Merge branch 'conversion-test-improvements' into catch-droplet-fix	2018-06-14 21:38:16 +09:00
Dean Herbert	d259b31893	Fix empty line	2018-06-14 21:38:08 +09:00
Dean Herbert	cb73f215ac	Add check for player screens too	2018-06-14 21:38:08 +09:00
Dean Herbert	caeddc861a	Add test for WorkingBeatmap leakage	2018-06-14 21:38:08 +09:00
smoogipoo	a4d2364083	Add one more newline	2018-06-14 21:29:08 +09:00
smoogipoo	b99b520656	Allow convertmapping to be extended	2018-06-14 21:25:33 +09:00
smoogipoo	024d2abfe0	Always generate mappings/convert values as soon as objects are converted ... # Conflicts: # osu.Game.Rulesets.Catch.Tests/CatchBeatmapConversionTest.cs	2018-06-14 21:25:23 +09:00
smoogipoo	8d0e7abdd6	Some rulesets don't have a beatmap processor	2018-06-14 21:23:11 +09:00
smoogipoo	5e66b02108	Process beatmap before generating mappings	2018-06-14 21:22:56 +09:00
smoogipoo	8f7334874c	Fix up performance calculators	2018-06-14 16:04:48 +09:00
smoogipoo	540b43313e	Remove PP test cases (osu-tools/osu-server should be used instead)	2018-06-14 15:57:06 +09:00
smoogipoo	b7a06b9594	Restructure of DifficultyCalculator to cleanup mod + attribute handling	2018-06-14 15:32:07 +09:00
smoogipoo	1431ee1867	Remove unused method	2018-06-14 14:46:25 +09:00
Dean Herbert	b318b770d4	Fix pixellation of volume meter progress bars	2018-06-13 19:22:39 +09:00
Dean Herbert	cee5be1d56	Improve precision wheel adjustment handling	2018-06-13 17:03:56 +09:00
Dean Herbert	e0b68e4e09	Fix hide re-schedule not triggering on noop state change	2018-06-13 16:47:10 +09:00
Dean Herbert	a55bf82fd9	Handle hover blocking in VolumeOverlay to ensure correct hide scheduling	2018-06-13 16:46:56 +09:00
Dean Herbert	2a18625b2c	Correctly block scroll events when hovering controls	2018-06-13 16:46:27 +09:00
Dean Herbert	2cc7953421	Merge remote-tracking branch 'upstream/master' into peppy-improve-volume-controls	2018-06-13 16:14:20 +09:00
Dean Herbert	0fdb04f57d	Fix empty line	2018-06-13 15:43:18 +09:00
Dean Herbert	3ac90511c9	Merge branch 'master' into fix-memory-leak	2018-06-13 15:27:39 +09:00
Dean Herbert	39738a997e	Add check for player screens too	2018-06-13 15:26:23 +09:00
Dan Balasescu	cbb883614a	Merge branch 'master' into catch-droplet-fix	2018-06-13 15:18:52 +09:00
Dean Herbert	14f5c814a6	Add test for WorkingBeatmap leakage	2018-06-13 15:12:10 +09:00
Dan Balasescu	0e0e64895a	Merge branch 'master' into mania-step-interval	2018-06-13 13:55:27 +09:00
Dean Herbert	a7ed3ea80b	Rename alwaysVisible to explain where it comes from	2018-06-13 11:38:15 +09:00
Dean Herbert	d9e7a324c0	Revert HudOverlay to private field	2018-06-13 11:30:22 +09:00
Roman Kapustin	71371dc4b8	ValueChanged parameters quickfix	2018-06-12 19:27:55 +03:00
UselessToucan	b6c0aa3f26	Merge branch 'master' into select_resolution_in_fullscreen_mode	2018-06-12 18:01:30 +03:00
smoogipoo	ca3186f34c	Create dependencies before children are loaded	2018-06-12 19:51:35 +09:00
smoogipoo	67aa52fb1d	Use bindable binding	2018-06-12 19:34:49 +09:00
Dan Balasescu	126678c226	Merge branch 'master' into multiple_previews_different_overlays	2018-06-12 19:26:51 +09:00
Dean Herbert	bcfb092e53	Change step to 200	2018-06-12 18:03:45 +09:00
smoogipoo	c70c7a476b	Always display the key counter during replay/autoplay	2018-06-12 17:59:59 +09:00
smoogipoo	3b396e38ca	Hide the scrollbar	2018-06-12 15:51:48 +09:00
smoogipoo	aaf2f66594	Make scrolling only zoom the timeline	2018-06-12 15:51:36 +09:00
smoogipoo	6ceac8ab0a	Add a centre marker to the timeline	2018-06-12 14:34:28 +09:00
Dan Balasescu	f71b0456e8	Merge branch 'master' into timeline-audio-scrolling	2018-06-12 14:23:05 +09:00
smoogipoo	30b7b7961f	Merge remote-tracking branch 'origin/master' into timeline-audio-scrolling ... # Conflicts: # osu-framework # osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs # osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs	2018-06-12 14:22:27 +09:00
Dan Balasescu	80ec0b1839	Merge branch 'master' into populate-missing-online-ids	2018-06-12 14:03:23 +09:00
Dean Herbert	ae136e89a4	Merge branch 'master' into ruleset-configs	2018-06-12 13:13:18 +09:00
Dan Balasescu	0a35a81c2d	Merge branch 'master' into populate-missing-online-ids	2018-06-12 13:11:21 +09:00
Dean Herbert	37ea4c273b	Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework	2018-06-11 20:17:41 +09:00
Dean Herbert	8092d70402	Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework	2018-06-11 20:17:33 +09:00
Dan Balasescu	41452a0754	Merge branch 'master' into multiple_previews_different_overlays	2018-06-11 18:56:50 +09:00
Dan Balasescu	7de8e1cfc4	Merge branch 'master' into refactor-api	2018-06-11 18:49:15 +09:00
Dan Balasescu	3981f56157	Merge branch 'master' into exponential-scoring-toggle	2018-06-11 18:34:55 +09:00
Dan Balasescu	78daf1c7ad	Merge branch 'master' into exponential-scoring-toggle	2018-06-11 18:19:33 +09:00
smoogipoo	b9391b3c6b	Fix bindable not working under non-debug due to weak references	2018-06-11 18:18:24 +09:00
Dan Balasescu	9994c69d58	Merge branch 'master' into fix-object-ordering	2018-06-11 17:53:33 +09:00
smoogipoo	b51e714ae5	Fix xmldoc	2018-06-11 15:44:59 +09:00
smoogipoo	563a2667d3	Merge branch 'ruleset-configs' into mania-playfield-inversions	2018-06-11 15:08:48 +09:00
smoogipoo	14b7530994	Use a global ruleset config cache	2018-06-11 15:07:42 +09:00
smoogipoo	be01dbae3a	Move ruleset dependency caching to CreateLocalDependencies ... In some cases we may want to refer to the cached configmanager dependency from subclasses. This prevents injection errors when doing so.	2018-06-11 15:07:29 +09:00
smoogipoo	f49b7d6e16	Add mania direction to settings	2018-06-11 14:36:19 +09:00
smoogipoo	93696fb5e5	Merge branch 'ruleset-configs' into mania-playfield-inversions ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs	2018-06-11 13:46:39 +09:00
smoogipoo	4fb6a8627e	Merge remote-tracking branch 'origin/master' into mania-playfield-inversions	2018-06-11 13:45:47 +09:00
smoogipoo	f4fbf27d42	Give ruleset settings a ruleset-specific config manager	2018-06-11 13:28:50 +09:00
smoogipoo	eca016ec6c	Move ruleset config managers to Ruleset	2018-06-11 13:17:08 +09:00
smoogipoo	22e8a0bb6e	Make ruleset config manager variants nullable	2018-06-11 13:13:36 +09:00
smoogipoo	63ec36b3be	Explicitly handle null settings case + add annotations	2018-06-11 12:57:56 +09:00
smoogipoo	b219c17115	Move dependency creation under ctor	2018-06-11 12:57:26 +09:00
Roman Kapustin	de7e4328c5	Use bindable size	2018-06-10 16:17:57 +03:00
Crusensis	fbc0cd6f5f	Split AffectsCombo into IsBonus	2018-06-09 18:14:33 -07:00
Dean Herbert	86fb9666b2	Rename "Exponential" to "Classic"	2018-06-10 01:45:05 +09:00
Dean Herbert	cc37a355d2	Add comment about matching stable scoring ... Also updated equation to be close to what is expected	2018-06-10 01:44:46 +09:00
Dean Herbert	aaa65c428f	Merge branch 'master' into diffcalc-modtypes	2018-06-09 23:35:17 +09:00
Aergwyn	b9b04c1b6e	move back logic into GameplayMenuOverlay	2018-06-09 09:28:02 +02:00
Aergwyn	792d3b8215	allow "go back" keybind in play	2018-06-09 09:14:58 +02:00
UselessToucan	4233211fb3	Merge branch 'master' into select_resolution_in_fullscreen_mode	2018-06-08 21:13:41 +03:00
Roman Kapustin	8702a70524	Resolve merge conflicts in DirectOverlay	2018-06-08 21:03:16 +03:00
Dean Herbert	d3570df64f	Merge pull request #2764 from peppy/update-dependencies ... Update framework and other packages	2018-06-08 22:07:25 +09:00
Dean Herbert	a5ddae3f37	Merge pull request #2763 from peppy/revert-update-subtree ... Revert InputManager UpdateSubTree change	2018-06-08 22:06:55 +09:00
Dean Herbert	fd4f61fc88	Update framework and other packages	2018-06-08 21:51:43 +09:00
Dean Herbert	a880e626d8	Use for loop and SetLayoutPosition	2018-06-08 21:20:15 +09:00
Dean Herbert	1e7bffe5e3	Merge branch 'master' into badge-ordering	2018-06-08 21:13:35 +09:00
Dean Herbert	9bdb3113ce	Revert "Always update children when ruleset input manager is updated" ... This reverts commit 4eb7a34944.	2018-06-08 21:05:28 +09:00
Dean Herbert	803598c3d0	Merge remote-tracking branch 'upstream/master' into DrabWeb-beatmap-set-downloader	2018-06-08 20:54:14 +09:00
Dean Herbert	ecc0f5e575	Use Any() instead of Count()	2018-06-08 20:54:09 +09:00
Dean Herbert	064e8190be	Add basic documentation	2018-06-08 20:53:58 +09:00
Dean Herbert	59e5a8556f	Fix volume control adjustment being extreme when precision scrolling	2018-06-08 18:15:03 +09:00
Dean Herbert	66d28aa9fc	Merge branch 'master' into beatmap-set-downloader	2018-06-08 16:28:25 +09:00
Dean Herbert	e1bc0fa552	Fix csproj file ending line	2018-06-08 15:59:59 +09:00
Dean Herbert	a775d00bd8	Add online fetch support for online IDs	2018-06-08 15:59:45 +09:00
Dean Herbert	955a78e76d	Remove OnlineBeatmapSetID from BeatmapInfo ... It should now be retrieved via the linked BeatmapSetInfo	2018-06-08 15:26:27 +09:00
smoogipoo	2a48e0e44a	Fix sequential speed change visualiser not working with 0 control points	2018-06-08 15:11:43 +09:00
Dean Herbert	e8455dc1e4	Fix incorrect hash usage	2018-06-08 14:38:04 +09:00
Dean Herbert	21c8ef576c	Expose result for synchronous consumption	2018-06-08 14:37:48 +09:00
Dean Herbert	b265f02d56	Add comment about scheduled invocation	2018-06-08 14:37:27 +09:00
DrabWeb	0815e0ba83	Merge https://github.com/ppy/osu into multiplayer-room-settings	2018-06-08 01:16:22 -03:00
Dean Herbert	8220e0c79a	Remove OnlineBeatmapSetID from BeatmapMetadata	2018-06-08 12:46:34 +09:00
Dean Herbert	d1e9dba4aa	Move beatmap lookup ability to new request	2018-06-08 12:21:12 +09:00
Dean Herbert	b45354ce97	Add missing header	2018-06-08 12:06:58 +09:00
Dean Herbert	1716975a37	Move out APIBeatmap	2018-06-08 12:04:33 +09:00
Dean Herbert	8cc31aca54	Reorganise API requests and response classes ... They were previously breaking the two-class-per-file rule.	2018-06-08 11:42:35 +09:00
DrabWeb	0fae49ee21	Don't add a 'with Video' subtitle.	2018-06-07 20:47:27 -03:00
Dean Herbert	0b4f5af52e	Add setting to toggle standardised or exponential scoring display ... Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.	2018-06-08 03:17:12 +09:00
rootyElf	b3cab35a2c	Update EntityFramework libraries ... Updated Microsoft.EntityFrameworkCore.Sqlite and Microsoft.EntityFrameworkCore.Sqlite.Core to 2.1.0 to enable the app to run on arm linux platforms. This also updates SQLitePCLRaw.lib.e_sqlite3.linux from 1.1.7 to 1.1.11. While 1.1.7 only provides native libraries for linux-x64 and linux-x86, 1.1.11 adds alpine-x64, linux-arm, linux-arm64, linux-armel and linux-musl-x64.	2018-06-07 15:46:31 +01:00
Roman Kapustin	1fdbd20471	Nullref quickfix in PlayButton	2018-06-07 14:50:21 +03:00
Roman Kapustin	ab6699b1fb	Stop DirectOverlay preview on search update	2018-06-07 14:40:41 +03:00
Roman Kapustin	3033294df1	Stop Preview on BeatmapSet change	2018-06-07 14:30:11 +03:00
Dean Herbert	2c25e5e8da	Merge branch 'master' into mania-step-interval	2018-06-07 20:26:33 +09:00
smoogipoo	55a5dfa9b6	Add column testcase	2018-06-07 20:24:33 +09:00
smoogipoo	55475d129f	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs	2018-06-07 19:19:20 +09:00
Dean Herbert	475fb06559	Use new bind method	2018-06-07 16:46:54 +09:00
Dean Herbert	e6158bc348	Merge remote-tracking branch 'upstream/master' into disallow-beatmap-change	2018-06-07 16:35:07 +09:00
smoogipoo	d1b469c1a3	Better handling of nested playfields' hitobjects	2018-06-07 16:28:21 +09:00
Dan Balasescu	ef287eaa7f	Merge branch 'master' into fix-menu-notifications	2018-06-07 15:35:30 +09:00
Dean Herbert	f3c9049660	Merge branch 'master' into disallow-beatmap-change	2018-06-07 15:34:19 +09:00
smoogipoo	485026da6f	Merge remote-tracking branch 'origin/master' into mania-mask-container ... # Conflicts: # osu.Game.Rulesets.Mania/Objects/Drawables/DrawableHoldNote.cs	2018-06-07 15:32:31 +09:00
Dean Herbert	5e9a1961cb	Greatly increase the playfield scroll speed adjust step ... It was so small previously that I believe many people didn't even realise it was working.	2018-06-07 14:35:33 +09:00
smoogipoo	d516a0a05c	Store platform offset clock in variable for visibility	2018-06-07 13:42:31 +09:00
smoogipoo	3745f9000b	Merge remote-tracking branch 'origin/master' into remove-decoder-offset	2018-06-07 13:37:19 +09:00
DrabWeb	fb96b30555	Cleanup.	2018-06-07 00:51:27 -03:00
DrabWeb	f13f71b1e9	Move GameTypePicker label to RoomSettingsOverlay.	2018-06-07 00:39:16 -03:00
DrabWeb	5c0e40df29	Apply on commit.	2018-06-07 00:25:16 -03:00
DrabWeb	ed97d35ef7	Test steps.	2018-06-06 23:30:17 -03:00
Dean Herbert	f491a18d40	Fix notifications not showing at main osu! logo on menu	2018-06-07 01:49:34 +09:00
Dean Herbert	17ba129e61	Make volume controls stay open when hovered ... Closes #2743.	2018-06-07 01:14:43 +09:00
Dean Herbert	dd75cd973b	Show UI mouse cursor when hovering volume meters during gameplay ... Also adds a hover animation.	2018-06-07 01:13:35 +09:00
Dean Herbert	621be3bbfc	Merge branch 'master' into disallow-beatmap-change	2018-06-07 00:38:40 +09:00
Dan Balasescu	b59c45ca57	Merge branch 'master' into fix-database-migration-failure	2018-06-06 22:44:35 +09:00
Dean Herbert	ee6f107f08	Merge remote-tracking branch 'upstream/master' into peppy-fix-import-path-failures	2018-06-06 22:12:10 +09:00
Dean Herbert	a60c888ae5	Add comment about reasoning for local context variable	2018-06-06 22:05:25 +09:00
Dean Herbert	00b4a2519f	Update framework	2018-06-06 21:22:22 +09:00
Dean Herbert	ea1336d243	Merge remote-tracking branch 'upstream/master' into nuget-consumption	2018-06-06 21:09:51 +09:00
Dean Herbert	70478e2216	Merge remote-tracking branch 'upstream/master' into fix-import-path-failures	2018-06-06 20:55:51 +09:00
Dean Herbert	c756a89daf	Standardise path	2018-06-06 20:55:42 +09:00
Dean Herbert	2e23da1dfa	Merge branch 'master' into beatmap-set-downloader	2018-06-06 20:32:58 +09:00
smoogipoo	18fc63bac2	Add back removed using	2018-06-06 20:32:37 +09:00
Dan Balasescu	c30861186b	Merge branch 'master' into disallow-beatmap-change	2018-06-06 20:26:17 +09:00
smoogipoo	ebcfe97ccf	Expose Dependencies from base OsuTestCase	2018-06-06 20:25:40 +09:00
smoogipoo	f2ac5b8b2d	CreatePlayer shouldn't receive a beatmap	2018-06-06 20:21:47 +09:00
smoogipoo	e77084bec4	Give OsuScreen a mutable BindableBeatmap	2018-06-06 20:19:53 +09:00
smoogipoo	ff60f69f47	Explicitly construct local beatmaps rather than using GetBoundCopy	2018-06-06 20:19:30 +09:00
smoogipoo	72cc53aded	Rename GameBeatmap -> BindableBeatmap	2018-06-06 20:16:20 +09:00
Dean Herbert	a645a109be	Merge branch 'master' into overlay-activation	2018-06-06 19:18:28 +09:00
Dean Herbert	0a97b8ae25	Implement DebugUtils locally ... Has been removed from framework	2018-06-06 18:33:10 +09:00
smoogipoo	4086ff7313	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game.Tests/Visual/TestCaseBeatmapInfoWedge.cs # osu.Game/Screens/Menu/Intro.cs # osu.Game/Screens/Menu/MenuSideFlashes.cs	2018-06-06 18:26:51 +09:00
DrabWeb	4aff2ba2af	Move settings to subfolder.	2018-06-06 06:25:34 -03:00
Dean Herbert	5a4408e359	Merge remote-tracking branch 'upstream/master' into nuget-consumption	2018-06-06 18:22:22 +09:00
DrabWeb	915a4535d0	Remove label option from SettingsTextBox.	2018-06-06 06:22:16 -03:00
Dean Herbert	9306fec498	Fix missing null checks	2018-06-06 18:21:03 +09:00