635 Commits

Author	SHA1	Message	Date
Javier Flores	f4c7a02a6f	Fix having negative beat when it should be 0	2017-05-17 09:23:04 -05:00
DrabWeb	9ba356f2c6	Added osu!direct header and filter control	2017-05-17 05:58:34 -03:00
EVAST9919	5fb8830e3a	Moved music controller buttons to it's own class	2017-05-17 10:36:24 +03:00
ColdVolcano	198542465b	More CI fixes	2017-05-17 01:37:31 -05:00
ColdVolcano	387d26a576	CI Fixes	2017-05-17 01:26:34 -05:00
ColdVolcano	5f192cae7b	Add missing licence header	2017-05-17 01:18:56 -05:00
ColdVolcano	0801a211da	Add a base container with beat syncing logic	2017-05-17 01:14:04 -05:00
Huo Yaoyuan	f1d5a92950	Use generic IEqutable to avoid typeless Equals.	2017-05-16 21:49:38 +08:00
Huo Yaoyuan	b9a40a841b	Use IsAssignableFrom.	2017-05-16 21:04:54 +08:00
Dean Herbert	b016d53b85	Fix TwoLayerButton not capturing MouseDown events ... Caused clicks to pass through the skip button to the progress bar.	2017-05-16 17:59:07 +09:00
Dean Herbert	efab186384	Update namespaces in line with framework	2017-05-16 12:50:30 +09:00
Dean Herbert	f730769186	Rewrite to make better	2017-05-15 12:54:56 +09:00
Dean Herbert	3b87a938db	Merge branch 'master' into cursor_size.	2017-05-15 12:23:49 +09:00
Dean Herbert	622b155fda	OsuConfig -> OsuSetting	2017-05-15 10:56:27 +09:00
EVAST9919	b6460d89c9	Cleanup	2017-05-14 10:26:52 +03:00
EVAST9919	49f5364e9e	CI fixes	2017-05-14 07:35:23 +03:00
EVAST9919	12dab6f75c	iplemented stable-like algorithm	2017-05-14 07:28:12 +03:00
EVAST9919	ca6df533bd	Automatic gameplay cursor size	2017-05-13 03:46:37 +03:00
Dean Herbert	24db423c4f	Merge remote-tracking branch 'upstream/master' into playlist-commit	2017-05-12 20:39:50 +09:00
Dan Balasescu	815379646c	Merge branch 'master' into new-option-search	2017-05-12 20:22:11 +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	f044b95ce8	Allow OsuTabControl to handle non-enum types.	2017-05-11 23:10:19 +09:00
smoogipooo	e1ed785cbf	Update framework.	2017-05-09 21:00:40 +09:00
Dean Herbert	ab1768ef80	Merge branch 'master' into tidy-up	2017-05-09 10:27:29 +09:00
Huo Yaoyuan	dff05bec79	Use readonly fields.	2017-05-08 18:56:04 +08:00
Dean Herbert	9f1f926634	Add non-null assurance.	2017-05-08 12:45:55 +09:00
Huo Yaoyuan	4f8549f220	Standardise usages of exceptions.	2017-05-07 00:38:17 +08:00
WebFreak001	5aecc3d761	Made cursortrail work with multiple positions	2017-05-05 17:44:51 +02:00
WebFreak001	063b606a12	Fix readonly warning	2017-05-03 18:48:17 +02:00
WebFreak001	008ff9d2f9	InputResample CursorTrail	2017-05-03 18:33:42 +02:00
DrabWeb	c193a90a16	Merge https://github.com/ppy/osu into playlist	2017-04-29 05:39:52 -03:00
Dean Herbert	94c259bd59	Remove most usages of DelayReset ... ButtonSystem requires some more work.	2017-04-27 18:39:40 +09:00
Jorolf	e53c4be356	I guess this works...	2017-04-22 18:36:36 +02:00
Jorolf	02249dcd67	add a function to OsuSliderBar to manually set the tooltip text	2017-04-22 18:34:57 +02:00
Dean Herbert	ef7bc0f92e	Update UI controls to understand DisabledChanged.	2017-04-21 14:02:04 +09:00
Dean Herbert	6e3125e115	Merge pull request #656 from smoogipooo/taiko-fixes ... Taiko fixes	2017-04-20 20:10:29 +09:00
smoogipooo	3acdc1dcfb	Update palette colours.	2017-04-20 19:36:53 +09:00
Dean Herbert	4e1942f998	Fix tooltips sticking after drag.	2017-04-20 18:17:12 +09:00
Dean Herbert	02e406860b	Merge remote-tracking branch 'upstream/master' into tooltips ... # Conflicts: # osu.Game/Graphics/UserInterface/OsuSliderBar.cs	2017-04-20 18:02:38 +09:00
Dean Herbert	0de71ab24d	Add basic tooltip support to OsuSliderBar.	2017-04-20 17:57:58 +09:00
Dean Herbert	c87657707f	Add tooltip to sliderbars. Move interface.	2017-04-20 17:33:07 +09:00
Dean Herbert	ce5763ed97	Remove using.	2017-04-20 16:37:29 +09:00
Dean Herbert	9c8cd08927	Don't play sliderbar samples more than once when value has not changed.	2017-04-20 16:35:55 +09:00
Dean Herbert	9d975f202f	Make background slightly transparent.	2017-04-20 16:29:05 +09:00
Dean Herbert	18bbbdad4c	Reduce appear delay slightly.	2017-04-20 16:28:55 +09:00
Dean Herbert	d12a9a7675	Don't run AutoSize transforms when tooltip is already invisible.	2017-04-20 16:28:45 +09:00
Dean Herbert	a884ac215e	Position tooltip better; remove need for lastState.	2017-04-20 16:08:36 +09:00
Dean Herbert	00d8cacba8	Update visual apperance.	2017-04-20 16:05:25 +09:00
Dean Herbert	990c14fbe0	Keep tooltip's current target while the main button is pressed. ... Handles drag operations better.	2017-04-20 15:51:30 +09:00
Dean Herbert	30c3c932b1	Remove redundancies.	2017-04-20 15:29:34 +09:00
Dean Herbert	b11315ca46	Remove unnecessary interfaces and simplify tooltip logic.	2017-04-20 14:34:29 +09:00
Jorolf	ea67b41683	move tooltip outside of the cursor	2017-04-20 00:42:40 +02:00
Jorolf	d04893a43a	---changing---	2017-04-19 15:33:24 +02:00
Jorolf	eda0e99179	Merge branch 'tooltips' of github.com:Jorolf/osu into tooltips	2017-04-19 13:53:08 +02:00
Jorolf	4f9c5dd44d	renaming and some changes in TestCaseTooltip	2017-04-19 13:52:17 +02:00
Jorolf	af9a45fd6c	Merge branch 'master' into tooltips	2017-04-19 13:51:39 +02:00
Jorolf	8e4288168a	renaming and some changes in TestCaseTooltip	2017-04-19 13:47:00 +02:00
Dean Herbert	fbd26a1d5e	Mode -> Ruleset.	2017-04-18 16:05:58 +09:00
Jorolf	095b6fded6	removed unused stuff and change the tooltip y coordinate	2017-04-17 19:50:34 +02:00
Jorolf	906d68936a	Merge branch 'tooltips' of github.com:Jorolf/osu into tooltips	2017-04-17 17:43:54 +02:00
Jorolf	25fd1d2b72	made method into property	2017-04-17 17:43:44 +02:00
Jorolf	d4ac3c5e9c	Update MenuCursor.cs	2017-04-17 17:10:55 +02:00
Jorolf	773e6a2911	moved tooltip stuff to Tooltip instead of MenuCursor	2017-04-17 17:04:48 +02:00
Jorolf	dd26f9fcac	Merge branch 'master' of git://github.com/ppy/osu into tooltips	2017-04-17 14:45:46 +02:00
Dean Herbert	52ddc414d5	Fix errors.	2017-04-14 20:17:17 +09:00
Dean Herbert	ed3956eca5	Make comma separators optional.	2017-04-14 20:09:01 +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
Jorolf	7f08c3c417	add IHasOverhangingTooltip	2017-04-14 00:18:17 +02: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	13f057f900	Give CursorTrail its own clock for the time being.	2017-04-13 14:14:12 +09:00
smoogipooo	3054697f98	Expose AccentColour/GlowColour from hud elements, and set from HudOverlay.	2017-04-13 10:04:12 +09:00
smoogipooo	2987a57588	Use formatter to add zeroes.	2017-04-12 20:28:04 +09:00
Dean Herbert	157ad17606	Merge branch 'master' into details	2017-04-12 20:25:51 +09:00
Dan Balasescu	5bf71aae9c	Remove unused using.	2017-04-12 20:14:12 +09:00
Dean Herbert	ec6267c5b2	switch -> if.	2017-04-12 19:41:11 +09:00
Jorolf	d2affe6867	requested changes	2017-04-12 10:52:24 +02:00
Dean Herbert	2964c04c14	Add special SliderBar sound behaviour when at extents.	2017-04-12 12:07:29 +09:00
Dean Herbert	d6fa51dc5c	Update SliderBar to use OnUserChange method.	2017-04-12 12:07:27 +09:00
Jorolf	ed2f5d210e	condensed some commits because they were small or already reversed	2017-04-11 22:48:53 +02:00
Jorolf	50b6bcd574	Merge branch 'master' into details	2017-04-11 19:06:58 +02:00
Jorolf	d4e5f55091	the power of linq	2017-04-11 18:43:48 +02:00
Jorolf	fb5952186c	changes and fixes	2017-04-11 14:02:56 +02:00
Dean Herbert	2bb50ff082	Add commas to score counter.	2017-04-11 19:21:05 +09:00
Dean Herbert	c615762da6	wip	2017-04-11 18:56:25 +09:00
Dean Herbert	9732110bd9	Update TransformTo methods in line with framework changes.	2017-04-11 17:25:56 +09:00
Dean Herbert	7ca0d6d117	Adjust cursor popin/out to make it less ugly.	2017-04-11 16:44:12 +09:00
Dean Herbert	f8c6ce15c3	Fix weird RollingCounter behaviour.	2017-04-11 16:37:36 +09:00
Jorolf	ad41fd5c1a	more unnecessary stuff	2017-04-10 16:49:48 +02:00
Jorolf	412d6a14ca	removed something unnecessary	2017-04-10 16:45:34 +02: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
Dean Herbert	5af4259ab4	Add back explicit binds.	2017-04-10 17:10:15 +09:00
Dean Herbert	f12b5a8954	Unify disable logic.	2017-04-10 16:22:36 +09:00
Dean Herbert	bb4a909de5	Update UI control access in line with framework changes.	2017-04-10 14:54:23 +09:00
DrabWeb	963cd09bd0	Merge https://github.com/ppy/osu into playlist	2017-04-09 04:04:13 -03:00
Jorolf	f7a9a11ae5	Bar uses AccentColour aswell	2017-04-08 13:53:11 +02:00
Jorolf	5e56e84c4a	change SRGBColour to Color4 and use IHasAccentColour in some places	2017-04-08 13:31:55 +02:00
Jorolf	c60a55285c	updated TestCase and some null checks	2017-04-07 20:32:09 +02:00
Jorolf	9881889f88	removed some unused stuff	2017-04-07 18:24:36 +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
Jorolf	e59c0a770f	Merge branch 'master' into details	2017-04-06 15:42:00 +02:00
Huo Yaoyuan	411988f038	Remove all trailing whitespaces in this repo.	2017-04-06 16:21:18 +08:00
Huo Yaoyuan	9b1e010dcc	Fix filename mismatch.	2017-04-06 16:05:41 +08:00
Dean Herbert	942699218a	Merge branch 'master' into details	2017-04-06 15:44:43 +09:00
Dean Herbert	863dc44c4d	Some minor improvements.	2017-04-06 09:57:34 +09:00
Jorolf	f9bf1c69bf	add Flags to BarDirection and remove unused "using"	2017-04-04 18:23:29 +02:00
Jorolf	502afc0a48	some fixes to BarGraph so Direction works properly	2017-04-04 18:09:16 +02:00
Jorolf	b2731bb0a1	some formatting	2017-04-04 17:27:08 +02:00
Jorolf	58f8dc8254	add direction to graphs	2017-04-04 17:17:22 +02:00
Dean Herbert	7c74951454	Update bindables. ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCaseResults.cs # osu.Game/Screens/Ranking/ResultModeButton.cs # osu.Game/Screens/Ranking/Results.cs	2017-04-04 11:34:13 +09:00
Dean Herbert	f6303d55ec	Upodate some tab usages.	2017-04-04 11:13:09 +09:00
Jorolf	5a694e0c9d	changed location of BarGraph to be more generic	2017-04-03 19:29:13 +02:00
Jorolf	a9baeddaa5	remove unused code	2017-04-02 21:12:49 +02:00
Jorolf	9db3fee4b4	make Screens work	2017-04-02 21:03:33 +02:00
Jorolf	8bc241da3d	make AppVeyor happy again	2017-04-02 18:31:19 +02:00
Jorolf	679829daae	vs17 -> vs15	2017-04-02 18:25:44 +02:00
Jorolf	e835b19d4a	add Tooltips	2017-04-02 18:19:59 +02:00
Dean Herbert	24d06fa92d	CheckBox -> Checkbox.	2017-03-31 17:38:33 +09:00
smoogipooo	a48224bd6d	Don't need Drawable type.	2017-03-31 15:06:33 +09:00
smoogipooo	43c306d658	IAccented -> IHasAccentColour.	2017-03-31 15:06:31 +09:00
smoogipooo	d944b8c192	Implement IAccented interface + transform.	2017-03-31 11:01:42 +09:00
Dean Herbert	f7dc7e9bb9	Update references.	2017-03-28 21:26:20 +09:00
Dean Herbert	cc5154dd12	Fix regression in mouse dragging behaviour.	2017-03-27 17:55:57 +09:00
DrabWeb	215b016f32	Initial implementation	2017-03-24 05:59:26 -03:00
Dean Herbert	0bcb463acf	ParallaxContainer should always know the mouse position.	2017-03-23 22:42:40 +09:00
DrabWeb	88d878e1d5	Formatting	2017-03-23 02:47:27 -03:00
Dean Herbert	e77229b34b	Merge branch 'master' into beatmap-detail-tabs	2017-03-23 14:26:00 +09:00
Dean Herbert	681ed38941	Use const whenever possible.	2017-03-23 13:52:38 +09:00
Dean Herbert	54e1b24fe9	Enforce readonly private members where possible.	2017-03-23 13:50:08 +09:00
DrabWeb	b8b45262c5	Formatting	2017-03-23 01:35:55 -03:00
DrabWeb	67421cdf1c	Even though it was 5 minutes ago what was I thinking	2017-03-23 01:34:06 -03:00
DrabWeb	87b8015e8f	Cleanup	2017-03-23 00:29:28 -03:00
DrabWeb	c173c4b7ee	Tab control	2017-03-23 00:22:31 -03:00
Dean Herbert	1d9da8facd	Merge pull request #520 from smoogipooo/use_equilateral_triangles ... Update framework + use EquilateralTriangle in Triangles.	2017-03-23 10:27:21 +09:00
Dean Herbert	e7f32fcbce	Merge pull request #525 from huoyaoyuan/controls ... DropDown update	2017-03-23 09:26:26 +09:00
Dean Herbert	b0340f77d8	Remove nested types completely.	2017-03-23 08:57:14 +09:00
Dean Herbert	ff57d3800f	Merge branch 'master' into use_equilateral_triangles	2017-03-23 08:51:43 +09:00
Dean Herbert	3dee39346f	U -> T1.	2017-03-23 08:49:29 +09:00
Dean Herbert	ba32d50456	Consolidate nested classes.	2017-03-23 08:44:52 +09:00
smoogipooo	9247017c9a	Use EquilateralTriangle in Triangles.	2017-03-23 08:34:39 +09:00
Dean Herbert	537f0b9340	Fix menu cursor size not sticking on startup. ... Also tidied up bindables.	2017-03-23 08:07:59 +09:00
Huo Yaoyuan	0dbc232ebf	Rename all DropDown -> Dropdown.	2017-03-22 22:32:32 +08:00
Huo Yaoyuan	6a4ca08578	Merge branch 'master' into controls	2017-03-22 22:28:19 +08:00
Dean Herbert	fbe08436d2	Fix usages of CircularContainer in line with framework changes.	2017-03-22 19:35:03 +09:00
Huo Yaoyuan	e217c67bcf	Merge branch 'master' into controls	2017-03-22 08:54:03 +08:00
Huo Yaoyuan	b06eb0122c	Fix for colours and members rename.	2017-03-22 08:15:31 +08:00
Huo Yaoyuan	f0edf5d3d3	Update to DropDown and Menu.	2017-03-22 07:18:53 +08:00
Dean Herbert	b00f86d809	Merge branch 'master' into seperateCursorSize	2017-03-22 08:11:45 +09:00
Jorolf	82d6129063	renamed CursorSize to MenuCursorSize	2017-03-21 17:16:23 +01:00
Huo Yaoyuan	1d13924e0a	Remove redundant type parameter. ... Nested type has implicit type parameter from base type.	2017-03-21 01:05:48 +08:00
smoogipooo	d27f37beb5	Hard-code text size in cases it wasn't set.	2017-03-20 13:48:06 +09:00
Dan Balasescu	417045c37c	Merge branch 'master' into textawesome_shadow	2017-03-20 13:17:35 +09:00
Dean Herbert	8f75032b64	Fix incorrect abs.	2017-03-18 22:37:50 +09:00
Dean Herbert	125936bad0	Fix double-assignment.	2017-03-18 22:23:53 +09:00
Dean Herbert	919ec2d3a5	Spend more when wound up.	2017-03-18 22:17:23 +09:00
Thomas Müller	f636f59289	Nicer cursor orientation when dragging	2017-03-18 12:47:49 +01:00
Jorolf	8568e1536c	Separated menu and gameplay cursor size	2017-03-17 18:40:03 +01:00
smoogipooo	77067b7e64	Re-style.	2017-03-18 02:04:23 +09:00
smoogipooo	dde2ac7f4a	Make TextAwesome have a shadow.	2017-03-17 22:03:47 +09:00
Dean Herbert	317dc94b4c	Adjust appearance.	2017-03-17 21:09:31 +09:00
Dean Herbert	f9f31ca092	Add statefulness to MenuCursor.	2017-03-17 20:45:27 +09:00
Dean Herbert	292de44a0b	WIP menu cursor.	2017-03-17 20:45:27 +09:00
Dean Herbert	e78bcf8739	Update TabControl in line with framework changes.	2017-03-17 00:39:40 +09:00
Dean Herbert	8cd1353d74	Fix serious input regression.	2017-03-16 22:09:35 +09:00
Dean Herbert	2cf6ed423e	Disallow duplicate active changes.	2017-03-16 21:33:08 +09:00
Dean Herbert	84b080a060	Make transition logic a bit more sane.	2017-03-16 21:26:03 +09:00
Dean Herbert	110bdbd0c1	Make everything share DropDown implementations again. Remove unnecessary files.	2017-03-16 21:17:14 +09:00
Dean Herbert	ab8a5afdb9	AlwaysReceiveInput and InternalContains.	2017-03-16 17:38:36 +09:00
Dean Herbert	93c0fe5140	Remove unnecessary set.	2017-03-16 17:02:37 +09:00
Dean Herbert	1156e76c28	Don't directly access Header.	2017-03-16 17:00:49 +09:00
Dean Herbert	334e389518	Tidy up OsuTabControl and FilterControl.	2017-03-16 16:35:44 +09:00
Drew DeVault	360340c61d	Fix linter issues	2017-03-15 22:39:09 -04:00
Drew DeVault	01cca1a4d2	Refactor color handling ... colour*	2017-03-15 20:52:31 -04:00
Drew DeVault	3aecbf5739	Rearrange things somewhat	2017-03-15 20:15:40 -04:00
Kelvin	755fb260db	Updated TabControl Usage	2017-03-14 19:52:21 -07:00
Kelvin	ee3d3b682f	Updated usage for DropDownHeader of FilterTabControl	2017-03-14 19:49:40 -07:00
Kelvin	2629f78afc	Add FilterControl and FilterTabControl	2017-03-14 19:49:40 -07:00
Dean Herbert	b5a8ef07fe	Update framework.	2017-03-15 09:46:03 +09:00
Dan Balasescu	0fa2776975	Merge branch 'master' into counter_bindables	2017-03-10 14:21:33 +09:00
smoogipooo	5f72265eff	Remove float ValueAt method.	2017-03-10 14:09:55 +09:00
smoogipooo	cd1717c42f	More bindables!	2017-03-10 13:49:51 +09:00
Dean Herbert	2821451d5b	Remove unused file.	2017-03-08 16:01:54 +09:00
Dean Herbert	4430255ec4	Merge remote-tracking branch 'upstream/master' into replay ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs # osu.Desktop/OsuGameDesktop.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableHitCircle.cs # osu.Game.Modes.Osu/Objects/Drawables/DrawableSlider.cs # osu.Game/Database/BeatmapDatabase.cs # osu.Game/Graphics/Cursor/OsuCursorContainer.cs # osu.Game/IPC/BeatmapImporter.cs # osu.Game/Modes/Mod.cs # osu.Game/Modes/Objects/Drawables/DrawableHitObject.cs # osu.Game/Modes/UI/Playfield.cs # osu.Game/Screens/Play/Player.cs # osu.Game/Screens/Play/PlayerInputManager.cs	2017-03-07 13:50:08 +09:00
Dean Herbert	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
Thomas Müller	9b92e99ce9	Merge branch 'master' into increase-ci-strictness	2017-03-06 21:44:39 +01:00
Dean Herbert	88f3dc0e02	Fix a few naming issues.	2017-03-06 18:49:23 +09:00
Dean Herbert	e356758a7d	Don't expicitly set origin of TextAwesome.	2017-03-06 17:06:48 +09:00
Dean Herbert	4e4408cd20	Merge branch 'master' into replay ... # Conflicts: # osu.Desktop.VisualTests/Tests/TestCasePlayer.cs	2017-03-05 17:45:03 +09:00
Thomas Müller	73fef85b12	Remove unnecessary usings	2017-03-04 19:43:59 +01:00
Thomas Müller	a14bdf8624	Use Color4Extensions from Framework and remove redundant Name	2017-03-04 19:42:37 +01:00
Dean Herbert	e12d89529c	Merge remote-tracking branch 'upstream/master' into update-flow	2017-03-04 23:28:39 +09:00
Thomas Müller	a2317e5a1e	Update usage of FillDirection	2017-03-04 11:00:17 +01:00
TheGui	e3c3806759	Fixed accuracy's counter first value change.	2017-03-04 04:48:32 -03: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	71534b3e13	Fix incorrect triangle density on first display.	2017-03-03 18:09:16 +09:00
Seth	1891bdf51e	Merge branch 'master' into mod-overlay	2017-03-03 01:11:15 -04:00