Skip to content

Changes between master and the base repos dev#8

Open
cale-bradbury wants to merge 102 commits intoremote-devfrom
master
Open

Changes between master and the base repos dev#8
cale-bradbury wants to merge 102 commits intoremote-devfrom
master

Conversation

@cale-bradbury
Copy link
Copy Markdown
Owner

No description provided.

cale-bradbury and others added 30 commits May 8, 2018 13:22
Revert "merge from base repo"
Fix to support a true fullscreen on MS Windows
…slider to smooth the microphone values over time. also added proper math for the full spectrum texture
# Conflicts:
#	src/store/clock/sagas.js
cale-bradbury and others added 29 commits January 30, 2019 21:44
…ion from the settings menu, may as well grab speed gains if you aren't using them
# Conflicts:
#	mockTests/sketches.spec.js
#	package.json
#	src/components/Param/index.js
#	src/components/SketchParam/index.js
#	src/containers/Param/index.js
#	src/containers/SketchParam/index.js
#	src/engine/Scene.js
#	src/main/mainWindow.js
#	src/store/clock/sagas.js
#	src/store/setCoreState.js
#	src/store/sketches/listener.js
#	yarn.lock
# Conflicts:
#	package.json
#	readme.md
#	src/components/Clock/index.js
#	src/components/SceneManager/index.js
#	src/containers/Clock/index.js
#	src/containers/ExportSettings/index.js
#	src/electron/main/menu.js
#	src/electron/renderer/menuHandler.js
#	src/engine/Scene.js
#	src/engine/index.js
#	src/engine/renderer.js
#	src/inputs/AudioAnalyzer.js
#	src/selectors/getSketchParams.js
#	src/store/exportSettings/reducer.js
#	src/store/rootListener.js
#	src/store/sketches/listener.js
#	yarn.lock
…ough the store

# Conflicts:
#	src/containers/Settings/index.js
#	src/inputs/AudioAnalyzer.js
#	src/store/rootListener.js
# Conflicts:
#	src/inputs/AudioAnalyzer.js
#	src/inputs/AudioInput.js
#	src/store/rootListener.js
# Conflicts:
#	src/electron/main/index.js
cale-bradbury pushed a commit that referenced this pull request Sep 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants