Commit Graph

123 Commits

Author SHA1 Message Date
5cbcf7a20a Fix error-level inspections. 2017-03-07 14:31:54 +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
0cad5d7d41 Fix most warnings. 2017-03-07 13:05:57 +09:00
fc6bd386ea Fix remaining usage of hit window constants. 2017-03-06 23:26:57 +09:00
c24a4f57d9 Raise errors on unnecessary using statements. 2017-03-06 19:15:47 +09:00
610de4a34c Only show replay cursor when replay input is present. 2017-03-06 15:24:00 +09:00
faf07ab51a Use generics everywhere. 2017-03-06 13:59:11 +09:00
20fcb8848b Move constants to base OsuHitObject representation. 2017-03-06 12:58:14 +09:00
910d9ccc00 Add proper slider following support to OsuAutoReplay. 2017-03-06 11:11:42 +09:00
56922b66be Refactor sliders to have more central position/progress calculations. 2017-03-06 11:11:29 +09:00
cb002ce7af General refactoring of OsuAutoReplay. 2017-03-06 10:10:29 +09:00
5b4424d4fa CreateAutoplayReplay -> CreateAutoplayScore. 2017-03-06 10:06:14 +09:00
1c5b918f9e Add osu! autoplay generation.
Doesn't work on complex sliders yet.
2017-03-05 17:46:00 +09:00
4e4408cd20 Merge branch 'master' into replay
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
2017-03-05 17:45:03 +09:00
73fef85b12 Remove unnecessary usings 2017-03-04 19:43:59 +01:00
a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
e12d89529c Merge remote-tracking branch 'upstream/master' into update-flow 2017-03-04 23:28:39 +09:00
a2317e5a1e Update usage of FillDirection 2017-03-04 11:00:17 +01:00
e3c3806759 Fixed accuracy's counter first value change. 2017-03-04 04:48:32 -03:00
adb6f01e39 Create class hierarchy for Score/Replay storage. 2017-03-04 15:32:41 +09:00
9e1383fa48 Merge remote-tracking branch 'upstream/master' into replay
# Conflicts:
#	osu.Game.Modes.Catch/CatchRuleset.cs
#	osu.Game.Modes.Mania/ManiaRuleset.cs
#	osu.Game.Modes.Taiko/TaikoRuleset.cs
#	osu.Game/Screens/Play/Player.cs
2017-03-04 13:17:01 +09:00
471b9daa93 Merge branch 'master' into mod-overlay
# Conflicts:
#	osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj
#	osu.Game/Screens/Select/PlaySongSelect.cs
#	osu.Game/osu.Game.csproj
2017-03-02 20:27:04 +09:00
4163569e57 Fix some license headers. 2017-03-02 18:45:20 +09:00
482be9f451 Remove AvailableMods 2017-03-02 02:04:26 -04:00
367d6d694c Merge https://github.com/ppy/osu into mod-overlay 2017-03-02 01:44:18 -04:00
1eee587c18 CreateModSections -> GetModsFor(PlayMode), fixed deselect not working in ModSelectOverlay, added MultiMod for multiple mods in one mod, fixed issues with SelectedColour in ModSection 2017-03-02 01:07:28 -04:00
6c680825ed ModSections in Ruleset, fixed toolbar play mode changed not firing 2017-03-01 22:05:52 -04:00
bb12463ae4 Working on better way to handle mods 2017-03-01 20:57:33 -04:00
4d28696479 FlowDirection -> FillDirection 2017-03-01 20:15:38 +01:00
9c853b0465 Update framewörk 2017-03-01 19:33:01 +01:00
d46e68b36b Merge branch 'master' of github.com:ppy/osu into flowcontainer-refactor
# Conflicts:
#	osu-framework
#	osu.Game/Beatmaps/Drawables/BeatmapGroup.cs
2017-03-01 18:05:58 +01:00
58ae9e888d Basic partial replay support. 2017-03-01 22:04:20 +09:00
f0e9ed4636 Fix regression in TrianglesPiece. 2017-03-01 11:56:14 +09:00
03889e6ca6 Update References to FlowStrategies
References now use the Create*-names instead of the outdated
Get*-names to create instances of FlowStrategies.
2017-02-27 16:55:55 +01:00
a22216d0b0 Update nuget packages. 2017-02-27 20:38:30 +09:00
47997c20ad Weld -> BindWith. 2017-02-27 12:24:53 +09:00
8d91519d59 Update usage of FlowContainer and its subclasses 2017-02-26 21:32:43 +01:00
c227eb1be5 Welded bindables. 2017-02-26 22:08:21 +09:00
1585ae842a Update framework 2017-02-26 11:22:58 +09:00
d150eb4450 Merge branch 'master' into better-star-counter 2017-02-24 19:37:04 +01:00
f7d985fe18 Fix and refactor star difficulty calculation boilerplate
Moves star difficulty calculation entry-point to Beatmap, and sets
star difficulty at the correct place for song select to display.
2017-02-24 19:36:17 +01:00
564608fe52 Fix incorrect slider assert logic (and improve flow). 2017-02-24 18:31:05 +09:00
a5dfa7ab06 Remove unnecessary using statements 2017-02-23 21:38:10 +01:00
735961977b Improve feel of spinners. 2017-02-22 18:23:06 +09:00
00ddcb11b4 Fix sliders playing hitsound twice at end. 2017-02-22 13:51:40 +09:00
7a0cea332f Add support for varying circle size 2017-02-19 18:21:45 +01:00
502ad4aa53 Fix incorrect naming scheme 2017-02-19 18:21:15 +01:00
417f146386 Add difficulty calculation
Adds base classes for difficulty calculations, hooks them up with
carousel container, and adds a port of the osu difficulty calculator.
2017-02-19 17:41:51 +01:00
1a31589abd Add padding zeroes to score display (and fix not being applied initially). 2017-02-18 17:35:37 +09:00
32ce8cf723 Audio class renames in line with framework changes. 2017-02-18 17:35:04 +09:00