Commit graph

77717 commits

Author SHA1 Message Date
Roxanne Skelly
44b92c542b Case 20499 - Scripts that use AppUI don't call that.onClosed() if the
script is restarted while the app is open
2019-03-28 16:05:24 -07:00
raveenajain
5480c9f5ca skinning, skeleton for models, avatar 2019-03-28 15:27:49 -07:00
SamGondelman
b98f47d1f3 add baked materials to fst materialMapping 2019-03-28 15:11:27 -07:00
Roxanne Skelly
88b7687183 Case 21726 - Domain lost recent entity edits upon restart
When an entity server starts up, grabs the version of the models.json
file locally, and then queries the domain server for its copy of the
models.json file...iff the domain server version is newer.

There was a bug in this process in that the comparison was made between
the wrong version, specifically the 'file format version' which doesn't
change unless there was a protocol change...and not the data version,
which increments every time a change is made to a domain.

Therefore, the version of the models.json on the domain server was never
downloaded to the entity server, even when it was newer.

It would be newer if the entity server assignment was moved to a machine
with an old version of the models.json file, which was in fact the case
on distributed3 during this period of time.
2019-03-28 13:19:16 -07:00
NissimHadar
171aebd6aa Remove disabling of --url for Android. 2019-03-28 13:04:16 -07:00
NissimHadar
705e6432a7 Merge branch 'master' of github.com:highfidelity/hifi into 21660-updateNitpickForQuest 2019-03-28 12:46:36 -07:00
NissimHadar
d230fc86db CR comments. 2019-03-28 12:23:25 -07:00
Roxanne Skelly
73cf51182e
Merge pull request #15262 from roxanneskelly/Case20832
Case20832- Inventory app Login and Cancel buttons do not respond if user logs out while Inventory is open.
2019-03-28 12:01:24 -07:00
Ryan Huffman
7e805562ef Fix some URLs with query params not working with model baker
After talking with Sabrina, we decided that we could safely leave the
query param and fragment intact for a URL in the model baker.
2019-03-28 11:59:31 -07:00
danteruiz
04d9858f02 fixing remaining issues 2019-03-28 11:43:53 -07:00
Wayne Chen
8627a92f29 adding functions to update variables 2019-03-28 11:29:34 -07:00
David Back
57c3620587 update package 2019-03-28 11:28:14 -07:00
David Back
4ddbdbbb6c fix bone rule warnings 2019-03-28 11:27:47 -07:00
NissimHadar
de1c40e994 Changed version. 2019-03-28 11:27:35 -07:00
Angus Antley
d963ec3005 can now override the eye rotation when procedural eye movement is turned off 2019-03-28 11:27:26 -07:00
Anthony Thibault
65507cfe11
Merge pull request #15180 from luiscuenca/flowCppFixes
Fix Flow touch and scale issues
2019-03-28 11:11:08 -07:00
Anthony Thibault
b0d5a82c80
Merge pull request #15169 from hyperlogic/bug-fix/rig-assert-fix
Rig.cpp: Fix for index out of range assert in debug builds
2019-03-28 11:10:32 -07:00
Anthony Thibault
cee298acdf
Merge pull request #15205 from amantley/rootTransBug
Fixed Bug For Old FBX Files That Have An Exported Pose Different From The Bind Pose
2019-03-28 11:10:03 -07:00
Oren Hurvitz
32406b8399 Fixed Safe Landing interaction with Local entities.
Local entities are collisionless, so they shouldn't affect Safe Landing since it specifies that it only wants
to find COLLIDABLE entities. However, due to the requirement to support legacy behavior, picks for COLLIDABLE
entities *do* intersect Local entities. In order to prevent this, we have to explicitly request only intersections
with Domain or Avatar entities.

For more information about this, see this Pull Request:
https://github.com/highfidelity/hifi/pull/15282
2019-03-28 18:54:14 +01:00
Wayne Chen
c3e5c49f69
update muted in AudioScriptingInterface 2019-03-28 10:40:39 -07:00
Wayne Chen
9349514ff7 make audio screen inputs/outputs unflickable 2019-03-28 10:35:28 -07:00
Oren Hurvitz
a00c9893a1 Eliminated some JavaScript warnings due to missing commas 2019-03-28 16:06:31 +02:00
Oren Hurvitz
7a8b7c095b Fixed a race condition related to the keyboard when starting Interface.
These two things need to happen in the following order:
1. Initialize the input plugins (including the keyboard)
2. Start the scripts

That's because the scripts try to use the keyboard (e.g., in edit.js), and if it's not ready yet
then they fail, and then Interface doesn't work right (e.g., the Create button doesn't work).

In order to ensure that these things happen in the correct order, we must make sure that
resumeAfterLoginDialogActionTaken() (which starts the scripts) is called only after everything
else in the Interface constructor has finished. Usually this happens correctly, but occasionally
resumeAfterLoginDialogActionTaken() is called too soon. This commit makes sure that even in that
case, we'll postpone calling resumeAfterLoginDialogActionTaken() until the Interface constructor
has finished.
2019-03-28 13:36:41 +02:00
Olivier Prat
c480f36dd4 Finally managed to switch to all static for OpenEXR 2019-03-28 10:58:58 +01:00
Oren Hurvitz
3d5035886c Allow logging-in with an email that contains a '+' sign.
Previously, attempts to login using an email such as "my+name@example.com" didn't work because the username wasn't
URL-encoded when it was sent to the server, so on the server the '+' was changed to a space.
2019-03-28 10:45:55 +01:00
Oren Hurvitz
49165056c9 Fixed a race condition that sometimes caused the main menus not to appear.
When Interface starts, it first calls pauseUntilLoginDetermined(), and later resumeAfterLoginDialogActionTaken().
But on rare occasions these functions are called in the reverse order, and this caused Interface to remain
in the "paused" state. Now we check for this case, and abort pauseUntilLoginDetermined() if it happens.

This has only happened to me when running Interface immediately after rebuilding it (in Release mode).
2019-03-28 11:44:12 +02:00
Oren Hurvitz
8e201f4801 Fixed race condition during initialization of the Desktop.
The Application constructor must setup event handlers for events emitted when the Desktop is
constructed *before* calling initializeUi(). Otherwise, sometimes these event handlers won't
be called.

When this problem happened (usually on slow machines), Interface would start but neither the
Desktop nor the Login Screen would appear.
2019-03-28 11:44:12 +02:00
Oren Hurvitz
69ebf1629d Allow copying grandchild entities.
Using Copy/Paste on entities only worked for one level of children, but not for grandchildren.
2019-03-28 11:00:09 +02:00
Oren Hurvitz
81f28b3b2c Fixed ray intersections with Local entities.
Previously, rays *always* intersected with Local entities, regardless of whether the pick filter requested
to hit on collidable or noncollidable entities. But Local entities are always collisionless, so a pick filter
for collidable entities shouldn't intersect with Local entities.
2019-03-28 08:42:11 +01:00
NissimHadar
e95efc29e4 Bug fix after code review. 2019-03-27 19:00:28 -07:00
David Rowe
f933872620 Address review comments. 2019-03-28 14:21:51 +13:00
danteruiz
d9b522d10c remove error file 2019-03-27 16:43:03 -07:00
danteruiz
40d424a01d avatar fading 2019-03-27 16:42:34 -07:00
Ryan Huffman
9abd0943ff Add new web and other properties to Create 2019-03-27 16:29:04 -07:00
Wayne Chen
f3708ba27b
Merge branch 'master' into newAudioMuteStates 2019-03-27 15:49:39 -07:00
SamGondelman
6cc95fe8ac CR 2019-03-27 15:46:25 -07:00
Clement
88a19f26e2 Use process function for overrides 2019-03-27 15:44:32 -07:00
Clement
3221e1dbd5 Simplify packing/unpacking for easier extension 2019-03-27 15:44:32 -07:00
Clement
d7d5938c20 Pack all simple traits 2019-03-27 15:44:32 -07:00
Clement
483b7a67b9 Fix simple traits vector bad init 2019-03-27 15:44:32 -07:00
SamGondelman
310d01feff wip 2019-03-27 15:44:01 -07:00
Howard Stearns
3da66dacc9 Merge branch 'master' of github.com:highfidelity/hifi into ddv-all 2019-03-27 15:08:03 -07:00
Howard Stearns
489fadda6e and now it's a list that cleans up after itself 2019-03-27 14:58:58 -07:00
Shannon Romano
8ff47659d3
Merge pull request #15273 from SamGondelman/transparency
Case 21949: Fix transparent shape flickering
2019-03-27 14:21:04 -07:00
Ken Cooke
abb0a166b1
Merge pull request #15260 from kencooke/audio-mixer-volume-control
Case 21902: System-wide independent volume controls
2019-03-27 13:19:30 -07:00
Howard Stearns
f6ee77a6ae an entity list of one 2019-03-27 12:23:02 -07:00
Simon Walton
e62270fccf Fixes for inline jsdoc 2019-03-27 12:00:30 -07:00
SamGondelman
36921276c6 fix transparent shape flickering 2019-03-27 11:52:37 -07:00
Howard Stearns
71111936a2 prep for entity lists 2019-03-27 11:42:16 -07:00
Angus Antley
fcb45802bd removed debug print 2019-03-27 11:19:28 -07:00