Commit Graph

3709 Commits

Author SHA1 Message Date
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
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
1b0e96f411 Fix some discrepancies when changing settings 2017-06-08 20:57:21 +09:00
83cdec3ee6 Merge remote-tracking branch 'upstream/master' into raw-input-osd 2017-06-08 20:41:04 +09:00
a454ca606f Merge remote-tracking branch 'upstream/master' into johnneijzen-master 2017-06-08 20:33:39 +09:00
e3403c619c Merge branch 'better-invalidations' into update-framework 2017-06-08 19:46:19 +09:00
028364b2d9 Add on-screen display support for RawInput and CursorSensitivity
Also allows resetting both at once using Ctrl+Alt+R.

- Depends on https://github.com/ppy/osu-framework/pull/807
2017-06-08 17:58:57 +09:00
513ec4f05f Merge remote-tracking branch 'origin/master' into dynamic-vertex-attributes 2017-06-08 17:57:39 +09:00
25ff4de39a Update with framework changes. 2017-06-08 17:57:06 +09:00
64682a741c Update framework 2017-06-08 17:05:25 +09:00
5f7270ee4b Use new invalidation rules 2017-06-08 09:53:45 +02:00
2f7d9655fd More Clean up 2017-06-08 15:27:35 +08:00
d9a9616125 EOF remove blank spaces 2017-06-08 14:56:03 +08:00
4abad17b92 Fix Black Space after } and Symbol Spacing 2017-06-08 14:48:42 +08:00
431d225a60 Keyword Spacing and Brackets Fixing 2017-06-08 14:35:10 +08:00
bf45155ed5 Merge branch 'master' into master 2017-06-08 12:55:25 +09:00
59e539f166 Fix build error on unix 2017-06-07 18:03:27 +02:00
e3cdb9f6fe Create section classes. 2017-06-07 22:53:31 +08:00
e94d98fa84 Expose header background for SectionsContainer. 2017-06-07 22:11:38 +08:00
aa3a231763 Review Changes 2017-06-07 22:00:14 +08:00
9f9107b847 Add gray background. 2017-06-07 21:15:43 +08:00
0b204bd157 Add padding to the bottom of SearchableListOverlay's ScrollFlow 2017-06-07 10:11:10 -03:00
f9c466eee9 bit more readable 2017-06-07 20:12:16 +08:00
23a7045eef More Clean UP 2017-06-07 20:07:18 +08:00
9b0e1c26a3 Clean Up Code 2017-06-07 19:53:37 +08:00
59bed2b16e Add missing spaces 2017-06-07 20:44:54 +09:00
8d434e88ee Fix VisualTest not using placeholder data 2017-06-07 20:20:22 +09:00
94c961ddb8 CI Fixes 2017-06-07 20:16:34 +09:00
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
fc2d9816df Make SearchableListHeader icon customisable 2017-06-07 20:06:02 +09:00
6a12173175 Add very temporary data source for social browser 2017-06-07 20:05:43 +09:00
8641379424 Not sure how these CI issues were missed. 2017-06-07 19:27:22 +09:00
1017cf54d9 CI fixes. 2017-06-07 19:17:45 +09:00
6f191193a1 Rename timing changes, simplify + improve columns/dictionary usage. 2017-06-07 19:15:51 +09:00
7aee8ee547 Make TimeSpan a double again. 2017-06-07 19:08:32 +09:00
a07f6801da Merge remote-tracking branch 'upstream/master' into timingchange-rework 2017-06-07 18:39:27 +09:00
1de296747f Merge remote-tracking branch 'upstream/master' into social-browser 2017-06-07 17:38:06 +09:00
5f537780cf Bring framework up-to-date 2017-06-07 15:32:50 +09:00
78fc36904e Merge branch 'master' into chat-focus 2017-06-06 19:13:30 +09:00
e3d10fc4d3 Update with more framework changes. 2017-06-06 15:52:35 +09:00
eb545d907d Merge branch 'master' into simplify-hud-overlay 2017-06-06 14:31:54 +09:00
a09d873db9 Basic member of profile header. 2017-06-06 12:12:20 +08:00
fac16bdebd Do not release focus of the chat text box when sending a message 2017-06-05 18:07:28 +02:00
6b7e18a1e3 Fix not being able to change channels when channel select dialog is up 2017-06-05 23:12:39 +09:00
8fa076b5d7 Merge branch 'master' into userpage 2017-06-05 21:14:46 +08:00
428b44f7d9 UserPage -> Profile. 2017-06-05 21:07:57 +08:00
1b8ef3bbbd Add test case for UserPage. 2017-06-05 21:05:01 +08:00