8475 Commits

Author	SHA1	Message	Date
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
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
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
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
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
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
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
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
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
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
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