Commit Graph

113 Commits

Author SHA1 Message Date
8f0ab2040f Add Jetbrains.Annotations NuGet package 2018-01-26 12:46:28 +01:00
c01f67b0d8 Merge remote-tracking branch 'upstream/master' into ruleset-configs 2018-01-23 16:23:25 +09:00
68a6323168 Remove SpecialColumnPosition for now
This needs to be re-implemented in the future, perhaps in a way that allows it to be dynamically changed.
2018-01-22 16:19:05 +09:00
77c4da5f0f KeyCoop -> DualStages 2018-01-22 15:11:15 +09:00
583aa9922f IKeyBindingMod -> IPlayfieldTypeMod 2018-01-22 15:07:14 +09:00
9f4ebad6e3 Add mania config manager 2018-01-17 20:21:25 +09:00
8a7892b66a Make variant keybindings work 2018-01-15 19:29:51 +09:00
e947e46566 fix :
1. Add space before {, before Duration, and after 1000
2. How about just ManiaStage?
3. This is really just Columns.Count, you're not saving much with this extra variable here.
2018-01-14 11:41:52 +09:00
561c9f2233 update rom ppy master
.
Find out that has some problem long hit note will not show hit result
2018-01-14 11:32:54 +09:00
f71d086a41 Fix post-merge issues 2018-01-10 18:08:43 +09:00
86b5591583 Merge remote-tracking branch 'origin/master' into scrolling-hitobjects-rewrite 2018-01-10 18:02:49 +09:00
4060583b10 Merge branch 'master' of https://github.com/ppy/osu
# Conflicts:
#	osu.Game.Rulesets.Mania/Mods/ManiaModGravity.cs
2018-01-09 22:09:25 +09:00
b8bb0a52e3 Move mod implementations to individual files 2018-01-09 14:08:18 +09:00
1276e2c71a Merge branch 'master' into scrolling-hitobjects-rewrite 2018-01-05 14:58:57 +09:00
f34131f8f4 Initial game-wide replacement of scrolling playfields 2018-01-04 18:50:17 +09:00
5326f71ed9 fix some error that smoogipoo says 2018-01-03 22:58:08 +09:00
ee13df94fc Merge branch 'mania-rc-cleanup' of https://github.com/smoogipoo/osu
# Conflicts:
#	osu.Game.Rulesets.Mania/UI/ManiaRulesetContainer.cs
2018-01-03 22:02:50 +09:00
b68daaeb4b Group -> Stage 2018-01-03 19:13:42 +09:00
bd171926d6 Remove AvailableColumns from ManiaRulesetContainer
Also restructures with the addition of a ManiaBeatmap which holds definitions for "groups" of columns. At the moment these are empty save for a "Column" property, but can be expanded in the future, maybe.
2018-01-03 18:44:25 +09:00
3f318fde2f Merge branch 'master' into master 2017-12-29 22:48:07 +09:00
2ca10b28c6 Use a non-broken opentk library 2017-12-29 15:42:51 +09:00
28da60cc38 https://github.com/ppy/osu/issues/716
1. split the playfield columns by ManiaModKeyCoop
2. can chaneg the key number by ManiaKeyMod
2017-12-28 22:40:23 +09:00
5b529511ec Update OpenTK nuget package
Fixes the recent AppVeyor errors
2017-12-27 13:18:34 +09:00
c99ea32574 Merge branch 'master' into beatmap-serialization 2017-12-21 13:39:39 +09:00
4a723f7382 Added the "Service Include" tag that is used by Visual Studio's test explorer to the .csproj files 2017-12-08 11:05:00 +01:00
b584178e85 Make Beatmap ISerializable and add more JsonIgnores 2017-12-06 00:37:37 +09:00
36be171c29 Fix up/clean up csprojs for C#7 support 2017-11-30 02:06:03 +09:00
a0c3349935 Add LangVer.props and osu.Game.props for common csproj properties 2017-11-30 00:45:37 +09:00
3e01a0dda5 Merge branch 'master' into mania-auto-generation-fixes 2017-11-29 19:11:36 +09:00
dfd035d07b Merge remote-tracking branch 'origin/master' into mania-auto-generation-fixes 2017-11-29 18:42:17 +09:00
93d7cd5a6d Merge branch 'master' into performance-calculator 2017-11-29 18:37:07 +09:00
1136db1556 Fix mania replays not defining important frames
Resolves https://github.com/ppy/osu/issues/1495 .
2017-11-29 14:20:15 +09:00
f8c296877b Add testcase for mania beatmap conversion (currently ignored) 2017-11-28 18:59:20 +09:00
38fe95d94a Add basic display for pp in TestCasePerformancePoints 2017-11-17 14:37:19 +09:00
bbc5c05055 Disable ruleset-level tests for now 2017-10-23 21:25:54 +09:00
c5046f6b3c Add back osu.Desktop project
While it was nice having less projects to deal with, it meant hacks to get around circular dependencies between rulesets and osu.Game. For now, let's just restore the osu.Desktop project and call it a day.

This allows for the project to build again with default visual studio settings.
2017-10-14 14:33:05 +09:00
b306eaca6e Move mania tests to correct namespace 2017-10-10 16:50:46 +09:00
e0911f014e Fix ruleset target path for release builds 2017-09-19 22:50:36 +09:00
99b512cce5 Output ruleset assemblies to the game folder rather than adding special logic 2017-09-19 19:27:14 +09:00
1f20c5eb69 Optimise project references 2017-09-19 16:07:00 +09:00
8fa76557db Avoid unnecessary dll copies 2017-09-19 16:06:59 +09:00
6db705a3a8 Update relative paths 2017-09-19 16:06:58 +09:00
6d3d485565 And then everything became one 2017-09-19 16:06:58 +09:00
fb7740a3ab Update all dependencies in line with framework 2017-09-13 20:25:40 +09:00
ee8ec31c6e Merge branch 'master' into judgement-revamp 2017-09-12 18:57:37 +09:00
1194e46ef1 Merge remote-tracking branch 'upstream/master' into judgement-revamp 2017-09-12 17:46:21 +09:00
160ad1924f Remove unneeded reference 2017-09-12 17:01:40 +09:00
6a815d343c Remove unneeded class. 2017-09-12 16:58:06 +09:00
3be9d3c747 Merge branch 'master' into mania-autoplay 2017-09-12 16:44:05 +09:00
8737a1b1a5 Implement osu!mania auto replay generation. 2017-09-12 15:52:32 +09:00