Commit graph

77425 commits

Author SHA1 Message Date
NissimHadar
709515dd74 Use place holder instead of RCC file. 2019-03-29 11:48:15 -07:00
Sam Gondelman
968dbb825a
Merge pull request #15243 from SamGondelman/proceduralTime
Case 21876: New procedural uniforms for time, iEntityTime and iLocalCreatedTime
2019-03-29 11:35:41 -07:00
Shannon Romano
ec44f5fddf
Merge pull request #15156 from NissimHadar/21660-updateNitpickForQuest
Case 21660: unique command line to run Interface on Quest - v3.1.5
2019-03-29 11:09:36 -07:00
Shannon Romano
c4925ddfa0
Merge pull request #15259 from SimonWalton-HiFi/avatar-hero-zone-improvements
Avatar hero zone improvements
2019-03-29 10:49:06 -07:00
Shannon Romano
ac0130d4c7
Merge pull request #15234 from SimonWalton-HiFi/clear-connection-on-add-node
When adding new Node clear any dangling Connection objects
2019-03-29 10:46:22 -07:00
Wayne Chen
2622408792 warn when muted only affects hmd 2019-03-29 10:45:40 -07:00
Shannon Romano
a83b90cdc6
Merge pull request #15044 from sethalves/lock-wearables
case 21149: add a button to Avatar panel to lock or unlock wearables; allow others to grab unlocked wearables
2019-03-29 10:41:21 -07:00
Wayne Chen
3c65b92ff5 moving text position higher 2019-03-29 10:41:16 -07:00
John Conklin II
56dde6e240
Merge pull request #15235 from Atlante45/fix/traits
Case 21108: Make traits easier to extend
2019-03-29 10:37:55 -07:00
Wayne Chen
248f9ba375 adding mute overlay back into HMD and have warn when muted disable in desktop 2019-03-29 10:32:13 -07:00
Ken Cooke
201d115cb6
Merge pull request #15274 from kencooke/audio-server-echo-fix
Case 21947: Fix the audio level of server echo
2019-03-29 10:12:37 -07:00
Ryan Huffman
bcb38b6626 Add damping to new dynamic entities in Create 2019-03-29 09:01:42 -07:00
raveenajain
b283bb303d jenkins warning fixes 2019-03-28 17:55:51 -07:00
Simon Walton
bc7fb10ab9 Fixes from review 2019-03-28 17:54:35 -07:00
Thijs Wenker
7e21a3f372 disable case sensitivity in file browsers (allow .fbx .fBx .FBX instead of only .fbx) 2019-03-29 01:48:57 +01:00
Thijs Wenker
687409b756 ignore case for .fbx file extension in AvatarDoctor 2019-03-29 01:46:57 +01:00
danteruiz
b9d04c6ebb adding entity to a faded list 2019-03-28 16:42:29 -07:00
Wayne Chen
3241d2f960 don't allow clicking on push to talk in MicBarApplication 2019-03-28 16:24:37 -07:00
Wayne Chen
f2b0e47c39 changing opacity 2019-03-28 16:19:35 -07:00
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
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
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
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
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
NissimHadar
e95efc29e4 Bug fix after code review. 2019-03-27 19:00:28 -07: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
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
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