11602 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	77189073b2	Merge branch 'master' into scalablecontainer-size-fix	2018-04-03 11:29:36 +09:00
Dean Herbert	25524bf24f	Merge pull request #2342 from smoogipoo/fix-formatexception-beatmap ... Handle possible FormatException when parsing timing points	2018-04-02 20:20:35 +09:00
smoogipoo	fd9480cfb6	Handle timingpoint FormatException	2018-04-02 20:08:40 +09:00
smoogipoo	d24d81d8a9	De-pluralize some methods	2018-04-02 20:07:18 +09:00
Dan Balasescu	ad4f38f109	Merge pull request #2308 from johnneijzen/Small-Clean-Up ... Set Correct values for addDelayedMovements() function	2018-04-02 14:33:20 +09:00
Dan Balasescu	d7b61b3c09	Merge branch 'master' into Small-Clean-Up	2018-04-02 14:13:15 +09:00
Dan Balasescu	7a2345959e	Merge pull request #2288 from FreezyLemon/fix-songselect-exit-notimplemented ... Fix Player trying to load DummyWorkingBeatmap and failing	2018-04-02 14:07:40 +09:00
Dan Balasescu	83dcff2907	Merge branch 'master' into fix-songselect-exit-notimplemented	2018-04-02 13:54:06 +09:00
Dan Balasescu	7bcb86dc3c	Merge pull request #2335 from peppy/fix-file-extension-matching ... Fix skin path being ignored in extension agnostic lookups	2018-04-02 13:53:54 +09:00
Dan Balasescu	32832304a7	Merge branch 'master' into fix-songselect-exit-notimplemented	2018-04-02 13:53:41 +09:00
Dan Balasescu	323534c721	Merge branch 'master' into fix-file-extension-matching	2018-04-02 13:27:14 +09:00
smoogipoo	551ba6ac4b	Fix ScalableContainer irrepairably altering content size	2018-04-02 13:06:06 +09:00
Dean Herbert	cc70f7182a	Merge pull request #2320 from DrabWeb/beatmap-set-status ... Add ranked status and video marker to beatmap overlay and panels	2018-03-30 21:07:05 +09:00
Dean Herbert	cf3cafd9a9	Merge branch 'master' into beatmap-set-status	2018-03-30 20:55:36 +09:00
Dean Herbert	c39f056b3b	Fix skin path being ignored in extension agnostic lookups ... Closes #2295.	2018-03-30 18:06:18 +09:00
Dean Herbert	7b34c83916	Merge pull request #2333 from Joehuu/hr-on-mania-is-unranked ... Revert changes on hard rock mod	2018-03-30 17:54:07 +09:00
Dan Balasescu	824201336a	Merge branch 'master' into hr-on-mania-is-unranked	2018-03-30 16:35:00 +09:00
Joseph Madamba	0887dafa2c	Revert changes on hard rock mod	2018-03-29 20:36:52 -07:00
Dan Balasescu	33b38b68cc	Merge pull request #2326 from peppy/rider-configuration ... Add rider run/debug configurations	2018-03-29 19:27:48 +09:00
Dean Herbert	ce6a61a5b7	Update framework	2018-03-29 18:56:36 +09:00
Dean Herbert	487c25c3dd	Merge remote-tracking branch 'upstream/master' into rider-configuration	2018-03-29 18:55:59 +09:00
Dean Herbert	4cc478d9f7	Merge pull request #2325 from smoogipoo/fix-mania-sounds ... Fix mania playing the wrong/duplicated sounds on playfield keypress	2018-03-29 17:46:29 +09:00
Dean Herbert	173f79f7b6	Force build before run	2018-03-29 17:17:33 +09:00
Dean Herbert	49c8bc44ad	Remove silly stuff	2018-03-29 17:08:06 +09:00
Dean Herbert	5c4b0c2b8d	Add rider run/debug configurations	2018-03-29 16:55:38 +09:00
smoogipoo	bb7618eb0c	FIx mania playfield playing the wrong/duplicated sounds ... Fixes #2266.	2018-03-29 16:13:31 +09:00
smoogipoo	187a025d36	Make hitobjects sorted by their start times	2018-03-29 16:07:31 +09:00
Dan Balasescu	fcf0b25fa0	Merge pull request #2321 from peppy/fix-visual-tests ... Make VisualTests/nUnit work again	2018-03-29 12:58:56 +09:00
smoogipoo	cc35b1ab64	Update framework	2018-03-29 12:47:24 +09:00
smoogipoo	687c889345	Add back osu.Desktop versions (used in deploy)	2018-03-29 12:47:17 +09:00
smoogipoo	d83e4dfd24	Add .vscode configurations for ruleset test projects	2018-03-29 12:26:32 +09:00
Dean Herbert	01116a73a3	Update framework	2018-03-28 18:09:18 +09:00
Dean Herbert	e47276c6b0	Remove VisualTests solution configuration	2018-03-28 16:17:04 +09:00
Dean Herbert	59df02da00	Update test projects to actually load in visual studio	2018-03-28 16:12:25 +09:00
Dean Herbert	9aae568bbe	Tidy up csproj further	2018-03-28 15:19:56 +09:00
Dean Herbert	81a8385c8c	Remove lingering reference to tests	2018-03-28 15:17:09 +09:00
Dean Herbert	9667d54ecb	Add missing licence headers	2018-03-28 14:48:08 +09:00
Dean Herbert	093bd7db3c	Update vscode build configurations	2018-03-28 14:41:37 +09:00
Dean Herbert	0026b94cd3	Consolidate and move ruleset test projects	2018-03-28 14:41:25 +09:00
Dean Herbert	c355a0794c	Let appveyor do its own discovery	2018-03-28 13:12:32 +09:00
Dean Herbert	4907f14dbe	Add back resources	2018-03-28 13:00:18 +09:00
Dean Herbert	94b1d3e4af	Make VisualTests/nUnit work again	2018-03-28 12:33:01 +09:00
DrabWeb	84bb96740f	Fix merge error.	2018-03-27 18:27:30 -03:00
DrabWeb	19bc6b9168	Merge https://github.com/ppy/osu into beatmap-set-status	2018-03-27 18:13:58 -03:00
DrabWeb	506e27a30e	Cleanup.	2018-03-27 17:59:58 -03:00
Dean Herbert	306ff09792	Merge pull request #2305 from smoogipoo/update-netstandard ... Switch to .NET Standard 2.0	2018-03-27 22:55:38 +09:00
Dean Herbert	d47d7a3dd4	Update submodules	2018-03-27 22:47:01 +09:00
Dean Herbert	efac68a8f5	Update deploy script	2018-03-27 22:36:43 +09:00
Dean Herbert	d76bc1a8ad	Revert "Move NoWarns" ... This reverts commit 75a413a40e.	2018-03-27 21:13:06 +09:00
Dean Herbert	524044d487	Add licence header to SquirrelUpdateManager	2018-03-27 19:19:28 +09:00