Dean Herbert
54e1b24fe9
Enforce readonly private members where possible.
2017-03-23 13:50:08 +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
b46ded7794
Use Bindable for DropDown.
2017-03-22 07:49:21 +08:00
Dean Herbert
8983bbcaad
Merge branch 'master' into leaderboards
2017-03-22 08:24:49 +09: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
Andrey Zavadskiy
943bd737c4
Hide letterbox position sliders
2017-03-21 18:24:19 +03:00
smoogipooo
d27f37beb5
Hard-code text size in cases it wasn't set.
2017-03-20 13:48:06 +09:00
Dean Herbert
5d0adc6454
Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards
2017-03-19 18:51:53 +09:00
Jorolf
80de15d935
fixed typo
2017-03-18 15:22:03 +01:00
Thomas Müller
9af0104e3e
Fix NaN when dragging music controller
...
When dragging music controller we divide by the dragged distance.
When dragging to the origin of the drag this resulted in NaN.
Now, we check for this and use 0 in this case.
2017-03-18 12:46:12 +01:00
Seth
4aea06be22
Merge branch 'master' into leaderboards
2017-03-17 18:23:01 -03:00
Jorolf
8568e1536c
Separated menu and gameplay cursor size
2017-03-17 18:40:03 +01:00
Dean Herbert
ab8a5afdb9
AlwaysReceiveInput and InternalContains.
2017-03-16 17:38:36 +09:00
Dean Herbert
1ae4c2dfbb
Remove a lot of customisation from Avatar (and add it in individual usages).
2017-03-15 15:22:28 +09:00
DrabWeb
650fc7563d
ScoreRank, Avatar to own files, +DrawableRank
2017-03-14 10:58:28 -03:00
Seth
21a9996225
Merge branch 'master' into leaderboards
2017-03-14 10:07:33 -03:00
Dan Balasescu
879a78156d
Merge branch 'master' into mod_application
2017-03-14 12:38:55 +09:00
Huo Yaoyuan
3913a0a9ee
Fix removal of the last one beatmap.
2017-03-14 05:35:58 +08:00
DrabWeb
74eddc768a
Random diff
2017-03-13 13:02:56 -03:00
DrabWeb
8e90e05f23
Changed animation to match the one in Comp3 6c(will probably clean later), changed avatar sprite to a toolbar avatar(doesn't load in visual test since there's no OsuGame), removed random test case data, now static
2017-03-13 12:31:46 -03:00
DrabWeb
dbc8d513f9
Merge https://github.com/ppy/osu into leaderboards
2017-03-13 09:36:16 -03:00
smoogipooo
c0e29652a6
Initial attempt at making mods apply better.
2017-03-12 22:13:43 +09:00
Dean Herbert
e6f4fe9e61
Merge pull request #458 from Lahvuun/master
...
Options sidebar flickering fix.
2017-03-10 13:20:07 +09:00
Jorolf
9dd835e256
didn't see this was unnecessary after my changes
2017-03-09 21:43:11 +01:00
Jorolf
d9a4a677fd
Added Descriptions to Rulesets + PlayModes list
2017-03-09 21:37:03 +01:00
Lahvuun
427a0dd0f5
Options sidebar flickering fix.
2017-03-09 22:29:39 +02:00
Huo Yaoyuan
9007409072
Follow appveyor's code style check.
2017-03-09 16:44:45 +08:00
Dean Herbert
115ebd4773
Merge branch 'master' into modselect
2017-03-09 17:31:25 +09:00
Huo Yaoyuan
1b182b1361
Fix typo.
2017-03-09 15:55:40 +08:00
Dean Herbert
dad6060149
Fix warnings not covered by resharper locally.
2017-03-09 16:07:34 +09:00
Dean Herbert
d7497330b2
Reduce warning/suggestion count to zero.
2017-03-09 15:52:40 +09:00
Dean Herbert
a048e666d7
Fix autoproperty which doesn't work on mono.
2017-03-09 14:26:09 +09:00
Dean Herbert
da751804b6
Reduce error count.
2017-03-09 14:24:16 +09:00
Dean Herbert
3eece390cb
Abstract constructors -> protected.
2017-03-09 14:01:08 +09:00
Dean Herbert
0c4c1689b6
Merge branch 'master' into modselect
2017-03-09 12:51:40 +09:00
Dean Herbert
5a42035f88
Update license headers.
2017-03-08 15:50:52 +09:00
Huo Yaoyuan
b19405c987
Allow null in mod list to generate a placeholder ModButton.
2017-03-07 19:52:51 +08:00
Huo Yaoyuan
8979b28496
Remove usages of the 'new' keyword.
2017-03-07 16:17:51 +08:00
Huo Yaoyuan
b56d6c767b
Merge branch 'master' into modselect
2017-03-07 16:10:53 +08:00
Dean Herbert
bff1179624
Merge branch 'master' into replay
...
# Conflicts:
# osu.Game/Modes/Mod.cs
2017-03-07 14:32:14 +09:00
Dean Herbert
ecdbcb20cf
Fix error-level inspections.
2017-03-07 13:52:47 +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
3e4cd0dc7c
Merge remote-tracking branch 'upstream/master' into less-mods-enum
...
# Conflicts:
# osu.Game.Modes.Mania/ManiaMod.cs
# osu.Game.Modes.Osu/OsuMod.cs
# osu.Game/Modes/Mod.cs
2017-03-07 13:42:50 +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
