Commit Graph

3526 Commits

Author SHA1 Message Date
smoogipooo 157e0e569a Remove unused file. 2017-06-12 12:57:34 +09:00
smoogipooo ffbb46f668 Update in line with framework. 2017-06-12 12:48:47 +09:00
smoogipooo 0521d4b761 Merge branch 'master' into dynamic-vertex-attributes
# Conflicts:
#	osu-framework
2017-06-10 17:26:16 +09:00
Dean Herbert 50e6bdf773 Merge branch 'master' into unix-nuget-issue 2017-06-09 21:07:37 +09:00
Krzysztof "Nairaner" Machura e7a732068c Fix issue where nuget was only sometimes updating modules case-sensitive 2017-06-09 12:03:18 +02:00
Dean Herbert 1b0e96f411 Fix some discrepancies when changing settings 2017-06-08 20:57:21 +09:00
Dean Herbert 83cdec3ee6 Merge remote-tracking branch 'upstream/master' into raw-input-osd 2017-06-08 20:41:04 +09:00
Dean Herbert a454ca606f Merge remote-tracking branch 'upstream/master' into johnneijzen-master 2017-06-08 20:33:39 +09:00
Dean Herbert e3403c619c Merge branch 'better-invalidations' into update-framework 2017-06-08 19:46:19 +09:00
Dean Herbert 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
smoogipooo 513ec4f05f Merge remote-tracking branch 'origin/master' into dynamic-vertex-attributes 2017-06-08 17:57:39 +09:00
smoogipooo 25ff4de39a Update with framework changes. 2017-06-08 17:57:06 +09: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 bf45155ed5 Merge branch 'master' into master 2017-06-08 12:55:25 +09: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
DrabWeb 0b204bd157 Add padding to the bottom of SearchableListOverlay's ScrollFlow 2017-06-07 10:11:10 -03: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
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
Dean Herbert 1de296747f Merge remote-tracking branch 'upstream/master' into social-browser 2017-06-07 17:38:06 +09:00
Dean Herbert 5f537780cf Bring framework up-to-date 2017-06-07 15:32:50 +09:00
Dean Herbert 78fc36904e Merge branch 'master' into chat-focus 2017-06-06 19:13:30 +09:00
Dan Balasescu eb545d907d Merge branch 'master' into simplify-hud-overlay 2017-06-06 14:31:54 +09:00
Thomas Müller fac16bdebd Do not release focus of the chat text box when sending a message 2017-06-05 18:07:28 +02:00
Dean Herbert 6b7e18a1e3 Fix not being able to change channels when channel select dialog is up 2017-06-05 23:12:39 +09:00
Dean Herbert d9106c4e30 Temporarily disable inspection 2017-06-05 21:58:13 +09:00
Dean Herbert 57aad1311d Merge branch 'master' into channel-selection 2017-06-05 21:46:28 +09:00
Dean Herbert d2294cd294 Merge branch 'master' into simplify-hud-overlay 2017-06-05 21:00:04 +09:00
Dean Herbert c85a0223b0 Only instantly move tooltip is we are not visible 2017-06-05 20:52:46 +09:00
Dean Herbert 04f0b5204a Merge branch 'master' into smoothly-moving-tooltips 2017-06-05 20:42:08 +09:00
Dean Herbert 09e075e3fb Allow adjusting mouse sensitivity at 0.01 increments 2017-06-05 20:22:39 +09:00
Dean Herbert 55d8b8b5f5 Merge branch 'master' into raw-input-sensitivity 2017-06-05 20:16:40 +09:00
Thomas Müller b4b3ba0787 Fix incorrect initial movement of tooltips 2017-06-05 13:07:38 +02:00
Thomas Müller e92c1210d1 Make osu tooltips move smoothly 2017-06-05 12:59:29 +02:00
Dean Herbert bf971f6613 Merge branch 'master' into social-browser 2017-06-05 19:16:28 +09:00
Dean Herbert 16fcfc473d Fix toggle not toggling on pressing escape
Also add comment about hacky implementation of toggle tab.
2017-06-05 18:04:40 +09:00
Dean Herbert 778865b6eb Merge remote-tracking branch 'upstream/master' into channel-selection 2017-06-05 17:36:14 +09:00
Dean Herbert 5568df1aee Remove StandardHUDOverlay
This class hierarchy was originally when we had different HUDs for rulesets, but this is no longer the case. Skins will be able to build off the base (new) HUDOverlay without issue, so there is no real need for the abstract class for now.

We can add it back if a need for it arises; for the moment I'd like to avoid as many Standard* classes as possible.
2017-06-05 17:18:07 +09:00