Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-13 03:52:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Amber.fbx to shortbow/models

Browse source
This commit is contained in:
Ryan Huffman 2017-02-08 16:14:47 -08:00
parent 8c088336e8
commit 5096993851
3 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
unpublishedScripts/marketplace/shortbow/models/Amber.fbx Normal file
View file

Binary file not shown.

2
unpublishedScripts/marketplace/shortbow/shortbowGameManager.js
View file

@ -102,7 +102,7 @@ var baseEnemyProperties = {
},
lifetime: 180,
"id": "{ed8f7339-8bbd-4750-968e-c3ceb9d64721}",
"modelURL": "http://hifi-content.s3.amazonaws.com/Examples%20Content/production/marblecollection/Amber.fbx?2",
"modelURL": Script.resolvePath("models/Amber.fbx"),
"name": "SB.Enemy",
"owningAvatarID": "{00000000-0000-0000-0000-000000000000}",
"queryAACube": {

13
unpublishedScripts/marketplace/shortbow/spawnShortbow.js
View file

@ -62,17 +62,10 @@ function getTemplate(name) {
return null;
}
// Cleanup Shortbow template data
var scoreboardTemplate = getTemplate('SB.Scoreboard');
Vec3.print("Scoreboard:", scoreboardTemplate.position);
for (var i = 0; i < TEMPLATES.length; ++i) {
if (TEMPLATES[i].name !== scoreboardTemplate.name) {
var template = TEMPLATES[i];
// Fixup position
template.localPosition = Vec3.subtract(template.position, scoreboardTemplate.position);
delete template.position;
}
// Cleanup Shortbow template data
for (var i = 0; i < TEMPLATES.length; ++i) {
var template = TEMPLATES[i];
// Fixup model url
if (template.type == "Model") {