h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 17:42:54 +08:00
Code Issues Releases Wiki Activity
854212a7aa
osu-lazer/osu.Game/Modes
History
smoogipooo 854212a7aa Merge branch 'master' into beatmap_parsing 
Conflicts:
	osu.Desktop.VisualTests/app.config
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Mania/app.config
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Osu/app.config
	osu.Game.Modes.Taiko/TaikoRuleset.cs
	osu.Game/Modes/Ruleset.cs
	osu.Game/app.config
	osu.Game/osu.Game.csproj
2017-03-14 13:39:19 +09:00
..
Mods Applyable -> Applicable. 2017-03-14 12:32:31 +09:00
Objects Add license headers. 2017-03-14 13:02:42 +09:00
UI Merge branch 'master' into beatmap_parsing 2017-03-14 13:39:19 +09:00
LegacyReplay.cs Update framework. 2017-03-14 12:01:58 +09:00
PlayMode.cs Added Descriptions to Rulesets + PlayModes list 2017-03-09 21:37:03 +01:00
Replay.cs Replay loading via drag-drop huzzah! 2017-03-04 19:02:43 +09:00
Ruleset.cs Merge branch 'master' into beatmap_parsing 2017-03-14 13:39:19 +09:00
Score.cs Combo should not be longs. 2017-03-10 16:05:05 +09:00
ScoreProcesssor.cs Combo should not be longs. 2017-03-10 16:05:05 +09:00