11492 Commits

Author	SHA1	Message	Date
Dean Herbert	63fea65c0c	Clarify repeat index	2019-03-11 14:53:21 +09:00
Dean Herbert	489153579a	Add xmldoc and clarify struct variables	2019-03-11 14:36:29 +09:00
Dean Herbert	2029cf93fd	Rename and reuse variables	2019-03-11 14:33:21 +09:00
Dean Herbert	26f78b659b	Merge remote-tracking branch 'upstream/master' into extract-slider-tick-creation	2019-03-11 14:31:12 +09:00
David Zhao	0d95511222	Merge branch 'master' into multi-background-stack	2019-03-11 11:19:08 +09:00
David Zhao	2df57c3a29	Give Multiplayer its own background stack	2019-03-11 11:08:04 +09:00
Joehu	0fc6fa7245	Fix file naming on ParticipantCountDisplay	2019-03-09 20:29:56 -08:00
jorolf	2525f5bcb7	Apply most suggestions	2019-03-09 23:58:14 +01:00
jorolf	bb6e57169f	Merge branch 'screen-title-class' of github.com:Jorolf/osu into profile-header-update	2019-03-09 20:22:33 +01:00
Joehu	7311ccabfb	Fix direct panel stats being misaligned by one pixel	2019-03-08 20:27:50 -08:00
Dean Herbert	9df27f3a5f	Merge branch 'master' into prevent-null-lookup	2019-03-09 11:14:54 +09:00
jorolf	af1c54d995	add ScreenTitle class	2019-03-08 23:44:01 +01:00
Dean Herbert	10734b774c	Update framework	2019-03-08 20:48:50 +09:00
Dean Herbert	c6194d5487	Merge branch 'master' into extract-slider-tick-creation	2019-03-08 20:40:03 +09:00
Dean Herbert	48e54c84c1	Merge branch 'master' into mod-wind	2019-03-08 20:23:02 +09:00
Dean Herbert	28a1baa07e	Merge branch 'extract-slider-tick-creation' of https://github.com/peppy/osu into extract-slider-tick-creation	2019-03-08 20:13:58 +09:00
Dean Herbert	93a999396e	LegacyFinalTick -> LegacyLastTick to match existing variable	2019-03-08 20:13:11 +09:00
Dean Herbert	f59b9e933e	Merge branch 'master' into extract-slider-tick-creation	2019-03-08 20:00:12 +09:00
Dean Herbert	355705f0a5	Fix legacy tick handling	2019-03-08 19:57:30 +09:00
Jamie Taylor	8e5816805c	Fix showing outdated data for non-online beatmaps	2019-03-08 18:44:35 +09:00
Jamie Taylor	800007c378	Set DummyWorkingBeatmap difficulties to 0 for better fallback display	2019-03-08 18:17:50 +09:00
smoogipoo	9a05643ec9	Minor refactorings	2019-03-08 17:18:54 +09:00
smoogipoo	a40ffcc692	Apply formatting adjustments	2019-03-08 16:44:39 +09:00
smoogipoo	a7ad29ca9d	Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design	2019-03-08 16:32:46 +09:00
smoogipoo	d055b248ac	Remove blank line	2019-03-08 15:56:36 +09:00
smoogipoo	7c5ca67691	Merge remote-tracking branch 'origin/master' into gameplay-clock-container ... # Conflicts: # osu.Game/Screens/Play/Player.cs	2019-03-08 15:54:15 +09:00
Dean Herbert	973f29b765	Apply review	2019-03-08 15:14:57 +09:00
Dan Balasescu	c967875ff6	Merge branch 'master' into fix-non-async-load	2019-03-08 15:14:37 +09:00
smoogipoo	e00702f4e4	Merge remote-tracking branch 'origin/master' into fix-non-async-load	2019-03-08 15:14:14 +09:00
smoogipoo	09b5cf4891	Move sizing to ctor	2019-03-08 15:14:07 +09:00
Dean Herbert	ed8c9bc88a	Merge remote-tracking branch 'upstream/master' into gameplay-clock-container	2019-03-08 15:07:55 +09:00
Dean Herbert	42efea1e06	Apply review	2019-03-08 15:05:45 +09:00
Dean Herbert	a73e3d9700	Move cursor construction to BDL	2019-03-08 15:01:45 +09:00
Dean Herbert	2c98ba1c0c	Split out consumption and creation into two separate code paths	2019-03-08 14:59:45 +09:00
Dean Herbert	3ccc76e18f	Merge remote-tracking branch 'upstream/master' into cursor-in-playfield	2019-03-08 14:50:46 +09:00
Dean Herbert	551380dd42	Extract slider tick creation so it can be shared with osu!catch	2019-03-08 14:46:26 +09:00
Dan Balasescu	969d5bcbd0	Merge branch 'master' into fix-roomstate-on-cancel	2019-03-08 14:10:24 +09:00
Dean Herbert	400514630d	Fix incomplete comment	2019-03-08 12:44:33 +09:00
Dan Balasescu	d1c18c52ab	Merge branch 'master' into fix-cursor-in-scale-container	2019-03-08 12:43:57 +09:00
Dean Herbert	c4cc72cad9	Merge pull request #4437 from peppy/fix-resharper-inspection ... Fix stuck r# inspection	2019-03-08 12:43:17 +09:00
Jamie Taylor	08fc42f8e9	Merge branch 'master' into fix-roomstate-on-cancel	2019-03-08 12:39:29 +09:00
Dean Herbert	75e94eba35	Merge branch 'master' into gameplay-clock-container	2019-03-08 12:32:48 +09:00
Dean Herbert	5ade51f030	Merge branch 'master' into fix-resharper-inspection	2019-03-08 12:29:56 +09:00
Dean Herbert	30a0bb4a25	Merge branch 'master' into fix-duplicate-bg-sprites	2019-03-08 12:25:23 +09:00
Dean Herbert	d01b026ebd	Fix stuck r# inspection	2019-03-08 12:16:12 +09:00
Dean Herbert	075ea70124	Move more toolbar to async load	2019-03-08 12:15:27 +09:00
Dean Herbert	11e5c6a2a0	Fire initial APIStateChanged on local thread	2019-03-08 12:15:27 +09:00
Dan Balasescu	101009c92e	Merge branch 'master' into fix-autoplay-tests	2019-03-08 12:14:40 +09:00
Dean Herbert	27edc41c11	Update framework	2019-03-07 20:14:43 +09:00
Dean Herbert	5ab9f45a8f	Merge branch 'drawnode-changes'	2019-03-07 20:10:42 +09:00
Dean Herbert	7fa84335ce	Merge branch 'line-graph-fix'	2019-03-07 20:10:11 +09:00
smoogipoo	30c6a7c3c5	Merge remote-tracking branch 'nekodex/master' into update-beatmap-scores-design ... # Conflicts: # osu.Game.Tests/Visual/TestCaseBeatmapScoresContainer.cs # osu.Game/Overlays/BeatmapSet/Scores/ClickableUserContainer.cs # osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs # osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs	2019-03-07 18:48:23 +09:00
Dean Herbert	1f44dde96b	Fix autoplay tests not working	2019-03-07 18:34:56 +09:00
smoogipoo	04d756524d	Adjust with shader changes	2019-03-07 18:30:18 +09:00
smoogipoo	e430b8a640	Merge remote-tracking branch 'nekodex/master' into drawnode-changes	2019-03-07 18:15:12 +09:00
David Zhao	b3e046c4d1	Rename PathWidth to PathRadius	2019-03-07 17:39:19 +09:00
David Zhao	b2f4850275	Apply twice the line radius in order to properly account for diameter	2019-03-07 17:25:51 +09:00
Jamie Taylor	c34e110a2c	Merge remote-tracking branch 'upstream/master' into fix-roomstate-on-cancel	2019-03-07 17:01:24 +09:00
Jamie Taylor	054db48089	Move online id null check to only bypass metrics lookup	2019-03-07 16:59:43 +09:00
Jamie Taylor	50c1b3a576	Move room resetting logic from MatchSubScreen to LoungeSubScreen	2019-03-07 16:49:48 +09:00
Jamie Taylor	e5e454ddcd	Don't perform lookup of beatmap stats unless an online id is present	2019-03-07 16:17:12 +09:00
Dan Balasescu	ae4ca2cb66	Merge branch 'master' into fix-duplicate-bg-sprites	2019-03-07 16:11:33 +09:00
Dean Herbert	64b6eaa844	Simplify inward bindings	2019-03-07 16:04:11 +09:00
Dean Herbert	58ef397f4f	Move all clock related gameplay logic inside GameplayClockContainer	2019-03-07 16:02:24 +09:00
Dan Balasescu	7783c33398	Merge branch 'master' into fix-mp-chat-in-own-room	2019-03-07 15:59:53 +09:00
Jamie Taylor	ee076bbbe3	Fix chat channel ids not being updated on room creation	2019-03-07 15:35:57 +09:00
Jamie Taylor	e13516c2ba	Only attempt to restore CurrentItem state if present	2019-03-07 14:09:28 +09:00
David Zhao	d97c070ef1	Account for path width correctly in LineGraph	2019-03-07 13:45:55 +09:00
Jamie Taylor	6e5ea78ca2	Fix some nullref crashes when escaping out of new room creation	2019-03-06 20:03:37 +09:00
Jamie Taylor	5de6e29294	Reset currentRoom state when cancelling room creation	2019-03-06 20:03:37 +09:00
smoogipoo	e3d463a141	Formatting fixes	2019-03-06 19:26:48 +09:00
Jamie Taylor	ab0ac7a82a	Pass through timeBeforeLoad instead of hardcoding	2019-03-06 19:12:37 +09:00
Jamie Taylor	06b65e00c4	Prevent null beatmap from creating an extra drawable	2019-03-06 19:12:28 +09:00
Jamie Taylor	eb80549782	Fix UpdateableBeatmapBackgroundSprite not disposing of previously loaded sprites	2019-03-06 19:12:22 +09:00
Dean Herbert	ffe53411f6	Add back cursor proxying	2019-03-06 17:44:58 +09:00
Dean Herbert	62716851a1	Revert some unnecessary changes	2019-03-06 17:41:54 +09:00
Dean Herbert	7aa30ca3f6	Change method of cursor creation	2019-03-06 17:41:54 +09:00
Dean Herbert	acf518c208	Move cursor inside playfield	2019-03-06 17:41:54 +09:00
Dean Herbert	5411c63093	Fix menu cursor not displaying outside of gameplay scaling area	2019-03-06 17:14:08 +09:00
smoogipoo	3c999d64d4	Fix post-merge errors	2019-03-06 16:09:21 +09:00
smoogipoo	ee1f9d4981	Merge remote-tracking branch 'origin/master' into profile-header-update ... # Conflicts: # osu-resources # osu.Game/Overlays/Profile/Components/GradeBadge.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/Header/RankGraph.cs # osu.Game/Overlays/Profile/Header/SupporterIcon.cs # osu.Game/Overlays/Profile/ProfileHeader.cs	2019-03-06 15:53:30 +09:00
Dean Herbert	2300e59e91	Formatting and simplification	2019-03-06 14:19:00 +09:00
Dean Herbert	d70b373af9	Merge branch 'master' into mod-wind	2019-03-06 14:04:04 +09:00
Dean Herbert	9441f88033	Use actual reference to default beatmap for fallback ... Co-Authored-By: nyquillerium <nyquill@ppy.sh>	2019-03-06 13:01:37 +09:00
Dean Herbert	b94d080b1c	Merge branch 'master' into LobbyList	2019-03-06 12:34:36 +09:00
Dean Herbert	6b042eae94	Merge branch 'master' into fix-cursor-in-scale-container	2019-03-05 22:22:56 +09:00
Dean Herbert	8a6fa0915e	Merge branch 'master' into simplify-gameplay-clock	2019-03-05 20:22:46 +09:00
Dean Herbert	558dbafb71	Use a safer method of setting the clock	2019-03-05 20:14:04 +09:00
Dean Herbert	d5943330b1	Fix potential infinite loop	2019-03-05 20:06:04 +09:00
Dean Herbert	76ce3954a0	Rename PauseContainer	2019-03-05 19:30:55 +09:00
David Zhao	89987210c3	Merge remote-tracking branch 'upstream/master' into LobbyList	2019-03-05 18:59:38 +09:00
David Zhao	34b2553b95	Remove redundant boolean	2019-03-05 18:59:25 +09:00
Dan Balasescu	fafc80818c	Fix typo ... Co-Authored-By: peppy <pe@ppy.sh>	2019-03-05 18:50:46 +09:00
Dean Herbert	f98d55531f	Add documentation for FetchScores	2019-03-05 18:48:59 +09:00
Nathan Alo	2a741d5853	Merge branch 'master' into local-leaderboard-display	2019-03-05 17:43:28 +08:00
Dean Herbert	424e02f165	Merge pull request #4411 from smoogipoo/fix-custom-sample-volume ... Fix volume not being considered for file samples	2019-03-05 18:41:52 +09:00
LeNitrous	8ad258f426	only check IsLoggedIn after requesting scores	2019-03-05 17:34:23 +08:00
Dean Herbert	5aaa2511eb	Merge pull request #4374 from Joehuu/status-direct-list ... Add beatmap status on direct list panels	2019-03-05 18:22:56 +09:00
smoogipoo	a08086cc8a	Fix volume not being considered for file samples	2019-03-05 18:21:29 +09:00
smoogipoo	aefaceb397	Merge remote-tracking branch 'origin/master' into show-mods-on-loader	2019-03-05 18:08:11 +09:00
Dean Herbert	fc0b297232	Fix menu cursor not displaying outside of gameplay scaling area	2019-03-05 18:06:24 +09:00
smoogipoo	c06dac5b1a	Remove null check (beatmap cannot be null)	2019-03-05 17:58:30 +09:00
smoogipoo	2fee7276ae	Combine creation + assignment	2019-03-05 17:58:05 +09:00
Dan Balasescu	bb6c83ab25	Merge branch 'master' into show-mods-on-loader	2019-03-05 17:46:35 +09:00
Dan Balasescu	8e99f54fed	Merge branch 'master' into update-beatmap-sections	2019-03-05 17:39:47 +09:00
Dan Balasescu	fd147dae21	Merge branch 'master' into fix-disabled-set-crash	2019-03-05 17:25:13 +09:00
smoogipoo	d01ec59acb	Fix sizings	2019-03-05 17:14:49 +09:00
smoogipoo	e73cef5f94	Prefill some more properties of TestWorkingBeatmap	2019-03-05 17:14:24 +09:00
David Zhao	52558c5cf6	Fix metadata potentially being null	2019-03-05 16:59:02 +09:00
David Zhao	166a8c8bbb	Add back fallback behavior for match creation	2019-03-05 16:41:59 +09:00
Dean Herbert	9a9b4efb8d	Fix excess line	2019-03-05 16:41:11 +09:00
Dean Herbert	93c79023dc	Merge remote-tracking branch 'upstream/master' into simplify-gameplay-clock	2019-03-05 16:41:01 +09:00
Dean Herbert	ec063a13db	Update RulesetInputManager to support new clock structure more accurately	2019-03-05 16:34:50 +09:00
smoogipoo	76aca738a9	Revert "Use same size labels from song select" ... This reverts commit 7077e405ab.	2019-03-05 16:02:07 +09:00
David Zhao	11e353c152	Use local class instead of having a separate file	2019-03-05 15:55:37 +09:00
David Zhao	fc62877fdc	Fall back to default background	2019-03-05 15:51:43 +09:00
Dan Balasescu	b5fb6e2a59	Merge branch 'master' into limit-blank-lines	2019-03-05 15:40:11 +09:00
David Zhao	7c53c7b602	Remove local background logic	2019-03-05 15:33:39 +09:00
Dan Balasescu	07c7d03a04	Merge branch 'master' into move-osu-settings	2019-03-05 15:32:54 +09:00
Dean Herbert	34f0967873	Merge branch 'master' into limit-blank-lines	2019-03-05 14:51:56 +09:00
Dean Herbert	4e33a98dbc	Move gameplay clock to own class	2019-03-05 13:53:47 +09:00
Dean Herbert	c5cd9972c4	Make restart private	2019-03-05 13:37:51 +09:00
Dean Herbert	01f1018d02	Tidy up clock logic using DI and a GameplayClock	2019-03-05 13:37:51 +09:00
Dean Herbert	5bb0511f0a	Fix SquareGraph not correctly filling columns when loaded with a non-zero time	2019-03-05 13:37:28 +09:00
smoogipoo	78596dfe80	Merge remote-tracking branch 'origin/master' into move-osu-settings ... # Conflicts: # osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs # osu.Game.Rulesets.Osu.Tests/TestCaseSlider.cs	2019-03-05 13:25:03 +09:00
David Zhao	aecbc31ffa	Use BeatmapSetCoverType.List for lobby listing	2019-03-05 12:08:14 +09:00
Dean Herbert	0ff17103e8	Merge branch 'master' into update-difficulty-brackets	2019-03-05 10:16:18 +09:00
LeNitrous	74a23edaf7	no longer adjust the clock rate	2019-03-04 17:48:51 +08:00
LeNitrous	86e861ddeb	update mod descriptions	2019-03-04 17:39:13 +08:00
Dean Herbert	3f197935d7	Fix remaining case	2019-03-04 14:03:59 +09:00
Dean Herbert	08e153208d	Unbinds are automatic	2019-03-03 20:03:22 +09:00
Dean Herbert	6ffa139ea8	Adjust transition length slightly	2019-03-03 20:02:56 +09:00
Dean Herbert	46b618d80c	Merge remote-tracking branch 'Joehuu/master' into supporter-disclaimer	2019-03-03 19:18:16 +09:00
LeNitrous	b83d44c316	use ternary operator instead	2019-03-03 16:50:31 +08:00
LeNitrous	a1a8246c05	trim whitespace	2019-03-03 16:30:08 +08:00
LeNitrous	5af5a76e87	Merge branch 'master' of https://github.com/LeNitrous/osu into mod-wind	2019-03-03 16:25:49 +08:00
LeNitrous	ecc2c28a62	mod rule changes	2019-03-03 16:22:00 +08:00
Dean Herbert	456c5be50c	Merge branch 'master' into taskbar-tooltip-fade-out	2019-03-03 12:47:37 +09:00
jorolf	e8d568470d	use a bindable instead	2019-03-02 19:13:38 +01:00
jorolf	176cbc7f2e	Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer	2019-03-02 19:04:48 +01:00
Dean Herbert	687d5d5ff1	Merge pull request #4387 from smoogipoo/fix-fonts ... Fix a few incorrect fonts	2019-03-02 20:07:26 +09:00
Dan Balasescu	f13901cc19	Merge branch 'master' into fix-mod-overlay-dim	2019-03-02 16:04:44 +09:00
Dean Herbert	b7126b3efb	Fix mod select overlay dimming itself	2019-03-02 14:48:05 +09:00
Dean Herbert	5487b011d6	Fix some inspections rider isn't able to deal with automatically	2019-03-02 14:34:56 +09:00
smoogipoo	268ea6a836	Wrong line	2019-03-02 13:28:16 +09:00
smoogipoo	83a02d32f7	Fix a few incorrect fonts	2019-03-02 13:25:59 +09:00
Joehu	7077e405ab	Use same size labels from song select	2019-03-01 15:48:58 -08:00
Nitrous	0be9f81310	Merge branch 'master' into show-mods-on-loader	2019-03-02 06:40:45 +08:00
Dean Herbert	7f1f812f29	Update framework	2019-03-01 22:06:42 +09:00
Dean Herbert	1871e8bb2c	Merge branch 'master' into master	2019-03-01 21:22:34 +09:00
Dean Herbert	c01990d005	Fix callback potentially not getting fired	2019-03-01 20:52:34 +09:00
Nitrous	7a47173f3e	Merge branch 'master' into show-mods-on-loader	2019-03-01 19:30:46 +08:00
Dean Herbert	431d439500	Make attribute public	2019-03-01 20:15:09 +09:00
LeNitrous	cf51c8aa31	attempt to comply with appveyor	2019-03-01 19:10:32 +08:00
Dean Herbert	9885913fff	Fix iOS builds not being able to read their deploy version	2019-03-01 20:01:16 +09:00
LeNitrous	4e081fe1fc	Merge branch 'show-mods-on-loader' of https://github.com/LeNitrous/osu into show-mods-on-loader	2019-03-01 18:41:41 +08:00
smoogipoo	bf8360636a	Adjust drawnodes to use the new shared data structure	2019-03-01 17:25:15 +09:00
Dean Herbert	19ce1f2869	Remove second conditional	2019-03-01 13:43:16 +09:00
Dan Balasescu	952c435f3c	Merge branch 'master' into ensure-focused-overlay-dim	2019-03-01 13:31:56 +09:00
smoogipoo	7583279e08	Remove unnecessary precondition	2019-03-01 13:29:02 +09:00
Joehu	e5bc927354	Add beatmap status on direct list panels	2019-02-28 19:38:05 -08:00
Shane Woolcock	5d1eacf1c1	Ensure all OsuFocusedOverlayContainers contribute to screen fading	2019-03-01 12:20:31 +09:00
David Zhao	b97b12debf	Merge branch 'master' into UserDimLogic	2019-03-01 12:11:53 +09:00
David Zhao	f6303a2855	Fix songselect blur potentially never being applied	2019-03-01 11:52:51 +09:00
Dean Herbert	6bccdd50ef	Merge branch 'master' into UserIDDBStore	2019-03-01 11:07:30 +09:00
Dean Herbert	49cbaecf4c	Update licence header	2019-03-01 10:52:53 +09:00
Dean Herbert	0300f0d665	Ensure deletions are correct without relying on FK cascade rule	2019-03-01 10:47:45 +09:00
Dean Herbert	d4041d5d42	Automate includes of files in ArchiveModelManager use cases	2019-03-01 10:25:21 +09:00
Dean Herbert	acc2113027	Make operation run asynchronously	2019-03-01 10:09:03 +09:00
Dean Herbert	798bc1306b	Merge remote-tracking branch 'upstream/master' into m2307-master ... # Conflicts: # osu.Game/Screens/Select/SongSelect.cs	2019-03-01 10:08:35 +09:00
Dean Herbert	80b5f1c523	Fix code formatting issues	2019-03-01 09:49:36 +09:00
Dean Herbert	67928ac1fe	Remove pointless check	2019-03-01 09:49:11 +09:00
Joehu	f4a6612d48	Fade out taskbar tooltip after clicking	2019-02-28 15:43:04 -08:00
Dean Herbert	aad53fa861	Merge branch 'master' into show-supported-window-modes	2019-02-28 22:47:33 +09:00
Shane Woolcock	f1912a281c	Use Count property	2019-02-28 21:46:49 +09:00
Shane Woolcock	dfb3fef9e1	Hide WindowMode dropdown if only one is selectable	2019-02-28 21:38:55 +09:00
Shane Woolcock	b159e3ec31	Fix headless tests	2019-02-28 20:39:55 +09:00
Dean Herbert	09e1e3bab6	Merge branch 'master' into UserDimLogic	2019-02-28 20:38:09 +09:00
Dean Herbert	30e820d107	Fix storyboard potentially being loaded many times	2019-02-28 20:36:00 +09:00
Dean Herbert	53eb0e7e4e	More formatting fixes	2019-02-28 20:30:23 +09:00
Dean Herbert	86913e720f	Remove extra space	2019-02-28 20:24:09 +09:00
Dean Herbert	6861163226	Remove pointless method	2019-02-28 20:21:27 +09:00
Shane Woolcock	94199e628c	Only display SupportedWindowModes in settings	2019-02-28 20:20:12 +09:00
Dean Herbert	c5270dd577	Remove unnecessary using	2019-02-28 20:17:00 +09:00
Dean Herbert	a716e5b265	Merge pull request #4365 from nekodex/beatmapsetoverlay-bindables ... Refactor BeatmapSetOverlay to use chained bindables	2019-02-28 20:08:44 +09:00
David Zhao	e3338e94d1	Make test cases more compact, add two way toggles	2019-02-28 20:01:15 +09:00
Jamie Taylor	1f273a4c3a	Use local variables where appropriate	2019-02-28 19:58:48 +09:00
Dean Herbert	15c092b0dd	Merge branch 'master' into fix-potential-crossthread	2019-02-28 19:57:35 +09:00
Dean Herbert	4ad3d76b13	Merge branch 'master' into beatmapsetoverlay-bindables	2019-02-28 19:19:36 +09:00
Dean Herbert	d10ad3c8a7	Fix warnings	2019-02-28 18:59:05 +09:00
Dean Herbert	5b53cf0961	Merge branch 'master' into hide-desktop-only-elements	2019-02-28 18:50:16 +09:00
Dean Herbert	48fcaf34e6	Update framework	2019-02-28 18:49:59 +09:00
Jamie Taylor	b7f7174055	Refactor BeatmapSetOverlay to use chained bindables instead of accessors to distribute changes	2019-02-28 18:46:28 +09:00
Dan Balasescu	99812bd448	Apply suggestions from code review ... Co-Authored-By: nyquillerium <nyquill@ppy.sh>	2019-02-28 18:25:58 +09:00
Dan Balasescu	a37445a938	Merge branch 'master' into better-mp-songselect-deletion-handling	2019-02-28 17:35:08 +09:00
smoogipoo	921346d303	Rename a few more members	2019-02-28 17:27:28 +09:00
Dean Herbert	b2872b47d0	Merge branch 'master' into UserDimLogic	2019-02-28 17:18:04 +09:00
smoogipoo	951b95ff78	Fix potential race condition	2019-02-28 17:17:57 +09:00
David Zhao	9f9b2b1902	Remove redundant setters	2019-02-28 17:13:25 +09:00
Jamie Taylor	4c8aa65200	private + renaming	2019-02-28 17:02:45 +09:00
David Zhao	69b1c76dce	Actually implement blurring fix	2019-02-28 16:51:17 +09:00
Dean Herbert	93a4229ba6	Merge pull request #4357 from Joehuu/toquantity-1 ... Use ToQuantity instead for words with number prefixes	2019-02-28 16:37:36 +09:00
Jamie Taylor	8cf83e2f4a	Fix the check of beatmapset local availability	2019-02-28 16:14:50 +09:00
Dan Balasescu	3a1066ff02	Merge branch 'master' into toquantity-1	2019-02-28 15:57:51 +09:00
Jamie Taylor	6e821a426d	Fix restoration of enabled mods when cancelling song select	2019-02-28 15:06:11 +09:00
Jamie Taylor	cf2feec7df	Fix multiplayer enabled mods check	2019-02-28 15:02:22 +09:00
Joehu	2241e1af9d	Use ToQuantity for words with number prefixes	2019-02-27 21:55:45 -08:00
Dean Herbert	2dbf7d122c	Merge branch 'master' into use-pattern-matching	2019-02-28 14:53:07 +09:00
Dean Herbert	99e2e6cf1c	Align text	2019-02-28 14:46:52 +09:00
Dean Herbert	774116923b	A few fixes	2019-02-28 14:45:59 +09:00
Dean Herbert	e2c6a8bc07	Use pattern matching wherever possible	2019-02-28 14:35:00 +09:00
Dean Herbert	0788a7e9f1	Merge branch 'master' into more-inspections	2019-02-28 14:32:57 +09:00
Dean Herbert	42be7857d1	Use expression body for property get/set where possible	2019-02-28 13:58:19 +09:00
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
Shane Woolcock	ce17e37c74	Conditionally add some UI elements only on desktop ... Prevents crashes from trying to access features that are not applicable to mobile.	2019-02-28 13:10:53 +09:00
Dean Herbert	3e1f283281	Merge remote-tracking branch 'upstream/master' into more-inspections	2019-02-28 13:09:18 +09:00
Dean Herbert	83e9dfda75	Merge branch 'master' into fix-osugame-test-case	2019-02-28 12:33:00 +09:00
Dean Herbert	43b02212ce	Add disposal check in single file load path	2019-02-28 12:24:56 +09:00
Dan Balasescu	76ec5868da	Merge branch 'master' into fix-square-graph-overhead	2019-02-28 12:23:37 +09:00
Dean Herbert	0faf83f7d1	Fix nullref in tests	2019-02-27 23:30:13 +09:00
Dean Herbert	42442edf5a	Update framework	2019-02-27 22:41:46 +09:00
Dean Herbert	d3a304c233	Merge branch 'master' into fix-home-button-cancel-2	2019-02-27 22:02:37 +09:00
Dean Herbert	53865c6857	Merge branch 'master' into better-mp-songselect-deletion-handling	2019-02-27 21:55:22 +09:00
Dean Herbert	ccb00b932b	Merge branch 'master' into fix-nasty-unbind	2019-02-27 21:44:54 +09:00
Dean Herbert	c8793911a8	Enable more stringent inspectcode style inspections	2019-02-27 21:25:40 +09:00
smoogipoo	7fa4262207	Clear delegate list rather than relying on unbinds	2019-02-27 21:04:47 +09:00
Dean Herbert	5c6db17865	Merge remote-tracking branch 'upstream/master' into fix-square-graph-overhead	2019-02-27 21:02:28 +09:00
Dan Balasescu	d2c2e41e0c	Merge branch 'master' into excess-skin-change	2019-02-27 20:30:18 +09:00
Dean Herbert	3af7d4939c	Add debounce testing	2019-02-27 19:11:09 +09:00
Dean Herbert	43a1df6e5c	Inline cancellation token source creation	2019-02-27 18:58:53 +09:00
Dean Herbert	6f5d4ce2e2	Debounce SquareGraph some more	2019-02-27 18:58:45 +09:00
Dean Herbert	8c4a59e57e	Fix SquareGraph more	2019-02-27 18:58:34 +09:00
Dean Herbert	9473b53226	Avoid redundant (synchronous) skin change	2019-02-27 18:53:01 +09:00
David Zhao	882fff1631	Assert storyboard visibilty at both steps of toggle	2019-02-27 17:56:44 +09:00
Dean Herbert	99d8d39ea1	Merge branch 'master' into fix-crossthread	2019-02-27 17:46:12 +09:00
smoogipoo	1006c539be	Fix looping not being checked	2019-02-27 17:03:09 +09:00
David Zhao	14ffd9efe8	Add fake storyboard to visually assess storyboard dim	2019-02-27 17:02:04 +09:00
smoogipoo	30815ace62	Fix crossthread operations due to Track.Completed	2019-02-27 16:52:34 +09:00
smoogipoo	f66fefb818	Adjust comment + accessibility	2019-02-27 16:30:10 +09:00
Jamie Taylor	c59d84fd21	Add sanity check to prevent TimeshiftPlayer from starting with incorrect beatmap/ruleset/mods	2019-02-27 16:21:14 +09:00
Jamie Taylor	a3f71d69a9	Ensure ruleset and mods are set correctly when leaving MatchSongSelect	2019-02-27 16:16:13 +09:00
Jamie Taylor	7c2ffb1826	Fix MatchSongSelect not handling beatmapset deletions	2019-02-27 14:34:39 +09:00
Joehu	5b4319a80f	Fix home button being cancelled by mod select again	2019-02-26 21:01:28 -08:00
smoogipoo	a07d797d75	Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization	2019-02-27 12:08:43 +09:00
Dean Herbert	56697339b3	Merge branch 'master' into fix-disabled-set-crash	2019-02-27 11:14:42 +09:00
jorolf	4c10185f5b	Fade out text instead of removing it immediately	2019-02-26 15:26:00 +01:00
jorolf	cacef7421d	Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer	2019-02-26 14:09:12 +01:00
Dean Herbert	d9872dda12	Use fade instead of negative margin	2019-02-26 16:10:06 +09:00
Dean Herbert	2d6d9dd723	Add better easing	2019-02-26 16:09:45 +09:00
Dean Herbert	c1432b2ed5	Add back newline	2019-02-26 15:48:34 +09:00
Dean Herbert	2fc34496fd	Merge branch 'master' into MissingSource	2019-02-26 15:38:51 +09:00
Dean Herbert	d2dc38f298	Merge branch 'master' into hide-exit-button	2019-02-26 13:25:47 +09:00
smoogipoo	8a943a6e65	Fix scores being stored as ints	2019-02-26 13:10:59 +09:00
Dan Balasescu	32b8bb2ccc	Fix broken grammar ... Co-Authored-By: peppy <pe@ppy.sh>	2019-02-26 12:28:49 +09:00
Shane Woolcock	e91c07209f	Move MainMenu initialisation from ctor to load	2019-02-26 09:54:42 +09:00
jorolf	796044ee7d	*I should've rechecked the code after the master merge*	2019-02-25 23:53:44 +01:00
jorolf	501dab7b32	Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer	2019-02-25 23:49:01 +01:00
jorolf	c680d63694	Don't show the supporter text if the user already has supporter status	2019-02-25 23:44:43 +01:00
Dean Herbert	568e90c70b	Merge branch 'master' into UserDimLogic	2019-02-25 22:35:48 +09:00
David Zhao	d750023c52	Fix TestCasePlayerLoader not having a background stack	2019-02-25 22:05:49 +09:00
Shane Woolcock	bebb635ca1	Merge branch 'master' into hide-exit-button ... # Conflicts: # osu.Game/Screens/Menu/MainMenu.cs	2019-02-25 21:48:42 +09:00
Shane Woolcock	2bd5bb3f69	Move all MainMenu button creation into load	2019-02-25 21:41:41 +09:00
Dean Herbert	97dc7f9819	Merge branch 'master' into MissingSource	2019-02-25 19:35:44 +09:00
Dean Herbert	2fbb0b4e6f	Don't use this	2019-02-25 19:34:03 +09:00
Dean Herbert	140de26a56	Merge remote-tracking branch 'upstream/master' into notify_track_completion_failure	2019-02-25 19:30:35 +09:00
Dean Herbert	ed10024b22	Fix some formatting / variable naming	2019-02-25 19:29:09 +09:00
Dean Herbert	a4e119786f	Fix some weird formatting	2019-02-25 19:19:28 +09:00
Dean Herbert	6881563346	Merge branch 'master' into ScrollingExitFix	2019-02-25 19:11:05 +09:00
Dean Herbert	f84a84edaa	Fix oops	2019-02-25 18:59:28 +09:00
Dean Herbert	314f35b0c5	Further simplify import messaging	2019-02-25 18:42:08 +09:00
David Zhao	59ad470eed	Clean up test code	2019-02-25 18:41:13 +09:00
David Zhao	ad1bce3585	Fix song select backround not being exited in time	2019-02-25 18:40:19 +09:00
Dean Herbert	80737b9ef8	Remove "silent" parameter; consolidate import logic	2019-02-25 18:24:06 +09:00
Dean Herbert	f0b26550d1	Merge branch 'master' into slider-fix	2019-02-25 16:12:52 +09:00
smoogipoo	7fde21b51a	Rename testcase	2019-02-25 16:09:12 +09:00
David Zhao	22a68d7bea	Perform new migration	2019-02-25 15:25:22 +09:00
David Zhao	4475643726	Revert database migration	2019-02-25 14:40:44 +09:00
Dean Herbert	706da017d7	Add target screen support and user bypass	2019-02-25 14:01:51 +09:00
David Zhao	8da671fa6c	Check if a user exists before creating new user	2019-02-25 13:58:19 +09:00
David Zhao	16fa30f71e	Fix bindable	2019-02-25 13:27:44 +09:00
David Zhao	ccc86b66fa	Use local private bindable in Player.cs	2019-02-25 13:15:37 +09:00
Dean Herbert	caef58675d	Tidy up and standardise present logic	2019-02-25 12:58:58 +09:00
David Zhao	af4606f3d2	Create new test for StoryboardReplacesBackground	2019-02-25 12:35:01 +09:00
Shane Woolcock	61be4f2695	Conditionally add ExitConfirmOverlay and disable back action	2019-02-25 10:43:47 +09:00
Shane Woolcock	add8b8e9c4	Only add Exit button if the GameHost supports it	2019-02-25 09:56:00 +09:00
Dean Herbert	287870f1e1	Remove limitation stopping search updates when no query present in direct ... Closes #4310.	2019-02-24 23:35:18 +09:00
David Zhao	24f5bc7a75	Add documentation and move storyboard init logic	2019-02-24 20:03:24 +09:00
David Zhao	3a9835fcdd	Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic	2019-02-24 18:11:08 +09:00
David Zhao	f4acd6e48f	Move PlayerLoader tests out of constructor, Improve Documentation	2019-02-24 18:10:59 +09:00
Dean Herbert	b140fc973a	Merge branch 'master' into UserDimLogic	2019-02-24 17:48:59 +09:00
Dan Balasescu	bd83a95a4f	Merge branch 'master' into fix-download-failure-exception	2019-02-24 16:01:18 +09:00
Dean Herbert	2281a0235d	Fix regression causing playback rate to display incorrectly	2019-02-24 15:27:06 +09:00
Dean Herbert	56397dbea6	Ensure beatmap is not disabled before continuing with present	2019-02-24 12:08:27 +09:00
Dean Herbert	4e06d5c7cd	Avoid fatal exceptions being thrown on download failure ... Closes #4313.	2019-02-24 00:33:11 +09:00
Dean Herbert	69b9de5acd	Update framework	2019-02-23 21:13:53 +09:00
David Zhao	809ab86ed0	Fix user ID not being added to database ... Needed for avatar retrieval	2019-02-23 17:04:02 +09:00
Dean Herbert	90cae0a69c	Simplify RulesetInputManager further	2019-02-23 15:48:34 +09:00
David Zhao	f8d18285a8	Fix backgrounds not properly being faded in song select	2019-02-23 14:59:54 +09:00
Dean Herbert	6d3c0e3191	Holy sheet	2019-02-23 14:39:55 +09:00
Dean Herbert	0c218eb0d5	Apply new RulesetInputManager logic ... Run UpdateSubTree twice to ensure correctness	2019-02-23 14:14:41 +09:00
Dean Herbert	490fb86f9e	Make base class abstract and add documentation	2019-02-23 14:14:34 +09:00
Dean Herbert	3495aa645f	Update headers	2019-02-23 14:14:34 +09:00
David Zhao	d59ba8cfe9	Rename base player test class to RateAdjustedBeatmap, refactor input tests	2019-02-23 14:14:34 +09:00
David Zhao	1fdb8ca37a	Fix auto-generated lisence header	2019-02-23 14:14:34 +09:00
David Zhao	8e09c66cbb	Split out testcase player for use in slider input tests	2019-02-23 14:14:34 +09:00
Roman Kapustin	8b4aa708fa	Resolve merge conflict	2019-02-22 23:04:45 +03:00
David Zhao	bb01948283	Use .Value with new bindable changes	2019-02-22 20:44:02 +09:00
David Zhao	ab3fa91a2f	Merge branch 'master' into UserDimLogic	2019-02-22 20:38:10 +09:00
David Zhao	76de39a344	Put user dim logic in yet another container inside UserDimContainer	2019-02-22 20:34:51 +09:00
Dean Herbert	367bc53a06	Revert some more instances of 'e' variable names	2019-02-22 20:15:25 +09:00
smoogipoo	a0dae820ee	Woops	2019-02-22 19:49:37 +09:00
smoogipoo	d61dfe888e	Fix venera fonts not being correctly specified	2019-02-22 19:42:09 +09:00
Dean Herbert	3015d40f8f	Merge branch 'master' into osu-fontusage	2019-02-22 18:09:23 +09:00
David Zhao	a4162a69fb	Remove leftover usage of dimlevel in BackgroundScreenBeatmap	2019-02-22 18:01:50 +09:00
Dean Herbert	0431582959	Remove excess new line	2019-02-22 17:57:49 +09:00
Dean Herbert	3fe4b8fd1c	Update variable names ... Also cleans up some weird code	2019-02-22 17:51:39 +09:00
Dean Herbert	2c9e6adfd4	Merge branch 'master' into bindable-valuechanged	2019-02-22 17:14:05 +09:00
Dean Herbert	452caabd40	Apply suggestions from code review ... Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>	2019-02-22 17:06:49 +09:00
David Zhao	263972a048	Remove DimLevel bindable from ScreenWithBeatmapBackground	2019-02-22 17:00:00 +09:00
David Zhao	918a60ebbf	Create a new player every time a test is performed.	2019-02-22 16:56:03 +09:00
David Zhao	65cdac60c3	Add tests to make sure the background is always the same through screen transitions	2019-02-22 14:43:05 +09:00
Dean Herbert	f919f2252f	Add ToString for Judgements to ease debugging	2019-02-22 12:02:54 +09:00
David Zhao	94bc552282	Fix backgrounds not fading out when replaced by storyboard, add test for this	2019-02-22 11:41:28 +09:00
Dean Herbert	8f53af1c71	Update framework	2019-02-22 11:32:14 +09:00
smoogipoo	8853f7ad76	Explicitly set exo typeface in a few places	2019-02-21 19:26:02 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
David Zhao	97db8abd59	Remove unused includes	2019-02-21 18:34:11 +09:00
David Zhao	0677194f46	Move all storyboard show logic into UserDimContainer	2019-02-21 18:14:58 +09:00
David Zhao	ad5e81f0cd	Add test case for background preview, fix unit tests	2019-02-21 15:24:26 +09:00
Dean Herbert	bbeecd6c26	Merge pull request #4299 from nekodex/fix-flying-logo ... Fix osu! logo traveling in a weird direction on entering gameplay	2019-02-21 14:39:35 +09:00
smoogipoo	7e41fbc29b	Remove LegacyDifficultyCalculator	2019-02-21 13:12:37 +09:00
smoogipoo	be9be5dee2	Add some xmldocs	2019-02-20 21:04:18 +09:00
smoogipoo	062196c7da	Cleanup	2019-02-20 20:52:56 +09:00
smoogipoo	cc33f230b4	Merge remote-tracking branch 'origin/master' into osu-fontusage	2019-02-20 20:37:48 +09:00
Jamie Taylor	9b3f2fdd24	Change RelativePositionAxes default on osu! logo to be both	2019-02-20 19:34:55 +09:00
smoogipoo	4db5531e4b	Replace copy-constructor/method with extension method	2019-02-20 19:32:30 +09:00
David Zhao	f5d8700920	Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic	2019-02-20 17:40:13 +09:00
David Zhao	25e7dcb375	Remove unused includes	2019-02-20 17:39:35 +09:00
David Zhao	49c5a9fc30	Merge branch 'master' into UserDimLogic	2019-02-20 17:30:34 +09:00
David Zhao	d703a9511a	Fix background dim previews	2019-02-20 17:20:45 +09:00
David Zhao	3f000dfe2e	Remove unnecessary region	2019-02-20 16:58:12 +09:00
David Zhao	1bd1b6b099	Move user dim logic into UserDimContainer instead	2019-02-20 16:53:57 +09:00
smoogipoo	dbfa95b9e7	Made medium the default font weight	2019-02-20 16:52:36 +09:00
Dean Herbert	b1337ed07f	Update framework	2019-02-20 16:09:29 +09:00
Dean Herbert	a4768a75e2	Merge remote-tracking branch 'upstream/master' into isactive-changes	2019-02-20 16:09:24 +09:00
smoogipoo	0693ab8e7d	Merge remote-tracking branch 'origin/master' into osu-fontusage ... # Conflicts: # osu.Game/Screens/Multi/Components/BeatmapTitle.cs	2019-02-20 15:04:08 +09:00
smoogipoo	a2aa3ec5cb	Adjust sprite texts in-line with framework changes	2019-02-20 15:03:20 +09:00
Dan Balasescu	f6d70e687b	Use correct local variable ... Co-Authored-By: peppy <pe@ppy.sh>	2019-02-20 12:27:25 +09:00
Dean Herbert	a6e055b1f8	Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock	2019-02-20 12:08:37 +09:00
Dean Herbert	b4bb87fee3	Make TrackVirtualTracking more accurate on seeks/stops	2019-02-20 12:08:30 +09:00
Dan Balasescu	96590156cd	Merge branch 'master' into add-button-tooltip	2019-02-20 11:37:55 +09:00
Dean Herbert	f2ad2931c7	Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock	2019-02-20 11:37:33 +09:00
smoogipoo	49eadcb575	Update active state immediately + fix potential nullref	2019-02-19 19:44:09 +09:00
smoogipoo	703df77000	Update in-line with framework IsActive changes	2019-02-19 19:16:03 +09:00
smoogipoo	b7b1f0ef0c	Merge branch 'remove-populateattributes' into new-diffcalc-mania	2019-02-19 17:55:56 +09:00
smoogipoo	4dcf39846d	Pass beatmap to CreateSkills()	2019-02-19 17:52:59 +09:00
smoogipoo	1efc5179aa	Merge branch 'remove-populateattributes' into new-diffcalc-mania	2019-02-19 17:46:52 +09:00
smoogipoo	ca8b7f24b4	Remove PopulateAttributes()	2019-02-19 17:36:33 +09:00
smoogipoo	8104c45c25	Merge remote-tracking branch 'origin/master' into new-diffcalc-mania ... # Conflicts: # osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyDifficultyCalculator.cs	2019-02-19 16:30:05 +09:00
Dean Herbert	151388dfad	Merge branch 'master' into diffcalc-merging-2	2019-02-19 15:42:15 +09:00
smoogipoo	7ed461aa8c	XMLDoc DifficultyHitObject	2019-02-19 14:30:59 +09:00
smoogipoo	93b7b51d0a	timeRate -> clockRate	2019-02-19 14:29:23 +09:00
smoogipoo	3784b673ae	History -> LimitedCapacityStack + re-xmldoc	2019-02-19 13:51:19 +09:00
smoogipoo	af0bb4d5e8	Remove mods from constructor	2019-02-19 13:40:39 +09:00
Dean Herbert	87dd7bcf6b	Fix one more test regression	2019-02-19 13:02:33 +09:00
Dean Herbert	0fce23a36b	Fix test regression	2019-02-19 12:38:45 +09:00
Dean Herbert	62fe5ad481	Nest class	2019-02-19 12:35:52 +09:00
Dean Herbert	f8033a3b35	Give TestWorkingBeatmap a reference clock	2019-02-19 12:27:30 +09:00
Dean Herbert	133c002d02	Fix test dlls being loaded as actual rulesets (and failing)	2019-02-19 12:13:55 +09:00
David Zhao	af049004dd	Add test cases for transitioning into pause overlay and into results	2019-02-18 19:53:55 +09:00
David Zhao	4e07aba548	Make it so visual tests only load the osu ruleset	2019-02-18 18:12:45 +09:00
David Zhao	1d80674fbd	Fix fadecontainer being added to multiple containers	2019-02-18 17:11:38 +09:00
David Zhao	af30aefe77	Merge branch 'master' into UserDimLogic	2019-02-18 16:56:16 +09:00
David Zhao	80800f2931	Match up fade behavior with current master	2019-02-18 16:34:11 +09:00
David Zhao	9be25c3758	Fix unit tests	2019-02-18 16:00:59 +09:00
David Zhao	f241d67e5f	Use conditional operator isntead of if	2019-02-18 15:23:03 +09:00
Dan Balasescu	c9c8cccd68	Merge branch 'master' into use-lifetime-optimization	2019-02-18 15:22:34 +09:00
smoogipoo	9cce9ce97c	Consider aggregate peaks	2019-02-18 15:00:32 +09:00
smoogipoo	a8faa942a6	Implement new difficulty calculator structure	2019-02-18 14:49:43 +09:00
David Zhao	df148f8787	Fix background dim not being disabled on playerloader exit	2019-02-18 12:55:42 +09:00
Dean Herbert	0a265c6d35	Update osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs ... Co-Authored-By: nyquillerium <nyquill@ppy.sh>	2019-02-18 11:54:25 +09:00
ThePyrotechnic	7bb56a198a	Merge branch 'master' into MissingSource	2019-02-17 19:54:43 +00:00
Dean Herbert	42dc7644f2	Merge branch 'master' into diffcalc-testcases	2019-02-17 21:06:42 +09:00
smoogipoo	134840f118	Fix nullref	2019-02-16 11:18:17 +09:00
Dean Herbert	4777fd1334	Merge remote-tracking branch 'upstream/master' into fix-screen-tests	2019-02-15 21:29:44 +09:00
Dean Herbert	c607b8c979	Update framework	2019-02-15 21:28:59 +09:00
Dean Herbert	bd4e8e132b	Merge pull request #4264 from nekodex/legacy-hitcircleoverlap-support ... Add support for the HitCircleOverlap property of legacy skins	2019-02-15 21:27:56 +09:00
Dean Herbert	90e462309f	Add newline	2019-02-15 21:16:54 +09:00
Dean Herbert	89981c02a2	Merge branch 'master' into fix-cursor-on-startup	2019-02-15 21:15:23 +09:00
Jamie Taylor	38cf5a1ea4	Add support for the HitCircleOverlap property in legacy skins	2019-02-15 21:03:06 +09:00
David Zhao	df7acc1d31	Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic	2019-02-15 17:22:04 +09:00
David Zhao	fcc3cf3b7e	Remove extra comma	2019-02-15 17:21:47 +09:00
David Zhao	8693d6a76b	Merge branch 'master' into UserDimLogic	2019-02-15 17:11:21 +09:00
Dean Herbert	5d502250d8	Fix account creation overlay not working ... Regressed with screen stack changes.	2019-02-15 17:01:51 +09:00
Dean Herbert	65721a01ab	Fix regressed screen test cases	2019-02-15 17:01:06 +09:00
David Zhao	53b7fdd834	Clean up test code and unused includes	2019-02-15 16:57:53 +09:00
Jamie Taylor	3ea13b1ade	Fix mouse cursor appearing prematurely during startup	2019-02-15 16:55:39 +09:00
David Zhao	0a60f6dacd	Documentation for tests and changes	2019-02-15 16:50:37 +09:00
David Zhao	6da9f94ae3	Fix regression with background dim	2019-02-15 16:17:01 +09:00
smoogipoo	280081d589	Fix beatmap ruleset not being set	2019-02-15 14:42:42 +09:00
Dean Herbert	490d48fa5e	Fix MultiplayerTestCase not being abstract	2019-02-15 13:48:14 +09:00
Dean Herbert	1550908edb	Add tooltip to key configuration button	2019-02-15 11:56:33 +09:00
Poyo	66de451b53	Update difficulty color bracket thresholds	2019-02-14 02:19:41 -08:00
David Zhao	3a74ad678a	clean up unused includes	2019-02-14 18:41:10 +09:00
David Zhao	a09e0790e1	Fix storyboards not dimming	2019-02-14 18:07:28 +09:00
David Zhao	e2a312a663	Move user dimming logic into its own container	2019-02-14 17:47:53 +09:00
Dean Herbert	777a606b2d	Don't revert beatmap on exiting leased state	2019-02-14 17:14:58 +09:00
Dean Herbert	813b36e98e	Merge pull request #4191 from peppy/leased-bindables-dont-work ... Add screen leased bindables via DependencyContainer	2019-02-14 17:05:39 +09:00
Dan Balasescu	9a0859464d	Merge branch 'master' into leased-bindables-dont-work	2019-02-14 16:24:10 +09:00
smoogipoo	f50a0be29d	Add osu! difficulty calculator test	2019-02-14 16:22:14 +09:00
Dean Herbert	3c16b03c60	Merge remote-tracking branch 'upstream/master' into download_button_should_observe_beatmaps_availability	2019-02-14 16:21:06 +09:00
Dean Herbert	a5f1f9830b	Fix potential schedule race case and regression in enum setting	2019-02-14 16:21:01 +09:00
Dean Herbert	503219b528	Merge branch 'master' into dont-log-passwords	2019-02-14 15:52:04 +09:00
Dean Herbert	cf66fc6924	Update framework	2019-02-14 13:29:07 +09:00
Dean Herbert	94ceb1e32b	Move screen change allowance to local usage	2019-02-14 13:28:21 +09:00
Roman Kapustin	a289cb7c6a	Handle beatmapset removal in DownloadTrackingComposite	2019-02-13 22:11:46 +03:00
Roman Kapustin	99046f16e8	Revert "Update direct download button state on beatmap import and removal" ... This reverts commit 11234d3c60.	2019-02-13 22:04:49 +03:00
Dean Herbert	5318de29b4	Fix import logic again	2019-02-13 19:57:54 +09:00
Dean Herbert	e604806398	Fix regression in screen change allowance logic	2019-02-13 19:43:01 +09:00
Dean Herbert	3ec94e4ab3	Remove disable setting	2019-02-13 15:14:34 +09:00
Dean Herbert	43843ac558	Remove explicit dispose	2019-02-13 14:58:40 +09:00
Dean Herbert	1373e0fad0	Fix BeatmapTitle not always displaying	2019-02-13 14:57:40 +09:00
Dean Herbert	166cdab2e8	Remove unnecessary null check	2019-02-13 14:14:57 +09:00
Dean Herbert	ab3adafafd	Fix crashes after entering player	2019-02-13 14:13:54 +09:00
Dan Balasescu	c3ae4d7b14	Improve comment ... Co-Authored-By: peppy <pe@ppy.sh>	2019-02-13 11:34:48 +09:00
Dean Herbert	19bef01dd0	Attempt to maybe fix tests	2019-02-13 11:05:02 +09:00
Michael Manis	5fbdbcf209	removed 'unknown source' line	2019-02-12 15:30:42 -05:00
Roman Kapustin	11234d3c60	Update direct download button state on beatmap import and removal	2019-02-12 21:20:49 +03:00
Dean Herbert	f08d5f058c	Merge branch 'master' into notify_track_completion_failure	2019-02-13 01:34:18 +09:00
Dean Herbert	b967b93b88	Fix regressions in tests	2019-02-12 19:53:08 +09:00
Dean Herbert	2ea839c475	Fix crashes on beatmap not being set correctly in player	2019-02-12 19:18:22 +09:00
Dean Herbert	a28689ff4c	Update framework	2019-02-12 17:58:36 +09:00
Dean Herbert	d5cce850a8	Revert some unnecessary complications in logo logic	2019-02-12 13:29:41 +09:00
Dean Herbert	272584eb79	Improve file layouts	2019-02-12 13:02:33 +09:00
Dean Herbert	78b47f9fe3	Fix starting matches not working	2019-02-12 11:19:42 +09:00
Dean Herbert	e57409fe41	Remove unnecessary bindable properties on mod lists	2019-02-12 10:51:39 +09:00
Dean Herbert	e4422167b6	Fix starting gameplay	2019-02-11 19:13:57 +09:00
Dean Herbert	88ffc78103	Restructure	2019-02-11 19:11:34 +09:00
Dean Herbert	e2e615cc5c	Merge branch 'master' into leased-bindables-dont-work	2019-02-11 16:30:12 +09:00
ThePyrotechnic	450fa0075f	Merge branch 'master' into MissingSource	2019-02-10 23:44:47 +00:00
Michael Manis	cfe14dcdb1	Options for handing unknown beatmap source	2019-02-10 18:31:39 -05:00
EVAST9919	0bd8fdb56d	Merge remote-tracking branch 'refs/remotes/ppy/master' into update-beatmap-scores-design	2019-02-10 04:46:11 +03:00
EVAST9919	4d489da032	small visual improvements	2019-02-10 04:16:56 +03:00
EVAST9919	04e57d7d3d	Refactor to make things more flexible	2019-02-09 06:23:58 +03:00
EVAST9919	105053e91b	TestCase fix	2019-02-09 00:56:41 +03:00
EVAST9919	107e0a5239	Warning fixes	2019-02-08 20:43:11 +03:00
EVAST9919	bd1f4f9549	Small design fixes	2019-02-08 20:35:07 +03:00
EVAST9919	13c154a0b3	Fix background colour and a bug with removing scores	2019-02-08 20:07:21 +03:00
EVAST9919	7a3ae0f479	update drawable score inline with the latest design	2019-02-08 19:50:02 +03:00
Roman Kapustin	d3721707fb	Update framework	2019-02-08 19:48:56 +03:00
UselessToucan	b5e04f6161	Merge branch 'master' into notify_track_completion_failure	2019-02-08 19:37:23 +03:00
EVAST9919	f43ee6b6a3	update drawable top score inline with the latest design	2019-02-08 19:06:46 +03:00
EVAST9919	4b7b174f75	Merge remote-tracking branch 'refs/remotes/ppy/master' into update-beatmap-scores-design	2019-02-08 18:35:18 +03:00
Dean Herbert	a30d3739cf	Merge remote-tracking branch 'upstream/master' into cmc-rooms	2019-02-08 18:45:39 +09:00
Dean Herbert	f52cac966b	Fix multiple blank lines	2019-02-08 18:45:32 +09:00
Dean Herbert	6c4d289901	Pass item rather than ID	2019-02-08 18:33:49 +09:00
Dan Balasescu	7ec0b4ba77	Fix nullref during room creation (#4228)	2019-02-08 17:53:01 +09:00
Dean Herbert	e8aed6b686	Update framework	2019-02-08 17:38:18 +09:00
Dan Balasescu	959b1ac845	Fix potential nullref when exiting multiplayer (#4227) ... Fixes https://github.com/ppy/osu/issues/3954	2019-02-08 17:28:00 +09:00
smoogipoo	7aca0f4a1d	Fix failing test cases	2019-02-08 16:08:23 +09:00
smoogipoo	febcd7d7c0	Remove currentRoom from RoomManager	2019-02-08 15:46:16 +09:00
smoogipoo	fdd37dbc4b	Merge remote-tracking branch 'origin/master' into cmc-rooms	2019-02-08 15:44:33 +09:00
smoogipoo	b5cc0ec8db	Update framework	2019-02-08 15:44:11 +09:00
smoogipoo	5643dc2e99	Remove redundant qualifiers	2019-02-08 15:44:05 +09:00
smoogipoo	6fe1f57236	Fix crash when start button is repeatedly pressed	2019-02-08 15:39:11 +09:00
smoogipoo	99a7ccc01a	Slight cleanup in multiplayer	2019-02-08 15:38:05 +09:00
smoogipoo	43240ea85e	Fix playlist issues with room creation	2019-02-08 15:23:03 +09:00
smoogipoo	42cd55e0d7	Move current room to multiplayer	2019-02-08 14:57:51 +09:00
smoogipoo	7f13e3c5f7	Directly resolve the filter bindable	2019-02-08 13:02:17 +09:00
smoogipoo	990bd44ca2	Combine roommanager and roompollingcomponent	2019-02-08 13:01:10 +09:00
smoogipoo	17fdfc15d9	Fix room title in the breadcrumbs	2019-02-07 20:09:49 +09:00
smoogipoo	1c2450a95a	Fix up room inspector status	2019-02-07 17:59:14 +09:00
smoogipoo	1e0135af6f	Move StatusColouredContainer into a more public location	2019-02-07 17:52:40 +09:00
smoogipoo	2d61548251	Fix room name being coloured	2019-02-07 16:45:36 +09:00
smoogipoo	4f86fe92ea	Fix match settings not showing	2019-02-06 18:50:43 +09:00
ProgrammaticNajel	9f8e724a76	Fix background being cut off at the top of the screen (#4207) ... Fix background being cut off at the top of the screen	2019-02-06 18:14:33 +09:00
smoogipoo	3207983a1c	Fix current room being set to null when parted	2019-02-06 15:12:40 +09:00
smoogipoo	a9aa22c97b	Remove ShadowModel requirement	2019-02-06 13:52:48 +09:00
EVAST9919	9cca11fb0d	Warning fixes	2019-02-06 01:48:43 +03:00
EVAST9919	c85dc1a236	update another scores design	2019-02-05 19:32:33 +03:00
EVAST9919	f560dde157	Add some flow for info containers	2019-02-05 15:26:45 +03:00
EVAST9919	559960036e	update top score design	2019-02-05 14:48:35 +03:00
smoogipoo	594dffba41	Fix a few cases of missed instant invocation	2019-02-05 19:11:20 +09:00
smoogipoo	aac371ba6e	Use CMC for all of multiplayer	2019-02-05 19:00:08 +09:00
Dean Herbert	2f8f4fac64	Fix combo colour fallbacks when skin is not providing any	2019-02-05 17:54:14 +09:00
smoogipoo	be51ee4ed5	Implement MultiplayerComposite, replaces RoomBindings	2019-02-05 16:14:37 +09:00
smoogipoo	d9537017c8	Use CMC in the Multiplayer screen	2019-02-05 16:03:05 +09:00
smoogipoo	37c1f5a824	Split polling logic from RoomManager, now a container	2019-02-05 15:38:19 +09:00
Dan Balasescu	84ab16c7c8	Merge branch 'master' into keybindings-settings-groups	2019-02-05 11:42:53 +09:00
Dean Herbert	216030fe64	Merge branch 'master' into fix-background-fade-2	2019-02-04 22:32:50 +09:00
smoogipoo	065b0c9076	Fix background not being faded correctly	2019-02-04 17:04:52 +09:00
Dan Balasescu	779477959f	Merge branch 'master' into fix_song_rearranging_in_music_controller_playlist	2019-02-04 15:39:29 +09:00
Dean Herbert	91d875db0d	Remove unused local	2019-02-04 12:56:55 +09:00
Dean Herbert	cd92dddd46	Add per-ruleset mappings	2019-02-04 12:31:05 +09:00
Dean Herbert	2d7c23dd9f	Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics	2019-02-04 12:15:53 +09:00
EVAST9919	d6d5bb5ecf	remove useless nullcheck	2019-02-03 17:20:35 +03:00
EVAST9919	eeecbfcbe0	Fix warnings	2019-02-03 17:09:04 +03:00
Roman Kapustin	71efbcf603	Merge remote-tracking branch 'ppy/master' into notify_track_completion_failure	2019-02-03 16:14:04 +03:00
EVAST9919	4b17ca0857	Fix wrong icons	2019-02-03 14:50:03 +03:00
Unknown	ead28e7102	stop logging keyboard events from password textbox	2019-02-03 12:34:38 +01:00
EVAST9919	3b529b7bda	Enable the sidebar and move "back" button to the key binding overlay	2019-02-03 14:34:04 +03:00
Dean Herbert	e01f342ab0	wip	2019-02-02 17:11:25 +09:00
Roman Kapustin	4c866e7940	Add PlaylistItemHandle.HandlePositionalInput override	2019-02-01 22:37:27 +03:00
Dean Herbert	ca5c8d37d1	Use leased bindables	2019-02-01 16:44:06 +09:00
Dean Herbert	499e06797a	Merge pull request #4114 from peppy/fix-replay-multiplier-text ... Fix replay playback speed not being displayed initially	2019-01-31 22:24:42 +09:00
Unknown	e6fa78109d	Merge branch 'master' into correct-preview-loop	2019-01-31 13:30:55 +01:00
Dan Balasescu	9968bdc0e4	Merge branch 'master' into download-tracking-component	2019-01-31 21:18:03 +09:00
Dean Herbert	3da851d93e	Merge branch 'master' into fix-replay-multiplier-text	2019-01-31 21:17:40 +09:00
Dean Herbert	7ce9a915b7	Merge branch 'master' into fix-osu-logo	2019-01-31 21:08:49 +09:00
Dan Balasescu	b85e119bae	Merge branch 'master' into reg-screen-focus-fix	2019-01-31 21:08:12 +09:00
Unknown	8c1f8ee596	restart correctly when leaving player (without noises)	2019-01-31 12:33:08 +01:00
Dean Herbert	cea82708ee	Merge branch 'master' into use-lifetime-optimization	2019-01-31 20:20:40 +09:00
Dean Herbert	d1c8ee65a5	Fix osu! logo potentially appearing during game load in a weird place	2019-01-31 19:22:29 +09:00
Dean Herbert	e191609067	Merge remote-tracking branch 'upstream/master' into download-tracking-component	2019-01-31 19:17:48 +09:00
Dean Herbert	c7cf3ef1cd	Update licence headers	2019-01-31 19:17:42 +09:00
Dean Herbert	7c6512118e	Fix importing progress bar not displaying	2019-01-31 19:15:17 +09:00
Dean Herbert	0b8bd520ab	Shake in all cases	2019-01-31 19:15:04 +09:00
Dean Herbert	b89694a969	Fix "importing" state display	2019-01-31 19:09:04 +09:00
Dean Herbert	041e3bf823	Handle unbinding better	2019-01-31 19:08:54 +09:00
Dean Herbert	b69a19f810	Attach progress immediately	2019-01-31 19:08:45 +09:00
Unknown	e2347ae7bf	Merge branch 'master' into correct-preview-loop	2019-01-31 10:53:09 +01:00
Dean Herbert	c54a515b3e	Change where BindValueChange is immediately run	2019-01-31 18:49:54 +09:00
Dean Herbert	7f2fdac50e	Update signatures	2019-01-31 18:47:30 +09:00
Dean Herbert	327a34f12a	Merge remote-tracking branch 'upstream/master' into download-tracking-component ... # Conflicts: # osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs	2019-01-31 18:45:09 +09:00
Dean Herbert	09056fd0d8	Merge branch 'master' into resources-via-nuget	2019-01-31 18:40:45 +09:00
Dean Herbert	ba6176fd03	Fix major regression in scaling behaviour	2019-01-31 18:28:46 +09:00
Dean Herbert	f85518b175	Don't expose padding	2019-01-31 18:16:28 +09:00
Dean Herbert	b48bb5b792	Move parallax logic out of BackgroundScreenStack	2019-01-31 18:10:33 +09:00
smoogipoo	bdaff27575	Fix nullref due to screens now being removed from parent	2019-01-31 15:02:07 +09:00
smoogipoo	b90207fa54	Give ScreenTestCase a background stack	2019-01-31 14:55:48 +09:00
smoogipoo	255b4a30e0	Allow logo to be null	2019-01-31 13:50:37 +09:00
smoogipoo	58d744e5dc	Remove manual overlay/toolbar logic from multiplayer	2019-01-31 13:38:21 +09:00
Dean Herbert	aac921c298	Update framework again	2019-01-31 13:33:21 +09:00
Dean Herbert	e8c39b9c37	Fix test screen loading	2019-01-31 11:00:44 +09:00
Dean Herbert	beab367e6d	Add null checks/allowances	2019-01-31 11:00:33 +09:00
Dean Herbert	d34aa50613	Merge branch 'master' into iscreen	2019-01-31 01:08:06 +09:00
smoogipoo	ac0bc53c4b	Revert "Merge pull request #4154 from phosphene47/carousel-wedge-level" ... This reverts commit cc8793a45e, reversing changes made to 94276c8abb.	2019-01-31 00:02:05 +09:00
smoogipoo	a8a34f8f20	Update framework	2019-01-30 23:56:14 +09:00
smoogipoo	5e78f51e24	Fix multiplayer crashing when exiting from lounge	2019-01-30 23:56:03 +09:00
Aergwyn	c2297b0c3b	Fix incorrect param doc ... Co-Authored-By: peppy <pe@ppy.sh>	2019-01-29 23:04:48 +09:00
smoogipoo	82dc7f39a3	Update licenses	2019-01-29 21:48:35 +09:00
smoogipoo	b5d187c4af	Fix post-merge errors	2019-01-29 21:27:32 +09:00
smoogipoo	91302ea0bc	Merge remote-tracking branch 'origin/master' into iscreen ... # Conflicts: # osu.Game/Screens/Multi/Match/MatchSubScreen.cs # osu.Game/Screens/Multi/Multiplayer.cs # osu.Game/Screens/Multi/MultiplayerSubScreen.cs # osu.Game/Screens/OsuScreen.cs # osu.Game/osu.Game.csproj # osu.sln	2019-01-29 21:21:36 +09:00
Dean Herbert	baea9691cc	Fix baetmap downloads using too much memory	2019-01-29 18:34:10 +09:00
Dean Herbert	23d0399e51	Allow deselection of textboxes on registration screen on mobile devices	2019-01-29 17:23:23 +09:00
ekrctb	8955d5de04	Update hit object result when lifetime is end	2019-01-29 15:25:27 +09:00
Dean Herbert	bbc24bbfdd	Merge remote-tracking branch 'upstream/master' into resources-via-nuget ... # Conflicts: # osu-resources # osu.sln	2019-01-29 12:19:35 +09:00
ekrctb	504e79b968	Merge branch 'master' into use-lifetime-optimization	2019-01-29 12:15:02 +09:00
Nitrous	ea4e79751e	Merge branch 'master' into mod-wind	2019-01-28 17:48:57 +08:00
Dean Herbert	628b3e1119	Move osu-resources to nuget	2019-01-28 18:33:39 +09:00
smoogipoo	7b1c1f3728	Move toolbar showing and overlay activation to OsuGame ... Now exposed through IOsuScreen.	2019-01-28 15:42:06 +09:00
Dean Herbert	354a99f5e1	Merge branch 'master' into samah-ios	2019-01-28 15:34:46 +09:00
Dean Herbert	8118b649d8	Merge branch 'master' into show-mods-on-loader	2019-01-28 14:11:54 +09:00
Dan Balasescu	47f35c423b	Merge branch 'master' into carousel-wedge-level	2019-01-28 13:49:12 +09:00
Dan Balasescu	610c2df2d4	Merge branch 'master' into dont-always-focus-textboxes	2019-01-28 13:40:08 +09:00
Dean Herbert	a208874e74	Fix incorrect handling of download failures	2019-01-28 11:59:25 +09:00
jorolf	648ed0e467	update license headers	2019-01-27 23:45:00 +01:00
jorolf	54d8e4043f	Merge branch 'master' of git://github.com/ppy/osu into profile-header-update	2019-01-27 23:32:48 +01:00
Jack Scotson	6a2100ddba	Merge branch 'master' into menu-globalaction-select	2019-01-27 19:13:34 +00:00
Scotsoo	c00636d328	Removing whitespace	2019-01-27 19:09:30 +00:00
Scotsoo	29c02fbaa7	Remove redundant space	2019-01-27 18:27:11 +00:00
Scotsoo	07bb278ec0	Considering GlobalActions in GameplatMenuOverlay	2019-01-27 18:19:20 +00:00
LeNitrous	03e57d0423	fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp	2019-01-26 20:15:19 +08:00
LeNitrous	a1ce7e9a95	add ModDisplay on PlayerLoader	2019-01-26 17:14:45 +08:00
Unknown	1fa87521f6	fix restarting with a different track in the same BeatmapSet	2019-01-26 07:29:30 +01:00
Unknown	3d5520d277	correctly loop from preview point in SongSelect	2019-01-26 07:09:01 +01:00
LeNitrous	d920ee67ee	forgot last whitespace	2019-01-26 13:47:33 +08:00
LeNitrous	73dbf5712d	add license headers	2019-01-26 13:43:27 +08:00
LeNitrous	39072376dd	revert WorkingBeatmap back to protected	2019-01-26 13:40:41 +08:00
LeNitrous	d76681aa82	use IApplicableToBeatmap instead of IApplicableToRulesetContainer	2019-01-26 13:39:23 +08:00
LeNitrous	c6e26a92ec	add wind up and wind down mods	2019-01-26 12:15:45 +08:00
Shane Woolcock	a14ad4f53f	Merge branch 'master' into samah-ios	2019-01-25 22:43:21 +10:30
smoogipoo	117703374e	Fix logo animations	2019-01-25 21:02:35 +09:00
smoogipoo	60cc2314ef	Fix ruleset + beatmap being changeable in match	2019-01-25 21:02:30 +09:00
phosphene47	5c70be07ab	Display carousel over beatmap info wedge	2019-01-25 22:58:55 +11:00
smoogipoo	b3403c78da	Fix a few potential crashes	2019-01-25 20:47:37 +09:00
smoogipoo	e2891ab1e9	Fix anchors + origins	2019-01-25 20:47:31 +09:00
smoogipoo	95e6785968	Make Multiplayer not an OsuScreen	2019-01-25 20:25:55 +09:00
Dean Herbert	28f529ca19	Rename to host	2019-01-25 20:24:32 +09:00
Dean Herbert	0b587baab8	Merge remote-tracking branch 'upstream/master' into fix-texture-loader-stores	2019-01-25 20:23:51 +09:00
Dean Herbert	4d032af26d	Merge pull request #3919 from peppy/fix-idle-weirdness ... Fix global idle state being entered when overlays are visible	2019-01-25 20:18:33 +09:00
Dean Herbert	a110569f56	Merge pull request #4151 from peppy/fix-sensitivity-tooltip ... Fix cursor sensitivity tooltip not updating instantly	2019-01-25 20:17:56 +09:00
Dean Herbert	4d982adf69	Merge branch 'master' into fix-idle-weirdness	2019-01-25 19:48:52 +09:00
Aergwyn	c8c375636f	Use lambda ... Co-Authored-By: peppy <pe@ppy.sh>	2019-01-25 19:34:25 +09:00
smoogipoo	e1e7759e0f	Re-implement MultiplayerSubScreen	2019-01-25 19:32:37 +09:00
smoogipoo	3fb17ead06	Fix breadcrumbs crash when last screen exits	2019-01-25 19:31:58 +09:00
Dean Herbert	49051a359f	Merge branch 'dont-always-focus-textboxes' into samah-ios	2019-01-25 19:22:26 +09:00
Unknown	77763fde8b	revert accidentally renamed variables	2019-01-25 11:22:05 +01:00
Dean Herbert	260034a80e	Don't auto-focus textboxes when on screen keyboard would cause inconvenience	2019-01-25 19:20:29 +09:00
Dean Herbert	82d944dc89	Fix textbox colours not always being set corrrectly	2019-01-25 19:20:29 +09:00
Unknown	4a916b2dee	replace license headers with new ones	2019-01-25 11:17:48 +01:00
Unknown	8ddff673b7	revert previous rename and rename ruleset specific classes instead	2019-01-25 11:14:37 +01:00
Dean Herbert	9e8347413b	Merge remote-tracking branch 'origin/fix-texture-loader-stores' into samah-ios ... # Conflicts: # osu.Game/Beatmaps/BeatmapManager.cs	2019-01-25 18:59:22 +09:00
Unknown	5446c99f22	Merge branch 'master' into move-osu-settings	2019-01-25 10:57:04 +01:00
Dean Herbert	159ac7359e	Merge branch 'update-framework' into samah-ios	2019-01-25 18:52:17 +09:00
Dean Herbert	144533706e	Update framework	2019-01-25 18:51:29 +09:00
Dean Herbert	e3fde56780	Merge remote-tracking branch 'origin/fix-idle-weirdness' into samah-ios	2019-01-25 18:49:41 +09:00
Dean Herbert	f4729d41f3	Merge branch 'master' into samah-ios	2019-01-25 18:49:08 +09:00
smoogipoo	da135346b2	Fix screen titles	2019-01-25 18:38:48 +09:00