|
|
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 |
|
|
|
0c4c1689b6
|
Merge branch 'master' into modselect
|
2017-03-09 12:51:40 +09:00 |
|
|
|
9f40a888ec
|
Update BeatmapArchiveReader's test
|
2017-03-08 21:55:38 +01:00 |
|
|
|
1acd51cc90
|
Merge remote-tracking branch 'upstream/master' into archive-reader
|
2017-03-08 21:54:17 +01: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 |
|
|
|
b19405c987
|
Allow null in mod list to generate a placeholder ModButton.
|
2017-03-07 19:52:51 +08: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 |
|
|
|
ffd79bee06
|
Remove inherited mods in incompatible list and add between Auto and NoFail.
|
2017-03-07 16:27:55 +08:00 |
|
|
|
8979b28496
|
Remove usages of the 'new' keyword.
|
2017-03-07 16:17:51 +08:00 |
|
|
|
b56d6c767b
|
Merge branch 'master' into modselect
|
2017-03-07 16:10:53 +08:00 |
|
|
|
2c7a9d2f77
|
Remove unnecessary using
|
2017-03-07 08:47:50 +01:00 |
|
|
|
309019aab3
|
Merge remote tracking branch 'upstream/master' into archive-reader
|
2017-03-07 08:41:44 +01: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 |
|
|
|
aee7b05bae
|
ArchiveManager decoupling
|
2017-03-07 00:10:33 +01:00 |
|
|
|
fd53d10264
|
Refactor ArchiveReader for extensibility
|
2017-03-06 23:56:08 +01: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 |
|
|
|
27edc9971e
|
Update deselect logic.
Change to DeselectTypes to avoid enumerating children for multi times.
|
2017-03-07 01:15:21 +08:00 |
|
|
|
eda7e1b26f
|
Fix and update mode changing handling.
|
2017-03-07 01:01:42 +08:00 |
|
|
|
5cd859ecf1
|
Fix missed color during loading.
|
2017-03-07 00:46:36 +08:00 |
|
|
|
836484ba51
|
Add abstract ModType for ModSection.
|
2017-03-07 00:32:22 +08:00 |
|
|
|
318ab68af1
|
Use Bindable<IEnumerable<Mod>> to fit other changes.
|
2017-03-07 00:17:06 +08:00 |
|
|
|
59d1fdb032
|
Simplify ModSection.
|
2017-03-07 00:12:06 +08: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 |
|
|
|
564b3f0706
|
Refactor icon management of ModButton.
|
2017-03-06 19:03:26 +08: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 |
|
|
|
a91d897282
|
Handle left and right mouse button only.
|
2017-03-06 18:02:51 +08: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 |
|
|
|
f6f20cafd3
|
Merge remote-tracking branch 'peppy/less-mods-enum' into modselect
|
2017-03-06 17:35:15 +08: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 |
|
