smoogipooo
|
43c306d658
|
IAccented -> IHasAccentColour.
|
2017-03-31 15:06:31 +09:00 |
|
smoogipooo
|
d944b8c192
|
Implement IAccented interface + transform.
|
2017-03-31 11:01:42 +09:00 |
|
Dean Herbert
|
f7dc7e9bb9
|
Update references.
|
2017-03-28 21:26:20 +09:00 |
|
Dean Herbert
|
cc5154dd12
|
Fix regression in mouse dragging behaviour.
|
2017-03-27 17:55:57 +09:00 |
|
Dean Herbert
|
0bcb463acf
|
ParallaxContainer should always know the mouse position.
|
2017-03-23 22:42:40 +09:00 |
|
DrabWeb
|
88d878e1d5
|
Formatting
|
2017-03-23 02:47:27 -03:00 |
|
Dean Herbert
|
e77229b34b
|
Merge branch 'master' into beatmap-detail-tabs
|
2017-03-23 14:26:00 +09:00 |
|
Dean Herbert
|
681ed38941
|
Use const whenever possible.
|
2017-03-23 13:52:38 +09:00 |
|
Dean Herbert
|
54e1b24fe9
|
Enforce readonly private members where possible.
|
2017-03-23 13:50:08 +09:00 |
|
DrabWeb
|
b8b45262c5
|
Formatting
|
2017-03-23 01:35:55 -03:00 |
|
DrabWeb
|
67421cdf1c
|
Even though it was 5 minutes ago what was I thinking
|
2017-03-23 01:34:06 -03:00 |
|
DrabWeb
|
87b8015e8f
|
Cleanup
|
2017-03-23 00:29:28 -03:00 |
|
DrabWeb
|
c173c4b7ee
|
Tab control
|
2017-03-23 00:22:31 -03:00 |
|
Dean Herbert
|
1d9da8facd
|
Merge pull request #520 from smoogipooo/use_equilateral_triangles
Update framework + use EquilateralTriangle in Triangles.
|
2017-03-23 10:27:21 +09:00 |
|
Dean Herbert
|
e7f32fcbce
|
Merge pull request #525 from huoyaoyuan/controls
DropDown update
|
2017-03-23 09:26:26 +09:00 |
|
Dean Herbert
|
b0340f77d8
|
Remove nested types completely.
|
2017-03-23 08:57:14 +09:00 |
|
Dean Herbert
|
ff57d3800f
|
Merge branch 'master' into use_equilateral_triangles
|
2017-03-23 08:51:43 +09:00 |
|
Dean Herbert
|
3dee39346f
|
U -> T1.
|
2017-03-23 08:49:29 +09:00 |
|
Dean Herbert
|
ba32d50456
|
Consolidate nested classes.
|
2017-03-23 08:44:52 +09:00 |
|
smoogipooo
|
9247017c9a
|
Use EquilateralTriangle in Triangles.
|
2017-03-23 08:34:39 +09:00 |
|
Dean Herbert
|
537f0b9340
|
Fix menu cursor size not sticking on startup.
Also tidied up bindables.
|
2017-03-23 08:07:59 +09:00 |
|
Huo Yaoyuan
|
0dbc232ebf
|
Rename all DropDown -> Dropdown.
|
2017-03-22 22:32:32 +08:00 |
|
Huo Yaoyuan
|
6a4ca08578
|
Merge branch 'master' into controls
|
2017-03-22 22:28:19 +08:00 |
|
Dean Herbert
|
fbe08436d2
|
Fix usages of CircularContainer in line with framework changes.
|
2017-03-22 19:35:03 +09:00 |
|
Huo Yaoyuan
|
e217c67bcf
|
Merge branch 'master' into controls
|
2017-03-22 08:54:03 +08:00 |
|
Huo Yaoyuan
|
b06eb0122c
|
Fix for colours and members rename.
|
2017-03-22 08:15:31 +08:00 |
|
Huo Yaoyuan
|
f0edf5d3d3
|
Update to DropDown and Menu.
|
2017-03-22 07:18:53 +08:00 |
|
Dean Herbert
|
b00f86d809
|
Merge branch 'master' into seperateCursorSize
|
2017-03-22 08:11:45 +09:00 |
|
Jorolf
|
82d6129063
|
renamed CursorSize to MenuCursorSize
|
2017-03-21 17:16:23 +01:00 |
|
Huo Yaoyuan
|
1d13924e0a
|
Remove redundant type parameter.
Nested type has implicit type parameter from base type.
|
2017-03-21 01:05:48 +08:00 |
|
smoogipooo
|
d27f37beb5
|
Hard-code text size in cases it wasn't set.
|
2017-03-20 13:48:06 +09:00 |
|
Dan Balasescu
|
417045c37c
|
Merge branch 'master' into textawesome_shadow
|
2017-03-20 13:17:35 +09:00 |
|
Dean Herbert
|
8f75032b64
|
Fix incorrect abs.
|
2017-03-18 22:37:50 +09:00 |
|
Dean Herbert
|
125936bad0
|
Fix double-assignment.
|
2017-03-18 22:23:53 +09:00 |
|
Dean Herbert
|
919ec2d3a5
|
Spend more when wound up.
|
2017-03-18 22:17:23 +09:00 |
|
Thomas Müller
|
f636f59289
|
Nicer cursor orientation when dragging
|
2017-03-18 12:47:49 +01:00 |
|
Jorolf
|
8568e1536c
|
Separated menu and gameplay cursor size
|
2017-03-17 18:40:03 +01:00 |
|
smoogipooo
|
77067b7e64
|
Re-style.
|
2017-03-18 02:04:23 +09:00 |
|
smoogipooo
|
dde2ac7f4a
|
Make TextAwesome have a shadow.
|
2017-03-17 22:03:47 +09:00 |
|
Dean Herbert
|
317dc94b4c
|
Adjust appearance.
|
2017-03-17 21:09:31 +09:00 |
|
Dean Herbert
|
f9f31ca092
|
Add statefulness to MenuCursor.
|
2017-03-17 20:45:27 +09:00 |
|
Dean Herbert
|
292de44a0b
|
WIP menu cursor.
|
2017-03-17 20:45:27 +09:00 |
|
Dean Herbert
|
e78bcf8739
|
Update TabControl in line with framework changes.
|
2017-03-17 00:39:40 +09:00 |
|
Dean Herbert
|
8cd1353d74
|
Fix serious input regression.
|
2017-03-16 22:09:35 +09:00 |
|
Dean Herbert
|
2cf6ed423e
|
Disallow duplicate active changes.
|
2017-03-16 21:33:08 +09:00 |
|
Dean Herbert
|
84b080a060
|
Make transition logic a bit more sane.
|
2017-03-16 21:26:03 +09:00 |
|
Dean Herbert
|
110bdbd0c1
|
Make everything share DropDown implementations again. Remove unnecessary files.
|
2017-03-16 21:17:14 +09:00 |
|
Dean Herbert
|
ab8a5afdb9
|
AlwaysReceiveInput and InternalContains.
|
2017-03-16 17:38:36 +09:00 |
|
Dean Herbert
|
93c0fe5140
|
Remove unnecessary set.
|
2017-03-16 17:02:37 +09:00 |
|
Dean Herbert
|
1156e76c28
|
Don't directly access Header.
|
2017-03-16 17:00:49 +09:00 |
|
Dean Herbert
|
334e389518
|
Tidy up OsuTabControl and FilterControl.
|
2017-03-16 16:35:44 +09:00 |
|
Drew DeVault
|
360340c61d
|
Fix linter issues
|
2017-03-15 22:39:09 -04:00 |
|
Drew DeVault
|
01cca1a4d2
|
Refactor color handling
colour*
|
2017-03-15 20:52:31 -04:00 |
|
Drew DeVault
|
3aecbf5739
|
Rearrange things somewhat
|
2017-03-15 20:15:40 -04:00 |
|
Kelvin
|
755fb260db
|
Updated TabControl Usage
|
2017-03-14 19:52:21 -07:00 |
|
Kelvin
|
ee3d3b682f
|
Updated usage for DropDownHeader of FilterTabControl
|
2017-03-14 19:49:40 -07:00 |
|
Kelvin
|
2629f78afc
|
Add FilterControl and FilterTabControl
|
2017-03-14 19:49:40 -07:00 |
|
Dean Herbert
|
b5a8ef07fe
|
Update framework.
|
2017-03-15 09:46:03 +09:00 |
|
Dan Balasescu
|
0fa2776975
|
Merge branch 'master' into counter_bindables
|
2017-03-10 14:21:33 +09:00 |
|
smoogipooo
|
5f72265eff
|
Remove float ValueAt method.
|
2017-03-10 14:09:55 +09:00 |
|
smoogipooo
|
cd1717c42f
|
More bindables!
|
2017-03-10 13:49:51 +09:00 |
|
Dean Herbert
|
2821451d5b
|
Remove unused file.
|
2017-03-08 16:01:54 +09:00 |
|
Dean Herbert
|
4430255ec4
|
Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
# osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
# osu.Desktop/OsuGameDesktop.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs
# osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
# osu.Game/Database/BeatmapDatabase.cs
# osu.Game/Graphics/Cursor/OsuCursorContainer.cs
# osu.Game/IPC/BeatmapImporter.cs
# osu.Game/Modes/Mod.cs
# osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
# osu.Game/Modes/UI/Playfield.cs
# osu.Game/Screens/Play/Player.cs
# osu.Game/Screens/Play/PlayerInputManager.cs
|
2017-03-07 13:50:08 +09:00 |
|
Dean Herbert
|
0cad5d7d41
|
Fix most warnings.
|
2017-03-07 13:05:57 +09:00 |
|
Dan Balasescu
|
bc74f453aa
|
Merge branch 'master' into replay
|
2017-03-07 11:41:16 +09:00 |
|
Thomas Müller
|
9b92e99ce9
|
Merge branch 'master' into increase-ci-strictness
|
2017-03-06 21:44:39 +01:00 |
|
Dean Herbert
|
88f3dc0e02
|
Fix a few naming issues.
|
2017-03-06 18:49:23 +09:00 |
|
Dean Herbert
|
e356758a7d
|
Don't expicitly set origin of TextAwesome.
|
2017-03-06 17:06:48 +09:00 |
|
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 |
|