1
0
mirror of https://github.com/ppy/osu.git synced 2024-12-26 01:22:55 +08:00
Commit Graph

5589 Commits

Author SHA1 Message Date
Dean Herbert
c8212e5d35 Merge pull request from nairaner/unix-nuget-issue
Fix unix nuget issue
2017-06-09 21:18:01 +09:00
Dean Herbert
50e6bdf773 Merge branch 'master' into unix-nuget-issue 2017-06-09 21:07:37 +09:00
Dan Balasescu
c525784141 Merge pull request from peppy/raw-input-osd
Add on-screen display support for RawInput and CursorSensitivity
2017-06-09 21:06:49 +09:00
smoogipooo
1f56848442 Rewrite the way speed adjustments are applied. 2017-06-09 19:57:03 +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
smoogipooo
921350128d Rename SpeedAdjustment -> MultiplierControlPoint + reworking. 2017-06-09 16:57:17 +09:00
smoogipooo
4b2669e65d Namespace movement. 2017-06-09 16:20:55 +09:00
smoogipooo
d11002e499 Use new naming structure + VisibleTimeRange bindable. 2017-06-09 16:11:49 +09:00
Dean Herbert
3e3e64eb39 More xmldoc 2017-06-09 14:21:48 +09:00
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
3be4db2e83 Update framework 2017-06-08 21:30:37 +09:00
Dean Herbert
1b0e96f411 Fix some discrepancies when changing settings 2017-06-08 20:57:21 +09:00
Dean Herbert
72cbf76a48 Update framework 2017-06-08 20:41:19 +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
6047bfc3ec Merge pull request 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 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
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
Thomas Müller
067a5a2401 Merge pull request 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 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 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 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 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