David Kelly
c40aadfea4
whitespace
2016-12-05 17:13:12 -08:00
David Kelly
296d9b1ddf
Merge branch 'dk/machineFingerprint' of https://github.com/davidkelly/hifi into dk/machineFingerprint
2016-12-05 17:10:19 -08:00
David Kelly
7880b5bfe0
Simple fallback now
...
If the bios uuid isn't a valid UUID (on mac or windows it 'should be`)
then we read the fallback from the settings and use that, or create and
write one to the settings if it is missing.
2016-12-05 17:05:39 -08:00
David Kelly
4d0f2c1ebb
annoying whitespace
2016-12-05 11:45:36 -08:00
David Kelly
54716f70e5
Now works on mac, small build change for that
...
Plus does nothing for linux, but there's a comment.
2016-12-05 11:11:30 -08:00
David Kelly
643353a31e
Initial push
...
Works on windows, have not tried it on mac. Lots more to do, but
need to get it pushed to remote just in case.
2016-12-02 15:46:20 -08:00
samcake
acdce95bba
Merge pull request #9140 from jherico/polyline_threading_fix
...
Possible polyline crash fix
2016-12-02 14:16:14 -08:00
Chris Collins
6cb85e92b1
Merge pull request #9136 from samcake/hdr
...
Fix a crash if current shader is null
2016-12-02 09:14:07 -08:00
Brad Davis
12ccbdac0b
Actually render polylines
2016-12-01 19:46:08 -08:00
Seth Alves
8fe7c3156a
Merge pull request #9138 from hyperlogic/bug-fix/3dsmax-fbx-reader-fixes
...
Support for the 3ds Max object offset feature
2016-12-01 19:39:05 -08:00
Brad Hefta-Gaub
934148fea5
Merge pull request #9141 from hyperlogic/feature/my-avatar-docs-part-1
...
Added jsdocs for MyAvatar
2016-12-01 18:11:25 -08:00
Anthony J. Thibault
35eeaad590
Added jsdocs for MyAvatar
...
Not complete by any means, but it's a start.
2016-12-01 17:38:43 -08:00
Seth Alves
d2b32c3084
Merge pull request #9057 from druiz17/childParent
...
fixed children of parent object not being added back when performing an undo
2016-12-01 16:59:06 -08:00
Anthony J. Thibault
68b103b46b
Fix for missing fields in static initializer.
2016-12-01 15:21:49 -08:00
Zach Fox
30dade242c
GIFs: Quality improvements; duration tweaks; processing notif ( #9139 )
2016-12-01 14:53:18 -08:00
Dante Ruiz
348c0c95e5
conforming to coding standard and better variable naming
2016-12-01 22:22:17 +00:00
Brad Davis
5bade2ef9a
Add locking around the code that reads polyline entity data and builds GPU structures for them
2016-12-01 14:14:17 -08:00
Seth Alves
24e54f25bf
Merge pull request #9108 from PhilipRosedale/drifting
...
Grab.js weaker at a distance
2016-12-01 12:59:28 -08:00
Philip Rosedale
c60b0c7ef5
Fix indents
2016-12-01 12:54:38 -08:00
Chris Collins
942850293e
Merge pull request #9105 from druiz17/teleportBug
...
Fix for unable to teleport to areas that you should
2016-12-01 11:35:06 -08:00
Seth Alves
efe9571ab8
Merge pull request #8691 from highfidelity/out-of-body-experience
...
Room Scale HMD comfort features.
2016-12-01 11:09:39 -08:00
Dante Ruiz
a35f28725b
fixed child not commit back when performing undo
2016-12-01 10:54:26 -08:00
Dante Ruiz
3c1d434449
fixed typo
2016-12-01 10:54:26 -08:00
Dante Ruiz
0c9cd5803a
added descendant checking
2016-12-01 10:54:26 -08:00
Dante Ruiz
c52f893273
isChildOfParent
2016-12-01 10:54:26 -08:00
Dante Ruiz
cb0e01bfa4
fixed child of parent not being added when performing an undo
2016-12-01 10:54:26 -08:00
samcake
ff39ec6753
fix a potential crash if the current shaderObject is null
2016-12-01 10:51:32 -08:00
Andrew Meadows
2bbe2be516
fix spelling: physcis --> physics
2016-12-01 10:50:10 -08:00
Andrew Meadows
ae699e2a65
add initializer for member variable
2016-12-01 10:41:40 -08:00
Andrew Meadows
445c730ca3
remove cruft, fix formatting and spelling
2016-12-01 10:38:13 -08:00
Andrew Meadows
333e9ec7f4
Merge pull request #9128 from Polyrhythm/ryan/v3-and-shader-helpers
...
Vec3 and shader helpers
2016-12-01 10:32:34 -08:00
Chris Collins
19b5e7cd86
Merge pull request #9054 from howard-stearns/third-person-lasers
...
make hand-controller ui work in third person
2016-12-01 10:11:12 -08:00
Chris Collins
c0a0a16ff8
Merge pull request #9127 from huffman/fix/hand-controller-grab-release
...
Fix 'releaseGrab' not being called when using grip buttons
2016-12-01 09:58:36 -08:00
Brad Hefta-Gaub
e0bcbb08ff
Merge pull request #9134 from samcake/blue
...
Fix a bug when using the gpu::Batch::_glUniform*() calls with a bad location
2016-12-01 09:03:56 -08:00
sam
3d29187156
FIx a potential bug when using _glUniform calls with an invalid location
2016-12-01 02:44:04 -08:00
sam
6342762fde
FIx a potential bug when using _glUniform calls with an invalid location
2016-12-01 02:39:52 -08:00
Anthony J. Thibault
e96676fea4
Support for the 3ds Max object offset feature
...
FBXReader now supports the GeometricTranslation, GeometricRotation and GeometricScaling FBX fields.
These offsets are applied directly to the mesh vertices, as they are never animated and the rest of our
rendering and animation system would have difficulty supporting them otherwise.
2016-11-30 18:28:55 -08:00
Ryan Jones
7b0756c745
remove lerp in deference to mix, adjust naming conventions, namespace shader helper functions
2016-11-30 16:37:04 -08:00
Brad Hefta-Gaub
c9545ca920
Merge pull request #9129 from Atlante45/audio-dll
...
Select Audio DLL at runtime
2016-11-30 15:42:21 -08:00
samcake
c3db2704ed
Merge pull request #9126 from jherico/gl_debugging
...
Working on OpenGL debuggability
2016-11-30 10:51:58 -08:00
Dante Ruiz
1b20cc8bd0
more clean up
2016-11-30 18:28:50 +00:00
Dante Ruiz
104cbbff7e
clean up
2016-11-30 18:26:06 +00:00
Dante Ruiz
34d24b947e
better implementation
2016-11-30 18:03:11 +00:00
Anthony J. Thibault
7f840d3a08
Can use 'xboxLaser' in third person camera
2016-11-30 10:01:11 -08:00
Chris Collins
c2863f3413
Merge pull request #9120 from Polyrhythm/ryan/bind-polyfill
...
add bind polyfill and basic .editorconfig for indentation
2016-11-30 09:52:56 -08:00
Atlante45
db263df03e
Select Audio DLL at runtime
2016-11-29 19:42:59 -08:00
Anthony J. Thibault
78559934a1
Merge branch 'master' into third-person-lasers
2016-11-29 16:38:34 -08:00
Ryan Jones
fe774a8530
adjust whitespace
2016-11-29 15:41:50 -08:00
Ryan Jones
3ccc493871
add helpers for v3 and shaders
2016-11-29 15:40:20 -08:00
Ryan Huffman
aa1e813d72
Fix 'releaseGrab' not being called when using grip buttons
2016-11-29 15:04:14 -08:00
