Dean Herbert
|
8e7e70bd1a
|
Merge branch 'master' into update-loop-logic
|
2017-07-10 03:19:49 +09:00 |
|
Thomas Müller
|
fec6f2ba65
|
Remove unnecessary usings
|
2017-07-09 19:57:22 +03:00 |
|
Thomas Müller
|
dedd4561a1
|
Display indices rather than one-based numbers
|
2017-07-09 19:41:36 +03:00 |
|
Thomas Müller
|
934a585b94
|
Better number formatting
|
2017-07-09 19:40:57 +03:00 |
|
Thomas Müller
|
1f425c3be8
|
Simplify existing code
|
2017-07-09 19:40:36 +03:00 |
|
Thomas Müller
|
8c40b80813
|
Also display negative beats
|
2017-07-09 19:33:23 +03:00 |
|
EVAST9919
|
d533ac0e98
|
Simplify info margin
|
2017-07-09 13:57:13 +03:00 |
|
EVAST9919
|
62fc55521c
|
Added background colour for better info visibility
|
2017-07-09 13:54:38 +03:00 |
|
EVAST9919
|
bd45e1f1e7
|
Make field readonly
|
2017-07-09 13:48:20 +03:00 |
|
EVAST9919
|
105d57a697
|
Update Testcase inline with framework
|
2017-07-09 13:39:48 +03:00 |
|
EVAST9919
|
6e293501e0
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatsync_fixes
|
2017-07-09 13:23:42 +03:00 |
|
Dean Herbert
|
2c8b8c3f9c
|
Update loop logic in line with framework changes
|
2017-07-09 18:23:34 +09:00 |
|
Dean Herbert
|
bb8efcc12f
|
Fix CI issues (pass #2)
|
2017-07-08 18:17:47 +09:00 |
|
Dean Herbert
|
3c425dd07f
|
Fix CI issue
|
2017-07-08 18:06:59 +09:00 |
|
Thomas Müller
|
22a987f6cc
|
Update test cases to new framework and fix old crashes
|
2017-07-07 15:05:55 +03:00 |
|
EVAST9919
|
10a522885a
|
Merge remote-tracking branch 'refs/remotes/ppy/master' into beatsync_fixes
|
2017-06-25 23:36:38 +03:00 |
|
Huo Yaoyuan
|
cad594018f
|
Add dummy data in test case.
|
2017-06-26 00:43:32 +08:00 |
|
DrabWeb
|
0de55776c0
|
Update DrawableRoom design.
|
2017-06-24 05:05:48 -03:00 |
|
DrabWeb
|
0133f9c086
|
Medal sprite, make MedalOverlay auto-show when loaded.
|
2017-06-24 01:19:44 -03:00 |
|
DrabWeb
|
e09625e49d
|
Merge https://github.com/ppy/osu into medal-splash
|
2017-06-23 22:42:36 -03:00 |
|
Dean Herbert
|
b90c9bcacf
|
Merge branch 'master' into profile
|
2017-06-23 22:51:31 +09:00 |
|
Dean Herbert
|
f314f5f7ea
|
CI fixes
|
2017-06-23 22:34:36 +09:00 |
|
Dean Herbert
|
1a8f207db3
|
Code formatting
|
2017-06-23 22:19:41 +09:00 |
|
Dean Herbert
|
81de1bd5a7
|
Merge branch 'master' into multiplayer-room-inspector
|
2017-06-23 21:55:18 +09:00 |
|
EVAST9919
|
3150bdb54b
|
Fixed wrong display string
|
2017-06-23 14:56:43 +03:00 |
|
EVAST9919
|
a59af5b005
|
Applied suggested changes
|
2017-06-23 10:01:28 +03:00 |
|
EVAST9919
|
b020fe0d50
|
Added TestCase
|
2017-06-23 08:36:47 +03:00 |
|
Dean Herbert
|
076d561615
|
Merge branch 'master' into profile
|
2017-06-23 13:12:36 +09:00 |
|
Dean Herbert
|
89c8a34025
|
Merge branch 'master' into better-drawablehitobject-lifetimes
|
2017-06-21 20:13:57 +09:00 |
|
Dean Herbert
|
45d3c2cd52
|
Merge branch 'master' into profile
|
2017-06-21 16:40:17 +09:00 |
|
smoogipooo
|
b191d96aab
|
CI fixes.
|
2017-06-21 11:35:19 +09:00 |
|
paparony03
|
62dee59672
|
Shapes namespace
Depends on https://github.com/ppy/osu-framework/pull/837
|
2017-06-20 15:54:23 +10:00 |
|
smoogipooo
|
34ac932fe2
|
Reduce pollution in DrawableHitObject in favor of a loosely-coupled IScrollingHitObject.
|
2017-06-19 10:54:23 +09:00 |
|
smoogipooo
|
4afe83e74e
|
Rework DrawableHitObject to provide default life times and proper DrawableTimingSection autosizing.
This exposes LifetimeOffset from DrawableHitObject which is used by the XSRG rulesets to adjust the life time range by the VisibleTimeRange.
|
2017-06-16 19:21:54 +09:00 |
|
Huo Yaoyuan
|
69270814d5
|
CI fixes.
|
2017-06-16 16:54:05 +08:00 |
|
Huo Yaoyuan
|
af4ddf8fbd
|
Merge branch 'master' into profile.
|
2017-06-16 16:32:54 +08:00 |
|
Huo Yaoyuan
|
43569d69a7
|
Update transforms.
|
2017-06-16 16:13:23 +08:00 |
|
smoogipooo
|
ea87aca032
|
We no longer need to pass in the control point.
|
2017-06-16 13:12:36 +09:00 |
|
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 |
|
Huo Yaoyuan
|
53bd22cf9c
|
Update usage design.
|
2017-06-15 20:06:17 +08:00 |
|
Huo Yaoyuan
|
13d9f3b9bb
|
Move namespace and setup for DI.
|
2017-06-15 17:53:12 +08:00 |
|
Dan Balasescu
|
6fd37ebc32
|
Merge branch 'master' into timingchange-rework
|
2017-06-15 16:23:51 +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
|
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
|
cfb7e4f61a
|
Tidy up testcase a bit
|
2017-06-15 14:16:47 +09:00 |
|
Huo Yaoyuan
|
b37c3f8ce1
|
Some CI fixes.
|
2017-06-15 07:58:20 +08:00 |
|
Huo Yaoyuan
|
f7a451ed82
|
Update test case.
|
2017-06-15 02:38:51 +08:00 |
|
Huo Yaoyuan
|
9ceb4930e9
|
Merge branch 'master' into profile
|
2017-06-13 15:23:12 +08:00 |
|
Dean Herbert
|
679786c76f
|
Move MenuItemType to correct namespace
|
2017-06-13 15:20:21 +09: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 |
|
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
|
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 |
|
Huo Yaoyuan
|
283b6b2b5e
|
Merge branch 'master' into profile
|
2017-06-09 13:45:32 +08: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
|
8de6bdf340
|
Rewrite mania to use the new timing section stuff.
|
2017-06-09 02:43:48 +09:00 |
|
smoogipooo
|
55f238f6a9
|
Remove IHasTimeSpan, add rename to TimingSection.
|
2017-06-08 23:40:24 +09:00 |
|
John Neijzen
|
2f7d9655fd
|
More Clean up
|
2017-06-08 15:27:35 +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 |
|
DrabWeb
|
8006fab3c7
|
Merge https://github.com/ppy/osu into osu-direct-search
|
2017-06-07 09:56:13 -03:00 |
|
smoogipooo
|
1932b58663
|
g -> gravity + one more xmldoc.
|
2017-06-07 19:21:31 +09:00 |
|
smoogipooo
|
1017cf54d9
|
CI fixes.
|
2017-06-07 19:17:45 +09:00 |
|
smoogipooo
|
6f191193a1
|
Rename timing changes, simplify + improve columns/dictionary usage.
|
2017-06-07 19:15:51 +09:00 |
|
Dean Herbert
|
a07f6801da
|
Merge remote-tracking branch 'upstream/master' into timingchange-rework
|
2017-06-07 18:39:27 +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 |
|
smoogipooo
|
e3d10fc4d3
|
Update with more framework changes.
|
2017-06-06 15:52:35 +09:00 |
|
Huo Yaoyuan
|
7d4c5999f6
|
Add description in test case.
|
2017-06-05 21:20:04 +08:00 |
|
Huo Yaoyuan
|
8fa076b5d7
|
Merge branch 'master' into userpage
|
2017-06-05 21:14:46 +08:00 |
|
Huo Yaoyuan
|
428b44f7d9
|
UserPage -> Profile.
|
2017-06-05 21:07:57 +08:00 |
|
Huo Yaoyuan
|
1b8ef3bbbd
|
Add test case for UserPage.
|
2017-06-05 21:05:01 +08:00 |
|
smoogipooo
|
4307242bb6
|
Update with framework changes.
|
2017-06-05 20:06:46 +09:00 |
|
Dean Herbert
|
bf971f6613
|
Merge branch 'master' into social-browser
|
2017-06-05 19:16:28 +09:00 |
|
Dean Herbert
|
af6f8bbd89
|
Fix namespaces and class names
|
2017-06-05 16:47:42 +09:00 |
|
Dean Herbert
|
0cb1df35e9
|
Merge remote-tracking branch 'upstream/master' into ingame_options
|
2017-06-05 14:53:37 +09:00 |
|
smoogipooo
|
a3299809fe
|
Merge remote-tracking branch 'origin/master' into timingchange-rework
# Conflicts:
# osu.Game/Graphics/Containers/ReverseDepthFillFlowContainer.cs
|
2017-06-05 10:19:53 +09:00 |
|
Thomas Müller
|
0afb188cde
|
Remove unused using
|
2017-06-03 20:05:51 +02:00 |
|
Thomas Müller
|
04925594ca
|
Merge branch 'master' into separate-skip
|
2017-06-03 17:45:57 +02:00 |
|
Thomas Müller
|
d498a4a022
|
Trim whitespace
|
2017-06-03 17:45:44 +02:00 |
|
Thomas Müller
|
8cd2f509ef
|
Move skip button into its own test, because it is no longer two-layered
|
2017-06-03 17:33:24 +02:00 |
|
Thomas Müller
|
3daae480d2
|
Remove TestCaseTooltip
|
2017-06-03 17:28:34 +02:00 |
|
Jorolf
|
a43890ffb4
|
update osu to use the framework's TooltipContainer
|
2017-06-03 14:50:35 +02:00 |
|
smoogipooo
|
7022c8d496
|
Move timing change stuff to osu.Game project.
|
2017-06-02 20:17:44 +09:00 |
|
smoogipooo
|
1d3f5d8649
|
CI fixes.
|
2017-06-02 18:19:21 +09:00 |
|
smoogipooo
|
264bf17bc2
|
Significantly reduce test case time.
|
2017-06-02 18:11:06 +09:00 |
|
smoogipooo
|
a96c259a8e
|
Fix up test case.
|
2017-06-02 18:07:45 +09:00 |
|
smoogipooo
|
1da5d508fa
|
aaaaa
|
2017-06-02 11:35:51 +09:00 |
|
DrabWeb
|
212b2c1142
|
Initial layout and animation
|
2017-06-01 04:45:46 -03:00 |
|
smoogipooo
|
d30706f640
|
Move drawable timing changes to Timing/Drawables.
|
2017-06-01 15:13:52 +09:00 |
|
smoogipooo
|
f612914e87
|
Initial rewrite of timing changes to allow them to be more extensible.
|
2017-06-01 14:26:21 +09:00 |
|
DrabWeb
|
c9403c5200
|
Incorrect test data spelling
|
2017-05-31 21:32:50 -03:00 |
|
DrabWeb
|
e708cdf41a
|
Level Range -> Range Range, don't use empty object initializers
|
2017-05-30 22:34:02 -03:00 |
|