Seth Alves
|
40c8261111
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
|
2017-05-19 17:14:58 -07:00 |
|
Seth Alves
|
5c94147f40
|
children collision hulls appear to be in the right place, now
|
2017-05-19 17:09:42 -07:00 |
|
Chris Collins
|
22aca527af
|
Merge pull request #10516 from zfox23/incrementAgentIdentitySequenceId
Increment _identitySequenceId before sending ID packet for agents
|
2017-05-19 17:04:37 -07:00 |
|
Zach Fox
|
487319f7ef
|
Increment _identitySequenceId before sending ID packet for agents
|
2017-05-19 16:53:25 -07:00 |
|
Clément Brisset
|
fa3ef25f3e
|
Merge pull request #10481 from marko8904/new_landing_in_welcome
changing the location in welcome to which a user is sent on the first run
|
2017-05-19 16:45:14 -07:00 |
|
Ryan Huffman
|
daff53aefb
|
Merge pull request #10505 from huffman/feat/tutorial-update-skybox
Update content set URL for RC40
|
2017-05-19 15:32:27 -07:00 |
|
Seth Alves
|
67f222cb3f
|
be more careful about fixing up entities which arrived before their parents
|
2017-05-19 15:19:16 -07:00 |
|
Ryan Huffman
|
26247e8653
|
Add check for valid mutableData in assignMipData
|
2017-05-19 15:00:53 -07:00 |
|
Seth Alves
|
386c76545c
|
be more careful about fixing up entities which arrived before their parents
|
2017-05-19 14:21:05 -07:00 |
|
Seth Alves
|
54dafa0f83
|
be more careful about fixing up entities which arrived before their parents
|
2017-05-19 14:14:00 -07:00 |
|
Seth Alves
|
5c93dbd20d
|
be more careful about fixing up entities which arrived before their parents
|
2017-05-19 13:48:29 -07:00 |
|
Seth Alves
|
936d0e2d50
|
be more careful about fixing up entities which arrived before their parents
|
2017-05-19 12:13:43 -07:00 |
|
Zach Fox
|
5e8f120138
|
Merge pull request #10510 from zfox23/snapshots_ImproveUploadRobustness
Ensure snapshots without story_ids get uploaded
|
2017-05-19 11:57:21 -07:00 |
|
Ryan Huffman
|
64bf5784e6
|
Fix FileStorage to not close files after they are opened
This is particularly an issue with KTX file reading/writing where we do
both concurrently.
|
2017-05-19 11:16:20 -07:00 |
|
Ryan Huffman
|
c36b85bb05
|
Add notes to KtxStorage::maybeOpenFile
|
2017-05-19 11:11:00 -07:00 |
|
Seth Alves
|
735e4b7d05
|
trying to get child collision hulls to be in the right place after import
|
2017-05-19 10:59:59 -07:00 |
|
Seth Alves
|
7220fe0ad8
|
set more physics flags dirty when an entity parent is found
|
2017-05-19 10:40:24 -07:00 |
|
Zach Fox
|
6765451cc8
|
Ensure snapshots without story_ids get uploaded
|
2017-05-19 10:36:31 -07:00 |
|
Marko Kudjerski
|
986d63cdbb
|
making sure that the first time landing in *welcome domain is updated for dev builds too
|
2017-05-19 10:17:02 -07:00 |
|
Marko Kudjerski
|
303bb05b3d
|
changing the location in welcome to which a user is sent on the first run
|
2017-05-19 10:17:02 -07:00 |
|
Seth Alves
|
77ce8a19cf
|
call entityChanged after settings flags
|
2017-05-19 10:11:02 -07:00 |
|
Seth Alves
|
0c12baa258
|
call entityChanged after settings flags
|
2017-05-19 09:57:42 -07:00 |
|
Seth Alves
|
99dfd9ded1
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
|
2017-05-19 08:26:02 -07:00 |
|
Chris Collins
|
76a025aade
|
Merge pull request #10507 from Atlante45/merge-back
Merge Stable back into master
|
2017-05-19 06:58:10 -07:00 |
|
Atlante45
|
ee9b98ffd7
|
Merge branch 'stable' of https://github.com/highfidelity/hifi
|
2017-05-18 17:11:45 -07:00 |
|
Ryan Huffman
|
eb9acad42e
|
Update content set URL for RC40
|
2017-05-18 16:36:01 -07:00 |
|
Zach Fox
|
48200fbd07
|
Merge pull request #10501 from zfox23/snapshots_disableWhileProcessing
Prevent another GIF from being captured while one is processing
|
2017-05-18 15:53:57 -07:00 |
|
Ryan Huffman
|
72af4219b8
|
Merge pull request #10499 from huffman/fix/ktx-progressive-image-size
Fix ktx image size in progrssively loaded cubemaps
|
2017-05-18 15:26:52 -07:00 |
|
Seth Alves
|
4007133423
|
collision hulls are still not always in the right place
|
2017-05-18 14:59:26 -07:00 |
|
Chris Collins
|
625bcdfd7e
|
Merge pull request #10498 from highfidelity/RC-39.3-HOTFIX
Build 39.3 Hotfix for T-Pose avatars
|
2017-05-18 14:57:57 -07:00 |
|
Seth Alves
|
1b0eeb9c2c
|
try harder to put things in place when their parent entities are discovered
|
2017-05-18 14:35:39 -07:00 |
|
Zach Fox
|
8efac1e7f1
|
Prevent another GIF from being captured while one is processing
|
2017-05-18 14:30:08 -07:00 |
|
Zach Pomerantz
|
c5a0a1af2f
|
Merge pull request #10429 from zzmp/audio/close-device
Close audio device when switching outputs
|
2017-05-18 17:18:53 -04:00 |
|
Clément Brisset
|
55b5f08714
|
Merge pull request #10465 from Atlante45/fix/domain-settings
Fix domain settings not getting cleared on re-assignment
|
2017-05-18 14:16:35 -07:00 |
|
Seth Alves
|
ef556fae9b
|
when an entity's parent wasn't known and then becomes known, patch up the rigid-body and the render-item bounds
|
2017-05-18 14:13:33 -07:00 |
|
Seth Alves
|
f35796259b
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
|
2017-05-18 13:20:50 -07:00 |
|
Seth Alves
|
ec02887ae6
|
attempt to get imported entities into the correct octree-element
|
2017-05-18 13:20:44 -07:00 |
|
David Kelly
|
df5928c04a
|
remove clockSkew, reference new version for Avatar packets
|
2017-05-18 11:47:53 -07:00 |
|
David Kelly
|
1fcf3b3a5f
|
Switch from timestamp to sequence id for avatar identity
|
2017-05-18 11:47:44 -07:00 |
|
Zach Fox
|
8213a1b280
|
First pass - checking performance
|
2017-05-18 11:47:27 -07:00 |
|
howard-stearns
|
7ec073dce4
|
Ensure avatar identity packet at mixer.
|
2017-05-18 11:47:07 -07:00 |
|
Ryan Huffman
|
6d2d838510
|
Fix ktx image size in progrssively loaded cubemaps
The size being written was the full image size (size of all faces), when
it should have been the face size.
|
2017-05-18 11:46:14 -07:00 |
|
David Kelly
|
c2b140cc03
|
Merge pull request #10489 from davidkelly/dk/sequenceNumberForAvatarIdentity
Switch from timestamp to sequence id for avatar identity
|
2017-05-18 10:09:42 -07:00 |
|
Seth Alves
|
b8567e0550
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox
|
2017-05-18 09:10:58 -07:00 |
|
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 |
|
Chris Collins
|
9dcb3a3845
|
Merge pull request #10495 from highfidelity/RC-39.2-Hotfix
Build 39.1 Hotfix for 30 second wifi check causing an issue with Audio
|
2017-05-18 05:39:44 -07: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 |
|
Brad Hefta-Gaub
|
e0b264cfd5
|
Merge pull request #10494 from sethalves/fix-nana
fix nan
|
2017-05-17 21:22:17 -07:00 |
|
Stephen Birarda
|
00fb328f2f
|
set wireless scan interval to -1
|
2017-05-17 21:07:57 -07:00 |
|
Seth Alves
|
b05cb4af3b
|
fix nan
|
2017-05-17 20:51:34 -07:00 |
|