1079 Commits

Author	SHA1	Message	Date
DrabWeb	9798117d53	Move RoomStatus to a class instead of enum	2017-05-22 21:13:57 -03:00
DrabWeb	03f6cded84	MultiplayerRoom -> Room	2017-05-22 12:44:58 -03:00
ColdVolcano	a1547f12d4	Applied suggestions + Update Framework	2017-05-22 04:38:21 -05:00
smoogipooo	3235e280a9	Add to csproj.	2017-05-22 17:32:18 +09:00
EVAST9919	b99bad055d	oops	2017-05-22 09:28:36 +03:00
EVAST9919	50e3feb761	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-22 09:12:40 +03:00
DrabWeb	7ce3b73ecd	Added UserPanel and UserStatus	2017-05-22 03:11:42 -03:00
EVAST9919	d717ccf85e	Settings -> ReplaySettings	2017-05-22 09:07:08 +03:00
Huo Yaoyuan	d0ff9e6576	Merge branch 'master' into sections	2017-05-22 12:52:27 +08:00
DrabWeb	800a319470	Remove newline	2017-05-22 01:08:35 -03:00
DrabWeb	0c30b2c698	Remove folder from osu.Game.csproj	2017-05-22 01:07:26 -03:00
DrabWeb	0795089d86	Merge https://github.com/ppy/osu into drawable-multiplayer-room	2017-05-22 01:06:05 -03:00
DrabWeb	e5ee7096f8	Initial cleanup	2017-05-22 00:07:15 -03:00
DrabWeb	c4e6870c12	Merge https://github.com/ppy/osu into roompanel	2017-05-21 22:37:00 -03:00
DrabWeb	bc980b60ac	Add files to project, update with framework changes	2017-05-21 22:36:46 -03:00
smoogipooo	0a0139aded	Remove the concept of beatmap events, rename BreakEvent -> BreakPeriod.	2017-05-22 10:12:33 +09:00
Jorolf	5b244367ee	allow for solutions were the osu repository isn't at the solution level	2017-05-21 20:29:05 +02:00
EVAST9919	0615f104f0	SettingsContainer -> SettingsDropdownContainer	2017-05-21 18:22:27 +03:00
DrabWeb	6a8d745db1	Use Channels in ChannelListItems, ChannelSection, fix ChannelListItem being misaligned	2017-05-20 18:29:57 -03:00
DrabWeb	31890a1e01	Initial layout, channels items	2017-05-20 18:06:25 -03:00
Dean Herbert	0b987be600	Merge branch 'master' into osu-direct	2017-05-20 16:17:59 +09:00
DrabWeb	e030573436	Add ReverseDepthFillFlowContainer to remove code duplication	2017-05-19 23:44:36 -03:00
DrabWeb	cdd2b54dc7	Move SlimEnumDropdown into it's own file	2017-05-19 20:25:08 -03:00
DrabWeb	83c81c0626	Cleanup (again)	2017-05-19 20:03:07 -03:00
Huo Yaoyuan	24a813e907	Basic children management of SectionsContainer.	2017-05-20 05:15:57 +08:00
DrabWeb	5b2c74be50	Remove Direct folder from csproj	2017-05-19 16:24:27 -03:00
DrabWeb	e1c4c36122	+BeatmapOnlineInfo, +OnlineWorkingBeatmap, minor cleanups, panel beatmap backgrounds	2017-05-19 15:43:18 -03:00
EVAST9919	4d0d27aa88	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-19 15:25:48 +03:00
EVAST9919	f2af31aceb	Naming fixes	2017-05-18 20:21:58 +03:00
EVAST9919	83a89ce22d	options -> settings	2017-05-18 11:39:22 +03:00
EVAST9919	d07d94d606	better resizing	2017-05-18 07:09:36 +03:00
EVAST9919	35bc3a42aa	Merge remote-tracking branch 'refs/remotes/ppy/master' into ingame_options	2017-05-18 06:36:15 +03:00
smoogipooo	eebd5a910e	Merge remote-tracking branch 'origin/master' into mania-beatmap-conversion	2017-05-18 11:59:31 +09:00
DrabWeb	cabfe72c92	Changed DirectPanel to a base class for DirectGridPanel and DirectListPanel	2017-05-17 18:02:33 -03:00
DrabWeb	5fb445e3fe	Basic direct panel, minor cleanups	2017-05-17 16:37:34 -03:00
Dean Herbert	41c252760d	Move all pause logic into PauseContainer	2017-05-17 21:57:01 +09:00
EVAST9919	e0625a9b30	More overlays and overall fixes	2017-05-17 15:39:26 +03:00
smoogipooo	74c23ff6d8	Add base for event parsing code.	2017-05-17 20:46:23 +09:00
DrabWeb	9ba356f2c6	Added osu!direct header and filter control	2017-05-17 05:58:34 -03:00
EVAST9919	1a4025ab3c	ingame options basic logic	2017-05-17 10:36:57 +03:00
smoogipooo	17466a662c	Add hold note conversion.	2017-05-17 13:09:07 +09:00
Dan Balasescu	91de72e161	Merge branch 'master' into on-screen-display	2017-05-16 16:27:19 +09:00
Dean Herbert	5e5ad9a899	Add basic on-screen display	2017-05-16 15:03:03 +09:00
Dean Herbert	dcd4b4450d	Add error message in chat when attempting to use commands	2017-05-15 13:26:35 +09:00
Dean Herbert	eaaba11586	Change all instances of options to settings where applicable	2017-05-15 10:55:29 +09:00
Dan Balasescu	815379646c	Merge branch 'master' into new-option-search	2017-05-12 20:22:11 +09:00
Dean Herbert	d3770d8395	Merge branch 'master' into chat-design-update	2017-05-12 19:57:57 +09:00
Dean Herbert	d2e066ca35	Move SearchTextBox to better namespace ... Is being used in multiple places now.	2017-05-12 19:57:06 +09:00
Dean Herbert	dbf60d24bf	Second design update pass.	2017-05-12 15:39:00 +09:00
Dean Herbert	c4a93cbc85	Move drawable chat related classes to better namespace	2017-05-12 15:38:51 +09:00
EVAST9919	1f34cec5ce	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-11 22:22:57 +03:00
Dean Herbert	9a1c662d1f	Update framework	2017-05-11 21:25:43 +09:00
Dean Herbert	ec67b617ae	Add OptionsHeader class ... Makes search textbox anchor correctly. Also improves visual styling.	2017-05-11 16:06:18 +09:00
EVAST9919	ae2186970c	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-08 18:16:16 +03:00
Dean Herbert	df4a737c9b	Merge remote-tracking branch 'ppy/master' into hud-mod-display	2017-05-08 10:56:34 +09:00
EVAST9919	d06b5783cb	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-06 17:33:51 +03:00
Dean Herbert	c9ba1ac4f6	Adjust namespaces. ... Also adds transition, uses IHasCurrentValue, combines Mod TestCases and more.	2017-05-05 13:00:05 +09:00
Dean Herbert	6298b3effd	Refactor ModSection and ModIcon to avoid null mods.	2017-05-05 12:16:41 +09:00
Dean Herbert	153951d3dd	Add OptionItem class ... Allow for centalised logic for all option UI controls.	2017-05-04 23:07:48 +09:00
EVAST9919	26985dbc62	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-03 16:22:40 +03:00
Dean Herbert	19f6d58723	Merge remote-tracking branch 'upstream/master' into options-implementation	2017-05-03 21:54:27 +09:00
EVAST9919	f49cc124ed	Merge remote-tracking branch 'refs/remotes/ppy/master' into mods_refactor	2017-05-03 08:26:54 +03:00
EVAST9919	a897dcbfbe	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-03 08:26:01 +03:00
EVAST9919	7e1efcc20b	Added ModsContainer	2017-05-02 22:34:07 +03:00
Dean Herbert	691742b828	Remove most options which have not yet been implemented.	2017-05-02 19:40:30 +09:00
smoogipooo	8e88d86639	Fix naming confusion.	2017-05-02 18:00:37 +09:00
Dean Herbert	1b0f353af3	Add support for framework-level mouse confining.	2017-05-02 17:45:42 +09:00
Dean Herbert	bef15fe637	Improve organisation of some options and config code.	2017-05-02 17:45:22 +09:00
EVAST9919	108cd28e96	Merge remote-tracking branch 'refs/remotes/ppy/master' into percentage	2017-05-02 10:15:56 +03:00
smoogipooo	e856abe59a	Let's not use Country for drawings-specific stuff...	2017-05-02 13:02:14 +09:00
Dean Herbert	2e0eda6b15	Merge branch 'master' into playlist	2017-05-01 19:44:57 +09:00
Dean Herbert	580cf93147	Refactoring part 4.	2017-05-01 15:03:11 +09:00
Dean Herbert	37944bb04e	Initial refactoring.	2017-05-01 13:01:08 +09:00
DrabWeb	c193a90a16	Merge https://github.com/ppy/osu into playlist	2017-04-29 05:39:52 -03:00
Thomas Tan	9b8b88601f	Create "AutoGenerator" base class and interface.	2017-04-29 02:08:48 +08:00
EVAST9919	eacf2045f0	Initial commit	2017-04-28 04:56:34 +03:00
smoogipooo	28f7e0cdba	Introduce SampleInfoList as List<SampleInfo> to reduce generic nesting. Fix CI warnings.	2017-04-26 14:12:21 +09:00
Dan Balasescu	91b264da1a	Merge branch 'master' into info-wedge-design-update	2017-04-25 08:14:59 +09:00
Dean Herbert	c7b789424b	Update BeatmapInfoWedge design ... - Adds colour difficulty strip. - Adjusts paddings. - Fixes source/artist confusion. - Double dash to em-dash.	2017-04-24 20:19:44 +09:00
Dean Herbert	e1a2f1bc7a	Add beatmap metrics lookup.	2017-04-24 19:17:11 +09:00
Dean Herbert	239f19ad02	Fix incorrect line endings.	2017-04-24 14:10:44 +09:00
Dan Balasescu	6fb8676215	Merge branch 'master' into nodal-hit-sounds	2017-04-22 22:11:19 +09:00
smoogipooo	2af9bf1423	Prefix everything inside Rulesets.Objects.Legacy with "Convert" to avoid naming clashes with Ruleset projects.	2017-04-22 21:33:11 +09:00
smoogipooo	5cdbb226f8	Remove CurvedHitObject to make RepeatSamples not tied to curve.	2017-04-21 20:40:11 +09:00
Dean Herbert	3f832731c9	Add DoubleTime, HalfTime and Nightcore support.	2017-04-21 17:33:37 +09:00
Dean Herbert	c87657707f	Add tooltip to sliderbars. Move interface.	2017-04-20 17:33:07 +09:00
Dean Herbert	4ca27a5395	Merge branch 'master' into tooltips	2017-04-20 15:08:26 +09:00
Dean Herbert	2a422ca5fa	Remove ScoreStatistic.	2017-04-20 11:26:02 +09:00
Dean Herbert	6cf026e5c1	Remove OsuScore and change the way statistics are stored (dynamic dictionary).	2017-04-20 11:03:11 +09:00
Dan Balasescu	66cb604081	Merge branch 'master' into score-statistics	2017-04-20 10:06:43 +09:00
Jorolf	e8aea3ccd2	Merge branch 'master' of git://github.com/ppy/osu into tooltips	2017-04-19 15:33:35 +02:00
Jorolf	d04893a43a	---changing---	2017-04-19 15:33:24 +02:00
Dan Balasescu	dd3f9c1cdd	Merge branch 'master' into results-screen	2017-04-19 21:58:40 +09:00
Jorolf	af9a45fd6c	Merge branch 'master' into tooltips	2017-04-19 13:51:39 +02:00
Dean Herbert	093abd6872	Add chat toggle button.	2017-04-19 19:54:03 +09:00
Dean Herbert	3129708ccb	Add chat sending support.	2017-04-19 18:46:52 +09:00
Dean Herbert	3b95fbab7d	Add score statistic tracking (osu!).	2017-04-19 16:29:27 +09:00
Dean Herbert	72fcc09a98	Add beatmap info and score date. ... Also adjusts design metrics.	2017-04-18 22:22:14 +09:00
Dean Herbert	d51b37cb44	Add a basic implementation of the new design results screen.	2017-04-18 22:22:14 +09:00
Dean Herbert	3b21340e1b	Split SquareGraph out and make SongProgressGraph also able to take a list of Objects.	2017-04-18 18:40:02 +09:00
Dean Herbert	fbd26a1d5e	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
smoogipooo	d04353aed0	Legacy mania hit objects don't have a "column", this should be determined by the beatmap converter.	2017-04-18 11:13:11 +09:00
smoogipooo	0e1ce333e3	Make IBeatmapProcessor a class with virtual methods.	2017-04-18 09:43:43 +09:00
smoogipooo	efc050a95a	Make IBeatmapConverter an abstract class instead of an interface.	2017-04-18 09:38:52 +09:00
smoogipooo	456aee63ca	Mode IBeatmapConverter and IBeatmapProcessor to osu.Game.Modes.Beatmaps namespace.	2017-04-18 09:36:08 +09:00
smoogipooo	09208adf81	Re-implement legacy hit object conversion.	2017-04-18 08:58:21 +09:00
Jorolf	dd26f9fcac	Merge branch 'master' of git://github.com/ppy/osu into tooltips	2017-04-17 14:45:46 +02:00
Dean Herbert	a4e2f34ee7	Make a RulesetDatabase.	2017-04-17 17:43:48 +09:00
Dean Herbert	83b083ce64	Move SQLite connections out of database classes; make abstract Database.	2017-04-17 14:37:52 +09:00
Dean Herbert	ce12cc20bd	Merge remote-tracking branch 'upstream/master' into remove-playmode	2017-04-17 13:00:53 +09:00
Adrian Kaz Scherzinger	60f7879875	Explicitly set C# 6.0 for now.	2017-04-16 06:44:08 +09:00
smoogipooo	0a1376c2db	Remove PlayMode game-wide.	2017-04-15 05:22:41 +09:00
smoogipooo	59bfc7abad	Move statics to RulesetCollection to avoid conflicts later on.	2017-04-15 04:53:37 +09:00
Dan Balasescu	3de3b94978	Merge branch 'master' into song-progress-graph	2017-04-15 01:29:02 +09:00
Dean Herbert	ac3b435f00	Merge remote-tracking branch 'upstream/master' into hud-improvements ... # Conflicts: # osu.Game.Modes.Osu/Scoring/OsuScoreProcessor.cs	2017-04-14 19:29:59 +09:00
Dean Herbert	09195a03a2	Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Game/Overlays/DragBar.cs	2017-04-14 11:25:00 +09:00
Jorolf	f6f75fac74	Merge branch 'master' of git://github.com/ppy/osu into tooltips ... # Conflicts: # osu.Game/Graphics/Cursor/MenuCursor.cs	2017-04-13 23:12:07 +02:00
Jorolf	c2b2e5ec19	changed way the tool tip is found and displayed	2017-04-13 23:00:49 +02:00
Dean Herbert	2c3fa30386	Metric -> Metrics.	2017-04-12 21:09:39 +09:00
Dean Herbert	157ad17606	Merge branch 'master' into details	2017-04-12 20:25:51 +09:00
Dean Herbert	c0338a82e7	Update nuget packages. ... Includes fix in OpenTK for focus issues.	2017-04-12 19:35:16 +09:00
Dean Herbert	c615762da6	wip	2017-04-11 18:56:25 +09:00
Jorolf	a597149b7f	Merge branch 'details' of github.com:Jorolf/osu into details	2017-04-10 16:42:42 +02:00
Jorolf	24b4b3ad7d	update to everything	2017-04-10 16:42:23 +02:00
Dean Herbert	c6a24bb549	Merge branch 'master' into details	2017-04-10 20:07:13 +09:00
Andrey Zavadskiy	e73f543c4f	Applied suggestions	2017-04-10 06:06:10 +03:00
Andrey Zavadskiy	425e96c45c	Moved logic to it's own class	2017-04-09 17:44:19 +03:00
DrabWeb	963cd09bd0	Merge https://github.com/ppy/osu into playlist	2017-04-09 04:04:13 -03:00
Jorolf	899e559b5c	ratings hide now + remove unnessary stuff	2017-04-07 19:58:49 +02:00
Jorolf	eb4b3772e9	put Bar into its own file and let it only add a background if BackgroundColour is changed	2017-04-07 18:13:55 +02:00
Dean Herbert	12d2102a88	Merge remote-tracking branch 'upstream/master' into song-progress-graph ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Modes/UI/HudOverlay.cs # osu.Game/Screens/Play/PauseOverlay.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj	2017-04-07 09:22:18 +09:00
Jorolf	e59c0a770f	Merge branch 'master' into details	2017-04-06 15:42:00 +02:00
Huo Yaoyuan	9b1e010dcc	Fix filename mismatch.	2017-04-06 16:05:41 +08:00
Dan Balasescu	6fc1384927	Merge branch 'master' into taiko-fixes	2017-04-06 16:23:22 +09:00
Dean Herbert	4783d17d94	Merge branch 'master' into better-hitsounds	2017-04-06 16:00:56 +09:00
smoogipooo	cec8bca78a	Implement IJsonSerializable, BeatmapInfo IJsonSerializable.	2017-04-06 15:54:50 +09:00
Dean Herbert	a18367454d	InGameOverlay -> MenuOverlay.	2017-04-06 15:34:52 +09:00
smoogipooo	c65ab5b6f1	General cleanup.	2017-04-06 11:56:19 +09:00
smoogipooo	eb82a4c090	Back to using SampleInfo + fix taiko beatmap conversion.	2017-04-06 11:41:16 +09:00
smoogipooo	2d8239a3f7	Re-implement the SampleBank/Sample structure. No parsing support yet.	2017-04-05 21:34:28 +09:00
Andrey Zavadskiy	62655b70c9	Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor	2017-04-04 18:41:37 +03:00
smoogipooo	5e67bcb581	Remove a few unused classes.	2017-04-04 13:14:45 +09:00
Jorolf	5a694e0c9d	changed location of BarGraph to be more generic	2017-04-03 19:29:13 +02:00
Jorolf	f3946bebb4	Merge branch 'master' of git://github.com/ppy/osu into details	2017-04-03 18:33:47 +02:00
smoogipooo	19b5555ef2	Slightly clean up archive readers + decoders. Read beatmap version into BeatmapInfo.	2017-04-03 20:26:46 +09:00
Jorolf	e835b19d4a	add Tooltips	2017-04-02 18:19:59 +02:00
Andrey Zavadskiy	3574dac780	Merge remote-tracking branch 'refs/remotes/ppy/master' into pause_buttons_refactor	2017-04-01 21:03:19 +03:00
Jorolf	47698be1f5	Merge branch 'master' into details	2017-03-31 21:10:45 +02:00
Dean Herbert	14fcc197e9	Merge branch 'master' into partial-judgements	2017-03-31 16:53:49 +09:00
Dean Herbert	50c328f1b4	Merge remote-tracking branch 'upstream/master' into partial-judgements ... # Conflicts: # osu.Game/osu.Game.csproj	2017-03-31 16:46:40 +09:00
Dean Herbert	5d25fa3282	Merge remote-tracking branch 'upstream/master' into accented-interface	2017-03-31 16:38:19 +09:00
Dean Herbert	fa7c72a099	Refactor ReplayInputHandler creation for more flexibility.	2017-03-31 15:59:53 +09:00
Dean Herbert	0f4b98ce73	Move FramedReplayInputHandler to own file and un-nest.	2017-03-31 15:32:34 +09:00
smoogipooo	43c306d658	IAccented -> IHasAccentColour.	2017-03-31 15:06:31 +09:00
Dean Herbert	e7ecc479c9	Add FramedReplay and use where legacy is not needed.	2017-03-31 12:43:42 +09:00
smoogipooo	d944b8c192	Implement IAccented interface + transform.	2017-03-31 11:01:42 +09:00
Jorolf	0d4f2c59a5	there's probably something in here I overlooked	2017-03-30 17:32:18 +02:00
Jorolf	6982529481	Merge branch 'master' of git://github.com/ppy/osu into details	2017-03-29 15:47:00 +02:00
smoogipooo	3050039972	Implement partial judgements + make Result non-nullable.	2017-03-29 18:35:28 +09:00
Jorolf	305bc9cff6	Merge branch 'master' of git://github.com/ppy/osu into details	2017-03-28 17:14:35 +02:00
Andrey Zavadskiy	cf3db49631	Inherit Pause/Fail overlay from InGameOverlay	2017-03-28 12:09:26 +03:00
Andrey Zavadskiy	62693a6a59	Again separate classes	2017-03-28 10:49:58 +03:00
Andrey Zavadskiy	9774f826ab	Pause and fail overlays -> StopOverlay	2017-03-28 06:08:31 +03:00
Andrey Zavadskiy	5461c6516a	Refactor PauseOverlay, FailDialog -> FailOverlay	2017-03-28 04:53:57 +03:00
Dean Herbert	13272e6995	Make Avatar accept a user. ... Add UpdateableAvatar to handle the toolbar use-case.	2017-03-28 00:08:26 +09:00
Dean Herbert	039f4a65dc	Combine user models.	2017-03-28 00:08:24 +09:00
Jorolf	775fd63d0f	Added difficulty container	2017-03-25 23:33:03 +01:00
ElegantMonkey	0678274118	Rename OptionDropdown and OptionEnumDropdown files	2017-03-25 07:45:04 -03:00
Jorolf	d8724e5e3e	Add metadata details	2017-03-24 23:02:24 +01:00
DrabWeb	215b016f32	Initial implementation	2017-03-24 05:59:26 -03:00
DrabWeb	befbc63c35	Merge https://github.com/ppy/osu into song-progress-graph	2017-03-23 23:42:06 -03:00
smoogipooo	2074812f46	Move ScoreProcessor and Score to Scoring/.	2017-03-24 09:51:52 +09:00
Dean Herbert	2cb801317d	JudgementInfo -> Judgement. ... There is no case where we use the term "Judgement" without the suffix, so deemed it unnecessary.	2017-03-23 19:00:18 +09:00
DrabWeb	0337f18fb9	Cleaning	2017-03-23 06:37:12 -03:00
Dean Herbert	4d61424abd	Merge branch 'master' into song-progress-graph	2017-03-23 17:44:22 +09:00
Dan Balasescu	e9a061c709	Merge branch 'master' into beatmap-detail-tabs	2017-03-23 17:13:02 +09:00
smoogipooo	c9fe9e681d	Make judgement text generic to be used between game modes.	2017-03-23 12:49:28 +09:00
DrabWeb	c173c4b7ee	Tab control	2017-03-23 00:22:31 -03:00
Dean Herbert	9601e143d4	Merge branch 'master' into working-beatmap	2017-03-23 09:37:21 +09:00
Dean Herbert	ba32d50456	Consolidate nested classes.	2017-03-23 08:44:52 +09:00
Huo Yaoyuan	0dbc232ebf	Rename all DropDown -> Dropdown.	2017-03-22 22:32:32 +08:00
DrabWeb	29c54d4d8b	Merge https://github.com/ppy/osu into song-progress-graph	2017-03-22 08:50:17 -03:00
Drew DeVault	cc2b4c5c5b	Refactor WorkingBeatmap ... Gets ArchiveReader out of WorkingBeatmap and delegates extracting stuff from it to subclasses. Should enable us to make an OnlineWorkingBeatmap or so.	2017-03-22 05:57:08 -04:00
Huo Yaoyuan	e217c67bcf	Merge branch 'master' into controls	2017-03-22 08:54:03 +08:00
Dean Herbert	8983bbcaad	Merge branch 'master' into leaderboards	2017-03-22 08:24:49 +09:00
Huo Yaoyuan	f0edf5d3d3	Update to DropDown and Menu.	2017-03-22 07:18:53 +08:00
smoogipooo	a272675705	Parse time signature from legacy beatmap control points.	2017-03-21 21:18:08 +09:00
Dean Herbert	5d0adc6454	Merge remote-tracking branch 'upstream/master' into DrabWeb/leaderboards	2017-03-19 18:51:53 +09:00
Dean Herbert	6c12da54f1	Merge pull request #499 from smoogipooo/legacy_beatmap_flag ... Add legacy beatmap flag.	2017-03-19 12:39:41 +09:00
DrabWeb	b0e7296e25	-IHasDrawableRepresentation, User.Region -> Country	2017-03-19 00:09:58 -03:00
smoogipooo	26b0bb02d8	Remove IIsLegacy, expose LegacyBeatmap without a public constructor.	2017-03-18 18:32:54 +09:00
Seth	4aea06be22	Merge branch 'master' into leaderboards	2017-03-17 18:23:01 -03:00
DrabWeb	0834b5b794	Made requested changes	2017-03-17 18:16:59 -03:00
Dan Balasescu	e529f5e439	Merge branch 'master' into song-select-loading-reoptimisation	2017-03-18 02:12:56 +09:00
Dean Herbert	292de44a0b	WIP menu cursor.	2017-03-17 20:45:27 +09:00
Dean Herbert	907236e475	Move filtering to BeatmapCarousel (but actual logic is now in FilterCriteria.	2017-03-17 19:54:51 +09:00
Dean Herbert	4b97304603	CarouselContainer -> BeatmapCarousel.	2017-03-17 19:12:54 +09:00
smoogipooo	862c4c408f	Add legacy beatmap flag.	2017-03-17 14:24:46 +09:00
Dean Herbert	60fc782e93	Merge branch 'master' into beatmap_timinginfo	2017-03-16 23:08:24 +09:00
Dean Herbert	271dddc9a7	Merge branch 'master' into generic_scoreprocessor	2017-03-16 23:04:19 +09:00
Dean Herbert	110bdbd0c1	Make everything share DropDown implementations again. Remove unnecessary files.	2017-03-16 21:17:14 +09:00
smoogipooo	5137338c7c	Replace List<ControlPoint> with TimingInfo in Beatmap.	2017-03-16 17:11:24 +09:00
Dean Herbert	334e389518	Tidy up OsuTabControl and FilterControl.	2017-03-16 16:35:44 +09:00
smoogipooo	7b66faab9e	Fix filename.	2017-03-16 12:59:09 +09:00
Dean Herbert	a22b34817c	Merge branch 'master' into leaderboards	2017-03-16 11:12:53 +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	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
DrabWeb	7572947214	Badge -> Team	2017-03-15 08:09:44 -03:00
smoogipooo	0f4df0566b	HasSpecial -> HasHold.	2017-03-15 19:43:38 +09:00
smoogipooo	c24d98cd11	Merge branch 'beatmap_parsing' of https://github.com/smoogipooo/osu into beatmap_parsing	2017-03-15 19:40:12 +09:00
smoogipooo	76c0a4d836	HitObjectType -> LegacyHitObjectType, move to Legacy namespace.	2017-03-15 19:39:40 +09:00
Dan Balasescu	a3906820ec	Merge branch 'master' into beatmap_parsing	2017-03-15 19:29:45 +09:00
smoogipooo	bf66b84ff8	Move a few classes/enums into separate files.	2017-03-15 16:07:40 +09:00
Dean Herbert	e3e19a156c	Rename incorrect class file.	2017-03-15 14:37:29 +09:00
Dean Herbert	8f5d262f30	Add GetScoresRequest API methods.	2017-03-15 14:06:05 +09:00
smoogipooo	6a31219781	Add further abstraction to Sliders/IHasCurve.	2017-03-15 12:52:25 +09:00
Dean Herbert	253bcebf51	Merge remote-tracking branch 'upstream/master' into leaderboards ... # Conflicts: # osu.Game/osu.Game.csproj	2017-03-15 12:23:34 +09:00
Kelvin	2629f78afc	Add FilterControl and FilterTabControl	2017-03-14 19:49:40 -07:00
DrabWeb	650fc7563d	ScoreRank, Avatar to own files, +DrawableRank	2017-03-14 10:58:28 -03:00
DrabWeb	2e8b1ad390	Woops	2017-03-14 10:09:58 -03:00
Seth	21a9996225	Merge branch 'master' into leaderboards	2017-03-14 10:07:33 -03:00
Huo Yaoyuan	e1cc74bb40	Merge branch 'master' into more-songselect	2017-03-14 20:50:53 +08:00
Huo Yaoyuan	3871a350f8	Move BeatmapOptions buttons to derived class and simplify.	2017-03-14 19:38:21 +08:00
smoogipooo	785b970125	Add special interface for LegacyHold.	2017-03-14 18:49:22 +09:00
smoogipooo	a1833fd6b0	Whoops, naming.	2017-03-14 18:49:01 +09:00
smoogipooo	4c7f0fcb73	Fix unit tests.	2017-03-14 18:46:34 +09:00
smoogipooo	ad9583a179	Merge branch 'beatmap_parsing' of https://github.com/smoogipooo/osu into beatmap_parsing	2017-03-14 18:06:50 +09:00
smoogipooo	1f43370886	Fix failing unit test, move legacy hitobjects to Objects/Legacy/.	2017-03-14 18:06:32 +09:00
Huo Yaoyuan	c3a0549cdd	Move player specific stuff to derived PlaySongSelect.	2017-03-14 16:58:34 +08:00
Dean Herbert	5c2bf02c9d	Merge branch 'master' into beatmap_parsing	2017-03-14 17:50:00 +09:00
Huo Yaoyuan	fae6afa9e3	Create basic SongSelect class.	2017-03-14 16:44:35 +08:00
smoogipooo	7141bc86d3	Rework beatmap post-processing into HitRenderer.	2017-03-14 17:01:21 +09:00
Dean Herbert	14b22445fa	Merge remote-tracking branch 'upstream/master' into general-fixes ... # Conflicts: # osu.Game/Modes/UI/HitRenderer.cs	2017-03-14 16:15:26 +09:00
Dean Herbert	1f68731a09	Split PlayerInputManager into two classes, allowing more precise handling of input (for KeyCounter).	2017-03-14 16:00:35 +09:00
smoogipooo	90ad2e9731	Remove unused interface.	2017-03-14 15:50:36 +09:00
smoogipooo	072eea82ea	Fix up combo colours + a few nullrefs.	2017-03-14 14:50:12 +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
Dan Balasescu	879a78156d	Merge branch 'master' into mod_application	2017-03-14 12:38:55 +09:00
smoogipooo	bc5912eab5	Applyable -> Applicable.	2017-03-14 12:32:31 +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
Huo Yaoyuan	db104d04d3	Use AutoGenerateBindingRedirects instead of explicit app.config.	2017-03-14 03:20:33 +08:00
Dean Herbert	2756d5f09f	Merge branch 'master' into mod_application	2017-03-13 23:00:11 +09:00
Dean Herbert	c51e97e8cc	Merge pull request #471 from smoogipooo/beatmap_conversion ... Beatmap conversion	2017-03-13 22:17:22 +09:00
Dean Herbert	b2981fb729	Merge branch 'master' into mod_application	2017-03-13 22:15:26 +09:00
DrabWeb	442a2c97db	Merge conflicts	2017-03-13 09:44:22 -03:00
DrabWeb	dbc8d513f9	Merge https://github.com/ppy/osu into leaderboards	2017-03-13 09:36:16 -03:00
DrabWeb	9912f5f9e1	Team -> Region, +IHasDrawableRepresentation, +Badge(placeholder for now), +Region to User, LeaderboardScoreDisplay -> LeaderboardScore	2017-03-13 09:33:25 -03:00
Alex Amadori	caa6e9c82b	General improvements	2017-03-13 11:29:24 +01: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	35ddca78f5	Remove old, unused hit object converters (will be re-implemented through IBeatmapConverter).	2017-03-13 14:50:55 +09:00
smoogipooo	c0e29652a6	Initial attempt at making mods apply better.	2017-03-12 22:13:43 +09:00
smoogipooo	3480dca0ad	Remove PlayMode enum requirement. Clean things up a lot.	2017-03-12 14:32:50 +09:00
smoogipooo	77a4a896c9	Cleanups.	2017-03-12 01:08:34 +09:00
smoogipooo	592e05a2c8	Better beatmap conversion model.	2017-03-12 00:34:21 +09:00
smoogipooo	75a5da62d0	Fix filenames.	2017-03-10 16:11:38 +09:00
smoogipooo	4015b87965	General fixes.	2017-03-10 13:09:50 +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
Alex Amadori	309019aab3	Merge remote tracking branch 'upstream/master' into archive-reader	2017-03-07 08:41:44 +01: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
Dan Balasescu	bc74f453aa	Merge branch 'master' into replay	2017-03-07 11:41:16 +09:00
Alex Amadori	fd53d10264	Refactor ArchiveReader for extensibility	2017-03-06 23:56:08 +01:00
Thomas Müller	9b92e99ce9	Merge branch 'master' into increase-ci-strictness	2017-03-06 21:44:39 +01:00
Dean Herbert	dcc7386609	Add option toggle for debug cached setting.	2017-03-06 22:07:46 +09:00
Dean Herbert	b5aff9df5f	Add options footer.	2017-03-06 17:30:46 +09:00
Dean Herbert	95e2e2b027	Replay loading via drag-drop huzzah!	2017-03-04 19:02:43 +09:00
Dean Herbert	aa9d85624d	Change IPC to make sense.	2017-03-04 18:51:16 +09:00
DrabWeb	a112b354f0	Basic implementation of score UI	2017-03-04 03:37:34 -04:00
Dean Herbert	adb6f01e39	Create class hierarchy for Score/Replay storage.	2017-03-04 15:32:41 +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	6f3b59268a	Merge pull request #385 from DrabWeb/mod-overlay ... Mod select	2017-03-03 21:09:08 +09:00
Dean Herbert	dc6a728cce	Merge branch 'master' into tournament_drawings	2017-03-03 20:48:07 +09:00
Dean Herbert	38a9e820e6	GroupsContainer -> GroupContainer.	2017-03-03 20:46:07 +09:00
Dean Herbert	bc01935a89	Move around some namespaces.	2017-03-03 20:42:22 +09:00
smoogipooo	5a4d07d770	Better way to initialize team lists.	2017-03-03 18:47:56 +09:00
Seth	fde509ab1d	Merge branch 'master' into mod-overlay	2017-03-03 04:12:42 -04:00
smoogipooo	777996d884	Rewrite VisualiserLine + add VisualiserContainer.	2017-03-03 15:43:16 +09:00
Seth	1891bdf51e	Merge branch 'master' into mod-overlay	2017-03-03 01:11:15 -04:00
Seth	2e74b4be60	Merge branch 'master' into beatmap-options	2017-03-03 00:52:45 -04:00
Dan Balasescu	09a2d39e3e	Merge branch 'master' into tournament_drawings	2017-03-03 13:06:18 +09:00
smoogipooo	efb13b29d1	General cleanups.	2017-03-03 13:01:57 +09:00
DrabWeb	7a4b9c5571	osu.Game.Overlays.BeatmapOptions -> osu.Game.Screens.Select.Options	2017-03-02 21:20:30 -04:00
Dean Herbert	3a8246f56d	Move PauseOverlay to correct namespace.	2017-03-03 10:17:39 +09:00
DrabWeb	b856fb5991	Implemented beatmap options overlay	2017-03-02 08:40:55 -04:00
Dean Herbert	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
Dean Herbert	435e845067	Merge branch 'master' into DrabWeb/song-progress-graph ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj # osu.Game/Overlays/Pause/PauseProgressBar.cs # osu.Game/Overlays/Pause/PauseProgressGraph.cs # osu.Game/osu.Game.csproj	2017-03-02 20:20:27 +09:00
Dean Herbert	58ae9e888d	Basic partial replay support.	2017-03-01 22:04:20 +09:00
smoogipooo	35d246b59d	Merge remote-tracking branch 'origin/master' into tournament_drawings	2017-03-01 19:32:33 +09:00
DrabWeb	570c95cb98	Merge https://github.com/ppy/osu into mod-overlay	2017-02-28 02:22:59 -04:00
DrabWeb	ce1798b8bc	DialogManager -> DialogOverlay, cleaned up how BeatmapDeletDialog works, added global DialogOverlay	2017-02-28 02:09:36 -04:00
DrabWeb	50d172be39	Added DialogManager(not wired up for desktop project yet)	2017-02-28 00:59:36 -04:00
DrabWeb	fbd9523596	Added beatmap delete dialog	2017-02-27 23:19:28 -04:00
DrabWeb	3094c01a40	Merge https://github.com/ppy/osu into popup-dialog	2017-02-27 16:40:04 -04:00
smoogipooo	fc33bf4761	Add drawings config.	2017-02-27 23:29:18 +09:00
smoogipooo	5f3e484353	Add scrolling teams container.	2017-02-27 23:29:06 +09:00
Dean Herbert	a22216d0b0	Update nuget packages.	2017-02-27 20:38:30 +09:00
smoogipooo	25a1c7a8ad	Initial groups implementation.	2017-02-27 14:19:07 +09:00
DrabWeb	d78dca3d85	New design	2017-02-26 23:35:13 -04:00
Dean Herbert	79993a576f	Add basic GC options.	2017-02-26 18:06:59 +09:00
DrabWeb	c94da4fcf0	Added popup dialog	2017-02-24 00:05:37 -04:00
Seth	b4b88712ad	Merge branch 'master' into mod-overlay	2017-02-23 08:00:24 -04:00
Dean Herbert	7e7bf07d03	Remove unused whitebox.	2017-02-23 11:11:46 +09:00
DrabWeb	99f1f88c75	Merge https://github.com/ppy/osu into mod-overlay	2017-02-22 12:35:55 -04:00
Dean Herbert	aef0eb49a1	Add loading screen.	2017-02-22 21:53:59 +09:00
Dean Herbert	afba4fbfad	Merge remote-tracking branch 'upstream/master' into chat-improvement	2017-02-21 15:46:28 +09: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	520e040396	Add FocusedTextBox abstraction.	2017-02-19 17:59:22 +09:00
Dean Herbert	0da0ef5a1b	Fix padding, fonts and alignment of chat display.	2017-02-19 17:06:41 +09:00
DrabWeb	006fb5502d	ModSelect -> ModSelectOverlay, + WaveOverlayContainer, + ModButton selected colours, made song select OnExit not handle closing mod select	2017-02-18 07:28:22 -04:00
Dean Herbert	fe3a6248ec	Add better screen hierarchy and placeholder for dev build disclaimer.	2017-02-17 20:07:16 +09:00
Dean Herbert	e6ef9f67aa	GameMode -> Screen.	2017-02-17 19:23:58 +09:00
DrabWeb	9fc3726925	ModSelector -> ModSelect, added mod descriptions, added per-mode mod selection, changed animations and made the wave mask properly	2017-02-16 18:32:27 -04:00
DrabWeb	0a58fc62db	Added mod selection overlay	2017-02-16 16:05:03 -04: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	fc192906ea	Handle proxied approach layer better and add slider's approach circle (previously missing).	2017-02-15 01:23:19 +09:00
John Leuenhagen	7ad9cd6b6e	add explicit false values to prevent warnings as errors	2017-02-12 02:32:11 -05:00
Dean Herbert	8ec927899f	Implement notifications.	2017-02-10 16:30:23 +09:00
Dean Herbert	d05b544d0d	Merge branch 'master' into audio-device-selection ... # Conflicts: # osu-framework # osu.Game/Overlays/Options/Sections/Audio/AudioDevicesOptions.cs	2017-02-09 16:21:28 +09:00
DrabWeb	50f93bc215	Refactoring to SongProgress in osu.Game.Screens.Play, moving out progress bar into it's own class	2017-02-08 16:22:31 -04:00
Dean Herbert	2e119cd74f	Handle toolbar offsets better.	2017-02-08 20:30:45 +09:00
Dean Herbert	84096b146e	Make password mask characters look better.	2017-02-08 12:49:20 +09:00
DrabWeb	3d0feb4de9	Very basic implementation of the graph	2017-02-07 01:49:41 -04:00
DrabWeb	7c83dc8aed	Merge https://github.com/ppy/osu into song-progress-graph	2017-02-06 20:40:49 -04:00
default0	b4f30dd417	Rework OptionDropdowns to be more versatile ... The existing OptionDropdown only supported enums and was thus renamed to OptionEnumDropDown. A new OptionDropdown has been created in its place to allow binding to arbitrary values, with a set of user-provided items.	2017-02-06 01:21:26 +01:00
Thomas Müller	d6714324df	OsuNub -> Nub.	2017-02-04 12:06:53 +01:00
Thomas Müller	0edc64a08c	Re-use checkbox nub for option sliders and slightly re-structure.	2017-02-04 09:50:58 +01:00
DrabWeb	0d8815bd37	Added back current work	2017-02-03 15:22:02 -04:00
Dean Herbert	4504440f80	Fix much dropdown shit.	2017-02-03 19:13:10 +09:00
Dean Herbert	16a01abc4d	Merge remote-tracking branch 'upstream/master' into options-refactor ... # Conflicts: # osu.Game/Beatmaps/Drawables/BeatmapPanel.cs # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/KeyCounter.cs	2017-02-03 13:16:07 +09:00
Dean Herbert	a6fd7f46c3	Merge remote-tracking branch 'upstream/master' into login-updates	2017-02-03 12:48:52 +09:00
Dean Herbert	4f89cc0784	Merge pull request #298 from peppy/skip-button ... Make skip button work.	2017-02-03 12:47:53 +09:00
Dean Herbert	90fd9d9132	Merge branch 'master' into options-refactor	2017-02-01 14:07:49 +09:00
Dean Herbert	7ce5fc08ee	Merge branch 'master' into skip-button ... # Conflicts: # osu.Game/Graphics/UserInterface/BackButton.cs # osu.Game/Screens/Play/Player.cs # osu.Game/osu.Game.csproj	2017-02-01 14:05:58 +09:00
Dean Herbert	e94c92b920	Merge branch 'master' into login-updates	2017-02-01 13:23:22 +09:00
Dean Herbert	046732b7e3	Merge remote-tracking branch 'upstream/master' into song-select-filtering	2017-02-01 10:09:14 +09:00
Dean Herbert	ea204ad606	Merge pull request #301 from DrabWeb/pause-overlay ... Pause overlay	2017-02-01 10:07:12 +09:00
Drew DeVault	637a99e8d0	Merge remote-tracking branch 'upstream/master' into song-select-filtering	2017-01-31 19:00:50 -05:00
Dean Herbert	6803b1a8db	Sidebar button style pass.	2017-01-31 19:58:38 +09:00
Dean Herbert	0d529cb636	General tidy-ups.	2017-01-31 19:23:52 +09:00
Dean Herbert	6b66ecc131	Global shadows and more sane font size setting.	2017-01-31 18:53:52 +09:00
Dean Herbert	6ca974bf0c	Re-namespace options, adjust font sizes + more.	2017-01-31 18:37:11 +09:00
Dean Herbert	62c5ad907a	Merge remote-tracking branch 'upstream/master' into login-updates ... # Conflicts: # osu.Game/Overlays/Options/General/LoginOptions.cs	2017-01-31 17:05:33 +09:00
Dean Herbert	22ef576c64	Make LoginOverlay mask better.	2017-01-31 16:59:38 +09:00
Dean Herbert	74366c620b	Move login screen to toolbar and update design (still not fully implemented). ... # Conflicts: # osu.Game/Overlays/Options/General/LoginOptions.cs # osu.Game/Overlays/Toolbar/Toolbar.cs	2017-01-30 22:55:35 +09:00
DrabWeb	ed3ed8251f	Made styling PauseButtons public, Resume/Retry/Quit buttons changed to subclasses	2017-01-30 08:04:39 -04:00
Dean Herbert	26e9533ff0	Add custom implementation of TextBox.	2017-01-30 20:29:04 +09:00
DrabWeb	d70cbd37dd	Made the pause progress graph it's own class, to be implemented, made it so the user couldn't double click the pause buttons and made it so the action wasn't called a second time when the mouse button was released, made PopIn and PopOut in PauseOverlay one line each, made Player.IsPaused a public getter with a private getter/setter, implemented restarting in Player	2017-01-30 04:08:14 -04:00
DrabWeb	582599a8de	Made PauseButton more visually responsive, added force option to Player.Pause, added very basic implementation of the progress bar	2017-01-28 16:55:42 -04:00
Drew DeVault	10897486ba	Merge remote-tracking branch 'upstream/master' into song-select-filtering	2017-01-27 15:41:46 -05:00
Dean Herbert	3e7503e860	Make skip button work.	2017-01-27 21:57:22 +09:00
Dean Herbert	420e61fa97	TwoLayerButton	2017-01-27 21:08:36 +09:00
Dean Herbert	5787b43586	wip	2017-01-27 19:14:44 +09:00
DrabWeb	dedd6a4bcf	Small cleanups	2017-01-27 05:39:15 -04:00
Dean Herbert	f3e9da609e	Merge pull request #295 from peppy/songselect-footer ... Initial implementation of song select footer area.	2017-01-27 16:13:43 +09:00
Drew DeVault	417933b7ec	Merge remote-tracking branch 'upstream/master' into song-select-filtering	2017-01-26 13:57:55 -05:00
Dean Herbert	139cac5e57	Add fail dialog and flow.	2017-01-27 00:41:34 +09:00
Dean Herbert	70271fee35	Move PlayerInputManager to own file.	2017-01-27 00:38:21 +09:00
Dean Herbert	4a7b3cf391	Initial implementation of song select footer area.	2017-01-27 00:36:12 +09:00
Dean Herbert	1853bbdda8	Move window/volume configuration to framework level.	2017-01-25 18:44:51 +09:00
Dean Herbert	cd8c9393f3	HP -> Health	2017-01-18 11:08:16 +08:00
Drew DeVault	5eb1cda77b	Rename FilterSongSelect, use OsuColour	2017-01-17 16:43:40 -05:00
Drew DeVault	73e46ee8c0	Initial layout of song select filtering UI	2017-01-17 15:41:50 -05:00
Dean Herbert	a3770adbc5	Merge branch 'master' into hpdisplay	2017-01-16 11:23:54 +08:00
Drew DeVault	fa007e632d	Refactor colors to palette based design	2017-01-12 16:38:27 -05:00
Dean Herbert	7eab50b989	Add basic HP display support.	2017-01-10 16:08:01 +08:00
Drew DeVault	70ecf48ca7	Add central color class ... I didn't move _every_ color here, but most of them. The ones I left behind are mostly just shades of gray. Closes #126	2017-01-09 17:20:31 -05:00
Drew DeVault	cf60c52f00	Switch to System.ComponentModel.Description	2016-12-07 09:42:53 -05:00
Drew DeVault	5456e0102c	s/OptionsDropdown/DropdownOption/g	2016-12-07 09:42:52 -05:00
Drew DeVault	4757a1c433	Wire up enum-backed dropdowns	2016-12-07 09:42:52 -05:00
Drew DeVault	0378de8346	Add DisplayName	2016-12-07 09:42:37 -05:00
Drew DeVault	9daf524120	Add OptionsDropdown<T> and wire up one example	2016-12-07 09:42:37 -05:00
Drew DeVault	ff7ec88e66	s/OptionsSlider/SliderOption/g	2016-12-07 09:42:37 -05:00
Drew DeVault	a350e95e40	Add OptionsSlider and wire up volume sliders	2016-12-07 09:41:28 -05:00
Dean Herbert	a80c28ca37	ToolbarOverlayToggleButton	2016-12-02 21:57:01 +09:00
Dean Herbert	9bf36418a0	Make toolbar buttons more independent logic-wise. ... Also adds visual toggle state for toggleable buttons.	2016-12-02 18:43:01 +09:00
Dean Herbert	11f958030f	Make Triangles more flexible and more random.	2016-12-01 18:53:13 +09:00
Dean Herbert	6ccce88a0e	Add proper user data retrieval on connect.	2016-12-01 16:44:24 +09:00
Dean Herbert	d7ab74363d	Simplify toolbar width/padding calculations. Add avatar display (incorrect user id).	2016-12-01 16:05:54 +09:00
Dean Herbert	167b559a95	Move toolbar to own namespace.	2016-12-01 14:22:29 +09:00
Dean Herbert	18509e6a60	ChatConsole -> ChatOverlay. Namespace tidying.	2016-11-30 18:30:06 +09:00
Dean Herbert	34e91c8474	Add the concept of IOnlineComponents, registered tot he API for handling state changes.	2016-11-30 18:30:01 +09:00
Thomas Müller	d0065d2d20	Merge pull request #205 from peppy/scoring ... Wire up basic scoring.	2016-11-29 20:56:53 +01: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
stanriders	ba18c9a309	Merged ExtendableButton and BackButton	2016-11-27 05:48:31 +03:00
stanriders	af57984d5c	Moved ExtendableButton out of framework	2016-11-27 04:41:17 +03:00
stanriders	e9343fe53d	Add stable-alike BackButton	2016-11-27 04:21:12 +03:00
Dean Herbert	c978a4c091	Tidy up code. Make trail smooth.	2016-11-26 19:22:56 +09:00
Dean Herbert	396ca9fe91	Remove HitJudgementResolver; reimplement in DrawableHitObject.	2016-11-26 16:51:51 +09:00
Dean Herbert	ece3bc0e01	Refactor BeatmapInfoWedge to be async.	2016-11-24 13:48:48 +09:00
Dean Herbert	611619fd9c	Fix some namespaces.	2016-11-23 12:00:17 +09:00
Thomas Müller	5cf5e8c80c	Move BeatmapInfoOverlay into its own class. ... No loading async optimizations yet.	2016-11-22 21:51:42 +01:00
Thomas Müller	9bf23bc4ad	Only handle beatmap panels that are visible in song select.	2016-11-22 21:41:48 +01:00
Thomas Müller	c6d688898f	Initial implementation of a beatmap carousell and various minor improvements to song select. ... No big optimizations yet, but groundwork is laid out.	2016-11-20 20:34:16 +01:00
Thomas Müller	f8788bb24b	Update the background according to the currently selected beatmap and blur it within song select.	2016-11-19 17:39:43 +01:00
Dean Herbert	1242ae3f2a	Add the concept of a HitJudgementResolver.	2016-11-19 16:19:26 +09:00
Dean Herbert	d3f810f72f	Introduce concept of HitObjectParsers, fix tests and stop using reflection (unreliable due to lazy loading).	2016-11-14 22:03:39 +09:00
Dean Herbert	5dd4e31011	Move DrawableHitObject.	2016-11-14 19:49:29 +09:00
Dean Herbert	4590be552f	Move play modes to their own projects.	2016-11-14 18:54:24 +09:00
Dean Herbert	06f4f93918	Move play modes to Modes namespace.	2016-11-14 18:03:20 +09:00
Dean Herbert	0f4538f69f	Rename GameModes namespace to Screens.	2016-11-14 17:23:33 +09:00
Dean Herbert	75be78752b	Merge remote-tracking branch 'refs/remotes/upstream/master' into options-sidebar-tracking ... # Conflicts: # osu.Game/osu.Game.csproj	2016-11-12 22:30:15 +09:00
Dean Herbert	099b309645	Introduce back the concept of Rulesets.	2016-11-12 18:26:21 +09:00
Dean Herbert	8d56a881d0	Merge pull request #157 from SirCmpwn/string-options ... Add TextBoxOption and wire it up	2016-11-12 16:11:09 +09:00
Drew DeVault	00cc4278da	Split off SidebarButton	2016-11-12 01:53:20 -05:00
Drew DeVault	a81f099d40	Add TextBoxOption and wire it up	2016-11-10 18:17:15 -05:00
Dean Herbert	788c11de10	Merge pull request #103 from huoyaoyuan/music-controller ... Music controller	2016-11-10 12:54:56 +09:00
Dean Herbert	8c68f9ba93	OptionsSideNav -> OptionsSidebar.	2016-11-08 19:17:09 +09:00
Drew DeVault	1bca78f4b6	Wire up one of the settings to the config ... One step at a time, right	2016-11-07 22:36:24 -05:00
Drew DeVault	4d04eb6fb1	Rearrange some options a bit, update framework	2016-11-07 22:15:48 -05:00
Drew DeVault	1ce6a7285a	Rearrange options namespaces	2016-11-07 21:24:41 -05:00
Drew DeVault	e6c3fc1091	Implement scrolling to each section	2016-11-07 17:07:55 -05:00
Huo Yaoyuan	c470140d64	Merge branch 'master'	2016-11-06 00:11:30 +08:00
Huo Yaoyuan	2d86cb1e81	Merge branch 'master'	2016-11-05 16:21:59 +08:00
Dean Herbert	b40ccccbe4	Add HitObject colours back in the mix.	2016-11-04 15:43:53 +09:00
Drew DeVault	cb40b7079f	Rework how references are passed about	2016-11-03 22:43:00 -04:00
Drew DeVault	af8e4415c3	Split out [Sub]sections into seperate files	2016-11-03 19:06:22 -04:00
Drew DeVault	1d8c6db0a7	Add remaining options	2016-11-03 19:06:22 -04:00
Drew DeVault	c7fa0a5ab0	Add more options	2016-11-03 19:06:22 -04:00
Drew DeVault	7e77efcfdc	Add Graphics options	2016-11-03 19:06:22 -04:00
Drew DeVault	6c0cef894e	Add OsuButton with sane defaults	2016-11-03 19:06:22 -04:00
Drew DeVault	2aa85a4b18	Split up options into subclasses	2016-11-03 19:06:22 -04:00
Huo Yaoyuan	7e2350cb13	Merge remote-tracking branch 'refs/remotes/peppy/lets-play'	2016-10-28 19:07:29 +08:00
Dean Herbert	0e39c5cc9c	Move Results to own namespace.	2016-10-28 16:10:10 +09:00
Dean Herbert	feccb7286c	Add the concept of a "WorkingBeatmap" and make player load beatmaps and audio from SongSelect.	2016-10-28 14:14:45 +09:00
Dean Herbert	d9dfc324c1	Rewrite a lot of Song Select to share logic between panels and consolidate logic inside classes where possible.	2016-10-27 19:52:48 +09:00
Huo Yaoyuan	35b1d0ae50	Seperated DragBar class.	2016-10-27 18:14:50 +08:00
Huo Yaoyuan	e1f6ab1a42	Create MusicController UI class and visual test.	2016-10-27 13:34:43 +08:00
Dean Herbert	debea59bab	Merge pull request #61 from SirCmpwn/song-select ... Song select	2016-10-27 13:54:34 +09:00
Dean Herbert	f846505a92	Tidy namespaces.	2016-10-27 12:01:13 +09:00
Dean Herbert	104cedba19	Merge pull request #109 from peppy/volume-control-input-fix ... Fix volume control input handling.	2016-10-27 11:45:09 +09:00
Drew DeVault	55e5ec6fae	General cleanup per PR feedback	2016-10-26 10:52:40 -04:00
Drew DeVault	157512b45f	Merge branch 'master' into song-select	2016-10-26 10:37:18 -04:00
Dean Herbert	3f23900347	Framework & OpenTK updates.	2016-10-26 23:13:44 +09:00
Dean Herbert	ee8b678989	Fix volume controls handling mouse wheel at a higher level than anything else game-wide.	2016-10-26 18:45:48 +09:00
Dean Herbert	d3a857edb9	Make importing work properly. ... Moves import code to BeatmapDatabase.	2016-10-24 11:39:53 -04:00
Drew DeVault	bc959f74a5	Add background textures to beatmap sets ... Needs osu-framework#189	2016-10-24 11:39:18 -04:00
Drew DeVault	bc6e705e2b	Add test case for song selection	2016-10-24 11:39:18 -04:00
Dean Herbert	1ce16afa23	Update nuget package versions.	2016-10-24 22:46:44 +09:00
Dean Herbert	43f0409893	Start to structure flow of information in Player. ... - Allow basic clicking of hitobjects. - Break non-osu! game modes temporarily. - Fix some issues with RollingCounters. - Add the ability to increment counters.	2016-10-19 19:44:03 +09:00
Dean Herbert	ee463dc65c	Merge pull request #77 from NeoAdonis/counters-a ... Rolling counters	2016-10-19 15:06:00 +09:00
Drew DeVault	7bdf1fe1bf	Drop BeatmapSet, only BeatmapSetInfo is necessary	2016-10-18 15:48:24 -04:00
Drew DeVault	8ca4a2067e	$(SolutionDir)	2016-10-18 13:58:24 -04:00
Drew DeVault	449f04c07b	Refactor the database code	2016-10-18 13:38:27 -04:00
Adonais Romero González	5abc3ba898	Merge remote-tracking branch 'upstream/master' into counters-a	2016-10-17 20:36:04 -05:00
Huo Yaoyuan	f4c381f745	Use OverlayContainer in framework.	2016-10-16 17:14:17 +08:00
Adonais Romero González	0ceb72ba42	More refactoring	2016-10-15 15:16:02 -05:00
Adonais Romero González	9241287c79	Merge branch 'master' into counters-a	2016-10-15 13:45:55 -05:00
Adonais Romero González	6bd3eaf37d	Changes according to review + Refactor	2016-10-14 18:23:27 -05:00
Dean Herbert	c3b745bfef	Merge pull request #57 from UselessToucan/VolumeControl ... VolumeControl: add controls for Effects and Music	2016-10-14 15:50:45 +09:00
Adonais Romero González	53cd698b3a	Merge branch 'master' into counters-a	2016-10-13 22:57:24 -05:00
Adonais Romero González	f10a03dcef	Merge with master	2016-10-13 17:20:35 -05:00
Adonais Romero González	ce07a45456	Improved code	2016-10-13 17:13:20 -05:00
TocoToucan	7d27406131	Fix merge conflict in osu.Game/osu.Game.csproj	2016-10-13 18:23:50 +03:00
Huo Yaoyuan	1c97edaac2	Base class for overlays.	2016-10-13 23:04:57 +08:00
Huo Yaoyuan	acd54d1ebc	Single Visibility enum type.	2016-10-13 22:22:27 +08:00
Dean Herbert	5e3e949fd6	Revert all counter commits. Requires much further review.	2016-10-13 14:45:41 +09:00
Dean Herbert	fde3ab420a	Merge branch 'master' ... Conflicts: osu.Game/osu.Game.csproj	2016-10-13 12:23:36 +09:00
Drew DeVault	65e3e13aa2	Fix reference paths in osu.Game.csproj	2016-10-13 12:19:15 +09:00
Drew DeVault	32ab8f97bb	Add more decoding (including full BeatmapMetadata)	2016-10-13 12:16:58 +09:00
Dean Herbert	2566d6bfe0	Fix regressions with HitRenderers, while also cleaning them up.	2016-10-13 10:10:15 +09:00
TocoToucan	ce391301fa	Merge VolumeControl.cs	2016-10-12 19:17:53 +03:00
Drew DeVault	e9a45de51f	Refactor database to reuse existing types	2016-10-12 11:32:40 -04:00
Drew DeVault	23bc26ddac	Implement OszArchiveReader	2016-10-12 11:32:40 -04:00
Drew DeVault	bc69aa1455	Initial support code for beatmap loading	2016-10-12 11:32:40 -04:00
Drew DeVault	005dc9e8cb	Drop GameMode	2016-10-12 11:32:40 -04:00
Drew DeVault	2d810f72fa	Add initial DB schema and support code	2016-10-12 11:32:07 -04:00
Dean Herbert	79b62d4373	Merge remote-tracking branch 'refs/remotes/upstream/master' ... Conflicts: osu-framework osu.Desktop.VisualTests/Program.cs	2016-10-12 15:20:23 +09:00
TocoToucan	89d7de31ee	VolumeControl: add controls for Effects and Music	2016-10-09 20:45:34 +03:00
Adonais Romero González	37115c8c9f	Merge branch 'master' into counters	2016-10-08 22:02:43 -05:00
Adonais Romero González	5ebb2fc289	Refactor + Stars Counter (initial) ... Moved a few things to allow using common transforms for a star counter. This implementation is basic and hacky, but good enough as proof of concept.	2016-10-08 19:11:01 -05:00
Dean Herbert	9594b7193c	Standardise drawable state access and split large nested classes out of MainMenu.ButtonSystem	2016-10-08 23:27:46 +09:00
Dean Herbert	47faf8f40d	Add in-game chat display, along with a global hotkey handling method.	2016-10-08 19:23:21 +09:00
Dean Herbert	3067c890ce	General improvements to chat querying and logic organisation.	2016-10-08 19:23:21 +09:00
Dean Herbert	b2d899feb5	Add basic intro sequence.	2016-10-08 15:54:04 +09:00
Dean Herbert	bdb72d7b82	Add basic VolumeControl and saving of volume to config.	2016-10-08 15:54:00 +09:00
Dean Herbert	d1dfa120d1	Move BackgroundModes to their own files.	2016-10-08 15:53:57 +09:00
Dean Herbert	d6042bd689	Add intro and begin to create central logic nest.	2016-10-08 15:53:56 +09:00
Adonais Romero González	00cfc51004	Rolling counters (initial)	2016-10-07 02:05:02 -05:00
Dean Herbert	c0f25a2683	Improve white-boxed game modes.	2016-10-05 20:08:58 +09:00
Dean Herbert	03aea04a00	Add BackgroundMode stack.	2016-10-05 20:06:55 +09:00
Dean Herbert	cc52580568	Implement mode selector highlight line.	2016-10-04 19:41:18 +09:00
Dean Herbert	11403a922a	Make Home, Settings and PlayMode buttons work.	2016-10-04 17:15:03 +09:00
Dean Herbert	f0681f35c4	Merge remote-tracking branch 'refs/remotes/upstream/master' into game-modes-layout ... # Conflicts: # osu.Game/OsuGame.cs # osu.Game/OsuGameBase.cs # osu.Game/osu.Game.csproj	2016-10-01 17:10:27 +09:00
Dean Herbert	b110a879a7	Merge branch 'refs/heads/master' into api-channels-messages ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj	2016-10-01 17:05:56 +09:00
Dean Herbert	5afb038025	Use explicit cast to OsuGame rather than in-between derived classes. ... # Conflicts: # osu.Game/GameModes/Menu/MainMenu.cs	2016-10-01 17:02:57 +09:00
Dean Herbert	cc14aeb802	Add basic background display system.	2016-09-30 18:45:55 +09:00
Dean Herbert	d93718d953	Add template toolbar.	2016-09-30 18:45:27 +09:00
Dean Herbert	357c94ed8a	Add OsuGameMode. Standardise naming of classes.	2016-09-30 13:30:55 +09:00
Dean Herbert	643ae0cefe	Merge remote-tracking branch 'upstream/master' into beatmap_framework	2016-09-30 00:13:08 +09:00
Dean Herbert	b4c9dca54b	Merge remote-tracking branch 'upstream/master' into api-channels-messages ... Conflicts: osu.Game/Online/Chat/Message.cs	2016-09-29 23:54:33 +09:00
Dean Herbert	154226b9a3	Basic white-boxing of all game modes.	2016-09-29 23:51:17 +09:00
Dean Herbert	2db962dc33	Add basic tweening mouse cursor. ... # Conflicts: # osu-framework	2016-09-29 23:46:33 +09:00
Dean Herbert	8650e951e5	Merge branch 'refs/heads/master' into api-channels-messages ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj	2016-09-28 16:30:00 +09:00
Dean Herbert	eaab1b718e	Merge branch 'refs/heads/master' into beatmap_framework ... # Conflicts: # osu.Desktop.VisualTests/osu.Desktop.VisualTests.csproj	2016-09-28 16:09:26 +09:00
Dean Herbert	67652a6d8e	Improve formatting of chat lines.	2016-09-27 20:45:26 +09:00
Dean Herbert	28045b7136	Add back basic API support for channel/message retrieval.	2016-09-27 18:33:52 +09:00
Dean Herbert	f0284ce57c	Use the old naming style for now.	2016-09-26 15:07:29 +09:00
Dean Herbert	ae100e3137	Move PlayTest to the VisualTests project.	2016-09-25 13:59:38 +09:00
Dean Herbert	58ed5c00e4	Merge remote-tracking branch 'refs/remotes/upstream/master' into beatmap_framework ... # Conflicts: # osu.Game/GameModes/Menu/ButtonSystem.cs # osu.Game/OsuGame.cs	2016-09-25 13:40:06 +09:00
Huo Yaoyuan	63535df6dc	Fix typo and missnaming.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	c70bf53486	Rename counter classes to avoid confusing.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	81f269ee69	MouseCount and KeyBoardCount, input handling.	2016-09-24 19:46:10 +08:00
Huo Yaoyuan	55a1a3827a	Implement KeyCounter and base Count class.	2016-09-24 19:46:10 +08:00
Dean Herbert	7bdb2fcfc7	Add basic implementation of VisualTest framework for osu! project. ... Comes with one complimentary test.	2016-09-24 15:47:17 +09:00
Dean Herbert	e0c06a4f19	Merge branch 'refs/heads/general-fixes' into beatmap_framework ... # Conflicts: # osu-framework # osu.Game/GameModes/FieldTest.cs # osu.Game/GameModes/FontTest.cs # osu.Game/GameModes/Menu/ButtonSystem.cs # osu.Game/Graphics/UserInterface/TextBox.cs # osu.Game/OsuGame.cs # osu.Game/osu.Game.csproj	2016-09-20 16:36:42 +09:00
Remie Richards	f2fa9f611a	Replaced osu.Game.Graphics.Cursor.CursorContainer.cs with osu.Framework.Graphics.Cursor.CursorContainer.cs	2016-09-17 22:11:27 +01:00
Remie Richards	4754c0e2d1	Clears out old tests (use the framework tests!), Replaces osu.Game.Graphics.UserInterface references with osu.Framework.Graphics.UserInterface	2016-09-17 21:54:52 +01:00
Dean Herbert	9e76feb159	Add remaining HitRenderers. ... Many general improvements.	2016-09-06 21:42:45 +09:00
Dean Herbert	024ae1d1c2	Move playfields to own class.	2016-09-06 21:42:45 +09:00
Dean Herbert	93744f7372	Add basic TaikoHitRenderer.	2016-09-06 21:42:45 +09:00
Dean Herbert	2ea5a5c675	Add basic HitRenderer framework.	2016-09-06 21:42:45 +09:00
Dean Herbert	ec25a50249	Add basic structure for catch mode objects.	2016-09-06 21:41:16 +09:00
Dean Herbert	49110cf8d8	Add mania Note and HoldNote.	2016-09-06 21:41:16 +09:00
Dean Herbert	cf12f4764f	Add basic structure for osu! mode objects.	2016-09-06 21:41:16 +09:00
Dean Herbert	7cee44ab1d	HitObject -> HitBase. Also add BaseHits for each game mode.	2016-09-06 21:41:16 +09:00
Dean Herbert	016521240a	Add playtest class.	2016-09-06 21:41:16 +09:00
Dean Herbert	ef98e4ee3c	Move beatmap metadata to separate class.	2016-09-06 21:41:16 +09:00
Dean Herbert	abe8ff21f6	Add more timing and sample related classes.	2016-09-06 21:41:16 +09:00
Dean Herbert	3098204dda	Add basic class structure for Beatmap/HitObject/SampleInfo/User.	2016-09-06 21:41:16 +09:00
Dean Herbert	7e3d2ebe80	Update nuget packages and framework reference once more.	2016-09-06 20:41:18 +09:00
Dean Herbert	ebd15d6f7c	Remove System.Drawing dependency.	2016-09-02 14:30:08 +09:00
Dean Herbert	b3e2339175	Make TextBox rendering work again.	2016-09-01 22:51:03 +09:00
Dean Herbert	013cf1cf3f	Fix broken namespaces.	2016-08-31 20:16:05 +09:00
Dean Herbert	8870935a4b	Add basic online API support.	2016-08-31 20:14:01 +09:00
Dean Herbert	6cbbeaaac0	Initial commit.	2016-08-26 14:41:47 +09:00