1376 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Drew DeVault	66d104394f	Add comments around cwd handling	2017-01-30 09:36:26 -05:00
Drew DeVault	c00a558cb7	Merge remote-tracking branch 'upstream/master' into song-select-filtering	2017-01-30 09:35:14 -05:00
Dean Herbert	578b33dc64	Merge pull request #300 from peppy/more-beatmap-info ... Beatmap details	2017-01-30 16:23:30 +09:00
Dean Herbert	9f90b57543	Move BPM calculations to Beatmap.	2017-01-30 16:03:45 +09:00
Dean Herbert	8f1e7ef19a	Fix non-matching shear angles.	2017-01-30 15:28:47 +09:00
Dean Herbert	0272c4b559	Add StarDifficulty property and correct colouring of difficulty icons.	2017-01-30 15:26:28 +09:00
Dean Herbert	1f2f2fa144	Fix visualtests.	2017-01-30 15:15:56 +09:00
Dean Herbert	2ed5cf7c91	Hook up icons better.	2017-01-30 13:35:40 +09:00
Dean Herbert	0c2152f3d0	Use beatmap's play mode.	2017-01-30 13:14:02 +09:00
Dean Herbert	e93f60396f	Add the ability for individual game modes to report statistics for display at song select.	2017-01-30 13:12:30 +09:00
Dean Herbert	3286713d11	avg -> mostly	2017-01-29 15:16:38 +09:00
Dean Herbert	6027cc7afa	Formatting fixes.	2017-01-29 15:15:04 +09:00
Dean Herbert	2e76874384	Simplify the lookup conditions for hitcircles/sliders (uses duration to discern).	2017-01-29 15:09:42 +09:00
Dean Herbert	3125fa89ee	Fix method which should be class.	2017-01-29 15:06:44 +09:00
Dean Herbert	77558abf58	Merge branch 'master' into more-beatmap-info ... # Conflicts: # osu.Game/Screens/Select/BeatmapInfoWedge.cs	2017-01-29 14:47:42 +09:00
Dean Herbert	800e35b637	Merge pull request #268 from EVAST9919/login_fix ... Login improvements	2017-01-28 23:20:32 +09:00
Andrey Zavadskiy	72bc7f8786	Simplify checking	2017-01-28 17:01:11 +03:00
Andrey Zavadskiy	e25b8bb298	Removed explicit methods	2017-01-28 16:56:05 +03:00
Andrey Zavadskiy	f12a8ace3f	Moved Config logic to OsuConfigManager	2017-01-28 13:10:05 +03:00
EVAST9919	ac7feafe9a	Merge branch 'master' into login_fix	2017-01-28 11:24:08 +02:00
Drew DeVault	10897486ba	Merge remote-tracking branch 'upstream/master' into song-select-filtering	2017-01-27 15:41:46 -05:00
Dean Herbert	f3e9da609e	Merge pull request #295 from peppy/songselect-footer ... Initial implementation of song select footer area.	2017-01-27 16:13:43 +09:00
Dean Herbert	8987a09741	Merge pull request #293 from peppy/general-fixes ... Fix some nullrefs when running visualtests with no maps loaded.	2017-01-27 16:12:46 +09:00
Dean Herbert	335420ec30	Merge pull request #290 from peppy/player-extension ... Add failing support	2017-01-27 16:12:17 +09:00
Drew DeVault	f3c5c1f0b8	Fixes following recent updates upstream	2017-01-26 21:31:28 -05:00
Drew DeVault	417933b7ec	Merge remote-tracking branch 'upstream/master' into song-select-filtering	2017-01-26 13:57:55 -05:00
Dean Herbert	629605c6b4	Make HasFailed's set private.	2017-01-27 00:41:34 +09:00
Dean Herbert	4efedd942d	Use null propagation.	2017-01-27 00:41:34 +09:00
Dean Herbert	f07b9591cd	Add null check when popping backgrounds from the mode stack.	2017-01-27 00:41:34 +09:00
Dean Herbert	139cac5e57	Add fail dialog and flow.	2017-01-27 00:41:34 +09:00
Dean Herbert	1d24ad3db6	osu! mode starts with health being full.	2017-01-27 00:41:34 +09:00
Dean Herbert	c3699c1395	Remove unused prevCount variable.	2017-01-27 00:39:00 +09:00
Dean Herbert	c01863dfa2	Add min/max constraints to HealthDisplay.	2017-01-27 00:39:00 +09:00
Dean Herbert	9f44e634a4	Allow visualtests to share config etc. with osu!.	2017-01-27 00:39:00 +09:00
Dean Herbert	cd149f04fc	Use bindable for HealthDisplay.	2017-01-27 00:38:21 +09:00
Dean Herbert	8c7bb4990c	Add support for failing.	2017-01-27 00:38:21 +09:00
Dean Herbert	70271fee35	Move PlayerInputManager to own file.	2017-01-27 00:38:21 +09:00
Dean Herbert	4a7b3cf391	Initial implementation of song select footer area.	2017-01-27 00:36:12 +09:00
Dean Herbert	d4e30f65db	Adjust timing of TestCaseHitObjects a bit.	2017-01-27 00:16:02 +09:00
Dean Herbert	a2501cc81d	Fix TestCaseHitObjects not working at all due to state being set before load is complete.	2017-01-27 00:16:02 +09:00
Dean Herbert	7ee6a50404	Fix checkbox design regressions.	2017-01-27 00:16:02 +09:00
Dean Herbert	c07001b566	Fix TestCasePlayer not working on consecutive executions (clock being set where it isn't necessary).	2017-01-27 00:16:02 +09:00
Dean Herbert	4aa2834082	Fix TestCasePlaySongSelect not working on consecutive executions.	2017-01-27 00:16:02 +09:00
Dean Herbert	162e183b36	Fix some nullrefs when running visualtests with no maps loaded.	2017-01-27 00:16:02 +09:00
Thomas Müller	d17bef12b6	Merge pull request #294 from peppy/framework-configuration ... Move window/volume configuration to framework level.	2017-01-26 15:50:13 +01:00
Dean Herbert	db37a7e332	Update framework.	2017-01-26 23:36:35 +09:00
Dean Herbert	25da8a53dc	Fix incorrect configuration retrievals.	2017-01-26 23:08:39 +09:00
Dean Herbert	1853bbdda8	Move window/volume configuration to framework level.	2017-01-25 18:44:51 +09:00
Dean Herbert	23938a810b	Merge pull request #292 from peppy/general-fixes ... Reset the beatmap database when it can't be read, rather than hard failing.	2017-01-23 21:43:52 +09:00
Dean Herbert	3a27178bb1	Merge pull request #289 from UselessToucan/JudgementsCapacity ... Specify ScoreProcessor.Judgements.Capacity	2017-01-23 21:40:00 +09:00