1073 Commits

Author	SHA1	Message	Date
smoogipoo	7f0f143a1b	Move IScrollAlgorithm to ScrollingRulesetContainer + use DI	2018-11-12 17:34:35 +09:00
smoogipoo	54ab256c8e	Instantiate a new path rather than setting properties on it ... # Conflicts: # osu.Game.Rulesets.Catch/Beatmaps/CatchBeatmapConverter.cs # osu.Game.Rulesets.Catch/Objects/JuiceStream.cs # osu.Game.Rulesets.Osu/Beatmaps/OsuBeatmapConverter.cs # osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/SliderPath.cs	2018-11-12 13:50:19 +09:00
smoogipoo	8583fd1380	Fix testcase never working	2018-11-08 14:04:20 +09:00
smoogipoo	2612fd3099	Adjust ruleset-specific namespaces	2018-11-07 16:10:21 +09:00
smoogipoo	e9e50f41fb	Use Name/NameScreen format	2018-11-07 13:04:17 +09:00
Dean Herbert	7f73fc2d39	Require holding back button to quit gameplay ... Avoids accidental presses and streamlines logic with on-screen element.	2018-11-07 01:49:21 +09:00
smoogipoo	52f4923c8e	Remove intermediate Screens namespace	2018-11-06 18:28:22 +09:00
smoogipoo	ac25718c5a	Renamespace compose-mode components	2018-11-06 18:14:46 +09:00
smoogipoo	bd775af274	PlacementMask -> PlacementBlueprint	2018-11-06 18:04:03 +09:00
smoogipoo	f2a5f28ea2	SelectionMask -> SelectionBlueprint	2018-11-06 17:56:04 +09:00
smoogipoo	ad2836a61e	MaskSelection -> SelectionBox	2018-11-06 17:52:47 +09:00
smoogipoo	26c9390c16	HitObjectMaskLayer -> BlueprintContainer	2018-11-06 17:36:10 +09:00
smoogipoo	faab744cbd	DragLayer -> DragBox	2018-11-06 17:24:57 +09:00
Dean Herbert	4554fc2c7b	Update framework and other dependencies	2018-11-05 18:22:16 +09:00
smoogipoo	ace1dce281	Merge remote-tracking branch 'origin/master' into fix-slider-samples ... # Conflicts: # osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs	2018-11-05 18:10:22 +09:00
smoogipoo	92d570342c	Fix sample additions not falling back to non-addition bank	2018-11-05 17:35:24 +09:00
smoogipoo	a4caaf56ef	Merge remote-tracking branch 'origin/master' into fix-slider-samples ... # Conflicts: # osu.Game.Tests/Beatmaps/Formats/LegacyBeatmapDecoderTest.cs # osu.Game/Rulesets/Objects/Legacy/Catch/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Mania/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Osu/ConvertHitObjectParser.cs # osu.Game/Rulesets/Objects/Legacy/Taiko/ConvertHitObjectParser.cs	2018-11-05 16:38:28 +09:00
smoogipoo	f674fcf2c8	Merge branch 'mask-separation' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Mania/Edit/ManiaHitObjectComposer.cs # osu.Game.Rulesets.Osu/Edit/OsuHitObjectComposer.cs # osu.Game.Tests/Visual/TestCaseHitObjectComposer.cs	2018-10-26 14:05:30 +09:00
smoogipoo	e14719e440	Mask -> Piece for non-mask components	2018-10-25 18:28:10 +09:00
smoogipoo	d19f80835b	Adjust namespaces	2018-10-25 18:26:28 +09:00
smoogipoo	8a2a6a3ecb	Preserve the beatmap's version	2018-10-23 14:59:21 +09:00
Roman Kapustin	b4c68f4cf7	Show a warning prior to opening external links	2018-10-22 23:16:57 +03:00
smoogipoo	0e841628b6	Implement hitobject deletion	2018-10-18 16:36:06 +09:00
Dean Herbert	cd718812b2	Merge branch 'master' into tighten-diffcalc-tolerances	2018-10-18 14:01:47 +09:00
smoogipoo	969477dadd	Remove placement events, make everything pass top-down	2018-10-17 17:43:16 +09:00
smoogipoo	4ea4ec0d25	Move placement handling events to a higher level	2018-10-17 15:46:30 +09:00
smoogipoo	70f1d17b7e	Merge remote-tracking branch 'origin/master' into editor-mask-placement ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchRulesetContainer.cs # osu.Game.Rulesets.Mania/Edit/ManiaEditRulesetContainer.cs # osu.Game.Rulesets.Osu/Edit/OsuEditRulesetContainer.cs # osu.Game/Rulesets/UI/RulesetContainer.cs	2018-10-16 17:28:16 +09:00
smoogipoo	47be95ce0b	Fix slider nodes using the wrong samples	2018-10-16 17:10:24 +09:00
smoogipoo	5095fbcdf7	Merge remote-tracking branch 'origin/master' into optimise-diffcalc	2018-10-16 10:27:18 +09:00
smoogipoo	2f943e77aa	Make Velocity and TickDistance private set	2018-10-15 12:31:52 +09:00
Dean Herbert	a314a561d0	Merge branch 'master' into playfield-scaling-rework	2018-10-12 19:32:43 +09:00
Dean Herbert	468f7fd1ea	Merge remote-tracking branch 'upstream/master' into playfield-scaling-rework	2018-10-12 19:25:08 +09:00
Dean Herbert	4a64cb7f85	Remove nuget includes im props	2018-10-12 18:56:18 +09:00
Dean Herbert	15dae9b2e4	Update nuget dependencies (version mismatches)	2018-10-12 18:51:51 +09:00
Dean Herbert	182aa63cc8	Update nuget dependencies	2018-10-12 17:08:59 +09:00
smoogipoo	83fd251c7b	Pass sub-controlpoints as span slices	2018-10-11 17:44:25 +09:00
smoogipoo	cb1703c6e2	Fix colours with alpha components not being parsed	2018-10-05 11:19:01 +09:00
smoogipoo	ff559a3a1b	Merge remote-tracking branch 'origin/master' into playfield-scaling-rework ... # Conflicts: # osu.Game.Rulesets.Catch/UI/CatchPlayfield.cs # osu.Game/Rulesets/UI/Scrolling/ScrollingPlayfield.cs	2018-10-05 10:40:16 +09:00
smoogipoo	e931aa3d9e	Move positional modifications to HitCirclePlacementMask	2018-10-04 13:43:50 +09:00
smoogipoo	10d0e2fef1	Fix up testcase	2018-10-03 14:35:32 +09:00
ekrctb	50091252e2	Adapt signature change of event handlers	2018-10-02 12:02:55 +09:00
ekrctb	99fc04c8af	Change signature to new event handler	2018-10-02 12:02:47 +09:00
smoogipoo	a8f156584b	Update framework with positional/non-positional changes	2018-09-26 14:01:15 +09:00
smoogipoo	368ceec47c	Simplify creation of a playfield	2018-09-21 14:35:50 +09:00
ekrctb	b790e16217	Use Click instead of now removed TriggerOnClick	2018-09-19 11:42:32 +09:00
ekrctb	a3e6973b41	Replace usage of now removed TriggerKeyPress and similar methods.	2018-09-19 11:36:55 +09:00
Dean Herbert	7b57439976	Add proper testing	2018-09-15 16:25:37 +09:00
Dean Herbert	e636cfe79e	Fix dynamic compilation not working	2018-09-15 16:24:06 +09:00
Dean Herbert	3c8c7a0459	Move ChannelManager to OsuGame ... There's no reason for it to exist at OsuGameBase	2018-09-14 13:31:25 +09:00
Dean Herbert	e6d5bbd886	Merge branch 'master' into multiplayer-room-settings	2018-09-09 22:40:08 +09:00
Dean Herbert	93e2d8f309	Allow testing of all chat-related classes dynamically	2018-09-06 15:56:27 +09:00
Dean Herbert	5aff19eaea	Merge branch 'master' into replay_keycounter	2018-09-05 08:53:02 +09:00
Dean Herbert	4376ad107e	Merge branch 'master' into Private_Messages	2018-08-24 17:26:33 +09:00
smoogipoo	1a2c3715c7	Fix testcase dodginess	2018-08-24 15:50:39 +09:00
smoogipoo	557a2ee39d	Add more comprehensive tests	2018-08-17 10:04:00 +09:00
ekrctb	cf4cb934cf	Merge branch 'master' into fix-combo-colours	2018-08-16 10:45:54 +09:00
Dean Herbert	ed2a642666	Fix info wedge test case failing randomly	2018-08-16 10:05:34 +09:00
smoogipoo	05b5144dac	Add parsing test	2018-08-15 13:36:22 +09:00
DrabWeb	e65bb5b54b	Remove unused usings, remove unused icon variable.	2018-08-14 12:34:05 -03:00
DrabWeb	7d8c0aca72	Order usings, use inline out variable declaration.	2018-08-14 12:25:35 -03:00
DrabWeb	af31845c83	Fix naming conflicts in RoomSettingsOverlay.	2018-08-14 11:31:20 -03:00
DrabWeb	52b157d072	Merge https://github.com/ppy/osu into multiplayer-room-settings	2018-08-14 11:16:25 -03:00
smoogipoo	e360985d73	Replace variables into the entire line	2018-08-14 18:15:09 +09:00
smoogipoo	78258e2fe2	Prefix some methods with "Test"	2018-08-14 14:19:26 +09:00
smoogipoo	15bd7e4f1f	Test that changing ruleset resets mods	2018-08-14 14:18:46 +09:00
Dean Herbert	4cb7063801	Add automated testing of mod preservation/removal	2018-08-07 16:45:18 +09:00
Dean Herbert	7b8bd7f21c	Fix mod selection not restoring when re-entering song select	2018-08-07 14:49:44 +09:00
miterosan	b414bff864	Fix the testcase	2018-08-04 01:00:46 +02:00
miterosan	358c346923	Use TabItem.Items.Count	2018-08-04 00:44:16 +02:00
miterosan	cc640893c2	Merge branch 'master' into Private_Messages	2018-08-04 00:33:46 +02:00
Dean Herbert	042e4e3966	Merge branch 'master' into add-loading-animation	2018-08-03 21:50:02 +09:00
Dan Balasescu	3460fd6e71	Merge branch 'master' into split-mod-sections	2018-08-03 18:48:31 +09:00
Dean Herbert	b1afcf0e5d	Add loading animation to player loader to make it more obvious when loading is complete	2018-08-02 19:47:50 +09:00
Dean Herbert	6ce32bd431	Update remaining nuget deps	2018-08-01 19:17:16 +09:00
Dean Herbert	3c06655672	Split out Special mods into Automation and Conversion	2018-07-31 18:00:42 +09:00
Dean Herbert	49b2d8c355	Merge branch 'master' into open-downloaded-beatmas	2018-07-31 16:41:09 +09:00
smoogipoo	ae8bf34fd1	Fix breadcrumb testcase failures	2018-07-31 13:48:21 +09:00
Dean Herbert	ddecf59cfd	Merge branch 'master' into open-downloaded-beatmas	2018-07-31 13:21:14 +09:00
Dean Herbert	6bb7f9ce9c	Merge branch 'master' into Private_Messages	2018-07-31 11:45:06 +09:00
Dean Herbert	338496452d	Move testing package references to somewhere appveyor will find them	2018-07-30 15:15:51 +09:00
Dean Herbert	3cf906042e	Merge branch 'master' into remove-net471-target	2018-07-30 11:28:06 +09:00
miterosan	8bccecc2e5	Add some more testing.	2018-07-30 00:13:32 +02:00
miterosan	b1e9a4fd24	Merge branch 'master' of https://github.com/ppy/osu into Private_Messages	2018-07-29 23:28:34 +02:00
miterosan	95cb21299a	Remove chatTabControl and transfer the logic into ChannelTabControl.	2018-07-29 21:18:37 +02:00
Roman Kapustin	3134e14b37	Test KeyCounter.RestoreState	2018-07-28 23:24:03 +03:00
Dean Herbert	b7de922896	Merge branch 'master' into open-downloaded-beatmas	2018-07-28 12:44:34 +09:00
Dean Herbert	ee0522ad84	Ignore failing test	2018-07-25 16:45:07 +02:00
AlFasGD	c4b1ba2979	Remove padding, fix corner radiuses	2018-07-25 15:14:40 +03:00
Dean Herbert	95cca046fb	Merge branch 'master' into open-downloaded-beatmas	2018-07-25 12:38:49 +02:00
AlFasGD	cd37b0df23	Merge branch 'master' into labelled-text-box	2018-07-24 09:19:22 +03:00
Dean Herbert	0aacde836a	Move private channel constructor to own class	2018-07-23 20:46:44 +02:00
miterosan	9f43e0c900	Merge branch 'master' of https://github.com/ppy/osu into Private_Messages ... # Conflicts: # osu.Game/Overlays/Chat/ChatTabControl.cs # osu.Game/Overlays/ChatOverlay.cs	2018-07-23 15:45:54 +02:00
AlFasGD	dd56a2d95f	Apply proposed changes (untested)	2018-07-23 15:44:10 +03:00
Dean Herbert	82ea4456e4	Fix testing regression	2018-07-23 10:33:10 +02:00
Dean Herbert	d561f54282	Merge branch 'master' into per-object-css	2018-07-23 03:01:17 +09:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
Dean Herbert	a2f744b05e	Merge remote-tracking branch 'upstream/master' into open-downloaded-beatmas	2018-07-21 00:03:17 +09:00
AlFasGD	6dd5c7e5ab	Add test case	2018-07-20 14:28:39 +03:00
Dean Herbert	7cc999027d	Merge branch 'master' into pause-input-fixes	2018-07-20 17:20:19 +09:00
Dean Herbert	241437c819	Remove unnecessary counting change logic	2018-07-20 17:08:25 +09:00
smoogipoo	c087a73f40	Implement per-hitobject custom sample banks	2018-07-20 15:12:44 +09:00
smoogipoo	967d0c3c72	Adjust testcase	2018-07-20 15:12:04 +09:00
Dean Herbert	64ead0fdf7	Add more tests and fix one remaining issue case	2018-07-20 11:55:17 +09:00
Dean Herbert	d7f1766ee2	wip	2018-07-19 18:51:08 +09:00
Dean Herbert	7be3a5d466	Centralise test storage logic	2018-07-19 14:07:55 +09:00
Dean Herbert	3e738c607a	Add more song select tests	2018-07-19 13:39:42 +09:00
Dean Herbert	0c24244340	Remove SingletonContextFactory ... It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution. # Conflicts: # osu.Game/Database/SingletonContextFactory.cs	2018-07-18 16:50:56 +09:00
Dean Herbert	1d52231d4f	Remove SingletonContextFactory ... It is dangerous to use this as it doesn't correctly handle contexts and can cause issues that will never actually arise in normal execution.	2018-07-18 16:44:47 +09:00
Dean Herbert	9611292f4e	FilterTask -> PendingFilter	2018-07-18 13:18:50 +09:00
Dean Herbert	fb09385f51	Remove net471 targeting	2018-07-18 11:01:08 +09:00
smoogipoo	827c5c4939	Remove scroll direction from ScrolingPlayfield constructor	2018-07-17 15:14:03 +09:00
Dean Herbert	ee2c7c50ad	Tidy up button hierarchy	2018-07-13 16:28:18 +09:00
Dan Balasescu	e20cdccf05	Merge branch 'master' into update-disclaimer	2018-07-12 23:41:55 +09:00
Dean Herbert	fbc5250bf1	Update framework	2018-07-11 17:12:01 +09:00
Dean Herbert	4638ac902c	Remove pointless rate adjust slider from TestCaseOsuGame	2018-07-11 16:31:00 +09:00
Dean Herbert	8bc7c4c9a2	Add TestCase and update disclaimer screen	2018-07-11 16:30:51 +09:00
Dan Balasescu	f5504914cc	Merge branch 'master' into fix-hitsound-fallback	2018-07-10 17:19:16 +09:00
Dan Balasescu	40ec486152	Merge branch 'master' into improve-button-system	2018-07-10 16:44:55 +09:00
Dan Balasescu	282a99fb88	Merge branch 'master' into fix-spelling	2018-07-10 16:32:14 +09:00
smoogipoo	65d351c31a	Fix failing test cases	2018-07-10 16:26:04 +09:00
miterosan	ad96338af7	Merge branch 'Private_Messages' of https://github.com/miterosan/osu into Private_Messages	2018-07-09 22:47:34 +02:00
miterosan	ea597916ca	Code cleanups	2018-07-09 22:41:53 +02:00
miterosan	ae093d2619	Merge branch 'master' into Private_Messages	2018-07-09 22:15:36 +02:00
miterosan	290b6e5f1d	Fix the crash in the visual testcase	2018-07-09 22:09:27 +02:00
Dean Herbert	974c4f5185	ToolbarMode* -> ToolbarRuleset*	2018-07-10 01:20:21 +09:00
Dean Herbert	1670f4fe31	Merge branch 'master' into fix-osd-fade-in	2018-07-09 19:10:57 +09:00
Dean Herbert	df67c0498d	Fix OSD fade-in not correctly debouncing ... It could potentially never fade in on quick presses.	2018-07-09 17:53:39 +09:00
HoutarouOreki	10aae3b0ee	Remove age from User class	2018-07-09 10:33:46 +02:00
miterosan	c56a4ea893	Merge branch 'master' into Private_Messages	2018-07-08 19:29:33 +02:00
DrabWeb	6b240280d0	Merge https://github.com/ppy/osu into multiplayer-room-settings	2018-07-07 01:10:27 -03:00
Dean Herbert	0b30e6eb6a	Merge remote-tracking branch 'upstream/master' into peppy-improve-button-system	2018-07-06 17:55:02 +09:00
Dean Herbert	4f894969df	Merge branch 'master' into hitobject-samples	2018-07-05 19:43:19 +09:00
Dean Herbert	1d6609d9f3	Add common custom words to dotsettings dictionary ... Also fixes some typos and reduces spelling suggestions to hints.	2018-07-05 15:54:41 +09:00
Dean Herbert	d11ba2df0e	Merge remote-tracking branch 'upstream/master' into smoogipoo-legacy-custom-banks	2018-07-05 14:53:31 +09:00
Dean Herbert	2aae528e1c	Improve code quality of main menu button system	2018-07-03 18:23:41 +09:00
miterosan	d791216505	Merge branch 'master' into Private_Messages	2018-07-03 07:58:15 +02:00
smoogipoo	90d90370c2	Use testcase ruleset	2018-07-02 15:25:37 +09:00
smoogipoo	4070c1a888	Merge remote-tracking branch 'origin/master' into non-null-ruleset ... # Conflicts: # osu.Game/Screens/Select/FilterControl.cs	2018-07-02 15:05:34 +09:00
smoogipoo	c1b8799253	Add simple testcase	2018-07-02 14:40:43 +09:00
smoogipoo	c78bfbfa55	Fix failing json conversion testcases	2018-07-02 13:34:19 +09:00
miterosan	884ac71874	Merge branch 'master' into Private_Messages	2018-06-28 21:04:02 +02:00
smoogipoo	9fd9af22f0	Remove unused using	2018-06-28 18:40:12 +09:00
smoogipoo	94f1b2eeb8	Only custom sample banks > 1 modify the filename	2018-06-28 18:29:17 +09:00
smoogipoo	3a9a82c80c	Add back legacy custom sample banks	2018-06-28 18:29:12 +09:00
Dean Herbert	c44a81bdf5	Add word wrap support	2018-06-28 13:04:39 +09:00
smoogipoo	ede59f63f6	Merge remote-tracking branch 'origin/master' into make-loading-more-visible	2018-06-27 12:52:06 +09:00
Dean Herbert	ac1bf3b092	Merge branch 'master' into editor-seek-snapping-fix	2018-06-27 11:08:19 +09:00
Dean Herbert	018dcc98b4	Fix failing tests	2018-06-26 19:17:34 +09:00
Dean Herbert	594cc0d21d	Merge branch 'master' into mania-playfield-inversions	2018-06-25 18:36:23 +09:00
Dean Herbert	e75ff1145c	Merge branch 'master' into editor-seek-snapping-fix	2018-06-25 18:27:03 +09:00
Dean Herbert	b0cd227e81	Fix race condition in TestCaseLounge (attempt 2)	2018-06-25 14:10:54 +09:00
miterosan	6049303c40	Merge branch 'master' into Private_Messages	2018-06-23 20:44:43 +02:00
Dan Balasescu	d77ba64a73	Merge branch 'master' into fix-test-case-lounge	2018-06-22 17:36:40 +09:00
Dean Herbert	fccd4f965c	Merge remote-tracking branch 'upstream/master' into make-loading-more-visible	2018-06-22 14:21:01 +09:00
Dean Herbert	eb6d6dc2de	Improve the visibility of the global loading animation ... Updates design to match new `osu-web` design. Adds TestCase for visual testing.	2018-06-22 13:14:43 +09:00
Dean Herbert	73e13e2d63	Rename Stop to StopAnyPlaying for clarity	2018-06-22 12:35:43 +09:00
smoogipoo	15bb301d14	Remove unused field	2018-06-21 19:37:45 +09:00
smoogipoo	1932399521	Add testcases	2018-06-21 19:31:07 +09:00
Dean Herbert	c60b8bba35	Fix race condition in TestCaseLounge	2018-06-21 17:04:57 +09:00
Dean Herbert	df0083e3d9	Add tests for ParallaxContainer	2018-06-21 12:48:57 +09:00
Dean Herbert	5157a069bc	Merge branch 'master' into Private_Messages	2018-06-21 11:37:19 +09:00
Dean Herbert	2697579448	Give TestLounge a background to make transitions work correctly	2018-06-21 09:54:13 +09:00
Dean Herbert	b8f9caf418	Merge branch 'master' into multiplayer-match	2018-06-19 17:18:33 +09:00
smoogipoo	01b909eaa7	Add testfixture annotation	2018-06-18 17:06:21 +09:00
smoogipoo	ffc5d7bd43	Fix some incorrect test case values	2018-06-18 17:05:04 +09:00
smoogipoo	0d154621b6	Cleanup testcase	2018-06-18 16:09:38 +09:00
Dean Herbert	1d9d240454	Merge branch 'master' into mania-playfield-inversions	2018-06-18 04:41:17 +09:00
Dean Herbert	d58ef96a23	Merge branch 'master' into timeline-markers	2018-06-18 03:14:04 +09:00
Dean Herbert	ae160baa6e	Merge branch 'master' into timeline-input-adjustment	2018-06-18 02:54:25 +09:00
Dean Herbert	48613ea1f6	Merge branch 'master' into timeline-markers	2018-06-18 02:09:20 +09:00
miterosan	1f04dd9ada	Cache the dependencies using the static method of the class Dependencies.	2018-06-17 15:08:13 +02:00
miterosan	cd0fe6a09e	Merge branch 'master' of https://github.com/ppy/osu into Private_Messages ... # Conflicts: # osu.Game.Tests/Visual/TestCaseChatLink.cs	2018-06-17 14:15:14 +02:00
Dean Herbert	a20ec0d4cc	Merge branch 'master' into timeline-audio-scrolling	2018-06-17 19:01:21 +09:00
smoogipoo	08f172ba98	Make testcase work on appveyor (no BASS)	2018-06-17 19:01:18 +09:00
smoogipoo	0695615c6a	Remove MusicController from compose timeline testcase	2018-06-17 19:01:14 +09:00
smoogipoo	6c100caba7	Use existing instance of beatmap rather than adding more resources	2018-06-17 19:00:58 +09:00
smoogipoo	4eda017fa5	Fix CI error	2018-06-17 17:54:05 +09:00
Dean Herbert	a6437c005c	Merge branch 'master' into diffcalc-rework	2018-06-15 18:02:18 +09:00
smoogipoo	8f7334874c	Fix up performance calculators	2018-06-14 16:04:48 +09:00
Dean Herbert	b318b770d4	Fix pixellation of volume meter progress bars	2018-06-13 19:22:39 +09:00
Dan Balasescu	ac1990c093	Remove unused using	2018-06-12 16:36:46 +09:00
smoogipoo	93d2b5c4de	Adjust precision for failing test	2018-06-12 16:20:38 +09:00
smoogipoo	34f23359bb	Fix unit tests	2018-06-12 16:20:31 +09:00
smoogipoo	7dfe171869	Fix rebase error	2018-06-12 14:34:28 +09:00
smoogipoo	6ceac8ab0a	Add a centre marker to the timeline	2018-06-12 14:34:28 +09:00
smoogipoo	b90cdfbfd1	Remove unused variable	2018-06-12 14:33:33 +09:00
Dan Balasescu	f71b0456e8	Merge branch 'master' into timeline-audio-scrolling	2018-06-12 14:23:05 +09:00
smoogipoo	30b7b7961f	Merge remote-tracking branch 'origin/master' into timeline-audio-scrolling ... # Conflicts: # osu-framework # osu.Game.Tests/Visual/TestCaseEditorComposeTimeline.cs # osu.Game/Screens/Edit/Screens/Compose/Timeline/Timeline.cs	2018-06-12 14:22:27 +09:00
Dan Balasescu	0a35a81c2d	Merge branch 'master' into populate-missing-online-ids	2018-06-12 13:11:21 +09:00
Dean Herbert	37ea4c273b	Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework	2018-06-11 20:17:41 +09:00
Dean Herbert	8092d70402	Merge remote-tracking branch 'upstream/master' into smoogipoo-editor-timeline-rework	2018-06-11 20:17:33 +09:00
Dan Balasescu	7de8e1cfc4	Merge branch 'master' into refactor-api	2018-06-11 18:49:15 +09:00
Dean Herbert	aaa65c428f	Merge branch 'master' into diffcalc-modtypes	2018-06-09 23:35:17 +09:00
Dean Herbert	955a78e76d	Remove OnlineBeatmapSetID from BeatmapInfo ... It should now be retrieved via the linked BeatmapSetInfo	2018-06-08 15:26:27 +09:00
DrabWeb	0815e0ba83	Merge https://github.com/ppy/osu into multiplayer-room-settings	2018-06-08 01:16:22 -03:00
Dean Herbert	8220e0c79a	Remove OnlineBeatmapSetID from BeatmapMetadata	2018-06-08 12:46:34 +09:00
Dean Herbert	8cc31aca54	Reorganise API requests and response classes ... They were previously breaking the two-class-per-file rule.	2018-06-08 11:42:35 +09:00
Dean Herbert	f3c9049660	Merge branch 'master' into disallow-beatmap-change	2018-06-07 15:34:19 +09:00
smoogipoo	3745f9000b	Merge remote-tracking branch 'origin/master' into remove-decoder-offset	2018-06-07 13:37:19 +09:00
DrabWeb	ed97d35ef7	Test steps.	2018-06-06 23:30:17 -03:00