Huo Yaoyuan
|
ffd79bee06
|
Remove inherited mods in incompatible list and add between Auto and NoFail.
|
2017-03-07 16:27:55 +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 |
|
Alex Amadori
|
2c7a9d2f77
|
Remove unnecessary using
|
2017-03-07 08:47:50 +01:00 |
|
Alex Amadori
|
309019aab3
|
Merge remote tracking branch 'upstream/master' into archive-reader
|
2017-03-07 08:41:44 +01:00 |
|
Dean Herbert
|
1fb846e61d
|
Make playfield scaling optional.
|
2017-03-07 15:49:04 +09:00 |
|
Dean Herbert
|
533868a608
|
Fix other regression.
|
2017-03-07 15:18:15 +09:00 |
|
Dean Herbert
|
577601a90f
|
Fix regression in deployment tool
|
2017-03-07 14:57:58 +09:00 |
|
Dean Herbert
|
2fc72b370d
|
Merge pull request #436 from peppy/replay
Replay loading via drag-drop huzzah!
|
2017-03-07 14:41:23 +09: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
|
5cbcf7a20a
|
Fix error-level inspections.
|
2017-03-07 14:31:54 +09:00 |
|
Dean Herbert
|
95fb34ccfb
|
Merge pull request #448 from peppy/less-mods-enum
Remove Mods enum.
|
2017-03-07 14:19:01 +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
|
688388333b
|
Merge pull request #449 from peppy/increase-ci-strictness
Raise warnings on unnecessary using statements.
|
2017-03-07 13:37:54 +09:00 |
|
Dean Herbert
|
1751532a01
|
Fix a few regressions.
|
2017-03-07 13:30:36 +09:00 |
|
Dean Herbert
|
0199181cce
|
Update framework.
|
2017-03-07 13:17:55 +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 |
|
Dean Herbert
|
12c316aba4
|
Fix int truncation.
|
2017-03-07 11:29:55 +09:00 |
|
Dean Herbert
|
9106c45858
|
Fix remaining errors.
|
2017-03-07 10:42:59 +09:00 |
|
Dean Herbert
|
2198fab7f3
|
Update framework.
|
2017-03-07 10:19:02 +09:00 |
|
Dean Herbert
|
39ff68a812
|
Add missing IncompatibleMods.
|
2017-03-07 09:16:47 +09:00 |
|
Alex Amadori
|
aee7b05bae
|
ArchiveManager decoupling
|
2017-03-07 00:10:33 +01:00 |
|
Alex Amadori
|
a297489151
|
Fix test
|
2017-03-07 00:03:04 +01:00 |
|
Alex Amadori
|
fd53d10264
|
Refactor ArchiveReader for extensibility
|
2017-03-06 23:56:08 +01:00 |
|
Thomas Müller
|
9b92e99ce9
|
Merge branch 'master' into increase-ci-strictness
|
2017-03-06 21:44:39 +01:00 |
|
Thomas Müller
|
f0126e8c76
|
Merge pull request #446 from peppy/options-footer
Options footer
|
2017-03-06 21:44:19 +01:00 |
|
Thomas Müller
|
6e9c4a4251
|
Merge branch 'master' into options-footer
|
2017-03-06 20:01:51 +01:00 |
|
Thomas Müller
|
1fdf865c88
|
Update framework
|
2017-03-06 20:01:36 +01:00 |
|
Thomas Müller
|
2d7d499f3d
|
Merge pull request #447 from peppy/general-fixes
General fixes
|
2017-03-06 20:01:08 +01:00 |
|
Thomas Müller
|
9fd16be2d4
|
Refactor IsDebug
|
2017-03-06 19:59:29 +01:00 |
|
Huo Yaoyuan
|
27edc9971e
|
Update deselect logic.
Change to DeselectTypes to avoid enumerating children for multi times.
|
2017-03-07 01:15:21 +08:00 |
|
Huo Yaoyuan
|
eda7e1b26f
|
Fix and update mode changing handling.
|
2017-03-07 01:01:42 +08:00 |
|
Huo Yaoyuan
|
5cd859ecf1
|
Fix missed color during loading.
|
2017-03-07 00:46:36 +08:00 |
|
Huo Yaoyuan
|
836484ba51
|
Add abstract ModType for ModSection.
|
2017-03-07 00:32:22 +08:00 |
|
Huo Yaoyuan
|
318ab68af1
|
Use Bindable<IEnumerable<Mod>> to fit other changes.
|
2017-03-07 00:17:06 +08:00 |
|
Huo Yaoyuan
|
59d1fdb032
|
Simplify ModSection.
|
2017-03-07 00:12:06 +08:00 |
|
Dean Herbert
|
fc6bd386ea
|
Fix remaining usage of hit window constants.
|
2017-03-06 23:26:57 +09:00 |
|
Dean Herbert
|
b55a579d15
|
Fix typo.
|
2017-03-06 23:00:21 +09:00 |
|
Dean Herbert
|
57cbecba83
|
Required changes for framework merge (https://github.com/ppy/osu-framework/pull/554).
|
2017-03-06 22:08:02 +09:00 |
|
Dean Herbert
|
dcc7386609
|
Add option toggle for debug cached setting.
|
2017-03-06 22:07:46 +09:00 |
|
Huo Yaoyuan
|
564b3f0706
|
Refactor icon management of ModButton.
|
2017-03-06 19:03:26 +08:00 |
|
Dean Herbert
|
f5c27d99a4
|
Add error handling to import process (resolves await warning).
|
2017-03-06 19:59:40 +09:00 |
|
Dean Herbert
|
c24a4f57d9
|
Raise errors on unnecessary using statements.
|
2017-03-06 19:15:47 +09:00 |
|
Huo Yaoyuan
|
a91d897282
|
Handle left and right mouse button only.
|
2017-03-06 18:02:51 +08:00 |
|
Dean Herbert
|
1e48b0a037
|
Ensure AssemblyName is never null (seems to be on CI server).
|
2017-03-06 19:00:15 +09:00 |
|
Dean Herbert
|
88f3dc0e02
|
Fix a few naming issues.
|
2017-03-06 18:49:23 +09:00 |
|
Huo Yaoyuan
|
f6f20cafd3
|
Merge remote-tracking branch 'peppy/less-mods-enum' into modselect
|
2017-03-06 17:35:15 +08:00 |
|