1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-18 15:32:55 +08:00
Commit Graph

5509 Commits

Author SHA1 Message Date
smoogipooo
aa830e435a Add comment. 2017-06-15 16:15:41 +09:00
Dean Herbert
f07a31b2ca Make hitobjects a bit more visual 2017-06-15 15:17:05 +09:00
Dean Herbert
6679575c13 Add current time labels 2017-06-15 15:06:38 +09:00
Dean Herbert
32226f90db Enforce exception better 2017-06-15 14:53:39 +09:00
Dean Herbert
585e7ba312 Add a check to make sure all hitobjects use relativepositionaxes 2017-06-15 14:42:25 +09:00
Dean Herbert
021019648e Add labels to playfield area 2017-06-15 14:40:30 +09:00
Dean Herbert
149eaa64de Use a relative width definition 2017-06-15 14:36:41 +09:00
Dean Herbert
63ca8a428d Add xmldoc to MultiplierControlPoint 2017-06-15 14:20:54 +09:00
Dean Herbert
f439237bd7 Set a more sane default for TimingControlPoint's BeatLength 2017-06-15 14:19:06 +09:00
Dean Herbert
cfb7e4f61a Tidy up testcase a bit 2017-06-15 14:16:47 +09:00
smoogipooo
95db62c385 Remove unused using. 2017-06-12 17:32:28 +09:00
smoogipooo
56244e0134 Add small test case to demonstrate usage. 2017-06-12 17:31:24 +09:00
smoogipooo
ba8014bbd9 Cleanups + xmldoc rewordings/improvements. 2017-06-12 15:20:34 +09:00
smoogipooo
419682b740 Merge remote-tracking branch 'origin/master' into timingchange-rework
# Conflicts:
#	osu-framework
2017-06-12 13:09:02 +09:00
Dean Herbert
8bd9c112ba Merge pull request #927 from smoogipooo/general-fixes
Update framework.
2017-06-12 13:02:36 +09:00
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
Dan Balasescu
df899d3de3 Merge pull request #921 from smoogipooo/dynamic-vertex-attributes
Dynamically determine vertex attributes (framework update)
2017-06-10 17:31:58 +09:00
smoogipooo
0521d4b761 Merge branch 'master' into dynamic-vertex-attributes
# Conflicts:
#	osu-framework
2017-06-10 17:26:16 +09:00
smoogipooo
de35ea22b1 Make bar lines work again. 2017-06-09 22:03:28 +09:00
Dean Herbert
c8212e5d35 Merge pull request #922 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 #920 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 #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
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 #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