711 Commits

Author	SHA1	Message	Date
smoogipoo	36cc79f04f	Softly handle invalid beat divisors instead of throwing	2019-11-08 17:28:11 +09:00
smoogipoo	998e1dfe47	Fix non-1/1 initial beat divisor control display	2019-11-08 17:23:47 +09:00
smoogipoo	eb9fff96ba	Read default beat divisor from beatmap	2019-11-08 17:22:58 +09:00
smoogipoo	df08a95734	Separate addition/removal into separate methods	2019-11-08 16:46:58 +09:00
smoogipoo	6fc1be64c2	Make hitobject samples a bindable list	2019-11-08 14:04:57 +09:00
smoogipoo	864b8db638	Use three states for the hitsound menu items	2019-11-08 13:52:36 +09:00
smoogipoo	046f0b0fe5	Allow right-clicks to trigger selection	2019-11-08 13:40:47 +09:00
smoogipoo	573d11503e	Remove unused using	2019-11-08 13:36:17 +09:00
smoogipoo	abb3a6ca5b	Initial right click context menu implementation	2019-11-08 13:36:17 +09:00
Dean Herbert	70cf91fb40	Seek editor when hit objects are double clicked (#6745) ... Seek editor when hit objects are double clicked	2019-11-06 19:22:41 +09:00
smoogipoo	3680e7c704	Seek editor when hit objects are double clicked	2019-11-06 18:15:57 +09:00
Dean Herbert	aaa06396f0	Reduce editor parallax	2019-11-06 18:11:56 +09:00
smoogipoo	2c1bfd62ef	Disallow selections to be moved outside of the playfield	2019-11-06 17:28:04 +09:00
Dean Herbert	c631a05a44	Add ability to edit individual ControlPoint attributes from tim… (#6638) ... Add ability to edit individual ControlPoint attributes from timing screen	2019-11-06 17:24:51 +09:00
Dean Herbert	a2963b66f6	Limit distance snap between two adjacent hit objects (#6740) ... Limit distance snap between two adjacent hit objects	2019-11-06 17:18:00 +09:00
Dean Herbert	23eab68c72	Merge remote-tracking branch 'upstream/master' into editor-timing-screen-2	2019-11-06 16:22:55 +09:00
smoogipoo	020b08b450	Initial implementation of limited distance snap	2019-11-06 15:27:48 +09:00
Dean Herbert	ebfb5d050d	Move section update code to abstract method to avoid incorrect BindValue usage	2019-11-06 14:36:43 +09:00
smoogipoo	322a1f0a86	Fix potential nullref	2019-11-06 12:45:35 +09:00
smoogipoo	7cd4cb8a93	Rename selectedPoints to selectedGroup	2019-11-06 12:32:12 +09:00
smoogipoo	9dd7f997d2	Reoder SampleSection to match others	2019-11-06 12:17:18 +09:00
smoogipoo	f20bfe7a55	Fix extra semicolon	2019-11-06 12:16:48 +09:00
Dan Balasescu	b5a8bbaa60	Merge branch 'master' into editor-timing-screen	2019-11-06 12:02:00 +09:00
Dean Herbert	52dba69a64	Implement slider control point deletion (#6679) ... Implement slider control point deletion Co-authored-by: Dean Herbert <pe@ppy.sh>	2019-11-05 19:15:15 +09:00
Dean Herbert	f4b93ec943	Add exception when holding control	2019-11-05 18:29:08 +09:00
Dean Herbert	f77de7d880	Simplify implementation	2019-11-05 18:25:38 +09:00
smoogipoo	0db34a47f8	Fix selecting underneath selected blueprints	2019-11-05 17:28:42 +09:00
smoogipoo	7c20a589f2	Remove unused usings	2019-11-05 13:56:21 +09:00
smoogipoo	c8beb5296f	Use PlatformAction.Delete instead of Delete key	2019-11-05 13:26:44 +09:00
Dean Herbert	7b67701e57	Merge branch 'master' into editor-timing-screen	2019-10-30 19:27:24 +09:00
Dean Herbert	7f2916454d	Simplify EditorClock.Seek method	2019-10-30 19:09:46 +09:00
Dean Herbert	93076ad6a1	Merge branch 'master' into editor-timing-screen	2019-10-30 18:42:20 +09:00
smoogipoo	45af796943	Remove usages of EF internals	2019-10-30 17:05:15 +09:00
Dean Herbert	522572eace	Add ability to adjust all control point attributes	2019-10-28 16:21:31 +09:00
Dean Herbert	9c3e54909c	Ensure tooltips of RowAttributes are up-to-date	2019-10-28 16:20:54 +09:00
Dean Herbert	ee5591d7d5	Add missing license headers	2019-10-28 12:42:17 +09:00
Dean Herbert	43ad4a3a3c	Tidy up string output	2019-10-28 12:31:38 +09:00
Dean Herbert	1953aa64b6	Merge branch 'bindable-control-points' into editor-timing-screen	2019-10-28 12:00:51 +09:00
Dean Herbert	8069674824	Merge remote-tracking branch 'upstream/master' into bindable-control-points	2019-10-28 11:52:04 +09:00
Dean Herbert	29e20bc8d2	Add xmldoc and combine GroupAt / CreateGroup	2019-10-28 10:45:11 +09:00
Dean Herbert	81b5d7b79f	Select another group after deleting selected	2019-10-27 16:30:05 +09:00
Dean Herbert	73369ae613	Add the ability to add/remove groups	2019-10-27 16:13:24 +09:00
Dean Herbert	0fba272e78	Add the ability to add new ControlPoint types to existing groups	2019-10-27 15:19:36 +09:00
Dean Herbert	de69665a46	Reduce horizontal spacing of attributes	2019-10-27 14:17:59 +09:00
Dean Herbert	93b003eb5a	Add selected row state	2019-10-27 13:31:23 +09:00
Dean Herbert	b8efc59cdc	Update UI components to use new grouping	2019-10-25 20:13:22 +09:00
Dean Herbert	e987db37ec	Add grouping of ControlPoints	2019-10-25 19:52:02 +09:00
Dean Herbert	da6769f0fc	Remove necessity of AutoGenerated flag	2019-10-25 19:43:38 +09:00
Dean Herbert	94ffe03e6e	Group timing points	2019-10-25 19:36:12 +09:00
Dan Balasescu	3692846367	Merge branch 'master' into snapping-refactor	2019-10-25 18:26:14 +09:00
smoogipoo	ae011e8ee8	Fix distance snap grid test scenes	2019-10-25 17:25:46 +09:00
smoogipoo	4ca6a5a0cc	Interface the distance snap provider	2019-10-25 16:50:21 +09:00
smoogipoo	607b4d874a	Refactor flow of snapping through HitObjectComposer	2019-10-25 16:40:30 +09:00
Dean Herbert	351f8d3dd1	Merge branch 'master' into editor-timing-screen	2019-10-25 13:21:56 +09:00
Dean Herbert	0b3c7f28af	Merge branch 'master' into fix-dragbox-first-frame	2019-10-24 23:01:32 +09:00
Dean Herbert	fa3350ce2d	Refactor blueprint movement and selection events (#6588) ... Refactor blueprint movement and selection events	2019-10-24 22:58:03 +09:00
smoogipoo	a969914d6e	Mention coordinate space	2019-10-24 18:24:22 +09:00
smoogipoo	d83b9ef0e4	Rename grid snapping methods	2019-10-24 18:18:04 +09:00
smoogipoo	f45f17339c	Implement slider path distance snapping	2019-10-24 18:17:30 +09:00
smoogipoo	7a71352684	Fix drag box being positioned incorrectly for 1 frame	2019-10-24 17:22:14 +09:00
smoogipoo	fb88001c0e	Reorder blueprint addition/removal + add regions	2019-10-24 16:53:34 +09:00
smoogipoo	45bd91f63f	Add special cases for click-selection	2019-10-24 16:14:29 +09:00
smoogipoo	8e4a21bee7	Separate out mouse down/click/up handling	2019-10-24 15:58:22 +09:00
smoogipoo	a07e5a269b	Extract drag events into multiple methods	2019-10-24 15:33:08 +09:00
smoogipoo	f128e99fb2	Remove unused methods	2019-10-24 15:07:04 +09:00
smoogipoo	e04c77178c	Move selection events to BlueprintContainer	2019-10-24 14:58:02 +09:00
smoogipoo	714c89faa4	Move selection drag events to BlueprintContainer	2019-10-24 14:57:58 +09:00
smoogipoo	cef2318cf5	Move drag box drag handling to BlueprintContainer	2019-10-23 18:38:06 +09:00
Dean Herbert	f61d7e4fbe	Add smoothing and tidy code a touch	2019-10-23 17:56:09 +09:00
smoogipoo	c9fec50f63	Remove unnecessary whitespace	2019-10-23 17:00:17 +09:00
smoogipoo	97383b4a37	Show centre point of distance snap grid	2019-10-23 16:58:56 +09:00
smoogipoo	851773a842	Apply adjustments for framework changes	2019-10-23 14:04:06 +09:00
Dean Herbert	c06f142433	Fix some spacing and references	2019-10-23 11:22:55 +09:00
Dean Herbert	5e22eed131	Add add/remove buttons	2019-10-22 21:50:21 +09:00
Dean Herbert	4883844c4c	Add basic information display for all types of control points	2019-10-22 20:57:56 +09:00
Dean Herbert	81e8b678d3	Update editor time when a new timing point is selected	2019-10-22 20:17:19 +09:00
Dean Herbert	25601ac17c	Merge branch 'master' into editor-timing-screen	2019-10-22 18:01:53 +09:00
Dean Herbert	0bf35faae8	Update incorrect reference	2019-10-21 19:25:56 +09:00
Dean Herbert	e3fa5f1da3	Merge branch 'master' into beatsnap-grid-integration	2019-10-21 18:44:34 +09:00
Dean Herbert	b157aaead1	Merge remote-tracking branch 'upstream/master' into beatsnap-grid-integration	2019-10-21 17:09:43 +09:00
smoogipoo	38c2c328ff	Rename HitObject -> DrawableObject in selection blueprints	2019-10-21 17:04:56 +09:00
smoogipoo	fc7e4680a7	Split on multiple lines	2019-10-21 14:08:28 +09:00
Dean Herbert	80bf68c108	Add control sections and hook up bindable control groups	2019-10-21 00:06:38 +09:00
Dean Herbert	0fbba9a5e5	Split out more classes	2019-10-20 23:42:13 +09:00
Dean Herbert	07286c0cfc	Fix editor's clock not being processed unless composer is loaded	2019-10-18 18:21:53 +09:00
Dean Herbert	ffec960b77	Split out classes	2019-10-18 17:59:54 +09:00
Dean Herbert	71d45d41d1	Add basic visualisation of different control point types	2019-10-18 17:57:37 +09:00
Dean Herbert	f22ec6f5bd	Merge branch 'master' into editor-timing-screen	2019-10-18 16:57:46 +09:00
smoogipoo	463079e148	Implement placement snapping	2019-10-18 13:48:59 +09:00
smoogipoo	ba4402207a	Implement selection time snapping	2019-10-18 12:53:38 +09:00
smoogipoo	1dc7c59853	Implement selection position snapping	2019-10-18 12:53:27 +09:00
smoogipoo	bc76a9cb8c	Expose selection changed event from BlueprintContainer	2019-10-18 12:40:27 +09:00
smoogipoo	c5ee533524	Merge branch 'dho-apply' into beatsnap-grid-integration	2019-10-18 12:38:29 +09:00
smoogipoo	510ce9345f	Fix potential blueprint nullrefs with the new structure	2019-10-17 16:14:28 +09:00
Dean Herbert	f92331531c	Rename grid to DistanceSnap to be more in line with its purpose	2019-10-17 15:32:02 +09:00
smoogipoo	b6b8098b98	Add an arbitrary offset to prevent div-by-0	2019-10-16 19:44:53 +09:00
smoogipoo	2d4b7dc361	Remove redundant code	2019-10-16 19:33:18 +09:00
smoogipoo	5ac5e34f85	Use a cleaner distance function	2019-10-16 19:32:45 +09:00
Dean Herbert	f3c38ae089	Merge branch 'master' into osu-beatsnapping-grid	2019-10-13 18:38:57 +09:00
Dean Herbert	00f0957cc3	Merge branch 'master' into editor-grids-2	2019-10-12 23:28:51 +09:00
Dean Herbert	de13320a2d	Add initial table display	2019-10-11 18:46:05 +09:00
smoogipoo	45835f97a1	Split out grids into separate files	2019-10-11 18:41:17 +09:00
smoogipoo	050d86a741	Always use the local coordinate space	2019-10-11 18:24:33 +09:00
smoogipoo	9ecec806c2	Rename grid creation method + parameter	2019-10-11 18:24:33 +09:00
smoogipoo	5f0cd356d7	Rename startPosition to centrePosition	2019-10-11 18:24:33 +09:00
smoogipoo	8fb2628f9e	Improve xmldocs	2019-10-11 18:24:33 +09:00
smoogipoo	66e0fef85b	Expose StartPosition for derived grids to use	2019-10-11 18:24:33 +09:00
smoogipoo	97d4a8e59e	Remove unnecessary dependency	2019-10-11 18:24:33 +09:00
smoogipoo	2df519ddfa	Simplify colour retrieval function	2019-10-11 18:24:33 +09:00
smoogipoo	2aa3d0bb39	Implement base class for beat snapping grids	2019-10-11 18:24:33 +09:00
Dean Herbert	937dbb7bf6	Initial layout for timing screen	2019-10-11 16:22:24 +09:00
smoogipoo	2e2768870f	Merge remote-tracking branch 'origin/master' into editor-selection-movement-params	2019-10-10 16:38:41 +09:00
Dean Herbert	0681bb9a2b	Fix potential nullref	2019-10-09 16:49:10 +09:00
Dean Herbert	2d8e5615e4	Extract timeline and layout logic from ComposeScreen	2019-10-09 16:05:55 +09:00
Dean Herbert	3dd2b18ff0	Make EditorScreen abstract	2019-10-09 16:04:58 +09:00
smoogipoo	179656788d	Remove unnecessary method	2019-10-08 19:27:59 +09:00
smoogipoo	c1db11fa06	More removal of "drag"	2019-10-08 19:24:58 +09:00
smoogipoo	8b661e624d	Remove drag from class/method namings + refactor	2019-10-08 19:08:31 +09:00
smoogipoo	08d043f447	Move selection relative to the hitobject start positions	2019-10-08 18:57:03 +09:00
Dean Herbert	3e904b4838	Fix naming of file	2019-10-08 14:37:56 +09:00
Dean Herbert	63bf8ff832	Better signify under construction screens in editor	2019-10-08 14:32:48 +09:00
Dan Balasescu	73e3dac64b	Merge branch 'master' into fix-editor-skinning	2019-10-08 13:28:10 +09:00
Dean Herbert	24269c0384	Fix skins not being displayed correctly in the editor	2019-10-08 12:52:34 +09:00
Dean Herbert	5472029ffe	Fix editor defaulting to 0.5x playback speed	2019-10-08 12:27:51 +09:00
Dean Herbert	6fce646369	Merge branch 'master' into placement-blueprint-movement	2019-10-04 19:05:56 +08:00
smoogipoo	652acac87f	Move placement movement event to BlueprintContainer	2019-10-03 16:14:42 +09:00
smoogipoo	3fb0b0b668	Rename to StartTimeChanged and add xmldocs	2019-10-03 14:37:16 +09:00
smoogipoo	897b3233af	Add start time tracking to EditorBeatmap	2019-10-03 14:23:48 +09:00
Dean Herbert	f493f1c71d	Move new components to v2 namespace	2019-09-24 19:00:26 +09:00
smoogipoo	6b702eb6de	Update with generic labelledcomponent	2019-09-24 18:25:17 +09:00
smoogipoo	5212c50654	Merge branch 'generic-labelledcomponent' into labelled-textbox-improvements	2019-09-24 18:23:01 +09:00
smoogipoo	df692b091c	Make LabelledComponent generic	2019-09-24 18:22:02 +09:00
smoogipoo	2bbf4ca4b5	Update LabelledTextBox to use LabelledComponent	2019-09-20 18:50:50 +09:00
smoogipoo	523272edab	Add xmldocs	2019-09-20 18:39:04 +09:00
smoogipoo	e0a97cfac5	Add a LabelledComponent base class	2019-09-20 18:35:15 +09:00
Andrei Zavatski	437e121056	Merge remote-tracking branch 'refs/remotes/ppy/master' into beatmap-video	2019-09-13 13:39:58 +03:00
Dean Herbert	e479be3fba	Merge pull request #5894 from smoogipoo/accessible-beatdivisor-colours ... Move beat divisor colour retrieval to BindableBeatDivisor	2019-09-02 12:41:19 +09:00
smoogipoo	cbbc6aad6e	Make method static	2019-08-31 21:32:02 +09:00
Andrei Zavatski	6e5cb8a318	implement video parsing	2019-08-30 23:19:34 +03:00
smoogipoo	40729356fa	Move beat divisor colour retrieval to BindableBeatDivisor	2019-08-30 17:34:58 +09:00
Dean Herbert	84e4748268	Remove duplicate getAnimation function and improve namespacing	2019-08-30 12:59:58 +09:00
Dean Herbert	3f500131d4	Add basic xmldoc	2019-08-30 11:33:50 +09:00
smoogipoo	6641811125	Add EditorWorkingBeatmap for reuse of the playable beatmap	2019-08-29 19:41:12 +09:00
smoogipoo	b04a8ae856	Add xmldocs	2019-08-29 16:31:43 +09:00
smoogipoo	5db813b7a4	Add secondary interface for further abstraction	2019-08-29 16:26:39 +09:00
smoogipoo	7927b684d3	Hook up + use editor beatmap	2019-08-29 16:06:40 +09:00
smoogipoo	840f224619	Remove typed events to reduce complexity	2019-08-29 16:05:44 +09:00
smoogipoo	6949c96aaa	Add initial EditorBeatmap structure	2019-08-29 15:17:27 +09:00
Dean Herbert	48716f8f2b	Update framework	2019-08-21 13:29:50 +09:00
Dean Herbert	ad873b542a	Simplify editor logic	2019-07-11 00:22:40 +09:00
Desconocidosmh	100d15e651	Move reseting tempo to Editor	2019-07-10 10:43:02 +02:00
Oskar Solecki	3472979d0b	Make sure exiting editor doesn't unpause the music	2019-07-09 12:53:40 +02:00
Oskar Solecki	8f7476e9cc	Remove unused stuff	2019-07-09 00:26:57 +02:00
Oskar Solecki	a4957909b4	Merge branch 'master' into Fix-music-playing-while-exiting-from-editor	2019-07-09 00:11:29 +02:00
Desconocidosmh	338371c3fc	Fix music playing while exiting from editor	2019-07-09 00:08:18 +02:00
Desconocidosmh	84cadc688a	Change method name	2019-07-07 17:11:54 +02:00
Desconocidosmh	1a117d1511	Closes #5277	2019-07-07 17:05:53 +02:00
Dean Herbert	fa879b4b60	Add a note explaining why manual handling is required	2019-06-30 20:47:09 +09:00
Unknown	5b26ef75b1	allow exiting editor again	2019-06-30 12:31:31 +02:00
smoogipoo	8c96e4c1fa	Move back button to OsuGame	2019-06-25 18:33:08 +09:00
Joehu	1a9efb3d7a	Fix editor play button	2019-06-15 11:05:58 -07:00
Dean Herbert	1b75fbed9a	Merge remote-tracking branch 'upstream/master' into update-scrollcontainer	2019-06-14 23:25:17 +09:00
Dean Herbert	bc574520bf	Update ScrollContainer usages in line with framework changes	2019-06-14 15:55:32 +09:00
Dean Herbert	15b9b53d35	Fix IconButtons not being scaled correctly	2019-06-14 13:40:32 +09:00
Dean Herbert	20b43c20c8	Rename variables to remove redundant "screen" terminology	2019-06-12 16:33:15 +09:00
Lucas A	15893bbb75	Drop UserActivity prefix for subclasses nested in UserActivity + Change status messages.	2019-06-11 19:41:48 +02:00
Lucas A	55663b3576	Nest all UserActivities into UserActivity	2019-05-12 17:38:02 +02:00
Lucas A	5ac6bd8204	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-05-12 11:53:30 +02:00
Dan Balasescu	22940373a0	Merge branch 'master' into zoomablescrollcontainer-fix	2019-05-09 13:54:21 +09:00
smoogipoo	5c6b4d923f	Reorder methods	2019-05-09 13:53:53 +09:00
David Zhao	d625f3c104	Private method	2019-05-09 13:21:01 +09:00
David Zhao	ff3c226596	Give ZoomableScrollContainer an initial width	2019-05-08 13:37:03 +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	d5d31282e5	Rename InitialScreenStatus to InitialScreenActivity in Editor / Player classes	2019-05-05 20:55:42 +02:00
Lucas A	5d4aa5a12e	Add ScreenStatus property to change the OsuScreen's status + Renamed old ScreenStatus property to InitialScreenStatus	2019-05-02 20:51:19 +02:00
Lucas A	7e42068a14	Merge remote-tracking branch 'upstream/master' into user-status-wiring	2019-04-28 19:48:35 +02:00
Dean Herbert	d40177f97c	Merge branch 'master' into drawnode-composability	2019-04-27 18:41:19 +09:00
smoogipoo	0bd35ab7bb	Turn on warnings, resolve issues	2019-04-25 17:36:17 +09:00
David Zhao	6502e26d09	Add draw size invalidation to ZoomableScrollContainer	2019-04-19 16:21:15 +09:00
Lucas A	da5d6cb1d4	Add Beatmap fields to UserStatusSoloGame & UserStatusEditing so they can carry metadata about the played / edited beatmap	2019-04-12 22:54:35 +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	612db31c38	Apply newline additions	2019-04-01 12:16:32 +09:00
Dean Herbert	de80fc0eac	Update icon usage to match framework changes	2019-03-27 19:29:27 +09:00
Dean Herbert	baea7230bc	Rename RulesetContainer to DrawableRuleset	2019-03-19 23:47:31 +09:00
Dean Herbert	5487b011d6	Fix some inspections rider isn't able to deal with automatically	2019-03-02 14:34:56 +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	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