Commit Graph

6504 Commits

Author SHA1 Message Date
915f61a8f7 Rename to scrollContentContainer. 2017-06-12 14:39:49 +08:00
ba8014bbd9 Cleanups + xmldoc rewordings/improvements. 2017-06-12 15:20:34 +09:00
419682b740 Merge remote-tracking branch 'origin/master' into timingchange-rework
# Conflicts:
#	osu-framework
2017-06-12 13:09:02 +09:00
8bd9c112ba Merge pull request #927 from smoogipooo/general-fixes
Update framework.
2017-06-12 13:02:36 +09:00
157e0e569a Remove unused file. 2017-06-12 12:57:34 +09:00
ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
e552c39444 change function to a property 2017-06-11 22:04:35 +03:00
c3f4b1b3cb Merge remote-tracking branch 'refs/remotes/ppy/master' into cancel-select-random 2017-06-11 21:56:55 +03:00
d5dc37ec62 Merge branch 'master' into profile 2017-06-11 23:41:08 +08:00
df899d3de3 Merge pull request #921 from smoogipooo/dynamic-vertex-attributes
Dynamically determine vertex attributes (framework update)
2017-06-10 17:31:58 +09:00
0521d4b761 Merge branch 'master' into dynamic-vertex-attributes
# Conflicts:
#	osu-framework
2017-06-10 17:26:16 +09:00
de35ea22b1 Make bar lines work again. 2017-06-09 22:03:28 +09:00
c8212e5d35 Merge pull request #922 from nairaner/unix-nuget-issue
Fix unix nuget issue
2017-06-09 21:18:01 +09:00
50e6bdf773 Merge branch 'master' into unix-nuget-issue 2017-06-09 21:07:37 +09:00
c525784141 Merge pull request #920 from peppy/raw-input-osd
Add on-screen display support for RawInput and CursorSensitivity
2017-06-09 21:06:49 +09:00
3945d33adc Make OsuTabControl.isEnumType static. 2017-06-09 19:04:29 +08:00
1f56848442 Rewrite the way speed adjustments are applied. 2017-06-09 19:57:03 +09:00
e7a732068c Fix issue where nuget was only sometimes updating modules case-sensitive 2017-06-09 12:03:18 +02:00
798d8711b8 Refactor SectionsContainer to generic. 2017-06-09 16:24:19 +08:00
c60ef2449f Fix initial scroll. 2017-06-09 16:05:05 +08:00
140c74cd2a Use PageTabControl. 2017-06-09 16:01:16 +08:00
921350128d Rename SpeedAdjustment -> MultiplierControlPoint + reworking. 2017-06-09 16:57:17 +09:00
51107acdff Improve section behaviour. 2017-06-09 15:22:07 +08:00
4b2669e65d Namespace movement. 2017-06-09 16:20:55 +09:00
d11002e499 Use new naming structure + VisibleTimeRange bindable. 2017-06-09 16:11:49 +09:00
8dce52e6a8 Fix incorrect class name. 2017-06-09 14:53:30 +08:00
5a0bd3b695 Set content in profile sections. 2017-06-09 14:53:00 +08:00
c31dd7a480 Set position and color for tab control. 2017-06-09 14:25:23 +08:00
283b6b2b5e Merge branch 'master' into profile 2017-06-09 13:45:32 +08:00
5033526070 Fix depth in SectiondContainer. 2017-06-09 13:37:55 +08:00
3e3e64eb39 More xmldoc 2017-06-09 14:21:48 +09:00
ed145e9bc9 Update framework. 2017-06-09 03:40:04 +09:00
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
a9c3234eb5 More cleanup + xmldoc changes. 2017-06-09 03:36:15 +09:00
8de6bdf340 Rewrite mania to use the new timing section stuff. 2017-06-09 02:43:48 +09:00
1231d5d35e More renaming + fixes. 2017-06-09 02:42:17 +09:00
7d921f92b1 Split out RelativeCoordinateAutoSizingContainer into HitObjectCollection, beginning major rework/refactoring. 2017-06-09 01:32:19 +09:00
55f238f6a9 Remove IHasTimeSpan, add rename to TimingSection. 2017-06-08 23:40:24 +09:00
3be4db2e83 Update framework 2017-06-08 21:30:37 +09:00
1b0e96f411 Fix some discrepancies when changing settings 2017-06-08 20:57:21 +09:00
72cbf76a48 Update framework 2017-06-08 20:41:19 +09:00
83cdec3ee6 Merge remote-tracking branch 'upstream/master' into raw-input-osd 2017-06-08 20:41:04 +09:00
6047bfc3ec Merge pull request #917 from johnneijzen/master
More Clean Up
2017-06-08 20:39:53 +09:00
a454ca606f Merge remote-tracking branch 'upstream/master' into johnneijzen-master 2017-06-08 20:33:39 +09:00
b2b1c08432 Merge pull request #918 from peppy/update-framework
Update framework
2017-06-08 20:24:40 +09:00
ad3d6f8fb4 Merge branch 'master' into update-framework 2017-06-08 19:55:21 +09:00
e3403c619c Merge branch 'better-invalidations' into update-framework 2017-06-08 19:46:19 +09:00
30fe7315ee Small cleanup 2017-06-08 06:47:21 -03:00
bb103d7878 Fix being able to commit with an empty query and clearing the results 2017-06-08 06:31:37 -03:00
70e12e5d9b Make the header tabs work 2017-06-08 06:21:45 -03:00