RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,276 Commits 3 Branches 651 Tags 354 MiB
Commit Graph

1624 Commits

Author SHA1 Message Date
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 5cbcf7a20a
Fix error-level inspections. 2017-03-07 14:31:54 +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 1751532a01
Fix a few regressions. 2017-03-07 13:30:36 +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 39ff68a812 Add missing IncompatibleMods. 2017-03-07 09:16:47 +09:00
Thomas Müller 9b92e99ce9 Merge branch 'master' into increase-ci-strictness 2017-03-06 21:44:39 +01:00
Thomas Müller 6e9c4a4251 Merge branch 'master' into options-footer 2017-03-06 20:01:51 +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 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
Dean Herbert 12a3b1414f
Add sane defaults for abstract Mod class and remove remaining use of enum. 2017-03-06 18:29:19 +09:00
Dean Herbert 45f500920c
Don't use Mods enum for handling incompatible mods. 2017-03-06 18:29:17 +09:00
Huo Yaoyuan ad75ead665 selectedMod -> selectedIndex 2017-03-06 17:21:25 +08:00
Huo Yaoyuan c2cf5242e1 Remove one-entry backing fields. 2017-03-06 17:14:41 +08:00
Dean Herbert 463c887879
Fix WaveOverlayContainer staying visible when hidden. 2017-03-06 17:32:13 +09:00
Dean Herbert 9908c1905d
Add keyboard shortcuts at song select for mod/random/options. 2017-03-06 17:32:12 +09:00
Dean Herbert 5ec2db6558
Fix crash on opening options before intro has played. 2017-03-06 17:32:10 +09:00
Dean Herbert b5aff9df5f
Add options footer. 2017-03-06 17:30:46 +09:00
Dean Herbert 0ee38571a6
Move version-related properties to OsuGameBase. 2017-03-06 17:30:44 +09:00
Dean Herbert e356758a7d
Don't expicitly set origin of TextAwesome. 2017-03-06 17:06:48 +09:00
Huo Yaoyuan a34e6453bf Simplify SelectedMods. 2017-03-06 15:39:27 +08:00
Dean Herbert 610de4a34c
Only show replay cursor when replay input is present. 2017-03-06 15:24:00 +09:00
Dean Herbert 2de25c23b4
Make Mods IEnumerable. 2017-03-06 15:20:55 +09:00
Dean Herbert 76ef8c1a6c
Add bindable mods and autoplay support. 2017-03-06 14:52:37 +09:00
Dean Herbert 1ea21daa91
Fix PlayMode regression. 2017-03-06 14:25:38 +09:00
Dean Herbert 652d18aada
Update second usage of comment. 2017-03-06 14:20:44 +09:00
Dean Herbert 4118be6388
Remove unnecessary bounds check. 2017-03-06 14:19:22 +09:00
Dean Herbert 809828f0ba
Improve NextFrame. 2017-03-06 14:18:44 +09:00
Dean Herbert 1b03998b86
Improve comment of SetFrameFromTime. 2017-03-06 14:15:43 +09:00
Dean Herbert 3b0445a244
Improve comment for PreferredPlayMode and allow null. 2017-03-06 14:08:58 +09:00