Commit Graph

360 Commits

Author SHA1 Message Date
01cca1a4d2 Refactor color handling
colour*
2017-03-15 20:52:31 -04:00
3aecbf5739 Rearrange things somewhat 2017-03-15 20:15:40 -04:00
755fb260db Updated TabControl Usage 2017-03-14 19:52:21 -07:00
ee3d3b682f Updated usage for DropDownHeader of FilterTabControl 2017-03-14 19:49:40 -07:00
2629f78afc Add FilterControl and FilterTabControl 2017-03-14 19:49:40 -07:00
b5a8ef07fe Update framework. 2017-03-15 09:46:03 +09:00
0fa2776975 Merge branch 'master' into counter_bindables 2017-03-10 14:21:33 +09:00
5f72265eff Remove float ValueAt method. 2017-03-10 14:09:55 +09:00
cd1717c42f More bindables! 2017-03-10 13:49:51 +09:00
2821451d5b Remove unused file. 2017-03-08 16:01:54 +09:00
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
0cad5d7d41 Fix most warnings. 2017-03-07 13:05:57 +09:00
bc74f453aa Merge branch 'master' into replay 2017-03-07 11:41:16 +09:00
9b92e99ce9 Merge branch 'master' into increase-ci-strictness 2017-03-06 21:44:39 +01:00
88f3dc0e02 Fix a few naming issues. 2017-03-06 18:49:23 +09:00
e356758a7d Don't expicitly set origin of TextAwesome. 2017-03-06 17:06:48 +09:00
4e4408cd20 Merge branch 'master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
2017-03-05 17:45:03 +09:00
73fef85b12 Remove unnecessary usings 2017-03-04 19:43:59 +01:00
a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
e12d89529c Merge remote-tracking branch 'upstream/master' into update-flow 2017-03-04 23:28:39 +09:00
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
e3c3806759 Fixed accuracy's counter first value change. 2017-03-04 04:48:32 -03:00
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
71534b3e13 Fix incorrect triangle density on first display. 2017-03-03 18:09:16 +09:00
1891bdf51e Merge branch 'master' into mod-overlay 2017-03-03 01:11:15 -04:00
ef13cdbff7 Disallow copying from OsuPasswordTextBox. 2017-03-03 10:00:39 +08:00
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
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
4163569e57 Fix some license headers. 2017-03-02 18:45:20 +09:00
ff5f0af2d3 Merge branch 'master' into popup-dialog 2017-03-02 16:42:20 +09:00
8040d6a03f Fix CursorTrail corruption by resetting on load. 2017-03-02 16:08:10 +09:00
367d6d694c Merge https://github.com/ppy/osu into mod-overlay 2017-03-02 01:44:18 -04:00
4d28696479 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
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
58ae9e888d Basic partial replay support. 2017-03-01 22:04:20 +09:00
e462ec46c3 Merge branch 'master' into general-fixes 2017-02-28 19:02:07 +01:00
585d42f89f Improve naming and correctness of triangles fading 2017-02-28 19:01:02 +01:00
570c95cb98 Merge https://github.com/ppy/osu into mod-overlay 2017-02-28 02:22:59 -04:00
e60cead483 Merge remote-tracking branch 'upstream/master' into warning_fixes 2017-02-28 13:49:19 +09:00
aa9582c0fa Add exponential fall-off of triangles' alpha values. 2017-02-28 11:28:25 +09:00
e8cae3b45e Remove new override in DialogButton 2017-02-27 21:38:25 -04:00
164f205ee5 Remove SpaceTextOnHover 2017-02-27 21:30:10 -04:00
3094c01a40 Merge https://github.com/ppy/osu into popup-dialog 2017-02-27 16:40:04 -04:00
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
3487dfe236 Removed unused variables and parameters 2017-02-27 17:32:32 +03:00
d78dca3d85 New design 2017-02-26 23:35:13 -04:00
47997c20ad Weld -> BindWith. 2017-02-27 12:24:53 +09:00
8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
c227eb1be5 Welded bindables. 2017-02-26 22:08:21 +09:00