56 Commits

Author	SHA1	Message	Date
smoogipooo	d3e14aad1b	Use =>.	2017-03-10 14:55:43 +09:00
smoogipooo	58a88cc715	More general refactorings.	2017-03-10 14:42:14 +09:00
smoogipooo	f44fa56646	Merge branch 'general_hud' of https://github.com/smoogipooo/osu into general_hud ... Conflicts: osu.Game.Modes.Osu/OsuRuleset.cs	2017-03-10 13:42:50 +09:00
smoogipooo	2d6e667c7c	Renaming + use IEnumerable.	2017-03-10 13:40:44 +09:00
Dean Herbert	2813484f2e	Merge branch 'master' into general_hud	2017-03-10 13:25:26 +09:00
Dean Herbert	9e223bd77b	Merge pull request #459 from Jorolf/rulesetAndPlayModeRemake ... Added Descriptions to Rulesets + PlayModes list	2017-03-10 13:18:43 +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
smoogipooo	fa9110ce6e	Remove custom combo counters.	2017-03-10 11:04:46 +09:00
Jorolf	d9a4a677fd	Added Descriptions to Rulesets + PlayModes list	2017-03-09 21:37:03 +01:00
Dean Herbert	0c4c1689b6	Merge branch 'master' into modselect	2017-03-09 12:51:40 +09:00
Dean Herbert	5a42035f88	Update license headers.	2017-03-08 15:50:52 +09:00
Huo Yaoyuan	b3b813c0ae	Follow current mod layout.	2017-03-07 20:05:50 +08:00
Dean Herbert	02cab41d34	Move InputManager to a higher and more implicit level. ... Also makes KeyCounterCollection work with replays.	2017-03-07 19:30:48 +09:00
Dean Herbert	bff1179624	Merge branch 'master' into replay ... # Conflicts: # osu.Game/Modes/Mod.cs	2017-03-07 14:32:14 +09:00
Dean Herbert	5cbcf7a20a	Fix error-level inspections.	2017-03-07 14:31:54 +09:00
Dean Herbert	ecdbcb20cf	Fix error-level inspections.	2017-03-07 13:52:47 +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	3e4cd0dc7c	Merge remote-tracking branch 'upstream/master' into less-mods-enum ... # Conflicts: # osu.Game.Modes.Mania/ManiaMod.cs # osu.Game.Modes.Osu/OsuMod.cs # osu.Game/Modes/Mod.cs	2017-03-07 13:42:50 +09:00
Dean Herbert	0cad5d7d41	Fix most warnings.	2017-03-07 13:05:57 +09:00
Dean Herbert	12a3b1414f	Add sane defaults for abstract Mod class and remove remaining use of enum.	2017-03-06 18:29:19 +09:00
Dean Herbert	45f500920c	Don't use Mods enum for handling incompatible mods.	2017-03-06 18:29:17 +09:00
Dean Herbert	610de4a34c	Only show replay cursor when replay input is present.	2017-03-06 15:24:00 +09:00
Dean Herbert	faf07ab51a	Use generics everywhere.	2017-03-06 13:59:11 +09:00
Dean Herbert	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
Dean Herbert	8bb4bea1a4	Fix incorrect ordering.	2017-03-02 20:27:13 +09:00
DrabWeb	482be9f451	Remove AvailableMods	2017-03-02 02:04:26 -04:00
DrabWeb	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
DrabWeb	6c680825ed	ModSections in Ruleset, fixed toolbar play mode changed not firing	2017-03-01 22:05:52 -04:00
DrabWeb	bb12463ae4	Working on better way to handle mods	2017-03-01 20:57:33 -04:00
Dean Herbert	58ae9e888d	Basic partial replay support.	2017-03-01 22:04:20 +09:00
Dean Herbert	a22216d0b0	Update nuget packages.	2017-02-27 20:38:30 +09:00
Thomas Müller	1585ae842a	Update framework	2017-02-26 11:22:58 +09:00
Thomas Müller	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
Thomas Müller	a5dfa7ab06	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
Thomas Müller	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
Dean Herbert	580584a015	Don't use osu! mode parser for other game modes for now (convert still works).	2017-02-15 12:36:47 +09:00
Dean Herbert	f207da6041	Add/update license headers.	2017-02-14 18:17:35 +09:00
John Leuenhagen	7ad9cd6b6e	add explicit false values to prevent warnings as errors	2017-02-12 02:32:11 -05:00
Damnae	38b25a7df3	Add hit object stacking.	2017-02-09 07:28:40 +01:00
Dean Herbert	50bd80cb0c	Update and standardise license headers.	2017-02-07 14:27:41 +09:00
Dean Herbert	2ed5cf7c91	Hook up icons better.	2017-01-30 13:35:40 +09:00
TocoToucan	badc8def9a	hitObjectsNumber -> hitObjectCount	2017-01-18 18:51:38 +03:00
TocoToucan	259c0964fd	Specify ScoreProcessor.Judgements.Capacity in order to avoid List<T> internal auto reallocations	2017-01-16 23:14:35 +03:00
Dean Herbert	40ea6e0d72	Fix incorrect folder name.	2016-12-08 21:36:34 +09:00
Dean Herbert	f356640cb7	Add missing licence headers.	2016-12-06 19:07:15 +09:00
Dean Herbert	d71b284642	Make ScoreProcessor abstract and avoid making AddJudgement virtual.	2016-11-29 22:02:37 +09:00
Dean Herbert	9d2a69f1e2	Add concept of ScoreProcessor.	2016-11-29 20:30:16 +09:00
Dean Herbert	9871960112	Basic score flow.	2016-11-29 17:34:16 +09:00
Dean Herbert	3ac89216bd	Standardise some naming and make hitcircles feel better.	2016-11-19 19:07:57 +09:00
Dean Herbert	acb85d0140	Fix regressions in combo counters and tidy up naming of SpriteTexts.	2016-11-19 16:19:54 +09:00