Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 13:51:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
55471 commits 75 branches 59 tags 1.2 GiB
Commit graph

22901 commits

Author SHA1 Message Date
Brad Hefta-Gaub
fbc32e5ba1 Merge pull request #10485 from samcake/orange 
Add protections when accessing the mip bytes of a texture when provided from a KtxStorage
 2017-05-18 08:47:58 -07:00
Sam Cake
5edcc38eba Polishing the scope shaders 2017-05-18 01:06:59 -07:00
David Rowe
f6c1fa4213 Merge branch 'master' into 21359 2017-05-18 16:40:20 +12:00
Brad Hefta-Gaub
014fd710de Merge pull request #10490 from Atlante45/feat/settings-map 
Enable Map/List storage in the settings
 2017-05-17 21:24:04 -07:00
Seth Alves
b05cb4af3b fix nan 2017-05-17 20:51:34 -07:00
David Rowe
26e390fa89 Tidy code setting head orientation 2017-05-18 13:55:06 +12:00
Zach Pomerantz
e8ab780899 include details in critical variantMap parsing error 2017-05-17 21:32:13 -04:00
samcake
80b6fd65ae Cleaning up counters and naming schemes... 2017-05-17 18:31:28 -07:00
David Rowe
f00232ab6d Fix avatar eyelids and blinking in recording playback 
Reinstates conditions to not calculate eye movements if face / eye
trackers are connected; they're considered connected for recording
playback.
 2017-05-18 13:30:29 +12:00
Sam Gateau
966afa1e4a Adding the drawKeyLight shader 2017-05-17 18:26:49 -07:00
Sam Gateau
3e7795ec11 Adding the drawKeyLight shader 2017-05-17 18:23:47 -07:00
Sam Gateau
79f700e8ce Adding the drawKeyLight shader 2017-05-17 18:12:48 -07:00
David Rowe
223b1a858b Fix avatar eye look-at in recording playback 2017-05-18 12:27:31 +12:00
Howard Stearns
95111d24b2 Merge branch 'master' into dk/sequenceNumberForAvatarIdentity 2017-05-17 17:09:47 -07:00
Brad Hefta-Gaub
c07eb3e45e Merge pull request #10471 from hyperlogic/feature/ik-flex-coeff 
Flex and weight IK tuning parameters
 2017-05-17 16:48:50 -07:00
Seth Alves
0dc355cf86 Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox 2017-05-17 16:43:50 -07:00
Brad Hefta-Gaub
93f3b2df45 Merge pull request #10491 from birarda/bug/bearer-timeout 
disable the bearer poll timeout
 2017-05-17 16:24:17 -07:00
Anthony J. Thibault
0018224fef moar warning fixes 2017-05-17 16:23:39 -07:00
Andrew Meadows
09433a93ba Merge pull request #10477 from AndrewMeadows/correct-avatar-mass 
More correct avatar mass
 2017-05-17 16:22:06 -07:00
Brad Hefta-Gaub
0d3f7058ec Merge pull request #10483 from AndrewMeadows/cap-velocities 
cap scripted linear and angular velocity inputs
 2017-05-17 16:15:42 -07:00
Stephen Birarda
2ac5fbf91d set wireless scan interval to -1 2017-05-17 15:33:52 -07:00
Anthony J. Thibault
78dd30f656 macosx warning fix 2017-05-17 15:22:39 -07:00
Zach Fox
c5a5cad76d Merge pull request #10487 from zfox23/removeExtraneousSendIdentity 
Remove extraneous calls to sendIdentityPacket()
 2017-05-17 15:20:09 -07:00
David Kelly
057718bde3 remove clockSkew, reference new version for Avatar packets 2017-05-17 15:14:56 -07:00
David Kelly
689a0b5bad Switch from timestamp to sequence id for avatar identity 2017-05-17 14:22:36 -07:00
Zach Fox
d4752926b8 First pass - checking performance 2017-05-17 13:51:27 -07:00
samcake
b19b0007c8 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-05-17 13:02:37 -07:00
samcake
ab3ea65d54 Simply add protections when accessing the mip bytes of a texture when provided from a KtxStorage 2017-05-17 12:36:12 -07:00
Atlante45
0d77977936 Enable Map/List storage in the settings 2017-05-17 12:11:15 -07:00
Seth Alves
9b1fe60b7c suppress frequest log-spam from constraints. 2017-05-17 11:55:31 -07:00
Seth Alves
8a88b30da7 Merge pull request #10468 from AndrewMeadows/cleanup-actions 
cleanup Actions and Constraints part-1
 2017-05-17 11:33:53 -07:00
Andrew Meadows
82c7188376 Merge pull request #10470 from huffman/fix/ktx-cubemaps 
Fix progressive loading of KTX cubemaps
 2017-05-17 11:23:24 -07:00
Andrew Meadows
97ed719506 cap scripted linear and angular velocity inputs 2017-05-17 10:40:45 -07:00
Sam Gateau
0f250e693d Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-17 09:49:20 -07:00
Seth Alves
8ab676e627 Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox 2017-05-17 09:09:04 -07:00
Dante Ruiz
a18940142e Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter 2017-05-17 16:23:50 +01:00
Thijs Wenker
278bc610d4 Merge pull request #10466 from misslivirose/feat-find-entities-by-type 
Add function findEntitiesByType EntityScriptingInterface
 2017-05-17 15:06:04 +02:00
Brad Hefta-Gaub
764bfe94f5 Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270 
Feature/snap turn smoothing 21270
 2017-05-16 21:05:38 -07:00
Brad Hefta-Gaub
ee6bed5c1c Merge pull request #10189 from Atlante45/fix/memory-leak 
Set max packet per second on the agent
 2017-05-16 21:03:05 -07:00
Brad Hefta-Gaub
12aa354ddd Merge pull request #10474 from ctrlaltdavid/21346 
Fix recording playback not clearing attachments and nametags
 2017-05-16 20:53:17 -07:00
Brad Hefta-Gaub
254c6e9292 Merge pull request #10441 from Atlante45/feat/launch-sandbox 
Launch the Sandbox as early as possible
 2017-05-16 20:52:23 -07:00
Brad Hefta-Gaub
36c7821e1e Merge pull request #10455 from ZappoMan/TriangleSetOptimizations 
TriangleSet optimizations - ~80% improvement in Ray picking against models
 2017-05-16 20:47:50 -07:00
David Rowe
e69c322fd3 Get UserActivityLogger working in AC scripts 2017-05-17 14:30:32 +12:00
samcake
b466964817 REvisiting the stats counter for the gpu context in the hope of better understanding the gpu texture streaming behavior 2017-05-16 18:21:24 -07:00
Brad Hefta-Gaub
f623a9dc82 Merge pull request #10478 from sethalves/delete-localtree-children 
clean up children of deleted avatar-entity
 2017-05-16 18:14:45 -07:00
Seth Alves
d90843428d when importing entities, make a queryAACube that takes children into account 2017-05-16 16:54:16 -07:00
Seth Alves
1e4e2cc1b4 when a parent entity is deleted, delete its children in the local tree, rather than waiting for the server to tell us about it 2017-05-16 16:22:40 -07:00
samcake
2cd2c95940 Adding more debugging tool 2017-05-16 16:12:31 -07:00
Andrew Meadows
d065b569d3 support for variable avatar mass by size 2017-05-16 16:03:51 -07:00
Ryan Huffman
e0212ac32b Remove _fullImageSize from ktx header 2017-05-16 15:53:07 -07:00
Ryan Huffman
7225326bfc Fix failed mip insertions not being handled by TextureCache 2017-05-16 15:12:47 -07:00
Ryan Huffman
bfd1274ed3 Fix progressive loading of cubemaps 
In various places we were using the KTX _imageSize as the size of the
entire mip level, when it is actually the size of the face for cubemaps.
 2017-05-16 15:12:47 -07:00
Atlante45
201f81f20a Don't wait on the sandbox 2017-05-16 14:41:57 -07:00
Seth Alves
b9005a9e76 fix up queryAACubes before sending imported entities to server 2017-05-16 14:32:55 -07:00
David Rowe
7897bf8aa8 Fix display name not getting cleared 2017-05-17 08:17:55 +12:00
David Rowe
733b0feabd Fix attachment data not getting cleared 2017-05-17 08:17:33 +12:00
Anthony J. Thibault
be7a9a2383 warning fixes 2017-05-16 11:00:25 -07:00
Ryan Huffman
8eacf0ad4b Remove unnecessary assert in Model.cpp 
This clause inside was not longer valid - it is a valid state for
part->_meshIndex < _modelMeshRenderItems.size(). A better check might be
to compare it to the size of _meshStates which we use below, but we use
_meshStates.at(...) which will do the bounds checking, which makes the
assert unnecessary.
 2017-05-16 10:56:33 -07:00
Dante Ruiz
add45df496 Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter 2017-05-16 16:38:31 +01:00
Dante Ruiz
b0fa26e390 fix wierd calibration effect due to low velocity filter 2017-05-16 16:38:01 +01:00
Andrew Meadows
e6accb61b0 more purging of legacy 'Spring' action 2017-05-16 08:09:20 -07:00
Sam Cake
4c3ddfbff9 Adding debuging of the ambient lighting 2017-05-16 01:01:19 -07:00
Andrew Meadows
9b3754c2ee remove unused API from ObjectDynamic and friends 2017-05-15 22:13:03 -07:00
Andrew Meadows
9e08dadaf4 Remove ObjectActionSpring 2017-05-15 22:11:42 -07:00
Liv Erickson
32fd905918 style pass 2017-05-15 20:49:30 -07:00
Liv Erickson
ae458dcbcf changing models to more generally reference entities in comment 2017-05-15 20:33:22 -07:00
Liv Erickson
a606f8a8d4 Fixing code style 2017-05-15 20:28:48 -07:00
Liv
08eb6442b5 Add function findEntitiesByType EntityScriptingInterface 
Updated EntityScriptingInterface.cpp and .h to create a new function for
the Entities API that can be called to filter out entities found by a
specific entity type.
 2017-05-15 18:36:36 -07:00
Zach Fox
bc1e97032a Thanks to Andrew! 2017-05-15 17:39:19 -07:00
samcake
db4387e55d Trying to mess with the defautl texture for skybox 2017-05-15 17:31:29 -07:00
samcake
8626e1f3d1 Keep fixing the cascading behavior to the zone render item 2017-05-15 17:19:46 -07:00
Dante Ruiz
724f849d88 Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter 2017-05-16 00:15:18 +01:00
Dante Ruiz
975b1ab077 moved low velocity filter in the input system 2017-05-16 00:15:06 +01:00
Zach Fox
64ae5119ae Merge pull request #10462 from zfox23/fixIdentityUpdatedAt 
Force _identityUpdatedAt to stay above 0, fixing more identity packet bugs
 2017-05-15 15:44:26 -07:00
Zach Fox
e492ca9364 Improve the test - thanks Dave! 2017-05-15 14:55:05 -07:00
Zach Fox
a2a24b22a8 Force _identityUpdatedAt to stay above 0 2017-05-15 14:25:47 -07:00
samcake
2df6d0df48 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-15 13:40:56 -07:00
Seth Alves
66a1dbfcfe Merge pull request #10445 from AndrewMeadows/cleanup-head-simulation 
cleanup Head::simulate() code
 2017-05-15 11:21:43 -07:00
Seth Alves
d7432048a0 Merge pull request #10456 from vladest/market-crash-fix 
Market crash fix
 2017-05-15 10:58:02 -07:00
Anthony J. Thibault
1e276d113c Added support for weights per target 2017-05-15 09:26:24 -07:00
Anthony J. Thibault
67fbb15faa WIP: initial implementation of flexCoefficients 2017-05-15 09:26:23 -07:00
Dante Ruiz
c689b9949c fixed merge conflict 2017-05-15 16:11:28 +01:00
Chris Collins
263e4de951 Merge pull request #10454 from samcake/orange 
Fixing potential crashes when loading  invalid KTX cached textures
 2017-05-14 17:41:06 -07:00
ZappoMan
149750fe21 make the octree sparse 2017-05-14 08:36:54 -07:00
ZappoMan
5065c7c5c4 more warning fixes 2017-05-13 10:17:59 -07:00
ZappoMan
da404ce2ce fix warning 2017-05-13 09:29:32 -07:00
Vladyslav Stelmakhovskyi
49a45f0300 Merge branch 'master' into market-crash-fix 2017-05-13 14:23:26 +02:00
Vladyslav Stelmakhovskyi
20c27fc133 Fix crash on save Map data settings from scripts 2017-05-13 14:20:28 +02:00
Sam Cake
b38be7e561 warning -1 2017-05-12 20:20:03 -07:00
ZappoMan
dcb70aa504 more cleanup 2017-05-12 19:03:08 -07:00
ZappoMan
4af3c760e6 more cleanup 2017-05-12 18:57:33 -07:00
ZappoMan
f1bd06cfa0 cleanup some unneeded class 2017-05-12 18:33:28 -07:00
samcake
c4e8885842 not testing in storage for alignment 2017-05-12 18:27:58 -07:00
samcake
f35b0297fa Replace the alignment test by a nice function 2017-05-12 18:25:07 -07:00
samcake
d734358290 Adding a comment for debug sake 2017-05-12 18:15:00 -07:00
samcake
5bc8e09865 Fixing the test... 2017-05-12 18:10:48 -07:00
samcake
bdb0414add Adding a validation step at runtime for the cached KTX file in order to regenerate them if anything seems wrong 2017-05-12 18:04:22 -07:00
ZappoMan
89b6a79f68 make sure to exit early if box intersection is already larger than best triangle intersection 2017-05-12 17:56:45 -07:00
anshuman64
49d4cf4e68 Merge pull request #10419 from hyperlogic/feature/ik-solver-init-config 
More stable IK when hips, feet and chest are controlled via external input
 2017-05-12 17:22:29 -07:00
ZappoMan
eb3b27849c only keep one copy of Triangles 2017-05-12 17:07:47 -07:00
Dante Ruiz
655483182c daving work 2017-05-12 23:38:20 +01:00
Seth Alves
9d4411e3f0 Merge pull request #10417 from sethalves/motor-action 
misc action/constraint changes
 2017-05-12 14:27:51 -07:00
Anthony Thibault
f4b772d747 Merge pull request #10452 from druiz17/bug-irecorder-crash 
Fixed input recorder crash
 2017-05-12 13:46:15 -07:00
Seth Alves
fcc5e12211 redelete these 2017-05-12 13:19:15 -07:00
Seth Alves
f40c7bde71 Merge pull request #9 from AndrewMeadows/motor-action 
remove unused parameters from Hinge and ConeTwist constraints
 2017-05-12 13:14:02 -07:00
Seth Alves
4af0a85aa0 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-12 13:03:58 -07:00
Seth Alves
630d95a812 fix constraint import some more 2017-05-12 13:03:51 -07:00
ZappoMan
ea8330e4e3 Merge branch 'master' of https://github.com/highfidelity/hifi into TriangleSetOptimizations 2017-05-12 13:00:14 -07:00
Brad Hefta-Gaub
5fbe1fd647 Merge pull request #10407 from Atlante45/fix/move-avatar-on-restart 
Don't send avatars to previous lookup on server restart
 2017-05-12 12:30:20 -07:00
Brad Hefta-Gaub
a88f72024d Merge pull request #10243 from birarda/bake-textures 
Add an internal tool for domain/model/skybox KTX texture baking
 2017-05-12 12:26:33 -07:00
Andrew Meadows
10d058af02 remove unused parameters from ObjectConstraintConeTwist 2017-05-12 12:07:34 -07:00
Andrew Meadows
18b1bb8b7f remove unused parameters from ObjectConstraintHinge 2017-05-12 12:04:08 -07:00
Dante Ruiz
6155d31513 removed debug statment 2017-05-12 19:48:31 +01:00
Dante Ruiz
1f328cc923 made requested changes 2017-05-12 19:46:12 +01:00
Clément Brisset
1658ced671 Merge pull request #10437 from Atlante45/feat/faster-startup 
Use baked default skybox
 2017-05-12 11:35:51 -07:00
Dante Ruiz
9a0fd78e41 fixed indentation 2017-05-12 19:34:13 +01:00
Dante Ruiz
026daef842 fixed input recorder crash 2017-05-12 19:26:37 +01:00
Seth Alves
bc6fb182eb pull out motor action, fix import of slider and cone-twist constraints 2017-05-12 10:32:28 -07:00
Seth Alves
fabcd7e8e0 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-12 10:31:55 -07:00
Seth Alves
4b0e51ca54 Merge pull request #10439 from sethalves/word-align--memorystorage 
fix - avoid crash in glTextureSubImage2D
 2017-05-12 10:31:44 -07:00
samcake
3393456d91 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-12 10:15:13 -07:00
Seth Alves
c6131916e1 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-12 09:46:21 -07:00
Seth Alves
4aa683363c back out previous changes, do compressionOptions.setPitchAlignment(4) instead 2017-05-11 16:22:12 -07:00
Andrew Meadows
a43447310d remove physics dependency from avatars-render lib 2017-05-11 15:22:22 -07:00
Zach Fox
9289cd2022 Merge pull request #10398 from zfox23/PAL_FixIDPacketOrder 
Fix the PAL not showing user info for user who opened PAL
 2017-05-11 15:16:05 -07:00
Andrew Meadows
04827c3a2a use const auto& where appropritate 2017-05-11 14:51:52 -07:00
Andrew Meadows
f4df223d23 cleanup Head::simulation() code 2017-05-11 14:46:00 -07:00
Atlante45
6378b96b4c CR 2017-05-11 14:41:02 -07:00
Seth Alves
ac2bc39a27 try, try again 2017-05-11 14:10:03 -07:00
Atlante45
9138ec53e9 Don't send avatars to previous lookup on server restart 2017-05-11 14:07:36 -07:00
Seth Alves
a26f9c7887 make _size const 2017-05-11 13:36:05 -07:00
Seth Alves
9d63113e62 Merge pull request #10337 from vladest/audio-source-sync 
Audio source sync
 2017-05-11 12:50:38 -07:00
Vladyslav Stelmakhovskyi
045e93fb95 Code style fixes #2 2017-05-11 21:49:07 +02:00
Seth Alves
19401af3e1 Merge branch 'master' of github.com:highfidelity/hifi into word-align--memorystorage 2017-05-11 12:43:05 -07:00
Atlante45
e0863aa50f Only open files for write if necessary 2017-05-11 11:54:52 -07:00
Zach Fox
15574f509e Clarifying comments 2017-05-11 11:45:07 -07:00
Vladyslav Stelmakhovskyi
bd6ac7a39e Code style fixes 2017-05-11 20:38:09 +02:00
Anthony J. Thibault
a14fa5dab9 code review feedback 2017-05-11 10:54:15 -07:00
Andrew Meadows
0852852f39 Merge pull request #10443 from ctrlaltdavid/21326-2 
Fix avatar recording playback mouth not moving
 2017-05-11 10:41:41 -07:00
ZappoMan
9e01ba6d8b Merge branch 'master' of https://github.com/highfidelity/hifi into TriangleSetOptimizations 2017-05-11 10:24:19 -07:00
Seth Alves
80e6edda0c code review 2017-05-11 10:13:15 -07:00
samcake
6b32219f5f Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-11 10:07:27 -07:00
Seth Alves
4042e2bceb Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-11 09:29:30 -07:00
Seth Alves
dfb9fecf17 pad MemoryStorage size to multiple of 4 rather than using a vector of uint32_t -- this gets the same alignment without needs casts 2017-05-11 07:11:40 -07:00
Seth Alves
712386f256 Merge branch 'master' of github.com:highfidelity/hifi into word-align--memorystorage 2017-05-11 06:55:49 -07:00
Vladyslav Stelmakhovskyi
4290eb21ea Fixed possible crashes/freezes on input audio switch 2017-05-11 15:41:07 +02:00
Vladyslav Stelmakhovskyi
f963233a7b Merge branch 'master' into audio-source-sync 2017-05-11 15:25:24 +02:00
Vladyslav Stelmakhovskyi
e4d9772bbc Fixed crashes/freezes on audio switch 2017-05-11 15:20:36 +02:00
David Rowe
e426d70437 Improve variable name 2017-05-11 18:37:23 +12:00
David Rowe
98b943269b Sum of blendshapes is used sent through avatar mixer 2017-05-11 18:17:35 +12:00
David Rowe
21f9594f81 Sum of blendshapes is used for recording 2017-05-11 18:17:12 +12:00
David Rowe
1b855f2c6b Voice modulation and facetrackers write to transient blendshapes 2017-05-11 18:15:38 +12:00
David Rowe
3b06b03e01 Rename blendshapes variables in preparation for repurposing 2017-05-11 16:46:36 +12:00
Philip Rosedale
5fe18bc217 Merge pull request #10435 from AndrewMeadows/truncate-mouth-time 
avoid floating point error when generating fake mouth shapes
 2017-05-10 21:17:21 -07:00
Seth Alves
c9868640c1 force data in MemoryStorage to be word aligned to avoid crash in glTextureSubImage2D 2017-05-10 18:14:50 -07:00
Anthony J. Thibault
147d067c4e Merge branch 'master' into feature/ik-solver-init-config 2017-05-10 18:12:39 -07:00
samcake
737fdf9dd8 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-10 17:28:07 -07:00
ZappoMan
a15c5999b5 first cut at octree storage of Triangle Set 2017-05-10 16:58:51 -07:00
Dante Ruiz
0cae299192 fix issue when loading file to the input recorder 2017-05-11 00:20:21 +01:00
Zach Fox
ae983658be Finally, the actual fix? 2017-05-10 15:59:19 -07:00
Vladyslav Stelmakhovskyi
2328da3c48 Merge branch 'master' into audio-source-sync 2017-05-10 21:22:40 +02:00
Vladyslav Stelmakhovskyi
2d46f9d30e Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum 2017-05-10 21:21:39 +02:00
Andrew Meadows
a3df55915b avoid floating point error in fake mouth shapes 2017-05-10 12:02:37 -07:00
Sam Gateau
33762b7c1a Merge pull request #10416 from jherico/texture_transfer_safety 
Fixing crash in texture transfer logic, again
 2017-05-10 10:42:39 -07:00
Chris Collins
cd317dadaf Merge pull request #10422 from huffman/fix/corrupt-ktx 
Fix possible corruption of ktx cache files
 2017-05-10 10:39:54 -07:00
samcake
39f6e22da3 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-10 09:48:26 -07:00
Ryan Huffman
d92bdbf0ed Fix unsigned/signed comparision warning 2017-05-10 09:43:55 -07:00
Seth Alves
9184936496 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-10 09:30:39 -07:00
Andrew Meadows
9b2efac6fb Merge pull request #10430 from ctrlaltdavid/21335 
Fix unreachable eye blink code
 2017-05-10 09:11:31 -07:00
Anthony J. Thibault
93b8dc550c Merge branch 'master' into feature/ik-solver-init-config 2017-05-10 09:03:21 -07:00
druiz17
ec5dd04230 Merge pull request #10418 from volansystech/Bug-4255-HMD-file-quit-AppCrashes 
Bug 4255: When you are in HMD and you go to file menu quit, it crashe…
 2017-05-10 08:50:11 -07:00
Brad Davis
ee1fd69316 Fixing crash in texture transfer logic, again 2017-05-09 21:24:58 -07:00
samcake
75facdfa88 Testing the new behavior with the BackgroundStage, 2017-05-09 17:31:18 -07:00
samcake
bc41be7ec1 Introucing the BackgroundStage to manage the background / skybox in one place 2017-05-09 17:10:05 -07:00
David Rowe
a0bc8ae2ee Fix unreachable eye blink code 2017-05-10 11:40:42 +12:00
Zach Pomerantz
5a11911e1d close audio device when switching 2017-05-09 19:38:52 -04:00
Ryan Huffman
6e4c5d1ab4 Update FileCache writing to check QSaveFile::write return value 2017-05-09 16:29:57 -07:00
Chris Collins
a302c220f4 Merge pull request #10424 from AndrewMeadows/fix-mouth-movement 
Fix avatar mouth movement when driven by audio loudness
 2017-05-09 16:09:05 -07:00
Zach Fox
d7e4f02291 This is a better method. 2017-05-09 15:33:33 -07:00
Zach Fox
9ab643c416 I think this is all that must be done. 2017-05-09 15:33:33 -07:00
Zach Pomerantz
219062b76a Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-underrun 2017-05-09 17:32:24 -04:00
Zach Pomerantz
45feee38b2 Merge pull request #10269 from zzmp/fix/audio-bg-join 
Cleanup Audio background threads on shutdown
 2017-05-09 17:23:36 -04:00
Ryan Huffman
542001b14f Update FileCache to use QSaveFile for atomic writes 2017-05-09 14:08:43 -07:00
Andrew Meadows
2be6d19dfe always call Head::simulate() for Avatar in view 2017-05-09 14:00:18 -07:00
Anthony J. Thibault
e63dc52ec9 moar warning fixes 2017-05-09 13:59:07 -07:00
Zach Pomerantz
c478f1a752 synchronously fill injector buffer on underrun 2017-05-09 16:34:42 -04:00
Anthony J. Thibault
d7f195bc42 warning fix 2017-05-09 13:17:06 -07:00
Anthony J. Thibault
0bcc3c023e warning fixes 2017-05-09 13:07:06 -07:00
trent
a3545661dc Merged hifi/master into this PR and resolved merge conflicts. 2017-05-09 15:09:53 -04:00
Ryan Huffman
d86071d783 Fix possible corruption of ktx cache files 
When creating a file like this:

  1. Create file
  2. Write file
  3. Close file

there is an opening before the file is written and closed where, if the
application were to crash (or not finish for any other reason), the file
would be left in an undefined state. Instead, this change updates it to
do this:

  1. Create temp file
  2. Write temp file
  3. Close temp file
  4. Move temp file to final path

This ensures that at step 3 we have a valid file, before we rename it.
We should never end up with a final file in an undefined state, but it is
possible to end up with a temp file that is an undefined state if we,
for instance, crash during step 2.
 2017-05-09 12:08:52 -07:00
Anthony J. Thibault
7b35e8c7fd Bug fix for hands, reduced elbow angle to 60 degrees from horizontal. 2017-05-09 11:57:41 -07:00
Seth Alves
48c78584c3 fix a bug that could cause OBJ models with external mtl references to hang the loading thread 2017-05-09 11:09:39 -07:00
samcake
c36035d3eb Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-09 10:46:38 -07:00
Seth Alves
b285a582bd oops 2017-05-09 10:37:45 -07:00
Seth Alves
4f24a7618a cleanups 2017-05-09 10:23:04 -07:00
Seth Alves
1c23f3b971 bump protocol version 2017-05-09 10:10:35 -07:00
Anthony J. Thibault
fe69f58174 Bug fix centerLimit rot for LeftArm, also, lower arms in centerLimit pose 
Lowering the arms in centerLimit poses will help keep the elbows relaxed on the side of the body.
 2017-05-09 09:47:26 -07:00
volansystech
34edc2345c Bug 4255: When you are in HMD and you go to file menu quit, it crashes and you have no menus when you come back. 
Fixed NPE of buttonProxy while doing addButtonProxyToQmlTablet on quitting the application.
 2017-05-09 22:07:32 +05:30
Seth Alves
1e1968357a Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-09 09:24:50 -07:00
Andrew Meadows
e92e710cdc Merge pull request #10413 from humbletim/fix_lookat_regression 
Fix lookAt eye snapping
 2017-05-09 08:51:10 -07:00
Vladyslav Stelmakhovskyi
7ab6909c77 Merge branch 'master' into audio-source-sync 2017-05-09 11:08:08 +02:00
Seth Alves
4816e4f826 what does VS mean when it uses words? 2017-05-08 21:39:41 -07:00
humbletim
29b1ac3572 optimizations per feedback 2017-05-08 21:50:24 -04:00
humbletim
68ca0d921e use assert rather than whole if block 2017-05-08 21:34:55 -04:00
Andrew Meadows
2835a73c6b Merge pull request #10071 from AndrewMeadows/walk-up-steps 
avatar can walk up steps
 2017-05-08 18:17:16 -07:00
Anthony J. Thibault
5a4b21c0a9 Removed debug code 2017-05-08 18:10:56 -07:00
Anthony J. Thibault
84aa86b464 Added animVar support for IK solutionSource. 2017-05-08 18:07:45 -07:00
samcake
bbb513220b Moving forward 2017-05-08 17:33:24 -07:00
Zach Pomerantz
73a3bf413b update local audio thread name 2017-05-08 20:14:09 -04:00
Zach Pomerantz
b6f652e0ea use network period multiple for local audio buffer 2017-05-08 20:05:14 -04:00
Seth Alves
55056e730a guard slider and cone-twist constraints against zero-length axisq 2017-05-08 17:02:37 -07:00
Zach Pomerantz
defc3c1c4f Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join 2017-05-08 19:55:10 -04:00
Seth Alves
f8cab08b19 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-08 16:37:19 -07:00
Seth Alves
de589a32f3 clone spring action into one called tractor and use tractor is most places. this frees us to fix the math in spring so that it's actually a spring 2017-05-08 16:36:51 -07:00
humbletim
ef0e32643d update refactored logic to match previous application behavior 2017-05-08 18:53:47 -04:00
Seth Alves
1346ce22b9 don't crash if imported entities make a reference to an unknown entity 2017-05-08 15:51:25 -07:00
Seth Alves
94dfbc81f3 entity export/import involving constraints now works 2017-05-08 15:44:31 -07:00
Anthony J. Thibault
2166d8c159 Added setSolutionSource to AnimInverseKinematics node. 2017-05-08 15:06:31 -07:00
Anthony J. Thibault
712fcbe27a Removed cruft/debug code & comments 2017-05-08 15:06:30 -07:00
Anthony J. Thibault
7af93f9fea Hooked up IK constraint rendering 2017-05-08 15:06:29 -07:00
Anthony J. Thibault
e992d6703a WIP: debug render joint constraints. 2017-05-08 15:06:28 -07:00
Anthony J. Thibault
a260163aee WIP commit, first pass at generating limit center joints + debug draw 2017-05-08 15:06:27 -07:00
Andrew Meadows
13186dcb78 replace tab characer r with spaces 2017-05-08 14:28:08 -07:00
Andrew Meadows
e44c2c8da3 init zero gravity to agree with init hover state 2017-05-08 12:47:32 -07:00
Thijs Wenker
5aed960c4c Merge pull request #10389 from AndrewMeadows/render-collision-shapes-002 
fix render of debug collision shapes
 2017-05-08 20:35:59 +02:00
Brad Hefta-Gaub
d52daf3445 Merge pull request #10378 from samcake/orange 
Adding a test to protect Uniform Buffer binding at wrong slot
 2017-05-08 11:16:56 -07:00
Vladyslav Stelmakhovskyi
d0111ac0bb Merge branch 'master' into audio-source-sync 2017-05-08 20:09:34 +02:00
Seth Alves
c8cdad5b4e Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-08 11:02:42 -07:00
Seth Alves
fd238f5438 working on fixing action/constraint export/import 2017-05-08 11:02:35 -07:00
Andrew Meadows
d9e893ac21 minior optimization/cleanup 2017-05-08 11:02:11 -07:00
Andrew Meadows
0f643b7d66 add check to avoid divide by zero 2017-05-08 10:59:15 -07:00
Andrew Meadows
f00a3cafb6 cleanup logic to be more readable 2017-05-08 10:52:54 -07:00
Chris Collins
4bfb23b5d2 Merge pull request #10388 from humbletim/21308 
CR #21308 Fix Script.print
 2017-05-08 10:46:49 -07:00
Chris Collins
1264c34f6c Merge pull request #10349 from birarda/machine-guid-fingerprint 
use MachineGuid for slightly safer windows machine fingerprint
 2017-05-08 10:42:14 -07:00
Chris Collins
0351ac1575 Merge pull request #10401 from jherico/fix_benny_hill_animations 
Fix sped up animations
 2017-05-08 09:11:23 -07:00
Chris Collins
b4118e5619 Merge pull request #10394 from zzmp/fix/local-audio-prep 
Guard against local audio crashes
 2017-05-08 09:04:41 -07:00
Sam Cake
d3724116d9 Using the items to pick the key light! 2017-05-08 00:20:20 -07:00
Seth Alves
7a1a9d6496 start on code to remap constraint IDs during import 2017-05-07 19:42:04 -07:00
Brad Davis
b63015eaea Fix sped up animations 2017-05-06 14:34:28 -07:00
Seth Alves
5d539bcc17 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-06 07:49:02 -07:00
samcake
b6c966ef39 Keep iterating on the zones 2017-05-05 18:07:21 -07:00
Chris Collins
820ed5049b Merge pull request #10365 from sethalves/fix-dont-send-non-entity-edits-over-wire 
Fix -- dont send non-entity edits to entity-server
 2017-05-05 16:37:27 -07:00
samcake
bc1e5101ac Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2017-05-05 16:13:51 -07:00
Zach Pomerantz
7db404eba0 recast avoid overwriting buffer logic 2017-05-05 18:16:48 -04:00
Zach Pomerantz
ed3fc004a6 avoid assignment-as-test 2017-05-05 18:15:56 -04:00
Seth Alves
b2ccc33a79 Merge branch 'master' of github.com:highfidelity/hifi into motor-action 2017-05-05 14:52:07 -07:00
Clément Brisset
479e810173 Merge pull request #10364 from huffman/fix/ktx-skybox-loading 
Fix progressive loading of KTX skybox textures
 2017-05-05 14:11:03 -07:00
Zach Pomerantz
48af83a960 guard against audio injector and local buffer datarace 2017-05-05 17:05:40 -04:00
Zach Pomerantz
cdf6c332a6 prevent overflow of local injectors buffer 2017-05-05 16:29:52 -04:00
Zach Pomerantz
e882e7b648 rm extra lock in audio read 2017-05-05 15:37:01 -04:00