11712 Commits

Author	SHA1	Message	Date
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
Shane Woolcock	ce17e37c74	Conditionally add some UI elements only on desktop ... Prevents crashes from trying to access features that are not applicable to mobile.	2019-02-28 13:10:53 +09:00
Dean Herbert	3e1f283281	Merge remote-tracking branch 'upstream/master' into more-inspections	2019-02-28 13:09:18 +09:00
Dean Herbert	83e9dfda75	Merge branch 'master' into fix-osugame-test-case	2019-02-28 12:33:00 +09:00
Dean Herbert	43b02212ce	Add disposal check in single file load path	2019-02-28 12:24:56 +09:00
Dan Balasescu	76ec5868da	Merge branch 'master' into fix-square-graph-overhead	2019-02-28 12:23:37 +09:00
Dean Herbert	0faf83f7d1	Fix nullref in tests	2019-02-27 23:30:13 +09:00
Dean Herbert	42442edf5a	Update framework	2019-02-27 22:41:46 +09:00
Dean Herbert	d3a304c233	Merge branch 'master' into fix-home-button-cancel-2	2019-02-27 22:02:37 +09:00
Dean Herbert	53865c6857	Merge branch 'master' into better-mp-songselect-deletion-handling	2019-02-27 21:55:22 +09:00
Dean Herbert	ccb00b932b	Merge branch 'master' into fix-nasty-unbind	2019-02-27 21:44:54 +09:00
Dean Herbert	c8793911a8	Enable more stringent inspectcode style inspections	2019-02-27 21:25:40 +09:00
smoogipoo	7fa4262207	Clear delegate list rather than relying on unbinds	2019-02-27 21:04:47 +09:00
Dean Herbert	5c6db17865	Merge remote-tracking branch 'upstream/master' into fix-square-graph-overhead	2019-02-27 21:02:28 +09:00
Dan Balasescu	d2c2e41e0c	Merge branch 'master' into excess-skin-change	2019-02-27 20:30:18 +09:00
Dean Herbert	3af7d4939c	Add debounce testing	2019-02-27 19:11:09 +09:00
Dean Herbert	43a1df6e5c	Inline cancellation token source creation	2019-02-27 18:58:53 +09:00
Dean Herbert	6f5d4ce2e2	Debounce SquareGraph some more	2019-02-27 18:58:45 +09:00
Dean Herbert	8c4a59e57e	Fix SquareGraph more	2019-02-27 18:58:34 +09:00
Dean Herbert	9473b53226	Avoid redundant (synchronous) skin change	2019-02-27 18:53:01 +09:00
David Zhao	882fff1631	Assert storyboard visibilty at both steps of toggle	2019-02-27 17:56:44 +09:00
Dean Herbert	99d8d39ea1	Merge branch 'master' into fix-crossthread	2019-02-27 17:46:12 +09:00
smoogipoo	1006c539be	Fix looping not being checked	2019-02-27 17:03:09 +09:00
David Zhao	14ffd9efe8	Add fake storyboard to visually assess storyboard dim	2019-02-27 17:02:04 +09:00
smoogipoo	30815ace62	Fix crossthread operations due to Track.Completed	2019-02-27 16:52:34 +09:00
smoogipoo	f66fefb818	Adjust comment + accessibility	2019-02-27 16:30:10 +09:00
Jamie Taylor	c59d84fd21	Add sanity check to prevent TimeshiftPlayer from starting with incorrect beatmap/ruleset/mods	2019-02-27 16:21:14 +09:00
Jamie Taylor	a3f71d69a9	Ensure ruleset and mods are set correctly when leaving MatchSongSelect	2019-02-27 16:16:13 +09:00
Jamie Taylor	7c2ffb1826	Fix MatchSongSelect not handling beatmapset deletions	2019-02-27 14:34:39 +09:00
Joehu	5b4319a80f	Fix home button being cancelled by mod select again	2019-02-26 21:01:28 -08:00
smoogipoo	a07d797d75	Merge remote-tracking branch 'Joehuu/master' into use-lifetime-optimization	2019-02-27 12:08:43 +09:00
Dean Herbert	56697339b3	Merge branch 'master' into fix-disabled-set-crash	2019-02-27 11:14:42 +09:00
jorolf	4c10185f5b	Fade out text instead of removing it immediately	2019-02-26 15:26:00 +01:00
jorolf	cacef7421d	Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer	2019-02-26 14:09:12 +01:00
Dean Herbert	d9872dda12	Use fade instead of negative margin	2019-02-26 16:10:06 +09:00
Dean Herbert	2d6d9dd723	Add better easing	2019-02-26 16:09:45 +09:00
Dean Herbert	c1432b2ed5	Add back newline	2019-02-26 15:48:34 +09:00
Dean Herbert	2fc34496fd	Merge branch 'master' into MissingSource	2019-02-26 15:38:51 +09:00
Dean Herbert	d2dc38f298	Merge branch 'master' into hide-exit-button	2019-02-26 13:25:47 +09:00
smoogipoo	8a943a6e65	Fix scores being stored as ints	2019-02-26 13:10:59 +09:00
Dan Balasescu	32b8bb2ccc	Fix broken grammar ... Co-Authored-By: peppy <pe@ppy.sh>	2019-02-26 12:28:49 +09:00
Shane Woolcock	e91c07209f	Move MainMenu initialisation from ctor to load	2019-02-26 09:54:42 +09:00
jorolf	796044ee7d	*I should've rechecked the code after the master merge*	2019-02-25 23:53:44 +01:00
jorolf	501dab7b32	Merge branch 'master' of git://github.com/ppy/osu into supporter-disclaimer	2019-02-25 23:49:01 +01:00
jorolf	c680d63694	Don't show the supporter text if the user already has supporter status	2019-02-25 23:44:43 +01:00
Dean Herbert	568e90c70b	Merge branch 'master' into UserDimLogic	2019-02-25 22:35:48 +09:00
David Zhao	d750023c52	Fix TestCasePlayerLoader not having a background stack	2019-02-25 22:05:49 +09:00
Shane Woolcock	bebb635ca1	Merge branch 'master' into hide-exit-button ... # Conflicts: # osu.Game/Screens/Menu/MainMenu.cs	2019-02-25 21:48:42 +09:00
Shane Woolcock	2bd5bb3f69	Move all MainMenu button creation into load	2019-02-25 21:41:41 +09:00
Dean Herbert	97dc7f9819	Merge branch 'master' into MissingSource	2019-02-25 19:35:44 +09:00
Dean Herbert	2fbb0b4e6f	Don't use this	2019-02-25 19:34:03 +09:00
Dean Herbert	140de26a56	Merge remote-tracking branch 'upstream/master' into notify_track_completion_failure	2019-02-25 19:30:35 +09:00
Dean Herbert	ed10024b22	Fix some formatting / variable naming	2019-02-25 19:29:09 +09:00
Dean Herbert	a4e119786f	Fix some weird formatting	2019-02-25 19:19:28 +09:00
Dean Herbert	6881563346	Merge branch 'master' into ScrollingExitFix	2019-02-25 19:11:05 +09:00
Dean Herbert	f84a84edaa	Fix oops	2019-02-25 18:59:28 +09:00
Dean Herbert	314f35b0c5	Further simplify import messaging	2019-02-25 18:42:08 +09:00
David Zhao	59ad470eed	Clean up test code	2019-02-25 18:41:13 +09:00
David Zhao	ad1bce3585	Fix song select backround not being exited in time	2019-02-25 18:40:19 +09:00
Dean Herbert	80737b9ef8	Remove "silent" parameter; consolidate import logic	2019-02-25 18:24:06 +09:00
Dean Herbert	f0b26550d1	Merge branch 'master' into slider-fix	2019-02-25 16:12:52 +09:00
smoogipoo	7fde21b51a	Rename testcase	2019-02-25 16:09:12 +09:00
David Zhao	22a68d7bea	Perform new migration	2019-02-25 15:25:22 +09:00
David Zhao	4475643726	Revert database migration	2019-02-25 14:40:44 +09:00
Dean Herbert	706da017d7	Add target screen support and user bypass	2019-02-25 14:01:51 +09:00
David Zhao	8da671fa6c	Check if a user exists before creating new user	2019-02-25 13:58:19 +09:00
David Zhao	16fa30f71e	Fix bindable	2019-02-25 13:27:44 +09:00
David Zhao	ccc86b66fa	Use local private bindable in Player.cs	2019-02-25 13:15:37 +09:00
Dean Herbert	caef58675d	Tidy up and standardise present logic	2019-02-25 12:58:58 +09:00
David Zhao	af4606f3d2	Create new test for StoryboardReplacesBackground	2019-02-25 12:35:01 +09:00
Shane Woolcock	61be4f2695	Conditionally add ExitConfirmOverlay and disable back action	2019-02-25 10:43:47 +09:00
Shane Woolcock	add8b8e9c4	Only add Exit button if the GameHost supports it	2019-02-25 09:56:00 +09:00
Dean Herbert	287870f1e1	Remove limitation stopping search updates when no query present in direct ... Closes #4310.	2019-02-24 23:35:18 +09:00
David Zhao	24f5bc7a75	Add documentation and move storyboard init logic	2019-02-24 20:03:24 +09:00
David Zhao	3a9835fcdd	Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic	2019-02-24 18:11:08 +09:00
David Zhao	f4acd6e48f	Move PlayerLoader tests out of constructor, Improve Documentation	2019-02-24 18:10:59 +09:00
Dean Herbert	b140fc973a	Merge branch 'master' into UserDimLogic	2019-02-24 17:48:59 +09:00
Dan Balasescu	bd83a95a4f	Merge branch 'master' into fix-download-failure-exception	2019-02-24 16:01:18 +09:00
Dean Herbert	2281a0235d	Fix regression causing playback rate to display incorrectly	2019-02-24 15:27:06 +09:00
Dean Herbert	56397dbea6	Ensure beatmap is not disabled before continuing with present	2019-02-24 12:08:27 +09:00
Dean Herbert	4e06d5c7cd	Avoid fatal exceptions being thrown on download failure ... Closes #4313.	2019-02-24 00:33:11 +09:00
Dean Herbert	69b9de5acd	Update framework	2019-02-23 21:13:53 +09:00
David Zhao	809ab86ed0	Fix user ID not being added to database ... Needed for avatar retrieval	2019-02-23 17:04:02 +09:00
Dean Herbert	90cae0a69c	Simplify RulesetInputManager further	2019-02-23 15:48:34 +09:00
David Zhao	f8d18285a8	Fix backgrounds not properly being faded in song select	2019-02-23 14:59:54 +09:00
Dean Herbert	6d3c0e3191	Holy sheet	2019-02-23 14:39:55 +09:00
Dean Herbert	0c218eb0d5	Apply new RulesetInputManager logic ... Run UpdateSubTree twice to ensure correctness	2019-02-23 14:14:41 +09:00
Dean Herbert	490fb86f9e	Make base class abstract and add documentation	2019-02-23 14:14:34 +09:00
Dean Herbert	3495aa645f	Update headers	2019-02-23 14:14:34 +09:00
David Zhao	d59ba8cfe9	Rename base player test class to RateAdjustedBeatmap, refactor input tests	2019-02-23 14:14:34 +09:00
David Zhao	1fdb8ca37a	Fix auto-generated lisence header	2019-02-23 14:14:34 +09:00
David Zhao	8e09c66cbb	Split out testcase player for use in slider input tests	2019-02-23 14:14:34 +09:00
Roman Kapustin	8b4aa708fa	Resolve merge conflict	2019-02-22 23:04:45 +03:00
David Zhao	bb01948283	Use .Value with new bindable changes	2019-02-22 20:44:02 +09:00
David Zhao	ab3fa91a2f	Merge branch 'master' into UserDimLogic	2019-02-22 20:38:10 +09:00
David Zhao	76de39a344	Put user dim logic in yet another container inside UserDimContainer	2019-02-22 20:34:51 +09:00
Dean Herbert	367bc53a06	Revert some more instances of 'e' variable names	2019-02-22 20:15:25 +09:00
smoogipoo	a0dae820ee	Woops	2019-02-22 19:49:37 +09:00
smoogipoo	d61dfe888e	Fix venera fonts not being correctly specified	2019-02-22 19:42:09 +09:00
Dean Herbert	3015d40f8f	Merge branch 'master' into osu-fontusage	2019-02-22 18:09:23 +09:00
David Zhao	a4162a69fb	Remove leftover usage of dimlevel in BackgroundScreenBeatmap	2019-02-22 18:01:50 +09:00
Dean Herbert	0431582959	Remove excess new line	2019-02-22 17:57:49 +09:00
Dean Herbert	3fe4b8fd1c	Update variable names ... Also cleans up some weird code	2019-02-22 17:51:39 +09:00
Dean Herbert	2c9e6adfd4	Merge branch 'master' into bindable-valuechanged	2019-02-22 17:14:05 +09:00
Dean Herbert	452caabd40	Apply suggestions from code review ... Co-Authored-By: smoogipoo <1329837+smoogipoo@users.noreply.github.com>	2019-02-22 17:06:49 +09:00
David Zhao	263972a048	Remove DimLevel bindable from ScreenWithBeatmapBackground	2019-02-22 17:00:00 +09:00
David Zhao	918a60ebbf	Create a new player every time a test is performed.	2019-02-22 16:56:03 +09:00
David Zhao	65cdac60c3	Add tests to make sure the background is always the same through screen transitions	2019-02-22 14:43:05 +09:00
Dean Herbert	f919f2252f	Add ToString for Judgements to ease debugging	2019-02-22 12:02:54 +09:00
David Zhao	94bc552282	Fix backgrounds not fading out when replaced by storyboard, add test for this	2019-02-22 11:41:28 +09:00
Dean Herbert	8f53af1c71	Update framework	2019-02-22 11:32:14 +09:00
smoogipoo	8853f7ad76	Explicitly set exo typeface in a few places	2019-02-21 19:26:02 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
David Zhao	97db8abd59	Remove unused includes	2019-02-21 18:34:11 +09:00
David Zhao	0677194f46	Move all storyboard show logic into UserDimContainer	2019-02-21 18:14:58 +09:00
David Zhao	ad5e81f0cd	Add test case for background preview, fix unit tests	2019-02-21 15:24:26 +09:00
Dean Herbert	bbeecd6c26	Merge pull request #4299 from nekodex/fix-flying-logo ... Fix osu! logo traveling in a weird direction on entering gameplay	2019-02-21 14:39:35 +09:00
smoogipoo	7e41fbc29b	Remove LegacyDifficultyCalculator	2019-02-21 13:12:37 +09:00
smoogipoo	be9be5dee2	Add some xmldocs	2019-02-20 21:04:18 +09:00
smoogipoo	062196c7da	Cleanup	2019-02-20 20:52:56 +09:00
smoogipoo	cc33f230b4	Merge remote-tracking branch 'origin/master' into osu-fontusage	2019-02-20 20:37:48 +09:00
Jamie Taylor	9b3f2fdd24	Change RelativePositionAxes default on osu! logo to be both	2019-02-20 19:34:55 +09:00
smoogipoo	4db5531e4b	Replace copy-constructor/method with extension method	2019-02-20 19:32:30 +09:00
David Zhao	f5d8700920	Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic	2019-02-20 17:40:13 +09:00
David Zhao	25e7dcb375	Remove unused includes	2019-02-20 17:39:35 +09:00
David Zhao	49c5a9fc30	Merge branch 'master' into UserDimLogic	2019-02-20 17:30:34 +09:00
David Zhao	d703a9511a	Fix background dim previews	2019-02-20 17:20:45 +09:00
David Zhao	3f000dfe2e	Remove unnecessary region	2019-02-20 16:58:12 +09:00
David Zhao	1bd1b6b099	Move user dim logic into UserDimContainer instead	2019-02-20 16:53:57 +09:00
smoogipoo	dbfa95b9e7	Made medium the default font weight	2019-02-20 16:52:36 +09:00
Dean Herbert	b1337ed07f	Update framework	2019-02-20 16:09:29 +09:00
Dean Herbert	a4768a75e2	Merge remote-tracking branch 'upstream/master' into isactive-changes	2019-02-20 16:09:24 +09:00
smoogipoo	0693ab8e7d	Merge remote-tracking branch 'origin/master' into osu-fontusage ... # Conflicts: # osu.Game/Screens/Multi/Components/BeatmapTitle.cs	2019-02-20 15:04:08 +09:00
smoogipoo	a2aa3ec5cb	Adjust sprite texts in-line with framework changes	2019-02-20 15:03:20 +09:00
Dan Balasescu	f6d70e687b	Use correct local variable ... Co-Authored-By: peppy <pe@ppy.sh>	2019-02-20 12:27:25 +09:00
Dean Herbert	a6e055b1f8	Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock	2019-02-20 12:08:37 +09:00
Dean Herbert	b4bb87fee3	Make TrackVirtualTracking more accurate on seeks/stops	2019-02-20 12:08:30 +09:00
Dan Balasescu	96590156cd	Merge branch 'master' into add-button-tooltip	2019-02-20 11:37:55 +09:00
Dean Herbert	f2ad2931c7	Merge remote-tracking branch 'upstream/master' into test-working-beatmap-clock	2019-02-20 11:37:33 +09:00
smoogipoo	49eadcb575	Update active state immediately + fix potential nullref	2019-02-19 19:44:09 +09:00
smoogipoo	703df77000	Update in-line with framework IsActive changes	2019-02-19 19:16:03 +09:00
smoogipoo	b7b1f0ef0c	Merge branch 'remove-populateattributes' into new-diffcalc-mania	2019-02-19 17:55:56 +09:00
smoogipoo	4dcf39846d	Pass beatmap to CreateSkills()	2019-02-19 17:52:59 +09:00
smoogipoo	1efc5179aa	Merge branch 'remove-populateattributes' into new-diffcalc-mania	2019-02-19 17:46:52 +09:00
smoogipoo	ca8b7f24b4	Remove PopulateAttributes()	2019-02-19 17:36:33 +09:00
smoogipoo	8104c45c25	Merge remote-tracking branch 'origin/master' into new-diffcalc-mania ... # Conflicts: # osu.Game.Rulesets.Mania/Difficulty/ManiaLegacyDifficultyCalculator.cs	2019-02-19 16:30:05 +09:00
Dean Herbert	151388dfad	Merge branch 'master' into diffcalc-merging-2	2019-02-19 15:42:15 +09:00
smoogipoo	7ed461aa8c	XMLDoc DifficultyHitObject	2019-02-19 14:30:59 +09:00
smoogipoo	93b7b51d0a	timeRate -> clockRate	2019-02-19 14:29:23 +09:00
smoogipoo	3784b673ae	History -> LimitedCapacityStack + re-xmldoc	2019-02-19 13:51:19 +09:00
smoogipoo	af0bb4d5e8	Remove mods from constructor	2019-02-19 13:40:39 +09:00
Dean Herbert	87dd7bcf6b	Fix one more test regression	2019-02-19 13:02:33 +09:00
Dean Herbert	0fce23a36b	Fix test regression	2019-02-19 12:38:45 +09:00
Dean Herbert	62fe5ad481	Nest class	2019-02-19 12:35:52 +09:00
Dean Herbert	f8033a3b35	Give TestWorkingBeatmap a reference clock	2019-02-19 12:27:30 +09:00
Dean Herbert	133c002d02	Fix test dlls being loaded as actual rulesets (and failing)	2019-02-19 12:13:55 +09:00
David Zhao	af049004dd	Add test cases for transitioning into pause overlay and into results	2019-02-18 19:53:55 +09:00
David Zhao	4e07aba548	Make it so visual tests only load the osu ruleset	2019-02-18 18:12:45 +09:00
David Zhao	1d80674fbd	Fix fadecontainer being added to multiple containers	2019-02-18 17:11:38 +09:00
David Zhao	af30aefe77	Merge branch 'master' into UserDimLogic	2019-02-18 16:56:16 +09:00
David Zhao	80800f2931	Match up fade behavior with current master	2019-02-18 16:34:11 +09:00
David Zhao	9be25c3758	Fix unit tests	2019-02-18 16:00:59 +09:00
David Zhao	f241d67e5f	Use conditional operator isntead of if	2019-02-18 15:23:03 +09:00
Dan Balasescu	c9c8cccd68	Merge branch 'master' into use-lifetime-optimization	2019-02-18 15:22:34 +09:00
smoogipoo	9cce9ce97c	Consider aggregate peaks	2019-02-18 15:00:32 +09:00
smoogipoo	a8faa942a6	Implement new difficulty calculator structure	2019-02-18 14:49:43 +09:00
David Zhao	df148f8787	Fix background dim not being disabled on playerloader exit	2019-02-18 12:55:42 +09:00
Dean Herbert	0a265c6d35	Update osu.Game/Screens/Backgrounds/BackgroundScreenBeatmap.cs ... Co-Authored-By: nyquillerium <nyquill@ppy.sh>	2019-02-18 11:54:25 +09:00
ThePyrotechnic	7bb56a198a	Merge branch 'master' into MissingSource	2019-02-17 19:54:43 +00:00
Dean Herbert	42dc7644f2	Merge branch 'master' into diffcalc-testcases	2019-02-17 21:06:42 +09:00
Dean Herbert	f0743ebecf	Merge remote-tracking branch 'upstream/master' into tournament-tools ... # Conflicts: # osu.Game.Tournament.Tests/TestCaseDrawings.cs # osu.Game/osu.Game.csproj	2019-02-17 17:25:09 +09:00
smoogipoo	134840f118	Fix nullref	2019-02-16 11:18:17 +09:00
Dean Herbert	4777fd1334	Merge remote-tracking branch 'upstream/master' into fix-screen-tests	2019-02-15 21:29:44 +09:00
Dean Herbert	c607b8c979	Update framework	2019-02-15 21:28:59 +09:00
Dean Herbert	bd4e8e132b	Merge pull request #4264 from nekodex/legacy-hitcircleoverlap-support ... Add support for the HitCircleOverlap property of legacy skins	2019-02-15 21:27:56 +09:00
Dean Herbert	90e462309f	Add newline	2019-02-15 21:16:54 +09:00
Dean Herbert	89981c02a2	Merge branch 'master' into fix-cursor-on-startup	2019-02-15 21:15:23 +09:00
Jamie Taylor	38cf5a1ea4	Add support for the HitCircleOverlap property in legacy skins	2019-02-15 21:03:06 +09:00
David Zhao	df7acc1d31	Merge branch 'UserDimLogic' of https://github.com/nyquillerium/osu into UserDimLogic	2019-02-15 17:22:04 +09:00
David Zhao	fcc3cf3b7e	Remove extra comma	2019-02-15 17:21:47 +09:00
David Zhao	8693d6a76b	Merge branch 'master' into UserDimLogic	2019-02-15 17:11:21 +09:00
Dean Herbert	5d502250d8	Fix account creation overlay not working ... Regressed with screen stack changes.	2019-02-15 17:01:51 +09:00
Dean Herbert	65721a01ab	Fix regressed screen test cases	2019-02-15 17:01:06 +09:00
David Zhao	53b7fdd834	Clean up test code and unused includes	2019-02-15 16:57:53 +09:00
Jamie Taylor	3ea13b1ade	Fix mouse cursor appearing prematurely during startup	2019-02-15 16:55:39 +09:00
David Zhao	0a60f6dacd	Documentation for tests and changes	2019-02-15 16:50:37 +09:00
David Zhao	6da9f94ae3	Fix regression with background dim	2019-02-15 16:17:01 +09:00
smoogipoo	280081d589	Fix beatmap ruleset not being set	2019-02-15 14:42:42 +09:00
Dean Herbert	490d48fa5e	Fix MultiplayerTestCase not being abstract	2019-02-15 13:48:14 +09:00
Dean Herbert	1550908edb	Add tooltip to key configuration button	2019-02-15 11:56:33 +09:00
Poyo	66de451b53	Update difficulty color bracket thresholds	2019-02-14 02:19:41 -08:00
David Zhao	3a74ad678a	clean up unused includes	2019-02-14 18:41:10 +09:00
David Zhao	a09e0790e1	Fix storyboards not dimming	2019-02-14 18:07:28 +09:00
David Zhao	e2a312a663	Move user dimming logic into its own container	2019-02-14 17:47:53 +09:00
Dean Herbert	777a606b2d	Don't revert beatmap on exiting leased state	2019-02-14 17:14:58 +09:00
Dean Herbert	813b36e98e	Merge pull request #4191 from peppy/leased-bindables-dont-work ... Add screen leased bindables via DependencyContainer	2019-02-14 17:05:39 +09:00
Dan Balasescu	9a0859464d	Merge branch 'master' into leased-bindables-dont-work	2019-02-14 16:24:10 +09:00
smoogipoo	f50a0be29d	Add osu! difficulty calculator test	2019-02-14 16:22:14 +09:00
Dean Herbert	3c16b03c60	Merge remote-tracking branch 'upstream/master' into download_button_should_observe_beatmaps_availability	2019-02-14 16:21:06 +09:00
Dean Herbert	a5f1f9830b	Fix potential schedule race case and regression in enum setting	2019-02-14 16:21:01 +09:00
Dean Herbert	503219b528	Merge branch 'master' into dont-log-passwords	2019-02-14 15:52:04 +09:00
Dean Herbert	cf66fc6924	Update framework	2019-02-14 13:29:07 +09:00
Dean Herbert	94ceb1e32b	Move screen change allowance to local usage	2019-02-14 13:28:21 +09:00
Roman Kapustin	a289cb7c6a	Handle beatmapset removal in DownloadTrackingComposite	2019-02-13 22:11:46 +03:00
Roman Kapustin	99046f16e8	Revert "Update direct download button state on beatmap import and removal" ... This reverts commit 11234d3c60.	2019-02-13 22:04:49 +03:00
Dean Herbert	5318de29b4	Fix import logic again	2019-02-13 19:57:54 +09:00
Dean Herbert	e604806398	Fix regression in screen change allowance logic	2019-02-13 19:43:01 +09:00
Dean Herbert	3ec94e4ab3	Remove disable setting	2019-02-13 15:14:34 +09:00
Dean Herbert	43843ac558	Remove explicit dispose	2019-02-13 14:58:40 +09:00
Dean Herbert	1373e0fad0	Fix BeatmapTitle not always displaying	2019-02-13 14:57:40 +09:00
Dean Herbert	166cdab2e8	Remove unnecessary null check	2019-02-13 14:14:57 +09:00
Dean Herbert	ab3adafafd	Fix crashes after entering player	2019-02-13 14:13:54 +09:00
Dan Balasescu	c3ae4d7b14	Improve comment ... Co-Authored-By: peppy <pe@ppy.sh>	2019-02-13 11:34:48 +09:00
Dean Herbert	19bef01dd0	Attempt to maybe fix tests	2019-02-13 11:05:02 +09:00
Michael Manis	5fbdbcf209	removed 'unknown source' line	2019-02-12 15:30:42 -05:00
Roman Kapustin	11234d3c60	Update direct download button state on beatmap import and removal	2019-02-12 21:20:49 +03:00
Dean Herbert	f08d5f058c	Merge branch 'master' into notify_track_completion_failure	2019-02-13 01:34:18 +09:00
Dean Herbert	b967b93b88	Fix regressions in tests	2019-02-12 19:53:08 +09:00
Dean Herbert	2ea839c475	Fix crashes on beatmap not being set correctly in player	2019-02-12 19:18:22 +09:00
Dean Herbert	a28689ff4c	Update framework	2019-02-12 17:58:36 +09:00
Dean Herbert	d5cce850a8	Revert some unnecessary complications in logo logic	2019-02-12 13:29:41 +09:00
Dean Herbert	272584eb79	Improve file layouts	2019-02-12 13:02:33 +09:00
Dean Herbert	78b47f9fe3	Fix starting matches not working	2019-02-12 11:19:42 +09:00
Dean Herbert	e57409fe41	Remove unnecessary bindable properties on mod lists	2019-02-12 10:51:39 +09:00
Dean Herbert	e4422167b6	Fix starting gameplay	2019-02-11 19:13:57 +09:00
Dean Herbert	88ffc78103	Restructure	2019-02-11 19:11:34 +09:00
Dean Herbert	e2e615cc5c	Merge branch 'master' into leased-bindables-dont-work	2019-02-11 16:30:12 +09:00
ThePyrotechnic	450fa0075f	Merge branch 'master' into MissingSource	2019-02-10 23:44:47 +00:00
Michael Manis	cfe14dcdb1	Options for handing unknown beatmap source	2019-02-10 18:31:39 -05:00
EVAST9919	0bd8fdb56d	Merge remote-tracking branch 'refs/remotes/ppy/master' into update-beatmap-scores-design	2019-02-10 04:46:11 +03:00
EVAST9919	4d489da032	small visual improvements	2019-02-10 04:16:56 +03:00
EVAST9919	04e57d7d3d	Refactor to make things more flexible	2019-02-09 06:23:58 +03:00
EVAST9919	105053e91b	TestCase fix	2019-02-09 00:56:41 +03:00
EVAST9919	107e0a5239	Warning fixes	2019-02-08 20:43:11 +03:00
EVAST9919	bd1f4f9549	Small design fixes	2019-02-08 20:35:07 +03:00
EVAST9919	13c154a0b3	Fix background colour and a bug with removing scores	2019-02-08 20:07:21 +03:00
EVAST9919	7a3ae0f479	update drawable score inline with the latest design	2019-02-08 19:50:02 +03:00
Roman Kapustin	d3721707fb	Update framework	2019-02-08 19:48:56 +03:00
UselessToucan	b5e04f6161	Merge branch 'master' into notify_track_completion_failure	2019-02-08 19:37:23 +03:00
EVAST9919	f43ee6b6a3	update drawable top score inline with the latest design	2019-02-08 19:06:46 +03:00
EVAST9919	4b7b174f75	Merge remote-tracking branch 'refs/remotes/ppy/master' into update-beatmap-scores-design	2019-02-08 18:35:18 +03:00
Dean Herbert	a30d3739cf	Merge remote-tracking branch 'upstream/master' into cmc-rooms	2019-02-08 18:45:39 +09:00
Dean Herbert	f52cac966b	Fix multiple blank lines	2019-02-08 18:45:32 +09:00
Dean Herbert	6c4d289901	Pass item rather than ID	2019-02-08 18:33:49 +09:00
Dan Balasescu	7ec0b4ba77	Fix nullref during room creation (#4228)	2019-02-08 17:53:01 +09:00
Dean Herbert	e8aed6b686	Update framework	2019-02-08 17:38:18 +09:00
Dan Balasescu	959b1ac845	Fix potential nullref when exiting multiplayer (#4227) ... Fixes https://github.com/ppy/osu/issues/3954	2019-02-08 17:28:00 +09:00
smoogipoo	7aca0f4a1d	Fix failing test cases	2019-02-08 16:08:23 +09:00
smoogipoo	febcd7d7c0	Remove currentRoom from RoomManager	2019-02-08 15:46:16 +09:00
smoogipoo	fdd37dbc4b	Merge remote-tracking branch 'origin/master' into cmc-rooms	2019-02-08 15:44:33 +09:00
smoogipoo	b5cc0ec8db	Update framework	2019-02-08 15:44:11 +09:00
smoogipoo	5643dc2e99	Remove redundant qualifiers	2019-02-08 15:44:05 +09:00
smoogipoo	6fe1f57236	Fix crash when start button is repeatedly pressed	2019-02-08 15:39:11 +09:00
smoogipoo	99a7ccc01a	Slight cleanup in multiplayer	2019-02-08 15:38:05 +09:00
smoogipoo	43240ea85e	Fix playlist issues with room creation	2019-02-08 15:23:03 +09:00
smoogipoo	42cd55e0d7	Move current room to multiplayer	2019-02-08 14:57:51 +09:00
Dean Herbert	2a9da602cb	Use nuget packages again	2019-02-08 13:07:57 +09:00
smoogipoo	7f13e3c5f7	Directly resolve the filter bindable	2019-02-08 13:02:17 +09:00
smoogipoo	990bd44ca2	Combine roommanager and roompollingcomponent	2019-02-08 13:01:10 +09:00
smoogipoo	17fdfc15d9	Fix room title in the breadcrumbs	2019-02-07 20:09:49 +09:00
smoogipoo	1c2450a95a	Fix up room inspector status	2019-02-07 17:59:14 +09:00
smoogipoo	1e0135af6f	Move StatusColouredContainer into a more public location	2019-02-07 17:52:40 +09:00
smoogipoo	2d61548251	Fix room name being coloured	2019-02-07 16:45:36 +09:00
smoogipoo	4f86fe92ea	Fix match settings not showing	2019-02-06 18:50:43 +09:00
ProgrammaticNajel	9f8e724a76	Fix background being cut off at the top of the screen (#4207) ... Fix background being cut off at the top of the screen	2019-02-06 18:14:33 +09:00
smoogipoo	3207983a1c	Fix current room being set to null when parted	2019-02-06 15:12:40 +09:00
smoogipoo	a9aa22c97b	Remove ShadowModel requirement	2019-02-06 13:52:48 +09:00
EVAST9919	9cca11fb0d	Warning fixes	2019-02-06 01:48:43 +03:00
EVAST9919	c85dc1a236	update another scores design	2019-02-05 19:32:33 +03:00
EVAST9919	f560dde157	Add some flow for info containers	2019-02-05 15:26:45 +03:00
EVAST9919	559960036e	update top score design	2019-02-05 14:48:35 +03:00
smoogipoo	594dffba41	Fix a few cases of missed instant invocation	2019-02-05 19:11:20 +09:00
smoogipoo	aac371ba6e	Use CMC for all of multiplayer	2019-02-05 19:00:08 +09:00
Dean Herbert	2f8f4fac64	Fix combo colour fallbacks when skin is not providing any	2019-02-05 17:54:14 +09:00
smoogipoo	be51ee4ed5	Implement MultiplayerComposite, replaces RoomBindings	2019-02-05 16:14:37 +09:00
smoogipoo	d9537017c8	Use CMC in the Multiplayer screen	2019-02-05 16:03:05 +09:00
smoogipoo	37c1f5a824	Split polling logic from RoomManager, now a container	2019-02-05 15:38:19 +09:00
Dan Balasescu	84ab16c7c8	Merge branch 'master' into keybindings-settings-groups	2019-02-05 11:42:53 +09:00
Dean Herbert	216030fe64	Merge branch 'master' into fix-background-fade-2	2019-02-04 22:32:50 +09:00
smoogipoo	065b0c9076	Fix background not being faded correctly	2019-02-04 17:04:52 +09:00
Dan Balasescu	779477959f	Merge branch 'master' into fix_song_rearranging_in_music_controller_playlist	2019-02-04 15:39:29 +09:00
Dean Herbert	91d875db0d	Remove unused local	2019-02-04 12:56:55 +09:00
Dean Herbert	cd92dddd46	Add per-ruleset mappings	2019-02-04 12:31:05 +09:00
Dean Herbert	2d7c23dd9f	Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics	2019-02-04 12:15:53 +09:00
EVAST9919	d6d5bb5ecf	remove useless nullcheck	2019-02-03 17:20:35 +03:00
EVAST9919	eeecbfcbe0	Fix warnings	2019-02-03 17:09:04 +03:00
Roman Kapustin	71efbcf603	Merge remote-tracking branch 'ppy/master' into notify_track_completion_failure	2019-02-03 16:14:04 +03:00
EVAST9919	4b17ca0857	Fix wrong icons	2019-02-03 14:50:03 +03:00
Unknown	ead28e7102	stop logging keyboard events from password textbox	2019-02-03 12:34:38 +01:00
EVAST9919	3b529b7bda	Enable the sidebar and move "back" button to the key binding overlay	2019-02-03 14:34:04 +03:00
Dean Herbert	482a01e7ba	Merge branch 'master' into tournament-tools ... # Conflicts: # osu.Game/Online/API/Requests/Responses/APIBeatmap.cs # osu.Game/OsuGameBase.cs # osu.Game/Overlays/ChatOverlay.cs # osu.Game/Screens/Menu/MainMenu.cs # osu.Game/Screens/Tournament/Drawings.cs # osu.Game/Screens/Tournament/Teams/DrawingsTeam.cs # osu.Game/osu.Game.csproj # osu.sln	2019-02-02 19:09:48 +09:00
Dean Herbert	e01f342ab0	wip	2019-02-02 17:11:25 +09:00
Roman Kapustin	4c866e7940	Add PlaylistItemHandle.HandlePositionalInput override	2019-02-01 22:37:27 +03:00
Dean Herbert	ca5c8d37d1	Use leased bindables	2019-02-01 16:44:06 +09:00
Dean Herbert	499e06797a	Merge pull request #4114 from peppy/fix-replay-multiplier-text ... Fix replay playback speed not being displayed initially	2019-01-31 22:24:42 +09:00
Unknown	e6fa78109d	Merge branch 'master' into correct-preview-loop	2019-01-31 13:30:55 +01:00
Dan Balasescu	9968bdc0e4	Merge branch 'master' into download-tracking-component	2019-01-31 21:18:03 +09:00
Dean Herbert	3da851d93e	Merge branch 'master' into fix-replay-multiplier-text	2019-01-31 21:17:40 +09:00
Dean Herbert	7ce9a915b7	Merge branch 'master' into fix-osu-logo	2019-01-31 21:08:49 +09:00
Dan Balasescu	b85e119bae	Merge branch 'master' into reg-screen-focus-fix	2019-01-31 21:08:12 +09:00
Unknown	8c1f8ee596	restart correctly when leaving player (without noises)	2019-01-31 12:33:08 +01:00
Dean Herbert	cea82708ee	Merge branch 'master' into use-lifetime-optimization	2019-01-31 20:20:40 +09:00
Dean Herbert	d1c8ee65a5	Fix osu! logo potentially appearing during game load in a weird place	2019-01-31 19:22:29 +09:00
Dean Herbert	e191609067	Merge remote-tracking branch 'upstream/master' into download-tracking-component	2019-01-31 19:17:48 +09:00
Dean Herbert	c7cf3ef1cd	Update licence headers	2019-01-31 19:17:42 +09:00
Dean Herbert	7c6512118e	Fix importing progress bar not displaying	2019-01-31 19:15:17 +09:00
Dean Herbert	0b8bd520ab	Shake in all cases	2019-01-31 19:15:04 +09:00
Dean Herbert	b89694a969	Fix "importing" state display	2019-01-31 19:09:04 +09:00
Dean Herbert	041e3bf823	Handle unbinding better	2019-01-31 19:08:54 +09:00
Dean Herbert	b69a19f810	Attach progress immediately	2019-01-31 19:08:45 +09:00
Unknown	e2347ae7bf	Merge branch 'master' into correct-preview-loop	2019-01-31 10:53:09 +01:00
Dean Herbert	c54a515b3e	Change where BindValueChange is immediately run	2019-01-31 18:49:54 +09:00
Dean Herbert	7f2fdac50e	Update signatures	2019-01-31 18:47:30 +09:00
Dean Herbert	327a34f12a	Merge remote-tracking branch 'upstream/master' into download-tracking-component ... # Conflicts: # osu.Game/Beatmaps/Drawables/BeatmapSetDownloader.cs	2019-01-31 18:45:09 +09:00
Dean Herbert	09056fd0d8	Merge branch 'master' into resources-via-nuget	2019-01-31 18:40:45 +09:00
Dean Herbert	ba6176fd03	Fix major regression in scaling behaviour	2019-01-31 18:28:46 +09:00
Dean Herbert	f85518b175	Don't expose padding	2019-01-31 18:16:28 +09:00
Dean Herbert	b48bb5b792	Move parallax logic out of BackgroundScreenStack	2019-01-31 18:10:33 +09:00
smoogipoo	bdaff27575	Fix nullref due to screens now being removed from parent	2019-01-31 15:02:07 +09:00
smoogipoo	b90207fa54	Give ScreenTestCase a background stack	2019-01-31 14:55:48 +09:00
smoogipoo	255b4a30e0	Allow logo to be null	2019-01-31 13:50:37 +09:00
smoogipoo	58d744e5dc	Remove manual overlay/toolbar logic from multiplayer	2019-01-31 13:38:21 +09:00
Dean Herbert	aac921c298	Update framework again	2019-01-31 13:33:21 +09:00
Dean Herbert	e8c39b9c37	Fix test screen loading	2019-01-31 11:00:44 +09:00
Dean Herbert	beab367e6d	Add null checks/allowances	2019-01-31 11:00:33 +09:00
Dean Herbert	d34aa50613	Merge branch 'master' into iscreen	2019-01-31 01:08:06 +09:00
smoogipoo	ac0bc53c4b	Revert "Merge pull request #4154 from phosphene47/carousel-wedge-level" ... This reverts commit cc8793a45e, reversing changes made to 94276c8abb.	2019-01-31 00:02:05 +09:00
smoogipoo	a8a34f8f20	Update framework	2019-01-30 23:56:14 +09:00
smoogipoo	5e78f51e24	Fix multiplayer crashing when exiting from lounge	2019-01-30 23:56:03 +09:00
Aergwyn	c2297b0c3b	Fix incorrect param doc ... Co-Authored-By: peppy <pe@ppy.sh>	2019-01-29 23:04:48 +09:00
smoogipoo	82dc7f39a3	Update licenses	2019-01-29 21:48:35 +09:00
smoogipoo	b5d187c4af	Fix post-merge errors	2019-01-29 21:27:32 +09:00
smoogipoo	91302ea0bc	Merge remote-tracking branch 'origin/master' into iscreen ... # Conflicts: # osu.Game/Screens/Multi/Match/MatchSubScreen.cs # osu.Game/Screens/Multi/Multiplayer.cs # osu.Game/Screens/Multi/MultiplayerSubScreen.cs # osu.Game/Screens/OsuScreen.cs # osu.Game/osu.Game.csproj # osu.sln	2019-01-29 21:21:36 +09:00
Dean Herbert	baea9691cc	Fix baetmap downloads using too much memory	2019-01-29 18:34:10 +09:00
Dean Herbert	23d0399e51	Allow deselection of textboxes on registration screen on mobile devices	2019-01-29 17:23:23 +09:00
ekrctb	8955d5de04	Update hit object result when lifetime is end	2019-01-29 15:25:27 +09:00
Dean Herbert	bbc24bbfdd	Merge remote-tracking branch 'upstream/master' into resources-via-nuget ... # Conflicts: # osu-resources # osu.sln	2019-01-29 12:19:35 +09:00
ekrctb	504e79b968	Merge branch 'master' into use-lifetime-optimization	2019-01-29 12:15:02 +09:00
Nitrous	ea4e79751e	Merge branch 'master' into mod-wind	2019-01-28 17:48:57 +08:00
Dean Herbert	628b3e1119	Move osu-resources to nuget	2019-01-28 18:33:39 +09:00
smoogipoo	7b1c1f3728	Move toolbar showing and overlay activation to OsuGame ... Now exposed through IOsuScreen.	2019-01-28 15:42:06 +09:00
Dean Herbert	354a99f5e1	Merge branch 'master' into samah-ios	2019-01-28 15:34:46 +09:00
Dean Herbert	8118b649d8	Merge branch 'master' into show-mods-on-loader	2019-01-28 14:11:54 +09:00
Dan Balasescu	47f35c423b	Merge branch 'master' into carousel-wedge-level	2019-01-28 13:49:12 +09:00
Dan Balasescu	610c2df2d4	Merge branch 'master' into dont-always-focus-textboxes	2019-01-28 13:40:08 +09:00
Dean Herbert	a208874e74	Fix incorrect handling of download failures	2019-01-28 11:59:25 +09:00
jorolf	648ed0e467	update license headers	2019-01-27 23:45:00 +01:00
jorolf	54d8e4043f	Merge branch 'master' of git://github.com/ppy/osu into profile-header-update	2019-01-27 23:32:48 +01:00
Jack Scotson	6a2100ddba	Merge branch 'master' into menu-globalaction-select	2019-01-27 19:13:34 +00:00
Scotsoo	c00636d328	Removing whitespace	2019-01-27 19:09:30 +00:00
Scotsoo	29c02fbaa7	Remove redundant space	2019-01-27 18:27:11 +00:00
Scotsoo	07bb278ec0	Considering GlobalActions in GameplatMenuOverlay	2019-01-27 18:19:20 +00:00
LeNitrous	03e57d0423	fix codefactor warnings and derive ModWindUp and ModWindDown to ModTimeRamp	2019-01-26 20:15:19 +08:00
LeNitrous	a1ce7e9a95	add ModDisplay on PlayerLoader	2019-01-26 17:14:45 +08:00
Unknown	1fa87521f6	fix restarting with a different track in the same BeatmapSet	2019-01-26 07:29:30 +01:00
Unknown	3d5520d277	correctly loop from preview point in SongSelect	2019-01-26 07:09:01 +01:00
LeNitrous	d920ee67ee	forgot last whitespace	2019-01-26 13:47:33 +08:00
LeNitrous	73dbf5712d	add license headers	2019-01-26 13:43:27 +08:00
LeNitrous	39072376dd	revert WorkingBeatmap back to protected	2019-01-26 13:40:41 +08:00
LeNitrous	d76681aa82	use IApplicableToBeatmap instead of IApplicableToRulesetContainer	2019-01-26 13:39:23 +08:00
LeNitrous	c6e26a92ec	add wind up and wind down mods	2019-01-26 12:15:45 +08:00
Shane Woolcock	a14ad4f53f	Merge branch 'master' into samah-ios	2019-01-25 22:43:21 +10:30
smoogipoo	117703374e	Fix logo animations	2019-01-25 21:02:35 +09:00
smoogipoo	60cc2314ef	Fix ruleset + beatmap being changeable in match	2019-01-25 21:02:30 +09:00
phosphene47	5c70be07ab	Display carousel over beatmap info wedge	2019-01-25 22:58:55 +11:00
smoogipoo	b3403c78da	Fix a few potential crashes	2019-01-25 20:47:37 +09:00
smoogipoo	e2891ab1e9	Fix anchors + origins	2019-01-25 20:47:31 +09:00
smoogipoo	95e6785968	Make Multiplayer not an OsuScreen	2019-01-25 20:25:55 +09:00
Dean Herbert	28f529ca19	Rename to host	2019-01-25 20:24:32 +09:00
Dean Herbert	0b587baab8	Merge remote-tracking branch 'upstream/master' into fix-texture-loader-stores	2019-01-25 20:23:51 +09:00
Dean Herbert	4d032af26d	Merge pull request #3919 from peppy/fix-idle-weirdness ... Fix global idle state being entered when overlays are visible	2019-01-25 20:18:33 +09:00
Dean Herbert	a110569f56	Merge pull request #4151 from peppy/fix-sensitivity-tooltip ... Fix cursor sensitivity tooltip not updating instantly	2019-01-25 20:17:56 +09:00
Dean Herbert	4d982adf69	Merge branch 'master' into fix-idle-weirdness	2019-01-25 19:48:52 +09:00
Aergwyn	c8c375636f	Use lambda ... Co-Authored-By: peppy <pe@ppy.sh>	2019-01-25 19:34:25 +09:00
smoogipoo	e1e7759e0f	Re-implement MultiplayerSubScreen	2019-01-25 19:32:37 +09:00
smoogipoo	3fb17ead06	Fix breadcrumbs crash when last screen exits	2019-01-25 19:31:58 +09:00
Dean Herbert	49051a359f	Merge branch 'dont-always-focus-textboxes' into samah-ios	2019-01-25 19:22:26 +09:00
Unknown	77763fde8b	revert accidentally renamed variables	2019-01-25 11:22:05 +01:00
Dean Herbert	260034a80e	Don't auto-focus textboxes when on screen keyboard would cause inconvenience	2019-01-25 19:20:29 +09:00
Dean Herbert	82d944dc89	Fix textbox colours not always being set corrrectly	2019-01-25 19:20:29 +09:00
Unknown	4a916b2dee	replace license headers with new ones	2019-01-25 11:17:48 +01:00
Unknown	8ddff673b7	revert previous rename and rename ruleset specific classes instead	2019-01-25 11:14:37 +01:00
Dean Herbert	9e8347413b	Merge remote-tracking branch 'origin/fix-texture-loader-stores' into samah-ios ... # Conflicts: # osu.Game/Beatmaps/BeatmapManager.cs	2019-01-25 18:59:22 +09:00
Unknown	5446c99f22	Merge branch 'master' into move-osu-settings	2019-01-25 10:57:04 +01:00
Dean Herbert	159ac7359e	Merge branch 'update-framework' into samah-ios	2019-01-25 18:52:17 +09:00
Dean Herbert	144533706e	Update framework	2019-01-25 18:51:29 +09:00
Dean Herbert	e3fde56780	Merge remote-tracking branch 'origin/fix-idle-weirdness' into samah-ios	2019-01-25 18:49:41 +09:00
Dean Herbert	f4729d41f3	Merge branch 'master' into samah-ios	2019-01-25 18:49:08 +09:00
smoogipoo	da135346b2	Fix screen titles	2019-01-25 18:38:48 +09:00
smoogipoo	15100632f1	Remove MultiplayerSubScreen and fix multiplayer crashes	2019-01-25 18:26:04 +09:00
Dean Herbert	4a59ccb81d	Merge branch 'master' into fix-idle-weirdness	2019-01-25 17:52:59 +09:00
Dean Herbert	a5f1aa644b	Fix cursor sensitivity tooltip not updating instantly	2019-01-25 17:30:35 +09:00
smoogipoo	f0e0088f43	Create a custom background stack to fix various background issues	2019-01-25 15:36:22 +09:00
Dean Herbert	a25dce53cd	Fix logical regression	2019-01-25 15:03:32 +09:00
Dean Herbert	e88d36ed38	Merge branch 'master' into fix-multiplayer-parallax-overflow	2019-01-25 14:55:28 +09:00
Dean Herbert	7ed215c521	Make InternalPadding a bit simpler	2019-01-25 14:46:45 +09:00
Dean Herbert	787d4da153	Combine constant	2019-01-25 14:10:59 +09:00
Dean Herbert	99d349c865	Merge branch 'master' into fix-texture-loader-stores	2019-01-25 12:39:02 +09:00
Dean Herbert	2b250aa47b	Merge branch 'master' into fix-tracked-config-disposal	2019-01-25 12:14:58 +09:00
Dean Herbert	c3b73d2d53	ALlow null host	2019-01-25 12:08:31 +09:00
Dean Herbert	014ea972d9	Merge remote-tracking branch 'origin/master' into samah-ios	2019-01-25 11:51:44 +09:00
Dean Herbert	bda5a90252	Readonly variable	2019-01-25 11:50:52 +09:00
Dean Herbert	6b3d53750c	Fix remaining cases of not using host-created TextureLoaderStore	2019-01-25 11:48:28 +09:00
Unknown	f07ac8ebd8	remove osu! specific settings from global config again	2019-01-24 16:11:55 +01:00
Unknown	2bbaa2ac60	silently return instead of throwing	2019-01-24 16:02:47 +01:00
ProgrammaticNajel	4cae9bae83	Merge branch 'master' into fix-multiplayer-parallax-overflow	2019-01-24 20:41:10 +08:00
ProgrammaticNajel	593e0b36f5	Add overflow padding in other multiplayer screen components ... Added padding to Room Creation and Beatmap Selection in Multiplayer.	2019-01-24 19:42:35 +08:00
smoogipoo	a7e281469b	Fix game exiting instantly on pressing close button	2019-01-24 20:13:29 +09:00
smoogipoo	50a384e19c	Fix game not exiting	2019-01-24 20:13:19 +09:00
smoogipoo	28f5c950ec	Fix player never completing load	2019-01-24 19:55:42 +09:00
smoogipoo	8ea7ec6445	Convert everything to use IScreen	2019-01-24 19:47:44 +09:00
ProgrammaticNajel	9fcefa7d69	Typo fix	2019-01-24 18:18:32 +08:00
ProgrammaticNajel	e4084b7d5d	Add overflow padding in other multiplayer screen components ... Added overflow padding in room selection screen (Header, Room Info, Leaderboards, and Room Chat)	2019-01-24 17:40:48 +08:00
Dean Herbert	a580c17949	Fix codefactor issue	2019-01-24 17:46:09 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
ProgrammaticNajel	7ac20c3545	Add overflow padding to account for parallax shifting ... Added overflow padding in the Multiplayer screen, and adjusting content (LoungeSubScreen, FilterControl, Header, "Create Room" button) to account for this padding.	2019-01-24 16:11:24 +08:00
Unknown	4a9bcf4937	rename OsuConfigManager to GameConfigManager ... also OsuSetting to GameSetting	2019-01-23 13:17:29 +01:00
Unknown	93c9037394	fix crash when config doesn't have tracked settings	2019-01-23 13:09:03 +01:00
Shane Woolcock	728c744e4d	Merge branch 'master' into samah-ios	2019-01-23 22:19:49 +10:30
Dean Herbert	7415a6e764	Cache input manager	2019-01-23 20:37:56 +09:00
Dean Herbert	484268f1f2	Expose CalculateAccuracy for performance tools	2019-01-23 20:30:32 +09:00
Dean Herbert	4c8e7a26dc	Merge branch 'master' into fix-idle-weirdness	2019-01-23 18:53:52 +09:00
Dean Herbert	1730ad143f	Merge branch 'master' into fix-key-counter	2019-01-23 18:22:08 +09:00
Dan Balasescu	067f290e6e	Merge branch 'master' into fix-key-counter	2019-01-23 17:49:21 +09:00
Christian Kamphausen	512e75982f	Merge branch 'master' into fix-transparent-background-on-screen-scale-modes	2019-01-23 09:49:19 +01:00
chrisny286	76700ad20f	Merge branch 'fix-transparent-background-on-screen-scale-modes' of https://github.com/chrisny286/osu into fix-transparent-background-on-screen-scale-modes	2019-01-23 09:40:44 +01:00
chrisny286	03e3247baf	replace FadeTo in PlayerLoader ... didnt notice that interaction yet. yes this makes it neccessary.	2019-01-23 09:40:38 +01:00
Dean Herbert	1025c51e0d	Allow filtering settings matching based on dropdown content	2019-01-23 17:30:05 +09:00
Dean Herbert	4180ca75bc	Fix typo in comment	2019-01-23 17:14:08 +09:00
chrisny286	bb56c4a1a7	use Color4.Black and White + using osuTK.Graphics	2019-01-23 09:08:34 +01:00
chrisny286	5d2b2ecf06	Merge remote-tracking branch 'upstream/master' into fix-transparent-background-on-screen-scale-modes	2019-01-23 08:52:46 +01:00
chrisny286	f4ebab2d3a	Fix backgrounds being transparent in some scaling modes ... by replacing `.FadeTo` at the necessary places with `.FadeColour`. restoring the `.FadeColour` in `fadeOut` of the Player Screen which is ran in every exit scenario.	2019-01-23 08:52:25 +01:00
Dean Herbert	c18ce2c23a	Formatting fixes	2019-01-23 14:51:25 +09:00
Dean Herbert	49633b3394	Fix key counter receptor getting overwritten by async load drawables	2019-01-23 14:51:25 +09:00
Dean Herbert	f107a922b4	Add tests for key counter inside player heirarchy	2019-01-23 14:51:25 +09:00
Christian Kamphausen	5e31db275d	Merge branch 'master' into Fix-OsuSliderBar-tooltip-not-updating-in-special-case	2019-01-23 04:14:59 +01:00
chrisny286	260011fc13	remove manual update ... misunderstood that earlier	2019-01-23 04:05:03 +01:00
chrisny286	fe5d34a657	replace as requested	2019-01-23 03:25:56 +01:00
chrisny286	47181cf5d7	add back update in onUserChange	2019-01-23 03:21:09 +01:00
Dean Herbert	e4007fcf23	Merge branch 'master' into download-tracking-component	2019-01-23 11:12:57 +09:00
Dean Herbert	7d6d7cf457	Merge remote-tracking branch 'upstream/master' into download-tracking-component ... # Conflicts: # osu.Game/Overlays/BeatmapSet/Buttons/DownloadButton.cs	2019-01-23 11:06:29 +09:00
chrisny286	13ba9d64d0	revert empty line	2019-01-23 02:56:00 +01:00
chrisny286	12503b4d07	revert and make VisibilityContainer not AlwaysPresent	2019-01-23 02:37:17 +01:00
chrisny286	f01ba17d1f	add check if replay is loaded before allowseeking can be overwitten	2019-01-23 02:12:40 +01:00
chrisny286	cabcfffdeb	Fix autoplay rewind/skip usable when UI hidden	2019-01-23 01:16:37 +01:00
jorolf	14d2ed7085	fix codefactor issue that I didn't notice and has been there for 12 days	2019-01-22 19:50:42 +01:00
chrisny286	3f96231b2f	convert to method group	2019-01-22 19:34:26 +01:00
chrisny286	09a2b287f9	Fix Tooltip not updating in special case ... When the Bindvalue of the Sliderbar gets changed by a line like "Bindable.Value = ..." the sliderbar will only update the nubs but wont run any methods which contain the updateToolTipText(T value) function. Example scenario: Two interlinked sliderbars which change the value of each other in certain cases.	2019-01-22 18:29:30 +01:00
Dean Herbert	09553550a3	Remove remaining supporter check	2019-01-23 00:19:39 +09:00
Dean Herbert	f33f91dadb	Merge pull request #4108 from peppy/fix-toolbar-padding-regression ... Fix overlays not being correctly offset by toolbar padding	2019-01-22 21:29:36 +09:00
Shane Woolcock	59eb33684d	Merge branch 'master' into samah-ios	2019-01-22 22:07:15 +10:30
Shane Woolcock	0c56942761	Code sanity	2019-01-22 21:32:23 +10:30
Shane Woolcock	fe86b14659	Update framework	2019-01-22 21:14:13 +10:30
Dean Herbert	863756a252	Merge pull request #4115 from peppy/allow-download-no-supporter ... Allow full osu!direct usage regardless of supporter status	2019-01-22 19:26:30 +09:00
Dan Balasescu	e35b0093f3	Merge branch 'master' into fix-toolbar-padding-regression	2019-01-22 19:18:02 +09:00
Dean Herbert	828b9451e5	Update framework	2019-01-22 16:48:32 +09:00
ekrctb	fe2b83279e	Correct wrong logic ... `OnlineBeatmapSetID == null` was the problem	2019-01-22 16:40:32 +09:00
ekrctb	0095521fc2	Use both OnlineBeatmapSetID and Hash	2019-01-22 16:10:04 +09:00
ekrctb	1d5f5865aa	Fix PresentBeatmap not working for unsubmitted beatmap set	2019-01-22 15:19:42 +09:00
Dean Herbert	5ea6e8e247	Allow full osu!direct usage regardless of supporter status for now	2019-01-22 14:22:38 +09:00
Dean Herbert	c58fe4f4ff	Fix nullref	2019-01-22 13:18:01 +09:00
Dean Herbert	cebeb0a219	Fix replay playback speed not being displayed initially	2019-01-22 11:40:57 +09:00
Dean Herbert	635046acff	Merge branch 'master' into taiko-namespace	2019-01-22 10:26:25 +09:00
Dean Herbert	21317806c9	Merge remote-tracking branch 'upstream/master' into nwabear-master	2019-01-22 10:07:35 +09:00
Dean Herbert	7baff750de	Consolidate layout, wording and ordering with VisualSettings	2019-01-22 10:06:30 +09:00
Dean Herbert	b373d78143	Add slight easing	2019-01-22 09:47:51 +09:00
Dean Herbert	25b5bbcd8f	Merge branch 'master' into score-panel-layout	2019-01-22 09:43:37 +09:00
Christian Kamphausen	86581feb4a	Merge branch 'master' into fix-playersettingsoverlay-not-coming-back-ctrl+H	2019-01-22 01:29:58 +01:00
chrisny286	d7d2e2fe44	trimmed whitespace	2019-01-21 19:22:19 +01:00
chrisny286	65fd69c817	Update HUDOverlay.cs ... separate PlayerSettingsOverlay from the other HUD elements in the Visibility Container	2019-01-21 19:10:29 +01:00
chrisny286	fb51578df3	Update PlayerSettingsOverlay.cs ... Framework renamed this variable so it needs to be renamed here too.	2019-01-21 17:19:40 +01:00
Bear Daniel	7cdb823c87	Moved "Use beatmap hitsounds" button	2019-01-21 08:04:06 -06:00
Dean Herbert	8160162cde	Merge remote-tracking branch 'upstream/master' into fix-replay-import-statistics	2019-01-21 20:58:17 +09:00
Dean Herbert	4eb5e67075	Fix overlays not being correctly offset by toolbar padding	2019-01-21 19:34:35 +09:00
ekrctb	e74f0057bd	Automatically layout based on score display width	2019-01-21 17:07:56 +09:00
ekrctb	0573c1c923	Fix taiko namespace ignored	2019-01-21 14:20:37 +09:00
Joehu	33735b15ae	Update osu!direct beatmap sections sorting	2019-01-20 09:39:07 -08:00
Shane Woolcock	25c3304766	Update framework	2019-01-20 22:07:59 +10:30
Shane Woolcock	0baa96fa4c	Merge branch 'master' into samah-ios	2019-01-20 21:48:08 +10:30
Dean Herbert	5579b52bdf	Merge branch 'master' into master	2019-01-20 20:16:20 +09:00
Shane Woolcock	fa6dd8c99e	Code sanity	2019-01-20 19:03:06 +10:30
Shane Woolcock	521b11dfcb	Use QuadBatch rather than LinearBatch of quads for LogoVisualisation ... GL_QUADS is deprecated, and is not supported at all on OpenGL ES. This fixes the logo visualisation not drawing on iOS.	2019-01-20 18:51:17 +10:30
Shane Woolcock	10b91e18bd	Merge branch 'master' into samah-ios ... # Conflicts: # osu.Game/osu.Game.csproj	2019-01-19 18:03:58 +10:30
Shane Woolcock	f26a551e95	Revert audio changes	2019-01-19 17:40:37 +10:30
Shane Woolcock	63c61d3e27	Convert to PackageReference	2019-01-19 14:13:46 +10:30
Bear Daniel	858541bcf4	Added "Use beatmap hitsounds" button to volume section of settings	2019-01-18 02:33:39 -06:00
Dean Herbert	f489718e25	Fix non-matching filename	2019-01-18 14:35:32 +09:00
Dean Herbert	21e79f51b1	Remove necessity of BeatmapSetDownloader	2019-01-18 14:28:06 +09:00
Dean Herbert	8848fa8b1b	Improve UX of download buttons on beatmap set overlay	2019-01-18 12:04:49 +09:00
Dean Herbert	b62630ecd2	Centralise download tracking logic so we can show it in multiple scenarios	2019-01-18 11:28:10 +09:00
nwabear	42fa04beee	Update SkinSection.cs ... Added "Use beatmap skins" button to general settings	2019-01-17 14:40:22 -06:00
Dean Herbert	b904bd9e8f	Update framework	2019-01-17 22:13:41 +09:00
Dean Herbert	5269ca31be	Merge branch 'master' into fix-room-inspector-cover	2019-01-17 21:49:25 +09:00
Dean Herbert	1d40d88f82	Merge branch 'master' into add-room-null-check	2019-01-17 21:34:25 +09:00
Dan Balasescu	b9c3b33e26	Merge branch 'master' into fix-room-inspector-cover	2019-01-17 20:55:17 +09:00
Dean Herbert	93a08bdb23	Remove stray using	2019-01-17 20:23:15 +09:00
Dean Herbert	d16f4af92b	Use TransferValueOnCommit for mouse sensitivity	2019-01-17 19:18:40 +09:00
Dean Herbert	59f7c5a26e	Fix room inspector cover not resetting when no room selected	2019-01-17 18:44:22 +09:00
Dean Herbert	ba9cdf2ce2	Add null check to fix crash on deselecting multiplayer room	2019-01-17 18:17:47 +09:00
Dean Herbert	491537b8ba	Add fade duration ... Not really visible in the existing usage, but once we enable the settings tab it will be required. Tested by manually enabling it.	2019-01-17 18:13:05 +09:00
Dean Herbert	c1f5c0edc9	Merge branch 'master' into hide-multiplayer-match-room-tab	2019-01-17 18:02:17 +09:00
Dean Herbert	4082c0e8e0	Merge branch 'master' into fix-slider-bar-tooltip-not-shown-until-value-is-changed	2019-01-17 17:34:04 +09:00
ekrctb	2bc3464802	Hide Room tab when Settings tab is active	2019-01-17 17:27:34 +09:00
ekrctb	6bfae52305	Fix sliders don't show tooltip until first change	2019-01-17 17:03:53 +09:00
ekrctb	f982b6da55	Don't hide 'hold for menu' even hud is hidden	2019-01-17 16:49:04 +09:00
Dean Herbert	99c963c56a	Merge branch 'master' into cancel-request-on-disposal	2019-01-17 15:29:49 +09:00
ekrctb	b6fb3a5c05	Cancel request on disposal for RoomInspector	2019-01-17 15:14:30 +09:00
Dean Herbert	2ab0c4632e	Merge branch 'master' into menu-background-skinning	2019-01-17 14:23:03 +09:00
Dan Balasescu	824fff5c85	Merge branch 'master' into fix-sticking-cursor	2019-01-17 12:06:00 +09:00
Dean Herbert	7bcf056872	Merge branch 'master' into update-framework	2019-01-16 19:16:53 +09:00
Dean Herbert	5ff58870b8	Update framework	2019-01-16 19:05:46 +09:00
Dean Herbert	3abfaea7ac	Stop cursor from sticking to edges of scaled game window	2019-01-16 17:21:26 +09:00
Dan Balasescu	75113db438	Merge branch 'master' into fix-skip-button-scaling	2019-01-16 16:37:37 +09:00
Dean Herbert	bfb18b4ffb	Update framework and other nuget packages	2019-01-16 10:14:37 +09:00
Dean Herbert	7ef127a3bf	Merge branch 'master' into update_tab_item_font	2019-01-15 18:31:16 +09:00
Shane Woolcock	6c35393d1a	Fix TrackManager usage	2019-01-13 23:10:16 +10:30
Shane Woolcock	f70cb81a3f	Update framework	2019-01-13 23:07:35 +10:30
Shane Woolcock	d80138d20d	Ensure beatmap textures are loaded via CreateTextureLoaderStore	2019-01-12 23:05:49 +10:30
Shane Woolcock	8f2ce6d048	Update framework	2019-01-12 15:55:03 +10:30
Shane Woolcock	a6c54a9675	Merge branch 'master' into samah-ios	2019-01-12 00:16:09 +10:30
Unknown	6eff79913b	remove blank lines	2019-01-11 10:34:56 +01:00
Dean Herbert	e2dd025225	Fix scaling of SkipOverlay when UI scale is adjusted ... Closes #4040.	2019-01-11 16:54:42 +09:00
Min	29e8c21c46	Merge branch 'master' into menu-background-skinning	2019-01-11 11:36:20 +09:00
jorolf	6ba7e2b670	split the profile header into several components	2019-01-11 01:12:19 +01:00
Dean Herbert	c1656a7608	Update framework	2019-01-10 21:22:42 +09:00
Dean Herbert	0a24d188b4	Remove TryGetValue as it won't work	2019-01-10 19:01:41 +09:00
Dean Herbert	1ff9203f9e	Merge branch 'master' into fix-idle-weirdness	2019-01-10 18:38:48 +09:00
Dean Herbert	8cd058ed9a	Merge branch 'master' into moreOptionsFromSkin.ini	2019-01-10 18:38:20 +09:00
Dean Herbert	2c2ed1ae47	Merge branch 'master' into profile-header-update	2019-01-10 18:34:39 +09:00
Dean Herbert	aa68bbc1d9	Merge branch 'master' into fix-match-select-crash	2019-01-10 15:40:03 +09:00
Dean Herbert	930d6382c7	Merge pull request #4016 from smoogipoo/fix-link-flow ... Fix links not working in partially masked text flow	2019-01-10 15:19:58 +09:00
smoogipoo	4578d36a67	Add comment	2019-01-10 14:55:36 +09:00
Dean Herbert	e04da7de1e	Merge pull request #4017 from smoogipoo/lounge-leaderboard ... Show match participants in the lounge	2019-01-10 14:36:26 +09:00
Dean Herbert	a264b67d58	Merge branch 'master' into moreOptionsFromSkin.ini	2019-01-10 14:33:34 +09:00
Dan Balasescu	bb36f457fe	Merge branch 'master' into add-ui-scale	2019-01-10 14:25:38 +09:00
Dan Balasescu	e6c2d29a8e	Merge branch 'master' into moreOptionsFromSkin.ini	2019-01-10 14:01:52 +09:00
Dean Herbert	5e4bea9d99	Fix extra newline	2019-01-10 12:11:14 +09:00
Dean Herbert	4f5c208672	Add UI scale ... Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.	2019-01-09 19:01:33 +09:00
Dean Herbert	045ed741b0	Fix API getting stuck in eternal failing state if login request fails	2019-01-09 15:29:27 +09:00
Dean Herbert	2dc185f249	Display avatars rather than full scores	2019-01-09 15:27:08 +09:00
Dean Herbert	0bf9e9b86b	Merge branch 'master' into lounge-leaderboard	2019-01-09 10:28:55 +09:00
Microgolf	097062caf7	Addresses requested changes	2019-01-08 17:57:03 +01:00
m2307	42ba690809	Merge branch 'master' into master	2019-01-08 17:53:58 +01:00
Dean Herbert	e4ff36a5bc	Merge pull request #4013 from smoogipoo/beatmap-scores-foreignkey ... Add explicit beatmap -> scores deletions rather than relying on FK cascades	2019-01-08 21:39:15 +09:00
Dean Herbert	415df52c69	Update framework	2019-01-08 21:26:24 +09:00
Dean Herbert	958840fe17	Merge branch 'master' into fix-sliderbar	2019-01-08 21:23:34 +09:00
Dean Herbert	6ce08312b2	Merge branch 'master' into fix-match-select-crash	2019-01-08 20:29:55 +09:00
Dan Balasescu	8214faeacc	Merge branch 'master' into fix-over-inclusive-channel-search	2019-01-08 19:54:31 +09:00
smoogipoo	2a4c91a6ab	Remove unused using	2019-01-08 19:26:24 +09:00
smoogipoo	122fc2de58	Show room leaderboard instead in the lounge	2019-01-08 19:24:55 +09:00
smoogipoo	da98915c0c	Fix links not working in partially masked text flow	2019-01-08 18:59:01 +09:00
smoogipoo	b17b88d071	Fix null beatmap possibly being selected	2019-01-08 18:06:46 +09:00
smoogipoo	cf8bcb7ba2	Add explicit beatmap -> scores relationship rather than relying on cascades	2019-01-08 17:53:43 +09:00
Shane Woolcock	d74aa52e69	Revert to old behaviour if no TrackManager available	2019-01-08 18:35:23 +10:30
smoogipoo	2c44b928d3	Remove unused references	2019-01-08 16:38:34 +09:00
smoogipoo	daeba63242	Remove more unused code	2019-01-08 16:37:18 +09:00
smoogipoo	38a3ccc817	Use value where applicable	2019-01-08 16:31:44 +09:00
smoogipoo	8692be9de3	Fix sliderbar not working correctly with TransferValueOnCommit = true	2019-01-08 16:07:54 +09:00
Shane Woolcock	19693c3e51	Use TrackManager CreateWaveform to fix editor crashes	2019-01-08 17:10:31 +10:30
Shane Woolcock	a267a1a085	Merge branch 'master' into samah-ios	2019-01-08 17:09:26 +10:30
Dean Herbert	a2a7aa708f	Use better logic for setting slider bar settings	2019-01-08 14:56:42 +09:00
Dean Herbert	01aa4c2a72	Use TransferOnCommit	2019-01-08 13:48:38 +09:00
Dean Herbert	199b614eba	Fix masking being unapplied incorrectly	2019-01-08 13:36:07 +09:00
Dean Herbert	440f4703cb	Fix toolbar offset not being applied	2019-01-08 12:57:31 +09:00
Dean Herbert	dd960e6a89	Remove unused variable	2019-01-08 12:50:42 +09:00
Dean Herbert	647a30279f	Merge branch 'master' into moreOptionsFromSkin.ini	2019-01-08 11:46:08 +09:00
Dean Herbert	8edec10e5f	Merge branch 'master' into fix-replay-import-statistics	2019-01-08 11:26:12 +09:00
Dean Herbert	276014f591	Merge branch 'master' into update-framework	2019-01-08 11:26:10 +09:00
Dean Herbert	2fc3e77be7	Merge branch 'master' into letterboxing	2019-01-08 11:26:09 +09:00
Dean Herbert	11861f4cc9	Merge branch 'master' into moreOptionsFromSkin.ini	2019-01-08 11:26:08 +09:00
Dean Herbert	881b10a18f	Merge remote-tracking branch 'Dragicafit/moreOptionsFromSkin.ini' into moreOptionsFromSkin.ini	2019-01-08 11:01:04 +09:00
Dean Herbert	7eed3ffe75	Merge branch 'master' into moreOptionsFromSkin.ini	2019-01-08 10:02:06 +09:00
Dean Herbert	4cee21f356	Make skinning better	2019-01-07 20:12:39 +09:00
Dean Herbert	8eedef3e86	Move cancellation to safer place	2019-01-07 19:31:05 +09:00
Dean Herbert	d72412d24d	Fix leaderboard not correctly handling cancellation	2019-01-07 19:28:46 +09:00
Dean Herbert	70d644406f	Merge remote-tracking branch 'origin/update-framework' into letterboxing ... # Conflicts: # osu.Game/Overlays/Settings/Sections/Graphics/LayoutSettings.cs	2019-01-07 18:53:53 +09:00
Dean Herbert	74539b5e5c	Merge remote-tracking branch 'upstream/master' into letterboxing	2019-01-07 18:52:48 +09:00
Dean Herbert	49ba4e5a14	Merge branch 'master' into update-framework	2019-01-07 18:51:54 +09:00
Dean Herbert	ca98caf84b	Merge pull request #4001 from UselessToucan/linq_temp ... Use Find instead of FirstOrDefault	2019-01-07 18:50:59 +09:00
Dean Herbert	f6018294b5	Update framework	2019-01-07 18:50:27 +09:00
Dean Herbert	13b077c83b	Merge remote-tracking branch 'upstream/master' into moreOptionsFromSkin.ini	2019-01-07 18:11:17 +09:00
Dean Herbert	73c2fcac08	Remove broken SettingsLabel class	2019-01-07 17:03:59 +09:00
Dean Herbert	e73845172c	Merge branch 'master' into fix-replay-import-statistics	2019-01-07 13:44:01 +09:00
Matthias Coenraerds	562c9e56fb	Fix naming	2019-01-06 13:38:43 +01:00
Matthias Coenraerds	472325b885	Verify leaderboard scope to be local	2019-01-06 13:37:30 +01:00
Roman Kapustin	4b5fc85875	Use Find instead of FirstOrDefault	2019-01-05 19:35:33 +03:00
jorolf	8bab87c072	update resources and remove unused usings	2019-01-04 23:09:21 +01:00
jorolf	52994c7ee8	Merge branch 'profile-header-update' of github.com:Jorolf/osu into profile-header-update	2019-01-04 22:52:29 +01:00
jorolf	a33a1458a5	update design and make play styles an enum	2019-01-04 22:52:00 +01:00
Matthias Coenraerds	a93c26ccfd	Filename does not match contained type	2019-01-04 20:40:07 +01:00
Matthias Coenraerds	3879348ee4	Implement clear scores on beatmap	2019-01-04 20:23:06 +01:00
Dean Herbert	01f6199c49	Merge branch 'master' into profile-header-update	2019-01-04 16:38:42 +09:00
Dean Herbert	4a7c6fb19d	Fix PP not display on profile overlay	2019-01-04 16:33:35 +09:00
Dean Herbert	4c2c7bd937	Fix global idle state being entered when overlays are visible	2019-01-04 16:26:10 +09:00
Dean Herbert	7d1163a7d2	Remove unnecessary null check	2019-01-04 15:49:23 +09:00
Dean Herbert	f2ccf70d1b	Backdate license header for now	2019-01-04 15:37:27 +09:00
Dean Herbert	c528a3896d	Formatting and naming	2019-01-04 15:34:32 +09:00
Dean Herbert	4c3310ca80	Remove unnecessary tracked settings (for now)	2019-01-04 15:28:48 +09:00
Dean Herbert	3a10dd47d5	Add preview for gameplay region	2019-01-04 15:28:35 +09:00
Dean Herbert	9c7830d83b	Size -> scale	2019-01-04 14:58:44 +09:00
Dean Herbert	35a6257642	Delay updates when changes would affect mouse position	2019-01-04 14:55:59 +09:00
Dean Herbert	5a807f2143	Add OSD support	2019-01-04 14:18:29 +09:00
Dean Herbert	3953f829c8	Add letterbox/screen scaling support	2019-01-04 13:36:02 +09:00
Dean Herbert	b6dc6c4a74	Merge branch 'master' into do_not_use_local_user_for_autoplay_score	2019-01-04 13:11:17 +09:00
Dean Herbert	aec3753863	Fix imported replays having excess statistics	2019-01-03 14:01:20 +09:00
Dean Herbert	8b25e4c9ee	Fix searching for "channel" matching all channels	2019-01-03 12:04:36 +09:00
Dean Herbert	2d405bfc43	Add back options for 3 and 7 day long rooms	2019-01-02 16:33:52 +09:00
FreezyLemon	0047f29ec8	move missing newline to front of "Plays with..."	2018-12-30 22:40:17 +01:00
Roman Kapustin	850a7aa327	Update tab text font on activation/deactivation	2018-12-29 17:43:19 +03:00
Shane Woolcock	32ffcb9865	Merge branch 'master' into samah-ios ... # Conflicts: # osu.Game/osu.Game.csproj	2018-12-29 20:09:00 +10:30
Shane Woolcock	ff4b41b35f	Add basic visual tests	2018-12-29 18:47:35 +10:30
Dean Herbert	1f2d340914	Merge branch 'master' into fix-room-ordering	2018-12-28 14:07:11 +09:00
Dean Herbert	e6ccf209c7	Merge pull request #3957 from peppy/fix-excessive-cover-loading ... Fix covers being loaded even when off-screen	2018-12-28 14:07:01 +09:00
Dean Herbert	0908309232	Merge branch 'master' into fix-room-ordering	2018-12-28 13:35:56 +09:00
Dean Herbert	8c62157d7a	Merge pull request #3943 from smoogipoo/fix-results ... Fix ScoreProcessor's population	2018-12-28 13:32:40 +09:00
Dean Herbert	55607634b4	Fix covers being loaded even when off-screen	2018-12-28 13:30:05 +09:00
smoogipoo	72482aff8d	Whoops	2018-12-28 01:48:13 +09:00
smoogipoo	a7db0bbb91	Sort rooms based on their API position	2018-12-28 01:45:19 +09:00
Lanyun Hou	f2f1ba8cbe	Fix typo in line 42	2018-12-28 00:43:20 +08:00
smoogipoo	be86281c72	Fix score results not populated	2018-12-28 00:24:02 +09:00
smoogipoo	338b95dd63	Fix none result getting included	2018-12-27 22:48:24 +09:00
Dean Herbert	99ed009838	Fix extra hit result types showing on ranking screen	2018-12-27 22:31:40 +09:00
Dean Herbert	12a93af156	Merge pull request #3939 from smoogipoo/fix-multi-mods ... Fix plays with mods not submitting	2018-12-27 22:20:10 +09:00
smoogipoo	a62405d82d	Fix plays with mods not submitting	2018-12-27 22:17:03 +09:00
Dean Herbert	cf079690e5	Use LargeTextureStore for online retrievals	2018-12-27 22:13:51 +09:00
Dean Herbert	2d1736e477	Merge pull request #3936 from smoogipoo/fix-multi-mods ... Ensure mods are set prior to starting play	2018-12-27 22:04:35 +09:00
Dean Herbert	304d245c9c	Merge pull request #3934 from peppy/populate-statistics ... Populate statistics for all rulesets' scores	2018-12-27 22:04:08 +09:00
smoogipoo	101fdf993e	Ensure mods are set prior to starting play	2018-12-27 21:59:43 +09:00
Dean Herbert	5977fc838f	Limit available durations for the time being	2018-12-27 21:59:08 +09:00
Dean Herbert	fb10d15870	Populate statistics for all rulesets' scores	2018-12-27 21:52:09 +09:00
smoogipoo	50b51a168e	Always submit standardised scores	2018-12-27 21:12:32 +09:00
Dean Herbert	c818e1cd83	Merge pull request #3929 from peppy/fix-polling-rates ... Fix polling rates	2018-12-27 20:28:15 +09:00
Dean Herbert	31baf0086f	Optional idle tracker	2018-12-27 20:17:27 +09:00
Dean Herbert	1ce33cb6da	Adjust polling rate based on current screen and idle state	2018-12-27 20:06:07 +09:00
Dean Herbert	c5764ded1c	Fix infinite polling rate in certain scenarios	2018-12-27 20:03:32 +09:00
Dean Herbert	ab5f6e149c	Remvoe extra newline	2018-12-27 19:25:56 +09:00
Dean Herbert	31db768bdc	Hide version overlay when not in main menu	2018-12-27 19:21:07 +09:00
smoogipoo	eaba9e1378	Fix mode icon not being updated for correct ruleset	2018-12-27 18:16:30 +09:00
smoogipoo	9a5630b3d5	Fix working beatmap not being updated	2018-12-27 18:16:30 +09:00
Dean Herbert	d6c53e3851	Cancel old web requests when changing filter modes	2018-12-27 18:09:42 +09:00
smoogipoo	b0e8561ad3	Fix ruleset not changing correctly	2018-12-27 17:48:10 +09:00
smoogipoo	dae710f9a6	Make leaderboard top not fade by default	2018-12-27 17:29:55 +09:00
phosphene47	3c677970cd	Add menu background skinning for supporters	2018-12-27 17:25:28 +09:00
smoogipoo	ea1309e768	Fix missing bind	2018-12-27 17:15:43 +09:00
smoogipoo	bd0576537e	Forcefully exit multiplayer if API loses connectivity	2018-12-27 17:12:58 +09:00
smoogipoo	f70e60747f	Remove option for 1-minute duration	2018-12-27 16:54:14 +09:00
smoogipoo	8e031325dd	CI fixes	2018-12-27 16:28:17 +09:00
smoogipoo	50201e602e	Combine implementations of status + end date info	2018-12-27 16:19:00 +09:00
smoogipoo	a3b6a3981c	Use .Equals() override instead of manual type checks	2018-12-27 16:19:00 +09:00
Dean Herbert	67e200e1b2	Leaderboard design updates	2018-12-27 15:52:40 +09:00
smoogipoo	1e71c5c9c4	Add + set ended room status	2018-12-27 13:32:44 +09:00
Dean Herbert	bfbd7e5106	Merge remote-tracking branch 'upstream/master' into timeshift-wip	2018-12-26 22:42:24 +09:00
Dean Herbert	bb502769c7	Fix enum	2018-12-26 22:42:17 +09:00
Dean Herbert	cc1f3d54b0	Fix looping failure	2018-12-26 22:37:09 +09:00
Dean Herbert	6b7b0af2e4	Temporary fix for participant count being nullable	2018-12-26 22:25:15 +09:00
Dean Herbert	f6aa6e6b3c	Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip	2018-12-26 22:16:41 +09:00
Dean Herbert	8cf30bdb6a	Play with delegate	2018-12-26 22:16:35 +09:00
smoogipoo	e7310a16c7	Fix playlist not updating correcly	2018-12-26 22:14:49 +09:00
Dean Herbert	a1fa914c66	Participants	2018-12-26 21:58:14 +09:00
Dean Herbert	bf9954aede	Merge remote-tracking branch 'smoogipoo/timeshift-wip' into timeshift-wip ... # Conflicts: # osu.Game.Tests/Visual/TestCaseLoungeRoomsContainer.cs # osu.Game.Tests/Visual/TestCaseMatchSettingsOverlay.cs # osu.Game/Screens/Multi/IRoomManager.cs # osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs # osu.Game/Screens/Multi/Match/Components/MatchSettingsOverlay.cs # osu.Game/Screens/Multi/RoomManager.cs	2018-12-26 21:32:12 +09:00
Dean Herbert	fb15806c98	Merge branch 'master' into fix-webrequest-cancellation	2018-12-26 21:21:29 +09:00
smoogipoo	2d19436456	Open -> Push	2018-12-26 21:21:26 +09:00
smoogipoo	152f3b1da3	Add processing overlay to lounge screen	2018-12-26 21:20:53 +09:00
smoogipoo	0c384417f1	Add processing overlay to room creation process	2018-12-26 21:19:02 +09:00
Dean Herbert	26834abd33	Fade and no schedule	2018-12-26 21:18:55 +09:00
smoogipoo	5af29f8384	Reduce code duplication	2018-12-26 21:18:44 +09:00
smoogipoo	940d4a16bb	Add error message when creation fails	2018-12-26 21:18:44 +09:00
smoogipoo	9901b11600	Display room join errors as notifications	2018-12-26 21:18:11 +09:00
smoogipoo	bee4e8ad28	Fix cancelled webrequests triggering exceptions	2018-12-26 21:17:10 +09:00
Dean Herbert	171287591c	Merge branch 'updateable-beatmap-sprite' into timeshift-wip ... # Conflicts: # osu.Game/Beatmaps/Drawables/UpdateableBeatmapBackgroundSprite.cs # osu.Game/Graphics/Containers/LinkFlowContainer.cs	2018-12-26 20:52:36 +09:00
Dean Herbert	8386e206c3	Update ParticipantInfo	2018-12-26 20:35:54 +09:00
Dean Herbert	5bd3ab51dd	Open -> Push	2018-12-26 20:35:54 +09:00
Dean Herbert	6f0d13e36b	Move PartRoom calls	2018-12-26 20:35:54 +09:00
smoogipoo	9d305ba024	Reduce code duplication	2018-12-26 20:33:19 +09:00
smoogipoo	be9ba78d47	Add error message when creation fails	2018-12-26 20:33:19 +09:00
smoogipoo	052ab4763a	Display room join errors as notifications	2018-12-26 20:32:36 +09:00
Dean Herbert	7a431ed87f	Update ParticipantInfo	2018-12-26 20:31:04 +09:00
Dean Herbert	869081ce9c	Open -> Push	2018-12-26 20:21:30 +09:00
Dean Herbert	692f5c289d	Move PartRoom calls	2018-12-26 20:12:51 +09:00
Dean Herbert	2353c204ee	Renaming	2018-12-26 20:05:57 +09:00
Dean Herbert	532a970c0f	Give leaderboard and chat more breathing room	2018-12-26 19:20:54 +09:00
Dean Herbert	0cefd4b21d	Improve room padding	2018-12-26 19:14:15 +09:00
Dean Herbert	e317b047f8	Merge remote-tracking branch 'upstream/master' into updateable-beatmap-sprite	2018-12-26 18:49:41 +09:00
Dean Herbert	edfb027ff2	Update framework	2018-12-26 18:49:33 +09:00
Dean Herbert	63847890d1	Add better messaging when connecting or failing	2018-12-26 18:07:33 +09:00
Dean Herbert	f442e59620	Icon and beatmap title visual pass	2018-12-26 18:01:53 +09:00
Dean Herbert	c6c8c472bb	Split class out	2018-12-26 16:50:50 +09:00
Dean Herbert	9b2575cc20	RoomSettingsOverlay -> MatchSettingOverlay	2018-12-26 16:50:50 +09:00
smoogipoo	aeb2186539	Fix api get user request never failing	2018-12-26 16:06:39 +09:00
Dean Herbert	6e8c46f00b	Fix padding and use grid container for more correctness	2018-12-26 15:23:57 +09:00
Dean Herbert	755c6b9243	Make room settings scroll	2018-12-26 15:03:35 +09:00
Dean Herbert	e9556afe22	Don't use all uppercase (is applied automatically)	2018-12-26 14:26:35 +09:00
Dean Herbert	e4a72c0c64	Fix failing testcase	2018-12-26 13:18:36 +09:00
Dean Herbert	c902c1587a	Add tests and modify fallback logic	2018-12-25 19:17:32 +09:00
smoogipoo	96c9e5f209	Make DefaultBeatmap readonly	2018-12-25 18:34:45 +09:00
smoogipoo	6a5f0eca18	Fix various elements flashing	2018-12-25 18:07:50 +09:00
smoogipoo	1dd2a4e368	Fix host info not working	2018-12-25 18:07:19 +09:00
Dean Herbert	9542e3e24a	Add Updateable beatmap sprite	2018-12-25 18:04:13 +09:00
smoogipoo	2f32c4d4d1	Fix title of match song select	2018-12-25 17:17:51 +09:00
smoogipoo	d4f5a8507c	Exit from match screen on escape	2018-12-25 17:14:56 +09:00
smoogipoo	91b83cd4b8	Fix leaderboard being queried on room creation	2018-12-25 13:57:25 +09:00
smoogipoo	23d21a45e5	More automated tests	2018-12-25 11:59:08 +09:00
smoogipoo	626ec85ae8	Remove IHasFilterableChildren from class	2018-12-25 11:58:28 +09:00
smoogipoo	6712a68797	Create IRoomManager interface, add test for RoomsContainer	2018-12-25 11:45:50 +09:00
smoogipoo	f79aa07d02	Fix enddate not being bound to	2018-12-25 11:31:36 +09:00
smoogipoo	e0e75c7339	Fix incorrect room status	2018-12-25 11:24:46 +09:00
jorolf	e05fbd4136	address some comments and improve ui	2018-12-25 01:09:49 +01:00
Shane Woolcock	436fbc7ffe	Merge branch 'master' into samah-ios	2018-12-24 15:52:47 +10:30
jorolf	360c17e2c7	appease CodeFactor and AppVeyor	2018-12-22 22:50:19 +01:00
jorolf	da99161736	add some missing stuff	2018-12-22 22:34:39 +01:00
jorolf	2fe80d5568	Update ProfileHeader to the new design	2018-12-22 21:50:25 +01:00
jorolf	15ae0cd70a	Merge branch 'master' of git://github.com/ppy/osu into profile-header-update	2018-12-22 16:54:39 +01:00
jorolf	b4fa2d9049	WIP	2018-12-22 16:51:24 +01:00
smoogipoo	02365ee5ba	Merge remote-tracking branch 'origin/master' into timeshift-wip	2018-12-22 23:23:21 +09:00
Dean Herbert	c6b37c45b5	Merge pull request #3902 from smoogipoo/disable-chat-avatar-click ... Disable avatar clicks in chat tabs	2018-12-22 20:11:01 +09:00
smoogipoo	40db23ff4c	Disable avatar clicks in chat tabs	2018-12-22 19:30:52 +09:00
smoogipoo	30dbc36fce	Don't clear username on logout	2018-12-22 17:54:19 +09:00
smoogipoo	0757beb3b8	Test for null before loading	2018-12-22 17:54:08 +09:00
smoogipoo	d9b8df1595	Merge remote-tracking branch 'origin/master' into user-registration	2018-12-22 17:19:28 +09:00
Dan Balasescu	e6c197e9aa	Merge branch 'master' into improve-text-search	2018-12-22 16:38:50 +09:00
Dean Herbert	005c6ff40c	Add tooltip text to results screen pages	2018-12-22 16:30:06 +09:00
smoogipoo	bb08bf10a0	Fix post-merge issues	2018-12-22 16:26:27 +09:00
smoogipoo	c2a00b84c7	Merge remote-tracking branch 'peppy/modular-results-screen' into timeshift-wip ... # Conflicts: # osu.Game/Screens/Multi/IMultiplayerScreen.cs # osu.Game/Screens/Play/Player.cs # osu.Game/Screens/Play/SoloResults.cs # osu.Game/Screens/Ranking/IResultPageInfo.cs # osu.Game/Screens/Ranking/ResultMode.cs # osu.Game/Screens/Ranking/ResultModeButton.cs # osu.Game/Screens/Ranking/ResultModeTabControl.cs # osu.Game/Screens/Ranking/Results.cs	2018-12-22 16:22:02 +09:00
Dean Herbert	7e97d37df5	Merge remote-tracking branch 'upstream/master' into modular-results-screen	2018-12-22 16:20:39 +09:00
Dean Herbert	a35d9178f0	Quick rename	2018-12-22 16:20:29 +09:00
Dan Balasescu	2c97409e2e	Merge branch 'master' into rewrite-standalone-chat	2018-12-22 16:07:27 +09:00
Dean Herbert	e7508cbd5e	Fix CI issues	2018-12-22 15:55:10 +09:00
Dean Herbert	e404a0bc20	Clean-ups and renames	2018-12-22 15:51:00 +09:00
smoogipoo	baed0ef3ba	Rename variable	2018-12-22 15:46:04 +09:00
smoogipoo	b9ec179713	Split out more requests + responses	2018-12-22 15:45:16 +09:00
Shane Woolcock	18abff3ac0	Split solution	2018-12-22 17:12:43 +10:30
smoogipoo	daa6292e08	Split results screen to allow for extensibility	2018-12-22 15:39:06 +09:00
smoogipoo	0e9991b81a	Merge remote-tracking branch 'origin/master' into timeshift-wip	2018-12-22 15:36:36 +09:00
Dean Herbert	e3308010c0	Merge pull request #3898 from peppy/leaderboard-modularity ... Leaderboard modularity	2018-12-22 15:36:12 +09:00
smoogipoo	ac0e6f8d42	Fix post-merge issues	2018-12-22 15:35:22 +09:00
smoogipoo	bdb6e03dfb	Merge remote-tracking branch 'peppy/leaderboard-modularity' into timeshift-wip ... # Conflicts: # osu.Game/Online/Leaderboards/Leaderboard.cs # osu.Game/Online/Leaderboards/LeaderboardScore.cs # osu.Game/Screens/Ranking/Pages/ScoreResultsPage.cs # osu.Game/Screens/Select/Leaderboards/BeatmapLeaderboard.cs	2018-12-22 15:33:26 +09:00
Dean Herbert	29fd1719da	Merge pull request #3896 from peppy/backwards-drawable-date ... Allow DrawableDate to be used to display future dates	2018-12-22 15:29:05 +09:00
Dean Herbert	52c6d5bfd4	Move protected method down	2018-12-22 15:23:32 +09:00
Dean Herbert	787e65c3c5	Reduce generic-ness	2018-12-22 15:20:35 +09:00
smoogipoo	3570c35d7f	Make RoomScore derive ScoreInfo	2018-12-22 15:17:35 +09:00
Shane Woolcock	56196e17dd	Merge branch 'master' into samah-ios	2018-12-22 16:44:15 +10:30
smoogipoo	6afd2f7263	Adjust styling of disabled settings	2018-12-22 15:00:35 +09:00
Dean Herbert	23259b295c	Remove unnecessary using	2018-12-22 14:45:35 +09:00
smoogipoo	e657f13c15	Separate out Leaderboard into BeatmapLeaderboard	2018-12-22 14:44:36 +09:00
Dean Herbert	870d843fff	Fix username not displaying correctly in overlay	2018-12-22 14:40:55 +09:00
smoogipoo	b82bb0ea28	Mate RoomSettingsOverlay fill height	2018-12-22 14:40:10 +09:00
smoogipoo	09d7dc73dc	Allow channel manager and osugame to be null	2018-12-22 14:38:46 +09:00
smoogipoo	dbd391825a	Rework+fix TestCaseMultiHeader	2018-12-22 14:30:08 +09:00
smoogipoo	f47ac35522	Add click to avatar	2018-12-22 14:23:53 +09:00
smoogipoo	7191233be8	Allow roommanager to be null	2018-12-22 14:14:14 +09:00
smoogipoo	21cfe5a3e6	Decouple header from matchscreen	2018-12-22 14:12:27 +09:00
smoogipoo	c06cf5d379	Decouple match info from match screen	2018-12-22 14:08:00 +09:00
smoogipoo	d28c754256	Fix negative dates, and time moving in opposite direction	2018-12-22 14:06:50 +09:00
smoogipoo	86ce0b5519	Make DrawableDate adjustable	2018-12-22 14:06:44 +09:00
smoogipoo	d93421b796	Merge remote-tracking branch 'Joehuu/master' into timeshift-wip ... # Conflicts: # osu.Game/Screens/Play/HUD/ModDisplay.cs	2018-12-22 14:02:45 +09:00
smoogipoo	f1a9a352fc	Cleanup bindable handling	2018-12-22 14:01:06 +09:00
smoogipoo	1cb69c3478	Split requests/responses into separate files	2018-12-22 12:50:37 +09:00
smoogipoo	dd0c04ea36	Move RoomManager to multiplayer screen	2018-12-22 12:45:36 +09:00
Dean Herbert	396caae0a9	Remove redundant newline	2018-12-21 19:01:19 +09:00
smoogipoo	7e9cc4e876	Seed the results screen	2018-12-21 18:37:33 +09:00
smoogipoo	4149734f89	Add room leaderboard to results	2018-12-21 18:22:13 +09:00
Dean Herbert	81104f4803	Make standalone chat reuse more code from main chat overlay	2018-12-21 17:54:12 +09:00
smoogipoo	8a2cc64bfa	Split results screen to allow for extensibility	2018-12-21 16:34:03 +09:00
smoogipoo	fe6c369e07	Fix incorrect channel	2018-12-21 14:37:05 +09:00
Dean Herbert	6bca344e56	Merge branch 'master' into add-alt-select-support	2018-12-21 14:32:24 +09:00
smoogipoo	1df4826a1d	Merge remote-tracking branch 'origin/master' into timeshift-wip	2018-12-21 14:14:17 +09:00
smoogipoo	6a9b0a0ba3	Fix initial messages not being received	2018-12-21 14:02:36 +09:00
smoogipoo	6b6629e9fd	Fix not posting to the correct channel	2018-12-21 14:02:29 +09:00
smoogipoo	fa2bc16140	Remove participants, add match chat	2018-12-21 14:01:11 +09:00
Dean Herbert	59452800ed	Update framework	2018-12-21 13:33:06 +09:00
smoogipoo	14879acd83	Fix possible nullref	2018-12-21 13:26:50 +09:00
smoogipoo	e27b7b0c0d	Cleanup	2018-12-21 13:06:11 +09:00
smoogipoo	5d59a1ffca	Merge remote-tracking branch 'origin/master' into timeshift-wip ... # Conflicts: # osu.Game.Tests/Visual/TestCasePollingComponent.cs # osu.Game/Online/API/APIRequest.cs # osu.Game/osu.Game.csproj	2018-12-21 12:51:31 +09:00
Dan Balasescu	3d4edd9121	Merge branch 'master' into standalone-chat	2018-12-21 12:31:33 +09:00
Dean Herbert	aaac45ab8c	Add ability to select chat tabs with alt-1-9	2018-12-20 21:50:47 +09:00
smoogipoo	822225577b	Add joining/parting room requests	2018-12-20 20:58:34 +09:00
smoogipoo	9031896484	Fix create room button showing in song select	2018-12-20 20:09:17 +09:00
smoogipoo	104a3c8ffc	Add click to avatar	2018-12-20 20:08:22 +09:00
smoogipoo	6a76e335c7	Linkify everything	2018-12-20 20:03:45 +09:00
smoogipoo	f8d25a1b6c	Add method to add arbitrary drawables as links	2018-12-20 20:01:58 +09:00
Dean Herbert	ef9d93ff6b	Remove mod multipliers ... We decided that mods shouldn't be interacting with other mods. This can be added once we have the ability to have per-mod settings, as a difficulty setting local to blinds.	2018-12-20 19:46:39 +09:00
Dean Herbert	d3368df94d	Simplify changes to RulesetContainer	2018-12-20 19:35:32 +09:00
Dean Herbert	bc8b0485d8	Add textbox/posting support	2018-12-20 18:49:03 +09:00
smoogipoo	deaf4ab4a1	Cleanup	2018-12-20 18:21:55 +09:00
smoogipoo	8db3ac0a9f	Make user links clickable	2018-12-20 18:04:39 +09:00
smoogipoo	1701af61d6	Add host avatar+username to match screen	2018-12-20 18:04:22 +09:00
Dean Herbert	65447d6f4a	Add optional parameters to target messages at a specific channel	2018-12-20 17:01:08 +09:00
Dean Herbert	3a13899ce1	Add stand-alone chat component	2018-12-20 16:54:49 +09:00
Dean Herbert	bb4b54799f	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-12-20 15:57:20 +09:00
Dean Herbert	9177a45587	Merge branch 'master' into mod-fl2	2018-12-20 15:50:18 +09:00
smoogipoo	2e28f378de	Move beatmap + mod info to header	2018-12-20 15:17:33 +09:00
smoogipoo	72016a416b	Deselect match if ended	2018-12-20 15:17:08 +09:00
smoogipoo	03546c9d0d	Implement primary filter routes	2018-12-20 15:16:46 +09:00
Dean Herbert	e15ff98915	Merge branch 'master' into improve-text-search	2018-12-19 20:45:00 +09:00
Dean Herbert	8d458b0b6e	Update framework version	2018-12-19 19:45:50 +09:00
smoogipoo	36f6b4fc3f	Hook up participated filter ... Very early stages, implementation will change.	2018-12-19 18:02:05 +09:00
smoogipoo	c86d9533bd	Add PollImmediately()	2018-12-19 18:01:21 +09:00
smoogipoo	673082445e	Rework filtering	2018-12-19 16:56:51 +09:00
smoogipoo	c544a5b9f0	Add end date to the drawable room too	2018-12-19 15:20:23 +09:00
smoogipoo	9d8170efa0	Only go into failing state if previously online	2018-12-19 14:32:43 +09:00
Dan Balasescu	02b95d3175	Merge branch 'master' into simplify-api-requests	2018-12-19 14:17:48 +09:00
Dean Herbert	067b448617	Merge branch 'master' into do_not_delete_replay_on_import	2018-12-19 13:50:04 +09:00
smoogipoo	a8d88dea3b	Display time remaining in the room	2018-12-19 13:07:56 +09:00
smoogipoo	224e644aa1	Fix negative dates, and time moving in opposite direction	2018-12-19 13:07:43 +09:00
smoogipoo	b89a6bea4c	Make DrawableDate adjustable	2018-12-19 12:44:51 +09:00
smoogipoo	2c000a9a1d	Disallow starting gameplay if there's not enough time in the room	2018-12-19 10:52:15 +09:00
smoogipoo	1051584f0f	Fix room duration not being set	2018-12-19 10:51:54 +09:00
Styphix	bacc07f5ec	Changed OsuFocusedOverlayContainer to WaveOverlayContainer from ChannelSelectionOverlay ... Not sure what colour i shouldve gone for but im certain that this should be fine	2018-12-18 19:44:31 -05:00
Roman Kapustin	4a1af67893	Do not delete file on import failure	2018-12-18 22:49:53 +03:00
Dean Herbert	6088612a26	Remove all retry logic and simplify overall handling of API requests	2018-12-18 20:20:17 +09:00
smoogipoo	72d1ba897f	Reorder tabs	2018-12-18 18:29:13 +09:00
smoogipoo	4050cb88ea	Fix potential nullref	2018-12-18 18:09:54 +09:00
smoogipoo	3cdeeb7ac5	Add forceful set helper methods in OsuGame	2018-12-18 18:09:46 +09:00
smoogipoo	e4e1bde5da	Fix playlist events running too early ... Screens are async loaded	2018-12-18 17:08:07 +09:00
smoogipoo	aabe6c68f5	Fix looping not working	2018-12-18 17:07:47 +09:00
smoogipoo	2f15d10029	Play track while in the multiplayer lobby	2018-12-18 14:45:35 +09:00
smoogipoo	5a8b255bd8	Directly bypass beatmap/ruleset restrictions	2018-12-18 14:17:20 +09:00
smoogipoo	8d640cdc25	Fix leaderboard not being refreshed when finishing gameplay	2018-12-18 12:56:16 +09:00
smoogipoo	7c4fd8ca60	Cleanup room definition	2018-12-17 14:46:43 +09:00
smoogipoo	cc68cf2f95	Implement duration	2018-12-17 14:44:54 +09:00
Dean Herbert	00998d5443	Fix web requests not getting correctly handled on first connection	2018-12-17 14:29:11 +09:00
smoogipoo	279891ae08	Change "apply" button to say "create" instead	2018-12-17 13:55:42 +09:00
smoogipoo	84552b5cee	Refresh leaderboard when returning to lobby	2018-12-17 11:51:28 +09:00
smoogipoo	bf8aae8d9b	Boot player back to lobby if token request fails	2018-12-17 11:51:17 +09:00
smoogipoo	2fd2425cc4	Fix playlist deserialisation for creating rooms	2018-12-17 11:05:03 +09:00
Dean Herbert	e9f661bbf5	Merge branch 'master' into user-registration	2018-12-17 05:05:06 +09:00
Dean Herbert	eec5afa382	Change inspection and add redundant parenthesis to appease codefactor	2018-12-15 16:37:37 +09:00
Dean Herbert	3892454ecc	Improve the way text search works at song select	2018-12-15 16:34:48 +09:00
smoogipoo	983a45c4d8	Fix invalid value	2018-12-14 21:21:02 +09:00
smoogipoo	9726eea0d0	Basic score submission implementation	2018-12-14 21:09:17 +09:00
smoogipoo	e8007ac37f	Implement multiplayer room leaderboard	2018-12-14 21:08:55 +09:00
Dean Herbert	0b5f3c00bf	Revert "Fix WaveOverlayContainer always being present" ... This reverts commit a6fc128094.	2018-12-14 20:50:27 +09:00
Dean Herbert	13cabac386	Update in line with framework changes	2018-12-14 19:56:21 +09:00
Dean Herbert	13f461099f	Merge branch 'master' into moreOptionsFromSkin.ini	2018-12-14 19:51:41 +09:00
smoogipoo	d9fc7c7d66	Separate out Leaderboard into BeatmapLeaderboard	2018-12-14 19:51:27 +09:00
Dean Herbert	2fe642a12b	Merge branch 'master' into master	2018-12-14 19:49:08 +09:00
Dean Herbert	fc5d5a7752	Merge branch 'master' into user-registration	2018-12-14 19:45:27 +09:00
Dean Herbert	79ae5e6fa5	Merge pull request #3855 from peppy/fix-waver-overlay-presence ... Fix WaveOverlayContainer always being present	2018-12-14 19:42:01 +09:00
Dean Herbert	dfe60f6318	Merge pull request #3823 from peppy/netcoreapp22 ... Update projects to target .NET core 2.2	2018-12-14 19:41:52 +09:00
Dean Herbert	ec793bd708	Merge pull request #3848 from peppy/polling-component ... Polling component	2018-12-14 19:41:36 +09:00
Dean Herbert	59a56b1a56	Merge pull request #3850 from peppy/fix-hitsound-change-crash ... Fix crash when changing beatmap toggles at loading screen	2018-12-14 19:41:13 +09:00
Dean Herbert	578f7ff459	Merge pull request #3852 from peppy/fix-exit-crash ... Fix crash on exiting player during results transition	2018-12-14 19:40:54 +09:00
Dean Herbert	4fb9a39038	Merge branch 'master' into fix-waver-overlay-presence	2018-12-14 19:40:36 +09:00
Dean Herbert	38fd35a0cf	Add polling time to ctor	2018-12-14 19:17:21 +09:00
Dean Herbert	64626f62db	Update framework	2018-12-14 19:02:25 +09:00
Dean Herbert	f083b18663	Update in line with framework changes	2018-12-14 17:59:42 +09:00
smoogipoo	de0fc2a0de	Fix beatmap + ruleset being changeable	2018-12-14 17:35:18 +09:00
smoogipoo	5f0069eb83	Fix incorrect ruleset being sent to API	2018-12-14 17:35:05 +09:00
smoogipoo	edefdb18f8	Fix beatmap not having any mods when going into play	2018-12-14 16:16:38 +09:00
smoogipoo	e3ad226075	Use the local beatmap if existing, fixing player not loading objects	2018-12-14 16:11:00 +09:00
Dean Herbert	9072af9792	Move bulk of method into separate private method with minor clean-ups	2018-12-14 15:48:34 +09:00
Dean Herbert	a6fc128094	Fix WaveOverlayContainer always being present	2018-12-14 15:41:05 +09:00
smoogipoo	83bf37a302	Enable/disable the view beatmap + ready buttons based on beatmap presence	2018-12-14 15:04:04 +09:00
smoogipoo	28192aef90	Fix nullref	2018-12-14 15:03:49 +09:00
smoogipoo	3de65238a2	Completely hide the select beatmap button for now	2018-12-14 14:33:50 +09:00
smoogipoo	b83f99d90a	Fix up header sizing + styling	2018-12-14 14:30:39 +09:00
smoogipoo	c9c04a6200	Fix ToBeatmap not using the correct metadata ... Metadata is always come from the API via the beatmap set.	2018-12-14 13:43:52 +09:00
smoogipoo	56fd4b95cd	Fix mod/beatmap selection not always working	2018-12-14 13:38:27 +09:00
smoogipoo	2e767a5292	Fix incorrect acronym	2018-12-14 13:38:13 +09:00
Dean Herbert	a1543905ae	Merge branch 'master' into fix-api-failure-fail	2018-12-14 13:19:09 +09:00
smoogipoo	8e6a85058b	Fix playlist-related errors	2018-12-14 12:35:05 +09:00
Dean Herbert	eb0a09576a	Merge branch 'master' into polling-component	2018-12-13 20:07:49 +09:00
smoogipoo	91f6b08479	Merge branch 'timeshift-api-integration'	2018-12-13 18:38:22 +09:00
smoogipoo	680a3e2aa4	Update with proper playlist usage	2018-12-13 18:38:03 +09:00
smoogipoo	2aafaf9ce2	Merge branch 'timeshift-api-integration'	2018-12-13 17:07:39 +09:00
smoogipoo	eb0e9c0bb1	Merge branch 'match-mod-display' ... # Conflicts: # osu.Game/Screens/Multi/Match/Components/Info.cs # osu.Game/osu.Game.csproj	2018-12-13 17:07:31 +09:00
smoogipoo	ca87b42758	Merge branch 'timeshift-player' ... # Conflicts: # osu.Game/Screens/Multi/Multiplayer.cs	2018-12-13 17:06:44 +09:00
smoogipoo	208273f16a	Merge branch 'timeshift' ... # Conflicts: # osu.Game/osu.Game.csproj	2018-12-13 17:06:20 +09:00
Dean Herbert	71e5ce59da	Fix crash on exiting player during results transition	2018-12-13 16:23:51 +09:00
smoogipoo	264bd0e2aa	Fix invalid room values	2018-12-13 16:06:30 +09:00
ekrctb	6f8a2e6ff2	Use LifetimeManagementContainer ... This is a significant performance boost for gameplay, especially for long or stroyboard-heavy maps.	2018-12-13 15:23:06 +09:00
Dean Herbert	ac0fc6236c	Fix crash when changing beatmap toggles at loading screen	2018-12-13 14:51:18 +09:00
Dean Herbert	4fc9902cd2	Fix reverting to default skin via settings button causing a hard crash	2018-12-12 21:30:21 +09:00
Dean Herbert	3110427eaf	Merge branch 'master' into moreOptionsFromSkin.ini	2018-12-12 19:54:56 +09:00
smoogipoo	bac4f42eac	Fix backgrounds not quite working	2018-12-12 19:34:37 +09:00
Ivan Pavluk	d5437f7b4b	Merge branch 'master' into master	2018-12-12 17:24:52 +07:00
Ivan Pavluk	28b033bd99	Autodetect LowestSuccessfulHitResult	2018-12-12 17:15:59 +07:00
smoogipoo	450e4cd223	Hook up API	2018-12-12 19:04:11 +09:00
smoogipoo	87ebb00f1c	Make Target abstract (should absolutely always be set)	2018-12-12 19:03:27 +09:00
smoogipoo	9af2b49c01	Merge remote-tracking branch 'peppy/polling-component' into timeshift-api-integration ... # Conflicts: # osu.Game/osu.Game.csproj	2018-12-12 16:22:14 +09:00
smoogipoo	6123a11b67	Use RoomID for creation	2018-12-12 16:20:11 +09:00
smoogipoo	439d741dee	Implement basic api structure for rooms	2018-12-12 16:06:56 +09:00
Ivan Pavluk	e49e2fda9e	Rename SuccessfulHitResult->LowestSuccessfulHitResult	2018-12-12 13:24:58 +07:00
Dean Herbert	ffb91b4afc	Update docstring ... Co-Authored-By: pavlukivan <pavlukivan@outlook.com>	2018-12-12 13:11:03 +07:00
Dean Herbert	d86cbf66a9	Update docstring ... Co-Authored-By: pavlukivan <pavlukivan@outlook.com>	2018-12-12 13:10:47 +07:00
smoogipoo	170955110f	Add mods to the match info	2018-12-12 14:38:03 +09:00
smoogipoo	6661b5870f	Merge branch 'songselect-mods' into match-mod-display ... # Conflicts: # osu.Game/osu.Game.csproj	2018-12-12 14:13:37 +09:00
Dean Herbert	14af450ecb	Merge branch 'master' into songselect-mods	2018-12-12 13:37:04 +09:00
smoogipoo	49dd6ae9b0	Move a lot more of PlaySongSelect into SongSelect	2018-12-12 13:21:44 +09:00
smoogipoo	497f431366	Implement RoomManager and RoomsContainer ... Reduces logic from LoungeScreen	2018-12-11 19:07:40 +09:00
smoogipoo	bf3f5ab685	Change ready button to "Start" and make it enter player	2018-12-11 17:32:01 +09:00
Dean Herbert	ea4dce8454	Add a polling component model	2018-12-10 21:08:14 +09:00
smoogipoo	1ac615b490	Renamespace	2018-12-10 19:27:25 +09:00
smoogipoo	cd41c45686	Disable select beatmap button after room is created	2018-12-10 19:03:22 +09:00
smoogipoo	3c44f9e4f1	Make select beatmap button into a triangle button	2018-12-10 18:50:52 +09:00
smoogipoo	3f64cfc1c6	Don't add rooms to lounge until they're actually created	2018-12-10 18:35:08 +09:00
smoogipoo	ca544ef3fe	Adjust match creation process	2018-12-10 18:25:32 +09:00
smoogipoo	77193eeea4	Move from lobby into match for creation process	2018-12-10 18:00:57 +09:00
smoogipoo	3b688c702c	Use graying rather than alpha	2018-12-10 17:06:34 +09:00
smoogipoo	c7970e5425	Cleanup handling of readonly fields	2018-12-10 16:50:00 +09:00
Ivan Pavluk	a62b105fb5	Fix formatting	2018-12-10 05:06:18 +00:00
Ivan Pavluk	98e166a679	Merge branch 'master' into master	2018-12-10 12:00:53 +07:00
smoogipoo	be3a912d0b	Use UnbindFrom()	2018-12-10 13:48:12 +09:00
smoogipoo	41c7d10dff	Fix compilation issues (+ use updated framework)	2018-12-10 13:48:05 +09:00
smoogipoo	352a758f5c	Replace 3 occurrences of SpriteText.Current	2018-12-10 13:20:05 +09:00
Ivan Pavluk	8457324044	SuccessfulHitWindow->SuccessfulHitResult	2018-12-10 09:04:12 +07:00
Dan Balasescu	77a544e475	formatting fix ... Co-Authored-By: pavlukivan <pavlukivan@outlook.com>	2018-12-09 23:38:29 +07:00
Dan Balasescu	784a114eae	formatting fix ... Co-Authored-By: pavlukivan <pavlukivan@outlook.com>	2018-12-09 23:38:19 +07:00
Dragicafit	9afbebf560	Equals to == for string	2018-12-09 13:29:14 +01:00
Dean Herbert	7a703f9237	Fix API getting stuck in connecting state on some exceptions	2018-12-09 15:08:25 +09:00
Shane Woolcock	14a4dbcc1d	Fix package references	2018-12-08 15:45:19 +10:30
Shane Woolcock	f1f66b9209	Merge branch 'master' into samah-ios ... # Conflicts: # osu.Game/osu.Game.csproj	2018-12-08 14:14:09 +10:30
Dragicafit	506f27a92e	cursorExpand is now a bool	2018-12-07 23:52:57 +01:00
Dragicafit	0816eaacb8	Make CursorExpand skinnable	2018-12-07 22:22:40 +01:00
Dragicafit	667eaf95d8	Make comboColours skinnable	2018-12-07 22:16:09 +01:00
smoogipoo	feb1adb51d	Use bindable propagation rather than properties	2018-12-07 20:18:43 +09:00
Dean Herbert	7d9cdf6f81	Remove unnecessary private field	2018-12-07 20:13:03 +09:00
Dean Herbert	d379d02761	Remove unnecessary base class	2018-12-07 20:12:56 +09:00
Dean Herbert	808f02b51d	Merge branch 'master' into mod-fl2	2018-12-07 19:58:27 +09:00
Dean Herbert	2a2561e5c8	Update framework and otehr nuget packages	2018-12-07 19:39:54 +09:00
Shane Woolcock	4bd7859709	Merge branch 'master' into samah-ios ... # Conflicts: # osu.Game/osu.Game.csproj	2018-12-07 18:49:02 +10:30
Shane Woolcock	4ff1318162	Don’t directly instantiate TrackBass	2018-12-07 18:40:45 +10:30
smoogipoo	29263d7154	Refactor bindable shenanigans in Match	2018-12-07 16:20:05 +09:00
smoogipoo	d68b4bb8e7	Remove custom action from DrawableRoom	2018-12-07 14:28:43 +09:00
Dean Herbert	2f9de149dd	Add constructor to create a PM channel from a User	2018-12-07 13:56:21 +09:00
Dean Herbert	2122966cd4	Show channel selector when no channels are joined	2018-12-07 13:26:31 +09:00
Ivan Pavluk	cb2444e01c	Remove Meh from TaikoHitWindows	2018-12-06 19:04:54 +07:00
WebFreak001	3cb91979bd	Merge branch 'master' of https://github.com/ppy/osu into mod-fl2	2018-12-06 12:14:48 +01:00
Shane Woolcock	bf8d256858	Make osu! run. Run osu!, run.	2018-12-06 21:30:23 +10:30
smoogipoo	10b526504a	Move ModOverlay to SongSelect	2018-12-06 19:29:18 +09:00
smoogipoo	c02150a19b	Make match header not fade when beatmap changes	2018-12-06 18:31:12 +09:00
smoogipoo	42817b98f9	Hide max participants box	2018-12-06 18:16:17 +09:00
Dean Herbert	ab27701ed1	Merge branch 'user-registration' of https://github.com/peppy/osu into user-registration	2018-12-06 17:11:57 +09:00
Dean Herbert	6ebe555838	Fix incorrect filename	2018-12-06 17:11:39 +09:00
Ivan Pavluk	1b6658f4ee	Move HealthIncreaseFor to Judgement	2018-12-06 15:09:42 +07:00
Dean Herbert	9689c4fa17	Merge branch 'master' into user-registration	2018-12-06 17:06:43 +09:00
Dean Herbert	f157628dcc	Remove unnecessary csproj change	2018-12-06 17:06:22 +09:00
Dean Herbert	b0e2b56e85	Don't show warning screen if no previous account is detected	2018-12-06 16:54:08 +09:00
Dean Herbert	de8c5a6df0	Block input and show loading when submitting registration	2018-12-06 16:29:41 +09:00
Shane Woolcock	1be2fc59c4	Add osu.iOS project	2018-12-06 17:49:09 +10:30
Dean Herbert	09f985c721	Add warning lines	2018-12-06 15:49:06 +09:00
Dean Herbert	d5de5d1cb7	Fix textbox focus issues	2018-12-06 14:57:00 +09:00
Dean Herbert	cc3ccc4c40	Affix logo in place better	2018-12-06 12:53:35 +09:00
Dean Herbert	88052dcea1	Reset to welcome screen on exiting mid-process	2018-12-06 12:38:11 +09:00
smoogipoo	eadbe4c470	Make beatmap selection work	2018-12-06 12:21:30 +09:00
Dean Herbert	d3f5111fa1	Use relative URL	2018-12-06 12:18:21 +09:00
Dean Herbert	e56f4cc8a5	Add remaining steps to registration screen	2018-12-06 11:58:09 +09:00
Dean Herbert	0df9fa1e59	Remove pointless default size specification in OsuLogo	2018-12-06 11:56:16 +09:00
Dean Herbert	669a17529a	Move external link opened to top most level	2018-12-06 11:55:58 +09:00
smoogipoo	5f0bde581c	Fix OsuBindableBeatmap not being able to be auto-constructed	2018-12-05 20:42:16 +09:00
smoogipoo	1a3c06f2d9	Fix OsuTestCase beatmap not having a correct default beatmap	2018-12-05 20:33:27 +09:00
Dean Herbert	94045413ce	Change statistics to be int for now	2018-12-05 19:44:01 +09:00
Dean Herbert	4f46fa4798	Hide on connect	2018-12-05 17:30:16 +09:00
Dean Herbert	1ca00f6662	Add registration API call and related error handling	2018-12-05 17:13:22 +09:00
smoogipoo	e7d7e00516	Better disabling of various controls	2018-12-05 17:01:14 +09:00
Dean Herbert	f3f449c749	wip	2018-12-05 13:08:35 +09:00
Dean Herbert	1a974f64de	Initial design for user registration dialog	2018-12-05 12:57:26 +09:00
Dean Herbert	b5ba74a628	Add more specific checks	2018-12-05 02:12:15 +09:00
Dean Herbert	c7c5837ec1	Fix GetWorkingBeatmap potentially loading same beatmap twice ... This could be seen when using the previous/next buttons in the MusicController while at song select.	2018-12-05 01:45:32 +09:00
Dean Herbert	4f5028bbc1	Merge branch 'master' into fix-hudoverlay-presence	2018-12-04 22:14:54 +09:00
smoogipoo	ca91dfa091	Make hudoverlay always present	2018-12-04 19:20:32 +09:00
smoogipoo	ec83790734	Add timeshift game type	2018-12-04 18:58:45 +09:00
smoogipoo	c469d12d63	Set room host when the room is refreshed	2018-12-04 18:18:17 +09:00
smoogipoo	a7ac544e12	Add interface for the multiplayer screen short title	2018-12-04 17:43:44 +09:00
smoogipoo	b251129c59	Block going into multiplayer while logged out	2018-12-04 17:43:27 +09:00
smoogipoo	f2a57ce270	Fix room host not being set	2018-12-04 17:23:58 +09:00
smoogipoo	6e5716c3f3	Adjust transition	2018-12-04 15:32:12 +09:00
smoogipoo	a02e025f06	Fix selections not working anymore	2018-12-04 15:26:06 +09:00
smoogipoo	d8739d9dee	Fix creating a new room re-using the existing model	2018-12-04 15:25:48 +09:00
Dean Herbert	1913dc7365	Merge branch 'master' into fix-home-button-cancel	2018-12-04 12:53:11 +09:00
smoogipoo	e22cefc27d	Immediately select newly-created rooms	2018-12-04 12:49:22 +09:00
Dean Herbert	415349e6ef	Add missing return	2018-12-04 12:14:26 +09:00
smoogipoo	9fdd48ded2	Add 1ms offset to controlpoint lookup times	2018-12-04 12:08:46 +09:00
Dean Herbert	a33865efce	Fix home button being cancelled by mod select	2018-12-04 12:06:05 +09:00
Roman Kapustin	c6c255718b	Handle ModAutoplay during score construction in the Player	2018-12-03 22:37:26 +03:00
Dan Balasescu	78d1a1c499	Merge branch 'master' into fix-async-profile-logic	2018-12-03 20:55:23 +09:00
Dan Balasescu	f278dff49c	Merge branch 'master' into fix-chat-crash	2018-12-03 19:17:05 +09:00
Dean Herbert	7e35afd178	Fix loading scores on profile pages potentially causing long blocking operations	2018-12-03 18:37:44 +09:00
smoogipoo	6a28e8c696	Add settings to lounge	2018-12-03 18:30:26 +09:00
Dean Herbert	14d9f1d8bb	Fix hard crash due to out-of-order chat sequencing	2018-12-03 18:13:10 +09:00
Dean Herbert	9a8136ea4a	Merge branch 'master' into fix-selector-regression	2018-12-03 18:01:12 +09:00
smoogipoo	53a54f8634	Renamespace room settings	2018-12-03 17:54:10 +09:00
smoogipoo	20b843e63c	Add create tab	2018-12-03 17:50:56 +09:00
smoogipoo	51c16867d5	Remove type conversion from LoungeTab to RoomAvailability	2018-12-03 17:50:39 +09:00
smoogipoo	eb88768bd0	Fix incorrect controlpoint being applied to samples	2018-12-03 17:21:27 +09:00
smoogipoo	814d401eb0	Make ChannelSelectorTabItem not switchable	2018-12-03 11:48:36 +09:00
smoogipoo	7255a01bf5	Remove ChatTabControl	2018-12-03 11:48:21 +09:00
Dean Herbert	03e416cda9	Merge remote-tracking branch 'upstream/master' into tournament-tools	2018-12-01 10:03:31 +09:00
Dean Herbert	f9fb6dc39b	Remove health from ScoreInfo	2018-12-01 00:17:05 +09:00
Dean Herbert	af3ef9a089	Fix some data types on ScoreInfo	2018-11-30 20:43:38 +09:00
Dean Herbert	2860f5a5cd	Revert "Fix D rank displaying as F" ... This reverts commit 17b2a4ca0d.	2018-11-30 20:03:21 +09:00
Dean Herbert	3921834cfd	Merge branch 'master' into fix-d-rank	2018-11-30 19:49:36 +09:00
Dean Herbert	b985d19078	Merge branch 'master' into local-score-saving	2018-11-30 19:48:00 +09:00
Dean Herbert	17b2a4ca0d	Fix D rank displaying as F	2018-11-30 19:46:40 +09:00
smoogipoo	f80a30cba4	Fix null being serialized	2018-11-30 18:52:31 +09:00
smoogipoo	b1c5b43767	Fix post-rebase errors	2018-11-30 18:46:47 +09:00
smoogipoo	10ed09521c	Add leaderboard display for local scores	2018-11-30 18:40:53 +09:00
smoogipoo	4144f4bd2f	Fix duplicates not being ignored if hash is null	2018-11-30 18:40:06 +09:00
smoogipoo	795933d1a1	CreateScoreInfo -> CreateScore	2018-11-30 18:32:08 +09:00