Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-29 23:06:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
77973 commits 6 branches 1 tag 1.1 GiB
Commit graph

32164 commits

Author SHA1 Message Date
Ken Cooke
ebc73bebc5 Ambisonic renderer using 4x4 rotate/scale matrix to implement gain crossfade 2019-03-30 15:39:33 -07:00
raveenajain
269b910d24 update variables, loops 2019-03-29 18:25:17 -07:00
Shannon Romano
6ccf16dfe5
Merge pull request #15288 from roxanneskelly/Case21726 
Case 21726 - Domain lost recent entity edits upon restart
 2019-03-29 17:06:31 -07:00
Shannon Romano
53c7ade542
Merge pull request #15178 from amantley/fbxJointParentBug 
Fix for FBX Root Being Given Non-Zero Parent
 2019-03-29 17:02:02 -07:00
danteruiz
db17f094da adding entities to fade out list; 2019-03-29 15:23:16 -07:00
Shannon Romano
df97f595f2
Merge pull request #15279 from kitely/allow-emails-with-plus-sign 
case 21982: Allow logging-in with an email that contains a '+' sign
 2019-03-29 13:04:11 -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
SamGondelman
33b3e2afac try to fix build errors? 2019-03-29 10:57:01 -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
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
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
luiscuenca
a7c36c9505 Merge branch 'master' into kdopsRotOffsetFix 2019-03-29 10:29:30 -07:00
SamGondelman
585a022dca embedded textures and relative material paths 2019-03-29 10:08:31 -07:00
Olivier Prat
7455ddb7ba Created Image class to encapsulate some transforms with QImage 2019-03-29 12:23:44 +01:00
raveenajain
b283bb303d jenkins warning fixes 2019-03-28 17:55:51 -07:00
luiscuenca
bea45e67cb Fix multisphere scale, desyncronize visualization and support joint scaling 2019-03-28 17:38:17 -07:00
danteruiz
b9d04c6ebb adding entity to a faded list 2019-03-28 16:42:29 -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
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
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
Olivier Prat
5f6f178438 Fixed compression when convolving 2019-03-28 18:50:12 +01:00
Olivier Prat
cef9e454d5 Working beta pipeline 2019-03-28 16:44:22 +01:00
Olivier Prat
2397d5919f Finished convolution code 2019-03-28 15:15:51 +01:00
Olivier Prat
5bf3cdd592 Working on cubemap seams 2019-03-28 11:59:21 +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
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
David Rowe
f933872620 Address review comments. 2019-03-28 14:21:51 +13: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
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
Angus Antley
d71c6c28de added the new hand anims to the resource, and added hand reset to initAnimGraph 2019-03-27 12:00:50 -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
4a2323f3c2 Just need to write correct textureLod equivalent on CPU cube map 2019-03-27 17:43:26 +01:00
Olivier Prat
a39fe7452c Preparing for cubemap convolution 2019-03-27 16:31:08 +01:00
Olivier Prat
aa4401801e Added new texture types : sky and ambient in place of just cube 2019-03-27 11:54:45 +01:00
Olivier Prat
12e8056e1f Android compilation fix 2019-03-27 08:15:07 +01:00
Angus Antley
02d9331603 This changes the avatar-animation json so that we have override 
animations for the right and left hand, similar to how we have whole
body override animations.
 2019-03-26 23:27:54 -07:00
SamGondelman
3d2b71bc7b remove all existing material parsing 2019-03-26 17:16:13 -07: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
Brad Davis
0c78c8fd87 Disable per-frame context switch on present thread 2019-03-26 13:50:46 -07:00
Brad Davis
36cecef166 Support explicit timestamps in tracing, conditional event output based on duration 2019-03-26 13:50:46 -07:00
SamGondelman
4ed7c09016 grab correct stencil masks from display plugins 2019-03-26 13:42:18 -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
David Rowe
9a1bb27034 AnimationCache, ModelCache, SoundCache, and TextureCache JSDoc 2019-03-26 13:58:43 +13: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
r3tk0n
3ac42e69e3 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-25 11:27:31 -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
r3tk0n
108e8b9994 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-21 15:17:56 -07:00
r3tk0n
7a8dfe0aaf Fix run speeds. 2019-03-21 15:06:21 -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
Shannon Romano
840f3a3a2e
Merge pull request #15187 from SamGondelman/wearables 
Case 21721: Fix wearable duplication on domain switch
 2019-03-15 17:40:23 -07:00
Ken Cooke
ca0379f6de Send InjectorGainSet packet to the audio-mixer 2019-03-15 17:24:50 -07:00
Sam Gondelman
e7f2df4fac
Merge pull request #15197 from SamGondelman/onion 
Case 21746: Fix color grading/lighting of renderLayer front entities
 2019-03-15 17:17:09 -07:00
amantley
2300fe471d we now read frame zero of the animation to override the bind pose in fbxs that are before version 7500 2019-03-15 16:53:06 -07:00
SamGondelman
d4e1ec9741 fix emitScriptEvent 2019-03-15 16:20:01 -07:00
sabrina-shanman
b6c44ea443 Remove unused variables when iterating through mesh nodes in FBXBaker 2019-03-15 15:56:36 -07:00
sabrina-shanman
53429f459e Remove some redundancy involving model texture URL resolution 2019-03-15 15:32:39 -07:00
SamGondelman
0d94030515 use web surface alpha 2019-03-15 15:32:31 -07:00
sabrina-shanman
60ed9e12a4 Attempt to fix build errors 2019-03-15 15:17:33 -07:00
SamGondelman
79dda7a6c7 build errors 2019-03-15 14:29:50 -07:00
SamGondelman
83bac723ef fix wearable duplication on domain switch 2019-03-15 13:38:25 -07:00
SamGondelman
8748a7561b fix lighting/color grading for everything 2019-03-15 12:48:32 -07:00
Ken Cooke
a5a305f181 Handle InjectorGainSet packet at the audio-mixer 2019-03-15 12:05:51 -07:00
sabrina-shanman
041db33578 Attempt to fix build warnings 2019-03-15 10:20:58 -07:00
sabrina-shanman
c54b23f647 Make material baking output unique textures per usage like model baking does 2019-03-14 17:09:26 -07:00
sabrina-shanman
c8209aa976 Do not have multiple copies of the original texture file in the baked output 2019-03-14 17:09:25 -07:00
sabrina-shanman
20d0ca0073 Fix baked material JSONS using wrong texture paths 2019-03-14 17:09:21 -07:00
SamGondelman
c985fc735d clean up avatar rendering and ring gizmo normals 2019-03-14 14:43:43 -07:00
Brad Davis
fd65f51140 Fix gamma correction on Quest 2019-03-14 14:27:20 -07:00
amantley
bc696d6db6 fixed memory leak caused by bone length scale computation 2019-03-14 13:49:13 -07:00
sabrina-shanman
3016860bab Fix QFile::open complaining the device was already open in 
TextureBaker::processTexture
 2019-03-14 13:31:29 -07:00
Brad Davis
19f856b760 Switch Oculus mobile to single draw FBO with multiple color attachments 2019-03-14 13:10:54 -07:00
sabrina-shanman
5e430c98c5 Attempt to fix build warnings 2019-03-14 09:56:25 -07:00
sabrina-shanman
5b75eb34e8 Fix ModelBaker not properly checking if texture file name exists 2019-03-13 17:26:02 -07:00
Howard Stearns
9b3b109d22 make placename consistent with hostname after domain reset 2019-03-13 17:09:54 -07:00
sabrina-shanman
27c7bf5c92 Remove duplicate FBX debug dump 2019-03-13 17:02:55 -07:00
sabrina-shanman
a3412bb25e Attempt to fix build errors 2019-03-13 16:44:50 -07:00
sabrina-shanman
cb1f42afe5 Copy pre-parsed node from FBXSerializer for baking 2019-03-13 16:44:50 -07:00
sabrina-shanman
3aaa18f529 Might as well deduplicate indices when loading model for baking 2019-03-13 16:44:50 -07:00
sabrina-shanman
32d5f7135f Give the oven model-baker Baker an appropriate materialMappingBaseURL, but disable ParseMaterialMappingTask for now 2019-03-13 16:44:50 -07:00
luiscuenca
c14b135f2b Fix flow touch and scale issues 2019-03-13 15:42:04 -07:00
amantley
9d739277c8 changed the fix so that we allow the root to be child 2019-03-13 14:26:27 -07:00
SamGondelman
300dd39abf fix script engine shutdown 2019-03-13 12:23:31 -07:00
amantley
93d7a4ae3b will no longer allow a non-zero parent of the root of an fbx model 2019-03-13 11:14:15 -07:00
amantley
c634c1445c Merge remote-tracking branch 'upstream/master' into fbxJointParentBug 2019-03-13 10:11:11 -07:00
Sam Gondelman
f013b9af2b
fix warnings 2019-03-13 00:24:19 -07:00
David Rowe
ea84847950 Update AnimStateDictionary JSDoc per feedback 2019-03-13 16:20:38 +13:00
David Rowe
7445d73857 Merge branch 'master' into M21222 
# Conflicts:
#	libraries/avatars/src/AvatarData.h
 2019-03-13 16:14:14 +13:00
SamGondelman
609c4ab52e try to fix audio injector threading issues 2019-03-12 18:41:43 -07:00
sabrina-shanman
7f77e163ac Restore 'Re-bake originals' checkbox to domain bake window 2019-03-12 18:17:11 -07:00
sabrina-shanman
a93825c2f9 Fix remaining issues with merge 2019-03-12 18:14:18 -07:00
Anthony Thibault
fff0d1a80e Rig.cpp: Fix for index out of range assert in debug builds 2019-03-12 17:43:23 -07:00
sabrina-shanman
ddc4f5349e Merge branch 'master' into hfm_oven_wip 2019-03-12 16:23:07 -07:00
amantley
7567e0d355 debugging the root of the fbx, it is not 0 in some cases 2019-03-12 15:48:42 -07:00
sabrina-shanman
41c0594361 Make output folder cleaner for single model bake when baked model url is given as input 2019-03-12 15:36:13 -07:00
sabrina-shanman
b42c6d1352 Fix baked models not mapping to correct textures 2019-03-12 15:36:06 -07:00
sabrina-shanman
5b504c4759 Add encode/decode speed config to BuildDracoMeshTask 2019-03-12 15:36:05 -07:00
sabrina-shanman
efc9f993f5 Add FSTBaker, and make ModelBaker output an FST 
Restore feature to look for baked model file in other oven directory
 2019-03-12 15:34:57 -07:00
danteruiz
6303f61cc3 fix lasers scale issue 2019-03-12 14:26:59 -07:00
Brad Davis
cb311408c6 Remove _compositeFramebuffer from display plugins 2019-03-12 12:20:20 -07:00
Sabrina Shanman
ff67cd652e
Merge pull request #15158 from SamGondelman/unrigged 
Case 7295: Fix rendering of unrigged vertices
 2019-03-12 10:59:29 -07:00
John Conklin II
2cf7462fbc
Merge pull request #15159 from dback2/jointOffset2RenamingFix 
Case 21669: Fix joint renaming with jointRotationOffset2
 2019-03-12 10:32:02 -07:00
David Back
f0bf87b3c3 fix joint out not being renamed with jointRotationOffset2 2019-03-11 18:53:35 -07:00
Shannon Romano
44fa00606a
Merge pull request #15153 from danteruiz/fix-soft-entity-popping 
Case 21618: menithal's avatar is constantly flashing
 2019-03-11 18:09:44 -07:00
amantley
7c7e632589 debug statements to find the node parsing error 2019-03-11 17:50:20 -07:00
SamGondelman
2b32b77bed handle case when clusterMatrices.size() == 0 2019-03-11 17:32:40 -07:00
Wayne Chen
0279373d11
Merge branch 'master' into ptt 2019-03-11 17:09:37 -07:00
Wayne Chen
4add8c1777
Merge pull request #15098 from wayne-chen/muteWarningModified 
Case 21564: Warn When Muted
 2019-03-11 16:53:00 -07:00
r3tk0n
39342b9771 Merge branch 'master' of https://github.com/highfidelity/hifi into project-freeloco 2019-03-11 16:27:05 -07:00
r3tk0n
ce2e0c7b81 Merge branch 'project-freeloco' of https://github.com/r3tk0n/hifi into project-freeloco 2019-03-11 16:25:13 -07:00
r3tk0n
cbd841a14d Update gearing system. 2019-03-11 16:22:48 -07:00
SamGondelman
b24b7fed3d the root node isn't the first onegit add ../.git add ../. 2019-03-11 15:34:41 -07:00
Shannon Romano
c0240d2431
Merge pull request #14932 from AndrewMeadows/allow-kinematic-mesh 
Case 21227: don't enforce MOTION_TYPE_STATIC on mesh shapes
 2019-03-11 15:33:32 -07:00
Wayne Chen
36c2358dc0
Merge branch 'master' into muteWarningModified 2019-03-11 14:35:13 -07:00
Shannon Romano
801306364a
Merge pull request #15148 from samcake/rc81-hero 
Case 21639: RC81: Adding Hero support in simulation of avatars
 2019-03-11 14:13:49 -07:00
SamGondelman
97b01bad70 tellPhysics to children when animating model 2019-03-11 12:23:26 -07:00
SamGondelman
b7e1798d1b better handling of unrigged vertices on skinned mesh 2019-03-11 11:28:30 -07:00
danteruiz
4371723145 fix soft entity popping 2019-03-11 11:27:12 -07:00
Wayne Chen
3dcc53a945
Merge branch 'master' into ptt 2019-03-10 17:14:54 -07:00
Bradley Austin Davis
0e46007d84
Merge pull request #15116 from jherico/fix/oculus_sdk_update 
Case 21595: Oculus SDK Update
 2019-03-08 23:53:06 -08:00
David Rowe
24286273b4 Miscellaneous JSDoc fixes 2019-03-09 19:22:07 +13:00
Sam Gateau
3464fe09c1 Applying the hero changes to master soon to be rc81 2019-03-08 18:13:20 -08:00
Anthony Thibault
c36d752b6b
Merge pull request #15141 from luiscuenca/flowAPIExtra 
add getFlowData method to MyAvatar
 2019-03-08 17:45:11 -08:00
Shannon Romano
ca87e217bd
Merge pull request #15097 from wayne-chen/audioSettingsModified 
Case 21562: Audio settings screen
 2019-03-08 16:22:52 -08:00
Wayne Chen
18b86d550d adding PushToTalk action 2019-03-08 16:07:48 -08:00
luiscuenca
80150565f6 Fix bug on group settings 2019-03-08 16:30:28 -07:00
David Rowe
24c7c8be19 Update JSDoc per merge from master 2019-03-09 12:03:59 +13:00
Shannon Romano
a8f6e74ca4
Merge pull request #15135 from SamGondelman/text81 
Case 21628: Fix text rendering on AMD/Mac
 2019-03-08 14:59:37 -08:00
Thijs Wenker
ded58b96f0
Merge pull request #15139 from huffman/feat/tga-textures 
Case 21220: Add more complete support for .tga files
 2019-03-08 23:53:21 +01:00
Thijs Wenker
60d46998ec
Merge pull request #15035 from thoys/feat/avatarTools/avatarDoctorMoreWarnings 
Case 21449: [AvatarPackager/AvatarDoctor] Warnings update
 2019-03-08 23:51:58 +01:00
Anthony Thibault
aa3b27d89e
Merge pull request #15143 from amantley/bugShadowNames2 
loading jointRotationOffset2 from FST and deal with the shadow joints
 2019-03-08 14:37:30 -08:00
Ryan Huffman
62f17acaf7 Fix warnings in TGAReader 2019-03-08 14:01:29 -08:00
luiscuenca
4858f64810 get the colliding joints 2019-03-08 14:36:47 -07:00
Ryan Huffman
1f0a8b18c8 Fix warning about TGAOrientation 2019-03-08 13:01:56 -08:00
luiscuenca
f363d95ca2 clear group settings on init 2019-03-08 13:02:47 -07:00
Ryan Huffman
2af9dc886a Add logging category to TGAReader 2019-03-08 11:56:04 -08:00
amantley
6b18b22433 loading jointRotationOffset2 from FST and deal with the shadow joints 2019-03-08 11:53:12 -08:00
luiscuenca
cb6f573b35 Merge branch 'master' into flowAPIExtra 2019-03-08 12:43:02 -07:00
Roxanne Skelly
c33d2aafda Merge branch 'master' of https://github.com/highfidelity/hifi into StandaloneTags 2019-03-08 11:41:34 -08:00
David Rowe
4779a6b156 Merge branch 'master' into M21222 2019-03-09 07:57:53 +13:00
David Rowe
5068075645 Fill in MyAvatar animation JSDoc 2019-03-09 07:42:55 +13:00
Roxanne Skelly
e94d248ac5
Merge pull request #15126 from howard-stearns/domainUnlimited 
unlimited certified copies in a domain
 2019-03-08 10:23:42 -08:00
Ryan Huffman
c55811ced5 Add support for TGA orientation 2019-03-08 09:47:35 -08:00
Ryan Huffman
5fd2b0699a Add more complete support for .tga files 2019-03-08 09:47:35 -08:00
luiscuenca
e8da6b5a0c add getFlowData 2019-03-08 10:36:58 -07:00
Thijs Wenker
d985d1bff0 use Rig instead of Avatar for height calculations 2019-03-08 03:36:56 +01:00
Anthony Thibault
dcd1258439
Merge pull request #15119 from hyperlogic/feature/improve-anim-pose-negative-scale 
Improve AnimPose support for negative scale
 2019-03-07 17:05:46 -08:00
Sam Gondelman
1ed2012a63
Merge pull request #15132 from SamGondelman/text 
Case 21621: Fix crash on startup
 2019-03-07 16:54:29 -08:00
David Rowe
eba89e8a80 Revise Avatar JSDoc as a result of MyAvatar JSDoc work 2019-03-08 13:50:03 +13:00
David Rowe
0b7cddb886 Fill in and tidy MyAvatar JSDoc 2019-03-08 13:49:10 +13:00
SamGondelman
af03fb5f85 try to fix text rendering on amd with transparency 2019-03-07 16:23:12 -08:00
Shannon Romano
45ab5efcef
Merge pull request #15121 from danteruiz/fix-stylus-gizmo 
Case 21603: Tablet x button is nearly impossible to hit with stylus
 2019-03-07 16:03:13 -08:00
Shannon Romano
8be93fd16c
Merge pull request #14891 from kencooke/glm-pack-normals-speedup 
Case 21114: SIMD optimized blendshape packing
 2019-03-07 15:28:40 -08:00
SamGondelman
1d6364773d fix crash on startup 2019-03-07 15:26:41 -08:00
Howard Stearns
d309995aef spell domainUnlimited right, and track challenges so that we don't reap 2019-03-07 14:48:57 -08:00
Anthony Thibault
0cf8f3e5c3 Code review feed back remove NEW_VERSION ifdef 2019-03-07 14:11:01 -08:00
John Conklin II
9a4b95faa2
Merge pull request #15111 from luiscuenca/flowDataOnFst 
Load flow bone data from FST file
 2019-03-07 12:48:36 -08:00