Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Correct build and initialization of Audioview #8

Merged
merged 15 commits into from
Nov 27, 2015
Merged

Correct build and initialization of Audioview #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
5eec12a
Disable sourcemaps for included projects due to browserify bug
kintel Nov 24, 2015
696532b
Use audio-view from shared-views
kintel Nov 23, 2015
8caf959
Collect sound assets
kintel Nov 24, 2015
607c474
Correctly include sound-assets
kintel Nov 24, 2015
3a0b0b2
Correctly require audio-view
kintel Nov 24, 2015
4459b8f
Merge remote-tracking branch 'origin/master' into audioview
kintel Nov 24, 2015
014fd5e
Don't start game until the audio is initialized
kintel Nov 24, 2015
edf6931
Reset disks on startup
kintel Nov 24, 2015
07b975e
Reset disks at start and end of disk game instead of depending on the…
kintel Nov 24, 2015
537e2a7
Reset all views at start of first game
kintel Nov 24, 2015
a496672
Merge branch 'tmp' into audioview
kintel Nov 24, 2015
bc7f5f0
No need to retry homing of disks any longer
kintel Nov 25, 2015
45e0b72
Merge branch 'tmp' into audioview
kintel Nov 25, 2015
cfa2dea
Remove unused config
kintel Nov 25, 2015
90b1079
Merge branch 'tmp' into audioview
kintel Nov 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/src/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ const SculptureActionCreator = require("@anyware/game-logic/lib/actions/sculptur
const HandshakeView = require('./views/handshake-view');
const PanelView = require('./views/panel-view');
const DiskView = require('./views/disk-view');
const AudioView = require('./views/audio-view');
const AudioView = require('@anyware/shared-views/lib/audio-view');

const SerialManager = require('./serial/serial-manager');

Expand Down Expand Up @@ -121,7 +121,7 @@ export default class SculptureApp {
}

_beginFirstGame() {
if (!this.client || !this.client.connected || !this.serialSearched) {
if (!this.client || !this.client.connected || !this.serialSearched || !this.audioInitialized) {
return;
}

Expand Down
64 changes: 0 additions & 64 deletions app/src/views/audio-view.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion gulpfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ gulp.task('collect-static', function collectStatic() {
});

gulp.task('collect-sounds', function collectSounds() {
return gulp.src('sounds/**/*')
return gulp.src(['node_modules/@anyware/sound-assets/**/*.wav'])
.pipe(gulp.dest(path.join(BUILD_DIRECTORY, 'sounds')));
});

Expand Down
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
"homepage": "https://github.com/anyWareSculpture/sculpture-client#readme",
"dependencies": {
"@anyware/game-logic": "^11.0.1",
"@anyware/sound-assets": "anyWareSculpture/sound-assets",
"@anyware/streaming-client": "^1.3.4",
"browser-serialport": "^2.0.2",
"flux": "^2.0.3",
Expand Down