4738 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
DrabWeb	87cdf5aac6	CI fixes	2017-05-22 01:29:39 -03: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	800a319470	Remove newline	2017-05-22 01:08:35 -03:00
DrabWeb	0c30b2c698	Remove folder from osu.Game.csproj	2017-05-22 01:07:26 -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	f8c419f9ba	Merge pull request #814 from MrTheMake/songselect-fixes ... Fixes to the song select screen	2017-05-22 12:52:36 +09:00
Dean Herbert	d3495545c5	Merge branch 'master' into songselect-fixes	2017-05-22 12:29:18 +09:00
Dean Herbert	0040fbb284	Merge pull request #790 from smoogipooo/mania-endtime-object-conversion ... Mania endtime object conversion	2017-05-22 12:22:33 +09:00
Dean Herbert	b50f9cad44	Merge branch 'master' into mania-endtime-object-conversion	2017-05-22 12:14:53 +09:00
Dean Herbert	ca653ac708	Merge pull request #789 from smoogipooo/mania-distance-object-conversion ... Mania distance object conversion	2017-05-22 12:12:54 +09:00
Dean Herbert	fe70641980	Merge branch 'master' into mania-distance-object-conversion	2017-05-22 12:08:01 +09:00
DrabWeb	e5ee7096f8	Initial cleanup	2017-05-22 00:07:15 -03:00
Dean Herbert	0ff3280bb3	Merge pull request #781 from huoyaoyuan/generic-interface ... More tidy ups	2017-05-22 11:49:24 +09:00
Dan Balasescu	d02aaf0a28	Merge branch 'master' into mania-distance-object-conversion	2017-05-22 11:36:36 +09:00
Dean Herbert	7f08d60008	Merge branch 'master' into generic-interface	2017-05-22 11:35:50 +09:00
Dean Herbert	05f5e55bc7	Merge pull request #820 from smoogipooo/remove-siblings ... Remove Note Siblings.	2017-05-22 11:28:25 +09:00
Dean Herbert	469cc5fa52	Merge branch 'master' into remove-siblings	2017-05-22 11:18:46 +09:00
Dean Herbert	71e5b0dd02	Merge pull request #813 from MrTheMake/replay-no-pausing ... Do not pause a running replay if the window is not focused	2017-05-22 11:18:14 +09:00
Dean Herbert	04f0dcc255	Merge branch 'master' into replay-no-pausing	2017-05-22 11:09:31 +09:00
Dean Herbert	d7796fa941	Merge pull request #822 from smoogipooo/mania-pattern-changes ... Mania pattern changes	2017-05-22 11:09:01 +09: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
Dean Herbert	4b17bb8e69	Merge branch 'master' into mania-pattern-changes	2017-05-22 10:25:17 +09:00
smoogipooo	6714a244e8	Add check before possibly going into endless loop.	2017-05-22 10:23:08 +09:00
smoogipooo	2d11a8bdf0	Update with pattern changes.	2017-05-22 10:20:42 +09:00
Dan Balasescu	4ce3a78066	Update Pattern.cs	2017-05-22 10:18:42 +09:00
smoogipooo	e9f7be8dce	Merge branch 'mania-pattern-changes' into mania-endtime-object-conversion	2017-05-22 10:17:54 +09:00
smoogipooo	cd66e2af14	Update with pattern changes.	2017-05-22 10:17:08 +09:00
smoogipooo	9fd4ab2302	Merge branch 'mania-pattern-changes' into mania-distance-object-conversion	2017-05-22 10:14:32 +09:00
Dan Balasescu	4ffc44eac7	Merge pull request #821 from peppy/remove-some-colours ... Move spinner colours to local definition for now	2017-05-22 10:14:04 +09:00
smoogipooo	0a0139aded	Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod.	2017-05-22 10:12:33 +09:00
smoogipooo	8c260e3364	Renamings + refactorings to Pattern.	2017-05-22 10:04:25 +09:00
smoogipooo	9de18d45a5	Use bitshifted notation.	2017-05-22 10:00:11 +09:00
smoogipooo	9f2ca1acbf	Remove siblings.	2017-05-22 09:57:03 +09:00
Dean Herbert	93182e5da3	Merge branch 'master' into generic-interface	2017-05-22 09:52:40 +09:00
smoogipooo	f42cbd5f38	Merge branch 'remove-siblings' into mania-endtime-object-conversion	2017-05-22 09:51:36 +09:00
Dean Herbert	82cf94bbff	Move spinner colours to local definition for now ... We don't want to start polluting the OsuColours namespace with non-UI colours.	2017-05-22 09:50:45 +09:00
smoogipooo	3041b55aac	Remove siblings.	2017-05-22 09:50:36 +09:00
smoogipooo	384295bdca	Merge branch 'remove-siblings' into mania-distance-object-conversion	2017-05-22 09:49:00 +09:00
smoogipooo	e58ffbd87d	Remove Note Siblings.	2017-05-22 09:46:34 +09:00
Dan Balasescu	0ddf2cb454	Merge pull request #817 from peppy/spinner-colour-rehash ... Update spinner colours	2017-05-22 09:38:12 +09:00
Dan Balasescu	256cf90305	Merge branch 'master' into spinner-colour-rehash	2017-05-22 09:22:49 +09: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