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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Brad Davis
|
63b3b7250d
|
Restore correct pipeline shader slot setup
|
2016-11-29 14:02:58 -08:00 |
|
Brad Davis
|
a98e49c892
|
Fix build errors
|
2016-11-29 14:02:15 -08:00 |
|
Brad Davis
|
3b07e31eab
|
Working on OpenGL debuggability
|
2016-11-29 13:15:56 -08:00 |
|
Ryan Jones
|
01ae2b9452
|
add errant semicolon
|
2016-11-29 11:56:11 -08:00 |
|
Ryan Jones
|
251b070db3
|
add unit test
|
2016-11-29 11:50:11 -08:00 |
|
Brad Hefta-Gaub
|
881e0cba11
|
Merge pull request #9117 from samcake/red
Potentially address the crash when no vertex format is specified
|
2016-11-29 09:23:43 -08:00 |
|
Ryan Jones
|
a59df5b04d
|
one last indentation fix
|
2016-11-28 17:19:43 -08:00 |
|
Ryan Jones
|
3961dbcf55
|
revert changes to dev utils, apply changes to system utils
|
2016-11-28 17:18:31 -08:00 |
|
Ryan Jones
|
68e86da023
|
adjust indentation and implement editorconfig at root of repo
|
2016-11-28 17:10:59 -08:00 |
|
Ryan Jones
|
4be1922df5
|
add bind polyfill
|
2016-11-28 14:47:15 -08:00 |
|
Howard Stearns
|
030f0d7103
|
Merge pull request #9114 from howard-stearns/bubble-state
bubble state
|
2016-11-28 12:16:39 -08:00 |
|
samcake
|
803a399bb6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into red
|
2016-11-28 11:58:17 -08:00 |
|
Brad Hefta-Gaub
|
6f0377eda0
|
Merge pull request #9113 from hyperlogic/feature/neuron-prefs
Added preferences for the Perception Neuron plugin.
|
2016-11-28 08:58:00 -08:00 |
|
David Kelly
|
1b26d51292
|
Merge pull request #9110 from howard-stearns/capture-original-location-in-snapshots
Capture original location in snapshots
|
2016-11-28 08:55:47 -08:00 |
|