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
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
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
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
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
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
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
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
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
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
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
Zach Pomerantz
ca7cd61c64
Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join
2017-05-05 13:04:01 -04:00
Chris Collins
fd836dcd68
Merge pull request #10366 from Atlante45/feat/normal-map-compression
...
Feat/normal map compression
2017-05-05 10:03:01 -07:00
Andrew Meadows
2bfbb63906
remove unused variable
2017-05-05 09:37:01 -07:00
Andrew Meadows
8ed93783bd
fix step up velocity calculation
2017-05-05 09:37:01 -07:00
Andrew Meadows
cd7be46b70
tweak threshold for minimum stepheight
2017-05-05 09:37:01 -07:00
Andrew Meadows
6e8d90e3b6
restore clear of follow accumulators
2017-05-05 09:37:01 -07:00
Andrew Meadows
fe401c7488
improved management of collisionless avatar state
2017-05-05 09:37:00 -07:00
Andrew Meadows
95a4bb9ef4
fix transition height from hover to stand
2017-05-05 09:35:49 -07:00
Andrew Meadows
e449c48888
remove one more line of cruft
2017-05-05 09:35:49 -07:00
Andrew Meadows
d34b667e82
remove kinematic character controller implemention
2017-05-05 09:35:49 -07:00
Andrew Meadows
94ee6d6838
fix driving motion of collisionless avatars
2017-05-05 09:35:49 -07:00
Andrew Meadows
e21bd7a67a
help avatar walk up steps
2017-05-05 09:35:49 -07:00
Andrew Meadows
a31a861e19
fix typo: physcis --> physics
2017-05-05 09:33:50 -07:00
Seth Alves
7f4399b0a3
fix name in entity-edit-an-overlay warning
2017-05-04 19:16:15 -07:00
Seth Alves
92966377fb
Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 19:05:57 -07:00
Seth Alves
a7c684e007
entity scripting call to get the nestable-type of an object, by id
2017-05-04 19:05:29 -07:00
Seth Alves
51cb579773
function to turn nestable-type into a string
2017-05-04 19:05:01 -07:00
Seth Alves
d25db099b9
be more effecient about ignoring edits to unknown entities
2017-05-04 18:49:46 -07:00
Seth Alves
960bab6e4e
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 16:42:57 -07:00
humbletim
c17d1a6d88
manually promote glm values to double when stringifying (to prevent -Wdouble-promotion "error")
2017-05-04 19:21:32 -04:00
Stephen Birarda
1857b297e0
don't re-grab the machine fingerprint every DS connection
2017-05-04 16:00:46 -07:00
Stephen Birarda
f39411656a
use machine GUID from registry for machine ID
2017-05-04 16:00:46 -07:00
Clément Brisset
d80704bfbf
Merge pull request #10375 from Atlante45/feat/store-irradiance
...
Store irradiance in cached KTX files
2017-05-04 16:00:44 -07:00
Chris Collins
7c36dd3282
Merge pull request #10359 from samcake/ambient
...
Fixing the by region update transfer of the compressed texture
2017-05-04 15:52:38 -07:00
Chris Collins
98085b6d26
Merge pull request #10386 from ZappoMan/MyAvatarAttachmentsNotVisibleBug
...
fix issue with not seeing your own attachments
2017-05-04 15:51:46 -07:00
Chris Collins
7d1ffe181f
Merge pull request #10340 from huffman/fix/obj-atp
...
Fix OBJ material loading not working over ATP
2017-05-04 15:50:52 -07:00
Andrew Meadows
f11d6eff92
fix typos: RenderItemsMap not RenderItems
2017-05-04 15:43:44 -07:00
humbletim
f71552c648
* update Vec3.print, Quat.print, Mat4.print, ScriptUUID.print to work with JSConsole and HMD-friendly script log
...
* add test output for Quat-euler and Mat4-row/col prints
2017-05-04 18:33:49 -04:00
ZappoMan
43a177cf9a
CR feedback
2017-05-04 15:22:44 -07:00
Atlante45
ecda313223
Add runtime access to compression settings
2017-05-04 15:07:59 -07:00
ZappoMan
0e3b65abde
Merge branch 'master' of https://github.com/highfidelity/hifi into MyAvatarAttachmentsNotVisibleBug
2017-05-04 15:06:31 -07:00
Brad Davis
9def788956
Merge pull request #10314 from jherico/avatars-renderer
...
Migrate Avatar rendering code to library
2017-05-04 14:23:49 -07:00
Brad Davis
2d0bbf70ae
Migrate core avatar rendering functionality to library
2017-05-04 14:08:59 -07:00
humbletim
e765d8858c
update script engine to not treat about:* as a local filename; resolve debugPrint FIXME
2017-05-04 16:57:41 -04:00
Ryan Huffman
87a685c4f9
Fix OSX warning in TextureCache
2017-05-04 13:41:20 -07:00
Atlante45
f728ae7955
Remove unecessary normalize
2017-05-04 12:38:27 -07:00
Brad Davis
fb995bebf1
Prevent crash on switching to 3D display twice
2017-05-04 12:04:21 -07:00
Atlante45
542923839d
Change name to VEC2NU8_XY
2017-05-04 10:33:34 -07:00
Atlante45
10289f5423
Format non compressed normal maps to new format.
2017-05-04 10:33:34 -07:00
Atlante45
ea2b188b64
Recompute Y from X/Z for normal maps
2017-05-04 10:33:34 -07:00
samcake
389d9405f9
Showing the comments
2017-05-04 10:18:14 -07:00
samcake
3f977a6743
Add a simple check on the uniform buffer slot to make sure it s valid
2017-05-04 10:16:33 -07:00
Andrew Meadows
7cb2bff4c5
Merge pull request #10350 from sethalves/fix-vr-2d-vr-tablet-crash
...
Fix vr 2d vr tablet crash
2017-05-04 10:08:55 -07:00
Seth Alves
74a82f92df
return null uuid for failure
2017-05-04 10:05:17 -07:00
Seth Alves
9ab2a61a4b
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-04 10:04:18 -07:00
Seth Alves
19327ef5a7
Merge pull request #10354 from zzmp/fix/tablet-deadlock
...
Fix deadlock from accessing an initializing tablet
2017-05-04 09:52:50 -07:00
Seth Alves
9171995ed3
add a comment
2017-05-03 21:41:00 -07:00
Seth Alves
69944cc76d
add a way to get a SpatiallyNestable's name without knowing what its type is
2017-05-03 21:32:49 -07:00
Seth Alves
f61ca1c8ac
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-03 20:34:37 -07:00
Seth Alves
03f416ff4d
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-03 20:32:08 -07:00
Seth Alves
c693687927
react to very small vectors instead of just zero-length ones
2017-05-03 20:23:10 -07:00
Seth Alves
f867a8e718
guard against bad hinge-constraint settings
2017-05-03 20:12:42 -07:00
Atlante45
5e36bebc96
Store irradiance in the KTX files.
2017-05-03 19:46:17 -07:00
Seth Alves
0fff7678bf
code review
2017-05-03 19:07:46 -07:00
Seth Alves
a259d00b63
Merge pull request #10332 from sethalves/bullet-constraints-5
...
Bullet constraints
2017-05-03 16:30:34 -07:00
Seth Alves
c09009ad8b
Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire
2017-05-03 16:21:58 -07:00
samcake
26441dbf2f
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-03 14:54:11 -07:00
Sam Gateau
8507fffcc2
Merge pull request #10313 from samcake/ambient-bis
...
Fixing the the mip gpu copy for compressed format texture in GL41Backend
2017-05-03 14:50:55 -07:00
Seth Alves
e96c3e84b4
if a script attempts to edit a non-entity, don't send the edit packet over the wire
2017-05-03 13:58:49 -07:00
Chris Collins
c4c62e790b
Merge pull request #10341 from jherico/texture_transfer_crash
...
Prevent possible crash in texture buffering thread
2017-05-03 15:50:49 -05:00
trent
ca4b563768
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-05-03 16:34:34 -04:00
samcake
c583ffbac4
Clean up names and comments
2017-05-03 11:30:09 -07:00
Ryan Huffman
a886963e20
Fix refresh crash with ktx textures
2017-05-03 11:26:52 -07:00
Ryan Huffman
7999ed6f60
Fix Resource::refresh for NetworkTexture
2017-05-03 11:26:52 -07:00
Ryan Huffman
2c19c5f045
Fix KTX creation not handling invalid storage
2017-05-03 11:26:52 -07:00
Ryan Huffman
0263021c0c
Fix loaded being reset to false for KTX resources
2017-05-03 11:26:52 -07:00
Stephen Birarda
5d1abe4499
Merge pull request #10307 from huffman/fix/ktx-crash
...
Fix for resource downloads getting capped
2017-05-03 11:25:51 -07:00
samcake
84305c2049
Fixing the by region update of the compressed texture to match the 4 x 4 tiles alignment
2017-05-02 17:30:31 -07:00
trent
786838d092
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-05-02 20:21:35 -04:00
samcake
48eb30936e
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
2017-05-02 17:20:10 -07:00
samcake
0ecf599267
Adressing the warning
2017-05-02 17:19:22 -07:00
trent
557a8fffd7
Addressing some PR feedback; moved easeInEaseOut to Interpolate class. My function is faster than andrew's. :D
2017-05-02 19:56:47 -04:00
samcake
dc50db7ee5
One more warning from gcc
2017-05-02 16:27:28 -07:00
Zach Pomerantz
0353940d9e
decouple initialization from storage in Table.getTablet()
2017-05-02 17:49:40 -04:00
samcake
41f0b1682e
Fixing warnings too
2017-05-02 14:45:41 -07:00
Vladyslav Stelmakhovskyi
e789b69a8e
Merge branch 'master' into audio-source-sync
2017-05-02 20:57:01 +02:00
samcake
32d675c82b
Clean up the new code and adress review comments
2017-05-02 11:46:51 -07:00
trent
6d1fb8a6f8
Merge branch 'feature/snap-turn-smoothing-21270' of https://github.com/mittens/hifi into feature/snap-turn-smoothing-21270
2017-05-02 13:55:39 -04:00
trent
49881b5ea2
Actually the full set of changes. Kids: don't forget to pop your stash.
2017-05-02 13:55:32 -04:00
samcake
df54ad2339
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-02 10:50:39 -07:00
Trent Polack
8f93a9a074
Merge branch 'master' into feature/snap-turn-smoothing-21270
2017-05-02 13:43:32 -04:00
trent
8f34ec4c7f
Iteration on the snap-turn smoothing based on feedback from Andrew. Also additional cleanup.
2017-05-02 13:41:34 -04:00
Brad Davis
425405f72d
Merge pull request #10245 from AndrewMeadows/avatar-renderer-002
...
more cleanup in preparation for moving Avatar class to lib
2017-05-02 10:37:22 -07:00
samcake
e561a33b01
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
2017-05-02 09:52:09 -07:00
Seth Alves
b82a333a5e
Merge pull request #10196 from ZappoMan/poseFilters
...
support for input controller pose filters
2017-05-02 09:46:22 -07:00
Seth Alves
6b2caf8081
Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash
2017-05-02 09:41:47 -07:00
trent
6317857e3d
Merge branch 'master' of https://github.com/highfidelity/hifi into feature/snap-turn-smoothing-21270
2017-05-02 12:11:39 -04:00
Sam Cake
54ace01cd6
Factorizing the code on both 45 and 41 backend
2017-05-02 00:32:32 -07:00
samcake
8b62fad85e
TRying to test with sysmem and still doesn;t work
2017-05-01 18:19:07 -07:00
Seth Alves
71deac49c6
reset tablet to homescreen when going from 2d to vr
2017-05-01 17:06:15 -07:00
samcake
4514da2a09
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-01 16:49:35 -07:00
Seth Alves
45a50f9a46
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-5
2017-05-01 15:32:29 -07:00
Seth Alves
3ec3005c6d
code review
2017-05-01 15:32:17 -07:00
