8273 Commits

Author	SHA1	Message	Date
DrabWeb	da8b1f996f	Override Type in Match.	2018-06-01 17:16:35 -03:00
DrabWeb	5073057420	Cleanup.	2018-06-01 16:34:03 -03:00
DrabWeb	a103acbd97	Merge https://github.com/ppy/osu into multiplayer-match	2018-06-01 16:27:38 -03:00
DrabWeb	97b473ef30	Expose tabs and hide beatmap select button in Header.	2018-06-01 16:23:11 -03:00
DrabWeb	cc32adf51f	Move max text updating into updateMax.	2018-06-01 14:28:24 -03:00
Dean Herbert	9b7741b353	Avoid using update for fading logic	2018-06-01 22:19:11 +09:00
Dean Herbert	ae6f603d16	Merge branch 'master' into match-panel-with-web	2018-06-01 21:31:18 +09:00
Dean Herbert	5c2a2e394e	Fix incorrect async logic in BeatmapInfoWedge ... Closes #2653. Alternative to #2657.	2018-06-01 20:31:29 +09:00
DrabWeb	59762c0393	Change Room.Participants to an IEnumerable.	2018-06-01 06:15:23 -03:00
DrabWeb	8dd36ee1a9	Default Max to null in ParticipantCount.	2018-06-01 06:08:57 -03:00
DrabWeb	9989517ff0	Merge https://github.com/ppy/osu into multiplayer-match	2018-06-01 04:01:14 -03:00
Dean Herbert	b9c601074d	Formatting fixes	2018-06-01 15:45:09 +09:00
Dean Herbert	c5a3eff182	Merge branch 'master' into multiplayer-logic-encapsulation	2018-06-01 15:31:19 +09:00
Dean Herbert	8bde1fd327	Merge branch 'master' into updateable-beatmap-set-cover	2018-06-01 15:20:59 +09:00
Joehu	729f2ec725	Match authorinfo with web	2018-05-31 14:34:47 -07:00
Joehu	b4d621a2cb	Add link colour to beatmap source	2018-05-31 10:21:22 -07:00
Joehu	1095669a55	Match panel with web	2018-05-31 08:09:19 -07:00
Dean Herbert	b68a5f5eab	Tidy up Loader logic	2018-05-31 20:07:44 +09:00
smoogipoo	4eb7a34944	Always update children when ruleset input manager is updated	2018-05-31 18:02:10 +09:00
DrabWeb	6781b81336	Cleanup.	2018-05-31 05:48:42 -03:00
Dean Herbert	42bc6b6b2e	Merge branch 'master' into updateable-beatmap-set-cover	2018-05-31 17:33:31 +09:00
Dean Herbert	dfbcf4d7b7	Add tests	2018-05-31 17:29:59 +09:00
Dean Herbert	7487c82ec1	Stop the logo from beating	2018-05-31 17:14:47 +09:00
Dean Herbert	c161d82474	Reduce the length of the fadeout animation	2018-05-31 17:14:04 +09:00
Dean Herbert	9df173b339	Merge branch 'master' into better-loading-logo	2018-05-31 15:59:04 +09:00
Dan Balasescu	29f3011f75	Merge branch 'master' into fix-osu-logo-discrepancies	2018-05-31 15:21:44 +09:00
smoogipoo	e48b17fb0d	Unindent	2018-05-31 15:17:59 +09:00
smoogipoo	4ff803d11d	Merge remote-tracking branch 'origin/master' into fix-osu-logo-discrepancies	2018-05-31 14:47:47 +09:00
Dan Balasescu	76567ae98b	Merge branch 'master' into song-selet-enumerable	2018-05-31 14:42:58 +09:00
Dan Balasescu	cd3ca68f03	Merge branch 'master' into song-selet-enumerable	2018-05-31 14:38:04 +09:00
Dan Balasescu	35d8ec8df6	Merge branch 'master' into fix-player-life-management	2018-05-31 14:34:31 +09:00
smoogipoo	9da7bfd615	Merge remote-tracking branch 'origin/master' into fix-beatmap-import-conflicts ... # Conflicts: # osu.Game/Database/ArchiveModelManager.cs	2018-05-31 14:02:52 +09:00
Dan Balasescu	a9db479b27	Merge branch 'master' into import-fixes	2018-05-31 13:49:12 +09:00
Dean Herbert	0f6c623ebb	Tidy up some unnecessary lines	2018-05-31 12:44:59 +09:00
Dean Herbert	205aa1a3cd	Fetch colour from OsuColour palette	2018-05-31 12:44:11 +09:00
Dean Herbert	319faf12f7	Fix incorrect naming of label	2018-05-31 12:39:56 +09:00
Dean Herbert	2f21b9c4ea	Merge remote-tracking branch 'upstream/master' into Joehuu-score-multiplier-edits	2018-05-31 12:36:37 +09:00
DrabWeb	ff93a54a64	Default Type to Title, use ToLower for the screen type title.	2018-05-30 23:16:54 -03:00
Dean Herbert	74c52e0a7c	Merge branch 'master' into multiplayer-screen-type	2018-05-31 00:16:43 +09:00
Dean Herbert	9ea6ab28ea	Fix intro potentially starting out-of-sync due to logo's outward animation	2018-05-30 20:22:31 +09:00
Dean Herbert	9497db0b0b	Add a delay before the loading logo is displayed	2018-05-30 20:22:26 +09:00
Dean Herbert	0caf15166e	Remove unnecessary FinishTransforms	2018-05-30 20:05:31 +09:00
Dean Herbert	0dafcf00b7	Fix some discrepancies with the main menu logo transitions	2018-05-30 19:50:00 +09:00
Dean Herbert	6d6b186fb2	Fix delayed logo animations playing even if screen has already been exited	2018-05-30 19:25:39 +09:00
Dean Herbert	a28e71995d	Offload database query to task ... Allows song select to load a touch faster, in theory.	2018-05-30 16:15:57 +09:00
Dean Herbert	5872b61988	Fix potential double-disposal of player if PlayerLoader is finalised	2018-05-30 15:48:26 +09:00
Dean Herbert	54e53f7190	Fix player getting loaded when exiting song select	2018-05-30 15:48:20 +09:00
Dean Herbert	6000a90721	Merge branch 'master' into overlay-activation	2018-05-30 13:59:20 +09:00
Dean Herbert	eb89317494	Remove performance optimisation tracking disables to keep things simple for now	2018-05-30 13:43:43 +09:00
Dean Herbert	4a7de043e0	Recycle all contexts on beginning a write operation for the time being	2018-05-30 13:43:25 +09:00
Dean Herbert	e23e2bd348	Fix recycling never being performed due to incorrect ordering	2018-05-30 13:37:52 +09:00
Dean Herbert	31ab6f2408	Fix event flushing sticking on early return	2018-05-29 19:43:52 +09:00
Dean Herbert	4a18951cce	Report full error to log file	2018-05-29 18:37:45 +09:00
Dean Herbert	0adc16f9bd	Handle online ID mismatches and clashes on beatmap import	2018-05-29 16:26:50 +09:00
Dean Herbert	47d88a48a2	Add logging on import processes	2018-05-29 16:26:42 +09:00
Dean Herbert	de8c4e6d56	Remove unique constraints on hash columns ... We are going to allow multiple instances of the same beatmap info hash as they could be in different beatmap sets.	2018-05-29 16:26:32 +09:00
Dean Herbert	c1f416b1cc	Add back missing rethrow	2018-05-29 16:23:38 +09:00
Dean Herbert	3d3026a80c	Report any error during import to the write context to allow for rollback	2018-05-29 16:23:38 +09:00
Dean Herbert	72da640059	Change order of event firing in Update calls ... A remove event should not be fired before the update is successful.	2018-05-29 16:23:38 +09:00
Dean Herbert	80806be047	Don't start transactions for migration ... It looks like transactions are used internally during migration.	2018-05-29 16:23:38 +09:00
Dean Herbert	a3287b8cf2	Correctly rollback failed imports	2018-05-29 16:23:38 +09:00
DrabWeb	7b8211e6db	Add MultiplayerScreen.Type	2018-05-29 04:23:29 -03:00
Dean Herbert	bcb04f6168	Improve transaction handling flexibility	2018-05-29 16:23:27 +09:00
Dean Herbert	d4e7f08c20	Bring entity framework up-to-date and re-enable transactions	2018-05-29 16:23:27 +09:00
Dean Herbert	2a87b851fa	Add proper transaction rollback logic on exception	2018-05-29 16:23:27 +09:00
DrabWeb	9a7e5a3e2c	Update TestCaseMatch.	2018-05-29 04:16:19 -03:00
DrabWeb	7edb82eb85	Add TestCaseMatchParticipants.	2018-05-29 03:53:30 -03:00
DrabWeb	b4b4a8a157	Add TestCaseMatchInfo.	2018-05-29 03:24:38 -03:00
DrabWeb	94b54a0520	Adjust design of ReadyButton.	2018-05-29 03:03:51 -03:00
DrabWeb	3915cb7f2f	Add Match Participants, change Room.Users to IEnumerable.	2018-05-29 02:42:52 -03:00
DrabWeb	77ff0640c2	Add a gradient over the cover in Header.	2018-05-29 01:53:45 -03:00
DrabWeb	c8ce34b6d4	Add Match Info.	2018-05-29 01:51:04 -03:00
DrabWeb	98819880c4	Add match screen header.	2018-05-29 01:16:39 -03:00
DrabWeb	ab3ac49a2d	Add empty Match screen.	2018-05-29 01:16:39 -03:00
DrabWeb	d090323c00	Add ParticipantCount to share with the Match screen.	2018-05-29 00:51:56 -03:00
DrabWeb	852d7ef48d	Use ?: expression instead of if/else.	2018-05-29 00:07:33 -03:00
DrabWeb	7beac3a712	Cleanup DrawableRoom.	2018-05-28 23:56:00 -03:00
DrabWeb	dcc39d96e2	BeatmapModeInfo -> BeatmapTypeInfo.	2018-05-28 23:45:59 -03:00
DrabWeb	bd9af745dd	Cleanup. ... (cherry picked from commit fffa6a004cf074caf0cf5c8ae1408a80500859fa)	2018-05-28 23:41:50 -03:00
DrabWeb	8b8d10349e	Move RoomInspector info panel content to BeatmapModeInfo to share with Match. ... (cherry picked from commit 257d9d13ac81d85583314f8b5dfabf05661b1572)	2018-05-28 23:41:42 -03:00
DrabWeb	8b36e1dad0	Add BeatmapTitle to encapsulate multiplayer beatmap title display logic. ... (cherry picked from commit 58e65afb45fbc675186e470cc4a268d9eaa2a539)	2018-05-28 23:41:07 -03:00
DrabWeb	bdfb5752cd	Update existing drawables to use UpdateableBeatmapSetCover.	2018-05-28 19:31:20 -03:00
DrabWeb	e920b8d577	Add UpdateableBeatmapSetCover.	2018-05-28 19:11:26 -03:00
Aergwyn	2b3a630270	add OverlayActivation enum ... + fix Toolbar being toggleable when it shouldn't be able to + allow opening overlays in MenuState.Initial again	2018-05-28 13:43:47 +02:00
smoogipoo	5be46307fd	Fix results screen parallax being cut off ... Alternative to / closes #2549. Didn't want to reference the toolbar as was done, also wanted to remove the awkward scaling factors so rather than scaling down the inner one, we scale up the outer one.	2018-05-28 19:43:59 +09:00
smoogipoo	a3470f9ec3	Merge remote-tracking branch 'origin/master' into disallow-beatmap-change ... # Conflicts: # osu.Game/Overlays/Music/PlaylistOverlay.cs # osu.Game/Screens/OsuScreen.cs	2018-05-28 18:01:15 +09:00
smoogipoo	3a5228af43	Make GameBeatmap late-bind its AudioManager for ctor Beatmap access	2018-05-28 17:55:41 +09:00
Dean Herbert	ed7c860802	Adjust transitions of DrawableRoom	2018-05-28 13:30:29 +09:00
Dean Herbert	02c37ebc1f	Move screen titles to OsuScreen	2018-05-28 13:30:24 +09:00
Dean Herbert	0ca6d73f0e	Add a delay before the osu! logo appears when exiting multiplayer	2018-05-28 13:30:17 +09:00
Dean Herbert	3c3412791c	Merge remote-tracking branch 'upstream/release' into multiplayer-lounge	2018-05-28 13:30:04 +09:00
smoogipoo	3abfd4711d	Fix wrong clock being seeked when unpausing	2018-05-28 03:42:53 +09:00
smoogipoo	8ae2a3696f	Apply platform universal offset at player level	2018-05-28 03:31:46 +09:00
Dean Herbert	916c9e7e89	Merge remote-tracking branch 'ppy/master' into fix-osu-autoplay	2018-05-27 15:12:52 +09:00
Dean Herbert	95315e46f0	Make drawable rooms fade in when first displayed ... Stops filtered rooms from briefly displaying.	2018-05-27 14:12:20 +09:00
Dean Herbert	12b5ca1b0d	Merge branch 'master' into multiplayer-lounge	2018-05-27 11:15:03 +09:00
Dean Herbert	bcdbd97da9	Merge branch 'master' into fix-playlist-pause	2018-05-27 11:00:50 +09:00
Dean Herbert	975ce82177	Ensure autoplay tests actually increase score above zero	2018-05-26 14:46:05 +09:00
Dean Herbert	79442ad238	Merge branch 'master' into CursorOverrideContainer-rename	2018-05-26 12:19:47 +09:00
HoutarouOreki	63fb9ddec4	Forgot file name	2018-05-25 21:20:42 +02:00
HoutarouOreki	e2d840c2de	Rename CursorOverrideContainer to MenuCursorContainer	2018-05-25 21:13:40 +02:00
Dean Herbert	699f661b02	Merge remote-tracking branch 'upstream/master' into AlFasGD-editor-seekbar-fix	2018-05-25 19:07:30 +09:00
Dean Herbert	cc69f07172	Merge remote-tracking branch 'upstream/master' into jorolf-open-external	2018-05-25 18:52:05 +09:00
Dean Herbert	1cb7d50407	Add and use default size (smaller than before)	2018-05-25 18:51:57 +09:00
Dean Herbert	1b5bb79fe9	Merge remote-tracking branch 'upstream/master' into jorolf-open-external	2018-05-25 18:50:30 +09:00
Dean Herbert	28aa6faef9	Merge branch 'master' into player_loader_input_toggles	2018-05-25 18:38:12 +09:00
Dean Herbert	385c2c5c86	Merge branch 'master' into musiccontroller-nullref	2018-05-25 11:01:09 +09:00
Dean Herbert	568d4882c6	Remove unnecessary null coalesce	2018-05-25 11:00:56 +09:00
Dean Herbert	7961c56239	Merge remote-tracking branch 'FreezyLemon/master' into smoogipoo-disallow-beatmap-change	2018-05-25 10:55:01 +09:00
smoogipoo	b649025e86	beginUserDrag/endUserDrag	2018-05-24 14:36:48 +09:00
smoogipoo	d4f68e0b67	Fix possible NaN values due to trackvirtual infinite length	2018-05-24 14:31:31 +09:00
smoogipoo	f1ac84d95b	Fix base.CreateLocalDependencies sometimes not being called	2018-05-24 13:03:25 +09:00
smoogipoo	5a517bad63	Move beatmap cleanup to Dispose()	2018-05-24 12:53:32 +09:00
smoogipoo	542eb848b0	Fix GetBoundCopy on IGameBeatmap not working	2018-05-24 12:42:58 +09:00
Aergwyn	0c0f86fe26	fix incorrect default values keeping overlays in wrong state	2018-05-23 16:25:10 +02:00
smoogipoo	fb78854485	Fix audio playback getting paused if playlist changes beatmap	2018-05-23 19:41:13 +09:00
smoogipoo	a5d2d74447	Remove whitespace	2018-05-23 19:01:27 +09:00
smoogipoo	a25462e10f	Fix testcase audio + dependency overrides not working	2018-05-23 18:52:09 +09:00
smoogipoo	8004b8af4d	Privatise the OsuGame beatmap, add local beatmap to OsuTestCase	2018-05-23 17:38:02 +09:00
smoogipoo	6c0c932c48	Reorder OsuGameBase methods	2018-05-23 14:56:40 +09:00
smoogipoo	f894d73501	Fix possible MusicController nullref	2018-05-23 14:36:09 +09:00
smoogipoo	a30f72b477	Add helper methods for seeking/scrolling	2018-05-23 14:32:00 +09:00
smoogipoo	6b0eeb3436	Rework seeking interactions to support smooth scrolling	2018-05-23 14:14:32 +09:00
smoogipoo	49f893d5e4	Couple the timeline to the audio	2018-05-23 12:00:11 +09:00
Vidalee	7a31986812	resolving the lost code problem	2018-05-22 22:39:55 +02:00
Vidalee	08e423ac5b	code sanity	2018-05-22 21:35:17 +02:00
Vidalee	50e2871c89	why this line was ommited	2018-05-22 21:29:41 +02:00
Aergwyn	76fbc656a1	fix disclaimer allowing notifications	2018-05-22 17:53:36 +02:00
jorolf	8fbda5bc59	add license header	2018-05-22 15:41:10 +02:00
jorolf	b324337fa1	Add icon next to beatmap title/username to open in browser	2018-05-22 15:29:52 +02:00
jorolf	a7bdaf75b0	Ensure badges are ordered correctly	2018-05-22 13:05:15 +02:00
Dean Herbert	ef40ca8805	Merge branch 'master' into respect-showoverlay-bindable	2018-05-22 19:00:42 +09:00
smoogipoo	1dfa3ff995	Merge remote-tracking branch 'origin/master' into editor-timeline-rework	2018-05-22 18:30:29 +09:00
Dan Balasescu	99163ca8ba	Merge branch 'master' into fix-main-menu-escape	2018-05-22 18:17:51 +09:00
smoogipoo	0e122468db	Fix progress easing to 0 if aborting after confirmation	2018-05-22 18:06:40 +09:00
Dean Herbert	d43e4af8ea	Fix overlap between quit button at key input overlay	2018-05-22 16:45:42 +09:00
Dean Herbert	436067c01f	Handle scale back in a nicer way	2018-05-22 16:44:37 +09:00
Dean Herbert	7b770d03c5	Use OnMouseMove instead of Update logic	2018-05-22 16:26:59 +09:00
Dean Herbert	babb7d5158	Fix white ring flash when holding button post-confirmation	2018-05-22 16:23:05 +09:00
Dean Herbert	5f8eb6d823	Fix class name	2018-05-22 16:04:36 +09:00
Dean Herbert	8fbda9d57e	Improve comment	2018-05-22 16:04:07 +09:00
Dean Herbert	58ae545747	innerCircle -> overlayCircle	2018-05-22 15:59:53 +09:00
Dean Herbert	ef55c3c197	Fix icon scale not resetting due to no implicit triggering	2018-05-22 15:58:17 +09:00
Dean Herbert	2ce2bd9788	Add comment for pendingAnimation	2018-05-22 15:58:00 +09:00
DrabWeb	349b0a3322	Remove empty ctor.	2018-05-22 01:46:08 -03:00
DrabWeb	3cc5bb516e	Remove unused Match ctor param.	2018-05-22 01:39:25 -03:00
DrabWeb	662559d3c9	More test steps.	2018-05-22 01:22:23 -03:00
DrabWeb	6aac4269e6	Add filtering.	2018-05-22 00:33:41 -03:00
DrabWeb	f7a4a4eeef	Add Lounge FilterControl.	2018-05-22 00:24:39 -03:00
DrabWeb	cae09492c3	Basic Lounge functionality.	2018-05-22 00:07:04 -03:00
DrabWeb	1210368e29	Add MultiplayerScreen base class.	2018-05-21 23:00:02 -03:00
Dean Herbert	5a892e4d08	This quit button don't quit	2018-05-22 02:09:52 +09:00
Dean Herbert	323aa189b6	Make on-confirmation animation more robust	2018-05-22 02:08:44 +09:00
Dean Herbert	156d7fb25a	Change depth of HUD ... Yes, this is intentional.	2018-05-22 02:08:21 +09:00
Dean Herbert	946a75ddb2	Block hover to use UI cursor instead of gameplay cursor	2018-05-22 02:05:08 +09:00
Dean Herbert	ebda287e81	Share code with HoldToConfirm implementations elsewhere	2018-05-22 01:44:06 +09:00
Roman Kapustin	30956b64aa	Do not change Margin for player settings groups on the PlayerLoader screen	2018-05-21 18:57:01 +03:00
Dean Herbert	f9c162dee9	Adjust design and feel	2018-05-22 00:49:33 +09:00
Aergwyn	cee8d21542	hide overlays when going back to initial menu state	2018-05-21 17:24:57 +02:00
Dean Herbert	d5afccd610	Make hint text display briefly at initial display, then on hover	2018-05-22 00:02:03 +09:00
Dean Herbert	3d9d40448d	Fix incorrect syntax	2018-05-22 00:01:40 +09:00
Dean Herbert	841336a181	Merge branch 'master' into exit_replay_button	2018-05-21 23:45:06 +09:00
Dean Herbert	9820666bcf	Merge branch 'master' into respect-showoverlay-bindable	2018-05-21 23:26:34 +09:00
Dean Herbert	d109522bf7	Fix escape not working to go backwards in menus before finally exiting the game ... Resolves #2596.	2018-05-21 23:09:00 +09:00
Aergwyn	b7e3ea348b	expose two Bindables with split logic instead of one with mixed logic	2018-05-21 15:53:55 +02:00
AlFasGD	a54bda6ce1	Apply requested changes	2018-05-21 13:23:39 +03:00
Aergwyn	1482bca147	Rename for better understanding ... ShowOverlays -> AllowOverlays ShowOverlaysOnEnter -> HideOverlaysOnEnter	2018-05-21 09:42:29 +02:00
Dean Herbert	c48c62ea04	Merge branch 'master' into player_loader_input_toggles	2018-05-21 16:20:08 +09:00
Dean Herbert	9e17eb2342	Reword settings text to be ruleset agnostic	2018-05-21 16:03:08 +09:00
Dean Herbert	5ec349de78	Reorder methods and remove useless comments	2018-05-21 15:59:33 +09:00
Dean Herbert	f53164843d	Reduce spacing changes	2018-05-21 15:56:02 +09:00
Dean Herbert	cea935ea40	Merge branch 'master' into osu-hd-setting	2018-05-21 15:21:09 +09:00
Dean Herbert	c75ef7704a	Merge remote-tracking branch 'Joehuu/master' into ocboogie-ruleset-keybindings	2018-05-21 14:49:34 +09:00
Dean Herbert	42519e3723	Rewrite code for clarity ... This also uses the AvailableRulesets list rather than private IDs	2018-05-21 14:49:26 +09:00
Joehu	46c6c1d07e	Allow drag clicking footer and filter on song select	2018-05-20 20:25:39 -07:00
Dean Herbert	92668f07e0	Merge branch 'master' into drawable-room-improvements	2018-05-21 11:09:12 +09:00
Dean Herbert	9f0cc7683b	Merge branch 'master' into respect-showoverlay-bindable	2018-05-21 04:43:55 +09:00
Dean Herbert	aaca7e92b4	Avoid excessive property lookups	2018-05-21 03:56:59 +09:00
Aergwyn	4d528c4e67	fix VisualTests and Samples still playing	2018-05-20 10:57:15 +02:00
DrabWeb	9cd0ec366e	Cleanup.	2018-05-19 02:51:51 -03:00
DrabWeb	136c57b824	Don't set size in ctor.	2018-05-19 02:27:33 -03:00
DrabWeb	ad878003f7	Add null room support to RoomInspector.	2018-05-19 02:23:09 -03:00
DrabWeb	4b2b2086df	Create drawable hierarchy for RoomInspector in load, remove display* methods.	2018-05-19 01:26:39 -03:00
Dean Herbert	e5aa1a038e	Merge branch 'master' into fix-hr-application	2018-05-18 18:37:51 +09:00
smoogipoo	e6e3758304	Fix HR mod affecting original beatmap difficulty ... Fixes #2575.	2018-05-18 18:11:52 +09:00
smoogipoo	82607b3eb3	Expose properties to control zoom	2018-05-18 17:53:09 +09:00
Jacob Odgård Tørring	5e0bbe7d0a	Merge branch 'master' into master	2018-05-18 10:19:16 +02:00
Aergwyn	67db539172	prevent Overlays from showing in intro/outro sequences	2018-05-18 08:00:05 +02:00
Dean Herbert	d75fe4009a	Add back action support to settings back button	2018-05-18 13:40:35 +09:00
Dean Herbert	e2389ad7a4	Allow using back button on PlayerLoader and Replay	2018-05-18 13:32:05 +09:00
smoogipoo	bc3d195aa2	Fix line endings	2018-05-18 13:05:58 +09:00
Dean Herbert	1cda5f4de9	Merge branch 'master' into back_mouse_button_support	2018-05-18 12:55:52 +09:00
Dean Herbert	6c00046835	Merge branch 'master' into mania-performance-calculator	2018-05-18 12:34:49 +09:00
Dean Herbert	8e784d9104	Merge branch 'master' into fix-conversion-hitwindows	2018-05-18 11:59:16 +09:00
Roman Kapustin	17d1759c37	Get rid of multiple blank lines in a row	2018-05-18 01:01:54 +03:00
Roman Kapustin	81d7e8a393	Resolve merge conflict	2018-05-18 00:25:47 +03:00
Vidalee	2492e34d3f	resolving codefactor styling issues	2018-05-17 19:44:09 +02:00
Vidalee	6a1abf4084	Merge branch 'master' into osu-hd-setting	2018-05-17 19:39:17 +02:00
DrabWeb	ebfbe58abb	Move Header breadcrumbs to a subclass.	2018-05-17 06:19:55 -03:00
Dean Herbert	d20011ba58	Fix an endless feedback loop	2018-05-17 17:56:29 +09:00
Dean Herbert	7c9d3c9742	Merge branch 'master' into multiplayer-base-screen	2018-05-17 17:41:31 +09:00
smoogipoo	43cdbec0a3	Fix hold note hitwindow lenience	2018-05-17 13:59:04 +09:00
smoogipoo	f67d263596	Move ruleset-specific hitwindows to post-converted hitobjects	2018-05-17 13:35:15 +09:00
Dean Herbert	d36c2686c9	Merge branch 'master' into beatmap-parsing-performance	2018-05-17 13:28:35 +09:00
smoogipoo	397d93660a	Don't deep-clone beatmapinfo/control points	2018-05-17 13:17:33 +09:00
DrabWeb	650d40f57f	Merge https://github.com/ppy/osu into multiplayer-base-screen	2018-05-17 00:34:40 -03:00
smoogipoo	c67f372560	Don't create nested hitobjects unless absolutely required	2018-05-17 12:29:33 +09:00
Dean Herbert	47cd9065bf	Merge branch 'master' into screen-breadcrumbs	2018-05-16 18:42:17 +09:00
smoogipoo	3f365c6621	Merge branch 'master' into editor-timeline-rework ... # Conflicts: # osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs # osu.Game/Screens/Edit/Screens/Compose/Compose.cs # osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollableTimeline.cs # osu.Game/Screens/Edit/Screens/Compose/Timeline/ScrollingTimelineContainer.cs	2018-05-16 18:04:24 +09:00
smoogipoo	0f817d18d4	Add explanatory comment	2018-05-16 13:59:51 +09:00
Dan Balasescu	ad81357fb5	Merge branch 'master' into fix-hitobject-order	2018-05-16 13:33:27 +09:00
Dean Herbert	452564d0e0	Merge branch 'master' into screen-breadcrumbs	2018-05-16 13:31:38 +09:00
smoogipoo	cf44357bdb	Use a stable sort for hitobjects	2018-05-16 13:30:48 +09:00
smoogipoo	8d8b7e6fa2	Fix conversion tests for ruleset-specific beatmaps not working ... TRuleset was a mistake. This resulted in cases that checked whether the beatmap was for the current ruleset (TaikoBeatmapConverter and ManiaBeatmapConverter) failing due to TestXRuleset != XRuleset...	2018-05-16 13:09:48 +09:00
DrabWeb	1a78ac3d10	Add Multiplayer screen.	2018-05-15 21:14:10 -03:00
DrabWeb	1450bf64f5	Add multiplayer screen header.	2018-05-15 20:34:14 -03:00
DrabWeb	b9d99b5f40	Fix nullref when exiting the last screen.	2018-05-15 19:42:50 -03:00
smoogipoo	de63a1b578	Remove construction of new ruleset	2018-05-16 01:43:58 +09:00
Dean Herbert	c0c449e453	Remove unused using	2018-05-15 22:53:33 +09:00
smoogipoo	3f67d04429	Cap CS to 10 also	2018-05-15 21:57:08 +09:00
smoogipoo	4101b8ddde	Merge remote-tracking branch 'origin/master' into more-diffcalc-improvements	2018-05-15 21:31:58 +09:00
smoogipoo	1acfc1bbab	Fix ModHardRock not properly clamping Drain/OD	2018-05-15 21:25:20 +09:00
Dean Herbert	28df77e838	Simplify code and remove generic	2018-05-15 21:10:26 +09:00
Dean Herbert	0325b1bd7a	Remove unused class	2018-05-15 19:42:30 +09:00
Dean Herbert	0def847f60	Merge branch 'master' into screen-breadcrumbs	2018-05-15 19:39:03 +09:00
Dean Herbert	fc192c8998	Merge remote-tracking branch 'upstream/master' into smoogipoo-disable-mouse-buttons	2018-05-15 19:23:51 +09:00
Dean Herbert	6bf1092c7d	Merge branch 'master' into enable-distance-overflow	2018-05-15 18:56:51 +09:00
Dean Herbert	0e0cc8bb69	Merge branch 'master' into namespace-cleanup	2018-05-15 18:10:48 +09:00
smoogipoo	995fda9b6f	Move base classes to osu.Game.Rulesets.Difficulty namespace	2018-05-15 17:38:08 +09:00
Dean Herbert	e39af1c906	Merge branch 'master' into convert-object-hitwindows	2018-05-15 17:33:27 +09:00
Dean Herbert	6d87ff2595	Merge branch 'master' into enable-distance-overflow	2018-05-15 16:18:17 +09:00
Dean Herbert	f2580e5656	Merge branch 'master' into score-parser-deriving	2018-05-15 15:42:01 +09:00
smoogipoo	1ee68c1c54	Make LegacyScoreParser abstract	2018-05-15 15:28:46 +09:00
Dean Herbert	5fee471307	Merge branch 'master' into beatmap-delete-fix	2018-05-15 14:49:09 +09:00
smoogipoo	fe2ea17e7f	Allow subclasses of LegacyScoreParser to specify beatmap/ruleset retrieval	2018-05-15 11:42:40 +09:00
ocboogie	4055a6fc0c	Merge branch 'master' into ruleset-keybindings	2018-05-14 15:39:10 -07:00
Roman Kapustin	f2f2fb8c73	Use both OnKeyDown and GlobalAction.Back	2018-05-14 22:09:09 +03:00
Roman Kapustin	e802b722f0	Revert "Handle mouse back button using OnMouseDown override instead of using GlobalAction" ... This reverts commit 44bbb8700e.	2018-05-14 20:27:05 +03:00
Dean Herbert	7507d18a93	Merge branch 'master' into mapping-del	2018-05-14 20:56:12 +09:00
Dean Herbert	4a92d1ddb6	Merge branch 'master' into fix-testruleset-issues	2018-05-14 20:21:49 +09:00
Dean Herbert	addb864d10	Allow help text to wrap	2018-05-14 19:56:03 +09:00
Dan Balasescu	d40efd3134	Merge branch 'master' into fix-testruleset-issues	2018-05-14 19:39:56 +09:00
smoogipoo	47cf4f27fb	Fix possibility of test rulesets being discovered from assemblies	2018-05-14 19:39:23 +09:00
Dean Herbert	28edf3bce7	Merge branch 'master' into hud-above-letterbox	2018-05-14 19:31:39 +09:00
ocboogie	d441fd53b9	Merge branch 'master' into ruleset-keybindings	2018-05-14 03:27:35 -07:00
smoogipoo	17861c2a16	Display "no key bound" when no shortcut	2018-05-14 19:20:53 +09:00
Dean Herbert	0234bbc37f	Move definition inline	2018-05-14 19:14:17 +09:00
Dean Herbert	f14948c022	Merge branch 'master' into exit-hold-confirmation	2018-05-14 18:13:40 +09:00
smoogipoo	115c2dc239	Move hud below the skip button	2018-05-14 18:02:18 +09:00
smoogipoo	027f6c3fa4	Fix instant movement not doing anything	2018-05-14 17:47:38 +09:00