hifi-production tutorials -> vircadia-content

Kalila L committed 6 years ago

Commit 46ddde01 parent dc554bb17 files · +38 −38Browse files

Showing the changes to scripts/tutorials/entity_scripts (5 of 17 files). Show all

Unified · Split

5 files

scripts/tutorials/entity_scripts/cow.js +1 −1
scripts/tutorials/entity_scripts/golfClub.js +1 −1
scripts/tutorials/entity_scripts/pingPongGun.js +1 −1
scripts/tutorials/entity_scripts/pistol.js +5 −5
scripts/tutorials/entity_scripts/soundMaker.js +1 −1

scripts/tutorials/entity_scripts/cow.js+1−1

@@ -19,7 +19,7 @@ · 18 unmodified lines
19	//set our id so other methods can get it.	19	//set our id so other methods can get it.
20	_this.entityID = entityID;	20	_this.entityID = entityID;
21	//load the mooing sound	21	//load the mooing sound
22	_this.mooSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/tutorials/cow/moo.wav")	22	_this.mooSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/cow/moo.wav")
23	_this.mooSoundOptions = {	23	_this.mooSoundOptions = {
24	volume: 0.7,	24	volume: 0.7,
25	loop: false	25	loop: false

scripts/tutorials/entity_scripts/golfClub.js+1−1

@@ -13,7 +13,7 @@ · 12 unmodified lines
13		13
14	(function() {	14	(function() {
15	var ball = null;	15	var ball = null;
16	var collisionSoundURL = "http://hifi-production.s3.amazonaws.com/tutorials/golfClub/collision1.wav";	16	var collisionSoundURL = "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/golfClub/collision1.wav";
17	var triggerState = false;	17	var triggerState = false;
18	var BALL_GRAVITY = -9.8;	18	var BALL_GRAVITY = -9.8;
19	var BALL_START_VELOCITY = 0.1;	19	var BALL_START_VELOCITY = 0.1;

scripts/tutorials/entity_scripts/pingPongGun.js+1−1

@@ -12,7 +12,7 @@ · 11 unmodified lines
12	(function() {	12	(function() {
13	var _this = this;	13	var _this = this;
14		14
15	var SHOOTING_SOUND_URL = 'http://hifi-production.s3.amazonaws.com/tutorials/pingPongGun/pong_sound.wav';	15	var SHOOTING_SOUND_URL = 'https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pingPongGun/pong_sound.wav';
16		16
17	function PingPongGun() {	17	function PingPongGun() {
18	return;	18	return;

scripts/tutorials/entity_scripts/pistol.js+5−5

@@ -30,8 +30,8 @@ · 29 unmodified lines
30	this.forceMultiplier = 1;	30	this.forceMultiplier = 1;
31	this.laserLength = 100;	31	this.laserLength = 100;
32		32
33	this.fireSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/tutorials/pistol/GUN-SHOT2.raw");	33	this.fireSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/GUN-SHOT2.raw");
34	this.ricochetSound = SoundCache.getSound("http://hifi-production.s3.amazonaws.com/tutorials/pistol/Ricochet.L.wav");	34	this.ricochetSound = SoundCache.getSound("https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/Ricochet.L.wav");
35	this.playRichochetSoundChance = 0.1;	35	this.playRichochetSoundChance = 0.1;
36	this.fireVolume = 0.2;	36	this.fireVolume = 0.2;
37	this.bulletForce = 10;	37	this.bulletForce = 10;
@@ -220,7 +220,7 @@ · 182 unmodified lines
220	"alphaStart": 0,	220	"alphaStart": 0,
221	"alphaFinish": 0,	221	"alphaFinish": 0,
222	"additiveBlending": true,	222	"additiveBlending": true,
223	"textures": "http://hifi-production.s3.amazonaws.com/tutorials/pistol/star.png"	223	"textures": "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/star.png"
224	});	224	});
225		225
226	Script.setTimeout(function() {	226	Script.setTimeout(function() {
@@ -270,7 +270,7 @@ · 43 unmodified lines
270	"alphaStart": 0,	270	"alphaStart": 0,
271	"alphaFinish": 0,	271	"alphaFinish": 0,
272	"additiveBlending": 0,	272	"additiveBlending": 0,
273	"textures": "http://hifi-production.s3.amazonaws.com/tutorials/pistol/smoke.png"	273	"textures": "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/smoke.png"
274	});	274	});
275	Script.setTimeout(function() {	275	Script.setTimeout(function() {
276	Entities.editEntity(smoke, {	276	Entities.editEntity(smoke, {
@@ -333,7 +333,7 @@ · 56 unmodified lines
333	"alphaStart": 0,	333	"alphaStart": 0,
334	"alphaFinish": 0,	334	"alphaFinish": 0,
335	"additiveBlending": true,	335	"additiveBlending": true,
336	"textures": "http://hifi-production.s3.amazonaws.com/tutorials/pistol/star.png"	336	"textures": "https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/pistol/star.png"
337	});	337	});
338	Script.setTimeout(function() {	338	Script.setTimeout(function() {
339	Entities.editEntity(flash, {	339	Entities.editEntity(flash, {

scripts/tutorials/entity_scripts/soundMaker.js+1−1

@@ -8,7 +8,7 @@ · 7 unmodified lines
8		8
9	(function(){	9	(function(){
10		10
11	var soundURL ='http://hifi-production.s3.amazonaws.com/tutorials/soundMaker/bell.wav';	11	var soundURL ='https://cdn-1.vircadia.com/us-e-1/Developer/Tutorials/soundMaker/bell.wav';
12	var ringSound;	12	var ringSound;
13		13
14	this.preload = function(entityID) {	14	this.preload = function(entityID) {

hifi-production tutorials -> vircadia-content

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code