Commit graph

31962 commits

Author SHA1 Message Date
danteruiz
04d9858f02 fixing remaining issues 2019-03-28 11:43:53 -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
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
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
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
Sam Gondelman
2005293b3f
Merge pull request #15269 from sethalves/audio-loopback-button-is-local
case 21932: the test-audio button causes a local audio-loopback rather than a server one
2019-03-27 10:54:57 -07:00
Simon Walton
6b21fc1af7 Merge remote-tracking branch 'upstream/master' into avatar-hero-zone-improvements
Fix jsdoc conflict, also minor clean-up.
2019-03-27 10:54:49 -07:00
Sam Gondelman
ffbf678695
Merge pull request #15217 from jherico/fix/framereader_files
Case 21793: Fix loading relative files
2019-03-27 10:52:35 -07:00
Sam Gondelman
0f99280c15
Merge pull request #15265 from hyperlogic/bug-fix/blendshape-precision
Improve blendshape precision for small models
2019-03-27 10:51:22 -07:00
Sam Gondelman
3c42cb34ed
Merge pull request #15251 from SamGondelman/animation82
Case 21888: Revert changes that impacted animation performance
2019-03-27 10:50:43 -07:00
Andrew Meadows
fb7daa185d improved physics for grabbed AvatarEntities 2019-03-27 10:12:59 -07:00
Seth Alves
5695c15809 avoid a deadlock when code invoked by onAddingEntity or onDeletingEntity runs more code that locks the entity tree 2019-03-27 10:12:57 -07:00
Seth Alves
fa36f12145 lock wearables when adjust-wearables page is opened 2019-03-27 10:12:57 -07:00
Seth Alves
29af3b1612 add a button to Avatar panel to lock or unlock wearables.
allow grabbing / adjusting others' wearables if they are unlocked.
2019-03-27 10:12:57 -07:00
Olivier Prat
12e8056e1f Android compilation fix 2019-03-27 08:15:07 +01:00
Howard Stearns
57da21cec2 more about challenges use entity id as id, not cert id 2019-03-26 17:12:28 -07:00
Seth Alves
5f8139a44c audio-loopback test ignores mute 2019-03-26 16:56:10 -07:00
Shannon Romano
1d5f9cc0ec
Merge pull request #15149 from ctrlaltdavid/M21222
Case 21222: Agent, Avatar, and MyAvatar JSDoc
2019-03-26 15:43:32 -07:00
Howard Stearns
c9b79b24e3 track nonces by entity id instead of by cert 2019-03-26 15:23:13 -07:00
Howard Stearns
be74218d93 eliminate copy of hash table 2019-03-26 12:05:10 -07:00
Howard Stearns
91a165b4c3 separate out the certified entity map stuff (no-op refactor) 2019-03-26 11:49:08 -07:00
Anthony Thibault
08c6acdf99 Improve blendshape precision for small models
For avatars authored in meters, the max component length would often be less then 1.
In that case, the blendshape offset was not normalized before quantization, resulting in loss of precision.
This change will normalize the offset for all cases, except when the max component length is 0.
2019-03-26 11:21:13 -07:00
Wayne Chen
e44cdb0d7b
Merge branch 'audio-mixer-volume-control' into addNewAudioControls 2019-03-26 10:39:29 -07:00
Olivier Prat
a93a081a9d Fixed small bug 2019-03-26 18:31:00 +01:00
Ken Cooke
3d7c3e7b6f Persist the audio-mixer settings across domain changes and server resets 2019-03-26 09:38:50 -07:00
Ken Cooke
95b4f954a6 Add AudioClient mixing gains for local injectors and system sounds 2019-03-26 09:38:50 -07:00
Ken Cooke
a2d261d20c Move the new audio volume API from Users scripting interface to Audio scripting interface 2019-03-26 09:38:07 -07:00
Ken Cooke
4a6e495f5f Add Users.setInjectorGain() and Users.getInjectorGain() to the scripting interface 2019-03-26 09:38:07 -07:00
Ken Cooke
755762e8ec Send InjectorGainSet packet to the audio-mixer 2019-03-26 09:38:07 -07:00
Ken Cooke
b15651f1eb Handle InjectorGainSet packet at the audio-mixer 2019-03-26 09:38:07 -07:00
Olivier Prat
311f3f43ac Fixed issue with EXR images on Android 2019-03-26 16:24:16 +01:00
Olivier Prat
92c406fc65 Fixed bug 2019-03-26 11:49:17 +01:00
Olivier Prat
d2011481bf Successfull buid and link of Oven with OpenEXR 2019-03-26 11:37:32 +01:00
Howard Stearns
02129e0543 no-op refactor in prep for multiple entities per cert 2019-03-25 16:14:48 -07:00
John Conklin II
e5a999b66a
Merge pull request #15256 from SamGondelman/shadow
Case 21898: Fix shadows when tablet is open and misc threading issues
2019-03-25 15:20:23 -07:00
Sam Gondelman
85024bcc0b
Merge pull request #15214 from SamGondelman/lasers
Case 21505: Fix laser ghosting
2019-03-25 14:43:52 -07:00
David Rowe
cf4370ed3a Merge branch 'master' into M21222 2019-03-26 09:44:48 +13:00
David Rowe
839a03ebe6 Miscellaneous JSDoc fixes noticed in passing 2019-03-26 09:41:07 +13:00
David Rowe
b78ae80ae6 Address review comments and add further examples 2019-03-26 09:40:47 +13:00
Wayne Chen
9a8c5e5a54
Merge branch 'master' into newAudioMuteStates 2019-03-25 13:33:24 -07:00
SamGondelman
57a02bc1d5 capture lambda by value 2019-03-25 11:29:25 -07:00
SamGondelman
de5643b5b9 quint64 -> uint64_t 2019-03-25 10:33:32 -07:00
Ken Cooke
b5e8176b0f
Merge branch 'master' into audio-mixer-volume-control 2019-03-23 16:15:29 -07:00
Sam Gateau
69a83e647e
Merge pull request #15157 from jherico/compositeless
Case 21730: Remove composite framebuffer from display plugins
2019-03-23 10:38:15 -07:00
Ken Cooke
cbeb4b0b20 Persist the audio-mixer settings across domain changes and server resets 2019-03-23 06:48:37 -07:00
Simon Walton
d7a1ecdbb3 Expose hero-status to scripts 2019-03-22 17:19:39 -07:00
SamGondelman
7db498a130 fix shadows when tablet is open and misc threading issues 2019-03-22 16:20:54 -07:00
Wayne Chen
d382893e75 staging avatar inputs for ignore radius 2019-03-22 14:16:28 -07:00
SamGondelman
c1c45d8a01 revert some now unnecessary changes that were impacting performance
(cherry picked from commit b6984de16c2fd17f04ea72de7b339c31db6467ab)
2019-03-22 11:55:04 -07:00
Ken Cooke
e6c720f793 Add AudioClient mixing gains for local injectors and system sounds 2019-03-22 10:12:31 -07:00
Sam Gondelman
40f5a0263c
Merge pull request #15201 from SamGondelman/emit
Case 21756: Entities.emitScriptEvent works now
2019-03-21 18:05:17 -07:00
Sam Gondelman
385970c39d
Merge pull request #15200 from SamGondelman/web
Case 21755: Allow Web Entities to use alpha from html/qml textures
2019-03-21 18:04:57 -07:00
Sam Gondelman
04ecdb463f
Merge pull request #15173 from SamGondelman/audio
Case 21457, Case 16836, Case 15782: Improve AudioInjector threading
2019-03-21 18:03:58 -07:00
Shannon Romano
212f02598c
Merge pull request #15231 from AndrewMeadows/fix-vanishing-avatar-entities
Case 21838: fix vanishing avatar entities for 0.82.0
2019-03-21 17:39:11 -07:00
Shannon Romano
33e73953eb
Merge pull request #15163 from danteruiz/fix-laser-scaling
Case 21499: Lasers are offset in front of hands after scaling avatar down then relaunching
2019-03-21 13:13:18 -07:00
Shannon Romano
b82c808562
Merge pull request #15207 from danteruiz/kick-ui
Case 21771: Possible Entity Scipt Ban Incident
2019-03-21 13:10:54 -07:00
SamGondelman
4fd2c4449d new procedural uniforms for time 2019-03-21 12:15:03 -07:00
Ken Cooke
7311c3ac06 Move the new audio volume API from Users scripting interface to Audio scripting interface 2019-03-21 11:51:49 -07:00
Sabrina Shanman
2fd2d2cc5d
Merge pull request #15154 from SamGondelman/parentCollider
Case 8064: Child of animated model brings collider with it
2019-03-21 11:26:50 -07:00
Sam Gondelman
61b7b8b669
reduce lambda copies 2019-03-21 08:36:32 -07:00
SamGondelman
3ff0770441 model emitters! 2019-03-20 21:25:14 -07:00
Ken Cooke
3186a94682 Add Users.setInjectorGain() and Users.getInjectorGain() to the scripting interface 2019-03-20 15:48:05 -07:00
Simon Walton
8947d4d133 When adding new Node clear any dangling Connection objects to its address 2019-03-20 15:45:06 -07:00
Howard Stearns
3085ea212d
Merge pull request #15186 from howard-stearns/make-placename-consistent-with-hostname-after-domain-reset
make placename consistent with hostname after domain reset
2019-03-20 12:18:32 -07:00
Andrew Meadows
9d11e44b4b update AvatarEntity trait when parentID changes 2019-03-20 11:37:16 -07:00
SamGondelman
38864e5b6e plane, circle, cylinders 2019-03-19 18:04:32 -07:00
SamGondelman
194008c77a box shapeType 2019-03-19 14:14:37 -07:00
Howard Stearns
44f897fbd2
Merge pull request #15216 from howard-stearns/allow-base-url-to-be-specified-in-fst
allow baseURL to be specified in fst
2019-03-19 13:56:27 -07:00
Sam Gateau
d88bee89e4
Merge pull request #15176 from sabrina-shanman/hfm_oven_wip
(case 21205) Incorporate HFM in Oven + Add FST baking/output + More Oven Improvements
2019-03-19 13:03:49 -07:00
SamGondelman
432a3f1610 uniform sampling of ellipsoid points 2019-03-19 12:59:03 -07:00
Howard Stearns
61fb65b5a4 don't set _url, so that cache_clearing works 2019-03-19 12:41:58 -07:00
Brad Davis
ad2c4718a3 Fix loading relative files 2019-03-19 09:32:44 -07:00
howard-stearns
0e4d3b2aeb allow baseURL to be specified in fst 2019-03-18 17:40:54 -07:00
sabrina-shanman
e6487332e8 Attempt to fix linker error with Android and draco in BuildDracoMeshTask.cpp 2019-03-18 17:02:44 -07:00
sabrina-shanman
64fbf51ac2 Warn if baked mesh is empty for OBJBaker 2019-03-18 16:49:09 -07:00
sabrina-shanman
266f3a8ad8 Warn if handleFinishedTextureBaker doesn't recognize the sender 2019-03-18 16:49:09 -07:00
sabrina-shanman
cf40ed953b Do not create temporary directory in ModelBaker and copy model directly to the original output folder 2019-03-18 16:49:09 -07:00
sabrina-shanman
c29b3a8c35 Bypass signals in JSBaker/MaterialBaker when resource is already loaded 2019-03-18 16:49:09 -07:00
sabrina-shanman
bc3b35aad3 Do not consolidate source images by file for now, since they may have the same filename but different paths 2019-03-18 16:49:00 -07:00
sabrina-shanman
0990b56952 Better avoid overwriting textures in ModelBaker::compressTexture 2019-03-18 16:48:47 -07:00
SamGondelman
7a5bbb8f6f fix laser ghosting 2019-03-18 14:53:11 -07:00
SamGondelman
ea50133146 working on adding particle shape types 2019-03-18 12:05:17 -07:00
danteruiz
2ab8eb98e8 better implementation 2019-03-17 14:00:41 -07:00
danteruiz
5f3e31b119 add ui to kick api 2019-03-15 18:15:18 -07:00