12295 Commits

Author	SHA1	Message	Date
smoogipoo	5f56c38475	Merge remote-tracking branch 'origin/master' into rename_test_case	2019-05-15 15:52:06 +09:00
Dean Herbert	88528e797f	Merge remote-tracking branch 'upstream/master' into HoutarouOreki-changelog-overlay	2019-05-15 14:24:45 +09:00
Dean Herbert	e7409a28a3	Merge branch 'move-screen-dependencies' into tournament-tools	2019-05-15 13:05:12 +09:00
Dean Herbert	1fd44d7945	Move OsuScreenDependencies to GameBase	2019-05-15 13:00:11 +09:00
Dean Herbert	7b56180b8b	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-05-15 12:08:23 +09:00
Roman Kapustin	459a285cd8	Rename test cases to test scenes inline with the framework change	2019-05-14 22:37:25 +03:00
Lucas A	2d966682dc	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-14 18:09:58 +02:00
Dean Herbert	456e6a6601	Merge branch 'master' into remember-fps-display-state	2019-05-14 18:54:04 +09:00
Dean Herbert	4c221e43a9	Apply minimal changes to make framework compile	2019-05-14 18:39:56 +09:00
Dean Herbert	f2e5beec11	Update framework	2019-05-14 18:35:35 +09:00
Dean Herbert	5308a68103	Merge remote-tracking branch 'upstream/master' into remember-fps-display-state	2019-05-14 18:35:19 +09:00
Dean Herbert	ec5b024fa6	Define toolbarElements	2019-05-14 18:34:25 +09:00
Dean Herbert	a0c03d7fc3	Merge remote-tracking branch 'upstream/master' into exit-hide-music-controller	2019-05-14 18:14:57 +09:00
smoogipoo	77263bd56e	Linkify more user links	2019-05-14 18:11:32 +09:00
Dean Herbert	eece4d878f	Tidy up colour references and texture assignment in ChangelogHeader	2019-05-14 18:03:54 +09:00
Dan Balasescu	d3d20773ee	Merge branch 'master' into fullscreen-overlay	2019-05-14 17:40:20 +09:00
Dan Balasescu	bffde7de08	Merge branch 'master' into exit-hide-music-controller	2019-05-14 17:36:38 +09:00
Dean Herbert	31e7f2fa87	Update ChangelogOverlay to use FullScreenOverlay	2019-05-14 17:35:21 +09:00
Dean Herbert	0fc43afd34	Merge branch 'master' into HoutarouOreki-changelog-overlay	2019-05-14 17:35:14 +09:00
Dean Herbert	aff239a4fb	Merge branch 'fullscreen-overlay' into HoutarouOreki-changelog-overlay	2019-05-14 17:33:30 +09:00
Dean Herbert	fad9e73999	Add null check in disposal clause	2019-05-14 17:08:54 +09:00
Dan Balasescu	d040fe9635	Merge branch 'master' into tidy-osu-game	2019-05-14 16:52:56 +09:00
Dean Herbert	a52690ed9a	Fix commented line check not working with whitespace (#4788) ... Fix commented line check not working with whitespace	2019-05-14 16:47:46 +09:00
smoogipoo	f1c9073338	Fix commented line check not working with whitespace	2019-05-14 16:16:55 +09:00
Dean Herbert	9aef4abf75	Merge pull request #4783 from smoogipoo/remove-unnecessary-allocations ... Reduce unnecessary allocations	2019-05-14 16:03:04 +09:00
Dean Herbert	c312a2e53c	Merge branch 'master' into fullscreen-overlay	2019-05-14 15:22:23 +09:00
Dean Herbert	e893925417	Move shadow fade logic	2019-05-14 15:19:23 +09:00
Dean Herbert	29bdc97ab7	Remove unnecessary DI	2019-05-14 15:07:18 +09:00
Dean Herbert	cb2b14e501	Centralise fullscreen overlay logic	2019-05-14 14:20:53 +09:00
Dean Herbert	cc558cf073	Merge branch 'add-new-colours' into HoutarouOreki-changelog-overlay	2019-05-14 13:36:17 +09:00
Dean Herbert	4abe987e11	Add new colour palette	2019-05-14 13:28:16 +09:00
Dean Herbert	0d57cf6599	Remember FPS display state after changing via Ctrl+F11 hotkey	2019-05-14 13:13:51 +09:00
smoogipoo	93b26cd026	Reduce unnecessary allocations	2019-05-14 13:04:49 +09:00
Dean Herbert	7553e2da25	Fix incorrect DI reference and update naming of SettingsOverlay classes	2019-05-14 10:45:05 +09:00
Dean Herbert	92f6f4d21a	Apply same fix to other methods which were missed	2019-05-13 19:04:12 +09:00
Dean Herbert	aca77a7ae2	Merge remote-tracking branch 'upstream/master' into fix-control-point-ordering	2019-05-13 18:47:05 +09:00
Dean Herbert	66df784e9a	Adjust header image sizing	2019-05-13 17:32:49 +09:00
Dean Herbert	d66a26cd11	Add JsonProperty hinting	2019-05-13 17:26:50 +09:00
Dean Herbert	8ecd1912e1	Split out web response classes into own files	2019-05-13 17:24:33 +09:00
Dean Herbert	27ca094421	Update outdated licence headers	2019-05-13 17:14:52 +09:00
Dean Herbert	4b508915f6	Centralise caching of components at OsuGame level	2019-05-13 17:10:25 +09:00
Dean Herbert	50c440de8d	Add toolbar button	2019-05-13 17:01:17 +09:00
Dean Herbert	e9c3f54307	Share web request between builds and streams	2019-05-13 16:44:43 +09:00
Dean Herbert	37a8d9eb80	Remove chart references for now	2019-05-13 16:27:54 +09:00
Dean Herbert	219c590b8a	Initial pass to make work with real API	2019-05-13 16:24:32 +09:00
Dean Herbert	5ea87d9467	Merge remote-tracking branch 'upstream/master' into use-volumemute-icon	2019-05-13 07:24:39 +09:00
Dean Herbert	8110d6768c	Inherit OsuButton	2019-05-13 07:24:34 +09:00
Joehu	c119a6a135	Use VolumeMute icon for mute button	2019-05-12 09:30:43 -07:00
Joehu	f14690e3b8	Swap profile play styles and last visit positions	2019-05-12 09:04:11 -07:00
Dean Herbert	31b72f168d	Fix deprecated calls and code styling (partly)	2019-05-13 00:46:22 +09:00
Lucas A	2f663622cc	Fix CI inspections	2019-05-12 17:40:18 +02:00
Lucas A	18fc965d7a	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-12 17:39:13 +02:00
Lucas A	55663b3576	Nest all UserActivities into UserActivity	2019-05-12 17:38:02 +02:00
Dean Herbert	34f54aa945	Resolve compile-time issues	2019-05-13 00:36:05 +09:00
Dean Herbert	943e1574a4	Merge branch 'master' into changelog-overlay	2019-05-13 00:24:18 +09:00
Dean Herbert	da2338581b	Merge branch 'master' into dev	2019-05-12 23:13:46 +09:00
Dean Herbert	487a56549e	Fix CI issues	2019-05-12 22:53:12 +09:00
Dean Herbert	41e13aef23	Use more standard parsing method	2019-05-12 22:53:03 +09:00
Dean Herbert	65097fddc1	Hide music controller when exiting via Alt-F4 ... Closes #4764.	2019-05-12 22:34:58 +09:00
Paul Teng	1c3b768266	Use Precision.AlmostBigger	2019-05-12 09:02:22 -04:00
Dean Herbert	ce0e4c506e	Merge branch 'master' into dev	2019-05-12 21:45:52 +09:00
Paul Teng	1a6c8e91a5	Compare Health with small value	2019-05-12 08:44:20 -04:00
Dean Herbert	82599127fd	Merge branch 'master' into patch-1	2019-05-12 20:30:25 +09:00
Paul Teng	7adaa09263	Move tab channel class into tab item class	2019-05-12 06:31:11 -04:00
Paul Teng	8957ad5a7e	Instantiate channel in tab item	2019-05-12 06:26:03 -04:00
Paul Teng	d53fb9a5c8	Check against type instead of channel name	2019-05-12 06:11:16 -04:00
Paul Teng	496a9dd41d	Create separate type for Join-Channel button	2019-05-12 06:02:21 -04:00
Lucas A	5ac6bd8204	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-12 11:53:30 +02:00
Dean Herbert	038e49701e	Move conditional to within BreakPeriod	2019-05-12 16:25:25 +09:00
Dean Herbert	1391aa342c	Merge branch 'master' into break-pause	2019-05-12 16:15:24 +09:00
Dean Herbert	3566da73cc	Merge branch 'master' into fix-more-pause-cases	2019-05-12 15:57:45 +09:00
Dean Herbert	9add2562f9	Close beatmap options when suspending (#4761) ... Close beatmap options when suspending	2019-05-12 15:50:10 +09:00
Dean Herbert	790700d8bf	Use more correct calculation	2019-05-12 15:40:58 +09:00
Joehu	175daac16a	Close beatmap options when suspending	2019-05-11 21:26:42 -07:00
Joehu	29cec54b3c	Fix beatmap carousel overlapping beatmap info wedge	2019-05-11 20:08:45 -07:00
Paul Teng	c508b8ed6b	Trim whitespace	2019-05-11 19:21:12 -04:00
Paul Teng	3971a49549	Ignore Add-channel button	2019-05-11 19:16:15 -04:00
Paul Teng	6cf1ca288f	Do not try to join the Add-channel button	2019-05-11 19:13:48 -04:00
smoogipoo	bde2d552b6	Merge remote-tracking branch 'origin/master' into fix-more-pause-cases ... # Conflicts: # osu.Game.Tests/Visual/Gameplay/TestCasePause.cs	2019-05-10 22:16:59 +09:00
smoogipoo	01eb1a34a9	Remove unused variable	2019-05-10 22:15:33 +09:00
Dean Herbert	ad93eda399	Allow song progress bar to show current position during a seek (#4746) ... Allow song progress bar to show current position during a seek Co-authored-by: Dan Balasescu <smoogipoo@smgi.me>	2019-05-10 21:10:11 +09:00
Dan Balasescu	4abd5c78cd	Merge branch 'master' into fix-score-deletion	2019-05-10 19:09:18 +09:00
smoogipoo	3fe61c4a7e	Trim whitespace	2019-05-10 18:48:39 +09:00
Dan Balasescu	425154c264	Merge branch 'master' into progress-bar-show-seek	2019-05-10 18:24:15 +09:00
Dan Balasescu	fe7ea1e900	Merge branch 'master' into fix-score-deletion	2019-05-10 18:24:04 +09:00
Dean Herbert	af3a75307d	Merge branch 'master' into fix-failing-pause-tests	2019-05-10 18:22:20 +09:00
Dean Herbert	97796a8578	Attempt to fix failing tests by delaying starting of the gameplay clock	2019-05-10 18:10:07 +09:00
smoogipoo	d2479acbf2	Fix incorrect value being clamped	2019-05-10 18:04:58 +09:00
Dan Balasescu	4776fc75b9	Merge branch 'master' into fix-score-deletion	2019-05-10 18:00:43 +09:00
smoogipoo	ad4b4f3422	Use nullable cancellation tokens	2019-05-10 17:42:45 +09:00
Dean Herbert	a44296a6db	Merge branch 'master' into progress-bar-show-seek	2019-05-10 17:27:49 +09:00
Dean Herbert	fdf67aaa11	Clamp values	2019-05-10 17:18:39 +09:00
Dean Herbert	21ab628f41	Merge branch 'master' into player-load-cancellations	2019-05-10 16:58:36 +09:00
smoogipoo	f6dfcc4dcf	Remove unnecessary Storyboard disposal	2019-05-10 16:31:22 +09:00
smoogipoo	d25d39b315	Add cancellation to storyboard/hitobject loading	2019-05-10 16:31:09 +09:00
Dan Balasescu	b9a579b624	Merge branch 'master' into fix-control-point-ordering	2019-05-10 16:18:22 +09:00
Dan Balasescu	32808a8a59	Merge branch 'master' into fix-long-skip-performance	2019-05-10 16:10:50 +09:00
smoogipoo	6a957ad27f	Fix pause triggered when already paused	2019-05-10 15:51:12 +09:00
smoogipoo	7c105fd99f	Fix testcase players pausing on window unfocus	2019-05-10 15:39:25 +09:00
David Zhao	9480c74fcc	Merge remote-tracking branch 'upstream/master' into result-count	2019-05-10 11:20:16 +09:00
David Zhao	5c096cbc91	Revert mirroring condition too	2019-05-09 18:59:00 +09:00
David Zhao	9e0af723cc	Split out affectscombo change	2019-05-09 18:56:19 +09:00
Dean Herbert	9248e6290c	Use FrameStabilityClock to denote current position on song progress	2019-05-09 18:09:26 +09:00
Dean Herbert	5942072128	Add a tween when clicking to seek	2019-05-09 18:07:38 +09:00
Dean Herbert	3bcfc86b9c	Allow custom MaxCatchUpFrames to be specified ... Also adjusts the default to allow for smoother seeking.	2019-05-09 16:39:03 +09:00
Dean Herbert	66594b7a1b	Pass GameplayStartTime to FrameStabilityContainer to allow bypassing prior to start	2019-05-09 16:39:03 +09:00
David Zhao	b0e34d86d5	Subtract a result from count if its been reverted	2019-05-09 16:16:20 +09:00
David Zhao	39fb5712f1	Only combo-incrementing results add to result count	2019-05-09 15:31:37 +09:00
Dean Herbert	516186c945	Merge branch 'master' into fix-score-deletion	2019-05-09 15:21:05 +09:00
Dean Herbert	24e64c1333	Add proper co-dependent beatmap/score deletion via events	2019-05-09 15:15:28 +09:00
Dean Herbert	6ebd13c733	Allow Delete and Undelete operations to run silently when needed	2019-05-09 15:15:02 +09:00
Dean Herbert	c8f9354327	Remove incorrect deletion include ... This was causing deletions of scores without considering that scores are now managed by a ScoreManager (and have their own data dependencies).	2019-05-09 15:13:35 +09:00
Dan Balasescu	2e50c1ce48	Merge branch 'master' into zoomablescrollcontainer-fix	2019-05-09 14:09:47 +09:00
Dan Balasescu	22940373a0	Merge branch 'master' into zoomablescrollcontainer-fix	2019-05-09 13:54:21 +09:00
smoogipoo	5c6b4d923f	Reorder methods	2019-05-09 13:53:53 +09:00
smoogipoo	35624a5d1c	Invert scheduling order	2019-05-09 13:42:04 +09:00
smoogipoo	3fed165b74	Cleanup some schedules	2019-05-09 13:33:18 +09:00
smoogipoo	c69d813745	Fix bindable potentially being set from background thread	2019-05-09 13:32:18 +09:00
David Zhao	d625f3c104	Private method	2019-05-09 13:21:01 +09:00
Dean Herbert	869136b2fb	Fix possible cross-thread config cache access (#4730) ... Fix possible cross-thread config cache access Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-05-09 11:16:48 +09:00
Dean Herbert	9457a6128e	Fix game pausing when made inactive while watching a replay	2019-05-09 10:57:55 +09:00
Dean Herbert	a5b07347e9	Merge branch 'master' into fix-ruleset-crossthread	2019-05-09 10:49:26 +09:00
Dean Herbert	31c91746a5	Merge branch 'master' into fix-ruleset-crossthread	2019-05-09 10:13:25 +09:00
smoogipoo	5128dc32e4	Remove unnecessary fillmode	2019-05-08 23:13:21 +09:00
smoogipoo	17a9f191cd	Fix incorrect texture name usage for some rank icons	2019-05-08 23:08:08 +09:00
Dean Herbert	83663467ce	Update dependencies	2019-05-08 21:08:46 +09:00
Dean Herbert	4f697e2bd5	Add licence header	2019-05-08 19:35:20 +09:00
Dean Herbert	6dea16f365	Move action and hotkey specification local	2019-05-08 19:29:43 +09:00
Dean Herbert	c91b9c6032	Add missing button	2019-05-08 19:27:53 +09:00
smoogipoo	39efa2d173	Fix possible cross-thread config cache access	2019-05-08 19:05:00 +09:00
Dean Herbert	772eb460fb	Move button definitions to their respective classes	2019-05-08 19:03:26 +09:00
Dean Herbert	0693290ad4	Merge remote-tracking branch 'upstream/master' into refactor-select-footer	2019-05-08 18:43:21 +09:00
Dean Herbert	b33372ca62	Don't expand mods in button on hover	2019-05-08 18:43:15 +09:00
Dean Herbert	8906eb874a	Fix CI issues	2019-05-08 18:43:06 +09:00
Dean Herbert	9a9ac05cd9	Fix post-merge issues	2019-05-08 18:42:54 +09:00
Dean Herbert	bace829629	Add ability to avoid expand animation in ModDisplay	2019-05-08 18:42:26 +09:00
Dean Herbert	66ebdbbe4c	Fix control points with same timestamp potentially being parsed incorrectly	2019-05-08 18:13:07 +09:00
Dan Balasescu	6ab83f8825	Merge branch 'master' into flashlight-dim	2019-05-08 13:37:21 +09:00
David Zhao	ff3c226596	Give ZoomableScrollContainer an initial width	2019-05-08 13:37:03 +09:00
smoogipoo	117f8bdd01	Merge remote-tracking branch 'Joehuu/master' into flashlight-dim	2019-05-08 13:25:01 +09:00
Dean Herbert	13cf9657a4	Merge branch 'master' into fix-updateable-background-crash	2019-05-08 13:17:28 +09:00
Lucas A	a5f758b977	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-07 18:27:14 +02:00
Lucas A	3ecfa9dcdb	Invert partialy activity logic introduced in latest commit	2019-05-07 18:26:34 +02:00
smoogipoo	a00e2b18a9	Fix background unloading/reloading sometimes crashing	2019-05-07 17:24:05 +09:00
smoogipoo	99f2ee0e48	Fix CI issues	2019-05-07 15:09:03 +09:00
Dan Balasescu	288b3deb94	Merge branch 'master' into fix-rank-display	2019-05-07 15:00:51 +09:00
Dean Herbert	8bc313fb33	Merge branch 'master' into fix-new-inspections	2019-05-07 14:14:40 +09:00
Dean Herbert	c878d814f6	Merge branch 'master' into pause-via-inactive	2019-05-07 13:35:23 +09:00
Dean Herbert	f7a570d67a	Fix double confirmation	2019-05-07 13:34:06 +09:00
smoogipoo	13b9b04bb8	Apply more cases/fix some existing ones	2019-05-07 13:23:09 +09:00
smoogipoo	d7c09e7dbd	Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs	2019-05-07 13:20:17 +09:00
Dan Balasescu	a1c64d8d26	Merge branch 'master' into fix-retry-sound	2019-05-07 12:40:01 +09:00
Dan Balasescu	8b9cfadd64	Merge branch 'master' into fix-retry-sound	2019-05-07 12:37:22 +09:00
Dean Herbert	64bc0f958b	Merge branch 'master' into fix-import-crash	2019-05-07 12:18:41 +09:00
smoogipoo	f26a1cff6c	Fix beatmap import crashing during room creation	2019-05-07 12:14:57 +09:00
David Zhao	abc163fa36	Fix merge	2019-05-07 12:07:45 +09:00
David Zhao	732b0b22a3	Merge remote-tracking branch 'upstream/master' into flashlight-dim	2019-05-07 12:04:58 +09:00
Dan Balasescu	9d3f6a716a	Merge branch 'master' into profile-details-animation	2019-05-07 11:44:22 +09:00
Lucas A	e7afaeaa4d	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-06 18:39:58 +02:00
Lucas A	59b8da5c77	Move OsuScreen activity logic to setUserActivity()	2019-05-06 18:37:21 +02:00
Lucas A	a50bbf7f42	Make appveyor happy.	2019-05-05 21:32:23 +02:00
Lucas A	3d8b56fe57	Fix user status related unit tests	2019-05-05 21:11:52 +02:00
Lucas A	d5d31282e5	Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes	2019-05-05 20:55:42 +02:00
Lucas A	88b8afbb6a	Make UserPanel show current user activity when ... user status is online.	2019-05-05 20:51:55 +02:00
Lucas A	fa986bb5e9	Rework OsuScreen user activity logic	2019-05-05 20:26:56 +02:00
Lucas A	b216635488	Added UserActivity class holding information about the current activity for the local user	2019-05-05 20:07:55 +02:00
Dean Herbert	7fdc79dd68	Improve skip boundary logic to be closer to expectations ... Supersedes #4693. Closes #4676.	2019-05-05 20:20:41 +09:00
Dean Herbert	3e3f12f277	Use more local bindables	2019-05-04 17:53:17 +09:00
Dean Herbert	b9a39fb788	Fix instant pausing when game becomes inactive ... Resolves #4685.	2019-05-04 14:54:29 +09:00
Dean Herbert	0fa0271878	Add animation when collapsing or expanding the profile details section	2019-05-04 11:03:18 +09:00
Joseph Madamba	53accbfce1	Merge branch 'master' into switch-centre-profile-info	2019-05-03 11:27:52 -07:00
Dean Herbert	41ab82cdc3	Merge branch 'master' into refactor-select-footer	2019-05-03 21:46:41 +09:00
LeNitrous	31341bfeb1	use SongSelect's SelectedMods property to ensure it exists	2019-05-03 16:51:33 +08:00
LeNitrous	009eaa647a	fixes to FooterButtonRandom	2019-05-03 16:38:15 +08:00
Dean Herbert	6bdaca1e3b	Fix mod equality checks not working as intended	2019-05-03 10:09:47 +09:00
Lucas A	a4a2ce5ec0	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-02 21:36:28 +02:00
Lucas A	5d4aa5a12e	Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus	2019-05-02 20:51:19 +02:00
Lucas A	84b41b3886	Split out setUserStatus() logic to multiple lines. + ... Make UserStatusDoNotDisturb inherit from UserStatus	2019-05-02 19:44:07 +02:00
Joehu	ac31a9640a	Add number sign to centre info rankings	2019-05-02 03:47:20 -07:00
Joehu	c6992bd6f9	Switch hidden/expanded centre profile header information	2019-05-02 03:37:15 -07:00
Dean Herbert	6a4dc5e25c	Improve xmldoc slightly	2019-05-02 14:03:58 +09:00
Dean Herbert	1817f7bc12	Merge branch 'master' into sh-xh-grading-2	2019-05-02 13:27:12 +09:00
Dean Herbert	975f6e2c5d	Merge pull request #4694 from peppy/update-framework ... Update framework	2019-05-02 13:13:15 +09:00
Dean Herbert	015b5cecb5	Update framework	2019-05-02 12:53:59 +09:00
jorolf	b61807da40	Add number sign inside ToString ... Co-Authored-By: Joehuu <madamba.joehu@outlook.com>	2019-05-01 17:55:30 -07:00
Joehu	6b7397b9cf	Check for null instead of not null	2019-04-30 22:07:06 -07:00
Joehu	9b2d5727cd	Fix wrong check	2019-04-30 21:54:25 -07:00
Joehu	1408513ebd	Use similar check used on tooltip	2019-04-30 21:51:56 -07:00
Joehu	3cd6ccfc3d	Add number sign in front of profile rankings	2019-04-30 20:47:44 -07:00
Lucas A	a3541339f5	Handle the restoring of the screen status when the user status is changed back to online after having being set to DND / offline via the login overlay	2019-04-30 21:40:44 +02:00
iiSaLMaN	ddd9262384	fix xmldoc	2019-04-30 19:08:31 +03:00
iiSaLMaN	3b03ca802a	Merge branch 'master' into sh-xh-grading-2	2019-04-30 18:55:35 +03:00
iiSaLMaN	148f4c4ce0	Pass Rank.Value instead ... Passing Rank.Value along each iteration instead of calculating.	2019-04-30 18:49:31 +03:00
iiSaLMaN	e0abd0b2c1	fix comment	2019-04-30 18:44:31 +03:00
iiSaLMaN	665558c297	Remove unnecessary comment	2019-04-30 18:44:06 +03:00
iiSaLMaN	5d50316ae7	Add xmldoc	2019-04-30 18:12:27 +03:00
Lucas A	7e42068a14	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-04-28 19:48:35 +02:00
Dean Herbert	5a9277ec0e	Merge branch 'master' into fix-retry-sound	2019-04-28 23:38:14 +09:00
Dean Herbert	f9f6e1f04a	Clamp values to avoid potentially weird element	2019-04-28 20:13:36 +09:00
Dean Herbert	8ab5149336	SupporterLevel -> SupportLevel	2019-04-28 20:11:36 +09:00
Dean Herbert	27ba89444e	Remove unnecessary using statements	2019-04-28 01:08:14 +09:00
Dean Herbert	fa340a9eff	Merge branch 'master' into profile-header-update	2019-04-27 23:48:23 +09:00
Dean Herbert	db75516e79	Merge branch 'master' into fix-lead-in-issues	2019-04-27 21:01:21 +09:00
Dean Herbert	d40177f97c	Merge branch 'master' into drawnode-composability	2019-04-27 18:41:19 +09:00
Dean Herbert	41d0b00120	Update framework	2019-04-27 16:43:23 +09:00
iiSaLMaN	b08fb5136e	Merge branch 'master' into sh-xh-grading-2	2019-04-26 10:38:10 +03:00
smoogipoo	32e71a6314	Fix incorrect seeking behaviour of TrackVirtualManual	2019-04-26 16:15:42 +09:00
smoogipoo	50a775145c	Separate variables	2019-04-26 13:56:26 +09:00
smoogipoo	2f4bf423a4	Renamespace	2019-04-26 13:51:39 +09:00
smoogipoo	7047303b0f	Add tooltips to all buttons	2019-04-26 13:29:58 +09:00
Dean Herbert	a680a38e81	Merge pull request #4675 from nyquillerium/playerloader-tracking ... Prevent PlayerLoader from tracking the logo after it has been exited.	2019-04-26 13:21:13 +09:00
smoogipoo	4adf590036	Combine hover/active state handling in tab control	2019-04-26 12:41:00 +09:00
smoogipoo	d5b91c6455	Cleanup top header container + user handling	2019-04-26 12:32:15 +09:00
smoogipoo	838325fed4	Remove HasTooltipContainer, use separate composites	2019-04-26 11:58:45 +09:00
David Zhao	9ce7d0416b	Fix framework version	2019-04-25 23:16:08 +09:00
David Zhao	9da13cb463	Merge branch 'master' into flashlight-dim	2019-04-25 23:15:15 +09:00
KingLuigi4932	619071b7ee	Unnecessary 'using' directive	2019-04-25 14:23:00 +03:00
smoogipoo	f8c5ee457b	Reduce tabcontrol spacing	2019-04-25 20:09:42 +09:00
smoogipoo	8329e53b6c	Remove extra space from header title	2019-04-25 20:08:14 +09:00
smoogipoo	2caea38f8c	Cleanup centre header container	2019-04-25 20:05:59 +09:00
KingLuigi4932	4e0f21102b	Merge branch 'sh-xh-grading-2' of https://github.com/iiSaLMaN/osu into sh-xh-grading-2	2019-04-25 14:04:12 +03:00
iiSaLMaN	45d9f42c98	Merge branch 'master' into sh-xh-grading-2	2019-04-25 14:01:38 +03:00
KingLuigi4932	c6b3197dd0	Add AdjustRank and use it in Hidden Mod	2019-04-25 13:56:57 +03:00
smoogipoo	9d5b81165e	Adjust button stylings	2019-04-25 19:51:05 +09:00
smoogipoo	0eca9b9683	Center -> centre	2019-04-25 18:43:29 +09:00
smoogipoo	b33c0e9a93	Cleanup bottom header container	2019-04-25 18:42:19 +09:00
smoogipoo	1766ed8f9e	Fix warnings/remove obsolete usages	2019-04-25 18:05:46 +09:00
smoogipoo	3b0d4c1bad	Merge branch 'turn-on-warnings' into profile-header-update	2019-04-25 17:43:10 +09:00
smoogipoo	0bd35ab7bb	Turn on warnings, resolve issues	2019-04-25 17:36:17 +09:00
Dean Herbert	6fdcd98caa	Don't play screen "back" sample when retrying	2019-04-25 14:15:07 +09:00
Dan Balasescu	b911322c92	Merge branch 'master' into fix-lead-in-issues	2019-04-25 12:34:29 +09:00
Dan Balasescu	9fa8f62077	Merge branch 'master' into update-framework	2019-04-25 12:25:17 +09:00
Dean Herbert	8dc7fd8223	Update framework	2019-04-25 12:16:12 +09:00
iiSaLMaN	d3bc443810	Merge branch 'master' into sh-xh-grading-2	2019-04-25 06:11:07 +03:00
Dean Herbert	4f31eee5ad	Merge branch 'master' into flashlight-dim	2019-04-24 17:01:11 +09:00
David Zhao	8222923ab8	Only track logo if we're still the current screen	2019-04-24 16:20:51 +09:00
iiSaLMaN	c5ca337e66	Merge branch 'master' into sh-xh-grading-2	2019-04-24 10:08:08 +03:00
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
Lucas A	fe8c705f1b	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-04-20 09:42:32 +02: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
Lucas A	5887008fb3	Merge branch 'master' into user-status-wiring	2019-04-15 11:43:53 +02: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
Lucas A	361c0ec9f2	Allow UserStatusSoloGame to provide metadata such as the ruleset the current beatmap is played in	2019-04-13 13:18:44 +02:00
Lucas A	da5d6cb1d4	Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap	2019-04-12 22:54:35 +02:00
Lucas A	69dda0ffd4	OsuScreens can now set a per screen user status ... which defaults to UserStatusOnline	2019-04-12 22:36:01 +02: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
Dean Herbert	1ef2a4c46f	Merge remote-tracking branch 'upstream/master' into tournament-tools	2019-04-03 16:23:33 +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