5473 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
smoogipooo	ed145e9bc9	Update framework.	2017-06-09 03:40:04 +09:00
smoogipooo	cd435f7ec6	Merge remote-tracking branch 'origin/master' into timingchange-rework ... # Conflicts: # osu-framework # osu.Game.Rulesets.Mania/Timing/ControlPointContainer.cs	2017-06-09 03:37:55 +09:00
smoogipooo	a9c3234eb5	More cleanup + xmldoc changes.	2017-06-09 03:36:15 +09:00
smoogipooo	8de6bdf340	Rewrite mania to use the new timing section stuff.	2017-06-09 02:43:48 +09:00
smoogipooo	1231d5d35e	More renaming + fixes.	2017-06-09 02:42:17 +09:00
smoogipooo	7d921f92b1	Split out RelativeCoordinateAutoSizingContainer into HitObjectCollection, beginning major rework/refactoring.	2017-06-09 01:32:19 +09:00
smoogipooo	55f238f6a9	Remove IHasTimeSpan, add rename to TimingSection.	2017-06-08 23:40:24 +09:00
Dean Herbert	6047bfc3ec	Merge pull request #917 from johnneijzen/master ... More Clean Up	2017-06-08 20:39:53 +09:00
Dean Herbert	a454ca606f	Merge remote-tracking branch 'upstream/master' into johnneijzen-master	2017-06-08 20:33:39 +09:00
Dean Herbert	b2b1c08432	Merge pull request #918 from peppy/update-framework ... Update framework	2017-06-08 20:24:40 +09:00
Dan Balasescu	ad3d6f8fb4	Merge branch 'master' into update-framework	2017-06-08 19:55:21 +09:00
Dean Herbert	e3403c619c	Merge branch 'better-invalidations' into update-framework	2017-06-08 19:46:19 +09:00
Thomas Müller	067a5a2401	Merge pull request #907 from Drezi126/osu-difficulty-refactor ... Refactor ppv2 to allow integration of pp+ features.	2017-06-08 10:27:06 +02:00
Thomas Müller	0438fd2058	Merge branch 'master' into osu-difficulty-refactor	2017-06-08 10:16:11 +02:00
Dean Herbert	64682a741c	Update framework	2017-06-08 17:05:25 +09:00
Tom94	5f7270ee4b	Use new invalidation rules	2017-06-08 09:53:45 +02:00
John Neijzen	2f7d9655fd	More Clean up	2017-06-08 15:27:35 +08:00
John Neijzen	d9a9616125	EOF remove blank spaces	2017-06-08 14:56:03 +08:00
John Neijzen	4abad17b92	Fix Black Space after } and Symbol Spacing	2017-06-08 14:48:42 +08:00
John Neijzen	431d225a60	Keyword Spacing and Brackets Fixing	2017-06-08 14:35:10 +08:00
Dean Herbert	8f909354bf	Merge pull request #912 from johnneijzen/master ... Clean up	2017-06-08 14:26:03 +09:00
Dean Herbert	bf45155ed5	Merge branch 'master' into master	2017-06-08 12:55:25 +09:00
Dean Herbert	bafd56b196	Merge pull request #915 from tacchinotacchi/unix-fix ... Fix build error on unix	2017-06-08 12:12:30 +09:00
Drezi126	9d915a691d	Fix comment placement.	2017-06-08 00:17:58 +02:00
Thomas Müller	286097d8bd	Merge branch 'master' into osu-difficulty-refactor	2017-06-07 20:43:48 +02:00
Péter Nemes	a0bdab9f0d	Aaand docs again.	2017-06-07 20:29:03 +02:00
Alex Amadori	59e539f166	Fix build error on unix	2017-06-07 18:03:27 +02:00
John Neijzen	aa3a231763	Review Changes	2017-06-07 22:00:14 +08:00
Dean Herbert	2124ffab5a	Merge pull request #914 from DrabWeb/searchable-list-padding ... Add padding to the bottom of SearchableListOverlay's ScrollFlow	2017-06-07 22:36:15 +09:00
DrabWeb	0b204bd157	Add padding to the bottom of SearchableListOverlay's ScrollFlow	2017-06-07 10:11:10 -03:00
Dan Balasescu	eb6a27e420	Merge pull request #913 from peppy/update-resources ... Fix resources getting rolled back	2017-06-07 21:28:25 +09:00
Dean Herbert	e51b4bc4ee	Fix resources getting rolled back	2017-06-07 21:16:41 +09:00
John Neijzen	f9c466eee9	bit more readable	2017-06-07 20:12:16 +08:00
John Neijzen	23a7045eef	More Clean UP	2017-06-07 20:07:18 +08:00
Dean Herbert	0198e16678	Merge pull request #859 from DrabWeb/social-browser ... Social browser	2017-06-07 21:06:05 +09:00
John Neijzen	9b0e1c26a3	Clean Up Code	2017-06-07 19:53:37 +08:00
Dean Herbert	59bed2b16e	Add missing spaces	2017-06-07 20:44:54 +09:00
Dean Herbert	8d434e88ee	Fix VisualTest not using placeholder data	2017-06-07 20:20:22 +09:00
Dean Herbert	94c961ddb8	CI Fixes	2017-06-07 20:16:34 +09:00
Dean Herbert	97db4856fc	Add toolbar toggle button ... Also ensure chat is hidden when social is displayed and vice-versa.	2017-06-07 20:15:58 +09:00
Dean Herbert	fc2d9816df	Make SearchableListHeader icon customisable	2017-06-07 20:06:02 +09:00
Dean Herbert	6a12173175	Add very temporary data source for social browser	2017-06-07 20:05:43 +09:00
smoogipooo	8641379424	Not sure how these CI issues were missed.	2017-06-07 19:27:22 +09:00
smoogipooo	1932b58663	g -> gravity + one more xmldoc.	2017-06-07 19:21:31 +09:00
smoogipooo	1017cf54d9	CI fixes.	2017-06-07 19:17:45 +09:00
smoogipooo	6f191193a1	Rename timing changes, simplify + improve columns/dictionary usage.	2017-06-07 19:15:51 +09:00
smoogipooo	7aee8ee547	Make TimeSpan a double again.	2017-06-07 19:08:32 +09:00
Dean Herbert	a07f6801da	Merge remote-tracking branch 'upstream/master' into timingchange-rework	2017-06-07 18:39:27 +09:00
Dean Herbert	1de296747f	Merge remote-tracking branch 'upstream/master' into social-browser	2017-06-07 17:38:06 +09:00
Dan Balasescu	f52f8326dd	Merge pull request #911 from peppy/update-framework ... Bring framework up-to-date	2017-06-07 15:42:42 +09:00