11866 Commits

Author	SHA1	Message	Date
Dean Herbert	bb69330e9f	Call ProcessFrame on the userOffsetClock after a seek ... Without doing this, GameplayClock can be left in an incorrect state after a seek (due to the userOffsetClock being its own FramedClock).	2019-04-24 15:28:14 +09:00
Dean Herbert	efaedafc08	Fix (legacy) AudioLeadIn being used incorrectly. ... This lead-in is intended to specify a value before zero, not a value before the start time. Also removes an unnecessary ProcessFrame call (it happens within Seek itself).	2019-04-24 15:28:14 +09:00
Dean Herbert	60328cf1fb	Ensure FrameStabilityContainer's ElapsedTime is zero on initial seek	2019-04-24 15:25:53 +09:00
Dean Herbert	80e1568e97	Fix FrameStabilityContainer performing frame-stable seeks	2019-04-24 15:25:52 +09:00
iiSaLMaN	a29c7d81ee	Merge branch 'master' into sh-xh-grading-2	2019-04-23 10:31:17 +03:00
Joehu	0838206ddd	Shorten multiplayer header to multi	2019-04-22 22:44:43 -07:00
David Zhao	9890884726	Remove fade in, update comment	2019-04-23 14:23:09 +09:00
smoogipoo	6c568d228f	Add comment	2019-04-23 13:45:51 +09:00
smoogipoo	6add395288	Fix gameplay cursor being hidden in tests/replays	2019-04-23 13:32:44 +09:00
Dean Herbert	52336e9062	Fix pause tests	2019-04-23 11:54:41 +09:00
Dan Balasescu	0bf17081f6	Merge branch 'master' into update-framework	2019-04-23 11:31:17 +09:00
Dean Herbert	c88a11a38f	Merge branch 'master' into fix-multiplayer-crash	2019-04-23 09:28:03 +09:00
iiSaLMaN	a6b60a2fc2	Merge branch 'master' into sh-xh-grading-2	2019-04-22 19:39:20 +03:00
smoogipoo	414d555484	Fix possible exit from non-current screen	2019-04-22 19:24:57 +09:00
Dean Herbert	1f18c08cfc	Update framework	2019-04-22 19:17:58 +09:00
Dean Herbert	5fe45c9bed	Merge branch 'master' into update-framework	2019-04-22 19:17:14 +09:00
Dean Herbert	ffd8268076	Fix hold for menu button's icon being incorrect (#4662) ... Fix hold for menu button's icon being incorrect Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>	2019-04-22 19:16:29 +09:00
Dean Herbert	5313ba2938	Merge branch 'master' into hp-rewind	2019-04-22 19:02:41 +09:00
Dan Balasescu	8fc0bf24c7	Merge branch 'master' into fix-hold-for-menu-icon	2019-04-22 18:57:43 +09:00
Dean Herbert	48e82d4b1c	Fix hold for menu button's icon being incorrect	2019-04-22 18:47:28 +09:00
Dean Herbert	6856571f17	Fix incorrect seek target	2019-04-22 18:45:58 +09:00
Dean Herbert	55c5ef898d	Remove delay on entering player	2019-04-22 18:29:58 +09:00
Dean Herbert	908eee9942	Fix pause tests	2019-04-22 18:29:51 +09:00
smoogipoo	aeae759fcd	Rename method + add xmldoc	2019-04-22 18:08:15 +09:00
smoogipoo	4edb17a88a	Make hp work + cleanup	2019-04-22 18:02:49 +09:00
Dean Herbert	b3c496d72c	Remove delay on entering player	2019-04-22 17:06:40 +09:00
Dean Herbert	034643b835	Fix pause tests	2019-04-22 17:06:22 +09:00
smoogipoo	fbb4e9df04	Implement hp at base ScoreProcessor	2019-04-22 16:51:38 +09:00
David Zhao	3fbbb7dcf9	Move intiial fade outside of absolute sequence	2019-04-22 16:39:28 +09:00
iiSaLMaN	cfb3c38c3a	Fix.	2019-04-22 10:14:19 +03:00
iiSaLMaN	9030935030	Fix AppVeyor Errors	2019-04-22 10:07:45 +03:00
iiSaLMaN	64429aa968	Fix AppVeyor Errors	2019-04-22 09:59:51 +03:00
iiSaLMaN	7a385e56ec	Fix AppVeyor Errors	2019-04-22 09:58:29 +03:00
iiSaLMaN	c784bc4418	Remove whitespaces	2019-04-22 06:15:37 +03:00
iiSaLMaN	de542ca202	Remove bindable and use property	2019-04-22 06:14:14 +03:00
iiSaLMaN	26f0b2a4fe	Remove bindable ... Bad usage	2019-04-22 06:12:41 +03:00
iiSaLMaN	699bdd0498	Merge branch 'master' into sh-xh-grading-2	2019-04-22 05:56:55 +03:00
Dean Herbert	4cf813dc33	Merge remote-tracking branch 'upstream/master' into update-framework	2019-04-22 11:26:29 +09:00
Dean Herbert	8ffb2f4224	Remove black box blocking some visual tests from being visible	2019-04-22 10:55:01 +09:00
Dean Herbert	732c38fa79	Update framework again	2019-04-22 10:45:56 +09:00
Dean Herbert	ae51a9e451	Fix drawable rank texture lookup	2019-04-22 09:57:33 +09:00
iiSaLMaN	cff319e0d8	Fix issue	2019-04-21 18:12:50 +03:00
iiSaLMaN	c5bf01cc5c	Fix issue	2019-04-21 18:05:52 +03:00
iiSaLMaN	b200142afb	Make AdjustRank Bindable and fix issue	2019-04-21 17:55:01 +03:00
iiSaLMaN	77614189c9	Make AdjustRank Bindable	2019-04-21 17:48:50 +03:00
iiSaLMaN	4e07975e7c	Ranks must be adjusted in Hidden Mod	2019-04-21 15:58:40 +03:00
iiSaLMaN	73da423639	Adjust rank	2019-04-21 15:58:19 +03:00
Dean Herbert	30d4dd9355	Change + rank strings to be cleaner for the end-user	2019-04-21 21:38:12 +09:00
Dean Herbert	6f2bc943eb	Fix rank display on break info display	2019-04-21 12:04:15 +08:00
David Zhao	6502e26d09	Add draw size invalidation to ZoomableScrollContainer	2019-04-19 16:21:15 +09:00
Dean Herbert	9d6912a692	Update framework	2019-04-18 21:23:40 +08:00
David Zhao	037e23247f	Remove unused using	2019-04-18 14:31:47 +09:00
David Zhao	dfa5beea89	Use the actual scale of Flashlight for FlashlightSize	2019-04-18 14:24:19 +09:00
Dean Herbert	d1799d197d	Update resources and mods usage	2019-04-18 09:27:30 +08:00
Dean Herbert	879f6152b0	Merge remote-tracking branch 'upstream/master' into flashlight-dim	2019-04-17 22:17:10 +08:00
Dean Herbert	2d7b3094ba	Merge branch 'master' into player-mod-reinstantiation	2019-04-17 16:42:57 +08:00
smoogipoo	12b6bc48bd	Use .With() wherever possible	2019-04-17 17:24:09 +09:00
smoogipoo	09568be270	Merge remote-tracking branch 'origin/master' into facade-container ... # Conflicts: # osu.Game/Screens/Play/PlayerLoader.cs	2019-04-17 17:17:33 +09:00
smoogipoo	897bfa60db	Fix tracking position during 150ms state change delay	2019-04-17 17:05:35 +09:00
smoogipoo	4106da2430	Rename facade + cleanup usage	2019-04-17 17:05:33 +09:00
smoogipoo	3a1587fa53	Throw exception when not relatively positioned	2019-04-17 17:04:11 +09:00
smoogipoo	9f92b3a8ba	Add xmldoc	2019-04-17 16:34:53 +09:00
smoogipoo	5a3d6a0258	Fix post-merge errors	2019-04-17 16:11:59 +09:00
smoogipoo	ad720cedeb	Merge remote-tracking branch 'origin/master' into player-mod-reinstantiation	2019-04-17 12:59:23 +09:00
Dean Herbert	b684cd49e6	Update framework	2019-04-16 22:51:57 +08:00
Dean Herbert	bb539af1a0	Merge branch 'master' into player-mod-reinstantiation	2019-04-16 22:35:21 +08:00
smoogipoo	ac2eabc9bf	Fix replay rewinding not respecting 60fps playback	2019-04-16 17:47:00 +09:00
LeNitrous	2d227d25cc	fix appveyor warnings	2019-04-14 07:55:15 +08:00
LeNitrous	91c327a90f	use ModDisplay	2019-04-14 07:22:31 +08:00
DrabWeb	c766631ad6	Check for breaks using GameplayClock time.	2019-04-13 11:39:22 -03:00
David Zhao	e25c7fdb9b	Use absolute sequence for flashlight breaks	2019-04-12 17:39:25 +09:00
David Zhao	69748abedc	Rename to TestCaseOsuFlashlight	2019-04-12 15:09:43 +09:00
David Zhao	dba4ccdf74	Add back flashlight testcase	2019-04-12 14:53:23 +09:00
David Zhao	846a4835ca	Invert flashlight dim	2019-04-12 11:23:40 +09:00
David Zhao	664a4ba540	Implement flashlight dimming on slider slide	2019-04-12 10:47:22 +09:00
LeNitrous	01cc78108c	add random button	2019-04-11 05:47:32 +08:00
LeNitrous	b4d0755818	please appveyor	2019-04-10 22:10:09 +08:00
LeNitrous	22f9339b01	let mods button have selected mod icons	2019-04-10 21:53:13 +08:00
smoogipoo	0222424aef	Make mods IReadOnlyList<Mod> gamewide ... Prevents potential multiple evaluations of enumerable.	2019-04-10 17:20:36 +09:00
smoogipoo	7845d542e3	Cache mods as array in DrawableRuleset	2019-04-10 17:20:36 +09:00
smoogipoo	85d3ff4846	Merge remote-tracking branch 'origin/master' into no-workingbeatmap-mods ... # Conflicts: # osu.Game/Screens/Play/GameplayClockContainer.cs	2019-04-10 12:06:51 +09:00
smoogipoo	4310f07a5c	Rename SelectedMods -> Mods	2019-04-10 12:03:57 +09:00
jorolf	c1db635933	Merge branch 'master' of git://github.com/ppy/osu into profile-header-update	2019-04-09 20:42:39 +02:00
smoogipoo	0603ed9ab7	Fix post-merge errors	2019-04-09 16:27:10 +09:00
Dan Balasescu	3073508a23	Merge branch 'master' into fix-offset-seek-handling	2019-04-09 15:40:48 +09:00
smoogipoo	4c571acd67	Reinstantiate mods for every player	2019-04-09 13:33:16 +09:00
smoogipoo	1c952e58cc	Fix testcase failures	2019-04-09 13:15:48 +09:00
smoogipoo	56496d28ba	Reset mods when exiting match	2019-04-09 12:59:32 +09:00
smoogipoo	cbb3fdaca8	Fix various crashes due to bindable being disabled	2019-04-09 12:59:32 +09:00
smoogipoo	ad124bfeec	Reimplement select mod track adjustments	2019-04-09 12:59:32 +09:00
smoogipoo	c584967eb1	Remove mods from workingbeatmap	2019-04-09 12:59:32 +09:00
smoogipoo	ca9f172a96	Use var	2019-04-09 12:58:10 +09:00
smoogipoo	93b6cc00df	Fix OsuScreenDependencies using the incorrect parent	2019-04-09 12:56:23 +09:00
smoogipoo	772bef91fa	Merge remote-tracking branch 'Joehuu/master' into drawnode-composability ... # Conflicts: # osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs	2019-04-08 23:01:12 +09:00
David Zhao	8a01995668	Remove need for tracking bool and backing logo	2019-04-08 16:14:41 +09:00
David Zhao	376bed3a30	Merge branch 'facade-container' of https://github.com/nyquillerium/osu into facade-container	2019-04-08 15:24:59 +09:00
David Zhao	a690302d00	Apply reviews	2019-04-08 15:24:09 +09:00
Dan Balasescu	d7655bc579	Use .Value instead of cast ... Co-Authored-By: nyquillerium <nyquill@ppy.sh>	2019-04-08 11:22:01 +09:00
DrabWeb	e76897d6a7	Fix ResumeContainers appearing when resuming during breaks.	2019-04-07 16:32:55 -03:00
Lucas A	e948b11756	Merge branch 'master' into invert-login-notification-depth	2019-04-07 14:03:01 +02:00
Ferdinand Bachmann	d431ca4efc	BeatmapLeaderboard: use OrderByDescending instead of negation ... (suggested by peppy)	2019-04-07 13:26:35 +02:00
Lucas A	3f2e6a9376	Allow loginOverlay to be null if there's no cached instance in DI (for testing cases)	2019-04-06 18:52:30 +02:00
Lucas A	394f14965b	Make appveyor happy with whitespaces	2019-04-06 18:23:56 +02:00
Lucas A	59410dbe3b	Open login overlay when notification asking for signing in to play multi is clicked	2019-04-06 18:05:13 +02:00
Lucas A	d5b7865ab8	Invert notification and loginOverlay depth order	2019-04-06 17:40:48 +02:00
theFerdi265	cb3532e7d4	BeatmapLeaderboard: fix local scores not being sorted	2019-04-06 00:53:02 +02:00
Dean Herbert	46ecaf3d6c	Merge branch 'master' into facade-container	2019-04-05 21:14:21 +09:00
Dean Herbert	dec16d9eb3	Merge branch 'master' into fix-blocked-volume-overlay	2019-04-05 21:01:58 +09:00
Dean Herbert	f93504c65a	Merge branch 'master' into button_fix	2019-04-05 20:47:08 +09:00
Dean Herbert	88445647c8	Merge branch 'master' into update-beatmap-scores-design	2019-04-05 18:27:30 +09:00
David Zhao	0208526837	Fix button system visual issue	2019-04-05 18:21:54 +09:00
Joehu	debda7ae7d	Fix volume overlay container reference	2019-04-05 00:05:42 -07:00
Joehu	53906e87ec	Split floatingOverlayContent	2019-04-05 00:00:21 -07:00
David Zhao	e06fe7950b	Cleanup	2019-04-05 15:06:37 +09:00
David Zhao	5fa93f4a05	Add test for checking exception	2019-04-05 15:05:11 +09:00
Dean Herbert	a34a511f22	Update framework	2019-04-05 14:55:25 +09:00
smoogipoo	15fbb6f176	Use common AddUserLink method	2019-04-05 14:15:36 +09:00
David Zhao	b1d74e57e5	Add checks guarding against setting tracking on multiple trackingcongtainers and setting facade size	2019-04-05 13:56:08 +09:00
David Zhao	7047f305a1	Apply reviews, add safety for multiple facades	2019-04-05 12:02:47 +09:00
smoogipoo	a6bf076dc7	Adjust green colour	2019-04-04 17:58:34 +09:00
smoogipoo	e13fffaca3	Make ScoreTable use TableContainer	2019-04-04 17:53:23 +09:00
Dean Herbert	1709e22763	Merge branch 'master' into fix-blocked-volume-overlay	2019-04-04 17:28:46 +09:00
David Zhao	6f5e9fe50d	Correct xmldoc	2019-04-04 13:33:13 +09:00
David Zhao	b2857384b8	Remove unnecessary logo assignment	2019-04-04 12:08:05 +09:00
David Zhao	e89143d76b	Add xmldoc for LogoTrackingPosition	2019-04-04 12:07:11 +09:00
David Zhao	15b2b6af7d	Clean up remaining assignments of logo relativePositionAxes	2019-04-04 11:28:36 +09:00
David Zhao	6b5458a625	Clean up test cases	2019-04-04 11:22:05 +09:00
jorolf	ba87136451	add gradient and fix remaining error	2019-04-04 00:57:15 +02:00
jorolf	ccc804a9b2	get everything working again	2019-04-04 00:24:42 +02:00
jorolf	5bc6042309	Merge branch 'master' of git://github.com/ppy/osu into profile-header-update	2019-04-03 22:59:27 +02:00
Dean Herbert	0919980cdd	Merge branch 'master' into bugfix/4584	2019-04-04 01:08:39 +09:00
Samuel Van Allen	bb516da5b6	Removed redundant empty argument list	2019-04-03 22:57:05 +08:00
Samuel Van Allen	3660924441	Trimmed whitespace	2019-04-03 22:40:20 +08:00
Samuel Van Allen	4d60f6fb6a	Use collection initializer and added missing blank line	2019-04-03 22:37:50 +08:00
Samuel Van Allen	55a6e43778	Check against databasedSet instead of function param	2019-04-03 21:49:33 +08:00
Samuel Van Allen	73c7c6c316	Hides "Details" button when OnlineBeatmapID is null	2019-04-03 21:44:36 +08:00
David Zhao	8a40b27e8f	Remove need for logo relativePositionAxes none	2019-04-03 20:32:53 +09:00
David Zhao	2ed945605e	Fix Axes.None requirement for FacadeContainer	2019-04-03 19:57:22 +09:00
Dean Herbert	84da708d44	Fix nullref	2019-04-03 18:46:08 +09:00
Dean Herbert	cb417ebd77	Player -> User	2019-04-03 18:44:19 +09:00
Dean Herbert	a15a9bd03a	Rewrite updateDisplay logic to not fail on some cases	2019-04-03 18:29:46 +09:00
Dean Herbert	5c3c08566f	DrawableTopScore can be composite	2019-04-03 18:20:03 +09:00
smoogipoo	3b7d26cca8	Remove custom styled text	2019-04-03 17:49:01 +09:00
Dean Herbert	efd7bea771	Add further xmldoc	2019-04-03 17:01:11 +09:00
Dean Herbert	50f8ab3dfb	Fix gameplay offset handling on seeks	2019-04-03 16:58:20 +09:00
smoogipoo	3da008d293	Add a bit of padding between the sections	2019-04-03 16:43:56 +09:00
smoogipoo	f8596e055a	Separate into multiple files	2019-04-03 16:38:54 +09:00
smoogipoo	42c915190a	Reorder DrawableTopScore	2019-04-03 16:12:24 +09:00
smoogipoo	e246fad301	Clear table if no scores are provided	2019-04-03 16:09:34 +09:00
smoogipoo	2c18b6df1c	Fix score table using 300/100/50	2019-04-03 16:09:19 +09:00
smoogipoo	d6b15f040a	Improve statistics display	2019-04-03 15:57:36 +09:00
smoogipoo	0cf27e244d	Fix usages of SpriteText and obsolete members	2019-04-03 15:44:14 +09:00
smoogipoo	dff58ab4ed	Initial cleanup pass of DrawableTopScore	2019-04-03 15:41:33 +09:00
smoogipoo	7f425059ae	Adjust transforms	2019-04-03 15:41:22 +09:00
smoogipoo	ab4be3b75f	General refactoring	2019-04-03 15:20:38 +09:00
smoogipoo	0d127c21f1	Merge remote-tracking branch 'Aergwyn/master' into update-beatmap-scores-design	2019-04-03 14:52:13 +09:00
Samuel Van Allen	e9269dc83b	Prevent unnecessary query in OsuGame::PresentBeatmap ... This resolves issue #4575	2019-04-02 23:57:31 +08:00
Dean Herbert	072954e4c0	Update framework	2019-04-02 21:00:05 +09:00
Dean Herbert	bcd51afea1	Fix osu! icon font name mismatch	2019-04-02 19:55:46 +09:00
Dean Herbert	bc1077ed73	Remove remaining FontAwesome reference	2019-04-02 19:55:34 +09:00
Dean Herbert	f1952c0816	Update font awesome usage	2019-04-02 19:55:24 +09:00
smoogipoo	a56e29347f	Adjust namespaces	2019-04-02 14:51:28 +09:00
smoogipoo	d8af5e1c5a	Update in-line with drawnode changes	2019-04-02 11:56:22 +09:00
David Zhao	020be50f03	Merge remote-tracking branch 'upstream/master' into facade-container	2019-04-02 11:28:44 +09:00
Dean Herbert	184403c7e1	Merge branch 'master' into resume-cursor-2	2019-04-01 14:24:00 +09:00
Dean Herbert	14b606f761	Merge branch 'master' into colourable-menu-elements	2019-04-01 14:16:36 +09:00
Dean Herbert	b09973aaea	Merge branch 'master' into colourable-menu-elements	2019-04-01 13:30:20 +09:00
Dean Herbert	2060bad3bc	Try applying minimal inspection fixes for latest Rider EAP	2019-04-01 13:28:14 +09:00
Dean Herbert	2b3c70b2d2	Refactor with constants and better method names	2019-04-01 13:13:56 +09:00
Dean Herbert	c39c37a18d	Apply more missed cases	2019-04-01 12:44:46 +09:00
Dean Herbert	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
Dean Herbert	7d6a08d6da	Fix a few new inspections in latest Rider EAP	2019-04-01 11:39:02 +09:00
Dean Herbert	e33974a57b	Merge branch 'master' into fix-replay-parse-culture	2019-04-01 11:32:50 +09:00
smoogipoo	fb0bba9b37	Use Parsing helpers	2019-04-01 11:23:07 +09:00
Dean Herbert	79b5c2482b	Merge pull request #4562 from peppy/fix-editor-blueprints ... Fix editor blueprints being misplaced	2019-04-01 11:17:17 +09:00
Dan Balasescu	6d1f24e5e6	Merge branch 'master' into fix-frame-handler-nullrefs	2019-04-01 10:59:10 +09:00
Dean Herbert	6896ec7731	Remove unnecessary method	2019-04-01 10:39:55 +09:00
Dean Herbert	d1a175675d	Use variable	2019-04-01 10:37:02 +09:00
smoogipoo	f453675838	Fix replays being parsed with incorrect cultures	2019-04-01 10:31:20 +09:00
LeNitrous	8088e27fa8	Mimic stable minimum cursor size	2019-03-31 21:10:35 +08:00
LeNitrous	698e38c4e0	make menu flashes and visualisation colourable by skin	2019-03-31 20:10:44 +08:00
Joehu	92673c6d1e	Add ability to sort by favourites on osu!direct	2019-03-30 19:24:16 -07:00
Dean Herbert	5d91c3bcfc	Fix replay handler nullref crashes	2019-03-31 01:33:56 +09:00
Dean Herbert	42eaabe24c	Fix editor blueprints being misplaced ... Regressed with PlayfieldAdjustmentContainer changes.	2019-03-31 01:29:37 +09:00
Dean Herbert	22519ddacc	Update framework	2019-03-30 12:45:09 +09:00
smoogipoo	772545dd22	Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design	2019-03-29 18:21:20 +09:00
David Zhao	952a12bb19	Return logo relativepositionaxes on content out	2019-03-29 16:54:34 +09:00
Joehu	1ba608f01f	Remove line spacing on similar code	2019-03-29 00:26:17 -07:00
Joehu	eefc55f89b	Fix volume overlay being blocked by other floating overlays ... - excluding settings	2019-03-29 00:20:16 -07:00
Dean Herbert	81585a8283	Merge branch 'master' into resume-cursor-2	2019-03-29 15:56:46 +09:00
smoogipoo	2967c876ea	Merge remote-tracking branch 'origin/master' into update-beatmap-scores-design ... # Conflicts: # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Overlays/BeatmapSet/Scores/DrawableScore.cs # osu.Game/Overlays/BeatmapSet/Scores/DrawableTopScore.cs # osu.Game/Overlays/BeatmapSet/Scores/ScoresContainer.cs	2019-03-29 15:11:00 +09:00
Dean Herbert	1217cfa334	Merge branch 'master' into fix-login-overlay-behavior	2019-03-29 15:03:07 +09:00
Dean Herbert	6c34842c4e	Merge branch 'master' into fix-loaderanimation-testcase	2019-03-29 15:02:45 +09:00
Dean Herbert	4225d41a84	Merge pull request #4443 from jorolf/screen-title-class ... Add ScreenTitle class Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-03-29 15:02:38 +09:00
Dean Herbert	6949c233bf	Merge remote-tracking branch 'upstream/master' into resume-cursor-2	2019-03-29 15:02:12 +09:00
Dean Herbert	c772a38c1b	Merge branch 'master' into fix-loaderanimation-testcase	2019-03-29 14:55:00 +09:00
Dean Herbert	ccc0853f75	Change login overlay's depth and load order	2019-03-29 14:53:40 +09:00
Dean Herbert	90a4cb8e04	Fix unnecessary positioning	2019-03-29 14:49:15 +09:00
Dean Herbert	5495a0a70f	Add content to ScreenTestCase as protection against overwriting	2019-03-29 14:34:58 +09:00
Joseph Madamba	9a32e12435	Merge branch 'master' into fix-login-overlay-behavior	2019-03-28 22:28:56 -07:00
Dean Herbert	a1fa497ec0	Merge pull request #4546 from Joehuu/fix-music-controller-offset ... Fix offset of music controller when toolbar is hidden Co-authored-by: Dean Herbert <pe@ppy.sh> Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>	2019-03-29 14:26:28 +09:00
Dean Herbert	bda8ce2dbb	Merge pull request #4537 from peppy/stable-storyboard-ordering ... Add stable storyboard element ordering Co-authored-by: Dan Balasescu <1329837+smoogipoo@users.noreply.github.com>	2019-03-29 14:15:26 +09:00
Dean Herbert	3e8952b087	Merge pull request #4521 from peppy/hitobject-drawable-representation ... Fix DrawableRuleset drawable creation method's name	2019-03-29 14:08:23 +09:00
Dean Herbert	3e28c4ae0a	Fix remaining IconUsage changes	2019-03-29 14:03:00 +09:00
Dan Balasescu	9c57b9eed2	Merge branch 'master' into fix-music-controller-offset	2019-03-29 14:02:49 +09:00
Dan Balasescu	e45c08ad23	Adjust comment	2019-03-29 14:02:19 +09:00
Dean Herbert	de47e0a8e8	Merge remote-tracking branch 'upstream/master' into screen-title-class	2019-03-29 14:01:08 +09:00
Dean Herbert	95bf0b9ed6	Merge remote-tracking branch 'upstream/master' into fix-music-controller-offset	2019-03-29 13:57:02 +09:00
Dean Herbert	c4096fb628	Remove unused using	2019-03-29 13:56:56 +09:00
Dean Herbert	202a0086cc	Merge branch 'master' into better-player-flags	2019-03-29 13:45:45 +09:00
Dean Herbert	c72705217a	Merge branch 'master' into framed-replay-handler-fixes	2019-03-29 12:59:51 +09:00
Dean Herbert	14cef94a53	Merge remote-tracking branch 'upstream/master' into hitobject-drawable-representation	2019-03-29 12:59:26 +09:00
Dean Herbert	0439216f7e	Merge branch 'master' into stable-storyboard-ordering	2019-03-29 12:44:09 +09:00
Dean Herbert	a71e9fdb0e	Merge branch 'master' into convert-ranking-statistics	2019-03-29 12:42:49 +09:00
Dean Herbert	e7b38cdc75	Remove unnecessary set	2019-03-29 12:38:47 +09:00
Dean Herbert	5b0aa7bf8d	Split out current/next frame conditionals for readability	2019-03-29 12:38:40 +09:00
Dean Herbert	19825cf237	Merge branch 'master' into ctb-pp	2019-03-29 12:34:17 +09:00
Dean Herbert	e5b49b1657	Merge branch 'master' into ctb-pp	2019-03-29 12:24:47 +09:00
Dean Herbert	d6f8dbfd5c	Merge branch 'master' into wedge-fix	2019-03-29 12:23:42 +09:00
Dean Herbert	fed58fba3a	Merge remote-tracking branch 'upstream/master' into resume-cursor-2	2019-03-29 12:14:28 +09:00
Dean Herbert	26a73b4a65	Merge branch 'master' into correct-preview-loop	2019-03-29 12:00:58 +09:00
Dean Herbert	ed0bf59e73	Merge branch 'master' into universal-playfield-adjust	2019-03-29 11:51:44 +09:00
Dan Balasescu	bab7d78130	Remove redundant cast ... Co-Authored-By: peppy <pe@ppy.sh>	2019-03-29 11:36:40 +09:00
Dean Herbert	785433bb74	Merge branch 'master' into universal-playfield-adjust	2019-03-29 11:25:54 +09:00
Dan Balasescu	d410054ec8	Merge branch 'master' into key-counter-display	2019-03-29 11:22:59 +09:00
Dean Herbert	7715606188	Merge branch 'master' into sprite-icon-compatibility	2019-03-29 11:15:34 +09:00
Dan Balasescu	772f0cac8a	Merge branch 'master' into gameplay-cursor-last-state	2019-03-29 11:01:13 +09:00
Dan Balasescu	7ab24e35f9	Merge branch 'master' into gameplay-paused-no-update	2019-03-29 10:53:32 +09:00
Dean Herbert	759c5b3db9	Restore previous resume behaviour for the time being	2019-03-29 10:52:26 +09:00
Dean Herbert	3b1f83da1d	Merge remote-tracking branch 'upstream/master' into correct-preview-loop	2019-03-29 10:31:15 +09:00
Dan Balasescu	4c038e7f67	Merge branch 'master' into testability-improvements	2019-03-29 10:23:12 +09:00
Dan Balasescu	900c00ba59	Merge branch 'master' into drawable-clear-safety	2019-03-29 10:14:41 +09:00
Dean Herbert	8642886ffa	Merge branch 'sprite-icon-compatibility' into universal-playfield-adjust	2019-03-29 00:39:51 +09:00
Dean Herbert	2f5668f4e7	Fix remaining framework changes	2019-03-29 00:29:14 +09:00
Dean Herbert	176b4ecc38	Merge branch 'master' into sprite-icon-compatibility	2019-03-28 23:47:44 +09:00
Dean Herbert	bca8714905	Update framework	2019-03-28 23:25:31 +09:00
Dean Herbert	70f99400ad	Fix many behavioural issues and add tests	2019-03-28 19:28:13 +09:00
David Zhao	f066bd1138	Adjust facade scale now that the size is different	2019-03-28 16:35:15 +09:00
David Zhao	9d66a5e4b2	Ensure logo stops tracking before suspend animation	2019-03-28 16:29:35 +09:00
David Zhao	039e451ab1	ensure logo is where it already needs to be on resume	2019-03-28 16:14:28 +09:00
David Zhao	bfe44eb33d	Remove SizeForFlow magic number	2019-03-28 15:40:58 +09:00
Joehu	9a3528ea9d	Fix field modifier	2019-03-27 22:31:40 -07:00
Joehu	2254c572c4	Remove unnecessary newline	2019-03-27 22:21:28 -07:00
Joehu	53f3dacdfb	Fix login overlay behavior	2019-03-27 22:01:06 -07:00
smoogipoo	0066459968	Don't convert 100s/50s for catch	2019-03-28 12:55:56 +09:00
Dean Herbert	467ee12edf	Merge branch 'framed-replay-handler-fixes' into better-player-flags	2019-03-28 12:45:25 +09:00
Dean Herbert	e9eb33a1b1	Merge branch 'fix-slider-ball-positional' into better-player-flags	2019-03-28 12:45:22 +09:00
Dean Herbert	148e26a6d4	Fix FramedReplayInputHandler starting at frame 0 when it shouldn't	2019-03-28 12:42:57 +09:00
Joehu	bdb39a79a9	Fix offset of music controller when toolbar is hidden	2019-03-27 20:27:26 -07:00
David Zhao	9b047d9b90	Add back menu logo transform	2019-03-28 12:00:50 +09:00
Dean Herbert	253b18b92f	Merge remote-tracking branch 'upstream/master' into better-player-flags	2019-03-28 11:18:54 +09:00
Dean Herbert	23b5271ce4	Merge branch 'master' into clean-overlays-code-1	2019-03-28 11:17:29 +09:00
Dean Herbert	d756a5d987	Merge pull request #4532 from peppy/update-framework ... Update framework	2019-03-28 10:50:20 +09:00
Joseph Madamba	cdf79ffe39	Merge branch 'master' into clean-overlays-code-1	2019-03-27 10:32:13 -07:00
Dean Herbert	dfb7d78903	Fix remaining game host regressions	2019-03-28 01:29:06 +09:00
Dean Herbert	61b8fb0366	Allow ScreenTestCase to support content	2019-03-27 22:28:32 +09:00
Dean Herbert	5c4f2cefea	Fix Loader and TestCaseLoaderAnimation	2019-03-27 22:28:25 +09:00
Dean Herbert	1a0d1b238e	Fix storage regression	2019-03-27 20:58:07 +09:00
David Zhao	061527a260	Add new automated tests for logofacade, reset interpolation	2019-03-27 20:04:01 +09:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
Unknown	fea6adbf54	fix wedge bleeding into other elements (and being misaligned)	2019-03-27 10:12:09 +01:00
David Zhao	2e3791be1c	Fix incorrect usage of LogoFacade	2019-03-27 18:11:12 +09:00
David Zhao	ca7a20585d	Apply reviews, delete playerloader test	2019-03-27 17:28:53 +09:00
smoogipoo	012dcc25c9	Rename APIScoreInfo -> APILegacyScoreInfo	2019-03-27 17:08:40 +09:00
smoogipoo	d2af2cf21d	Set legacy api score statistics directly	2019-03-27 17:08:01 +09:00
smoogipoo	eceecde0f8	Make APIScoreInfo derive LegacyScoreInfo	2019-03-27 17:07:45 +09:00
smoogipoo	977122d05f	Fix ScoreInfo not getting set	2019-03-27 16:59:29 +09:00
smoogipoo	8fcb75809d	Add LegacyScoreInfo for statistics preservation/conversion	2019-03-27 16:55:46 +09:00
smoogipoo	a5d5f469eb	Populate more hit results for catch	2019-03-27 14:52:56 +09:00
smoogipoo	7239ebf5de	Add margin for mods	2019-03-27 13:57:26 +09:00
David Zhao	43c6a8d2e5	use a property instead	2019-03-27 11:44:50 +09:00
David Zhao	efeed71517	Add comment	2019-03-27 11:37:16 +09:00
David Zhao	384eee3395	Remove DI requirement for the Facade in PlayerLoader	2019-03-27 11:32:26 +09:00
Dean Herbert	3fcbc2eab3	Fix key counter getting overridden	2019-03-27 10:31:21 +09:00
smoogipoo	adab31fd58	Cleanup + fix up score table layout	2019-03-26 17:38:56 +09:00
David Zhao	3fe52be77f	Better tests, add documentation	2019-03-26 17:22:36 +09:00
Dean Herbert	15821c7511	Fix cursor adding	2019-03-26 17:04:14 +09:00
Dean Herbert	a88f23e555	Convert remaining two flags to ctor parameters	2019-03-26 16:53:44 +09:00
Dean Herbert	92184adef5	Add stable sorting of storyboard elements	2019-03-26 16:37:52 +09:00
Dean Herbert	83076e32c7	Fix TestWorkingBeatmap not running for times below zero	2019-03-26 16:35:34 +09:00
Dean Herbert	83863d35c3	Remove AllowLeadIn flag	2019-03-26 16:35:00 +09:00
Dean Herbert	dde7788c44	Merge branch 'universal-playfield-adjust' into resume-cursor-2	2019-03-26 13:58:48 +09:00
Dean Herbert	fb302e7ad8	Remove using	2019-03-26 13:58:07 +09:00
Dean Herbert	8658de5108	Rename KeyCounterCollection -> KeyCounterDisplay ... Also fix not working	2019-03-26 13:52:48 +09:00
Dean Herbert	27cb4ce0d1	Remove poop	2019-03-26 13:48:35 +09:00
Dean Herbert	fbc97edc55	Add base cursor class to retrieve true visibility state	2019-03-26 13:41:30 +09:00
Dean Herbert	b4d785c76c	Don't update gameplay loop while paused	2019-03-26 13:36:17 +09:00
Dean Herbert	ed3746e166	Make PlayfieldAdjustmentContainer universal	2019-03-26 13:32:44 +09:00
Dean Herbert	e512d88899	Apply required refactor	2019-03-26 13:29:26 +09:00
Dean Herbert	5d166a011d	Update framework	2019-03-26 13:28:59 +09:00
Dean Herbert	868367511e	Add ManualInputManager to screen tests ... Also sanitises content init order (ctor for content; bdl for other)	2019-03-26 13:26:55 +09:00
Dean Herbert	256a579de0	Allow player to not pause on focus loss	2019-03-26 13:17:00 +09:00
Dean Herbert	c403dede20	Add ManualInputManager to screen tests ... Also sanitises content init order (ctor for content; bdl for other)	2019-03-26 13:16:46 +09:00
Dean Herbert	4c0121a112	Merge remote-tracking branch 'upstream/master' into resume-cursor-2	2019-03-26 11:31:23 +09:00
Dean Herbert	b75ea295db	Rename KeyCounterCollection -> KeyCounterDisplay ... Also fix not working	2019-03-26 11:28:43 +09:00
David Zhao	be9ac39f54	Cleanup	2019-03-26 11:11:27 +09:00
David Zhao	35bf262d19	Merge remote-tracking branch 'upstream/master' into facade-container	2019-03-26 11:11:13 +09:00
David Zhao	a0f6718145	Better tests and implementation	2019-03-26 10:48:29 +09:00
smoogipoo	f4aeb390ef	Initial re-layout of score table	2019-03-26 10:21:34 +09:00
Dean Herbert	82140c38fc	Apply CI fixes	2019-03-25 22:00:33 +09:00
Dean Herbert	a642f10131	Remove redundant cast	2019-03-25 21:52:01 +09:00
Dean Herbert	15aea7f745	Update framework	2019-03-25 21:50:28 +09:00
Dean Herbert	245f463e3f	Don't update gameplay loop while paused	2019-03-25 20:31:55 +09:00
Dean Herbert	a23dfb58ad	Add base cursor class to retrieve true visibility state	2019-03-25 20:31:55 +09:00
Dean Herbert	06d4856e17	Remove unnecessary CursorTargetContainer	2019-03-25 20:31:55 +09:00
Dean Herbert	c79d187a89	Add final osu! resume screen implementation	2019-03-25 20:31:55 +09:00
Dean Herbert	38e481686f	Make PlayfieldAdjustmentContainer universal	2019-03-25 20:31:55 +09:00
Dean Herbert	57b3b7b54b	Add back resume overlay	2019-03-25 20:31:55 +09:00
Dean Herbert	a694626cc6	Add proper resume request logic	2019-03-25 20:31:55 +09:00
Dean Herbert	8ad4009c33	osu! resume overlay	2019-03-25 20:31:55 +09:00
smoogipoo	6a9f005ed4	Merge remote-tracking branch 'Joehuu/master' into update-beatmap-scores-design ... # Conflicts: # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs	2019-03-25 15:21:29 +09:00
Dean Herbert	fa7a0a0742	Merge branch 'master' into drawable-clear-safety	2019-03-25 13:58:57 +09:00
Dean Herbert	5b83e97e9d	Fix typo	2019-03-25 13:38:50 +09:00
Dean Herbert	c97116c91a	Add safety against DrawableHitObject implementations clearing children	2019-03-25 13:34:22 +09:00
Dean Herbert	fcc91efc1a	Merge branch 'master' into skinnable-scaling-container-background	2019-03-25 13:33:39 +09:00
Dean Herbert	cd1b171df7	Refactor async load logic (not required due to stack presence)	2019-03-25 13:28:51 +09:00
Dean Herbert	e705eb586d	Revert unintentional change	2019-03-25 12:51:54 +09:00
Dean Herbert	9a6576c0a1	Merge remote-tracking branch 'upstream/master' into multi-background-stack	2019-03-25 12:40:31 +09:00
Dean Herbert	371166955e	Apply a few minor refactors	2019-03-25 12:39:40 +09:00
LeNitrous	fee260fa03	remove empty argument list	2019-03-25 06:05:57 +08:00
LeNitrous	01ce8f161e	make scaling container background use BackgroundScreenStack with BackgroundScreenDefault	2019-03-25 05:49:57 +08:00
Dean Herbert	9bf48863b0	Fix DrawableRuleset drawable creation method's name	2019-03-25 00:00:29 +09:00
David Zhao	5169f7a43c	Change default for null screen parallax, apply reviews	2019-03-24 16:21:43 +09:00
David Zhao	d37968d88d	Add better test for facade containers	2019-03-24 15:18:38 +09:00
Dean Herbert	11b474e194	Handle released for safety	2019-03-24 12:19:09 +09:00
Dean Herbert	0d72104235	Refactor for formatting sanity	2019-03-24 12:03:06 +09:00
Dean Herbert	8ad19fc2d4	Merge branch 'master' into menu-globalaction-select	2019-03-24 11:58:52 +09:00
Dean Herbert	9a11a08acc	Update textbox usages	2019-03-23 02:00:27 +09:00
Dean Herbert	97675f6495	Update framework	2019-03-23 00:55:31 +09:00
David Zhao	6e98a8dd7c	Initial implementation	2019-03-22 20:01:58 +09:00
David Zhao	e93311fdc9	DI facade	2019-03-22 19:01:32 +09:00
Dean Herbert	db89796752	Merge remote-tracking branch 'upstream/master' into multi-background-stack	2019-03-22 16:05:39 +09:00
Dan Balasescu	b4954c5a7f	Merge branch 'master' into pause-logic-simplification	2019-03-22 15:11:34 +09:00
Dan Balasescu	e09c107f38	Merge branch 'master' into better-dummy-api	2019-03-22 14:51:11 +09:00
Dean Herbert	9e6cdd7bd5	Combine conditionals and clarify comment	2019-03-22 14:42:51 +09:00
Dean Herbert	5b8fd6822e	Move storyboard logic region down	2019-03-22 14:39:20 +09:00
Dan Balasescu	a9975e845c	Merge branch 'master' into upgrade-nuget-packages	2019-03-22 14:37:58 +09:00
Dean Herbert	59d0996c8d	Cleanup other instance of same function	2019-03-22 14:31:54 +09:00
smoogipoo	860999ad29	Cleanup	2019-03-22 14:20:53 +09:00
Dan Balasescu	5de99f3f5b	Merge branch 'master' into fix-random-select-crash	2019-03-22 14:11:06 +09:00
David Zhao	dcae86e39a	Add a new test for OsuScreenStack, fix parallax	2019-03-22 14:10:38 +09:00
Dean Herbert	dc004910d7	Fix AccountCreationOverlay tests and better complete dummy api's behaviour	2019-03-22 11:55:35 +09:00
jorolf	7873022a8b	Merge branch 'master' of git://github.com/ppy/osu into screen-title-class	2019-03-21 22:18:59 +01:00
jorolf	454c82c49e	Don't go outside of the container bounds	2019-03-21 22:18:45 +01:00
Joseph Madamba	d5272a83cf	Rename "urgent" to "topMost"	2019-03-21 11:16:10 -07:00
Dean Herbert	d6f17a5ecd	Bring nuget packages up to date	2019-03-22 02:41:21 +09:00
Dean Herbert	37010f97d7	Fix random select crashing ... Closes #3383.	2019-03-21 21:02:54 +09:00
Dean Herbert	a10e43410a	Fix song select potentially starting play before the carousel (and bindables) have been initialised	2019-03-21 20:52:34 +09:00
Dean Herbert	4789aa81cb	Add an explicit flag for tracking song select's bindable binding ... Not required (this change does not affect logic) but improves clarity.	2019-03-21 20:52:15 +09:00
Dean Herbert	96dba6a20d	Move nested method to bottom of class	2019-03-21 20:51:21 +09:00