4195 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	928550b1a8	Merge branch 'master' into remove-playmode	2017-04-17 21:01:10 +09:00
Dean Herbert	4b6ba565f8	Fix forgotten revert.	2017-04-17 20:10:51 +09:00
smoogipooo	eaa171baf4	Rewrite bar lines to make sure they're centered at their beat's start position.	2017-04-17 20:02:36 +09:00
Dean Herbert	3c00776416	Merge pull request #639 from huoyaoyuan/fixes ... Don't block input in BeatmapInfoWedge.	2017-04-17 19:54:06 +09:00
Dean Herbert	fe0d18777e	Fix appveyor issues.	2017-04-17 19:52:07 +09:00
Dean Herbert	af13f97435	Fix regressions and test cases.	2017-04-17 19:44:03 +09:00
Huo Yaoyuan	c235a14e3e	Don't block input in BeatmapInfoWedge.	2017-04-17 17:08:01 +08:00
Dean Herbert	db6556a0f9	Index DeletePending for better performance.	2017-04-17 17:44:02 +09:00
Dean Herbert	a4e2f34ee7	Make a RulesetDatabase.	2017-04-17 17:43:48 +09:00
Dean Herbert	83b083ce64	Move SQLite connections out of database classes; make abstract Database.	2017-04-17 14:37:52 +09:00
Dean Herbert	ce12cc20bd	Merge remote-tracking branch 'upstream/master' into remove-playmode	2017-04-17 13:00:53 +09:00
ocboogie	78273d76e3	Added basic loading screen and test case	2017-04-16 20:18:41 -07:00
Dean Herbert	6239eab233	Update forgotten submodule.	2017-04-16 22:40:29 +09:00
Dean Herbert	ce5d48b86c	Merge pull request #637 from Dormanil/CS7-migration ... Explicitly set language version to C# 6.0 for now.	2017-04-16 20:37:31 +09:00
Dean Herbert	fbda181769	Update framework.	2017-04-16 20:15:36 +09:00
Adrian Kaz Scherzinger	60f7879875	Explicitly set C# 6.0 for now.	2017-04-16 06:44:08 +09:00
ColdVolcano	ca1f89f2cf	Fix crash when there's no beatmaps	2017-04-14 17:48:27 -05:00
ColdVolcano	2c6327fca9	Build for real this time	2017-04-14 17:17:51 -05:00
Javier Flores	984c7092a6	Pls AppVeyor don't die	2017-04-14 16:33:58 -05:00
smoogipooo	ddce3c157f	Clean up a few remaining stragglers.	2017-04-15 06:15:55 +09:00
smoogipooo	4a149c4ab8	Better default values + don't set Mode from outside.	2017-04-15 06:14:31 +09:00
smoogipooo	0333e1a050	Remove unused usings.	2017-04-15 05:57:18 +09:00
smoogipooo	3845ab2a72	Add comment.	2017-04-15 05:55:38 +09:00
smoogipooo	6dbc75283c	Re-implement config value.	2017-04-15 05:52:58 +09:00
smoogipooo	0a1376c2db	Remove PlayMode game-wide.	2017-04-15 05:22:41 +09:00
smoogipooo	a89af273be	Make BeatmapInfo expose Ruleset instead of PlayMode.	2017-04-15 05:01:36 +09:00
smoogipooo	59bfc7abad	Move statics to RulesetCollection to avoid conflicts later on.	2017-04-15 04:53:37 +09:00
ColdVolcano	0a89e7deb8	Merge remote-tracking branch 'refs/remotes/upstream/master'	2017-04-14 13:32:55 -05:00
ColdVolcano	b7d61add45	Cleanup + AppVeyor fixes	2017-04-14 13:10:59 -05:00
ColdVolcano	b5fc84087f	Show song in MusicController and SongSelect	2017-04-14 12:59:15 -05:00
ColdVolcano	2eb73a7c70	More smoothness when MenuMusic is false	2017-04-14 12:58:47 -05:00
ColdVolcano	2a9f4e6950	Get MenuMusic and MenuVoice woking	2017-04-14 12:42:42 -05:00
Dan Balasescu	9927f9aca5	Merge pull request #363 from DrabWeb/song-progress-graph ... Song Progress	2017-04-15 01:37:25 +09:00
Dan Balasescu	31ce66bfdc	Trim whitespace.	2017-04-15 01:31:42 +09:00
Dan Balasescu	3de3b94978	Merge branch 'master' into song-progress-graph	2017-04-15 01:29:02 +09:00
Dan Balasescu	b247a7c3c3	Merge pull request #633 from peppy/hud-improvements ... Rearrange HUD elements	2017-04-14 23:50:08 +09:00
Dean Herbert	52ddc414d5	Fix errors.	2017-04-14 20:17:17 +09:00
Dean Herbert	ed3956eca5	Make comma separators optional.	2017-04-14 20:09:01 +09:00
Dean Herbert	ac3b435f00	Merge remote-tracking branch 'upstream/master' into hud-improvements ... # Conflicts: # osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs	2017-04-14 19:29:59 +09:00
Dean Herbert	9d753a7798	Merge branch 'master' into song-progress-graph	2017-04-14 19:24:13 +09:00
Dean Herbert	627114abec	Improve test case.	2017-04-14 19:23:33 +09:00
Dean Herbert	98544a8077	Fix unsynchronised tweening.	2017-04-14 19:20:07 +09:00
Dean Herbert	ea0631ede8	Encapsulate progress update logic better.	2017-04-14 18:23:34 +09:00
Dean Herbert	acd7a5b254	Hook up beatmap object density to progress display.	2017-04-14 17:58:37 +09:00
Dean Herbert	6421f040dd	Fix SongProgress handling escape.	2017-04-14 15:27:24 +09:00
Dean Herbert	8c41707ac7	Fix incorrect default state. Handle input better.	2017-04-14 14:40:52 +09:00
Dean Herbert	09195a03a2	Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-04-14 11:25:00 +09:00
Dean Herbert	d2fd3f1e0c	Merge pull request #631 from peppy/pause-clean-up ... Pause clean up	2017-04-14 11:22:15 +09:00
Jorolf	7f08c3c417	add IHasOverhangingTooltip	2017-04-14 00:18:17 +02:00
Jorolf	f6f75fac74	Merge branch 'master' of git://github.com/ppy/osu into tooltips ... # Conflicts: # osu.Game/Graphics/Cursor/MenuCursor.cs	2017-04-13 23:12:07 +02:00