Dean Herbert
|
4e4408cd20
|
Merge branch 'master' into replay
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
|
2017-03-05 17:45:03 +09:00 |
|
Thomas Müller
|
73fef85b12
|
Remove unnecessary usings
|
2017-03-04 19:43:59 +01:00 |
|
Thomas Müller
|
a14bdf8624
|
Use Color4Extensions from Framework and remove redundant Name
|
2017-03-04 19:42:37 +01:00 |
|
Dean Herbert
|
e12d89529c
|
Merge remote-tracking branch 'upstream/master' into update-flow
|
2017-03-04 23:28:39 +09:00 |
|
Thomas Müller
|
a2317e5a1e
|
Update usage of FillDirection
|
2017-03-04 11:00:17 +01:00 |
|
TheGui
|
e3c3806759
|
Fixed accuracy's counter first value change.
|
2017-03-04 04:48:32 -03:00 |
|
Dean Herbert
|
9e1383fa48
|
Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
# osu.Game.Modes.Catch/CatchRuleset.cs
# osu.Game.Modes.Mania/ManiaRuleset.cs
# osu.Game.Modes.Taiko/TaikoRuleset.cs
# osu.Game/Screens/Play/Player.cs
|
2017-03-04 13:17:01 +09:00 |
|
Dean Herbert
|
71534b3e13
|
Fix incorrect triangle density on first display.
|
2017-03-03 18:09:16 +09:00 |
|
Seth
|
1891bdf51e
|
Merge branch 'master' into mod-overlay
|
2017-03-03 01:11:15 -04:00 |
|
Huo Yaoyuan
|
ef13cdbff7
|
Disallow copying from OsuPasswordTextBox.
|
2017-03-03 10:00:39 +08:00 |
|
Thomas Müller
|
c732890664
|
Remove usages of negative Margin / Padding
Replaces such usage with more sensible settings, like changing the
position or size.
|
2017-03-02 19:16:31 +01:00 |
|
Dean Herbert
|
471b9daa93
|
Merge branch 'master' into mod-overlay
# Conflicts:
# osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
# osu.Game/Screens/Select/PlaySongSelect.cs
# osu.Game/osu.Game.csproj
|
2017-03-02 20:27:04 +09:00 |
|
Dean Herbert
|
4163569e57
|
Fix some license headers.
|
2017-03-02 18:45:20 +09:00 |
|
Dean Herbert
|
ff5f0af2d3
|
Merge branch 'master' into popup-dialog
|
2017-03-02 16:42:20 +09:00 |
|
Dean Herbert
|
8040d6a03f
|
Fix CursorTrail corruption by resetting on load.
|
2017-03-02 16:08:10 +09:00 |
|
DrabWeb
|
367d6d694c
|
Merge https://github.com/ppy/osu into mod-overlay
|
2017-03-02 01:44:18 -04:00 |
|
Thomas Müller
|
4d28696479
|
FlowDirection -> FillDirection
|
2017-03-01 20:15:38 +01:00 |
|
Thomas Müller
|
9c853b0465
|
Update framewörk
|
2017-03-01 19:33:01 +01:00 |
|
Thomas Müller
|
d46e68b36b
|
Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
# Conflicts:
# osu-framework
# osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
|
2017-03-01 18:05:58 +01:00 |
|
Dean Herbert
|
58ae9e888d
|
Basic partial replay support.
|
2017-03-01 22:04:20 +09:00 |
|
Thomas Müller
|
e462ec46c3
|
Merge branch 'master' into general-fixes
|
2017-02-28 19:02:07 +01:00 |
|
Thomas Müller
|
585d42f89f
|
Improve naming and correctness of triangles fading
|
2017-02-28 19:01:02 +01:00 |
|
DrabWeb
|
570c95cb98
|
Merge https://github.com/ppy/osu into mod-overlay
|
2017-02-28 02:22:59 -04:00 |
|
Dean Herbert
|
e60cead483
|
Merge remote-tracking branch 'upstream/master' into warning_fixes
|
2017-02-28 13:49:19 +09:00 |
|
Dean Herbert
|
aa9582c0fa
|
Add exponential fall-off of triangles' alpha values.
|
2017-02-28 11:28:25 +09:00 |
|
DrabWeb
|
e8cae3b45e
|
Remove new override in DialogButton
|
2017-02-27 21:38:25 -04:00 |
|
DrabWeb
|
164f205ee5
|
Remove SpaceTextOnHover
|
2017-02-27 21:30:10 -04:00 |
|
DrabWeb
|
3094c01a40
|
Merge https://github.com/ppy/osu into popup-dialog
|
2017-02-27 16:40:04 -04:00 |
|
default0
|
03889e6ca6
|
Update References to FlowStrategies
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
|
2017-02-27 16:55:55 +01:00 |
|
Andrey Zavadskiy
|
3487dfe236
|
Removed unused variables and parameters
|
2017-02-27 17:32:32 +03:00 |
|
DrabWeb
|
d78dca3d85
|
New design
|
2017-02-26 23:35:13 -04:00 |
|
Dean Herbert
|
47997c20ad
|
Weld -> BindWith.
|
2017-02-27 12:24:53 +09:00 |
|
default0
|
8d91519d59
|
Update usage of FlowContainer and its subclasses
|
2017-02-26 21:32:43 +01:00 |
|
Dean Herbert
|
c227eb1be5
|
Welded bindables.
|
2017-02-26 22:08:21 +09:00 |
|
Thomas Müller
|
1585ae842a
|
Update framework
|
2017-02-26 11:22:58 +09:00 |
|
Dean Herbert
|
12db33ad4b
|
Visual and readability improvements to StarCounter.
|
2017-02-24 19:30:56 +09:00 |
|
Dean Herbert
|
c5552dfb27
|
Merge remote-tracking branch 'upstream/master' into remove-usings
|
2017-02-24 11:29:34 +09:00 |
|
Thomas Müller
|
0264c44a20
|
Do not shadow Colour in TwoLayerButton
Renames Colour to BackgroundColour instead.
|
2017-02-23 22:33:37 +01:00 |
|
Thomas Müller
|
a5dfa7ab06
|
Remove unnecessary using statements
|
2017-02-23 21:38:10 +01:00 |
|
DrabWeb
|
99f1f88c75
|
Merge https://github.com/ppy/osu into mod-overlay
|
2017-02-22 12:35:55 -04:00 |
|
Dean Herbert
|
afba4fbfad
|
Merge remote-tracking branch 'upstream/master' into chat-improvement
|
2017-02-21 15:46:28 +09:00 |
|
Jorolf
|
1e0a694ff8
|
replaced bool with Bindable<bool>
Also accounted for the ParallaxAmount when moving to default position
|
2017-02-19 17:11:36 +01:00 |
|
Jorolf
|
7f751d3653
|
Update ParallaxContainer.cs
|
2017-02-19 16:54:00 +01:00 |
|
Jorolf
|
e83ac8b04c
|
Removed public ParallaxEnabled property
|
2017-02-19 13:47:26 +01:00 |
|
Dean Herbert
|
520e040396
|
Add FocusedTextBox abstraction.
|
2017-02-19 17:59:22 +09:00 |
|
Jorolf
|
f166bb0f96
|
Moved movement to the default position to property
|
2017-02-18 22:26:48 +01:00 |
|
Jorolf
|
77bfe57d8c
|
compacted code, made public bool to disable it
|
2017-02-18 22:00:07 +01:00 |
|
Jorolf
|
a48e4a31a7
|
Parallax Option works now
|
2017-02-18 21:34:21 +01:00 |
|
Dean Herbert
|
78c9348b5a
|
Make accuracy fixed width and improve feel.
|
2017-02-18 17:35:54 +09:00 |
|
Dean Herbert
|
1a31589abd
|
Add padding zeroes to score display (and fix not being applied initially).
|
2017-02-18 17:35:37 +09:00 |
|