osu-lazer

mirror of https://github.com/ppy/osu.git synced 2024-12-30 15:02:56 +08:00

Author	SHA1	Message	Date
MrTheMake	f76abe2329	Disallow clicking through the song select footer.	2017-05-20 22:13:23 +02:00
MrTheMake	306feb177a	Fix null pointer reference	2017-05-20 20:18:29 +02:00
MrTheMake	031fddc995	Fix current beatmap track is started again when entering songselect and changing to another difficulty from the same beatmap set.	2017-05-20 19:53:18 +02:00
MrTheMake	57b9ed0f54	Do not pause a running replay if the window is not focused.	2017-05-20 18:56:50 +02:00
ColdVolcano	38a566890f	Add licence header	2017-05-20 11:44:19 -05:00
ColdVolcano	2014d35301	Merge branch 'master' of ppy/osu into menu-flashes	2017-05-20 11:39:39 -05:00
ColdVolcano	4e83f12f34	Initial implementation Note this won't work with the osu!bgm because it is not a beatmap	2017-05-20 11:02:42 -05:00
Dean Herbert	0b987be600	Merge branch 'master' into osu-direct	2017-05-20 16:17:59 +09:00
DrabWeb	1eb96e07bd	Remove unused using directive	2017-05-20 03:01:09 -03:00
DrabWeb	0c5fec975d	Change ModDisplay to use ReverseDepthFillFlowContainer	2017-05-20 02:56:00 -03:00
DrabWeb	e030573436	Add ReverseDepthFillFlowContainer to remove code duplication	2017-05-19 23:44:36 -03:00
EVAST9919	9f803de9d5	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-19 19:49:48 +03:00
Dean Herbert	561b517dec	Merge branch 'master' into skip-redesign	2017-05-20 00:42:04 +09:00
Dean Herbert	674731f9bb	Add sound back to skip action	2017-05-19 22:23:48 +09:00
Dean Herbert	60f960aafd	Fix audio clock breakage.	2017-05-19 22:19:20 +09:00
Dean Herbert	20156d26f9	Don't rely on parent's clock	2017-05-19 22:12:09 +09:00
EVAST9919	6f0e1fccdb	moved autosize to ctor and whitespace fix	2017-05-19 16:08:33 +03:00
EVAST9919	b2b299a8c3	Fixed the ability to change visibility even not in replay	2017-05-19 15:54:21 +03:00
Dean Herbert	aef82acb0d	Update skip button design	2017-05-19 21:54:14 +09:00
EVAST9919	4d0d27aa88	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-19 15:25:48 +03:00
Dean Herbert	da31d129ee	Merge branch 'master' into mania-beatmap-conversion	2017-05-19 18:18:59 +09:00
Dean Herbert	a7d16ac213	Move skip logic to inside SkipButton	2017-05-19 18:18:21 +09:00
smoogipooo	9191c4f3e3	Remove LegacyBeatmapConverter.	2017-05-19 16:31:56 +09:00
Dean Herbert	36b628bbcc	Merge branch 'master' into fix-early-inactive-pause	2017-05-19 16:21:20 +09:00
smoogipooo	67cf64062a	Add flag to determine whether the beatmap requested for conversion is for the current ruleset.	2017-05-19 16:02:40 +09:00
Dean Herbert	bfd37d0350	Fix audio beginning to play when potentially paused due to inactive window Also removes all usage of Delay() in Player. Resolves #793.	2017-05-19 13:53:09 +09:00
Dean Herbert	5ae3a7143e	Fix audio seeking when entering play mode in certain cases Resolves #794	2017-05-19 13:23:11 +09:00
EVAST9919	91b081f0b2	Change visibility on ctrl+h	2017-05-19 06:41:33 +03:00
EVAST9919	f2af31aceb	Naming fixes	2017-05-18 20:21:58 +03:00
EVAST9919	83a89ce22d	options -> settings	2017-05-18 11:39:22 +03:00
EVAST9919	d07d94d606	better resizing	2017-05-18 07:09:36 +03:00
EVAST9919	35bc3a42aa	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-18 06:36:15 +03:00
Dan Balasescu	32c471d285	Merge branch 'master' into pause-container	2017-05-18 01:22:37 +09:00
Dean Herbert	8084c575ef	Merge branch 'master' into fix-fail-pause-conflict	2017-05-17 23:32:41 +09:00
EVAST9919	a9f37d3e78	now button can hide content	2017-05-17 17:24:52 +03:00
EVAST9919	a21343da23	CI fixes	2017-05-17 17:14:09 +03:00
EVAST9919	60ed7a2372	fixed license header	2017-05-17 16:54:49 +03:00
EVAST9919	1e029d05a8	Added bindable to adjust playback speed	2017-05-17 16:10:49 +03:00
Dean Herbert	41c252760d	Move all pause logic into PauseContainer	2017-05-17 21:57:01 +09:00
EVAST9919	0867ef814c	Visible only in replay	2017-05-17 15:54:12 +03:00
EVAST9919	e0625a9b30	More overlays and overall fixes	2017-05-17 15:39:26 +03:00
Dean Herbert	88a70e407c	Fix and simplifty pause logic Resolves #770	2017-05-17 20:11:41 +09:00
DrabWeb	9ba356f2c6	Added osu!direct header and filter control	2017-05-17 05:58:34 -03:00
Dean Herbert	7bb38e927b	Fix song select reverting to first difficulty of current group on entering	2017-05-17 17:33:20 +09:00
Dean Herbert	cab12ee55a	Reduce the possibility of recomputing drawables when underlying beatmap hasn't changed	2017-05-17 17:33:16 +09:00
EVAST9919	1a4025ab3c	ingame options basic logic	2017-05-17 10:36:57 +03:00
Dean Herbert	12cb530358	Merge branch 'master' into tidy-up	2017-05-17 09:24:11 +09:00
nyaamara	a3e93afb37	Merge pull request #3 from ppy/master cool	2017-05-16 16:57:45 -04:00
nyaamara	b22c84287a	Fix typo.	2017-05-16 16:54:33 -04:00
Huo Yaoyuan	d929de466a	DateDisplay -> DateTimeDisplay for more exactly.	2017-05-16 21:16:52 +08:00
Huo Yaoyuan	d213706d07	Use DateTimeOffset.	2017-05-16 21:14:50 +08:00
Dean Herbert	6487bf45cf	Eagerly attempt to pause the game when the window is not focused	2017-05-16 17:59:14 +09:00
Dean Herbert	89e2a39d14	Merge remote-tracking branch 'upstream/master' into margin-padding-namespace	2017-05-16 16:36:34 +09:00
Dean Herbert	efab186384	Update namespaces in line with framework	2017-05-16 12:50:30 +09:00
Dean Herbert	23760d6805	Adjust osu! logo metrics and add shockwave impact animation	2017-05-15 19:36:03 +09:00
Dean Herbert	622b155fda	OsuConfig -> OsuSetting	2017-05-15 10:56:27 +09:00
Dean Herbert	eaaba11586	Change all instances of options to settings where applicable	2017-05-15 10:55:29 +09:00
Dean Herbert	e096dd8126	Merge branch 'master' into fix-beatmap-population	2017-05-12 20:30:06 +09:00
Dan Balasescu	815379646c	Merge branch 'master' into new-option-search	2017-05-12 20:22:11 +09:00
Dan Balasescu	d60da82c4c	Merge branch 'master' into fix-beatmap-population	2017-05-12 20:15:10 +09:00
Dean Herbert	a9b3f74218	Fix ruleset not always getting populated in a WorkingBeatmap	2017-05-12 20:05:44 +09:00
Dean Herbert	d3770d8395	Merge branch 'master' into chat-design-update	2017-05-12 19:57:57 +09:00
Dean Herbert	d2e066ca35	Move SearchTextBox to better namespace Is being used in multiple places now.	2017-05-12 19:57:06 +09:00
Dean Herbert	cf239f4d9c	Move chat into main content Also changes the way parallax is applied to OsuScreens game-wide.	2017-05-12 19:03:21 +09:00
EVAST9919	9a04069123	removed useless booleans, using nullables instead	2017-05-12 10:16:31 +03:00
EVAST9919	34b4efc4e9	Applied suggested changes	2017-05-12 08:12:34 +03:00
EVAST9919	79ed92a0d7	Simplified logic	2017-05-12 01:48:28 +03:00
EVAST9919	1f34cec5ce	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-11 22:22:57 +03:00
Dean Herbert	a2f6d8a3e6	Fix broken test cases, remove some recursive lookup methods.	2017-05-11 19:38:28 +09:00
Dean Herbert	70ef503403	Merge branch 'master' into metadata	2017-05-11 12:23:00 +09:00
EVAST9919	ea0add2354	Fixed update condition	2017-05-11 02:34:57 +03:00
EVAST9919	d55c97a08a	Stop progress as soon as we at 100%	2017-05-11 01:48:46 +03:00
EVAST9919	5b469eff69	Fixes	2017-05-10 10:33:02 +03:00
EVAST9919	d8f9e71b84	Applied suggested changes	2017-05-10 10:14:44 +03:00
EVAST9919	7b17e331c4	cleanups	2017-05-10 03:45:31 +03:00
EVAST9919	315f1f1256	CI fixes	2017-05-09 06:23:03 +03:00
EVAST9919	2c92ee432b	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-09 06:05:46 +03:00
EVAST9919	2826c663fd	Apply suggested changes	2017-05-09 06:05:37 +03:00
Dean Herbert	ab1768ef80	Merge branch 'master' into tidy-up	2017-05-09 10:27:29 +09:00
EVAST9919	de2486b8e6	Moved timeLeft recalculation to property	2017-05-08 20:36:02 +03:00
EVAST9919	17d1ecb8f5	Use float type for progress value	2017-05-08 19:42:36 +03:00
EVAST9919	4b5e24cc36	Changed logic a bit	2017-05-08 19:14:19 +03:00
EVAST9919	ae2186970c	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-08 18:16:16 +03:00
Huo Yaoyuan	cb21e98ae1	MatchCreate.ValidForResume = false.	2017-05-08 19:55:04 +08:00
Huo Yaoyuan	dff05bec79	Use readonly fields.	2017-05-08 18:56:04 +08:00
Dean Herbert	48368779ab	Avoid polluting Player with HUD-specific code.	2017-05-08 11:48:40 +09:00
Dean Herbert	df4a737c9b	Merge remote-tracking branch 'ppy/master' into hud-mod-display	2017-05-08 10:56:34 +09:00
EVAST9919	f0145c7f4f	Trying to woke up AppVeyor	2017-05-08 02:16:56 +03:00
EVAST9919	926ed907c2	CI fixes	2017-05-08 02:00:21 +03:00
EVAST9919	dda25219bc	code fixes	2017-05-08 01:54:31 +03:00
EVAST9919	c3a42ded36	Fixed Graph/seeking offset	2017-05-08 01:23:51 +03:00
EVAST9919	531f2c410a	removed useless variable	2017-05-08 00:26:34 +03:00
EVAST9919	ea28a9f7ce	Adjust values	2017-05-08 00:16:58 +03:00
Huo Yaoyuan	4f8549f220	Standardise usages of exceptions.	2017-05-07 00:38:17 +08:00
EVAST9919	d06b5783cb	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-06 17:33:51 +03:00
Huo Yaoyuan	f37c857af8	CI fixes.	2017-05-06 16:06:38 +08:00
Huo Yaoyuan	767cfaaac3	Access database recursively.	2017-05-06 15:37:53 +08:00
Huo Yaoyuan	146d57953d	Use metadata field of WorkingBeatmap.	2017-05-06 14:57:11 +08:00
skettios	36dff94802	removed check if ModSelectOverlay is open	2017-05-05 18:16:48 -07:00
skettios	d129bd0c1f	Fix ModSelectOverlay accepting escape when it shouldn't Because PlaySongSelect is suspending when selecting a song, we don't actually hide ModSelectOverlay.	2017-05-05 17:03:24 -07:00
Dean Herbert	44f06e5423	Add hover expand support.	2017-05-05 13:17:36 +09:00
Dean Herbert	9c4f813da1	Remove unnecessary hide/show logic. Also change the way the overlay appears when actually playing.	2017-05-05 13:14:44 +09:00
Dean Herbert	b547dd6893	CI Fixes.	2017-05-05 13:06:54 +09:00
Dean Herbert	c9ba1ac4f6	Adjust namespaces. Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.	2017-05-05 13:00:05 +09:00
EVAST9919	95f6c999bd	Adjust scale and CI fixes	2017-05-04 17:59:01 +03:00
EVAST9919	475eb6fe5f	Cleanup	2017-05-04 17:29:52 +03:00
EVAST9919	57c4232416	Added testcase	2017-05-04 11:58:37 +03:00
EVAST9919	6063231e40	float value fix	2017-05-03 16:58:10 +03:00
EVAST9919	5f2f1d2763	CI fixes	2017-05-03 14:01:43 +03:00
EVAST9919	9e35eb8d97	Fixes	2017-05-03 13:53:45 +03:00
EVAST9919	e7a8619f01	ModIcon refactor	2017-05-03 09:48:10 +03:00
EVAST9919	f49cc124ed	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-03 08:26:54 +03:00
EVAST9919	a897dcbfbe	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-03 08:26:01 +03:00
EVAST9919	6ea3629c9a	Adjust the size	2017-05-03 08:23:52 +03:00
EVAST9919	2e30a69b67	removed using	2017-05-02 23:04:36 +03:00
EVAST9919	a955f9cbfd	Simplify hiding logic	2017-05-02 22:59:36 +03:00
EVAST9919	37c3133981	Fixes	2017-05-02 22:46:18 +03:00
EVAST9919	7e1efcc20b	Added ModsContainer	2017-05-02 22:34:07 +03:00
Dean Herbert	5a8a8acbc8	Merge branch 'master' into roompanel	2017-05-02 18:04:48 +09:00
smoogipooo	8e88d86639	Fix naming confusion.	2017-05-02 18:00:37 +09:00
smoogipooo	9ca8295149	Oops.	2017-05-02 17:09:16 +09:00
smoogipooo	40d2fee1dc	Split up adding of local store from the ctor.	2017-05-02 16:55:04 +09:00
smoogipooo	e2620e2840	Make Team not inherit Country.	2017-05-02 16:54:43 +09:00
smoogipooo	ee0a5409bb	CI fixes.	2017-05-02 16:33:48 +09:00
EVAST9919	108cd28e96	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-02 10:15:56 +03:00
smoogipooo	91e000fd44	Back to sanity.	2017-05-02 14:21:22 +09:00
smoogipooo	f17046abaf	Add ability to load Drawings flags from osu/Drawings/Flags.	2017-05-02 13:28:35 +09:00
smoogipooo	e856abe59a	Let's not use Country for drawings-specific stuff...	2017-05-02 13:02:14 +09:00
Dean Herbert	6074cb5979	Make playlist filtering work. Also standardises searchable terms in beatmap metadata.	2017-05-02 10:45:55 +09:00
ColdVolcano	6ce0245c2b	Typo	2017-05-01 19:34:08 -05:00
ColdVolcano	1b52445f86	Fix crash when selecting non-existent IDs from database	2017-05-01 19:31:46 -05:00
ColdVolcano	f2b0602f90	Double check if the selectedpanel is not the provided as argument	2017-05-01 00:13:00 -05:00
EVAST9919	698ae0832f	Move string formatting inside the class	2017-05-01 07:00:44 +03:00
EVAST9919	ba0fbacda0	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-01 06:33:04 +03:00
Dean Herbert	47e4a5b9cb	Merge branch 'master' into metadata_additions	2017-05-01 12:02:35 +09:00
EVAST9919	0386e96573	applied requested changes	2017-05-01 05:38:51 +03:00
EVAST9919	668262ed06	Applied requested changes	2017-05-01 04:53:46 +03:00
EVAST9919	e9094bac51	Added suggested changes	2017-04-30 17:05:00 +03:00
Dean Herbert	1e3847c73c	Cancel the existing scheduled task when running it ahead of time.	2017-04-29 20:28:56 +09:00
Dean Herbert	2dcb4e9b93	Fix race condition when attempting to start a beatmap during debounce.	2017-04-29 20:12:09 +09:00
EVAST9919	a8c918f7bf	Removed empty line	2017-04-28 21:12:48 +03:00
EVAST9919	d5c56aab7a	Initial commit	2017-04-28 21:05:00 +03:00
Dean Herbert	2ece1cbd07	CI Fixes.	2017-04-28 22:26:51 +09:00
Dean Herbert	a681e3e380	Remove unused method.	2017-04-28 22:17:42 +09:00
Dean Herbert	4e65da0fd1	Fix regression in panel select animation. Currently we are required to update computeYPositions twice per selection. Without doing this, panels are in the wrong place when using keyboard selection. There's still a bit of work to be done to make this work correctly. It's caused by a race condition of state application for panels which have not yet been presented (and get their state applied in LoadComplete which breaks the order of things).	2017-04-28 22:17:35 +09:00
EVAST9919	f8faea8da2	Removed unnecessary nested class	2017-04-28 16:02:00 +03:00
EVAST9919	c4bd21914d	warning fixes	2017-04-28 15:37:22 +03:00
EVAST9919	b409a22309	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-04-28 15:29:24 +03:00
Dean Herbert	70e81115f4	Refactor BeatmapInfoWedge to suck a little less.	2017-04-28 21:16:37 +09:00
Dean Herbert	59cc5ea00a	CI Fixes.	2017-04-28 20:50:23 +09:00
Dean Herbert	45729a8881	Add debounce to WorkingBeatmap creation at song select. Improves perceived performance when quickly moving through carousel.	2017-04-28 20:44:16 +09:00
Dean Herbert	003cf53441	Streamline panel selection event logic. Was previously firing multiple times where it was completely unnecessary. Also had bidirection firing going on.	2017-04-28 20:43:42 +09:00
Dean Herbert	b78fa99620	Don't perform a selection if we already have the correct panel selected.	2017-04-28 20:31:09 +09:00
Naeferith	2a269dbc5a	Remove unsused variable + IStateful Implementation	2017-04-28 10:57:59 +02:00
smoogipooo	c95a6fbd09	Use single line for GetUnicodePreference.	2017-04-28 14:14:14 +09:00
Dan Balasescu	658ff61e8a	Merge branch 'master' into locale	2017-04-28 13:51:36 +09:00
EVAST9919	c27909d53c	CI fixes	2017-04-28 05:02:25 +03:00
EVAST9919	eacf2045f0	Initial commit	2017-04-28 04:56:34 +03:00
Dean Herbert	94c259bd59	Remove most usages of DelayReset ButtonSystem requires some more work.	2017-04-27 18:39:40 +09:00
Dean Herbert	59a3e23879	Ensure PlayerInputManager's initial time is transferred at load.	2017-04-27 17:38:00 +09:00
Huo Yaoyuan	3706bc8741	Merge branch 'master' into locale	2017-04-26 19:56:34 +08:00
Huo Yaoyuan	4cb18361c1	Use localisation engine for unicode text.	2017-04-26 19:50:38 +08:00
Dan Balasescu	a243729a54	Merge branch 'master' into fix-mouse-button-disable	2017-04-26 20:43:56 +09:00
Dan Balasescu	f261a077d2	General fixes/cleanup in Player.	2017-04-26 20:37:47 +09:00
Dan Balasescu	08b1d5beb9	Use const where it was inteded.	2017-04-26 20:15:34 +09:00
Dean Herbert	e826f17eb0	Fix get-set mismatch.	2017-04-26 19:25:41 +09:00
Dean Herbert	f48d497737	Fix disabling mouse buttons causing auto to stop working.	2017-04-26 18:56:20 +09:00
Dean Herbert	c2108b7706	Use object initialiser.	2017-04-26 18:32:47 +09:00
Dean Herbert	b6f838f536	Fix potential nullref.	2017-04-26 18:32:40 +09:00
Dean Herbert	4656a7170a	Add very basic lead-in support.	2017-04-26 18:17:25 +09:00
Dean Herbert	9d14b6e1e9	Make SongProgress return the actual time value via OnSeek.	2017-04-26 18:17:17 +09:00
Dean Herbert	01caaf44f3	Add a decoupled clock to allow for lead-in and lead-out time.	2017-04-26 18:16:55 +09:00
Dean Herbert	e003d9fc3c	Add basic replay frame accurate "seeking". Previously we were looping over Update, when we should instead have been looping over UpdateSubTree.	2017-04-25 22:59:58 +09:00
Dean Herbert	d476482493	Add basic seeking support when a replay is loaded.	2017-04-25 22:59:51 +09:00
Dean Herbert	eb5d334838	Add non-toggle support for showing seek bar in SongProgress.	2017-04-25 22:59:46 +09:00
Dean Herbert	30e2e7bfe4	Merge branch 'master' into slider-stuff	2017-04-25 19:42:46 +09:00
Dean Herbert	f93adebc52	Minor style fixes.	2017-04-25 13:33:34 +09:00
ColdVolcano	51c577624b	Remove BeatmapInfo field	2017-04-24 22:59:33 -05:00
Dean Herbert	a850f4bda3	Merge branch 'master' into roompanel	2017-04-25 12:53:49 +09:00
ColdVolcano	1df50adc3a	Post-merge fixes (and CodeFactor fixes)	2017-04-24 22:48:25 -05:00
ColdVolcano	630c556b80	Merge branch 'master' of https://github.com/ppy/osu into intro-improvements	2017-04-24 22:42:28 -05:00
ColdVolcano	e6428dd0c2	Merge branch 'master' of https://github.com/ColdVolcano/osu into intro-improvements	2017-04-24 22:32:10 -05:00
Dan Balasescu	91b264da1a	Merge branch 'master' into info-wedge-design-update	2017-04-25 08:14:59 +09:00
Dan Balasescu	b3e21f6f99	Merge branch 'master' into general-fixes	2017-04-25 08:05:03 +09:00
Dan Balasescu	f329587bd4	Fix mismatched braces.	2017-04-25 08:02:09 +09:00
Dean Herbert	43d09a9734	CI fixes	2017-04-24 20:31:25 +09:00
Dean Herbert	2d6fa711d1	Remove unnecessary base.Update() in PlayerInputManager.	2017-04-24 20:22:21 +09:00
Dean Herbert	c7b789424b	Update BeatmapInfoWedge design - Adds colour difficulty strip. - Adjusts paddings. - Fixes source/artist confusion. - Double dash to em-dash.	2017-04-24 20:19:44 +09:00
Dean Herbert	d84f1f05e2	Add better commenting for ambiguous parameter	2017-04-24 20:16:53 +09:00
Dean Herbert	9670ea9a2a	CI fixes	2017-04-24 20:16:41 +09:00
Dean Herbert	8b048a6706	Fix typo.	2017-04-24 19:33:48 +09:00
Dean Herbert	c55d406b44	Fix nullref possibility.	2017-04-24 19:25:35 +09:00
Dean Herbert	6aa6e5eef7	Store and restore the selected details tab at song select.	2017-04-24 19:25:27 +09:00
Dean Herbert	e1a2f1bc7a	Add beatmap metrics lookup.	2017-04-24 19:17:11 +09:00
Dean Herbert	d6c5654924	Reduce paddings and lock in some fixed heights for BeatmapDetails.	2017-04-24 18:55:49 +09:00
Dean Herbert	4fa22146b8	Increase safety of score lookups when leaderboard isn't visible.	2017-04-24 18:48:28 +09:00
Dean Herbert	ee659e7307	Fix decimal display of beatmap details being too precise.	2017-04-24 18:34:27 +09:00
ColdVolcano	30b7a029dc	Remove for real this time	2017-04-23 00:57:41 -05:00
ColdVolcano	fe35d20def	Remove not needed stuff (+typo fix)	2017-04-23 00:50:02 -05:00
ColdVolcano	094a0f9639	Move MenuMusic logic to MainMenu	2017-04-23 00:36:23 -05:00
Jorolf	1d2f19b5a2	change background dim from integer to double	2017-04-22 18:34:03 +02:00
Dean Herbert	caf3d311cd	Merge remote-tracking branch 'upstream/master' into speed-adjust-mods	2017-04-21 20:55:20 +09:00
Dean Herbert	d94035e9da	Merge branch 'master' into general-fixes	2017-04-21 20:42:46 +09:00
Dean Herbert	3f832731c9	Add DoubleTime, HalfTime and Nightcore support.	2017-04-21 17:33:37 +09:00
Dean Herbert	5fdc9819cf	Add basic UO support (now called Audio Offset).	2017-04-21 16:20:05 +09:00
Dean Herbert	5aa90df819	Allow OsuScreens to decide whether ruleset switching should be allowed. Tidies up ToolbarModeSelector a lot by using DI.	2017-04-21 16:03:59 +09:00
Dean Herbert	4a3ae6937d	Improve the look of ScreenWhiteBox.	2017-04-21 15:41:22 +09:00
Dean Herbert	c7411c47d6	Update User API stuff.	2017-04-20 19:51:28 +09:00
Dean Herbert	1707c2458e	Update exception name.	2017-04-20 12:11:03 +09:00
Dean Herbert	873599b359	Fix conversion regression.	2017-04-20 11:36:50 +09:00
Dean Herbert	a47870b376	Apply Ruleset to Scores. Reduce complexity of score creation.	2017-04-20 11:16:08 +09:00
Dean Herbert	6cf026e5c1	Remove OsuScore and change the way statistics are stored (dynamic dictionary).	2017-04-20 11:03:11 +09:00
Dean Herbert	015eacb3b8	Merge branch 'results-screen' into score-statistics	2017-04-19 20:51:23 +09:00
Dean Herbert	7fe2f6639d	Merge remote-tracking branch 'upstream/master' into results-screen # Conflicts: # osu.Game/Users/User.cs	2017-04-19 20:51:05 +09:00
Dean Herbert	3e48a57e9a	Merge branch 'master' into score-statistics	2017-04-19 20:36:14 +09:00
Dean Herbert	1f7ed72dc6	Update font/size.	2017-04-19 17:32:30 +09:00
Dean Herbert	3b95fbab7d	Add score statistic tracking (osu!).	2017-04-19 16:29:27 +09:00
Dean Herbert	afcd7d7fa0	Format accuracy better in LeaderboardScores.	2017-04-19 16:05:17 +09:00
Dean Herbert	2783f49267	Fix incorrect EndTimes when processing has not been run on HitObjects before the SongProgressGraph is displayed.	2017-04-19 16:05:14 +09:00
Dean Herbert	2f53f2e248	Add license headers.	2017-04-18 22:35:21 +09:00
Dean Herbert	49f4981f1c	Fix CI issues.	2017-04-18 22:28:16 +09:00
Dean Herbert	a0d9c14526	Add temporary means of getting the user which is responsible for a resulting play.	2017-04-18 22:22:14 +09:00
Dean Herbert	2bf560a371	Disable page three for now.	2017-04-18 22:22:14 +09:00
Dean Herbert	e8d55b5bb5	Add back button.	2017-04-18 22:22:14 +09:00
Dean Herbert	4a3fc710c4	Add temporary combo/accuracy display.	2017-04-18 22:22:14 +09:00
Dean Herbert	f1bd64a74d	Adjust colour metrics.	2017-04-18 22:22:14 +09:00
Dean Herbert	32df625d82	Adjust text size and padding.	2017-04-18 22:22:14 +09:00
Dean Herbert	28835bd5bd	Add back comma separator to score display.	2017-04-18 22:22:14 +09:00
Dean Herbert	782019e0c7	Make line gradient correct.	2017-04-18 22:22:14 +09:00
Dean Herbert	886ac1fb40	Add progress graph background and update ruleset references.	2017-04-18 22:22:14 +09:00
Dean Herbert	968d46a10f	whitespace.	2017-04-18 22:22:14 +09:00
Dean Herbert	49fc91cf37	Add an exit transition.	2017-04-18 22:22:14 +09:00
Dean Herbert	72fcc09a98	Add beatmap info and score date. Also adjusts design metrics.	2017-04-18 22:22:14 +09:00
Dean Herbert	7d32cc85c8	Make leaderboard scores clickable.	2017-04-18 22:22:14 +09:00
Dean Herbert	d51b37cb44	Add a basic implementation of the new design results screen.	2017-04-18 22:22:14 +09:00
Dean Herbert	b0f1851e88	Adjust visuals slightly.	2017-04-18 20:52:57 +09:00
Dean Herbert	1071645dca	Flexible cube count (and thus graph height). This also scaled the graph to the height of the maximum value. And much tidying.	2017-04-18 19:25:52 +09:00
Dean Herbert	3b21340e1b	Split SquareGraph out and make SongProgressGraph also able to take a list of Objects.	2017-04-18 18:40:02 +09:00
Dean Herbert	417a5ca713	A bit of renaming.	2017-04-18 18:29:24 +09:00
Dean Herbert	66865c50ad	Remove explicit RelativeSize setting.	2017-04-18 18:10:13 +09:00
Dean Herbert	784ca2300b	Add safety check for when no objects have been assigned.	2017-04-18 18:09:37 +09:00
Dean Herbert	5ba85818db	Combine push logic and adjust transitions a bit more.	2017-04-18 17:07:02 +09:00
Dean Herbert	ddff26d167	Show metadata when loading between retries. Also speeds up the display a bit.	2017-04-18 17:00:58 +09:00
Dean Herbert	edd71c0560	Tidy up and comment PlayerLoader logic.	2017-04-18 16:56:01 +09:00
Dean Herbert	2ccb8b154f	Change conditional ordering to allow player to always run its fadeOut sequence.	2017-04-18 16:47:30 +09:00
Dean Herbert	24deaf05b6	Merge branch 'master' into player-loader-restart	2017-04-18 16:36:25 +09:00
Dean Herbert	64a8992153	Merge branch 'master' into general-fixes	2017-04-18 16:19:52 +09:00
Dean Herbert	fbd26a1d5e	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
ocboogie	1f7373db8f	Removed unneeded restarting variable	2017-04-17 23:52:38 -07:00
ocboogie	2bd89e922f	Removed unneeded newPlayer	2017-04-17 23:48:21 -07:00
ocboogie	c0f4cbcba6	Added back PlayerLoader overlays	2017-04-17 23:36:11 -07:00
Dean Herbert	727086c0b2	Updates in-line with framework.	2017-04-18 15:34:53 +09:00
ocboogie	be8d32688b	Fixed HotkeyRetryOverlay just going to a black screen	2017-04-17 22:36:03 -07:00
ocboogie	5c48fa6cb1	Removed testing line	2017-04-17 21:35:48 -07:00
ocboogie	aa466d0e84	PlayerLoader creates a new instance of the Player class on Restart	2017-04-17 21:32:38 -07:00
smoogipooo	4a60e9299e	Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion	2017-04-18 10:59:43 +09:00
Dean Herbert	8ef675d9b3	Add fallback to allow FilterCriteria to run without a ruleset being set.	2017-04-18 10:55:45 +09:00
smoogipooo	d5c5b7eb6b	Merge remote-tracking branch 'smoogipooo/remove-playmode' into better-conversion	2017-04-18 10:09:36 +09:00
Dean Herbert	6b6690caf7	Fix filtering by ruleset.	2017-04-18 10:04:41 +09:00
Dean Herbert	f2174054ea	Fix song select.	2017-04-18 10:04:32 +09:00
smoogipooo	786446354e	Fix post-rebase errors.	2017-04-18 09:00:53 +09:00
smoogipooo	2767fbd81a	Implement Beatmap conversion testing.	2017-04-18 08:57:09 +09:00
Dean Herbert	928550b1a8	Merge branch 'master' into remove-playmode	2017-04-17 21:01:10 +09:00
Huo Yaoyuan	c235a14e3e	Don't block input in BeatmapInfoWedge.	2017-04-17 17:08:01 +08:00
Dean Herbert	a4e2f34ee7	Make a RulesetDatabase.	2017-04-17 17:43:48 +09:00
ocboogie	78273d76e3	Added basic loading screen and test case	2017-04-16 20:18:41 -07: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	3845ab2a72	Add comment.	2017-04-15 05:55:38 +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
Dean Herbert	9d753a7798	Merge branch 'master' into song-progress-graph	2017-04-14 19:24:13 +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	9bf861d0a4	Merge remote-tracking branch 'upstream/master' into peppy/pause-clean-up # Conflicts: # osu.Game/Screens/Play/FailOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs	2017-04-14 01:07:34 +09:00
Dean Herbert	262a2c9f0e	Add exception for failing.	2017-04-13 19:13:09 +09:00
Dean Herbert	5f8baf874d	Use interpolatedSourceClock's IsRunning value for consistency.	2017-04-13 18:31:23 +09:00
Dean Herbert	1f4e0b0251	Fix MosueUp and HighResolution events not being handled by MenuOverlays.	2017-04-13 13:03:07 +09:00
Dean Herbert	359fea7e25	Improve "escape" pressing logic in pause/fail menus.	2017-04-13 12:40:00 +09:00
Dean Herbert	94bf1d65b6	Fix thread race conditions on pausing close to a fail.	2017-04-13 11:41:08 +09:00
ocboogie	7b240d84da	Merge branch 'master' into master	2017-04-12 15:04:27 -07:00
Dean Herbert	2c3fa30386	Metric -> Metrics.	2017-04-12 21:09:39 +09:00
ocboogie	32b87d12b5	Removed unneeded `using`	2017-04-12 04:54:24 -07:00
Dean Herbert	157ad17606	Merge branch 'master' into details	2017-04-12 20:25:51 +09:00
ocboogie	6c6ef946bd	Some more clean up	2017-04-12 04:01:52 -07:00
ocboogie	d250dde537	Fixed repeat keys working for retrying	2017-04-12 02:50:03 -07:00
ocboogie	348dd71406	Fixed repeat keys working for resuming	2017-04-12 02:43:42 -07:00
Jorolf	98ce9e0724	remove ??	2017-04-12 11:25:32 +02:00
Jorolf	e285d33f8c	fails, retries and size not enforced	2017-04-12 11:05:10 +02:00
Jorolf	d2affe6867	requested changes	2017-04-12 10:52:24 +02:00
ocboogie	8cad09370d	Fixed pause and fail screen overlap	2017-04-12 00:20:41 -07:00
ColdVolcano	50cb9e0fe7	Match stable search parameters	2017-04-11 18:07:54 -05:00
Jorolf	ed2f5d210e	condensed some commits because they were small or already reversed	2017-04-11 22:48:53 +02:00
Jorolf	50b6bcd574	Merge branch 'master' into details	2017-04-11 19:06:58 +02:00
Jorolf	d4e5f55091	the power of linq	2017-04-11 18:43:48 +02:00
Dan Balasescu	3b60ca3c1c	Merge branch 'master' into leaderboard-api	2017-04-12 00:14:24 +09:00
Dan Balasescu	bc98e53aff	I helped.	2017-04-12 00:09:45 +09:00
Jorolf	9026880495	fix	2017-04-11 14:40:12 +02:00
Jorolf	9dd8920c2c	🤔 I hope this works	2017-04-11 14:22:13 +02:00
Jorolf	bfebba3a20	null reference fixes	2017-04-11 14:12:23 +02:00
Jorolf	fb5952186c	changes and fixes	2017-04-11 14:02:56 +02:00
Dean Herbert	1a1607aaaa	Improve the look of the transition on hotkey retry (and retry in general).	2017-04-11 19:58:57 +09:00
Dean Herbert	9732110bd9	Update TransformTo methods in line with framework changes.	2017-04-11 17:25:56 +09:00
Dean Herbert	dc3a2d45fe	Move API lookup from BeatmapDetailArea to Leaderboard.	2017-04-11 16:36:50 +09:00
Dean Herbert	ecfe68d6fb	Hide deprecated API storage variables and populate Score.User automatically.	2017-04-11 16:36:47 +09:00
Jorolf	ad41fd5c1a	more unnecessary stuff	2017-04-10 16:49:48 +02:00
Jorolf	a597149b7f	Merge branch 'details' of github.com:Jorolf/osu into details	2017-04-10 16:42:42 +02:00
Jorolf	24b4b3ad7d	update to everything	2017-04-10 16:42:23 +02:00
Dean Herbert	c6a24bb549	Merge branch 'master' into details	2017-04-10 20:07:13 +09:00
Dean Herbert	43a4657540	Remove unnecessary AlwaysPresent.	2017-04-10 17:26:05 +09:00
Dean Herbert	3a01cfccee	Adjust fade length and easing.	2017-04-10 17:25:56 +09:00
Dean Herbert	15c1013f5b	Don't schedule event, it's unreliable and doesn't match the fade.	2017-04-10 17:25:46 +09:00
Andrey Zavadskiy	7366640b95	Merge remote-tracking branch 'refs/remotes/ppy/master' into key_retry	2017-04-10 09:10:20 +03:00
Dean Herbert	bb4a909de5	Update UI control access in line with framework changes.	2017-04-10 14:54:23 +09:00
Andrey Zavadskiy	1879a05c7b	Removed using	2017-04-10 06:10:12 +03:00
Andrey Zavadskiy	e73f543c4f	Applied suggestions	2017-04-10 06:06:10 +03:00
Andrey Zavadskiy	a7264aa84c	Warning fix	2017-04-09 17:53:16 +03:00
Andrey Zavadskiy	425e96c45c	Moved logic to it's own class	2017-04-09 17:44:19 +03:00
Andrey Zavadskiy	4ab4f65c83	Retry on Tilde key	2017-04-09 16:26:31 +03:00
Jorolf	bcef1ce2b6	replace space in text with Spacing in FillFlowContainer	2017-04-08 13:59:22 +02:00
Jorolf	f7a9a11ae5	Bar uses AccentColour aswell	2017-04-08 13:53:11 +02:00
Dean Herbert	adc16b0727	Merge pull request #608 from Tom94/music-controller-button-animation Music controller button animation	2017-04-08 20:48:39 +09:00
Jorolf	5e56e84c4a	change SRGBColour to Color4 and use IHasAccentColour in some places	2017-04-08 13:31:55 +02:00
Dean Herbert	b5431c496b	Fix osu! logo handling drags for no reason.	2017-04-08 19:34:04 +09:00
Jorolf	c60a55285c	updated TestCase and some null checks	2017-04-07 20:32:09 +02:00
Jorolf	6a87fd6112	retries and fails hide if they're not present	2017-04-07 20:19:03 +02:00
Jorolf	899e559b5c	ratings hide now + remove unnessary stuff	2017-04-07 19:58:49 +02:00
Jorolf	65d9f4fc45	hide MetadataSegments without content and remove fail/retry initialisations	2017-04-07 19:27:14 +02:00
Jorolf	9881889f88	removed some unused stuff	2017-04-07 18:24:36 +02:00
Jorolf	eb4b3772e9	put Bar into its own file and let it only add a background if BackgroundColour is changed	2017-04-07 18:13:55 +02:00
Dean Herbert	0d4f457265	Improve transitions when exiting play mode.	2017-04-07 20:46:35 +09:00
Dean Herbert	54d1afb655	Fade in HitRenderer post entering animation.	2017-04-07 20:38:57 +09:00
Dean Herbert	39175905e4	Fix crashes on completing a taiko map (where a strong his is the last hit in the map).	2017-04-07 16:56:09 +09:00
Dean Herbert	7e99fc47e2	wip	2017-04-07 16:54:54 +09:00
Dean Herbert	1842d80e28	Update test case.	2017-04-07 09:43:08 +09:00
Dean Herbert	12d2102a88	Merge remote-tracking branch 'upstream/master' into song-progress-graph # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Modes/UI/HudOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj	2017-04-07 09:22:18 +09:00
Jorolf	e59c0a770f	Merge branch 'master' into details	2017-04-06 15:42:00 +02:00
Jorolf	28193cbaaa	hide BeatmapDetails on entering the Select screen	2017-04-06 15:39:23 +02:00
Huo Yaoyuan	411988f038	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Huo Yaoyuan	9b1e010dcc	Fix filename mismatch.	2017-04-06 16:05:41 +08:00
Dean Herbert	942699218a	Merge branch 'master' into details	2017-04-06 15:44:43 +09:00
Dean Herbert	7c63c8394b	Remove unnecessary depth setting.	2017-04-06 15:36:03 +09:00
Dean Herbert	a18367454d	InGameOverlay -> MenuOverlay.	2017-04-06 15:34:52 +09:00
Dean Herbert	856696b17e	Fix incorrect verbatim strings.	2017-04-06 15:31:21 +09:00
Dean Herbert	6285f3eea8	Merge branch 'master' into pause_buttons_refactor	2017-04-06 15:00:48 +09:00
Andrey Zavadskiy	0946e42363	removed useless stuff	2017-04-05 22:51:43 +03:00
Andrey Zavadskiy	6a510097df	InGameOverlay fixes	2017-04-05 22:36:03 +03:00
Dean Herbert	4aafc172ca	Allow playfield to specify whether it has a cursor or not.	2017-04-05 17:38:57 +09:00
Dean Herbert	4b1588a21d	Fix correct mode filter not being applied when first entering song select.	2017-04-05 17:33:19 +09:00
Dean Herbert	8173d01d78	Fix crash on changing play mode too early.	2017-04-05 17:26:45 +09:00
Andrey Zavadskiy	f2a9ec0f24	Converted constructor to protected	2017-04-04 19:02:36 +03:00
Andrey Zavadskiy	7b95f2d46a	InGameOverlay now is abstract	2017-04-04 18:53:13 +03:00
Andrey Zavadskiy	62655b70c9	Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor	2017-04-04 18:41:37 +03:00
Jorolf	b2731bb0a1	some formatting	2017-04-04 17:27:08 +02:00
Jorolf	58f8dc8254	add direction to graphs	2017-04-04 17:17:22 +02:00
Dean Herbert	7c74951454	Update bindables. # Conflicts: # osu.Desktop.VisualTests/Tests/TestCaseResults.cs # osu.Game/Screens/Ranking/ResultModeButton.cs # osu.Game/Screens/Ranking/Results.cs	2017-04-04 11:34:13 +09:00
Dean Herbert	f6303d55ec	Upodate some tab usages.	2017-04-04 11:13:09 +09:00
Dean Herbert	d0ebbad0fa	Fix avatar display.	2017-04-04 10:33:41 +09:00
Jorolf	8e689a06d8	change font	2017-04-03 23:03:49 +02:00
Jorolf	5a694e0c9d	changed location of BarGraph to be more generic	2017-04-03 19:29:13 +02:00
Jorolf	f3946bebb4	Merge branch 'master' of git://github.com/ppy/osu into details	2017-04-03 18:33:47 +02:00
smoogipooo	27132958c8	Merge remote-tracking branch 'origin/master' into taiko-drawable-generation Conflicts: osu.Desktop.VisualTests/Tests/TestCaseTaikoHitObjects.cs osu.Desktop.VisualTests/Tests/TestCaseTaikoPlayfield.cs osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj	2017-04-03 14:19:31 +09:00
Dean Herbert	263374a357	Remove unnecessary using.	2017-04-02 17:11:31 +09:00
Dean Herbert	bfa2e68bfb	Container->Wrapper.	2017-04-02 16:17:13 +09:00
Dean Herbert	6f1fff4ee7	Update async load usage to new style.	2017-04-02 15:56:12 +09:00
Andrey Zavadskiy	1ecff1b32c	Fix naming and testcase	2017-04-01 21:50:25 +03:00
Andrey Zavadskiy	f70de7439b	Moved title and description to each class	2017-04-01 21:42:12 +03:00
Andrey Zavadskiy	bd123fa906	Better inheritance	2017-04-01 21:29:17 +03:00
Andrey Zavadskiy	e3a8a14281	Removed unnecessary using	2017-04-01 21:19:49 +03:00
Andrey Zavadskiy	ebc814f06a	Typos fix	2017-04-01 21:17:24 +03:00
Andrey Zavadskiy	3574dac780	Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor	2017-04-01 21:03:19 +03:00
Jorolf	017281246d	changed SpriteText to OsuSpriteText	2017-04-01 18:12:44 +02:00
Jorolf	d0b4f86725	fix errors from merge	2017-04-01 14:16:18 +02:00
Jorolf	072a77b4d9	Merge branch 'master' of git://github.com/ppy/osu into details	2017-04-01 14:12:20 +02:00
Jorolf	e380254386	remove unnecessary code	2017-03-31 22:32:09 +02:00
Jorolf	1f19d72474	removed wrong using >.>	2017-03-31 21:24:05 +02:00
Jorolf	d8bb72dd78	remove unused using-directive	2017-03-31 21:19:23 +02:00
Jorolf	50b8580141	add license header	2017-03-31 21:13:20 +02:00
Jorolf	47698be1f5	Merge branch 'master' into details	2017-03-31 21:10:45 +02:00
Dean Herbert	24d06fa92d	CheckBox -> Checkbox.	2017-03-31 17:38:33 +09:00
Dean Herbert	fa7c72a099	Refactor ReplayInputHandler creation for more flexibility.	2017-03-31 15:59:53 +09:00
Jorolf	0d4f2c59a5	there's probably something in here I overlooked	2017-03-30 17:32:18 +02:00
Jorolf	15326204d5	Merge branch 'master' of git://github.com/ppy/osu into details	2017-03-30 16:38:25 +02:00
smoogipooo	76d0beb64f	Fix custom transform.	2017-03-30 22:28:51 +09:00
Jorolf	a3430dd072	add culture info	2017-03-29 16:10:07 +02:00
Jorolf	cdb3150c56	add readonlies and remove unused using directives	2017-03-29 16:00:29 +02:00
Jorolf	6982529481	Merge branch 'master' of git://github.com/ppy/osu into details	2017-03-29 15:47:00 +02:00
Jorolf	ab4d1c7725	better maxValue calculation for the retry and fail graph	2017-03-29 15:33:36 +02:00
Jorolf	7bd13d76a8	fixes + updates to DetailsBar and a button for the TestCaseDetails	2017-03-29 14:48:43 +02:00
Dean Herbert	6afa6f30cc	Keep selected beatmap in centre of screen post-filter.	2017-03-29 20:01:46 +09:00
Dean Herbert	fa7fd6efe3	Fix mode selector not invoking a re-filter.	2017-03-29 19:48:13 +09:00
Dean Herbert	b96a153e0e	Resize ranks better.	2017-03-29 12:24:04 +09:00
smoogipooo	eed50784ba	Make player work with TaikoHitRenderer.	2017-03-29 11:35:57 +09:00
Dan Balasescu	d7674e2367	Merge branch 'master' into dynamic-recompile	2017-03-29 10:12:48 +09:00
Dean Herbert	ab97967237	Update references and framework.	2017-03-29 09:54:00 +09:00
Dan Balasescu	bca18ce209	Merge branch 'master' into move-easingtypes	2017-03-29 08:14:13 +09:00
Dan Balasescu	e53a5a3521	Merge branch 'master' into avatars-and-login	2017-03-29 07:52:43 +09:00
Jorolf	199c70ff95	Added fails and retries	2017-03-28 20:18:56 +02:00
Jorolf	305bc9cff6	Merge branch 'master' of git://github.com/ppy/osu into details	2017-03-28 17:14:35 +02:00
Jorolf	909fdb647c	Added ratings and different bar rotations	2017-03-28 17:12:54 +02:00
Dean Herbert	f7dc7e9bb9	Update references.	2017-03-28 21:26:20 +09:00
Andrey Zavadskiy	91e18cc63e	Fix usings	2017-03-28 12:12:35 +03:00
Andrey Zavadskiy	cf3db49631	Inherit Pause/Fail overlay from InGameOverlay	2017-03-28 12:09:26 +03:00
Andrey Zavadskiy	687f71e410	Fixes	2017-03-28 11:45:48 +03:00
Andrey Zavadskiy	60be69d3b0	Fixes	2017-03-28 11:41:08 +03:00
Andrey Zavadskiy	85c2184170	Fixes	2017-03-28 11:33:56 +03:00
Andrey Zavadskiy	62693a6a59	Again separate classes	2017-03-28 10:49:58 +03:00
Dean Herbert	4042b94e01	Use DelayedLoadContainer in more places.	2017-03-28 15:28:58 +09:00
Dean Herbert	f690e1d0c4	Move async logic to framework.	2017-03-28 14:24:34 +09:00
Andrey Zavadskiy	9774f826ab	Pause and fail overlays -> StopOverlay	2017-03-28 06:08:31 +03:00
Andrey Zavadskiy	c4500fa270	fixes	2017-03-28 05:19:32 +03:00
Andrey Zavadskiy	110d43bc25	fixes	2017-03-28 05:12:04 +03:00
Andrey Zavadskiy	457f5c6a89	Removed unised using statement	2017-03-28 04:58:30 +03:00
Andrey Zavadskiy	2348b619a3	Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor	2017-03-28 04:55:46 +03:00
Andrey Zavadskiy	5461c6516a	Refactor PauseOverlay, FailDialog -> FailOverlay	2017-03-28 04:53:57 +03:00
Andrey Zavadskiy	2f9a15092b	Refactor pause buttons	2017-03-28 04:52:11 +03:00
Dean Herbert	13272e6995	Make Avatar accept a user. Add UpdateableAvatar to handle the toolbar use-case.	2017-03-28 00:08:26 +09:00
Dean Herbert	0ad070c2d8	Update grade textures.	2017-03-27 22:24:47 +09:00
Jorolf	775fd63d0f	Added difficulty container	2017-03-25 23:33:03 +01:00
Jorolf	d8724e5e3e	Add metadata details	2017-03-24 23:02:24 +01:00
DrabWeb	f0035659db	Unused using	2017-03-24 00:45:19 -03:00
DrabWeb	a6dfed9668	Formatting	2017-03-24 00:41:56 -03:00
DrabWeb	0edee04200	Use OsuColour instead of static colours	2017-03-24 00:41:14 -03:00
Dean Herbert	cb0c7dca71	Merge branch 'master' into taiko_scoreprocessing	2017-03-24 12:25:19 +09:00
DrabWeb	f1f6f2041f	Null track handling in player	2017-03-23 23:57:33 -03:00
DrabWeb	befbc63c35	Merge https://github.com/ppy/osu into song-progress-graph	2017-03-23 23:42:06 -03:00
DrabWeb	b56fb310bf	More cleanup	2017-03-23 23:38:23 -03:00
smoogipooo	2074812f46	Move ScoreProcessor and Score to Scoring/.	2017-03-24 09:51:52 +09:00
DrabWeb	0a11d035fe	Formatting	2017-03-23 09:07:13 -03:00
DrabWeb	b429d8f1b3	More proper fix	2017-03-23 09:05:53 -03:00
DrabWeb	3364801221	Fix for the fix	2017-03-23 08:32:24 -03:00
DrabWeb	bbca6cf602	Fix bottom square being clipped	2017-03-23 08:13:03 -03:00
DrabWeb	938f5eaf58	Dragging	2017-03-23 07:38:08 -03:00
Dean Herbert	63d7c5a5a3	Pressing back while mod select is visible should close mod select before exiting.	2017-03-23 19:35:46 +09:00
Dean Herbert	8c4fd44a85	Tidy up song select footer and fix depth of mod select vs osu! cookie.	2017-03-23 19:32:58 +09:00
DrabWeb	ca2816f9c8	Formatting	2017-03-23 07:24:43 -03:00
DrabWeb	3923892863	Delete SongProgressGraphColumn.cs	2017-03-23 07:20:16 -03:00
DrabWeb	546a3d0914	Merge branch 'song-progress-graph' of https://github.com/DrabWeb/osu into song-progress-graph	2017-03-23 07:15:53 -03:00
DrabWeb	0337f18fb9	Cleaning	2017-03-23 06:37:12 -03:00
Dean Herbert	b5d661b53a	some fixing and restyling.	2017-03-23 18:20:00 +09:00
Dean Herbert	4d61424abd	Merge branch 'master' into song-progress-graph	2017-03-23 17:44:22 +09:00
Dean Herbert	644e9ae9d5	Increase padding to make flyte happy.	2017-03-23 16:36:52 +09:00
Dean Herbert	6bcbd116c8	Only get APIAccess from DI (it's all we need).	2017-03-23 16:32:35 +09:00
Dean Herbert	3ae7d0cb98	Better handle the passing of Beatmap and updating of scores. PresentScores was dangerous as it could potentially bring up unsafe threading scenarios. This ensures everything will work well in all cases.	2017-03-23 16:31:08 +09:00
Dean Herbert	a561611125	Set default tab to global scores. This will need to be saved to the config file eventually.	2017-03-23 16:29:10 +09:00
Dean Herbert	022fd625df	Remove transitions for now If you want to add transitions, the containers should be IStateful so we can discern their state for later use (because I switched to Show/Hide I can use IsPresent for now). We should probably look at moving the VisibilityState portion of OverlayContainer into a new StatefulContainer class or similar, so it can be used in situations like this.	2017-03-23 16:28:45 +09:00
DrabWeb	88d878e1d5	Formatting	2017-03-23 02:47:27 -03:00
DrabWeb	b8129526a4	Typo	2017-03-23 02:29:23 -03:00
Dean Herbert	e77229b34b	Merge branch 'master' into beatmap-detail-tabs	2017-03-23 14:26:00 +09:00
Dean Herbert	681ed38941	Use const whenever possible.	2017-03-23 13:52:38 +09:00
Dean Herbert	54e1b24fe9	Enforce readonly private members where possible.	2017-03-23 13:50:08 +09:00
DrabWeb	b8b45262c5	Formatting	2017-03-23 01:35:55 -03:00
DrabWeb	67421cdf1c	Even though it was 5 minutes ago what was I thinking	2017-03-23 01:34:06 -03:00
DrabWeb	677b8afc1f	Integration	2017-03-23 01:19:29 -03:00
DrabWeb	87b8015e8f	Cleanup	2017-03-23 00:29:28 -03:00
DrabWeb	c173c4b7ee	Tab control	2017-03-23 00:22:31 -03:00
DrabWeb	5ebbc2c0ba	Formatting	2017-03-22 09:33:01 -03:00
DrabWeb	818bdd8e88	SongProgress in HudOverlay	2017-03-22 09:27:04 -03:00
DrabWeb	333008e26d	Formatting	2017-03-22 08:59:44 -03:00
DrabWeb	340ddb59cd	License headers	2017-03-22 08:54:21 -03:00
DrabWeb	29c54d4d8b	Merge https://github.com/ppy/osu into song-progress-graph	2017-03-22 08:50:17 -03:00
Dean Herbert	fbe08436d2	Fix usages of CircularContainer in line with framework changes.	2017-03-22 19:35:03 +09:00
Dean Herbert	f3486b7288	Add correct lifetime expiry for leaderboard content	2017-03-22 09:07:02 +09:00
Dean Herbert	7387dbd9fc	Tidy up LeaderboardScore	2017-03-22 09:04:33 +09:00
Dean Herbert	1699daaf7f	Make DrawableRank safer.	2017-03-22 08:32:28 +09:00
Dean Herbert	8983bbcaad	Merge branch 'master' into leaderboards	2017-03-22 08:24:49 +09:00
Dean Herbert	0b2bb2ea0e	Fix typo in font name declaration.	2017-03-21 22:51:49 +09:00
smoogipooo	d27f37beb5	Hard-code text size in cases it wasn't set.	2017-03-20 13:48:06 +09:00
Dean Herbert	09bf014ded	Simplify fade out gradient code.	2017-03-19 21:49:29 +09:00
Dean Herbert	5d0adc6454	Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards	2017-03-19 18:51:53 +09:00
Dean Herbert	256a3268ac	Inline single usage of EdgeEffect.	2017-03-19 18:51:40 +09:00
Thomas Müller	44f71b3975	Merge branch 'master' into fix-beatmap-options	2017-03-19 09:34:53 +01:00
Dean Herbert	8cb334a118	Adjust sizing a touch.	2017-03-19 16:34:29 +09:00
DrabWeb	b0e7296e25	-IHasDrawableRepresentation, User.Region -> Country	2017-03-19 00:09:58 -03:00
Dean Herbert	3d8ec4fa05	FIx transition not always being correct.	2017-03-19 02:33:25 +09:00
Dean Herbert	3c7b4a8ffa	Fix cursor being displayed during disclaimer.	2017-03-19 01:59:13 +09:00
DrabWeb	0bc8ed9c9e	Use Colour for non-faded scores	2017-03-18 01:56:19 -03:00
DrabWeb	e78069af12	Parenthesis	2017-03-18 01:48:29 -03:00
DrabWeb	b9d5ab5d8c	Only calculate fade for fading leaderboard scores	2017-03-18 01:44:05 -03:00
DrabWeb	fbb8e79f1a	Move ctor above methods	2017-03-17 19:45:51 -03:00
DrabWeb	137611ecf3	Use LeaderboardScore height for fade	2017-03-17 19:07:45 -03:00
DrabWeb	82c02fa1fc	Formatting	2017-03-17 18:29:55 -03:00
Seth	4aea06be22	Merge branch 'master' into leaderboards	2017-03-17 18:23:01 -03:00
DrabWeb	27ab8e2e86	Merge	2017-03-17 18:21:35 -03:00
DrabWeb	0834b5b794	Made requested changes	2017-03-17 18:16:59 -03:00
Dan Balasescu	e529f5e439	Merge branch 'master' into song-select-loading-reoptimisation	2017-03-18 02:12:56 +09:00
smoogipooo	bcaf12e3d9	Rename Criteria -> CreateCriteria and make into method.	2017-03-18 02:11:14 +09:00
Dan Balasescu	cd30958086	Merge branch 'master' into song-select-loading-reoptimisation	2017-03-18 01:25:22 +09:00
Dean Herbert	3e3cde01ef	Fix missing permitNulls.	2017-03-17 21:21:16 +09:00
Dean Herbert	f9f31ca092	Add statefulness to MenuCursor.	2017-03-17 20:45:27 +09:00
Dean Herbert	7110ab8e17	Stop cursor moving when paused.	2017-03-17 20:45:27 +09:00
Dean Herbert	0a03bdc428	Add missing license header.	2017-03-17 20:44:02 +09:00
Dean Herbert	6be80c95ae	Preload song select from main menu.	2017-03-17 20:11:59 +09:00
Dean Herbert	c7fa79b027	Fix nullref.	2017-03-17 20:09:23 +09:00
Dean Herbert	907236e475	Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria.	2017-03-17 19:54:51 +09:00
Dean Herbert	4b97304603	CarouselContainer -> BeatmapCarousel.	2017-03-17 19:12:54 +09:00
Dean Herbert	dc28f8c79e	Remove all external access to BeatmapGroup.	2017-03-17 19:12:15 +09:00
Dean Herbert	9c664e5b05	Reorganise song select methods to allow for more flexibility.	2017-03-17 11:52:54 +09:00
smoogipooo	9a4af8f194	GetScore -> CreateScore.	2017-03-17 02:03:12 +09:00
smoogipooo	2394e7ff78	Make CheckFailed not actually trigger internal things, and make private.	2017-03-17 01:36:30 +09:00
Dean Herbert	ea642e5ef4	Merge branch 'master' into scoreprocessor_failing_improvements	2017-03-17 00:52:30 +09:00
Dean Herbert	e78bcf8739	Update TabControl in line with framework changes.	2017-03-17 00:39:40 +09:00
smoogipooo	b13340c3c8	Move CheckFailed outside of Schedule().	2017-03-17 00:30:23 +09:00
Dean Herbert	60fc782e93	Merge branch 'master' into beatmap_timinginfo	2017-03-16 23:08:24 +09:00
Dean Herbert	271dddc9a7	Merge branch 'master' into generic_scoreprocessor	2017-03-16 23:04:19 +09:00
Dean Herbert	110bdbd0c1	Make everything share DropDown implementations again. Remove unnecessary files.	2017-03-16 21:17:14 +09:00
Dean Herbert	ab8a5afdb9	AlwaysReceiveInput and InternalContains.	2017-03-16 17:38:36 +09:00
smoogipooo	5137338c7c	Replace List<ControlPoint> with TimingInfo in Beatmap.	2017-03-16 17:11:24 +09:00
Dean Herbert	e17f728282	Fix CI.	2017-03-16 17:04:03 +09:00
Dean Herbert	1a7c2eda5e	Size FilterControl relatively now that we can.	2017-03-16 17:01:02 +09:00
Dean Herbert	bd5493fb25	Add back correct defaults.	2017-03-16 16:44:14 +09:00
Dean Herbert	334e389518	Tidy up OsuTabControl and FilterControl.	2017-03-16 16:35:44 +09:00
Dean Herbert	4bedd4d2d7	Block input behind FilterControl.	2017-03-16 14:33:31 +09:00
Dean Herbert	da6b98db10	fixup! Filter doesn't need to be public, nor have a property.	2017-03-16 14:23:48 +09:00
Dean Herbert	269c1a5e5c	Reword some comments.	2017-03-16 14:08:37 +09:00
Dean Herbert	352de22590	Filter doesn't need to be public, nor have a property.	2017-03-16 14:08:29 +09:00
Dean Herbert	4d84bf7350	Change difficulty sort to be based on MaxStarDifficulty.	2017-03-16 13:59:23 +09:00
smoogipooo	2a2caeba32	Add better failing support to ScoreProcessor.	2017-03-16 13:39:57 +09:00
Dean Herbert	ff37d2da03	Index -> Rank + some formatting.	2017-03-16 13:15:06 +09:00
Dean Herbert	8e5d83b857	Isolate leaderboard retrieval code into its own method.	2017-03-16 12:56:59 +09:00
smoogipooo	c82ae011fb	Make ScoreProcessors take generic judgements.	2017-03-16 12:45:23 +09:00
Dean Herbert	a22b34817c	Merge branch 'master' into leaderboards	2017-03-16 11:12:53 +09:00
Drew DeVault	01cca1a4d2	Refactor color handling colour*	2017-03-15 20:52:31 -04:00
Drew DeVault	db5a1e241a	Don't crash on unimplemented sorts	2017-03-15 20:18:20 -04:00
Drew DeVault	3aecbf5739	Rearrange things somewhat	2017-03-15 20:15:40 -04:00
Drew DeVault	cac6c42aac	Merge remote-tracking branch 'upstream/master' into tab-control	2017-03-15 20:15:28 -04:00
DrabWeb	cf81467e13	Move fade start out of loop	2017-03-15 14:00:31 -03:00
DrabWeb	cd37ebdff2	Fading	2017-03-15 13:57:41 -03:00
DrabWeb	efd617dd34	Formatting	2017-03-15 08:53:36 -03:00
DrabWeb	20685d51cd	Adjust delays to start at 0	2017-03-15 08:51:07 -03:00
DrabWeb	847d485d5f	Remove schedules	2017-03-15 08:49:17 -03:00
DrabWeb	aea9a7b795	LeaderboardScore state, initial delay handled by leaderboard	2017-03-15 08:44:29 -03:00
DrabWeb	7572947214	Badge -> Team	2017-03-15 08:09:44 -03:00
Dan Balasescu	a3906820ec	Merge branch 'master' into beatmap_parsing	2017-03-15 19:29:45 +09:00
Dean Herbert	56868e3c06	Make a few more strings literals.	2017-03-15 19:21:55 +09:00
Dean Herbert	f2cfcdb2ca	Force an OnBeatmapChanged event to invoke when entering a screen.	2017-03-15 19:09:30 +09:00
Dean Herbert	1855f48997	Add cancellation support for API requests.	2017-03-15 18:07:26 +09:00
Dean Herbert	295f821025	Add leaderboard to song select.	2017-03-15 17:11:08 +09:00
Dean Herbert	4f95378f27	Add fade out of previously displayed scores.	2017-03-15 17:10:54 +09:00
Dean Herbert	78efecb89d	Remove Alpha 0.001 hack.	2017-03-15 17:07:56 +09:00
Dean Herbert	775a86e798	Add null-checks and fallbacks to make display work with current API version.	2017-03-15 15:22:46 +09:00
Dean Herbert	1ae4c2dfbb	Remove a lot of customisation from Avatar (and add it in individual usages).	2017-03-15 15:22:28 +09:00
Dean Herbert	7bc0a1fdfe	Use fixed-width for score display.	2017-03-15 15:21:07 +09:00
Dean Herbert	dfc4bccbe0	Add some padding to leaderboard.	2017-03-15 14:42:56 +09:00
Dean Herbert	c1f56c7c0e	Scores should be enumerable.	2017-03-15 14:38:38 +09:00
Dean Herbert	15e713899d	Add a left content area to song select.	2017-03-15 14:34:19 +09:00
Dean Herbert	d96a78459d	Rename ScoreRanks to be in line with current API.	2017-03-15 13:55:29 +09:00
Kelvin	4353c9dc3d	Fixed Warnings	2017-03-14 20:42:02 -07:00
Kelvin	18afd8eabe	Fixed license headers	2017-03-14 20:30:42 -07:00
Dean Herbert	253bcebf51	Merge remote-tracking branch 'upstream/master' into leaderboards # Conflicts: # osu.Game/osu.Game.csproj	2017-03-15 12:23:34 +09:00
Kelvin	20e2e7a8c8	Sort on SortTabs ValueChanged	2017-03-14 20:19:41 -07:00
Kelvin	755fb260db	Updated TabControl Usage	2017-03-14 19:52:21 -07:00
Kelvin	ee3d3b682f	Updated usage for DropDownHeader of FilterTabControl	2017-03-14 19:49:40 -07:00
Kelvin	40bcc63a90	Added and styled FilterTabControls	2017-03-14 19:49:40 -07:00
Kelvin	2629f78afc	Add FilterControl and FilterTabControl	2017-03-14 19:49:40 -07:00
Huo Yaoyuan	37ff1f3971	Control footer by virtual property.	2017-03-15 10:10:59 +08:00
DrabWeb	09cb0d6bbc	Proper icons	2017-03-14 12:58:22 -03:00
DrabWeb	94c2734b09	More warnings	2017-03-14 12:15:19 -03:00
DrabWeb	55187a8380	Warnings, accuracy formatting	2017-03-14 11:55:19 -03:00
Huo Yaoyuan	8c991eae01	Fix CI issues.	2017-03-14 22:27:24 +08:00
DrabWeb	4c03b62a75	More usings	2017-03-14 11:23:48 -03:00
Huo Yaoyuan	a8d15e616b	Remove parameter of OnSelected.	2017-03-14 22:22:23 +08:00
Huo Yaoyuan	b2dd9afcf3	Update editor workflow and make edit button works.	2017-03-14 22:18:40 +08:00
DrabWeb	ebe48b7c24	Removed D rank	2017-03-14 11:14:27 -03:00
DrabWeb	322446effe	-Unused usings	2017-03-14 11:11:23 -03:00
DrabWeb	650fc7563d	ScoreRank, Avatar to own files, +DrawableRank	2017-03-14 10:58:28 -03:00
Huo Yaoyuan	f068f7c4bd	No footer in EditSongSelect.	2017-03-14 21:51:26 +08:00
Huo Yaoyuan	259d39c6ad	Stop playing the track in editor to avoid unused member warning	2017-03-14 21:28:33 +08:00
Huo Yaoyuan	f97e8ae97f	Fix typo and warnings.	2017-03-14 21:20:38 +08:00
Huo Yaoyuan	c939897a8a	Revert "Auto assign hotkeys for BeatmapOptionsButton." This reverts commit `beb0a8ff03`.	2017-03-14 21:13:57 +08:00
Dean Herbert	8176b4ef77	Fix merge errors.	2017-03-14 22:11:38 +09:00
Dean Herbert	12326f610e	Adjust transition to flyte's liking.	2017-03-14 22:11:29 +09:00
Seth	21a9996225	Merge branch 'master' into leaderboards	2017-03-14 10:07:33 -03:00
DrabWeb	d53f219051	Adjusted score rank size	2017-03-14 10:04:42 -03:00
Huo Yaoyuan	e1cc74bb40	Merge branch 'master' into more-songselect	2017-03-14 20:50:53 +08:00
Huo Yaoyuan	beb0a8ff03	Auto assign hotkeys for BeatmapOptionsButton.	2017-03-14 20:50:43 +08:00
Huo Yaoyuan	35a60a8f7d	Use depth to arrange buttons.	2017-03-14 20:19:05 +08:00
Huo Yaoyuan	618e8e822b	Implement EditSongSelect and MatchSongSelect.	2017-03-14 19:53:20 +08:00
Huo Yaoyuan	3871a350f8	Move BeatmapOptions buttons to derived class and simplify.	2017-03-14 19:38:21 +08:00
smoogipooo	72e1612f32	Null-safety in the case where there are no HitObjects.	2017-03-14 19:44:14 +09:00
Huo Yaoyuan	c4e5eac35b	Move footer stuff to derived.	2017-03-14 18:38:06 +08:00
Huo Yaoyuan	9a4247f67e	Make Footer handles hotkey.	2017-03-14 18:16:04 +08:00
Huo Yaoyuan	c3a0549cdd	Move player specific stuff to derived PlaySongSelect.	2017-03-14 16:58:34 +08:00
Dean Herbert	5c2bf02c9d	Merge branch 'master' into beatmap_parsing	2017-03-14 17:50:00 +09:00
Huo Yaoyuan	fae6afa9e3	Create basic SongSelect class.	2017-03-14 16:44:35 +08:00
Huo Yaoyuan	0198593697	Make BeatmapInfoWedge:OverlayContainer and unify transforms.	2017-03-14 16:29:20 +08:00
Dean Herbert	14b22445fa	Merge remote-tracking branch 'upstream/master' into general-fixes # Conflicts: # osu.Game/Modes/UI/HitRenderer.cs	2017-03-14 16:15:26 +09:00
Dean Herbert	1f68731a09	Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter).	2017-03-14 16:00:35 +09:00
smoogipooo	854212a7aa	Merge branch 'master' into beatmap_parsing Conflicts: osu.Desktop.VisualTests/app.config osu.Game.Modes.Catch/CatchRuleset.cs osu.Game.Modes.Mania/ManiaRuleset.cs osu.Game.Modes.Mania/app.config osu.Game.Modes.Osu/OsuRuleset.cs osu.Game.Modes.Osu/app.config osu.Game.Modes.Taiko/TaikoRuleset.cs osu.Game/Modes/Ruleset.cs osu.Game/app.config osu.Game/osu.Game.csproj	2017-03-14 13:39:19 +09:00
Dan Balasescu	879a78156d	Merge branch 'master' into mod_application	2017-03-14 12:38:55 +09:00
Dean Herbert	0da950beac	Fix KeyCounter M1 M2 display.	2017-03-14 12:31:09 +09:00
Dean Herbert	1eacafc7b4	Merge branch 'master' into general-fixes	2017-03-14 12:02:24 +09:00
Dean Herbert	4fa037c0b2	Update framework.	2017-03-14 12:01:58 +09:00
Huo Yaoyuan	3913a0a9ee	Fix removal of the last one beatmap.	2017-03-14 05:35:58 +08:00
DrabWeb	6bd9e3cac1	+Score ranks	2017-03-13 18:34:43 -03:00
Huo Yaoyuan	14a22f032f	Fix beatmap panel removal.	2017-03-14 04:35:43 +08:00
DrabWeb	8e90e05f23	Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static	2017-03-13 12:31:46 -03:00
DrabWeb	442a2c97db	Merge conflicts	2017-03-13 09:44:22 -03:00
DrabWeb	dbc8d513f9	Merge https://github.com/ppy/osu into leaderboards	2017-03-13 09:36:16 -03:00
DrabWeb	9912f5f9e1	Team -> Region, +IHasDrawableRepresentation, +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay -> LeaderboardScore	2017-03-13 09:33:25 -03:00
smoogipooo	f50e0bbf3c	Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use.	2017-03-13 19:15:25 +09:00
Dean Herbert	14a6129675	Merge branch 'master' into roompanel	2017-03-13 16:41:14 +09:00
smoogipooo	c0e29652a6	Initial attempt at making mods apply better.	2017-03-12 22:13:43 +09:00
smoogipooo	64aab090d5	Instantiate HitRenderer with WorkingBeatmap.	2017-03-12 18:03:13 +09:00
smoogipooo	529cabb001	Make HudOverlay not dependent on Ruleset.	2017-03-10 16:16:07 +09:00
smoogipooo	4015b87965	General fixes.	2017-03-10 13:09:50 +09:00
smoogipooo	31f6cbd8cf	Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets.	2017-03-10 12:14:13 +09:00
Dean Herbert	d7497330b2	Reduce warning/suggestion count to zero.	2017-03-09 15:52:40 +09:00
Dean Herbert	da751804b6	Reduce error count.	2017-03-09 14:24:16 +09:00
Dean Herbert	01c379da19	User invariant culture sorting.	2017-03-09 14:02:20 +09:00
Dean Herbert	9772f2a042	Update framework.	2017-03-09 13:50:33 +09:00
Dean Herbert	5a42035f88	Update license headers.	2017-03-08 15:50:52 +09:00
Dean Herbert	02cab41d34	Move InputManager to a higher and more implicit level. Also makes KeyCounterCollection work with replays.	2017-03-07 19:30:48 +09:00
Dean Herbert	5cbcf7a20a	Fix error-level inspections.	2017-03-07 14:31:54 +09:00
Dean Herbert	4430255ec4	Merge remote-tracking branch 'upstream/master' into replay # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs # osu.Desktop/OsuGameDesktop.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs # osu.Game/Database/BeatmapDatabase.cs # osu.Game/Graphics/Cursor/OsuCursorContainer.cs # osu.Game/IPC/BeatmapImporter.cs # osu.Game/Modes/Mod.cs # osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs # osu.Game/Modes/UI/Playfield.cs # osu.Game/Screens/Play/Player.cs # osu.Game/Screens/Play/PlayerInputManager.cs	2017-03-07 13:50:08 +09:00
Dean Herbert	1751532a01	Fix a few regressions.	2017-03-07 13:30:36 +09:00
Dean Herbert	0cad5d7d41	Fix most warnings.	2017-03-07 13:05:57 +09:00
Dan Balasescu	bc74f453aa	Merge branch 'master' into replay	2017-03-07 11:41:16 +09:00
Thomas Müller	9b92e99ce9	Merge branch 'master' into increase-ci-strictness	2017-03-06 21:44:39 +01:00
Dean Herbert	57cbecba83	Required changes for framework merge (https://github.com/ppy/osu-framework/pull/554 ).	2017-03-06 22:08:02 +09:00
Dean Herbert	88f3dc0e02	Fix a few naming issues.	2017-03-06 18:49:23 +09:00
Dean Herbert	9908c1905d	Add keyboard shortcuts at song select for mod/random/options.	2017-03-06 17:32:12 +09:00
Dean Herbert	e356758a7d	Don't expicitly set origin of TextAwesome.	2017-03-06 17:06:48 +09:00
Dean Herbert	76ef8c1a6c	Add bindable mods and autoplay support.	2017-03-06 14:52:37 +09:00
Dean Herbert	faf07ab51a	Use generics everywhere.	2017-03-06 13:59:11 +09:00
Dean Herbert	81cc27e104	Fix typo.	2017-03-06 10:06:25 +09:00
Dean Herbert	7afcac3660	Move PreferredPlayMode to WorkingBeatmap.	2017-03-05 17:45:40 +09:00
Dean Herbert	4e4408cd20	Merge branch 'master' into replay # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs	2017-03-05 17:45:03 +09:00
DrabWeb	5719c6656a	Update to work with latest framework	2017-03-04 22:38:01 -04:00
DrabWeb	9cde20ffc7	Merge https://github.com/ppy/osu into leaderboards	2017-03-04 22:33:05 -04:00
DrabWeb	b02e413e56	Removed LeaderboardFade fully	2017-03-04 22:30:48 -04:00
DrabWeb	269c139d2a	Flags(redoing later), glowing text, proper Score and User usage	2017-03-04 22:29:52 -04:00
Naeferith	89a443fb92	Lobby's Room Panel	2017-03-04 23:49:47 +01:00
Thomas Müller	73fef85b12	Remove unnecessary usings	2017-03-04 19:43:59 +01:00
Thomas Müller	a14bdf8624	Use Color4Extensions from Framework and remove redundant Name	2017-03-04 19:42:37 +01:00
Jorolf	7eebee36ab	Merge branch 'master' into moarOptions	2017-03-04 16:11:27 +01:00
Thomas Müller	a3f1cb2232	Merge branch 'master' into update-flow	2017-03-04 15:35:53 +01:00
Jorolf	5c5066e1ae	renamed local groups	2017-03-04 15:30:14 +01:00
Dean Herbert	e12d89529c	Merge remote-tracking branch 'upstream/master' into update-flow	2017-03-04 23:28:39 +09:00
smoogipooo	112545f135	Fix unnecessarily throwing exception if there's no last drawings results file.	2017-03-04 23:24:32 +09:00
Dean Herbert	00fdffe9c8	Update framework (and fix non-conforming anchors in FillFlowContainers).	2017-03-04 23:24:13 +09:00
Dean Herbert	389635c7ed	Avoid panel state changes when performing a sort.	2017-03-04 22:05:16 +09:00
Dean Herbert	8f3621ca24	Make selectGroup a private method.	2017-03-04 22:05:02 +09:00
Dean Herbert	7a6a614358	Don't show pause menu when watching replays.	2017-03-04 21:35:26 +09:00
Thomas Müller	a2317e5a1e	Update usage of FillDirection	2017-03-04 11:00:17 +01:00
DrabWeb	d1bad34434	Enter animation, remove testing mod icons	2017-03-04 05:01:55 -04:00
Thomas Müller	a2b79de672	Add comments to CarouselContainer	2017-03-04 09:34:39 +01:00
Thomas Müller	aaa1f766af	Fix beatmap removal	2017-03-04 09:34:28 +01:00
Thomas Müller	9bddd1ed4b	Fix broken CarouselContainer animations The previous commit broke animations of difficulty panels when selecting beatmaps. This commit fixes these.	2017-03-04 09:33:24 +01:00
DrabWeb	d6f53c8b77	Moved test data to visual test	2017-03-04 04:05:31 -04:00
Thomas Müller	a97a7f1024	No more custom lifetimelist in CarouselContainer	2017-03-04 08:54:14 +01:00
DrabWeb	a112b354f0	Basic implementation of score UI	2017-03-04 03:37:34 -04:00
Dean Herbert	adb6f01e39	Create class hierarchy for Score/Replay storage.	2017-03-04 15:32:41 +09:00
Dean Herbert	9e1383fa48	Merge remote-tracking branch 'upstream/master' into replay # Conflicts: # osu.Game.Modes.Catch/CatchRuleset.cs # osu.Game.Modes.Mania/ManiaRuleset.cs # osu.Game.Modes.Taiko/TaikoRuleset.cs # osu.Game/Screens/Play/Player.cs	2017-03-04 13:17:01 +09:00
Jorolf	b9e4c920c5	SelectRandom doesnt select hidden groups now	2017-03-03 21:11:38 +01:00
Dean Herbert	6f3b59268a	Merge pull request #385 from DrabWeb/mod-overlay Mod select	2017-03-03 21:09:08 +09:00
Dean Herbert	dc6a728cce	Merge branch 'master' into tournament_drawings	2017-03-03 20:48:07 +09:00
Dean Herbert	38a9e820e6	GroupsContainer -> GroupContainer.	2017-03-03 20:46:07 +09:00
Dean Herbert	bc01935a89	Move around some namespaces.	2017-03-03 20:42:22 +09:00
Dean Herbert	2ac248c7d0	Use OsuSpriteText.	2017-03-03 20:29:39 +09:00
Dean Herbert	1ea1118db6	Simplify file reading.	2017-03-03 20:24:34 +09:00
Dean Herbert	4a109fcc55	Remvoe ctor argument and fallback to storage-based TeamList if no custom list has been provided.	2017-03-03 20:21:11 +09:00
Dean Herbert	ca73b77a9a	Tidying code.	2017-03-03 20:08:32 +09:00
Dean Herbert	41cefd1cb3	xmldoc commenting.	2017-03-03 20:08:21 +09:00
Dean Herbert	c3cb225eef	Fix being able to stop rotation when it isn't started.	2017-03-03 20:07:57 +09:00
smoogipooo	5a4d07d770	Better way to initialize team lists.	2017-03-03 18:47:56 +09:00
smoogipooo	890066dae4	Use sprite visualiser lines instead of shader.	2017-03-03 18:47:22 +09:00
smoogipooo	54993b874f	Fix idle and stopping -> stopped state.	2017-03-03 18:45:04 +09:00
smoogipooo	2a49200008	Nothing to see here.	2017-03-03 18:02:02 +09:00
smoogipooo	b2661be0b2	Fix setting same state multiple times.	2017-03-03 17:59:16 +09:00
DrabWeb	9d75ab85e9	Put mod select over beatmap options	2017-03-03 04:19:03 -04:00
Seth	fde509ab1d	Merge branch 'master' into mod-overlay	2017-03-03 04:12:42 -04:00
Dean Herbert	bdb130fabc	Avoid using right-to-left fill direction for now.	2017-03-03 16:54:59 +09:00
Dean Herbert	47845a7fbd	Fix button input handling.	2017-03-03 16:54:43 +09:00
smoogipooo	7cac2680b1	Make test case add test drawings file.	2017-03-03 16:33:40 +09:00
Dean Herbert	b0ee728528	Remove full-screen background layer and add half-height holder. Doesn't interact well with dialog popups. May add back later with complementing logic.	2017-03-03 16:11:23 +09:00
smoogipooo	1d1c08125b	Further safety checking.	2017-03-03 16:01:24 +09:00
smoogipooo	777996d884	Rewrite VisualiserLine + add VisualiserContainer.	2017-03-03 15:43:16 +09:00
smoogipooo	a70b1ae108	Use a singular FlowContainer for teams.	2017-03-03 15:12:26 +09:00
smoogipooo	04dd24b04b	OnTeamSelected + async changes.	2017-03-03 14:51:19 +09:00
smoogipooo	3ae55933c4	Remove game dependency.	2017-03-03 14:11:47 +09:00
smoogipooo	d96345e408	s/internalPeriod/_period	2017-03-03 14:11:37 +09:00
Seth	1891bdf51e	Merge branch 'master' into mod-overlay	2017-03-03 01:11:15 -04:00
smoogipooo	e6d911e49b	Move modified key conditional location.	2017-03-03 14:08:37 +09:00
Dean Herbert	fb6c25edf8	Fix more silly hacks.	2017-03-03 13:58:46 +09:00
Dean Herbert	2e01857782	Better constants.	2017-03-03 13:58:46 +09:00
Dean Herbert	00b139b3df	Remove hack (fixed at framework level).	2017-03-03 13:58:46 +09:00
Seth	2e74b4be60	Merge branch 'master' into beatmap-options	2017-03-03 00:52:45 -04:00
smoogipooo	3174b56e28	Add license headers.	2017-03-03 13:17:24 +09:00
smoogipooo	959a3d49be	Post-merge fixes.	2017-03-03 13:17:16 +09:00
Dan Balasescu	09a2d39e3e	Merge branch 'master' into tournament_drawings	2017-03-03 13:06:18 +09:00
smoogipooo	efb13b29d1	General cleanups.	2017-03-03 13:01:57 +09:00
smoogipooo	d0894bbc9b	Use storage instead of raw file access.	2017-03-03 12:59:58 +09:00
smoogipooo	b7b36b6306	Unused.	2017-03-03 12:59:31 +09:00
smoogipooo	d6c1f82105	Make visualiser lines have no separation.	2017-03-03 12:59:19 +09:00
smoogipooo	d222c523a1	Exit drawings if no drawings.txt file.	2017-03-03 12:43:48 +09:00
smoogipooo	26b81a14cf	Ctrl+Shift+D at main menu to open up drawings, until we get a permanent place for it.	2017-03-03 12:42:19 +09:00
smoogipooo	062d8ddc7c	Don't handle menu buttons when Shift or Ctrl or Alt is pressed.	2017-03-03 12:41:45 +09:00
smoogipooo	febdfd5de4	Make groups fill up in round robin way, rather than sequentially.	2017-03-03 12:06:35 +09:00
Dean Herbert	78a0bce3bb	Merge pull request #423 from peppy/general-fixes Move PauseOverlay to correct namespace.	2017-03-03 11:32:42 +09:00
DrabWeb	f872330902	Fix BeatmapDeleteDialog namespace	2017-03-02 21:28:05 -04:00
DrabWeb	7a4b9c5571	osu.Game.Overlays.BeatmapOptions -> osu.Game.Screens.Select.Options	2017-03-02 21:20:30 -04:00
Dean Herbert	3a8246f56d	Move PauseOverlay to correct namespace.	2017-03-03 10:17:39 +09:00
DrabWeb	223962121e	Refactor not just rename	2017-03-02 09:26:29 -04:00
DrabWeb	1eeb4aa875	Missed some	2017-03-02 09:21:16 -04:00
Dean Herbert	ecd3453774	Fix potential nullref.	2017-03-02 22:17:14 +09:00
DrabWeb	536925c77a	Comply to naming conventions	2017-03-02 09:15:53 -04:00
Dean Herbert	f9b87ad08c	Fix selection on entry to song select. Also only shows sets with beatmaps for current play mode.	2017-03-02 22:02:32 +09:00
Dean Herbert	9ea83230aa	Formatting fixes.	2017-03-02 22:01:53 +09:00
DrabWeb	b856fb5991	Implemented beatmap options overlay	2017-03-02 08:40:55 -04:00
Dean Herbert	e399d6c6d1	Use bindable for PlayMode.	2017-03-02 21:16:58 +09:00
Dean Herbert	471b9daa93	Merge branch 'master' into mod-overlay # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/osu.Game.csproj	2017-03-02 20:27:04 +09:00
Dean Herbert	435e845067	Merge branch 'master' into DrabWeb/song-progress-graph # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Overlays/Pause/PauseProgressBar.cs # osu.Game/Overlays/Pause/PauseProgressGraph.cs # osu.Game/osu.Game.csproj	2017-03-02 20:20:27 +09:00
Dean Herbert	51950eef43	Merge branch 'master' into master	2017-03-02 18:06:31 +09:00
Dean Herbert	ff5f0af2d3	Merge branch 'master' into popup-dialog	2017-03-02 16:42:20 +09:00
Dean Herbert	c4ca18eeba	Remove references to PassThrough.	2017-03-02 16:28:51 +09:00
DrabWeb	367d6d694c	Merge https://github.com/ppy/osu into mod-overlay	2017-03-02 01:44:18 -04:00
smoogipooo	b0d5d88fe9	Fix slight threading scheduling issue.	2017-03-02 12:26:42 +09:00
smoogipooo	1a4f0a92a5	Add saving + reloading (to/from drawings_results.txt) functionality.	2017-03-02 12:20:31 +09:00
DrabWeb	6c680825ed	ModSections in Ruleset, fixed toolbar play mode changed not firing	2017-03-01 22:05:52 -04:00
DrabWeb	befdf68abe	Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once	2017-03-01 18:41:00 -04:00
Thomas Müller	4d28696479	FlowDirection -> FillDirection	2017-03-01 20:15:38 +01:00
Thomas Müller	9c853b0465	Update framewörk	2017-03-01 19:33:01 +01:00
Thomas Müller	d46e68b36b	Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor # Conflicts: # osu-framework # osu.Game/Beatmaps/Drawables/BeatmapGroup.cs	2017-03-01 18:05:58 +01:00
Dean Herbert	b6e7e054c3	wankoz	2017-03-01 22:56:20 +09:00
Dean Herbert	58ae9e888d	Basic partial replay support.	2017-03-01 22:04:20 +09:00
smoogipooo	35d246b59d	Merge remote-tracking branch 'origin/master' into tournament_drawings	2017-03-01 19:32:33 +09:00
DrabWeb	d5d8352b62	Testing build	2017-02-28 17:09:31 -04:00
Jorolf	61cbcfd597	Merge branch 'master' into pluginManager	2017-02-28 20:34:56 +01:00
Jorolf	522034020e	Moved Bindable init	2017-02-28 11:44:12 +01:00
DrabWeb	570c95cb98	Merge https://github.com/ppy/osu into mod-overlay	2017-02-28 02:22:59 -04:00
DrabWeb	ce1798b8bc	DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay	2017-02-28 02:09:36 -04:00
DrabWeb	50d172be39	Added DialogManager(not wired up for desktop project yet)	2017-02-28 00:59:36 -04:00
Dean Herbert	e60cead483	Merge remote-tracking branch 'upstream/master' into warning_fixes	2017-02-28 13:49:19 +09:00
DrabWeb	fbd9523596	Added beatmap delete dialog	2017-02-27 23:19:28 -04:00
smoogipooo	1e15318da6	Add background.	2017-02-28 10:26:37 +09:00
Jorolf	8b3477820f	Disable mousewheel while playing	2017-02-28 00:08:34 +01:00
default0	03889e6ca6	Update References to FlowStrategies References now use the Create-names instead of the outdated Get-names to create instances of FlowStrategies.	2017-02-27 16:55:55 +01:00
smoogipooo	44f3dfa3fe	Make it display by default.	2017-02-27 23:38:37 +09:00
Andrey Zavadskiy	3487dfe236	Removed unused variables and parameters	2017-02-27 17:32:32 +03:00
smoogipooo	fc33bf4761	Add drawings config.	2017-02-27 23:29:18 +09:00
smoogipooo	9d731af01b	Finish it up, slightly hackishly, but that's ok.	2017-02-27 23:29:17 +09:00
smoogipooo	5f3e484353	Add scrolling teams container.	2017-02-27 23:29:06 +09:00
Dean Herbert	e8b027130f	Remove unused variable.	2017-02-27 23:17:21 +09:00
Alex Amadori	8b336156f0	Merge remote-tracking branch 'upstream/master'	2017-02-27 14:55:44 +01:00
Dean Herbert	afdb95f4d5	Fix even more test regressions.	2017-02-27 20:39:04 +09:00
Dean Herbert	4da09713a9	Fix test case regression.	2017-02-27 18:09:27 +09:00
Dean Herbert	68dd3c02aa	Fix failing testcase (nullref).	2017-02-27 17:05:12 +09:00
Dean Herbert	7c602a2af3	Update framework.	2017-02-27 15:55:57 +09:00
smoogipooo	25a1c7a8ad	Initial groups implementation.	2017-02-27 14:19:07 +09:00
Dean Herbert	47997c20ad	Weld -> BindWith.	2017-02-27 12:24:53 +09:00
default0	8d91519d59	Update usage of FlowContainer and its subclasses	2017-02-26 21:32:43 +01:00
Dean Herbert	bc231c6bd4	Remove dispose which is no longer necessary.	2017-02-26 22:08:29 +09:00
Dean Herbert	c227eb1be5	Welded bindables.	2017-02-26 22:08:21 +09:00
Dean Herbert	c5ad79e3e2	Remove unnecessary schedule.	2017-02-26 21:15:33 +09:00
Thomas Müller	1585ae842a	Update framework	2017-02-26 11:22:58 +09:00
Dean Herbert	17a28cd3b6	Don't push Player if we aren't still current.	2017-02-25 11:46:19 +09:00
Dean Herbert	7483b69477	Remove unnecessary Dispose logic.	2017-02-25 10:44:19 +09:00
Thomas Müller	4aecd59c74	Merge branch 'master' into fix-memory-leak	2017-02-24 19:54:14 +01:00
Thomas Müller	f7d985fe18	Fix and refactor star difficulty calculation boilerplate Moves star difficulty calculation entry-point to Beatmap, and sets star difficulty at the correct place for song select to display.	2017-02-24 19:36:17 +01:00
Alex Amadori	ace023f0c7	Refactor local vars named in a c-like fashion	2017-02-24 17:08:18 +01:00
Alex Amadori	90b0f035ad	Compute average of star ratings	2017-02-24 17:01:14 +01:00
Alex Amadori	51b6075210	Merge remote-tracking branch 'upstream/master'	2017-02-24 16:54:37 +01:00
Alex Amadori	e2ae03e798	Merge with upstream/master	2017-02-24 16:54:27 +01:00
Dean Herbert	c4fbfb5a8f	Update comment with new knowledge.	2017-02-24 21:46:34 +09:00
Dean Herbert	5096f6b83d	Fix memory leak from Player's InputManager.	2017-02-24 21:01:05 +09:00
Dean Herbert	ea4639932c	Simplify event names.	2017-02-24 17:21:14 +09:00
Dean Herbert	d24403e58e	Remove unused using statement.	2017-02-24 17:20:00 +09:00
Dean Herbert	958bf54c31	Add safe deletion support.	2017-02-24 17:08:13 +09:00
Dean Herbert	6c3bda18b6	Add beatmap deletion support. Note that this is a very naive approach and will result in file access exceptions. This will be fixed in a further commit.	2017-02-24 14:37:54 +09:00
Dean Herbert	3a89348413	Centralise access to WorkingBeatmaps. They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).	2017-02-24 13:43:21 +09:00
Dean Herbert	355bbb6324	SearchTextBox should not handle shift-delete.	2017-02-24 11:44:40 +09:00
Dean Herbert	c5552dfb27	Merge remote-tracking branch 'upstream/master' into remove-usings	2017-02-24 11:29:34 +09:00
Thomas Müller	0264c44a20	Do not shadow Colour in TwoLayerButton Renames Colour to BackgroundColour instead.	2017-02-23 22:33:37 +01:00
Thomas Müller	37bc75a7b6	Remove unused variables	2017-02-23 22:32:49 +01:00
Thomas Müller	2689de0c0c	Update framework and add "Async" suffix to asynchronous methods	2017-02-23 22:32:10 +01:00
Thomas Müller	a5dfa7ab06	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
Seth	b4b88712ad	Merge branch 'master' into mod-overlay	2017-02-23 08:00:24 -04:00
Dean Herbert	6701cd9016	Merge branch 'master' into general-fixes	2017-02-23 17:04:53 +09:00
Dean Herbert	f812641696	Merge pull request #383 from peppy/player-loading-screen Add loading screen.	2017-02-23 17:04:44 +09:00
Dean Herbert	da2bfe6d3c	Framework updates.	2017-02-23 16:42:12 +09:00
Dean Herbert	9746877903	Merge remote-tracking branch 'upstream/master' into mod-overlay	2017-02-23 11:11:52 +09:00
Dean Herbert	7e7bf07d03	Remove unused whitebox.	2017-02-23 11:11:46 +09:00
DrabWeb	99f1f88c75	Merge https://github.com/ppy/osu into mod-overlay	2017-02-22 12:35:55 -04:00
Dean Herbert	aef0eb49a1	Add loading screen.	2017-02-22 21:53:59 +09:00
Dean Herbert	7cda82d016	Space to skip.	2017-02-22 21:28:40 +09:00
Thomas Müller	0d3cc39cbc	Merge branch 'master' into general-fixes	2017-02-22 08:01:34 +01:00
Dean Herbert	2d2660c1c5	Improve transition when retrying a beatmap.	2017-02-22 14:14:37 +09:00
Alex Amadori	3d19199218	Fixed for star difficulty	2017-02-21 18:27:39 +01:00
Alex Amadori	6c161fb167	Merge remote-tracking branch 'upstream/master'	2017-02-21 18:15:46 +01:00
Dean Herbert	afba4fbfad	Merge remote-tracking branch 'upstream/master' into chat-improvement	2017-02-21 15:46:28 +09:00
Thomas Müller	444c3ba817	Merge branch 'master' into difficulty-calculator	2017-02-20 07:38:10 +01:00
Alex Amadori	a0d0c1854b	Merge remote-tracking branch 'upstream/master'	2017-02-19 19:09:55 +01:00
Thomas Müller	417f146386	Add difficulty calculation Adds base classes for difficulty calculations, hooks them up with carousel container, and adds a port of the osu difficulty calculator.	2017-02-19 17:41:51 +01:00
Dean Herbert	520e040396	Add FocusedTextBox abstraction.	2017-02-19 17:59:22 +09:00
Jorolf	a48e4a31a7	Parallax Option works now	2017-02-18 21:34:21 +01:00
Alex Amadori	21cf96ec10	More sorting rookie mistakes	2017-02-18 16:23:13 +01:00
Alex Amadori	f48c83b787	Fix silly sorting mistakes	2017-02-18 15:56:29 +01:00
Alex Amadori	d92382c1aa	Merge remote-tracking branch 'upstream/master'	2017-02-18 15:18:26 +01:00
Alex Amadori	6bbbbd8f96	Implemented sorting in TestCasePlaySong	2017-02-18 15:11:40 +01:00
Dean Herbert	c1194102b1	Remove second sample playback when clicking osu! logo.	2017-02-18 22:33:24 +09:00
DrabWeb	006fb5502d	ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select	2017-02-18 07:28:22 -04:00
Dean Herbert	32ce8cf723	Audio class renames in line with framework changes.	2017-02-18 17:35:04 +09:00
Alex Amadori	1cd93f79b3	General sorting improvements	2017-02-18 07:59:01 +01:00
Dean Herbert	bf33cc6f53	Make disclaimer actually be a thing.	2017-02-18 14:16:46 +09:00
Alex Amadori	6b3ecc28b8	Fixed BeatmapPanels disappearing	2017-02-17 23:32:14 +01:00
Alex Amadori	7dcbefd50f	Implemented basic sorting logic	2017-02-17 17:41:53 +01:00
Dean Herbert	fe3a6248ec	Add better screen hierarchy and placeholder for dev build disclaimer.	2017-02-17 20:07:16 +09:00
Dean Herbert	e6ef9f67aa	GameMode -> Screen.	2017-02-17 19:23:58 +09:00
Dean Herbert	9e8b4d43dd	Improve exit procedure.	2017-02-17 17:25:28 +09:00
DrabWeb	9fc3726925	ModSelector -> ModSelect, added mod descriptions, added per-mode mod selection, changed animations and made the wave mask properly	2017-02-16 18:32:27 -04:00
DrabWeb	0a58fc62db	Added mod selection overlay	2017-02-16 16:05:03 -04:00
Dean Herbert	9a2beb5979	Update Key Counter font.	2017-02-16 22:43:49 +09:00
Dean Herbert	04346dbb92	Make osu! logo at song select correctly handle mouse focus.	2017-02-16 22:24:25 +09:00
Dean Herbert	67105e6dfd	Replace all usage of SpriteText with OsuSpriteText.	2017-02-15 21:37:43 +09:00
Dean Herbert	d570a6d308	Handle cases where HitObjects were not parsed.	2017-02-15 12:38:10 +09:00
Dean Herbert	13ed7db361	Merge branch 'master' into general-fixes	2017-02-15 01:14:25 +09:00
Dean Herbert	f207da6041	Add/update license headers.	2017-02-14 18:17:35 +09:00
Dean Herbert	6fa84f3a81	Merge branch 'master' into disable-unimplemented-options	2017-02-14 08:35:40 +09:00
Dean Herbert	4f9d1a6c39	Visually disable options which aren't yet wired up.	2017-02-14 00:36:50 +09:00
Dean Herbert	343e48c195	Merge branch 'master' into followpoints	2017-02-13 22:23:57 +09:00
Dean Herbert	1aeb48b920	Merge remote-tracking branch 'upstream/master' into osb_loading	2017-02-13 18:22:29 +09:00
Thomas Müller	aaaf7163e0	Update framework.	2017-02-13 17:46:50 +09:00
Thomas Müller	e3f35cd66e	Merge branch 'master' into osb_loading	2017-02-12 12:26:25 +01:00
Dean Herbert	37e75e9a54	Add null check when loading beatmap background.	2017-02-12 16:13:44 +09:00
Dean Herbert	7efa3415a4	Merge branch 'master' into followpoints	2017-02-10 20:59:45 +09:00
Damnae	2d155f6a5c	Bring back the delay to what it was before.	2017-02-10 10:48:25 +01:00
Damnae	6f37c02868	Fix followpoints needing a DelayReset.	2017-02-10 10:07:52 +01:00
Dean Herbert	e23202c449	Merge remote-tracking branch 'upstream/master' into desktop-unit-tests	2017-02-10 17:22:38 +09:00
DrabWeb	c61052d62e	Added toggling the progress bar, added buttons to the visual test	2017-02-09 20:12:15 -04:00
DrabWeb	0327c46d36	Fixed columns not being able to have zero fill	2017-02-09 19:29:12 -04:00
DrabWeb	843b58c8f4	Moved random graph values to test case, added null handling for graph values	2017-02-09 19:08:23 -04:00
DrabWeb	ac6726ee2e	Fixed setting column filled values not updating visually, added gray background to visual test	2017-02-09 18:56:50 -04:00
DrabWeb	4d7766b92b	Added displaying given values to the graph	2017-02-09 18:51:05 -04:00
DrabWeb	7fea233181	Removed gradient from test case, modified DragBar to allow access to what's needed in the progress bar, styled the progress bar	2017-02-09 16:28:40 -04:00
Damnae	a504c73f33	Load beatmap data from an optional osb file.	2017-02-09 15:19:09 +01:00
Andrey Zavadskiy	e06aa44c4c	Warning Fixes	2017-02-09 16:18:08 +03:00
Dean Herbert	829fb2605b	Fix visualtest regression.	2017-02-09 17:47:11 +09:00
Dean Herbert	60e206e587	Merge pull request #336 from Damnae/hitobject_stacking Add hit object stacking.	2017-02-09 17:01:52 +09:00
Damnae	38b25a7df3	Add hit object stacking.	2017-02-09 07:28:40 +01:00
Dean Herbert	faa805e437	Fix SearchTextBox's handling of keyboard input to allow for IME input.	2017-02-09 12:33:24 +09:00
DrabWeb	50f93bc215	Refactoring to SongProgress in osu.Game.Screens.Play, moving out progress bar into it's own class	2017-02-08 16:22:31 -04:00
Dean Herbert	d230c3f9ac	Correct masking layers on song select.	2017-02-08 20:39:17 +09:00
Dean Herbert	050fa7fbe8	Adjust FilterControl to match design and give an absolute height.	2017-02-08 20:30:45 +09:00
Dean Herbert	a7dac15d05	Toolbar is now toggled by the main menu.	2017-02-08 20:30:45 +09:00
Dean Herbert	2e119cd74f	Handle toolbar offsets better.	2017-02-08 20:30:45 +09:00
Dean Herbert	417b0817a9	Improve arrow key redirection at song select.	2017-02-08 15:30:20 +09:00
Dean Herbert	937c065af7	Clear content of SearchTextBox on first escape keypress.	2017-02-08 15:14:15 +09:00
Dean Herbert	bbf8d1000b	Update focus requesting code in SearchTextBox.	2017-02-08 15:13:56 +09:00
Dean Herbert	a6f02106a4	Use new placeholder logic.	2017-02-08 14:08:01 +09:00
Dean Herbert	5a89ba1040	Make OsuTextBox use OsuSpriteText.	2017-02-08 11:22:46 +09:00
Dean Herbert	34a030e3be	Fix race conditions causing menu transitions to look wrong when executed in very fast succession.	2017-02-07 22:19:36 +09:00
Dean Herbert	d06f0cf870	Fix escape not always handling back action correctly at main menu (back button not yet visible).	2017-02-07 22:19:17 +09:00
Dean Herbert	dc5e9dde56	Fix escape key nonsense.	2017-02-07 21:46:13 +09:00
Dean Herbert	8a0887c3c3	Add sound effect to osu! logo clicking.	2017-02-07 21:45:59 +09:00
Dean Herbert	24ba21363e	Make intro->mainmenu work better by delaying interactiveness of osu! logo.	2017-02-07 21:37:34 +09:00
Dean Herbert	e2f680a65f	Change main menu buttons to be activate OnClick.	2017-02-07 20:30:40 +09:00
Dean Herbert	6b011a50d2	Naming standardisation and enforcing.	2017-02-07 16:20:36 +09:00
Dean Herbert	50bd80cb0c	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Dean Herbert	9b9ed32245	Remove all @2x references, updates resource and framework.	2017-02-06 22:19:47 +09:00
Dean Herbert	86205c35a4	Fix weird state changes of footer buttons.	2017-02-06 20:46:53 +09:00
Thomas Müller	8271b139e9	Use the framework's new AlwaysPresent switch instead of setting the alpha to 0.01.	2017-02-05 09:40:58 +01:00
Thomas Müller	6db70f8850	Use MaskingSmoothness to make masked diagonal edges smoother.	2017-02-04 11:06:26 +01:00
Dean Herbert	ddea76927f	Better SearchTextBox focus handling.	2017-02-03 19:12:57 +09:00
Dean Herbert	16a01abc4d	Merge remote-tracking branch 'upstream/master' into options-refactor # Conflicts: # osu.Game/Beatmaps/Drawables/BeatmapPanel.cs # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/KeyCounter.cs	2017-02-03 13:16:07 +09:00
Dean Herbert	4f89cc0784	Merge pull request #298 from peppy/skip-button Make skip button work.	2017-02-03 12:47:53 +09:00
Drew DeVault	52fb345e79	Merge branch 'master' into song-select-filtering	2017-02-02 09:25:27 -08:00
Drew DeVault	437cc834eb	@Tom94 pointed out this problem	2017-02-02 12:23:06 -05:00
Dean Herbert	966121a438	Fix keyboard controls not respecting search filter.	2017-02-02 19:37:35 +09:00
Dean Herbert	0c887d3a46	Fix deselected group remaining visible after search.	2017-02-02 19:24:43 +09:00
Dean Herbert	aec84ae725	Fix laggy animations, incorrect hiding logic.	2017-02-02 19:24:14 +09:00
Drew DeVault	c88a2fbf8a	Replace incorrectly removed background logic I had earlier thought that removing this would solve the weirdness with starting the beatmap on any but the first difficulty, and forgot to replace it when I found the actual cause.	2017-02-01 19:32:30 -05:00
Drew DeVault	5003b3738a	Remove constant boolean expressions	2017-02-01 19:15:22 -05:00
Drew DeVault	3c7c3d1cb9	Tidy up GetEnumerable	2017-02-01 19:12:24 -05:00
Drew DeVault	2d691ca8d5	Use OnChange instead of OnCommit OnCommit only gets fired when focus is lost	2017-02-01 19:12:24 -05:00
Dean Herbert	90fd9d9132	Merge branch 'master' into options-refactor	2017-02-01 14:07:49 +09:00
Dean Herbert	7ce5fc08ee	Merge branch 'master' into skip-button # Conflicts: # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj	2017-02-01 14:05:58 +09:00
DrabWeb	0d53d3c4ff	Fixed quitting not working	2017-01-31 22:33:28 -04:00
Dean Herbert	046732b7e3	Merge remote-tracking branch 'upstream/master' into song-select-filtering	2017-02-01 10:09:14 +09:00
Dean Herbert	ea204ad606	Merge pull request #301 from DrabWeb/pause-overlay Pause overlay	2017-02-01 10:07:12 +09:00
DrabWeb	c92418e000	Made Player.canPause one line	2017-01-31 21:02:58 -04:00
Drew DeVault	b1a55f6b5e	Use OnCommit instead of OnChange simplifies things	2017-01-31 19:48:33 -05:00
Drew DeVault	f740707712	Initialize previousFilter to string.Empty	2017-01-31 19:45:42 -05:00
DrabWeb	13da75f149	Fixed a bug where the user can double press escape to exit the song	2017-01-31 20:44:59 -04:00
Drew DeVault	35a1479fc1	Fix extra click sound effect	2017-01-31 19:37:00 -05:00
DrabWeb	bcd41a2c8f	Moved pause overlay action setting to the initialiser in Player, moved pause overlay displaying be handled in OnExiting instead of OnKeyDown, removed clockWasStarted and used sourceClock.IsRunning instead	2017-01-31 20:28:50 -04:00
Drew DeVault	624d51204f	Fix issue with background on player Not sure why this only happens on my branch, I didn't touch this code.	2017-01-31 19:14:54 -05:00
Drew DeVault	4597a765b8	Fix escape key to exit PlaySongSelect This is less than ideal but is the least disruptive solution. The InputManager itself holds Escape keypresses from getting to anything else if something is focused.	2017-01-31 19:00:54 -05:00
Drew DeVault	637a99e8d0	Merge remote-tracking branch 'upstream/master' into song-select-filtering	2017-01-31 19:00:50 -05:00
DrabWeb	91a5d0b3cf	Made requested changes	2017-01-31 09:17:47 -04:00
Dean Herbert	6b66ecc131	Global shadows and more sane font size setting.	2017-01-31 18:53:52 +09:00
Drew DeVault	acdf64e1f7	Remove code to check for other focused controls	2017-01-30 23:08:24 -05:00
Drew DeVault	5852657205	Refactor out Hidden Also fixes a bug I didn't think about before	2017-01-30 22:35:09 -05:00
Drew DeVault	8d294a4eca	Only grab focus if nothing else has it	2017-01-30 14:03:05 -05:00
Drew DeVault	144a87a247	Fix focus interactions with search text box	2017-01-30 13:56:33 -05:00
Drew DeVault	09680196c9	SearchTextBox: Don't handle Key.{Enter,Left,Right}	2017-01-30 10:16:55 -05:00
Drew DeVault	b32cbdbec2	Relocate enums	2017-01-30 10:07:11 -05:00
Drew DeVault	fb431fd44e	&&=, unnecessary null check	2017-01-30 09:49:58 -05:00
Drew DeVault	9a2cba8520	Use null coalesce operator where appropriate	2017-01-30 09:48:21 -05:00
Drew DeVault	7f3cb381a9	Refactor FilterControl.Search	2017-01-30 09:48:12 -05:00
Drew DeVault	42a2285ef3	Make BeatmapGroup.Hidden more intelligent	2017-01-30 09:47:04 -05:00
Drew DeVault	0a81fdbd10	Update null background handling	2017-01-30 09:44:02 -05:00
Drew DeVault	c00a558cb7	Merge remote-tracking branch 'upstream/master' into song-select-filtering	2017-01-30 09:35:14 -05:00
DrabWeb	740f6e5595	Moved delaying resuming to Player	2017-01-30 09:06:26 -04:00
Dean Herbert	bdbe8501d3	Merge branch 'master' into add-flash-effects # Conflicts: # osu.Game/Overlays/Options/General/LoginOptions.cs	2017-01-30 21:47:05 +09:00
DrabWeb	ad33ae9431	Removed unnecessary change	2017-01-30 06:24:44 -04:00
DrabWeb	015832f242	Changed PauseOverlay to layout with FlowContainers and not positioning, made the retry counter in PauseOverlay have the number bolded, made it so if the player presses escape before the clock is started in Player then Exit is called instead of Pause	2017-01-30 06:14:28 -04:00
DrabWeb	d70cbd37dd	Made the pause progress graph it's own class, to be implemented, made it so the user couldn't double click the pause buttons and made it so the action wasn't called a second time when the mouse button was released, made PopIn and PopOut in PauseOverlay one line each, made Player.IsPaused a public getter with a private getter/setter, implemented restarting in Player	2017-01-30 04:08:14 -04:00
Dean Herbert	2ad9377b37	Adjust carousel radius slightly (flyte wanted it).	2017-01-30 16:55:47 +09:00
Dean Herbert	f0d30cc873	Make triangles opaque.	2017-01-30 16:53:12 +09:00
Dean Herbert	a315db68ab	Remove unused field.	2017-01-30 16:08:31 +09:00
Dean Herbert	9f90b57543	Move BPM calculations to Beatmap.	2017-01-30 16:03:45 +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	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
DrabWeb	28967cf77a	Renamed Player.isPaused to IsPaused, did a small patch suggested for how the player can click through the pause menu onto the Playfield(only partially works, upstream changes need to be made for full functionality), made Retry default to Resume until retrying is implemented, minor cleanups	2017-01-29 05:04:48 -04: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
DrabWeb	582599a8de	Made PauseButton more visually responsive, added force option to Player.Pause, added very basic implementation of the progress bar	2017-01-28 16:55:42 -04:00
Drew DeVault	10897486ba	Merge remote-tracking branch 'upstream/master' into song-select-filtering	2017-01-27 15:41:46 -05:00
DrabWeb	feba3f35ba	Changed the roles of PauseOverlay and player in pausing, PauseOverlay is now only the UI portion and doesn't do things like actually pause the game, and only calls actions and hides itself, whereas Player actually pauses the game and brings up the pause overlay in the first place	2017-01-27 15:28:39 -04:00
DrabWeb	601a5ed39c	Reverted Player to upstream	2017-01-27 14:29:51 -04:00
Dean Herbert	3e7503e860	Make skip button work.	2017-01-27 21:57:22 +09:00
Dean Herbert	420e61fa97	TwoLayerButton	2017-01-27 21:08:36 +09:00
DrabWeb	3ed88ea043	Added PauseOverlay.TogglePaused, renamed OnPlay and similar to OnResume, made Pause and Play public, added proper testing for the visual test(pause button instead of auto-pause, logging actions), made PauseOverlay's fade duration a constant instead of statically typed	2017-01-27 07:11:22 -04:00
DrabWeb	81de5a2097	Made the pause overlay be at -1 depth so it renders on top of everything(used to allow circles to draw on top)	2017-01-27 06:36:43 -04:00
DrabWeb	f35974021a	Set actions for retry/quit, moved setting paused to PopIn and PopOut, added null propogation for the sound samples for PauseButton(sometimes in the visual tests the audio doesn't load for whatever reason), added a gradient to the background of the PauseOverlay visual test(same as the one in the menu button system test), wired up the retry and quit actions in Player, made the quit action quit the map, retry still does nothing	2017-01-27 06:19:52 -04:00
Dean Herbert	5787b43586	wip	2017-01-27 19:14:44 +09:00
DrabWeb	fe265c01cb	Added current work on pause overlay	2017-01-27 05:24:49 -04:00
Dean Herbert	6d44c5c8f1	Move logo colour definitions local to their usage.	2017-01-27 17:57:52 +09:00
Dean Herbert	9b2669e1ae	Add flash when activating the osu! logo.	2017-01-27 17:23:53 +09:00
Dean Herbert	50e4c39e32	Add flash when activating a menu button.	2017-01-27 17:23:53 +09:00
Dean Herbert	a238637990	Move osu! logo colour declarations to palette.	2017-01-27 17:23:53 +09: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
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	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	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	1853bbdda8	Move window/volume configuration to framework level.	2017-01-25 18:44:51 +09:00
Dean Herbert	3a27178bb1	Merge pull request #289 from UselessToucan/JudgementsCapacity Specify ScoreProcessor.Judgements.Capacity	2017-01-23 21:40:00 +09:00
Dean Herbert	ae464fcace	Move Intro logic to OnEntering in line with framework changes.	2017-01-20 16:30:24 +08:00
Drew DeVault	678f0aaa16	Implement filtering with strings	2017-01-17 19:18:15 -05:00
Drew DeVault	75de03bd88	Use OsuColour for green text	2017-01-17 18:26:43 -05:00
Drew DeVault	46e7bcef8c	Improve beatmap import	2017-01-17 17:05:06 -05:00
Drew DeVault	7559fc593a	Use default background on empty song select screen	2017-01-17 16:43:53 -05:00
Drew DeVault	5eb1cda77b	Rename FilterSongSelect, use OsuColour	2017-01-17 16:43:40 -05:00
Drew DeVault	63031fbc3d	Move filter container z depth and add hover fx	2017-01-17 15:41:50 -05:00
Drew DeVault	73e46ee8c0	Initial layout of song select filtering UI	2017-01-17 15:41:50 -05:00
TocoToucan	259c0964fd	Specify ScoreProcessor.Judgements.Capacity in order to avoid List<T> internal auto reallocations	2017-01-16 23:14:35 +03:00
Dean Herbert	ee0b6be84b	Merge pull request #266 from kizayoi/master Add support for old beatmaps	2017-01-16 16:02:22 +08:00
Dean Herbert	4030413291	Merge branch 'refs/heads/SirCmpwn/colors'	2017-01-14 06:52:30 +08:00
Drew DeVault	e81073695f	Implement disable mouse buttons	2017-01-13 17:17:04 -05:00
Drew DeVault	f5f545df62	Refactor OsuColour into injected instance class Which should allow you to change the color palette in the future for skinning purposes.	2017-01-12 23:49:05 -05:00
Drew DeVault	fa007e632d	Refactor colors to palette based design	2017-01-12 16:38:27 -05:00
Drew DeVault	c222be05c0	Add Color4.Opacity and OsuColor.Gray	2017-01-10 13:44:40 -05:00
Drew DeVault	70ecf48ca7	Add central color class I didn't move _every_ color here, but most of them. The ones I left behind are mostly just shades of gray. Closes #126	2017-01-09 17:20:31 -05:00
柯十六夜	ef11c3f389	Add default Beatmap ID	2016-12-21 14:47:56 +08:00
柯十六夜	02f6e46105	Add support for v9 beatmaps	2016-12-20 23:56:49 +08:00
n4b3l	aebe87fefc	better implementation	2016-12-19 16:09:29 +01:00
n4b3l	09f9f86b06	check if dimLevel is null on exit	2016-12-19 14:03:10 +01:00
n4b3l	c614d61b1a	getbpm takes Beatmap instead of WorkingBeatmap	2016-12-18 19:34:20 +01:00
n4b3l	ded6588d3b	minor style fixed	2016-12-18 17:21:05 +01:00
n4b3l	5f893d46c7	style fixes	2016-12-18 16:53:52 +01:00
Thomas Müller	db21fe062e	Merge pull request #252 from n4b3l/background-dim basic background dim	2016-12-18 16:04:10 +01:00
Thomas Müller	66435a515c	Don't async/await song selection since audio operations are now on a separate thread.	2016-12-18 15:19:41 +01:00
n4b3l	df305989d0	use config bindable directly	2016-12-18 10:48:59 +01:00
Dean Herbert	6e10a9bb29	Allow starting maps by clicking an active panel a second time.	2016-12-18 16:59:13 +09:00
Dean Herbert	2cbc528971	Remove janky beatmap info wedge animation, restore pixel snapping.	2016-12-18 16:50:39 +09:00
n4b3l	492581fa50	fixed length.seconds display	2016-12-18 04:03:11 +01:00
n4b3l	f551133b0e	..	2016-12-18 03:56:27 +01:00
n4b3l	3d64bee069	proper round + std bpm	2016-12-18 03:53:26 +01:00
n4b3l	63dd8893d9	bpm as ints	2016-12-18 02:53:43 +01:00
n4b3l	0fbd2d8bc8	removed random enter	2016-12-17 21:03:14 +01:00
n4b3l	224e6a877a	responsive to dim changes	2016-12-17 20:59:41 +01:00
n4b3l	36049cc493	smoother transition	2016-12-17 20:29:20 +01:00
n4b3l	73532b9172	small code improvements	2016-12-17 19:57:58 +01:00
n4b3l	2f708a704d	bpm range added + changed spacing	2016-12-17 19:31:34 +01:00
n4b3l	a04a0a7d2c	fix allignment...	2016-12-17 15:58:51 +01:00
n4b3l	d812a7cb4e	func for icons	2016-12-17 15:53:26 +01:00
n4b3l	c73fbe6e42	Remove unnecessary casts	2016-12-17 15:06:56 +01:00
n4b3l	9e6161b862	better scaling	2016-12-17 12:18:55 +01:00
n4b3l	e31e19f1b8	removed unnecessary padding	2016-12-17 12:04:42 +01:00
n4b3l	376b3df2f8	icons with TextAwesome	2016-12-17 11:57:52 +01:00
n4b3l	590db66b37	remove icons from resource	2016-12-17 11:30:30 +01:00
Dean Herbert	3e42fa4f90	Merge pull request #247 from peppy/song-select-async-player Load player async	2016-12-17 16:05:50 +09:00
n4b3l	b78b40a629	implement icons	2016-12-17 01:58:39 +01:00
n4b3l	ba81222af6	basic background dim	2016-12-16 17:13:24 +01:00
n4b3l	881d58574e	Design improvements	2016-12-16 14:21:12 +01:00
n4b3l	991ad298d9	more beatùa	2016-12-16 04:25:28 +01:00
BuildTools	d37ff8f153	Deleted unnecesary things (I guess)	2016-12-15 17:35:14 -06:00
BuildTools	b788878c95	Unnecesary things were removed (I guess)	2016-12-15 17:28:22 -06:00
BuildTools	a845a897b3	Add Base Preview Time	2016-12-15 17:11:48 -06:00
Dean Herbert	8ce18e8986	Improve song select startup time via better database querying. Also fix difficulty displays.	2016-12-15 22:58:32 +09:00
Dean Herbert	08ef8ed8ea	Add comment about future implementation.	2016-12-15 22:58:18 +09:00
Dean Herbert	8d800dac99	Make Player load async.	2016-12-15 22:58:00 +09:00
Dean Herbert	9557821776	Start a map using enter key.	2016-12-15 22:57:28 +09:00
Dean Herbert	21f993d149	Add ability to navigate song select carousel using arrow keys.	2016-12-15 22:57:14 +09:00
Dean Herbert	c420c55291	Merge branch 'master' into hit-samples # Conflicts: # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs	2016-12-13 17:57:24 +09:00
Thomas Müller	9c4c713aa0	Fix panels that are moving off-screen having an incorrect X coordinate applied.	2016-12-10 11:30:22 +01:00
Dean Herbert	6cfb174f02	Fix exiting results screen returning to player.	2016-12-08 20:03:18 +09:00
Dean Herbert	bbc11c77ca	Add (temporary) transitions to songselect and player.	2016-12-07 20:47:28 +09:00
Dean Herbert	f356640cb7	Add missing licence headers.	2016-12-06 19:07:15 +09:00
Dean Herbert	ef8793ff24	Merge branch 'refs/heads/master' into more-sound-effects	2016-12-06 00:08:45 +09:00
Dean Herbert	7bd9a87bda	Add menu button sound effects.	2016-12-05 21:09:41 +09:00
Dean Herbert	8fc8ca3998	Add song select panel sound effects.	2016-12-05 20:09:56 +09:00
Dean Herbert	ff85ccca6d	Move the actual outro sequence into Intro rather than MainMenu.	2016-12-05 19:34:52 +09:00
Thomas Müller	1e8dc780ab	Use new framework-level triangles.	2016-12-01 19:12:35 +01:00
Dean Herbert	22905d2033	Align logo correctly between intro and main menu. Kinda hacky but will do for now.	2016-12-01 21:59:32 +09:00
Dean Herbert	2342a17dbc	Move BufferedContainer usage to allow ripple to blend correctly with the background layer.	2016-12-01 21:29:14 +09:00
Dean Herbert	511dab32ef	Remove masking from Triangles to simplify OsuLogo masking hierarchy.	2016-12-01 21:12:37 +09:00
Dean Herbert	4b74ea7586	Separate logo hover and bounce into separate containers to fix consecutive actions.	2016-12-01 20:52:26 +09:00
Dean Herbert	1f370fe29c	Add animated osu! logo.	2016-12-01 20:21:14 +09:00
Dean Herbert	c26587ec3a	Update depth comparer name.	2016-11-30 15:50:48 +09:00
Dean Herbert	5101297f53	Add drop shadows to main menu buttons.	2016-11-30 15:02:53 +09:00
Dean Herbert	476168eec2	Add shadow to main menu button/icon text.	2016-11-30 13:15:34 +09:00
Dean Herbert	1e037b3eaa	Merge remote-tracking branch 'refs/remotes/upstream/master' into fix-depth	2016-11-30 12:21:12 +09:00
Thomas Müller	d0065d2d20	Merge pull request #205 from peppy/scoring Wire up basic scoring.	2016-11-29 20:56:53 +01:00
Thomas Müller	b12b82fdd3	Fix depth values.	2016-11-29 20:50:12 +01:00
Dean Herbert	74e3a87f78	Add very basic ranking screen.	2016-11-29 23:59:56 +09:00
Dean Herbert	2947121e48	Hook up ScoreProcessor to Scoreoverlay etc.	2016-11-29 21:28:43 +09:00
Dean Herbert	9d2a69f1e2	Add concept of ScoreProcessor.	2016-11-29 20:30:16 +09:00
Dean Herbert	9871960112	Basic score flow.	2016-11-29 17:34:16 +09:00
stanriders	775e8ac5d6	Hardcoded button size, fixed input handling, fixed flash not being visible	2016-11-27 18:56:05 +03:00
stanriders	ba18c9a309	Merged ExtendableButton and BackButton	2016-11-27 05:48:31 +03:00
stanriders	e9343fe53d	Add stable-alike BackButton	2016-11-27 04:21:12 +03:00
Dean Herbert	af18d25357	Move some styling inside BeatmapInfoWedge and fix initial transition happening too early.	2016-11-26 17:31:35 +09:00
Dean Herbert	5764bf8093	Improve IsAlive logic.	2016-11-26 17:22:58 +09:00
Dean Herbert	ebab9d66bf	Merge remote-tracking branch 'refs/remotes/upstream/master' into carousel-fixes	2016-11-26 17:08:40 +09:00
Dean Herbert	82a708d2c0	Merge pull request #189 from SirCmpwn/general-fixes General fixes	2016-11-26 16:56:07 +09:00
Dean Herbert	396ca9fe91	Remove HitJudgementResolver; reimplement in DrawableHitObject.	2016-11-26 16:51:51 +09:00
Dean Herbert	e36a51acf0	Custom LifetimeList (experimental).	2016-11-25 18:30:13 +09:00
Dean Herbert	f9f72f25a2	Add basic flow for hitobject judgement.	2016-11-25 16:26:50 +09:00
Drew DeVault	89effca12e	Remove need for PlaySongSelect ctor to take a db	2016-11-25 00:44:46 -05:00
Dean Herbert	4184dd2329	Change the way we set our initial y position on first display.	2016-11-25 12:50:18 +09:00
Tom94	495cb926f7	Move beatmap panels back to an X of 0 when they are unselected.	2016-11-24 20:25:29 +01:00
Dean Herbert	6c69bd2ba3	Fix regression causing crash on using z/x in player mode.	2016-11-24 21:27:12 +09:00
Dean Herbert	ece3bc0e01	Refactor BeatmapInfoWedge to be async.	2016-11-24 13:48:48 +09:00
Dean Herbert	1eb04ff11e	Don't use the overlay suffix for beatmapInfo wedge.	2016-11-24 13:35:25 +09:00
Dean Herbert	311b5c623c	Adjust difficulty panel offsets slightly.	2016-11-24 13:33:32 +09:00
Tom94	718f2b13a8	Do not change depth value of drawables currently contained within a container.	2016-11-24 13:23:05 +09:00
Tom94	3e4ff27865	Simplify Y position computations and do not scroll to selected beatmap whenever Y positions are recomputed.	2016-11-23 17:42:21 +01:00
Dean Herbert	1e0b7dffc0	Move WedgeBackground to its own class and improve display a bit.	2016-11-23 14:29:20 +09:00
Dean Herbert	622b127180	One missing carousel rename.	2016-11-23 13:28:49 +09:00
Dean Herbert	2e05ec0296	Fix scaling of BeatmapInfoOverlay wedge.	2016-11-23 13:07:35 +09:00
Dean Herbert	611619fd9c	Fix some namespaces.	2016-11-23 12:00:17 +09:00
Thomas Müller	030a20a3f2	Fix minor issues with alpha fading at edges.	2016-11-22 21:58:46 +01:00
Thomas Müller	5cf5e8c80c	Move BeatmapInfoOverlay into its own class. No loading async optimizations yet.	2016-11-22 21:51:42 +01:00
Thomas Müller	9bf23bc4ad	Only handle beatmap panels that are visible in song select.	2016-11-22 21:41:48 +01:00
Thomas Müller	ba1d3ab20e	Carousell -> Carousel	2016-11-22 20:10:25 +01:00
Thomas Müller	2596e71494	Improve smooth movement in beatmap carousel.	2016-11-22 20:10:04 +01:00
Thomas Müller	20be2f4628	Terminate loop through beatmap groups when having found a selection.	2016-11-22 19:00:42 +01:00
Thomas Müller	b22762d0e1	Merge branch 'master' of github.com:ppy/osu into better-song-select	2016-11-22 18:55:13 +01:00
Dean Herbert	4cf2dd90d6	Standardise and simplify the amount of beatmap information passed around song select.	2016-11-22 22:07:15 +09:00
Dean Herbert	ccb00aeb94	Add comment about wedgedBeatmapInfo performance issues.	2016-11-22 21:43:35 +09:00
Dean Herbert	a3234a5269	Avoid synchronous queries in BackgroundModeBeatmap.	2016-11-22 21:22:12 +09:00
Dean Herbert	a251db804c	Stop adding beatmaps to song select when disposed.	2016-11-22 16:13:38 +09:00
Dean Herbert	3e9c398652	Update input handler logic to match framework changes.	2016-11-21 21:36:11 +09:00
Thomas Müller	d32f11b5e2	Smoother movement within song select.	2016-11-21 07:59:46 +01:00
Thomas Müller	318fe2f9d6	Fix broken VisualTests SongSelect.	2016-11-20 20:43:43 +01:00
Thomas Müller	c6d688898f	Initial implementation of a beatmap carousell and various minor improvements to song select. No big optimizations yet, but groundwork is laid out.	2016-11-20 20:34:16 +01:00
Thomas Müller	40805ad32c	Adjust size of wedged background overlay.	2016-11-20 12:29:38 +01:00
Thomas Müller	57e7c7097d	Update framework and add rudimentary fading to song select screen.	2016-11-20 12:16:54 +01:00
Thomas Müller	0fdd505807	Add wedged background overlay to song select.	2016-11-20 10:02:20 +01:00
Thomas Müller	f8788bb24b	Update the background according to the currently selected beatmap and blur it within song select.	2016-11-19 17:39:43 +01:00
Dean Herbert	b61521a93c	Tidy up Player.cs.	2016-11-16 15:48:35 +09:00
Huo Yaoyuan	53deaf2a00	Merge branch 'master'	2016-11-16 10:51:39 +08:00
Dean Herbert	d846246ef2	ShowToolbar -> ShowOverlays; include MusicController.	2016-11-15 20:55:57 +09:00
Dean Herbert	abdfe42388	Merge branch 'refs/heads/master' into better-anchors # Conflicts: # osu.Game.Mode.Osu/UI/OsuComboCounter.cs # osu.Game.Mode.Osu/UI/OsuScoreOverlay.cs	2016-11-15 14:33:13 +09:00
Dean Herbert	5dd4e31011	Move DrawableHitObject.	2016-11-14 19:49:29 +09:00
Dean Herbert	4590be552f	Move play modes to their own projects.	2016-11-14 18:54:24 +09:00
Dean Herbert	06f4f93918	Move play modes to Modes namespace.	2016-11-14 18:03:20 +09:00
Dean Herbert	0f4538f69f	Rename GameModes namespace to Screens.	2016-11-14 17:23:33 +09:00

... 274 275 276 277 278 ...

14841 Commits