1270 Commits

Author	SHA1	Message	Date
Dean Herbert	0dbb2220e0	Add missing early activation to menu flashes	2017-05-24 21:07:12 +09:00
Seth	3094a8267f	Merge branch 'master' into drawable-multiplayer-room	2017-05-24 04:39:57 -03:00
Dean Herbert	45a964cebe	Merge branch 'master' into osu-direct	2017-05-24 15:33:53 +09:00
Dean Herbert	03f9a86366	Add missing readonly	2017-05-24 13:29:12 +09:00
Dean Herbert	16d9a677d0	Add a low-end cutoff for scale adjust	2017-05-24 13:08:59 +09:00
Dean Herbert	a9d1e54c27	Adjust triangle movement based on amplitude	2017-05-24 13:08:54 +09:00
Dean Herbert	4ee11764b8	Merge branch 'master' into osu-direct	2017-05-24 12:16:34 +09:00
Dean Herbert	b1bd88ae71	Merge branch 'master' into logo-beat	2017-05-24 11:41:02 +09:00
Dan Balasescu	90d54a6cfe	Merge branch 'master' into logo-beat	2017-05-24 10:36:30 +09:00
Dean Herbert	87a2cc2004	Merge branch 'master' into menu-flashes	2017-05-24 10:10:29 +09:00
ColdVolcano	207d6e4ac3	Update to new syntax of OnNewBeat	2017-05-23 20:01:20 -05:00
ColdVolcano	c6d744eb7c	Merge branch 'master' of ppy/osu into menu-flashes	2017-05-23 20:00:02 -05:00
Dean Herbert	dee6a1e2be	Merge branch 'master' into songselect-fix	2017-05-24 09:45:34 +09:00
MrTheMake	24f64c8815	More formatting	2017-05-24 02:38:05 +02:00
MrTheMake	67774192dd	Formatting fixes	2017-05-24 02:30:32 +02:00
MrTheMake	0616256bd0	CI fix	2017-05-24 02:23:52 +02:00
MrTheMake	09adb23591	Fix scheduled task not being canceled	2017-05-24 02:22:30 +02:00
Dean Herbert	b477e5cd9e	Fix potential nullref	2017-05-24 02:53:21 +09:00
Dean Herbert	813b09189c	Remove unused parameter	2017-05-24 02:09:31 +09:00
Dean Herbert	7e827c4f11	Add amplitude adjust	2017-05-24 01:45:01 +09:00
Dean Herbert	b12300391b	Merge branch 'master'	2017-05-24 01:17:09 +09:00
Dean Herbert	0842e00f13	Merge branch 'master' into controlpoint-rework	2017-05-24 00:20:15 +09:00
Dean Herbert	a48a03bf38	Merge branch 'master' into menu-music-osz	2017-05-23 23:56:07 +09:00
MrTheMake	0603be5937	Unregister OnBeatmapChanged() when exiting song selection	2017-05-23 15:30:15 +02:00
EVAST9919	178f8127b8	overall fixes	2017-05-23 16:01:00 +03:00
EVAST9919	2e28b10c36	CI fixes and removed useless property	2017-05-23 12:24:16 +03:00
EVAST9919	4b23cc47ea	Moved KeyCounter visibility logic to it's own class	2017-05-23 11:53:42 +03:00
EVAST9919	eafe215169	Simplify Hud visibility change	2017-05-23 11:53:12 +03:00
Dean Herbert	0634a3a5c5	Merge branch 'master' into osu-direct	2017-05-23 17:33:20 +09:00
Dean Herbert	0dd52e4e29	Various refactoring	2017-05-23 17:26:28 +09:00
Dean Herbert	2decb2b2ff	Add more flashiness during kiai time	2017-05-23 16:42:47 +09:00
Dean Herbert	73320f9a7e	Don't bounce the ripple ... Also ripple better.	2017-05-23 16:42:41 +09:00
Dean Herbert	fe7ac20e29	Read menu music from osz resource	2017-05-23 16:38:43 +09:00
smoogipooo	3cdfd2eef5	Split ControlPoint into different types. ... # Conflicts: # osu.Game.Rulesets.Mania/UI/Column.cs	2017-05-23 14:03:40 +09:00
Dean Herbert	3e0aaa1aa0	Add basic beat response to osu! logo	2017-05-23 12:29:43 +09:00
DrabWeb	9798117d53	Move RoomStatus to a class instead of enum	2017-05-22 21:13:57 -03:00
DrabWeb	cf0e7887b5	Unused using	2017-05-22 13:14:56 -03:00
DrabWeb	25b457e994	Proper Bindable usage	2017-05-22 13:05:18 -03:00
DrabWeb	65df2d2b70	MultiplayerRoomStatus -> RoomStatus	2017-05-22 12:46:41 -03:00
DrabWeb	2c16d9c3a7	CurrentBeatmap -> Beatmap	2017-05-22 12:45:40 -03:00
DrabWeb	03f6cded84	MultiplayerRoom -> Room	2017-05-22 12:44:58 -03:00
ColdVolcano	9235cbff8d	Apply suggestions	2017-05-22 05:59:16 -05:00
ColdVolcano	63196df541	Typo fix ... Forgot the pharenteses	2017-05-22 05:05:54 -05:00
ColdVolcano	601b840713	Apply suggestions	2017-05-22 04:55:33 -05:00
ColdVolcano	f2b5be27c8	CI Fixes	2017-05-22 04:53:32 -05:00
ColdVolcano	a1547f12d4	Applied suggestions + Update Framework	2017-05-22 04:38:21 -05:00
ColdVolcano	1ea60fd393	Merge pull request #828 into menu-flashes	2017-05-22 04:15:46 -05:00
EVAST9919	50e3feb761	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-22 09:12:40 +03:00
EVAST9919	d717ccf85e	Settings -> ReplaySettings	2017-05-22 09:07:08 +03:00
ColdVolcano	059af0850b	Changes in-line with framework	2017-05-21 23:47:08 -05:00
DrabWeb	d1df895844	Unused using	2017-05-22 01:16:59 -03:00
DrabWeb	26bf9dd64b	Remove unused Background	2017-05-22 01:13:51 -03:00
DrabWeb	0795089d86	Merge https://github.com/ppy/osu into drawable-multiplayer-room	2017-05-22 01:06:05 -03:00
DrabWeb	82fdf1a918	Bindables, avatars, more cleanup	2017-05-22 01:01:55 -03:00
Dean Herbert	d3495545c5	Merge branch 'master' into songselect-fixes	2017-05-22 12:29:18 +09:00
DrabWeb	e5ee7096f8	Initial cleanup	2017-05-22 00:07:15 -03:00
DrabWeb	c4e6870c12	Merge https://github.com/ppy/osu into roompanel	2017-05-21 22:37:00 -03:00
DrabWeb	bc980b60ac	Add files to project, update with framework changes	2017-05-21 22:36:46 -03:00
MrTheMake	e9c2b51012	Random the difficulty too	2017-05-22 01:59:10 +02:00
MrTheMake	5ef7451dba	Improved LEFTand RIGHT key behaviour	2017-05-22 01:53:36 +02:00
MrTheMake	4056338203	Remove unnecessary track starting	2017-05-21 21:35:49 +02:00
MrTheMake	0539584578	CI fix	2017-05-21 21:33:54 +02:00
MrTheMake	b543b1f9fc	Remove unnecessary restart	2017-05-21 21:20:59 +02:00
MrTheMake	6219b8e6dd	Fixed an error with looping	2017-05-21 20:27:41 +02:00
MrTheMake	974e8d1f82	Fix pressing up always goes to the first beatmap group difficulty, not the last	2017-05-21 19:27:34 +02:00
MrTheMake	9b87f5d8db	Reformating	2017-05-21 18:16:54 +02:00
MrTheMake	6d7f70d0ea	Fix CI warnings	2017-05-21 18:00:31 +02:00
EVAST9919	0615f104f0	SettingsContainer -> SettingsDropdownContainer	2017-05-21 18:22:27 +03:00
MrTheMake	34653eb8c0	Fixed null references	2017-05-21 17:20:20 +02:00
MrTheMake	7db45cb58f	Moved the whole looping assignments inside PlaySongSelect	2017-05-21 17:09:56 +02:00
MrTheMake	ec213efc49	Trimmed whitespaces	2017-05-21 16:13:20 +02:00
MrTheMake	cc35cc281c	Fixed null reference in case there are no beatmaps	2017-05-21 16:10:10 +02:00
MrTheMake	48f4879157	Use the track's implemented looping algorithm to loop tracks in the song select screen	2017-05-21 15:57:41 +02:00
MrTheMake	043d1ed20a	Updated preload condition to handle special case	2017-05-21 14:08:04 +02:00
MrTheMake	662ea0ec2d	Repeat a beatmap's track if it has ended	2017-05-21 14:00:40 +02:00
MrTheMake	1546bbc66b	Updated preload condition.	2017-05-21 13:04:04 +02:00
MrTheMake	44cad4e0ac	Fix a bug that prevents the lowest beatmap group from being selected if it is not completly on-screen.	2017-05-21 03:04:12 +02:00
MrTheMake	33ebc8fd49	Trimmed more whitespaces	2017-05-20 22:23:49 +02:00
MrTheMake	97aadad113	Trimmed spaces.	2017-05-20 22:16:05 +02:00
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