4809 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	0842e00f13	Merge branch 'master' into controlpoint-rework	2017-05-24 00:20:15 +09:00
Dean Herbert	d162a2b033	Merge pull request #832 from peppy/menu-music-osz ... Read menu music from osz resource	2017-05-24 00:09:46 +09:00
Dean Herbert	a48a03bf38	Merge branch 'master' into menu-music-osz	2017-05-23 23:56:07 +09:00
Dean Herbert	7e3caa19fd	Merge pull request #837 from EVAST9919/fixes ... Tidy ups	2017-05-23 23:50:44 +09:00
EVAST9919	564abc1a5b	using autosize instead of constant height	2017-05-23 14:32:45 +03:00
EVAST9919	165d6ef1bb	Make transition a bit smoother	2017-05-23 12:30:39 +03:00
Dan Balasescu	2d806c7f11	Merge branch 'master' into menu-music-osz	2017-05-23 18:26:48 +09:00
EVAST9919	2e28b10c36	CI fixes and removed useless property	2017-05-23 12:24:16 +03:00
EVAST9919	c7a241246e	Better letterbox settings transition	2017-05-23 12:09:32 +03:00
smoogipooo	76fe4af9a6	Fix visual test failing.	2017-05-23 18:06:31 +09: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	9cb614fee7	Merge pull request #827 from smoogipooo/mania-note-input ... Implement mania note input	2017-05-23 17:22:59 +09:00
Dean Herbert	836c33cfb0	Merge branch 'master' into mania-note-input	2017-05-23 16:50:01 +09:00
smoogipooo	a4823bca91	CI fixes.	2017-05-23 16:47:47 +09:00
Dean Herbert	fe7ac20e29	Read menu music from osz resource	2017-05-23 16:38:43 +09:00
smoogipooo	7e5bb61a44	Fix line endings.	2017-05-23 16:13:51 +09:00
smoogipooo	1867cbb381	Revert a bit of BeatSyncedContainer for smaller changeset.	2017-05-23 16:06:30 +09:00
smoogipooo	836bf930a0	More cleanups.	2017-05-23 15:29:38 +09:00
smoogipooo	2344f37a3c	Always add TimingChange control points.	2017-05-23 15:26:07 +09:00
smoogipooo	002a0e99a2	Use SortedList + BinarySearch to find control points at time values.	2017-05-23 15:20:32 +09:00
smoogipooo	6bfd7e0fb0	xmldocs.	2017-05-23 14:11:37 +09:00
smoogipooo	ea4a285329	Fix compile errors.	2017-05-23 14:08:15 +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	d1eb8937b7	Merge pull request #828 from smoogipooo/ColdVolcano/beat-syncing ... Add beat syncing container	2017-05-23 11:25:24 +09:00
Dean Herbert	1295b0a7e1	Merge branch 'master' into ColdVolcano/beat-syncing	2017-05-23 10:51:47 +09:00
Dean Herbert	e6e443dbce	Merge pull request #800 from smoogipooo/mania-hitobject-object-conversion ... Mania hitobject object conversion	2017-05-22 21:34:17 +09:00
Dean Herbert	51728e48be	Merge branch 'master' into mania-hitobject-object-conversion	2017-05-22 21:12:00 +09:00
Dean Herbert	9d411fe07b	Merge pull request #815 from huoyaoyuan/sections ... Abstract out SectionsContainer from Settings	2017-05-22 20:09:09 +09:00
smoogipooo	adf8bb853e	Move load() to be directly below ctor.	2017-05-22 20:06:37 +09:00
smoogipooo	de575b3867	Early return if beatLength = 0.	2017-05-22 20:02:02 +09:00
smoogipooo	95c4704a9e	Delay backwards instead of using a millisecond tolerance.	2017-05-22 20:01:28 +09:00
Dean Herbert	b494938145	Merge branch 'master' into sections	2017-05-22 19:55:27 +09:00
Dean Herbert	2e730c6840	Merge pull request #826 from smoogipooo/mania-input-base ... Add basic framework required to implement mania note input	2017-05-22 19:54:59 +09:00
Dan Balasescu	fc90cfa604	Update BeatSyncedContainer.cs	2017-05-22 17:50:05 +09:00
smoogipooo	3235e280a9	Add to csproj.	2017-05-22 17:32:18 +09:00
Dan Balasescu	a438a8b8d3	Merge branch 'master' into ColdVolcano/beat-syncing	2017-05-22 17:27:22 +09:00
smoogipooo	70d7f61f7c	More inversion for logic simplification.	2017-05-22 17:19:39 +09:00
smoogipooo	f81ffa636d	Use BindTo instead of taking the game's beatmap bindable.	2017-05-22 17:18:11 +09:00
smoogipooo	609aac6453	Better kiai mode detection.	2017-05-22 17:18:05 +09:00
smoogipooo	b241140496	Proper kiai mode detection.	2017-05-22 17:18:00 +09:00
smoogipooo	abe9c464a8	Invert if statements.	2017-05-22 17:17:54 +09:00
Huo Yaoyuan	63259a3457	Fix depth of header background. ... Thanks to the order of adding to parent container, the depth value is actually not needed.	2017-05-22 16:00:03 +08:00
Huo Yaoyuan	85684e5fee	Do not scroll headers to when scrolling position is negative.	2017-05-22 15:54:58 +08:00
smoogipooo	4200e05fe7	Don't handle repeat keys.	2017-05-22 16:42:14 +09:00
smoogipooo	7314a9019c	Fix nullref.	2017-05-22 16:39:30 +09:00
smoogipooo	f9eb448f16	Implement DrawableNote hits.	2017-05-22 16:35:15 +09:00
Dan Balasescu	6f00f7f0d0	Update HitWindows.cs	2017-05-22 16:34:38 +09:00
smoogipooo	62c7e97a5f	Add helper method to easily compare time offset to hit windows.	2017-05-22 16:28:44 +09:00
smoogipooo	0f3cf18345	Forgot license header.	2017-05-22 16:15:52 +09:00