493 Commits

Author	SHA1	Message	Date
Andrei Zavatski	6631b07442	Refactor to replace existing panels	2020-03-04 14:58:15 +03:00
Dean Herbert	394b88aa65	Add thread mode dropdown	2020-02-28 22:17:45 +09:00
Dean Herbert	4ad2d0cfb6	Remove deprecated debug setting	2020-02-28 22:17:45 +09:00
Dean Herbert	92f6f0207c	Rename LoadingAnimation to LoadingSpinner	2020-02-21 15:33:31 +09:00
recapitalverb	ee14a275a2	Make IAPIProvider instances nullable	2020-02-14 22:02:44 +07:00
recapitalverb	10798aeab3	Fix code formatting	2020-02-14 20:30:27 +07:00
recapitalverb	c753cb46c5	Use [Resolved] wherever possible	2020-02-14 20:14:00 +07:00
unknown	894642d588	add xmldoc and formatting	2020-01-28 18:04:00 +08:00
unknown	aa264cd2a8	allow tooltip to show as percentage as needed	2020-01-28 12:32:30 +08:00
Dean Herbert	bc75290655	Ensure min and max stars are correctly ordered	2020-01-25 00:11:20 +09:00
smoogipoo	d1684a3c92	Duplicate keywords for better UX	2020-01-24 19:50:16 +09:00
smoogipoo	75d0fd0bab	Rename class	2020-01-24 19:43:23 +09:00
smoogipoo	2643b6fca3	Add additional keywods	2020-01-24 19:12:48 +09:00
smoogipoo	62fa619ad4	Display "no limit" for maximum stars	2020-01-24 19:08:14 +09:00
Dean Herbert	da65fff48e	Merge remote-tracking branch 'upstream/master' into collapse-graph-option	2020-01-24 13:55:42 +09:00
Revel	a86fb2113e	fix tooltip capitalization	2020-01-14 14:26:54 -05:00
Joehu	19033e0ef8	Fix user status dropdown having no padding around items	2020-01-10 19:25:33 -08:00
Salman Ahmed	b93bbf81aa	Add lighten background during breaks setting	2019-12-10 15:10:35 +03:00
Huo Yaoyuan	c0fe91a84c	Merge branch 'master' into sharpen	2019-11-26 18:21:50 +08:00
Dean Herbert	1fd5ed3c0f	Change login placeholder text to ask for username	2019-11-25 21:35:25 +09:00
Dean Herbert	d0002cc1c2	Update performance logging setting	2019-11-22 19:50:30 +09:00
Dean Herbert	ab42fac43a	Improve naming	2019-11-22 02:38:31 +09:00
Dean Herbert	a97d760afa	Merge remote-tracking branch 'upstream/master' into menu-background-modes	2019-11-22 02:23:02 +09:00
Huo Yaoyuan	818553027b	Merge branch 'master' into sharpen	2019-11-21 23:42:46 +08:00
Dean Herbert	d7cb23a909	Remove redundant keyword	2019-11-21 22:51:00 +09:00
Dean Herbert	8b1fb2d5a1	Standardise keyword specifications	2019-11-21 22:35:15 +09:00
Andrei Zavatski	f066d8434c	Apply suggestions	2019-11-21 00:26:39 +03:00
Andrei Zavatski	6b3010535f	Simplify Keywords usage for SettingsSubsection	2019-11-20 21:03:31 +03:00
Andrei Zavatski	f3d9abc84a	Capitalize Bar for consistency	2019-11-20 19:57:02 +03:00
Andrei Zavatski	e820ddd3e8	Implement settings keywords	2019-11-20 19:27:34 +03:00
Huo Yaoyuan	e5e8e70704	Use pattern matching.	2019-11-12 19:55:19 +08:00
Ganendra Afrasya	5c2917d303	Place sign in button inside ShakeContainer	2019-10-30 00:50:04 +07:00
Roman Kapustin	e00992dfd8	Remove FollowPlayback setting	2019-10-07 19:44:22 +03:00
Roman Kapustin	eda4a27b45	Move FollowPlayback setting to User Interface subsection	2019-10-06 15:06:25 +03:00
Roman Kapustin	bdea75b995	Autoscroll playlist on song change	2019-10-05 23:53:05 +03:00
HDragonHR	faf8fe132e	Change bindable int to float	2019-10-02 12:26:46 +08:00
LeNitrous	b8d147a3b4	introduce main menu background modes	2019-09-24 17:42:06 +08:00
Dean Herbert	b41ac543c5	Allow changing logged in user	2019-09-23 04:46:50 +09:00
Dean Herbert	ead3ee3b41	Merge branch 'master' into hold-to-press-setting	2019-09-19 20:05:14 +09:00
Dan Balasescu	027d6194f2	Merge branch 'master' into add-hit-lighting	2019-09-19 18:07:29 +09:00
Dean Herbert	177a789d79	Add setting to adjust hold-to-confirm activation time	2019-09-19 14:06:25 +09:00
Dean Herbert	63cc8d4f90	Add hit lighting setting	2019-09-18 02:16:57 +09:00
Dean Herbert	b5b29a21e7	Move menu cursor rotation to more appropriate settings section	2019-09-18 02:15:18 +09:00
Andrei Zavatski	437e121056	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video	2019-09-13 13:39:58 +03:00
iiSaLMaN	cb55159b28	Use float types for cursor sizes	2019-09-03 01:28:51 +03:00
Andrei Zavatski	94512fea8e	Apply naming suggestions	2019-08-31 16:20:33 +03:00
Andrei Zavatski	fa3591e5ec	Add setting to turn on/off the video	2019-08-31 00:42:20 +03:00
Andrei Zavatski	a59a14c9e6	Add setting to enable/disable hit error visibility	2019-08-18 15:01:04 +03:00
Dean Herbert	cb0cd7ed58	Add triangles intro	2019-08-09 20:05:28 +09:00
Dean Herbert	4c6cccb3a3	Update settings in line with framework changes	2019-07-30 23:31:21 +09:00
smoogipoo	fab3ec3e5b	Add maximum height to skin dropdown	2019-07-30 19:28:02 +09:00
Dean Herbert	df5abd9651	Merge branch 'master' into shuffle-skin	2019-07-29 01:55:57 +09:00
Dean Herbert	27e79d56ec	Merge branch 'master' into collapse-graph-option	2019-07-09 23:40:43 +09:00
Salman Ahmed	b10c35b6ab	Update label text ... Co-Authored-By: Aergwyn <aergwyn@t-online.de>	2019-07-07 06:13:27 +03:00
Dean Herbert	84919d70bb	Health bar -> Health display ... Also inverts logic	2019-07-07 05:30:30 +09:00
Salman Ahmed	dfabed3d85	Merge branch 'master' into applicable-to-hud	2019-07-06 16:30:02 +03:00
iiSaLMaN	530e07110f	Use a descriptive name for the setting	2019-07-06 06:32:25 +03:00
Unknown	ee44caf964	better setting description	2019-07-05 08:52:44 +02:00
Dean Herbert	99da04527d	Replays -> scores	2019-07-05 14:07:14 +09:00
Unknown	608223cbb4	Add setting to collapse the song progress graph	2019-07-04 11:59:38 +02:00
Dean Herbert	7575047db8	Merge branch 'master' into import-stable-scores	2019-07-04 01:00:42 +09:00
Salman Ahmed	744e651a37	Merge branch 'master' into applicable-to-hud	2019-07-02 05:24:56 +03:00
Salman Ahmed	72e5cbb07f	Add checkbox for hiding health bar	2019-07-02 01:45:09 +03:00
Dean Herbert	3902da9135	Merge remote-tracking branch 'upstream/master' into abstract-menu	2019-06-28 18:13:44 +09:00
Dean Herbert	6d0cc1f770	Remove GC debug setting	2019-06-28 15:59:19 +09:00
smoogipoo	23df1a5d42	Merge remote-tracking branch 'HollyHacker/master' into abstract-menu	2019-06-28 13:42:56 +09:00
HoLLy	55216dffb7	Merge remote-tracking branch 'origin/master' into import-stable-scores	2019-06-27 14:07:17 +02:00
Dean Herbert	9e1cb90dd8	Remove existing argument for ItemAdded event ... For all usages, it looks like this was unnecessary.	2019-06-26 11:40:41 +09:00
smoogipoo	fb94cd43a4	Remove unnecessary local item storage in SettingsDropdown	2019-06-25 12:00:05 +09:00
jorolf	4d8f49b9bc	update code to work with https://github.com/ppy/osu-framework/pull/2568	2019-06-24 23:17:07 +02:00
HoLLy	d99f4d1a87	Change import button to mention replays instead of scores	2019-06-21 17:42:54 +02:00
HoLLy	15c75b4442	Add basic score import from stable	2019-06-19 18:33:51 +02:00
Dean Herbert	f358fce9ab	Move activity (writable) bindable to APIAccess so it correctly transfers between users	2019-06-12 18:04:57 +09:00
Dean Herbert	a9c229b1ec	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-06-12 16:00:35 +09:00
Dean Herbert	b29b1bf254	Merge branch 'master' into mod-grow-improvement	2019-06-12 13:18:02 +09:00
Dean Herbert	609a82bc94	Update VisibilityContainer usage in line with framework	2019-06-11 15:13:58 +09:00
Lucas A	141775d98c	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-06-10 21:41:00 +02:00
Shane Woolcock	807d434be0	Access WindowModes via IBindableList	2019-06-09 17:52:02 +09:30
Ganendra Afrasya	49193a2703	Rename the setting label	2019-06-09 13:12:41 +07:00
Ganendra Afrasya	afc3a08953	Use existing setting instead ... Now it read IncreaseFirstObjectVisibility bindable instead	2019-06-09 13:11:40 +07:00
Ganendra Afrasya	f326264a85	Adding increase first object grow mod visibility setting	2019-06-08 00:42:57 +07:00
smoogipoo	4d035afcc6	Add setting to bypass front-to-back	2019-06-06 16:49:42 +09:00
Lucas A	2d966682dc	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-14 18:09:58 +02:00
Dean Herbert	7553e2da25	Fix incorrect DI reference and update naming of SettingsOverlay classes	2019-05-14 10:45:05 +09:00
Lucas A	a5f758b977	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-07 18:27:14 +02:00
smoogipoo	d7c09e7dbd	Merge remote-tracking branch 'origin/master' into fix-new-inspections ... # Conflicts: # osu.Game.Rulesets.Catch/Judgements/CatchDropletJudgement.cs # osu.Game.Rulesets.Catch/Judgements/CatchJudgement.cs # osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs # osu.Game.Rulesets.Osu/Replays/OsuAutoGenerator.cs # osu.Game.Rulesets.Osu/UI/Cursor/CursorTrail.cs # osu.Game.Tests/Visual/SongSelect/TestCaseBeatmapScoresContainer.cs # osu.Game/Graphics/OsuFont.cs # osu.Game/Online/API/Requests/Responses/APILegacyScoreInfo.cs # osu.Game/Overlays/Profile/Header/BadgeContainer.cs # osu.Game/Overlays/Profile/ProfileHeader.cs # osu.Game/Screens/Select/PlaySongSelect.cs # osu.Game/Skinning/LegacySkinDecoder.cs	2019-05-07 13:20:17 +09:00
Lucas A	88b8afbb6a	Make UserPanel show current user activity when ... user status is online.	2019-05-05 20:51:55 +02:00
smoogipoo	772bef91fa	Merge remote-tracking branch 'Joehuu/master' into drawnode-composability ... # Conflicts: # osu.Game.Rulesets.Osu/UI/Cursor/OsuCursorContainer.cs	2019-04-08 23:01:12 +09:00
Dean Herbert	f1952c0816	Update font awesome usage	2019-04-02 19:55:24 +09:00
smoogipoo	a56e29347f	Adjust namespaces	2019-04-02 14:51:28 +09:00
Dean Herbert	c39c37a18d	Apply more missed cases	2019-04-01 12:44:46 +09:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
Dean Herbert	f0114d776d	Use interface to access API ... Allows for better testability.	2019-03-13 12:58:18 +09:00
Dan Balasescu	fd147dae21	Merge branch 'master' into fix-disabled-set-crash	2019-03-05 17:25:13 +09:00
Shane Woolcock	f1912a281c	Use Count property	2019-02-28 21:46:49 +09:00
Shane Woolcock	dfb3fef9e1	Hide WindowMode dropdown if only one is selectable	2019-02-28 21:38:55 +09:00
Shane Woolcock	b159e3ec31	Fix headless tests	2019-02-28 20:39:55 +09:00
Shane Woolcock	94199e628c	Only display SupportedWindowModes in settings	2019-02-28 20:20:12 +09:00
Dean Herbert	d10ad3c8a7	Fix warnings	2019-02-28 18:59:05 +09:00
Dean Herbert	5b53cf0961	Merge branch 'master' into hide-desktop-only-elements	2019-02-28 18:50:16 +09:00
Dean Herbert	0788a7e9f1	Merge branch 'master' into more-inspections	2019-02-28 14:32:57 +09:00
Dean Herbert	42be7857d1	Use expression body for property get/set where possible	2019-02-28 13:58:19 +09:00
Dean Herbert	26d53d06a9	Fix remaining issues	2019-02-28 13:31:40 +09:00
Shane Woolcock	ce17e37c74	Conditionally add some UI elements only on desktop ... Prevents crashes from trying to access features that are not applicable to mobile.	2019-02-28 13:10:53 +09:00
Dean Herbert	80737b9ef8	Remove "silent" parameter; consolidate import logic	2019-02-25 18:24:06 +09:00
Dean Herbert	367bc53a06	Revert some more instances of 'e' variable names	2019-02-22 20:15:25 +09:00
Dean Herbert	3015d40f8f	Merge branch 'master' into osu-fontusage	2019-02-22 18:09:23 +09:00
Dean Herbert	3fe4b8fd1c	Update variable names ... Also cleans up some weird code	2019-02-22 17:51:39 +09:00
smoogipoo	d8c55bc729	Adjust namespaces	2019-02-21 19:05:52 +09:00
smoogipoo	bca347427f	Update with framework bindable changes	2019-02-21 18:56:34 +09:00
smoogipoo	0693ab8e7d	Merge remote-tracking branch 'origin/master' into osu-fontusage ... # Conflicts: # osu.Game/Screens/Multi/Components/BeatmapTitle.cs	2019-02-20 15:04:08 +09:00
smoogipoo	a2aa3ec5cb	Adjust sprite texts in-line with framework changes	2019-02-20 15:03:20 +09:00
Dean Herbert	1550908edb	Add tooltip to key configuration button	2019-02-15 11:56:33 +09:00
Dean Herbert	a5f1aa644b	Fix cursor sensitivity tooltip not updating instantly	2019-01-25 17:30:35 +09:00
Dean Herbert	8617aaa2a7	Update licence header (and remove year)	2019-01-24 17:43:03 +09:00
Dean Herbert	7baff750de	Consolidate layout, wording and ordering with VisualSettings	2019-01-22 10:06:30 +09:00
Bear Daniel	7cdb823c87	Moved "Use beatmap hitsounds" button	2019-01-21 08:04:06 -06:00
Bear Daniel	858541bcf4	Added "Use beatmap hitsounds" button to volume section of settings	2019-01-18 02:33:39 -06:00
nwabear	42fa04beee	Update SkinSection.cs ... Added "Use beatmap skins" button to general settings	2019-01-17 14:40:22 -06:00
Dean Herbert	93a08bdb23	Remove stray using	2019-01-17 20:23:15 +09:00
Dean Herbert	d16f4af92b	Use TransferValueOnCommit for mouse sensitivity	2019-01-17 19:18:40 +09:00
Dean Herbert	5e4bea9d99	Fix extra newline	2019-01-10 12:11:14 +09:00
Dean Herbert	4f5c208672	Add UI scale ... Limited to (relatively) sane values until we eventually get around to adjusting UI to allow higher extermities.	2019-01-09 19:01:33 +09:00
smoogipoo	2c44b928d3	Remove unused references	2019-01-08 16:38:34 +09:00
smoogipoo	daeba63242	Remove more unused code	2019-01-08 16:37:18 +09:00
Dean Herbert	a2a7aa708f	Use better logic for setting slider bar settings	2019-01-08 14:56:42 +09:00
Dean Herbert	01aa4c2a72	Use TransferOnCommit	2019-01-08 13:48:38 +09:00
Dean Herbert	3a10dd47d5	Add preview for gameplay region	2019-01-04 15:28:35 +09:00
Dean Herbert	9c7830d83b	Size -> scale	2019-01-04 14:58:44 +09:00
Dean Herbert	35a6257642	Delay updates when changes would affect mouse position	2019-01-04 14:55:59 +09:00
Dean Herbert	3953f829c8	Add letterbox/screen scaling support	2019-01-04 13:36:02 +09:00
Dean Herbert	63847890d1	Add better messaging when connecting or failing	2018-12-26 18:07:33 +09:00
Dean Herbert	fc5d5a7752	Merge branch 'master' into user-registration	2018-12-14 19:45:27 +09:00
Dean Herbert	4fc9902cd2	Fix reverting to default skin via settings button causing a hard crash	2018-12-12 21:30:21 +09:00
Dean Herbert	1a974f64de	Initial design for user registration dialog	2018-12-05 12:57:26 +09:00
Jan Jurzitza	3f6656e2cd	Merge branch 'master' into shuffle-skin	2018-12-04 12:59:31 +01:00
smoogipoo	a8ad7d4670	Add silent import parameter	2018-11-30 18:27:13 +09:00
WebFreak001	89ded824b3	Style fixes	2018-11-28 12:49:17 +01:00
WebFreak001	c4c2191500	Apply requested changes	2018-11-28 12:36:21 +01:00
smoogipoo	a88b69ec43	Notify of existing imports	2018-11-28 20:19:35 +09:00
WebFreak001	17a11212e8	Style fixes	2018-11-25 14:41:39 +01:00
WebFreak001	2b05a61806	Fix crash when reseting skin while in dropdown	2018-11-25 14:24:20 +01:00
WebFreak001	edb45e4e47	Only show random skin button with more than one skin	2018-11-25 14:23:53 +01:00
WebFreak001	6a9187ece0	Fixed style warnings	2018-11-25 04:01:30 +01:00
WebFreak001	f38b68a590	Add action to pick random skin	2018-11-25 03:50:26 +01:00
smoogipoo	cadfe41f83	Merge remote-tracking branch 'origin/master' into external_link_warning	2018-11-23 15:19:52 +09:00
Dean Herbert	7755242a43	Merge branch 'master' into osuTK	2018-11-21 18:53:11 +09:00
smoogipoo	5ad96afea0	Fix crashes when importing/deleting from model managers	2018-11-20 18:09:23 +09:00
smoogipoo	f27bd3ef3e	OpenTK -> osuTK	2018-11-20 17:14:59 +09:00
Roman Kapustin	376e76e00d	Resolve merge conflicts	2018-11-18 16:10:36 +03:00
smoogipoo	f1f2fc133a	Use SkinInfo directly	2018-11-14 19:29:20 +09:00
smoogipoo	aff5fa6169	Update with osu!-side dropdown changes	2018-11-14 18:02:38 +09:00
Roman Kapustin	b4809f4417	External link warning code cleanup	2018-11-01 23:52:07 +03:00
Roman Kapustin	805f8d98c4	Implement warn about opening external links option	2018-10-22 23:57:37 +03:00
Dean Herbert	841b2e8692	Merge branch 'master' into consistent-terminology-format	2018-10-10 19:19:36 +09:00
ekrctb	99fc04c8af	Change signature to new event handler	2018-10-02 12:02:47 +09:00
Dan Balasescu	b1450b1f1a	Merge branch 'master' into fix-3514	2018-10-02 09:24:58 +09:00
AtomCrafty	6c55efdf20	Add true to BindValueChanged call to hide resolution dropdown when starting in windowed mode	2018-10-01 13:12:34 +02:00
Hanamuke	b983e20067	Merge branch 'master' into AR_Catch	2018-09-30 16:01:55 +02:00
Dean Herbert	dafbabec31	Fix import buttons having incorrect mappings when setting disabled states	2018-09-21 21:08:21 +09:00
Dean Herbert	1861547c86	Apply review	2018-09-20 19:01:04 +09:00
Hanamuke	e7d78b94ae	Remove ScrollingVisualisation from settings	2018-09-19 18:30:25 +02:00
smoogipoo	73fb3fa3a4	Fix macOS crashing in fullscreen mode	2018-09-19 17:52:35 +09:00
Joehu	f99eff1192	Use consistent terminology format	2018-09-15 07:30:11 -07:00
Dean Herbert	c1cdff8505	Add default resolution to avoid crashing	2018-09-07 19:29:51 +09:00
Dean Herbert	81da7ce298	Merge branch 'master' into add-skin-import-delete	2018-09-07 16:48:01 +09:00
Dean Herbert	bf0ad723f5	Add default fallback for headless operation	2018-09-07 14:35:38 +09:00
Dean Herbert	f76d00e8ae	Simplify null checks	2018-09-07 14:31:38 +09:00
Dean Herbert	581da108fc	Rewrite to not suck	2018-09-05 11:32:38 +09:00
Dean Herbert	46b6601cbf	Merge remote-tracking branch 'upstream/master' into select_resolution_in_fullscreen_mode	2018-09-05 10:47:34 +09:00
Dean Herbert	5efa9c7652	Fix items in skin settings not always being removed corrrectly	2018-09-03 11:51:03 +09:00
Dean Herbert	144e80dff6	Add "import all skins from stable" option (and mass delete)	2018-09-03 10:10:04 +09:00
smoogipoo	ce367bcc42	Fix invalid GC latency mode being set	2018-08-22 12:02:14 +09:00
Dean Herbert	0f37758314	Update framework	2018-07-21 16:21:53 +09:00
Roman Kapustin	8f9bf4bd3e	Remove redundant DesktopGameWindow cast	2018-07-10 22:07:32 +03:00
HoutarouOreki	dd20663192	Lesser keyboard steps	2018-07-10 17:28:56 +02:00
Roman Kapustin	699702f8d0	Use DesktopGameWindow.GetCurrentDisplay method	2018-07-09 21:57:31 +03:00
Roman Kapustin	3dbdfcc1e2	Merge remote-tracking branch 'ppy/master' into select_resolution_in_fullscreen_mode	2018-07-09 21:31:46 +03:00
smoogipoo	9f405b0894	Don't hard-bail if config skin doesn't exist anymore	2018-07-02 16:49:07 +09:00
Roman Kapustin	4af45b7518	Do not display resolutions lower than 800x600	2018-06-30 20:06:11 +03:00
Roman Kapustin	5076fe4c20	LayoutSettings: inject OsuGameBase instead of OsuGame	2018-06-23 12:45:13 +03:00
Roman Kapustin	5d26d5d4ed	Fix resolutionDropdown	2018-06-21 20:42:22 +03:00
Roman Kapustin	71371dc4b8	ValueChanged parameters quickfix	2018-06-12 19:27:55 +03:00
UselessToucan	b6c0aa3f26	Merge branch 'master' into select_resolution_in_fullscreen_mode	2018-06-12 18:01:30 +03:00
Roman Kapustin	de7e4328c5	Use bindable size	2018-06-10 16:17:57 +03:00
UselessToucan	4233211fb3	Merge branch 'master' into select_resolution_in_fullscreen_mode	2018-06-08 21:13:41 +03:00
Dean Herbert	0b4f5af52e	Add setting to toggle standardised or exponential scoring display ... Also adjusts exponential scoring to be closer to stable. Log wasn't cutting it.	2018-06-08 03:17:12 +09:00
Dean Herbert	1dd5bdcf72	Move setting to new "mods" section	2018-06-06 12:32:59 +09:00
Roman Kapustin	e98f9f1323	Add dropdown for selecting fullscreen resolution	2018-06-02 21:02:45 +03:00
Dean Herbert	9e17eb2342	Reword settings text to be ruleset agnostic	2018-05-21 16:03:08 +09:00
Dean Herbert	76e58a51b9	Merge remote-tracking branch 'upstream/master' into Vidalee-osu-hd-setting	2018-04-25 17:28:21 +09:00
Dean Herbert	e395a47112	Changes to naming and text	2018-04-18 19:47:13 +09:00
Dean Herbert	bd834dd487	Merge remote-tracking branch 'upstream/master' into tgi74-rightclickscrolling	2018-04-18 19:46:59 +09:00
Dean Herbert	c9615f837a	Merge remote-tracking branch 'upstream/master' into instant-hide-screenshot	2018-04-16 00:20:06 +09:00
Dean Herbert	a0f9f8d512	Update frramework again	2018-04-13 21:47:50 +09:00
smoogipoo	733f70cbd5	Merge remote-tracking branch 'origin/master' into instant-hide-screenshot	2018-04-13 21:13:09 +09:00
Dean Herbert	9f5a52b641	Merge remote-tracking branch 'upstream/master' into UselessToucan-ignored_input_handler	2018-04-13 19:54:15 +09:00
Dean Herbert	81f0649e44	Merge remote-tracking branch 'origin/master' into tgi74-rightclickscrolling	2018-04-13 19:50:44 +09:00
Dean Herbert	32a74f95a5	Normalize all the line endings	2018-04-13 18:26:38 +09:00
tgi74000	e3cd0ef200	Add right click scrolling in song select (and its option)	2018-04-13 11:09:49 +02:00