diff --git a/crediting/credit.html b/crediting/credit.html index bf4ce49..3c3e06a 100644 --- a/crediting/credit.html +++ b/crediting/credit.html @@ -1,29 +1,9 @@ + @@ -34,8 +14,10 @@ [num]
- [title]
- [platform img][author] + [title] +
+ [platform img] + [author]
diff --git a/crediting/credit.sh b/crediting/credit.sh index 1b4b038..144468e 100755 --- a/crediting/credit.sh +++ b/crediting/credit.sh @@ -41,7 +41,7 @@ while read p || [[ -n $p ]]; do then echo "mastodon!" FIELDS[1]=$( echo "${FIELDS[1]}" | cut -c 12- ) - sed -i 's/\[platform img\]//' "$SCRIPT_DIR/credit2.html" + sed -i 's/\[platform img\]//' "$SCRIPT_DIR/credit2.html" elif [[ "${FIELDS[1]}" =~ ^"[twitch]/" ]] then echo "twitch!" diff --git a/crediting/github.png b/crediting/github.png index dd3ee74..7f033c5 100644 Binary files a/crediting/github.png and b/crediting/github.png differ diff --git a/crediting/mastodon.png b/crediting/mastodon.png new file mode 100644 index 0000000..5aa3e5a Binary files /dev/null and b/crediting/mastodon.png differ diff --git a/crediting/mastodon.svg b/crediting/mastodon.svg deleted file mode 100644 index 586c654..0000000 --- a/crediting/mastodon.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/on screen note/n.png b/on screen note/n.png deleted file mode 100644 index 40fa037..0000000 Binary files a/on screen note/n.png and /dev/null differ diff --git a/on screen note/note.html b/on screen note/note.html deleted file mode 100644 index dc02362..0000000 --- a/on screen note/note.html +++ /dev/null @@ -1,35 +0,0 @@ - - - - - -
-
-
- src: i was there -
-
-
- - \ No newline at end of file diff --git a/on screen note/note.sh b/on screen note/note.sh index 43f336b..9ca9b88 100755 --- a/on screen note/note.sh +++ b/on screen note/note.sh @@ -3,11 +3,14 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) WORKING=$PWD -echo "file:///$SCRIPT_DIR/note.html" +head -n 13 "$SCRIPT_DIR/notetemplate.html" >"$SCRIPT_DIR/note.html" +echo $@ >>"$SCRIPT_DIR/note.html" +tail -n 5 "$SCRIPT_DIR/notetemplate.html" >>"$SCRIPT_DIR/note.html" + firefox -P screenshitter --headless --window-size 3840,2160 --screenshot "$WORKING/ns1.png" "file:///$SCRIPT_DIR/note.html" -convert "ns1.png" -fuzz 12% -transparent "#00ff00" "ns2.png" +convert "$WORKING/ns1.png" -fuzz 12% -transparent "#00ff00" "$WORKING/ns2.png" #convert ns2.png -trim "n$i.png" # blender wants to scale to fit, # and if you want a 1:1 scale image i don't know what the *fuck* it's doing with an origin point. -convert ns2.png "n$i.png" -rm ns1.png ns2.png +convert $WORKING/ns2.png "$WORKING/note.png" +rm "$WORKING/ns1.png" "$WORKING/ns2.png" "$SCRIPT_DIR/note.html" diff --git a/on screen note/notetemplate.html b/on screen note/notetemplate.html new file mode 100644 index 0000000..c699268 --- /dev/null +++ b/on screen note/notetemplate.html @@ -0,0 +1,19 @@ + + + + + + +
+
+
+ note loading... +
+
+
+ + \ No newline at end of file diff --git a/scriptsplitter/.gitignore b/scriptsplitter/.gitignore new file mode 100644 index 0000000..6fe09e3 --- /dev/null +++ b/scriptsplitter/.gitignore @@ -0,0 +1,378 @@ +appsettings.Development.json + +# ---> VisualStudio +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# ---> VisualStudioCode +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +tmp/ diff --git a/shared/Roboto-Thin.ttf b/shared/Roboto-Thin.ttf new file mode 100644 index 0000000..2e0dee6 Binary files /dev/null and b/shared/Roboto-Thin.ttf differ diff --git a/shared/style.css b/shared/style.css new file mode 100644 index 0000000..d357b51 --- /dev/null +++ b/shared/style.css @@ -0,0 +1,48 @@ + +@font-face { + font-family: 'Roboto-Thin'; + src: url('Roboto-Thin.ttf'); +} +body{ + padding:0; + margin:0; + background-color: #232627; + font-family: 'Roboto-Thin', 'Georgia', serif; + color: #DEDEDE; +} +.centerized{ + font-size: 8em; + display:block; + margin: auto; + max-width: 90%; +} +.note{ + background-color: #232627; + font-size: 3em; + border: 5px solid #666; + border-radius: 0.5em; + display:inline-flex; + flex-flow: row nowrap; + position: absolute; + bottom: 0.25em; + right: 0.25em; +} +.text{ + padding: 0.25em 1em 0.25em 0.25em; +} + +.credit{ + font-size: 3em; + background-color: #232627; + border: 5px solid #CECECE; + border-radius: 0.5em; + display:inline-flex; + flex-flow: row nowrap; +} +.credit .number{ + padding:0.75em; + border-right: 5px solid #CECECE; +} +.credit img.src{ + height:1em; +} \ No newline at end of file diff --git a/title card/titlecard.sh b/title card/titlecard.sh index f84ef06..20bf903 100755 --- a/title card/titlecard.sh +++ b/title card/titlecard.sh @@ -5,7 +5,7 @@ WORKING=$PWD cp "$SCRIPT_DIR/titlecardtemplate.html" "$SCRIPT_DIR/titlecard.html" -head -n 23 "$SCRIPT_DIR/titlecardtemplate.html" >"$SCRIPT_DIR/titlecard.html" +head -n 7 "$SCRIPT_DIR/titlecardtemplate.html" >"$SCRIPT_DIR/titlecard.html" echo $@ >>"$SCRIPT_DIR/titlecard.html" tail -n 4 "$SCRIPT_DIR/titlecardtemplate.html" >>"$SCRIPT_DIR/titlecard.html" firefox -P screenshitter --headless --window-size 3840,2160 --screenshot "$WORKING/tc.png" "file:///$SCRIPT_DIR/titlecard.html" diff --git a/title card/titlecardtemplate.html b/title card/titlecardtemplate.html index b55c2ff..dbaa25e 100644 --- a/title card/titlecardtemplate.html +++ b/title card/titlecardtemplate.html @@ -1,27 +1,11 @@ - + -
+
- loading... + title card loading...