Commit Graph

1622 Commits

Author SHA1 Message Date
da751804b6 Reduce error count. 2017-03-09 14:24:16 +09:00
01c379da19 User invariant culture sorting. 2017-03-09 14:02:20 +09:00
3eece390cb Abstract constructors -> protected. 2017-03-09 14:01:08 +09:00
0976e205d8 Remove redundant parentheses. 2017-03-09 14:00:17 +09:00
dc5ac6e88f Add missing access modifiers. 2017-03-09 13:55:29 +09:00
9772f2a042 Update framework. 2017-03-09 13:50:33 +09:00
2821451d5b Remove unused file. 2017-03-08 16:01:54 +09:00
5a42035f88 Update license headers. 2017-03-08 15:50:52 +09:00
123c8f3489 Add comment. 2017-03-08 11:54:52 +09:00
02cab41d34 Move InputManager to a higher and more implicit level.
Also makes KeyCounterCollection work with replays.
2017-03-07 19:30:48 +09:00
1fb846e61d Make playfield scaling optional. 2017-03-07 15:49:04 +09:00
bff1179624 Merge branch 'master' into replay
# Conflicts:
#	osu.Game/Modes/Mod.cs
2017-03-07 14:32:14 +09:00
5cbcf7a20a Fix error-level inspections. 2017-03-07 14:31:54 +09:00
ecdbcb20cf Fix error-level inspections. 2017-03-07 13:52:47 +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
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
1751532a01 Fix a few regressions. 2017-03-07 13:30:36 +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
12c316aba4 Fix int truncation. 2017-03-07 11:29:55 +09:00
9106c45858 Fix remaining errors. 2017-03-07 10:42:59 +09:00
39ff68a812 Add missing IncompatibleMods. 2017-03-07 09:16:47 +09:00
9b92e99ce9 Merge branch 'master' into increase-ci-strictness 2017-03-06 21:44:39 +01:00
6e9c4a4251 Merge branch 'master' into options-footer 2017-03-06 20:01:51 +01:00
9fd16be2d4 Refactor IsDebug 2017-03-06 19:59:29 +01:00
57cbecba83 Required changes for framework merge (https://github.com/ppy/osu-framework/pull/554). 2017-03-06 22:08:02 +09:00
dcc7386609 Add option toggle for debug cached setting. 2017-03-06 22:07:46 +09:00
f5c27d99a4 Add error handling to import process (resolves await warning). 2017-03-06 19:59:40 +09:00
c24a4f57d9 Raise errors on unnecessary using statements. 2017-03-06 19:15:47 +09:00
1e48b0a037 Ensure AssemblyName is never null (seems to be on CI server). 2017-03-06 19:00:15 +09:00
88f3dc0e02 Fix a few naming issues. 2017-03-06 18:49:23 +09:00
12a3b1414f Add sane defaults for abstract Mod class and remove remaining use of enum. 2017-03-06 18:29:19 +09:00
45f500920c Don't use Mods enum for handling incompatible mods. 2017-03-06 18:29:17 +09:00
463c887879 Fix WaveOverlayContainer staying visible when hidden. 2017-03-06 17:32:13 +09:00
9908c1905d Add keyboard shortcuts at song select for mod/random/options. 2017-03-06 17:32:12 +09:00
5ec2db6558 Fix crash on opening options before intro has played. 2017-03-06 17:32:10 +09:00
b5aff9df5f Add options footer. 2017-03-06 17:30:46 +09:00
0ee38571a6 Move version-related properties to OsuGameBase. 2017-03-06 17:30:44 +09:00
e356758a7d Don't expicitly set origin of TextAwesome. 2017-03-06 17:06:48 +09:00
610de4a34c Only show replay cursor when replay input is present. 2017-03-06 15:24:00 +09:00
2de25c23b4 Make Mods IEnumerable. 2017-03-06 15:20:55 +09:00
76ef8c1a6c Add bindable mods and autoplay support. 2017-03-06 14:52:37 +09:00
1ea21daa91 Fix PlayMode regression. 2017-03-06 14:25:38 +09:00
652d18aada Update second usage of comment. 2017-03-06 14:20:44 +09:00
4118be6388 Remove unnecessary bounds check. 2017-03-06 14:19:22 +09:00
809828f0ba Improve NextFrame. 2017-03-06 14:18:44 +09:00
1b03998b86 Improve comment of SetFrameFromTime. 2017-03-06 14:15:43 +09:00
3b0445a244 Improve comment for PreferredPlayMode and allow null. 2017-03-06 14:08:58 +09:00
faf07ab51a Use generics everywhere. 2017-03-06 13:59:11 +09:00
81cc27e104 Fix typo. 2017-03-06 10:06:25 +09:00