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

298 Commits

Author SHA1 Message Date
Dean Herbert e78bcf8739
Update TabControl in line with framework changes. 2017-03-17 00:39:40 +09:00
smoogipooo e0a8c3b1e5 Rename BaseDifficulty -> Difficulty / BeatmapDifficulty. 2017-03-16 23:18:02 +09:00
Dean Herbert 64825c32c5
Add margin to testcase to better see edges. 2017-03-16 21:16:30 +09:00
Dean Herbert bd5493fb25
Add back correct defaults. 2017-03-16 16:44:14 +09:00
Dean Herbert 95757ac420
Merge remote-tracking branch 'refs/remotes/2yangk23/master' 
# Conflicts:
#	osu.Desktop.VisualTests/Tests/TestCaseTabControl.cs
 2017-03-16 16:38:42 +09:00
Dean Herbert 334e389518
Tidy up OsuTabControl and FilterControl. 2017-03-16 16:35:44 +09:00
Kelvin 58fc0a2622 Make TabControl test label more clear 2017-03-15 22:49:23 -07:00
Dean Herbert da6b98db10
fixup! Filter doesn't need to be public, nor have a property. 2017-03-16 14:23:48 +09:00
Drew DeVault 3aecbf5739 Rearrange things somewhat 2017-03-15 20:15:40 -04:00
Drew DeVault cac6c42aac Merge remote-tracking branch 'upstream/master' into tab-control 2017-03-15 20:15:28 -04:00
smoogipooo 0a24a30b1d Use DrawableOsuHitObject instead. 2017-03-15 21:48:01 +09:00
smoogipooo 42da0f1a72 Merge remote-tracking branch 'origin/master' into generic_judgements_2 
Conflicts:
	osu.Desktop.VisualTests/Tests/TestCaseHitObjects.cs
	osu.Game.Modes.Catch/UI/CatchHitRenderer.cs
	osu.Game.Modes.Mania/UI/ManiaHitRenderer.cs
	osu.Game.Modes.Mania/osu.Game.Modes.Mania.csproj
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs
	osu.Game.Modes.Osu/Objects/Drawables/DrawableSpinner.cs
	osu.Game.Modes.Osu/UI/OsuHitRenderer.cs
	osu.Game.Modes.Taiko/UI/TaikoHitRenderer.cs
	osu.Game.Modes.Taiko/osu.Game.Modes.Taiko.csproj
	osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs
	osu.Game/Modes/UI/HitRenderer.cs
	osu.Game/osu.Game.csproj
 2017-03-15 21:36:43 +09:00
smoogipooo e0e0a2726d Move OsuJudgementInfo to its own class, remove PositionalJudgementInfo. 2017-03-15 19:23:42 +09:00
smoogipooo 36e8618370 Make DrawableHitObjects have generic JudgementInfos. 2017-03-15 18:55:38 +09:00
smoogipooo 6a31219781 Add further abstraction to Sliders/IHasCurve. 2017-03-15 12:52:25 +09:00
Kelvin 18afd8eabe Fixed license headers 2017-03-14 20:30:42 -07:00
Kelvin 755fb260db Updated TabControl Usage 2017-03-14 19:52:21 -07:00
Kelvin 40bcc63a90 Added and styled FilterTabControls 2017-03-14 19:49:40 -07:00
Kelvin 2629f78afc Add FilterControl and FilterTabControl 2017-03-14 19:49:40 -07:00
smoogipooo 4c7f0fcb73 Fix unit tests. 2017-03-14 18:46:34 +09:00
smoogipooo d6ccc66b23 Attempt to fix nullref warning. 2017-03-14 17:46:35 +09:00
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