RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,430 Commits 4 Branches 650 Tags 351 MiB
Commit Graph

277 Commits

Author SHA1 Message Date
smoogipooo 6cddd95734 Cleanup. 2017-03-14 17:02:20 +09:00
smoogipooo e52d5181f7 Fix a few visual tests failing. 2017-03-14 17:01:46 +09:00
smoogipooo 7141bc86d3 Rework beatmap post-processing into HitRenderer. 2017-03-14 17:01:21 +09:00
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
smoogipooo a502ff2c87 Fix post-merge issues. 2017-03-14 12:47:29 +09:00
Dan Balasescu 879a78156d Merge branch 'master' into mod_application 2017-03-14 12:38:55 +09:00
Dean Herbert ba10c3a8db
Revert "Merge pull request #441 from tacchinotacchi/archive-reader" 
This reverts commit 6f20473e65, reversing
changes made to c76a495d3d.
 2017-03-14 11:46:34 +09:00
Dean Herbert 980807d91e
Fix post-merge issues. 2017-03-13 22:33:41 +09:00
Dean Herbert b2981fb729 Merge branch 'master' into mod_application 2017-03-13 22:15:26 +09:00
smoogipooo f50e0bbf3c Rework/rewrite beatmap parsing to parse to base hit objects, which mode-specific beatmap converters can then use. 2017-03-13 19:15:25 +09:00
Alex Amadori 971d8eb7c5 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-13 10:56:31 +01:00
smoogipooo 7d129ebd6d Attempt to fix things. 2017-03-12 22:38:50 +09:00
smoogipooo c0e29652a6 Initial attempt at making mods apply better. 2017-03-12 22:13:43 +09:00
smoogipooo 64aab090d5 Instantiate HitRenderer with WorkingBeatmap. 2017-03-12 18:03:13 +09:00
smoogipooo 59b62b8fd4 Merge remote-tracking branch 'origin/master' into refactor_hitrenderer 2017-03-12 01:20:11 +09:00
smoogipooo 75ed7406e4 Merge remote-tracking branch 'origin/master' into refactor_hitrenderer 
Conflicts:
	osu.Game.Modes.Catch/CatchRuleset.cs
	osu.Game.Modes.Mania/ManiaRuleset.cs
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game.Modes.Taiko/TaikoRuleset.cs
 2017-03-11 14:22:59 +09:00
smoogipooo 02281d8a2a Make HitRenderer not have a publicly-settable Beatmap, replace AllObjectsJudged for performance. 2017-03-10 15:19:36 +09:00
smoogipooo c0bb2685bf Fix post-merge errors. 2017-03-10 14:44:38 +09:00
smoogipooo aed89b7c0f Merge branch 'general_hud' into counter_bindables 
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseScoreCounter.cs
	osu.Game/Modes/UI/HUDOverlay.cs
 2017-03-10 14:44:29 +09:00
smoogipooo 605326e8f6 More ComboCounter fixups + refactorings. 2017-03-10 14:34:08 +09:00
smoogipooo 7a68e46366 Merge remote-tracking branch 'origin/master' into combocounter_bindable 
Conflicts:
	osu.Game.Modes.Osu/OsuRuleset.cs
	osu.Game/Modes/Ruleset.cs
 2017-03-10 14:15:06 +09:00
smoogipooo cd1717c42f More bindables! 2017-03-10 13:49:51 +09:00
smoogipooo 4015b87965 General fixes. 2017-03-10 13:09:50 +09:00
smoogipooo 4cc032e1d7 Make ComboCounter count a bindable, and properly bind it to the processor. 2017-03-10 12:55:10 +09:00
Dan Balasescu 70d91e16d5 Merge branch 'master' into general_hud 2017-03-10 12:49:37 +09:00
smoogipooo 617ceb8001 Rename to StandardComboCounter, add HealthDisplay abstraction. 2017-03-10 12:47:00 +09:00
smoogipooo 31f6cbd8cf Rename ScoreOverlay -> HUDOverlay, move to osu.Game, make it not overridable by rulesets. 2017-03-10 12:14:13 +09:00
Dean Herbert 2b64de9dd8 Fix using statements. 2017-03-10 11:37:53 +09:00
smoogipooo fa9110ce6e Remove custom combo counters. 2017-03-10 11:04:46 +09:00
Alex Amadori 7374839923 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-09 17:07:00 +01:00
Dean Herbert dad6060149
Fix warnings not covered by resharper locally. 2017-03-09 16:07:34 +09:00
Dean Herbert d7497330b2
Reduce warning/suggestion count to zero. 2017-03-09 15:52:40 +09:00
Dean Herbert dc5ac6e88f
Add missing access modifiers. 2017-03-09 13:55:29 +09:00
Alex Amadori 1acd51cc90 Merge remote-tracking branch 'upstream/master' into archive-reader 2017-03-08 21:54:17 +01:00
Dean Herbert 5a42035f88
Update license headers. 2017-03-08 15:50:52 +09:00
Alex Amadori 309019aab3 Merge remote tracking branch 'upstream/master' into archive-reader 2017-03-07 08:41:44 +01:00
Dean Herbert 5cbcf7a20a
Fix error-level inspections. 2017-03-07 14:31:54 +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 0cad5d7d41
Fix most warnings. 2017-03-07 13:05:57 +09:00
Alex Amadori a297489151 Fix test 2017-03-07 00:03:04 +01:00
Dean Herbert faf07ab51a
Use generics everywhere. 2017-03-06 13:59:11 +09:00
Dean Herbert 5b4424d4fa
CreateAutoplayReplay -> CreateAutoplayScore. 2017-03-06 10:06:14 +09:00
Dean Herbert 54945415c0
Remove unnecessary usings. 2017-03-06 10:05:42 +09:00
Dean Herbert 1c5b918f9e Add osu! autoplay generation. 
Doesn't work on complex sliders yet.
 2017-03-05 17:46:00 +09:00
Dean Herbert 7afcac3660 Move PreferredPlayMode to WorkingBeatmap. 2017-03-05 17:45:40 +09:00
Dean Herbert 4e4408cd20 Merge branch 'master' into replay 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCasePlayer.cs
 2017-03-05 17:45:03 +09:00
Thomas Müller 73fef85b12 Remove unnecessary usings 2017-03-04 19:43:59 +01:00
Thomas Müller a14bdf8624 Use Color4Extensions from Framework and remove redundant Name 2017-03-04 19:42:37 +01:00
Dean Herbert 95e2e2b027
Replay loading via drag-drop huzzah! 2017-03-04 19:02:43 +09:00
Dean Herbert adb6f01e39
Create class hierarchy for Score/Replay storage. 2017-03-04 15:32:41 +09:00