Merge branch 'collision'

This commit is contained in:
2023-11-04 13:16:11 -06:00
11 changed files with 1144 additions and 66 deletions

26
.vscode/settings.json vendored
View File

@@ -1,24 +1,24 @@
{
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#d816d8",
"activityBar.background": "#d816d8",
"activityBar.activeBackground": "#2f7c47",
"activityBar.background": "#2f7c47",
"activityBar.foreground": "#e7e7e7",
"activityBar.inactiveForeground": "#e7e7e799",
"activityBarBadge.background": "#caca15",
"activityBarBadge.foreground": "#15202b",
"activityBarBadge.background": "#422c74",
"activityBarBadge.foreground": "#e7e7e7",
"commandCenter.border": "#e7e7e799",
"sash.hoverBorder": "#d816d8",
"statusBar.background": "#aa11aa",
"sash.hoverBorder": "#2f7c47",
"statusBar.background": "#215732",
"statusBar.foreground": "#e7e7e7",
"statusBarItem.hoverBackground": "#d816d8",
"statusBarItem.remoteBackground": "#aa11aa",
"statusBarItem.hoverBackground": "#2f7c47",
"statusBarItem.remoteBackground": "#215732",
"statusBarItem.remoteForeground": "#e7e7e7",
"titleBar.activeBackground": "#aa11aa",
"titleBar.activeBackground": "#215732",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#aa11aa99",
"titleBar.inactiveBackground": "#21573299",
"titleBar.inactiveForeground": "#e7e7e799"
},
"peacock.remoteColor": "aa11aa",
"peacock.remoteColor": "#215732",
"deno.enable": true,
"deno.unstable": true,
"liveServer.settings.port": 5501,
@@ -34,6 +34,8 @@
"NMAX",
"omggif's",
"plte",
"trns"
"trns",
"aabb",
"deadzone"
]
}