1843 Commits

Author	SHA1	Message	Date
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
DrabWeb	9141d244bf	Focus trigger in WaveOverlayContainer	2017-03-03 18:05:43 -04:00
DrabWeb	5a83687a27	Small cleanups	2017-03-03 18:02:31 -04:00
Jorolf	b9e4c920c5	SelectRandom doesnt select hidden groups now	2017-03-03 21:11:38 +01:00
Thomas Müller	aff9e3617d	Massively improves fill-rate of mod select screen ... This is done by masking away the parts of WaveOverlayContainer that are behind the content.	2017-03-03 20:42:03 +01:00
Dean Herbert	6f3b59268a	Merge pull request #385 from DrabWeb/mod-overlay ... Mod select	2017-03-03 21:09:08 +09:00
Dean Herbert	9fe86583f1	Merge pull request #412 from revam/remove-source-on-import ... Remove source on Import(IEnumerable<string> paths), Import(string path)	2017-03-03 20:59:26 +09:00
Dean Herbert	7a294f770a	Merge branch 'master' into remove-source-on-import	2017-03-03 20:51:39 +09:00
Dean Herbert	398b1fcf03	Add comment about .ID == 0 check.	2017-03-03 20:51:07 +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
Dean Herbert	2ac248c7d0	Use OsuSpriteText.	2017-03-03 20:29:39 +09:00
Dean Herbert	1ea1118db6	Simplify file reading.	2017-03-03 20:24:34 +09:00
Dean Herbert	4a109fcc55	Remvoe ctor argument and fallback to storage-based TeamList if no custom list has been provided.	2017-03-03 20:21:11 +09:00
Dean Herbert	ca73b77a9a	Tidying code.	2017-03-03 20:08:32 +09:00
Dean Herbert	41cefd1cb3	xmldoc commenting.	2017-03-03 20:08:21 +09:00
Dean Herbert	c3cb225eef	Fix being able to stop rotation when it isn't started.	2017-03-03 20:07:57 +09:00
smoogipooo	5a4d07d770	Better way to initialize team lists.	2017-03-03 18:47:56 +09:00
smoogipooo	890066dae4	Use sprite visualiser lines instead of shader.	2017-03-03 18:47:22 +09:00
smoogipooo	54993b874f	Fix idle and stopping -> stopped state.	2017-03-03 18:45:04 +09:00
Dean Herbert	71534b3e13	Fix incorrect triangle density on first display.	2017-03-03 18:09:16 +09:00
smoogipooo	2a49200008	Nothing to see here.	2017-03-03 18:02:02 +09:00
smoogipooo	b2661be0b2	Fix setting same state multiple times.	2017-03-03 17:59:16 +09:00
DrabWeb	9d75ab85e9	Put mod select over beatmap options	2017-03-03 04:19:03 -04:00
Seth	fde509ab1d	Merge branch 'master' into mod-overlay	2017-03-03 04:12:42 -04:00
Dean Herbert	511c072270	Merge pull request #418 from DrabWeb/beatmap-options ... Beatmap options overlay	2017-03-03 16:59:21 +09:00
Dean Herbert	bdb130fabc	Avoid using right-to-left fill direction for now.	2017-03-03 16:54:59 +09:00
Dean Herbert	47845a7fbd	Fix button input handling.	2017-03-03 16:54:43 +09:00
smoogipooo	7cac2680b1	Make test case add test drawings file.	2017-03-03 16:33:40 +09:00
Dean Herbert	b0ee728528	Remove full-screen background layer and add half-height holder. ... Doesn't interact well with dialog popups. May add back later with complementing logic.	2017-03-03 16:11:23 +09:00
smoogipooo	1d1c08125b	Further safety checking.	2017-03-03 16:01:24 +09:00
smoogipooo	777996d884	Rewrite VisualiserLine + add VisualiserContainer.	2017-03-03 15:43:16 +09:00
smoogipooo	a70b1ae108	Use a singular FlowContainer for teams.	2017-03-03 15:12:26 +09:00
smoogipooo	04dd24b04b	OnTeamSelected + async changes.	2017-03-03 14:51:19 +09:00
smoogipooo	3ae55933c4	Remove game dependency.	2017-03-03 14:11:47 +09:00
smoogipooo	d96345e408	s/internalPeriod/_period	2017-03-03 14:11:37 +09:00
Seth	1891bdf51e	Merge branch 'master' into mod-overlay	2017-03-03 01:11:15 -04:00
smoogipooo	e6d911e49b	Move modified key conditional location.	2017-03-03 14:08:37 +09:00
Dean Herbert	fb6c25edf8	Fix more silly hacks.	2017-03-03 13:58:46 +09:00
Dean Herbert	2e01857782	Better constants.	2017-03-03 13:58:46 +09:00
Dean Herbert	00b139b3df	Remove hack (fixed at framework level).	2017-03-03 13:58:46 +09:00
Seth	2e74b4be60	Merge branch 'master' into beatmap-options	2017-03-03 00:52:45 -04:00
smoogipooo	3174b56e28	Add license headers.	2017-03-03 13:17:24 +09:00
smoogipooo	959a3d49be	Post-merge fixes.	2017-03-03 13:17:16 +09: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
smoogipooo	d0894bbc9b	Use storage instead of raw file access.	2017-03-03 12:59:58 +09:00
smoogipooo	b7b36b6306	Unused.	2017-03-03 12:59:31 +09:00
smoogipooo	d6c1f82105	Make visualiser lines have no separation.	2017-03-03 12:59:19 +09:00
smoogipooo	d222c523a1	Exit drawings if no drawings.txt file.	2017-03-03 12:43:48 +09:00
smoogipooo	26b81a14cf	Ctrl+Shift+D at main menu to open up drawings, until we get a permanent place for it.	2017-03-03 12:42:19 +09:00
smoogipooo	062d8ddc7c	Don't handle menu buttons when Shift or Ctrl or Alt is pressed.	2017-03-03 12:41:45 +09:00
John Leuenhagen	417c7e341a	Password textbox now performs login on enter	2017-03-02 22:41:14 -05:00
smoogipooo	febdfd5de4	Make groups fill up in round robin way, rather than sequentially.	2017-03-03 12:06:35 +09:00
Dean Herbert	78a0bce3bb	Merge pull request #423 from peppy/general-fixes ... Move PauseOverlay to correct namespace.	2017-03-03 11:32:42 +09:00
Dean Herbert	70f046092c	Merge pull request #424 from DrabWeb/namespace-fix ... Fix BeatmapDeleteDialog namespace	2017-03-03 11:32:35 +09:00
Huo Yaoyuan	ef13cdbff7	Disallow copying from OsuPasswordTextBox.	2017-03-03 10:00:39 +08:00
DrabWeb	f872330902	Fix BeatmapDeleteDialog namespace	2017-03-02 21:28:05 -04: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
Dean Herbert	f81836f635	Merge remote-tracking branch 'upstream/master' into no-negative-margin	2017-03-03 09:58:40 +09:00
Thomas Müller	c732890664	Remove usages of negative Margin / Padding ... Replaces such usage with more sensible settings, like changing the position or size.	2017-03-02 19:16:31 +01:00
Mikal Stodal	c88c6c4c62	More summaries	2017-03-02 15:37:45 +01:00
Dean Herbert	ecd3453774	Fix potential nullref.	2017-03-02 22:17:14 +09:00
Mikal Stodal	dfa21444b4	Ensure correct exception logged	2017-03-02 14:10:32 +01:00
DrabWeb	fcda2f0e4e	Fixed shadow	2017-03-02 09:05:10 -04:00
Dean Herbert	f9b87ad08c	Fix selection on entry to song select. ... Also only shows sets with beatmaps for current play mode.	2017-03-02 22:02:32 +09:00
Dean Herbert	9ea83230aa	Formatting fixes.	2017-03-02 22:01:53 +09:00
Dean Herbert	ef8a35f5cc	Fix Toolbar's mode changer not working correctly.	2017-03-02 22:01:24 +09:00
DrabWeb	b856fb5991	Implemented beatmap options overlay	2017-03-02 08:40:55 -04:00
Mikal Stodal	2498305174	Merged branch master into remove-source-on-import	2017-03-02 13:39:22 +01:00
Mikal Stodal	47162a3e91	Update summary and commentary	2017-03-02 13:39:02 +01:00
Mikal Stodal	6661195e92	Only add set if ID is 0	2017-03-02 13:36:01 +01:00
Dean Herbert	e399d6c6d1	Use bindable for PlayMode.	2017-03-02 21:16:58 +09:00
Dean Herbert	ab91333b21	Replace missing perfect icon with cross.	2017-03-02 20:29:48 +09: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	4163569e57	Fix some license headers.	2017-03-02 18:45:20 +09:00
Dean Herbert	68a359698d	Fix potential nullref caused by test data.	2017-03-02 18:35:24 +09:00
Dean Herbert	51950eef43	Merge branch 'master' into master	2017-03-02 18:06:31 +09:00
Dean Herbert	963117f07d	Fix incorrect event order.	2017-03-02 17:41:33 +09:00
Dean Herbert	68857b573d	More code tidying.	2017-03-02 17:14:05 +09:00
Dean Herbert	c4871bbbf3	Tidy up code. ... The triggered bool is not even necessary because input is no longer handled after the OverlayContainer's state is set to hidden.	2017-03-02 17:08:00 +09:00
Dean Herbert	d1cd077e0d	Post-merge fixes.	2017-03-02 16:54:55 +09:00
Dean Herbert	ff5f0af2d3	Merge branch 'master' into popup-dialog	2017-03-02 16:42:20 +09:00
Dean Herbert	c4ca18eeba	Remove references to PassThrough.	2017-03-02 16:28:51 +09:00
Dean Herbert	8040d6a03f	Fix CursorTrail corruption by resetting on load.	2017-03-02 16:08:10 +09:00
DrabWeb	482be9f451	Remove AvailableMods	2017-03-02 02:04:26 -04:00
DrabWeb	367d6d694c	Merge https://github.com/ppy/osu into mod-overlay	2017-03-02 01:44:18 -04:00
DrabWeb	37ed1b3d09	Moved key press select mods to ModSection	2017-03-02 01:24:32 -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
smoogipooo	b0d5d88fe9	Fix slight threading scheduling issue.	2017-03-02 12:26:42 +09:00
smoogipooo	1a4f0a92a5	Add saving + reloading (to/from drawings_results.txt) functionality.	2017-03-02 12:20:31 +09: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
DrabWeb	befdf68abe	Made DialogOverlay use PopupDialog's direct valfixed last dialogs not expiring, DialogOverlay actually hides now, fixed an issue where multiple buttons could be pressed at once	2017-03-01 18:41:00 -04:00
Thomas Müller	4d28696479	FlowDirection -> FillDirection	2017-03-01 20:15:38 +01:00
Thomas Müller	9c853b0465	Update framewörk	2017-03-01 19:33:01 +01:00
Thomas Müller	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
Mikal Stodal	418ae24fea	Document private method getBeatmapSet(path)	2017-03-01 17:57:57 +01:00
Mikal Stodal	1e901a1604	Only set StoryBoardFile once	2017-03-01 17:08:12 +01:00
Dean Herbert	b6e7e054c3	wankoz	2017-03-01 22:56:20 +09:00
Dean Herbert	58ae9e888d	Basic partial replay support.	2017-03-01 22:04:20 +09:00
Andrey Zavadskiy	a6504e8f22	Triggering fix	2017-03-01 13:36:53 +03:00
smoogipooo	35d246b59d	Merge remote-tracking branch 'origin/master' into tournament_drawings	2017-03-01 19:32:33 +09:00
Andrey Zavadskiy	cc92459ee1	KeyCounter visibility	2017-03-01 13:22:01 +03:00
Dean Herbert	327300e9a7	Merge pull request #408 from Jorolf/pluginManager ... Disable mousewheel while playing	2017-03-01 13:10:47 +09:00
DrabWeb	d5d8352b62	Testing build	2017-02-28 17:09:31 -04:00
Jorolf	61cbcfd597	Merge branch 'master' into pluginManager	2017-02-28 20:34:56 +01:00
Thomas Müller	e462ec46c3	Merge branch 'master' into general-fixes	2017-02-28 19:02:07 +01:00
Thomas Müller	585d42f89f	Improve naming and correctness of triangles fading	2017-02-28 19:01:02 +01:00
Mikal Stodal	eff66a1da6	Only delete on successful import.	2017-02-28 14:46:16 +01:00
Mikal Stodal	d54a75a5c5	Delete file after importing BeatmapSet w/error handling, ... also changed batch-commit of multiple sets to database.	2017-02-28 14:35:42 +01:00
Jorolf	522034020e	Moved Bindable init	2017-02-28 11:44:12 +01:00
DrabWeb	c3a81127f2	Updated to work with latest framework	2017-02-28 02:25:38 -04: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
Dean Herbert	654859a2a1	Restore potentially breaking change.	2017-02-28 13:56:35 +09:00
Dean Herbert	e60cead483	Merge remote-tracking branch 'upstream/master' into warning_fixes	2017-02-28 13:49:19 +09:00
DrabWeb	fbd9523596	Added beatmap delete dialog	2017-02-27 23:19:28 -04:00
DrabWeb	bc7fd3bd39	Remove uneccesary cast, move enter OK button to one liner	2017-02-27 22:38:44 -04:00
DrabWeb	94f34b985b	Forgot returns	2017-02-27 22:32:30 -04:00
DrabWeb	0ce8fff666	Enter key presses first OK button, 1-9 presses button at number	2017-02-27 22:31:23 -04:00
Dean Herbert	aa9582c0fa	Add exponential fall-off of triangles' alpha values.	2017-02-28 11:28:25 +09:00
DrabWeb	e8cae3b45e	Remove new override in DialogButton	2017-02-27 21:38:25 -04:00
DrabWeb	164f205ee5	Remove SpaceTextOnHover	2017-02-27 21:30:10 -04:00
smoogipooo	1e15318da6	Add background.	2017-02-28 10:26:37 +09:00
DrabWeb	b3a231185b	Conform to naming conventions	2017-02-27 20:55:10 -04:00
DrabWeb	34ba3129a3	Removed background triangles	2017-02-27 20:44:27 -04:00
Jorolf	8b3477820f	Disable mousewheel while playing	2017-02-28 00:08:34 +01:00
DrabWeb	64d036fe81	Update to work with latest framework	2017-02-27 16:41:45 -04:00
DrabWeb	3094c01a40	Merge https://github.com/ppy/osu into popup-dialog	2017-02-27 16:40:04 -04:00
Thomas Müller	f96144f234	Merge branch 'master' into fix-db-deletion	2017-02-27 20:59:52 +01:00
default0	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
Andrey Zavadskiy	e06b3ecf2d	Input fix	2017-02-27 18:18:12 +03:00
smoogipooo	44f3dfa3fe	Make it display by default.	2017-02-27 23:38:37 +09:00
Andrey Zavadskiy	9444ffd849	Removed redundant qualifiers	2017-02-27 17:37:38 +03:00
Andrey Zavadskiy	3487dfe236	Removed unused variables and parameters	2017-02-27 17:32:32 +03:00
smoogipooo	fc33bf4761	Add drawings config.	2017-02-27 23:29:18 +09:00
smoogipooo	9d731af01b	Finish it up, slightly hackishly, but that's ok.	2017-02-27 23:29:17 +09:00
smoogipooo	5f3e484353	Add scrolling teams container.	2017-02-27 23:29:06 +09:00
Dean Herbert	e8b027130f	Remove unused variable.	2017-02-27 23:17:21 +09:00
Alex Amadori	8b336156f0	Merge remote-tracking branch 'upstream/master'	2017-02-27 14:55:44 +01:00
Dean Herbert	afdb95f4d5	Fix even more test regressions.	2017-02-27 20:39:04 +09:00
Dean Herbert	a22216d0b0	Update nuget packages.	2017-02-27 20:38:30 +09:00
Dean Herbert	777f673a46	Fix more test regressions.	2017-02-27 19:48:48 +09:00
Dean Herbert	4a4f1f4d82	Actually delete all related database entries, not just the set.	2017-02-27 18:27:38 +09:00
Dean Herbert	4da09713a9	Fix test case regression.	2017-02-27 18:09:27 +09:00
Dean Herbert	68dd3c02aa	Fix failing testcase (nullref).	2017-02-27 17:05:12 +09:00
Dean Herbert	7c602a2af3	Update framework.	2017-02-27 15:55:57 +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	47997c20ad	Weld -> BindWith.	2017-02-27 12:24:53 +09:00
default0	0d1dec665a	Set StarDifficulty to -1 for invalid beatmaps ... The StarDifficulty calculation in a BeatmapGroup would not properly deal with Beatmaps that cannot be loaded and thus cause a NullReferenceException when trying to work with them, instead of assigning a StarDifficulty of -1 to signify that the map is invalid.	2017-02-26 21:57:19 +01:00
default0	8d91519d59	Update usage of FlowContainer and its subclasses	2017-02-26 21:32:43 +01:00
Dean Herbert	bc231c6bd4	Remove dispose which is no longer necessary.	2017-02-26 22:08:29 +09:00
Dean Herbert	c227eb1be5	Welded bindables.	2017-02-26 22:08:21 +09:00
Dean Herbert	c5ad79e3e2	Remove unnecessary schedule.	2017-02-26 21:15:33 +09:00
Dean Herbert	686372a7f9	Update with framework structural changes.	2017-02-26 20:54:32 +09:00
Dean Herbert	9f5518312d	Add missing file.	2017-02-26 18:28:01 +09:00
Dean Herbert	79993a576f	Add basic GC options.	2017-02-26 18:06:59 +09:00
Dean Herbert	27d31d1d30	Merge remote-tracking branch 'upstream/master' into better-container	2017-02-26 11:23:06 +09:00
Thomas Müller	1585ae842a	Update framework	2017-02-26 11:22:58 +09:00
DrabWeb	a009268370	Merge https://github.com/ppy/osu into popup-dialog	2017-02-25 21:22:47 -04:00
Dean Herbert	f6eb970f69	Merge branch 'master' into async-imports	2017-02-25 18:42:02 +09:00
Dean Herbert	17a28cd3b6	Don't push Player if we aren't still current.	2017-02-25 11:46:19 +09:00
Dean Herbert	7483b69477	Remove unnecessary Dispose logic.	2017-02-25 10:44:19 +09:00
Dean Herbert	7a60a5e499	Lock the BeatmapDatabase's connection during imports. ... This should avoid any potential issues with intertwined transactions on the same connection while still allowing higher throughput when importing.	2017-02-25 10:39:13 +09:00
DrabWeb	bd6ca99246	Even faster	2017-02-24 16:48:30 -04:00
DrabWeb	42b26a4c2f	Speedup triangles	2017-02-24 16:41:10 -04:00
Thomas Müller	4aecd59c74	Merge branch 'master' into fix-memory-leak	2017-02-24 19:54:14 +01:00
Thomas Müller	04900c1c49	Merge branch 'master' into async-imports	2017-02-24 19:48:06 +01:00
Thomas Müller	d150eb4450	Merge branch 'master' into better-star-counter	2017-02-24 19:37:04 +01: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
Alex Amadori	ace023f0c7	Refactor local vars named in a c-like fashion	2017-02-24 17:08:18 +01:00
Alex Amadori	90b0f035ad	Compute average of star ratings	2017-02-24 17:01:14 +01:00
Alex Amadori	51b6075210	Merge remote-tracking branch 'upstream/master'	2017-02-24 16:54:37 +01:00
Alex Amadori	e2ae03e798	Merge with upstream/master	2017-02-24 16:54:27 +01:00
Dean Herbert	c4fbfb5a8f	Update comment with new knowledge.	2017-02-24 21:46:34 +09:00
Dean Herbert	5096f6b83d	Fix memory leak from Player's InputManager.	2017-02-24 21:01:05 +09:00
Dean Herbert	12db33ad4b	Visual and readability improvements to StarCounter.	2017-02-24 19:30:56 +09:00
Dean Herbert	c178493877	Add support for undeleting beatmaps if they are imported during an undeleted state.	2017-02-24 18:13:38 +09:00
Dean Herbert	5ff4028c29	Make beatmap importing async.	2017-02-24 18:12:50 +09:00
Dean Herbert	ea4639932c	Simplify event names.	2017-02-24 17:21:14 +09:00
Dean Herbert	d24403e58e	Remove unused using statement.	2017-02-24 17:20:00 +09:00
Dean Herbert	958bf54c31	Add safe deletion support.	2017-02-24 17:08:13 +09:00
Dean Herbert	6c3bda18b6	Add beatmap deletion support. ... Note that this is a very naive approach and will result in file access exceptions. This will be fixed in a further commit.	2017-02-24 14:37:54 +09:00
Dean Herbert	3a89348413	Centralise access to WorkingBeatmaps. ... They can now only be instantiated from BeatmapDatabase and are abstract (to avoid misuse).	2017-02-24 13:43:21 +09:00
DrabWeb	c94da4fcf0	Added popup dialog	2017-02-24 00:05:37 -04:00
Dean Herbert	355bbb6324	SearchTextBox should not handle shift-delete.	2017-02-24 11:44:40 +09:00
Dean Herbert	c5552dfb27	Merge remote-tracking branch 'upstream/master' into remove-usings	2017-02-24 11:29:34 +09:00
Thomas Müller	0264c44a20	Do not shadow Colour in TwoLayerButton ... Renames Colour to BackgroundColour instead.	2017-02-23 22:33:37 +01:00
Thomas Müller	9e8fb698c6	Remove incorrectly shadowed variable	2017-02-23 22:33:07 +01:00
Thomas Müller	37bc75a7b6	Remove unused variables	2017-02-23 22:32:49 +01:00
Thomas Müller	2689de0c0c	Update framework and add "Async" suffix to asynchronous methods	2017-02-23 22:32:10 +01:00
Thomas Müller	a5dfa7ab06	Remove unnecessary using statements	2017-02-23 21:38:10 +01:00
Seth	b4b88712ad	Merge branch 'master' into mod-overlay	2017-02-23 08:00:24 -04:00
DrabWeb	64b0f85b89	Documented Mod class	2017-02-23 07:59:27 -04:00
DrabWeb	a67bfacb19	Made requested changes	2017-02-23 07:57:58 -04:00
DrabWeb	e1c4abd8c5	Cleaned ModSelectOverlay	2017-02-23 07:36:31 -04:00
Kelvin	fd622286fe	Enable Tabbing in LoginOptions	2017-02-23 00:50:09 -08:00
Dean Herbert	f1538791c3	Correctly hook up window mode dropdown.	2017-02-23 17:35:14 +09:00
Dean Herbert	6701cd9016	Merge branch 'master' into general-fixes	2017-02-23 17:04:53 +09:00
Dean Herbert	f812641696	Merge pull request #383 from peppy/player-loading-screen ... Add loading screen.	2017-02-23 17:04:44 +09:00
Dean Herbert	da2bfe6d3c	Framework updates.	2017-02-23 16:42:12 +09:00
Dean Herbert	c683cdbb1d	Derive from FocusedOverlayContainer and remove custom focus logic.	2017-02-23 12:51:32 +09:00
Dean Herbert	cee1c14557	Clean-up code.	2017-02-23 12:48:24 +09:00
Dean Herbert	8d1498a8db	Fix initial state and shorten disappear animation.	2017-02-23 12:47:20 +09:00
Dean Herbert	b33627a750	Make transitions better.	2017-02-23 12:42:31 +09:00
Dean Herbert	8787b0dc90	Remove a lot of constants (use object initialisers instead).	2017-02-23 12:17:59 +09:00
Dean Herbert	521a9b7728	Remove need for waves array; use generic container.	2017-02-23 11:26:50 +09:00
Dean Herbert	d154cf7938	Abstract wave logic to class.	2017-02-23 11:22:01 +09:00
Dean Herbert	9f367bcc0e	Fix line endings.	2017-02-23 11:16:23 +09:00
Dean Herbert	9746877903	Merge remote-tracking branch 'upstream/master' into mod-overlay	2017-02-23 11:11:52 +09:00
Dean Herbert	7e7bf07d03	Remove unused whitebox.	2017-02-23 11:11:46 +09:00
DrabWeb	79ff96de0d	Typo	2017-02-22 16:38:36 -04:00
DrabWeb	a58a0a4edf	Fix transition stutter	2017-02-22 16:37:58 -04:00
DrabWeb	cf5258ceb0	Thanks refactoring	2017-02-22 13:17:06 -04:00
DrabWeb	bf1d13e734	Comply to formatting style	2017-02-22 13:12:39 -04:00
DrabWeb	8cd7ebcb43	readonly -> const	2017-02-22 13:03:19 -04:00
DrabWeb	416772e96f	Update to work with latest framework	2017-02-22 12:46:38 -04:00
DrabWeb	99f1f88c75	Merge https://github.com/ppy/osu into mod-overlay	2017-02-22 12:35:55 -04:00
DrabWeb	bac0431102	Fixed build failing	2017-02-22 12:28:34 -04:00
DrabWeb	cc956bc8ec	Newline	2017-02-22 12:23:46 -04:00
DrabWeb	584a514267	Cleanup part 2	2017-02-22 12:22:29 -04:00
DrabWeb	4821f323b8	Cleanup	2017-02-22 12:12:41 -04:00
DrabWeb	337a1004d3	Made mod disabling better	2017-02-22 11:34:22 -04:00
Dean Herbert	d19a7813f3	Fix TestCasePlayer regression.	2017-02-22 23:27:29 +09:00
Dean Herbert	c83d2bbe6e	Make panels fade in again.	2017-02-22 21:54:49 +09:00
Dean Herbert	aef0eb49a1	Add loading screen.	2017-02-22 21:53:59 +09:00
Dean Herbert	7cda82d016	Space to skip.	2017-02-22 21:28:40 +09:00
Thomas Müller	0d3cc39cbc	Merge branch 'master' into general-fixes	2017-02-22 08:01:34 +01:00
Thomas Müller	44bedb5407	Merge branch 'master' into chat-improvement	2017-02-22 07:36:42 +01:00
Dean Herbert	2d2660c1c5	Improve transition when retrying a beatmap.	2017-02-22 14:14:37 +09:00
Dean Herbert	d00ea4564f	Fix API coming online too early in race scenarios.	2017-02-22 14:09:48 +09:00
Dean Herbert	190bed8939	Add top padding.	2017-02-22 13:38:22 +09:00
Dean Herbert	b7a9fd85ea	Assert single channel support for now.	2017-02-22 13:38:10 +09:00
Alex Amadori	3d19199218	Fixed for star difficulty	2017-02-21 18:27:39 +01:00
Alex Amadori	6c161fb167	Merge remote-tracking branch 'upstream/master'	2017-02-21 18:15:46 +01:00
Dean Herbert	afba4fbfad	Merge remote-tracking branch 'upstream/master' into chat-improvement	2017-02-21 15:46:28 +09:00
Dean Herbert	5f29b0dc4f	Update in line with framework changes.	2017-02-21 15:46:04 +09:00
Dean Herbert	cbd061d573	Improve appearance of notifications.	2017-02-21 13:52:37 +09:00
Dean Herbert	aedce4d516	Merge remote-tracking branch 'upstream/master' into difficulty-calculator	2017-02-20 21:20:56 +09:00
Dean Herbert	6a83620589	Add better focus handling and padding/margin updates.	2017-02-20 21:11:09 +09:00
Dean Herbert	e3fa49dda7	Naively "send" messages that the user types (doesn't arrive yet).	2017-02-20 21:10:43 +09:00
Dean Herbert	4afa434962	Maintain a scroll position when scrolled to the bottom of a chat channel.	2017-02-20 21:10:23 +09:00
Dean Herbert	75b66871dd	Add colourised usernames.	2017-02-20 21:09:56 +09:00
Dean Herbert	7a2eedbd7e	Add message batching per-channel.	2017-02-20 21:09:34 +09:00
Dean Herbert	729f2eec8d	Increase maximum chat history.	2017-02-20 21:07:44 +09:00
Thomas Müller	444c3ba817	Merge branch 'master' into difficulty-calculator	2017-02-20 07:38:10 +01:00
Thomas Müller	1ead694c75	Merge branch 'master' into general-fixes	2017-02-20 07:37:31 +01:00
Dean Herbert	a621a65eb5	Fix GlobalHotkeys not working (regression due to masking rules).	2017-02-20 15:31:15 +09:00
Dean Herbert	737bd62c30	Fix GlobalHotkeys not working (regression due to masking rules).	2017-02-20 15:27:48 +09:00
Alex Amadori	a0d0c1854b	Merge remote-tracking branch 'upstream/master'	2017-02-19 19:09:55 +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
Jorolf	1e0a694ff8	replaced bool with Bindable<bool> ... Also accounted for the ParallaxAmount when moving to default position	2017-02-19 17:11:36 +01:00
Jorolf	7f751d3653	Update ParallaxContainer.cs	2017-02-19 16:54:00 +01:00
Jorolf	e83ac8b04c	Removed public ParallaxEnabled property	2017-02-19 13:47:26 +01:00
Dean Herbert	c6fa5cc803	Fix order of execution when populating initial messages.	2017-02-19 18:46:19 +09:00
Dean Herbert	de87141e90	Remove unused using statements.	2017-02-19 18:39:54 +09:00
Dean Herbert	cde660a8ef	Scroll to bottom.	2017-02-19 18:07:35 +09:00
Dean Herbert	aac4ba2baa	Add input box to ChatOverlay.	2017-02-19 18:02:25 +09: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
Jorolf	f166bb0f96	Moved movement to the default position to property	2017-02-18 22:26:48 +01:00
Jorolf	77bfe57d8c	compacted code, made public bool to disable it	2017-02-18 22:00:07 +01:00
Jorolf	a48e4a31a7	Parallax Option works now	2017-02-18 21:34:21 +01:00
DrabWeb	3f5d155583	Added DeselectAll	2017-02-18 11:40:05 -04:00
Alex Amadori	21cf96ec10	More sorting rookie mistakes	2017-02-18 16:23:13 +01:00
DrabWeb	a024353574	Wave animation fine tuning	2017-02-18 11:21:41 -04:00
Alex Amadori	f48c83b787	Fix silly sorting mistakes	2017-02-18 15:56:29 +01:00
Alex Amadori	d92382c1aa	Merge remote-tracking branch 'upstream/master'	2017-02-18 15:18:26 +01:00
Alex Amadori	6bbbbd8f96	Implemented sorting in TestCasePlaySong	2017-02-18 15:11:40 +01:00
Dean Herbert	c1194102b1	Remove second sample playback when clicking osu! logo.	2017-02-18 22:33:24 +09:00
Dean Herbert	ebc38917dc	Fix options sidebar not displaying correclty.	2017-02-18 22:29:20 +09:00
DrabWeb	d1af050355	Fixed typo, made mod select take focus when visible	2017-02-18 07:50:22 -04:00
DrabWeb	d82b67ee9b	Made Mod abstract, added KeyMod as a base for mania key count modes	2017-02-18 07:44:46 -04: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	78c9348b5a	Make accuracy fixed width and improve feel.	2017-02-18 17:35:54 +09:00
Dean Herbert	1a31589abd	Add padding zeroes to score display (and fix not being applied initially).	2017-02-18 17:35:37 +09:00
Dean Herbert	32ce8cf723	Audio class renames in line with framework changes.	2017-02-18 17:35:04 +09:00
Alex Amadori	1cd93f79b3	General sorting improvements	2017-02-18 07:59:01 +01:00
Dean Herbert	94dd268fd2	Move constant for default ControlPoint out of Slider.	2017-02-18 15:54:16 +09:00
Dean Herbert	bf33cc6f53	Make disclaimer actually be a thing.	2017-02-18 14:16:46 +09:00
Alex Amadori	6b3ecc28b8	Fixed BeatmapPanels disappearing	2017-02-17 23:32:14 +01:00
Thomas Müller	ef775458dd	Fix compilation error introduced in merge conflict resolution.	2017-02-17 21:27:17 +01:00
Thomas Müller	04de28d8b2	Merge branch 'refs/heads/update-framework' into general-fixes	2017-02-17 21:26:39 +01:00
Thomas Müller	1198705a6f	Merge branch 'master' of github.com:ppy/osu into general-fixes ... # Conflicts: # osu.Game/Beatmaps/Beatmap.cs	2017-02-17 21:22:34 +01:00
Thomas Müller	4b0d6cd26b	Don't rely on default relative size of ScrollContainer.	2017-02-17 20:08:28 +01:00
Shadoxfix	7a45ea58b2	Add comment explaining why the branch is necessary	2017-02-17 18:17:18 +01:00
Alex Amadori	7dcbefd50f	Implemented basic sorting logic	2017-02-17 17:41:53 +01:00
Shadoxfix	72306e8757	Fix beatmap import crash when the first timingPoint starts later than a slider	2017-02-17 17:36:00 +01: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
Dean Herbert	366e95dd4f	Remove outdated comment.	2017-02-17 17:33:41 +09:00
Dean Herbert	9e8b4d43dd	Improve exit procedure.	2017-02-17 17:25:28 +09:00
Dean Herbert	0b922365bb	Fix nullref due to missing controlPoints.	2017-02-17 15:27:48 +09:00
DrabWeb	4ccfa380f5	Added high/low multiplier indication	2017-02-16 19:09:18 -04:00
DrabWeb	e0dab3490f	Added toggling mods with keys	2017-02-16 19:00:18 -04: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	53e40804ab	Move other score components to centre alignment (and switch font).	2017-02-16 22:44:41 +09:00
Dean Herbert	ca6946c7a2	Update Health display design.	2017-02-16 22:44:21 +09:00
Dean Herbert	9a2beb5979	Update Key Counter font.	2017-02-16 22:43:49 +09:00
Dean Herbert	04346dbb92	Make osu! logo at song select correctly handle mouse focus.	2017-02-16 22:24:25 +09:00
Dean Herbert	8bf3902cbd	Add the concept of nested DrawableHitObjects. ... - Applies to Slider Ticks and start circle. repeat/endpoints still need addressing. - Removed SliderTicksLayer abstraction for now.	2017-02-16 17:02:36 +09:00
Dean Herbert	2640c2ac43	Add tick sample.	2017-02-16 13:39:01 +09:00
Dean Herbert	23677a309f	Merge branch 'master' into slider_ticks	2017-02-16 11:06:23 +09:00
Damnae	b7fca88b4f	Clearer slider Velocity and TickDistance calculations.	2017-02-15 18:55:49 +01:00
Dean Herbert	7fbc5990d1	Add combo numbers.	2017-02-15 23:23:55 +09:00
Dean Herbert	67105e6dfd	Replace all usage of SpriteText with OsuSpriteText.	2017-02-15 21:37:43 +09:00
Dean Herbert	12e265a3e2	Combine triangle system implementations.	2017-02-15 20:39:10 +09:00
Jorolf	d42c5481b0	Make mode selector selected line non-relative. (#352) ... * mode selector line has the correct length now * calculation is now a 'one-liner' * Line length is absolute now * Line length is calculated inline	2017-02-15 13:48:49 +09:00
Dean Herbert	d570a6d308	Handle cases where HitObjects were not parsed.	2017-02-15 12:38:10 +09:00
Dean Herbert	753232533a	Display Important/Error logging in notifications for now.	2017-02-15 12:37:57 +09: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	8e9a5e9faa	Add the ability to make DrawableHitObjects non-interactive (for use in other contexts).	2017-02-15 01:23:20 +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
Dean Herbert	13ed7db361	Merge branch 'master' into general-fixes	2017-02-15 01:14:25 +09:00
Dean Herbert	f207da6041	Add/update license headers.	2017-02-14 18:17:35 +09:00
Dean Herbert	6fa84f3a81	Merge branch 'master' into disable-unimplemented-options	2017-02-14 08:35:40 +09:00
Dean Herbert	4f9d1a6c39	Visually disable options which aren't yet wired up.	2017-02-14 00:36:50 +09:00
Dean Herbert	343e48c195	Merge branch 'master' into followpoints	2017-02-13 22:23:57 +09:00
Dean Herbert	11643d2e09	Remove unnecessary methods and local variables.	2017-02-13 18:30:51 +09:00
Dean Herbert	1aeb48b920	Merge remote-tracking branch 'upstream/master' into osb_loading	2017-02-13 18:22:29 +09:00
Thomas Müller	aaaf7163e0	Update framework.	2017-02-13 17:46:50 +09:00
Thomas Müller	e3f35cd66e	Merge branch 'master' into osb_loading	2017-02-12 12:26:25 +01:00
Dean Herbert	e32ccb6153	Move scene graph init to ctors.	2017-02-12 19:39:54 +09:00
Dean Herbert	874af48de6	Merge remote-tracking branch 'upstream/master' into installer-updater	2017-02-12 17:18:04 +09:00
John Leuenhagen	7ad9cd6b6e	add explicit false values to prevent warnings as errors	2017-02-12 02:32:11 -05:00
Dean Herbert	3d65c468ae	Merge remote-tracking branch 'upstream/master' into installer-updater	2017-02-12 16:30:12 +09:00
Dean Herbert	37e75e9a54	Add null check when loading beatmap background.	2017-02-12 16:13:44 +09:00
Dean Herbert	870aa2750f	Don't attempt to import command line arguments as beatmaps.	2017-02-12 14:53:33 +09:00
Dean Herbert	ac548dc9ec	Rework notifications to be more flexible.	2017-02-12 14:50:42 +09:00
Dean Herbert	a14b7eb598	NotificationManager should become visible when receiving a notification (until we implement toasts).	2017-02-12 14:50:02 +09:00
Thomas Müller	d3380631e8	Handle preferred audio device correctly when it is unavailable ... This commit allows loading, storing, and displaying a preferred audio device from config even when it is unavailable.	2017-02-11 16:33:54 +01:00
Thomas Müller	d79c8b9695	Update AudioDevicesOptions when devices are found or lost ... This commit hooks up AudioDevicesOptions to the new events exposed by the AudioManager of osu-framework. The device list is now updated when new devices become available or are lost.	2017-02-11 16:29:33 +01:00
Thomas Müller	8394e2ff38	Update OptionDropDown value when items change ... Items of OptionDropDown could previously already be changes on-the-fly, but the selected value was not correctly updated (it kept the same index). This commit addresses this problem.	2017-02-11 16:27:15 +01:00
Thomas Müller	2c4ecb990d	Remove line break in MusicController	2017-02-11 16:23:15 +01:00
Dean Herbert	7efa3415a4	Merge branch 'master' into followpoints	2017-02-10 20:59:45 +09:00
Damnae	2d155f6a5c	Bring back the delay to what it was before.	2017-02-10 10:48:25 +01:00
Damnae	6f37c02868	Fix followpoints needing a DelayReset.	2017-02-10 10:07:52 +01:00
Dean Herbert	e23202c449	Merge remote-tracking branch 'upstream/master' into desktop-unit-tests	2017-02-10 17:22:38 +09:00
Dean Herbert	398ac6f459	Add assert to ensure complete is only called once.	2017-02-10 16:58:40 +09:00
Dean Herbert	dd8ec70bd5	Remove excess newline.	2017-02-10 16:57:49 +09:00
Dean Herbert	2da5628184	Merge remote-tracking branch 'upstream/master' into notifications-manager	2017-02-10 16:54:56 +09:00
Thomas Müller	0f7cee230b	Merge pull request #343 from peppy/general-fixes ... Add pink glow to cursor because I can't fucking see it against white.	2017-02-10 08:45:00 +01:00
Dean Herbert	8ec927899f	Implement notifications.	2017-02-10 16:30:23 +09:00
Dean Herbert	d5b7a8ce9e	Add pink glow to cursor because I can't fucking see it against white.	2017-02-10 16:24:40 +09:00