11102 Commits

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