10197 Commits

Author	SHA1	Message	Date
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
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
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
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
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
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
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	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
smoogipoo	a6b0e35b2d	Fix post-rebase issues	2018-11-30 18:31:54 +09:00
smoogipoo	a8ad7d4670	Add silent import parameter	2018-11-30 18:27:13 +09:00
smoogipoo	d07a724970	Only allow replay screen changes in menu + songselect	2018-11-30 18:25:54 +09:00
smoogipoo	4c1abdcd8c	Save score upon map completion	2018-11-30 18:25:14 +09:00
smoogipoo	8eff49bccd	Remove User from Replay	2018-11-30 18:25:14 +09:00
smoogipoo	ed67984638	Don't load player if score has no replay data	2018-11-30 18:24:35 +09:00
Dean Herbert	059e9e180b	Apply review	2018-11-30 18:07:15 +09:00
Dean Herbert	9718e476c7	Add license header	2018-11-30 18:07:15 +09:00
Dean Herbert	2dd5dad7c5	Remove empty lines	2018-11-30 18:07:15 +09:00
Dean Herbert	00c5ea28c7	Update migrations in line with hash change	2018-11-30 18:07:15 +09:00
Dean Herbert	66e43e6ed9	Update hashing method in line with master	2018-11-30 17:36:06 +09:00
Dean Herbert	be37f3c328	Rename NoModMod	2018-11-30 17:35:13 +09:00
Dean Herbert	aa7a665317	Merge remote-tracking branch 'upstream/master' into scoredatabase	2018-11-30 17:20:23 +09:00
Dean Herbert	d97a15a504	Add IMod and change ShortenedName to Acronym	2018-11-30 17:16:00 +09:00
Dean Herbert	84f3d4f48d	Fix nullref	2018-11-30 17:15:32 +09:00
Dean Herbert	e82ad3539b	Move JsonIgnore specification to interface	2018-11-30 16:39:25 +09:00
Dean Herbert	58293c3eae	Re-migrate	2018-11-30 16:35:57 +09:00
Dean Herbert	3727955911	Refactors/renames	2018-11-30 16:35:45 +09:00
Dan Balasescu	f496bdba69	Merge branch 'master' into fix-skin-duplication	2018-11-30 16:20:03 +09:00
smoogipoo	bc3fcb87b7	Use input events rather than scene graph traversals	2018-11-30 15:47:55 +09:00
Dean Herbert	831cd3ed59	ScoreInfo scoreInfo -> ScoreInfo score	2018-11-30 15:18:52 +09:00
Dan Balasescu	e83f6707bf	Merge branch 'master' into editor-keyboard-seek	2018-11-30 15:17:06 +09:00
Dean Herbert	705ef5e3ac	Fix hash function	2018-11-30 15:10:56 +09:00
Dean Herbert	271dcded3c	Merge branch 'master' into scoredatabase	2018-11-30 14:59:58 +09:00
Dean Herbert	ab621bd873	Toggle pause in editor with spacebar	2018-11-30 14:58:09 +09:00
Dean Herbert	0ee5a5bdb4	Add support for keyboard seeking in the editor	2018-11-30 14:57:25 +09:00
smoogipoo	64bb27be5d	Add scoreinfo tables	2018-11-30 14:48:31 +09:00
smoogipoo	69370c53ca	Fix rank not being read	2018-11-30 14:48:25 +09:00
Dean Herbert	b3a55a26d7	Merge branch 'master' into inter-column-movements	2018-11-30 14:31:44 +09:00
Dean Herbert	7543af07dd	Remove weird reference	2018-11-30 14:30:50 +09:00
smoogipoo	690a1f0765	Fix score statistics not being serialised	2018-11-30 14:27:34 +09:00
smoogipoo	5530736541	Cleanup mods string	2018-11-30 14:27:34 +09:00
smoogipoo	b673eb79b1	Fix local score infos conflicting	2018-11-30 14:27:34 +09:00
smoogipoo	aa7f66b24a	Fix crash when loading scores with no mods	2018-11-30 14:27:34 +09:00
Dean Herbert	5254b07680	Merge remote-tracking branch 'upstream/master' into inter-column-movements	2018-11-30 11:57:53 +09:00
Jack Scotson	e11b2218cb	Merge branch 'master' into keypad-enter	2018-11-29 13:51:07 +00:00
Dean Herbert	7ffc597a8e	Fix one-frame issues	2018-11-29 14:55:20 +09:00
Dean Herbert	3d46ac7d35	Remove unnecessary high frequency input	2018-11-29 13:21:11 +09:00
Dean Herbert	86a0f8d2a9	Merge branch 'master' into note-placement	2018-11-29 13:06:11 +09:00
Dean Herbert	097c8e0155	Merge branch 'master' into fix-taiko-completions	2018-11-29 12:17:37 +09:00
smoogipoo	aea84f737b	Fix taiko hitobjects potentially disappearing before being judged	2018-11-29 12:12:29 +09:00
smoogipoo	d2f0a921ca	Fix lookups by beatmapinfo failing for imports of existing sores	2018-11-28 20:41:48 +09:00
smoogipoo	a88b69ec43	Notify of existing imports	2018-11-28 20:19:35 +09:00
smoogipoo	aaf3e650a5	Fix some columns	2018-11-28 20:19:35 +09:00
smoogipoo	2bb7a078c9	Don't import replays with no existing beatmap	2018-11-28 20:19:35 +09:00
smoogipoo	554c858944	Fix mods not deserializing properly	2018-11-28 20:19:35 +09:00
Dean Herbert	ab2b2493a1	Move hashing functionality to ArchiveModelManager	2018-11-28 19:21:36 +09:00
Dean Herbert	0384f3549f	Add hash and missing indices to SkinInfo	2018-11-28 19:15:56 +09:00
Dean Herbert	f42d4a9382	Add wildcard scope to oauth requests	2018-11-28 19:02:23 +09:00
Dean Herbert	ce660b6d67	Add skin de-duplication	2018-11-28 19:01:22 +09:00
smoogipoo	542a75d076	Add index on online score id	2018-11-28 18:56:20 +09:00
smoogipoo	b8e60afa69	Move replays to an wrapping Score class	2018-11-28 18:45:17 +09:00
smoogipoo	219929eb47	Score -> ScoreInfo	2018-11-28 18:33:01 +09:00
smoogipoo	5b409a5ae5	Fix missed renames	2018-11-28 17:27:22 +09:00
smoogipoo	41a8a12df3	Add ruleset foreign key	2018-11-28 17:26:46 +09:00
smoogipoo	ed02847752	Beatmap -> BeatmapInfo + add foreign key	2018-11-28 17:26:39 +09:00
smoogipoo	2ee181daf7	Re-namespace replay-related classes	2018-11-28 17:20:37 +09:00
smoogipoo	1717d7defb	Implement importing of scores into ScoreManager	2018-11-28 17:19:58 +09:00
smoogipoo	7a82b99417	Add storage for a few more parsed fields	2018-11-28 17:02:14 +09:00
smoogipoo	4ba7690e04	Initial scoremanager/scorestore structure	2018-11-28 16:50:16 +09:00
smoogipoo	3fe4a36845	Add databased fields to Score	2018-11-28 16:39:08 +09:00
smoogipoo	09b79d736b	Remove unused usings	2018-11-28 16:33:42 +09:00
smoogipoo	a783fdb501	Add LegacyFileArchiveReader ... Treats files as "archives" for import.	2018-11-28 16:13:16 +09:00
smoogipoo	5fd6e6ca77	Re-namespacing	2018-11-28 16:12:57 +09:00
smoogipoo	0982508d26	Rename to LegacyDirectoryArchiveReader	2018-11-28 15:13:27 +09:00
smoogipoo	dc31736db7	Add explicit foreign key property to INamedFileInfo	2018-11-28 13:45:56 +09:00
smoogipoo	14ff4bc26a	Move primary key attribute to IHasPrimaryKey	2018-11-28 13:19:23 +09:00
smoogipoo	ea52d2d527	Make Mod IJsonSerializable	2018-11-28 13:12:29 +09:00
smoogipoo	c5d2dc2f6a	Remove unnecessary newline	2018-11-28 13:05:17 +09:00
Dean Herbert	6647fcd299	Fix volume adjustment precision regressing	2018-11-27 18:05:38 +09:00
Dean Herbert	cd513e6e91	Merge branch 'master' into note-placement	2018-11-26 23:12:25 +09:00
Dean Herbert	da79292250	Merge branch 'master' into fix_idle_tracker	2018-11-26 17:41:45 +09:00
Dean Herbert	77090500e8	Merge branch 'fix_idle_tracker' of https://github.com/UselessToucan/osu into fix_idle_tracker	2018-11-26 17:41:22 +09:00
Dean Herbert	32b36f2883	Use IBindable<>	2018-11-26 17:07:30 +09:00
Dean Herbert	266873740d	Specify RelativeSizeAxes in ctor ... This is basically always the behaviour we want.	2018-11-26 17:07:20 +09:00
Dean Herbert	626048038c	Handle the null case	2018-11-26 16:50:41 +09:00
Dan Balasescu	38ef1d1f03	Merge branch 'master' into multiplayer-room-settings	2018-11-26 16:46:27 +09:00
Dean Herbert	b751a0d918	Merge branch 'master' into fix_idle_tracker	2018-11-26 16:44:04 +09:00
Dean Herbert	87da7b05a6	Remove unnecessarily specified RelativeSizeAxes	2018-11-26 16:39:11 +09:00
Dean Herbert	68f0d25550	Mvoe private method to bottom	2018-11-26 16:33:58 +09:00
Dean Herbert	8d65d49126	Use bindable flow for checking idle time	2018-11-26 16:32:59 +09:00
smoogipoo	dea387c31e	Fix post-merge issues	2018-11-26 16:29:56 +09:00
smoogipoo	dcf740e5d3	Merge remote-tracking branch 'origin/master' into multiplayer-room-settings	2018-11-26 16:27:22 +09:00
smoogipoo	efdad3a3a7	Merge remote-tracking branch 'origin/master' into ChatManager_with_BindableCollection	2018-11-26 16:12:55 +09:00
smoogipoo	f9f300b215	Fix drag breaking if scrolling while dragging	2018-11-26 16:08:56 +09:00
Dean Herbert	fe5b043a59	Merge branch 'master' into fix_idle_tracker	2018-11-26 15:24:44 +09:00
Dean Herbert	4cfeb1b9a1	Merge branch 'master' into note-placement	2018-11-26 14:35:31 +09:00
Dean Herbert	c944e8bb29	Merge branch 'master' into fix-deletion-crash	2018-11-26 14:20:02 +09:00
Dean Herbert	bfebed053d	Merge branch 'master' into note-placement	2018-11-26 14:19:46 +09:00
smoogipoo	56032a4522	Merge branch 'mania-selection-movement' into inter-column-movements ... # Conflicts: # osu.Game.Rulesets.Mania/Edit/Blueprints/ManiaSelectionBlueprint.cs # osu.Game/Screens/Edit/Compose/Components/SelectionHandler.cs	2018-11-26 11:45:48 +09:00
smoogipoo	4fbe28e98f	Merge remote-tracking branch 'origin/master' into note-placement	2018-11-26 10:42:20 +09:00
naoey	c71fc0b800	Don't focus overlay again after set is fetched	2018-11-25 14:49:09 +05:30
smoogipoo	cadfe41f83	Merge remote-tracking branch 'origin/master' into external_link_warning	2018-11-23 15:19:52 +09:00
smoogipoo	df004d7a49	Adjust dialog text	2018-11-23 15:19:15 +09:00
smoogipoo	ac73844fe0	Fix header potentially overflowing the dialog	2018-11-23 15:19:09 +09:00
Dean Herbert	afa547af84	Fix order of ChannelManager dependency caching	2018-11-23 11:00:17 +09:00
Dan Balasescu	b446a73c0c	Add brackets ... Co-Authored-By: peppy <pe@ppy.sh>	2018-11-23 10:06:06 +09:00
Dean Herbert	1b76e2faf5	Merge branch 'master' into fix-editor-precise-scroll	2018-11-23 09:57:35 +09:00
Dean Herbert	a4259261e3	Merge branch 'master' into fix-channel-presence	2018-11-23 08:11:46 +09:00
Dan Balasescu	2f368a32d4	Merge branch 'master' into fix-invalid-cached	2018-11-22 23:56:20 +09:00
Dan Balasescu	0ee4b1c4ac	Merge branch 'master' into fix-channel-presence	2018-11-22 21:52:16 +09:00
Dean Herbert	10047e6815	Adjust tick-based wheel control to be more correct	2018-11-22 20:13:40 +09:00
Dean Herbert	1da2006dea	Merge branch 'master' into note-placement	2018-11-22 19:44:39 +09:00
Dean Herbert	a48c26d999	Fix precision scroll events being handled incorrectly by editor	2018-11-22 19:40:44 +09:00
Dean Herbert	61fdfe39fd	Add comment	2018-11-22 19:21:32 +09:00
Dean Herbert	6cd69b794d	Fix leaderboard accessing drawables in a possibly invalid state	2018-11-22 19:08:46 +09:00
Dean Herbert	a144e97568	Fix crash on creating two new PM channels	2018-11-22 18:27:22 +09:00
smoogipoo	d1ec9fc294	Merge remote-tracking branch 'Joehuu/master' into fix-channel-presence	2018-11-22 13:04:32 +09:00
smoogipoo	5caa67d735	Hide playlist when MusicController is hidden	2018-11-22 12:12:34 +09:00
miterosan	4f41512265	Lowercase the references to joinedChannel and availableChannels	2018-11-21 23:21:27 +01:00
miterosan	21c9353fee	Remove not used usings	2018-11-21 23:15:45 +01:00
miterosan	a14b6ac9df	Replace ObservableCollection with BindableCollection	2018-11-21 23:15:44 +01:00
smoogipoo	cd2737156f	Fix crashes when importing/deleting from model managers	2018-11-21 23:11:09 +01:00
smoogipoo	aac7081580	Update package	2018-11-21 23:11:09 +01:00
smoogipoo	39e9c61e24	OpenTK -> osuTK	2018-11-21 23:11:08 +01:00
Dean Herbert	2126cf0d9a	Fix join process for PMs being incorrect	2018-11-21 20:44:41 +09:00
Dean Herbert	b31efb7bb9	Fix PM channel type	2018-11-21 20:34:36 +09:00
Dean Herbert	d677921680	Remove excess newline	2018-11-21 18:53:50 +09:00
Dean Herbert	7755242a43	Merge branch 'master' into osuTK	2018-11-21 18:53:11 +09:00
Dean Herbert	ecd7deaf1e	Merge pull request #3746 from smoogipoo/fix-threaded-callback-crashes ... Fix crashes when importing/deleting from model managers	2018-11-21 18:52:20 +09:00
Dean Herbert	88f82eb722	Fix instabilities in channel join logic	2018-11-21 17:15:15 +09:00
Dean Herbert	4cde66240d	Fix default channels not being joined	2018-11-21 17:15:15 +09:00
Dean Herbert	eab2776755	Fix a crash on leaving the selected channel	2018-11-21 17:15:15 +09:00
smoogipoo	ab2c969122	Add private channel types	2018-11-21 12:58:45 +09:00
smoogipoo	5ad96afea0	Fix crashes when importing/deleting from model managers	2018-11-20 18:09:23 +09:00
smoogipoo	2a41c38294	Update package	2018-11-20 17:30:03 +09:00
smoogipoo	dc8cd51e15	Implement mania note deletion	2018-11-20 17:26:00 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Dean Herbert	23a446bab2	Add support for all channel types	2018-11-20 15:03:55 +09:00
Dean Herbert	ed26d8ebec	Merge branch 'master' into fix-taiko-lifetimes	2018-11-20 04:05:05 +09:00
Roman Kapustin	285b199d7d	Make IdleTracker IHandleGlobalInput	2018-11-19 20:50:46 +03:00
Roman Kapustin	3c0ce2b615	Revert "Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle"" ... This reverts commit bcdaee7d39.	2018-11-19 20:48:59 +03:00
smoogipoo	d5b937f88f	Fix post-merge issue	2018-11-19 19:17:03 +09:00
Dan Balasescu	8cee4141e8	Merge branch 'master' into note-placement	2018-11-19 19:08:53 +09:00
smoogipoo	bcdaee7d39	Revert "Merge pull request #3415 from UselessToucan/return_to_large_logo_after_idle" ... This reverts commit 3e2e2a7000, reversing changes made to d94801b6c6.	2018-11-19 17:52:31 +09:00
smoogipoo	55edeb095d	SelectionBox -> SelectionHandler	2018-11-19 16:58:11 +09:00
smoogipoo	595e2ffbff	Unbind event when column changes	2018-11-19 16:20:21 +09:00
Dean Herbert	970ea928ae	Fix hold for menu button occasionally disappearing	2018-11-19 12:06:47 +09:00
Dean Herbert	a57f98ed4d	Merge branch 'master' into fix-taiko-lifetimes	2018-11-19 08:41:19 +09:00
Dean Herbert	72c9c66461	Merge branch 'master' into improve_hud_overlay_colour_setting	2018-11-19 08:14:51 +09:00
Roman Kapustin	376e76e00d	Resolve merge conflicts	2018-11-18 16:10:36 +03:00
Roman Kapustin	ecf8a89f26	Set AccentColour and GlowColour in StandardHealthDisplay	2018-11-16 19:30:58 +03:00
Dan Balasescu	57c1ddb1e0	Merge branch 'master' into flashlight-mod	2018-11-16 18:45:15 +09:00
smoogipoo	4cbda97b1e	Move positional adjustment to SelectionBox	2018-11-16 17:12:24 +09:00
Roman Kapustin	37b19f78ae	Set AccentColour in concrete counters	2018-11-15 23:37:21 +03:00
jorolf	80bd98bb9d	apply suggestions	2018-11-15 17:38:38 +01:00
smoogipoo	df7515b66f	Pass all selected hitobjects to the selection blueprints	2018-11-15 21:01:09 +09:00
smoogipoo	d5464702fa	Fix post-merge issue	2018-11-15 20:56:34 +09:00
smoogipoo	eddba44d0f	Merge branch 'note-placement' into inter-column-movements	2018-11-15 20:53:57 +09:00
smoogipoo	e207dd728b	Fix taiko proxies not receiving the correct lifetimes	2018-11-15 20:26:12 +09:00
Dan Balasescu	e8f34ddff0	Merge branch 'master' into return_to_large_logo_after_idle	2018-11-15 15:16:10 +09:00
jorolf	41a0f9896e	Merge branch 'master' into flashlight-mod	2018-11-15 00:35:42 +01:00
jorolf	7d2958b7b0	split shader, remove unnecessary clutter and fix some bugs	2018-11-15 00:33:13 +01:00
HoLLy	9dd3d28436	Fix SettingsTextBox having width of 0	2018-11-14 22:29:11 +01:00
Dean Herbert	caaa5645e3	Correct framework version	2018-11-14 21:16:08 +09:00
Dean Herbert	30547ac064	Merge remote-tracking branch 'upstream/master' into dropdown-updates	2018-11-14 20:03:45 +09:00
smoogipoo	f1f2fc133a	Use SkinInfo directly	2018-11-14 19:29:20 +09:00
Dan Balasescu	81a3170e3b	Merge branch 'master' into hold-for-menu-back	2018-11-14 19:13:07 +09:00
Jack Scotson	8ee81c4811	Merge branch 'master' into keypad-enter	2018-11-14 10:03:19 +00:00
Dan Balasescu	61a62a4eae	Merge branch 'master' into hold-for-menu-back	2018-11-14 18:35:08 +09:00
smoogipoo	4b86c29f7b	Merge remote-tracking branch 'origin/master' into placement-hiding	2018-11-14 18:34:45 +09:00
smoogipoo	c963fc7cd2	Reduce chaining	2018-11-14 18:34:13 +09:00
Dean Herbert	4dec2d1db0	Merge remote-tracking branch 'upstream/master' into note-placement	2018-11-14 18:29:31 +09:00
Dan Balasescu	e9b47c6233	Merge branch 'master' into hold-for-menu-back	2018-11-14 18:22:34 +09:00
Dean Herbert	a83efe225e	Merge remote-tracking branch 'upstream/master' into add-mania-selection-testcase	2018-11-14 18:11:53 +09:00
smoogipoo	aff5fa6169	Update with osu!-side dropdown changes	2018-11-14 18:02:38 +09:00
Dean Herbert	a1dd1057ce	Merge branch 'master' into more-global-scrollalgo	2018-11-14 17:15:24 +09:00
Dean Herbert	84d16ee71b	Merge branch 'master' into placement-hiding	2018-11-14 16:59:41 +09:00
smoogipoo	7274908059	Implement interface	2018-11-14 15:33:09 +09:00
Dean Herbert	fb22fc11f6	Merge remote-tracking branch 'upstream/master' into Private_Messages	2018-11-14 13:59:17 +09:00
Dean Herbert	9a9d5e60af	More refactors	2018-11-14 13:59:02 +09:00
Dean Herbert	2ae139d260	Merge branch 'master' into more-global-scrollalgo	2018-11-14 13:54:53 +09:00
Dean Herbert	34973a3e9f	Merge branch 'master' into scrollalgorithm-timeat	2018-11-14 13:32:16 +09:00
Dean Herbert	8b190edde0	Merge branch 'master' into more-global-scrollalgo	2018-11-14 13:32:14 +09:00
Dean Herbert	8d59b7299f	Merge branch 'master' into no-drawable-speedchangevis	2018-11-14 13:22:01 +09:00
Dean Herbert	c4769f6802	Refactors	2018-11-14 13:19:51 +09:00
Dean Herbert	396a5b3cd0	Merge branch 'master' into Private_Messages	2018-11-14 12:49:54 +09:00
Dean Herbert	b9278b3488	Fix brackets	2018-11-14 12:05:07 +09:00
Dean Herbert	161d476091	Merge remote-tracking branch 'upstream/master' into hide-seekbar-with-no-song	2018-11-14 11:53:43 +09:00
Dean Herbert	c77412992e	Merge conditionals	2018-11-14 11:53:34 +09:00
Jack Scotson	0bced171e7	Merge branch 'master' into keypad-enter	2018-11-13 17:11:21 +00:00
Scotsoo	4dab5db2e5	Allowing keypad enter to be used along with normal enter	2018-11-13 17:09:28 +00:00
Dean Herbert	3caf0cb0d9	Merge branch 'master' into no-drawable-speedchangevis	2018-11-13 19:42:04 +09:00
Dean Herbert	e7d984415b	Merge branch 'master' into immutable-sliderpath	2018-11-13 18:06:14 +09:00
Dean Herbert	72ae22b0c4	Add support for creating new PM conversations	2018-11-13 17:24:11 +09:00
Dean Herbert	f241fcdba1	Add back support for new API and private messages	2018-11-13 15:20:59 +09:00