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
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
Andrew Meadows
e446d0f8c9
Merge pull request #10473 from huffman/fix/model-mesh-parts-assert
...
Remove unnecessary assert in Model.cpp
2017-05-16 15:29:22 -07:00
anshuman64
b36fb81524
Merge pull request #10475 from highfidelity/viveChange
...
Change Puck Calibration Time from 2 sec to 1 sec
2017-05-16 13:58:18 -07:00
Anshuman Dewangan
e3cd85bd22
Changed calibration time from 2 to 1 sec
2017-05-16 13:55:04 -07:00
Zach Fox
e0dd047263
Merge pull request #10472 from zfox23/snapshot_fixSnapshotDeletion
...
Snapshots: Fix case when user story would be incorrectly deleted
2017-05-16 12:54:10 -07:00
Zach Fox
aa0394c2ef
Fix case when user stories would be incorrectly deleted
2017-05-16 11:07:03 -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
Andrew Meadows
9a4b624029
Merge pull request #10464 from zfox23/fixIdentityUpdatedAt_FINAL_REAL_V2
...
Implement PR10462 correctly & fix identity packet bugs again
2017-05-15 17:50:58 -07:00
Zach Fox
bc1e97032a
Thanks to Andrew!
2017-05-15 17:39:19 -07: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
Sam Gateau
1e42878d7f
Merge pull request #10460 from samcake/orange
...
Fix the default skybox texture
2017-05-15 13:38:41 -07:00
samcake
0b393c845a
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-05-15 13:38:03 -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
8ff8d70f84
Merge pull request #10457 from vladest/sit-script-crash
...
Fix crash in sit script
2017-05-15 11:07:37 -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
samcake
b627fe463b
Generate correct KTX for the default Sky
2017-05-15 10:50:10 -07: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
Philip Rosedale
6e82343b29
Merge pull request #10406 from amvmoody/21289
...
21289 - Edit: Add the ability to duplicate an object with hand controller
2017-05-13 20:43:52 -07:00
Vladyslav Stelmakhovskyi
cc10fc81b7
Fix crash in sit script
2017-05-13 20:57:04 +02:00
Brad Hefta-Gaub
ed7a63c89c
Merge pull request #10451 from druiz17/puck-lost-tracking
...
Better handing when the pucks lose tracking and openvr still send you a "valid" data
2017-05-13 10:20:42 -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
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
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
Dante Ruiz
e6020e0137
added lookup table for tracking result and configs
2017-05-13 00:40:07 +01:00
Brad Hefta-Gaub
bffa3185d0
Merge pull request #10402 from MrRoboman/W-21305-floating-lanterns
...
added floating lantern box that spawns floating lanterns
2017-05-12 15:57:03 -07:00
Dante Ruiz
052126bdd2
Merge branch 'master' of github.com:highfidelity/hifi into puck-lost-tracking
2017-05-12 23:39:43 +01:00
Rob Kayson
9fc0ad0d28
fix indent floatingLanternBox
2017-05-12 15:12:43 -07:00
Rob Kayson
f3d8d1641f
fix indent createFloatingLanternBox.js
2017-05-12 15:10:40 -07:00
Rob Kayson
a12e8e34db
coding standard
2017-05-12 15:06:22 -07: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
Thijs Wenker
abd7f201b0
Merge pull request #10453 from zfox23/Snapshot_FixTweetText
...
Fix the Twitter @mention reference
2017-05-12 21:42:18 +02:00
Zach Fox
d189f3f110
Fix the twitter mention
2017-05-12 12:39:10 -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
8ce31ccc89
Merge pull request #10385 from SimHacker/21280
...
Implemented chat interface script and tablet web page for worklist #21280
2017-05-12 12:29:40 -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
