1
0
mirror of https://github.com/ppy/osu.git synced 2024-11-09 05:37:25 +08:00
Commit Graph

5537 Commits

Author SHA1 Message Date
smoogipooo
874db28478 CI fixes. 2017-06-16 13:09:06 +09:00
smoogipooo
c8a1933874 Implement proper expiry in test case. 2017-06-16 13:06:44 +09:00
smoogipooo
5bac0919f0 Remove gross autoSizingAxes and life time. 2017-06-16 13:00:08 +09:00
Dan Balasescu
6bfb716cc6 CI fixes.
Update SpeedAdjustmentCollection.cs
2017-06-16 11:48:14 +09:00
smoogipooo
41c6140435 We don't need to use Cached just yet.
This was here to support dynamic re-ordering of hit objects and speed adjustment containers, however there needs to be more work done to TimingControlPoints/MultiplierControlPoints in general before this is possible.
2017-06-16 10:53:02 +09:00
smoogipooo
5d7336b235 A bit more cleanup. 2017-06-16 10:06:47 +09:00
smoogipooo
ff84a11c37 We don't need this to be protected anymore. 2017-06-16 09:54:16 +09:00
smoogipooo
03b2b254ba Make SpeedAdjustmentCollection support unordered adds of speed adjustments and hit objects. 2017-06-16 09:38:06 +09:00
smoogipooo
fda220acbc Move speed adjustment code from ManiaHitRenderer to SpeedAdjustedHitRenderer. 2017-06-15 19:34:28 +09:00
Dan Balasescu
6fd37ebc32 Merge branch 'master' into timingchange-rework 2017-06-15 16:23:51 +09:00
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
Dan Balasescu
df79fff996 Merge pull request #931 from peppy/fix-hacky-tabs
Fix hacky channel selector tab
2017-06-13 19:51:51 +09:00
smoogipooo
99a93d98dc Merge remote-tracking branch 'origin/master' into fix-hacky-tabs 2017-06-13 19:46:01 +09:00
smoogipooo
cd2db315b8 Update framework. 2017-06-13 19:45:01 +09:00
Dan Balasescu
0e7afc91fa Merge pull request #932 from peppy/nuget-update
Update nuget packages
2017-06-13 16:07:19 +09:00
Dean Herbert
3ca80eb149 Add readonly 2017-06-13 15:54:26 +09:00
Dean Herbert
19236dcd1e Merge branch 'improved-loading-animation' into nuget-update 2017-06-13 15:50:21 +09:00
Dean Herbert
178e2b716e Merge branch 'master' into us 2017-06-13 15:46:53 +09:00
Dean Herbert
d6e042aec0 Merge pull request #930 from EVAST9919/context_menu
Context menu (osu-side)
2017-06-13 15:40:33 +09:00
Dean Herbert
700d6f9d38 Adjust appearance slightly 2017-06-13 15:27:47 +09:00
Dean Herbert
679786c76f Move MenuItemType to correct namespace 2017-06-13 15:20:21 +09:00
Dean Herbert
cec9053f0b Update framework 2017-06-13 14:01:56 +09:00
Dean Herbert
41d4aee4f5 Update nuget packages
- [ ] Depends on framework partner in crime https://github.com/ppy/osu-framework/pull/820
2017-06-13 11:50:46 +09:00
EVAST9919
9f8c66b8c6 Forgot to add dropdown-like animation 2017-06-12 13:39:45 +03:00
EVAST9919
41eb084191 CI fixes 2017-06-12 13:37:13 +03:00
EVAST9919
1711258038 Context Menu 2017-06-12 12:56:07 +03:00
EVAST9919
6c71e8447c update framework 2017-06-12 12:55:58 +03:00
Dean Herbert
3efe8629d6 Fix hacky tabs 2017-06-12 18:39:22 +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
Dean Herbert
e94425f311 Improve the loading animation and use it in multiple places
- Supersedes https://github.com/ppy/osu/pull/926.
- [ ] Depends on https://github.com/ppy/osu-framework/pull/817.
2017-06-12 17:04:42 +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