5525 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Dean Herbert	acce59cdb3	Merge pull request #830 from smoogipooo/controlpoint-rework ... Split out ControlPoints into more specific types	2017-05-24 00:41:59 +09:00
Jorolf	7d28290a4a	update framework	2017-05-23 17:35:40 +02:00
Jorolf	7ad10009e6	Merge branch 'master' of git://github.com/ppy/osu into channel-selector-tab-item	2017-05-23 17:32:48 +02:00
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
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	2ca0794b37	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-23 14:45:38 +03: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
smoogipooo	9255297075	Cleanup.	2017-05-23 17:59:45 +09:00
smoogipooo	ae94e6ea85	Redesign hit explosions.	2017-05-23 17:57:34 +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
smoogipooo	25a48d832f	Make kiai time hit object pulse on bar line beats.	2017-05-23 17:36:43 +09: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	9cb614fee7	Merge pull request #827 from smoogipooo/mania-note-input ... Implement mania note input	2017-05-23 17:22:59 +09:00
smoogipooo	4c66157a07	Merge branch 'beat-sync-container-improvements' into taiko-visual-update	2017-05-23 16:51:45 +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	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
smoogipooo	61348ff08d	Restructure playfield so that various elements are masked.	2017-05-23 16:42:17 +09:00
Dean Herbert	fe7ac20e29	Read menu music from osz resource	2017-05-23 16:38:43 +09:00
smoogipooo	27eef9122a	Merge remote-tracking branch 'origin/master' into taiko-visual-update	2017-05-23 16:19:12 +09:00
smoogipooo	7e5bb61a44	Fix line endings.	2017-05-23 16:13:51 +09:00
smoogipooo	aad6f8f5d6	Refactoring of BeatSyncedContainer.	2017-05-23 16:11:46 +09:00
smoogipooo	7066376855	Merge branch 'controlpoint-rework' into beat-sync-container-improvements	2017-05-23 16:07:59 +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	3e0aaa1aa0	Add basic beat response to osu! logo	2017-05-23 12:29:43 +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
DrabWeb	62897d302e	Remove SettingsButton(old and outdated design), fix channel list scrolling under the header	2017-05-22 22:37:25 -03:00
DrabWeb	9798117d53	Move RoomStatus to a class instead of enum	2017-05-22 21:13:57 -03:00
DrabWeb	4681beab5d	CI fixes	2017-05-22 13:22:14 -03:00
DrabWeb	cf0e7887b5	Unused using	2017-05-22 13:14:56 -03:00
DrabWeb	8b505a9e8b	Remove tab character	2017-05-22 13:06:52 -03:00