Brad Hefta-Gaub
|
d7c3677b22
|
add example
|
2017-03-07 17:55:03 -08:00 |
|
Brad Hefta-Gaub
|
8ae6f2727d
|
add support for double click messages to overlays and entities
|
2017-03-07 17:52:55 -08:00 |
|
Brad Hefta-Gaub
|
1e51ae62b1
|
Merge pull request #9804 from jherico/oculus_update
Update Oculus SDK to 1.11
|
2017-03-07 15:00:44 -08:00 |
|
Seth Alves
|
71c2b4215d
|
Merge pull request #9811 from ZappoMan/triangleSet
Cleanup how Models do ray-picking and determination of point inside of convex hull
|
2017-03-07 14:12:56 -08:00 |
|
Thijs Wenker
|
d2c3b0b706
|
Fix coding standards link
|
2017-03-07 22:37:54 +01:00 |
|
Seth Alves
|
cd91d6ff3c
|
Merge pull request #9824 from sethalves/fix-tablet-qml-overlay-in-hmd
fix -- restore missing shading pipeline for simple opaque in deferred
|
2017-03-07 13:25:44 -08:00 |
|
Ryan Huffman
|
a744e0d11c
|
Merge pull request #9685 from humbletim/21114-part2
CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions
|
2017-03-07 13:25:25 -08:00 |
|
Howard Stearns
|
2b117407d4
|
Merge pull request #9805 from howard-stearns/fix-ban-remove-from-pal
fix 'banned user doesn't disappear from pal until refresh'
|
2017-03-07 12:27:41 -08:00 |
|
Brad Hefta-Gaub
|
f7e824e47c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet
|
2017-03-07 12:18:36 -08:00 |
|
howard-stearns
|
cb41b9135b
|
fix broken merge
|
2017-03-07 12:10:52 -08:00 |
|
Seth Alves
|
694fc58374
|
restore missing shading pipeline for simple opaque in deferred
|
2017-03-07 12:07:24 -08:00 |
|
howard-stearns
|
8a489f36f4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-ban-remove-from-pal
|
2017-03-07 10:49:53 -08:00 |
|
Andrew Meadows
|
1e9623e2f2
|
Merge pull request #9813 from druiz17/multipule-audio-fix
removed duplicated audio devices
|
2017-03-07 10:00:48 -08:00 |
|
Brad Hefta-Gaub
|
d8b7076a9e
|
Merge pull request #9816 from AndrewMeadows/sphere-means-sphere
ModelEntityItems that use 'sphere' for shapeType should collide as true spheres
|
2017-03-07 09:53:52 -08:00 |
|
Howard Stearns
|
f0fd29abd3
|
Merge pull request #9815 from davidkelly/dk/3377
Retain selection in PAL when sorting or reloading
|
2017-03-07 09:38:07 -08:00 |
|
Brad Hefta-Gaub
|
69a8ea99ca
|
Merge pull request #9823 from vladest/qml_js_in_qtcreator
Adding ability for QML/JS file to be visible in QtCreator. Also chang…
|
2017-03-07 09:20:51 -08:00 |
|
David Kelly
|
b760e86226
|
rest of cr feedback
|
2017-03-07 10:17:32 -07:00 |
|
David Kelly
|
c6dbfc85f0
|
cr feedback
|
2017-03-07 09:54:00 -07:00 |
|
Vladyslav Stelmakhovskyi
|
2d2b2094fd
|
Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination
|
2017-03-07 10:11:09 +01:00 |
|
Andrew Meadows
|
8c773483cf
|
Merge pull request #9820 from Atlante45/fix/avatar-lean
Fix avatar lean
|
2017-03-06 22:18:34 -08:00 |
|
Brad Hefta-Gaub
|
b111bcb826
|
Merge pull request #9818 from ctrlaltdavid/21205
Remove Developer > Network > Bandwith Details dialog
|
2017-03-06 22:02:33 -08:00 |
|
Brad Hefta-Gaub
|
87934ee82d
|
fix bugs in some meshes
|
2017-03-06 21:50:32 -08:00 |
|
Atlante45
|
ff9d6d657c
|
Remove weighted offset, special case downward pressure
|
2017-03-06 19:41:08 -08:00 |
|
David Rowe
|
51739f2f99
|
Remove Developer > Network > Bandwith Details dialog
|
2017-03-07 15:02:26 +13:00 |
|
Brad Davis
|
f9dcfa54aa
|
Add debug/release builds to oculus lib
|
2017-03-06 16:08:21 -08:00 |
|
Andrew Meadows
|
d749c0c8be
|
use fabsf() rather than fabs()
|
2017-03-06 15:50:32 -08:00 |
|
Andrew Meadows
|
10b3e7fc67
|
sphere shapeType for models means 'sphere'
|
2017-03-06 15:14:51 -08:00 |
|
David Kelly
|
3d39aae35b
|
minor tweak - just in case
|
2017-03-06 15:52:33 -07:00 |
|
David Kelly
|
f23f882595
|
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3377
|
2017-03-06 15:26:21 -07:00 |
|
David Kelly
|
e14a1ad1af
|
minor cleanup
|
2017-03-06 15:26:03 -07:00 |
|
David Kelly
|
db036d997c
|
first pass
|
2017-03-06 15:18:35 -07:00 |
|
Dante Ruiz
|
fc65723d68
|
corrected removing duplicate devices
|
2017-03-06 22:14:20 +00:00 |
|
Zach Fox
|
5223f872c1
|
Merge pull request #9753 from zfox23/FB_3234_TakeTwo
Optimize AvatarMixer with respect to Identity and Avatar Data
|
2017-03-06 13:37:29 -08:00 |
|
Andrew Meadows
|
1b8f6b9835
|
Merge pull request #9784 from samcake/blue
Fixing Emissive on overlay for models (opaque and transparent)
|
2017-03-06 13:24:00 -08:00 |
|
Brad Hefta-Gaub
|
f27475613f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet
|
2017-03-06 12:53:59 -08:00 |
|
samcake
|
21f36d7212
|
removing comments and restoring the correct behavior for Pal.js
|
2017-03-06 12:41:00 -08:00 |
|
Brad Hefta-Gaub
|
38668b6ce5
|
Merge pull request #9812 from sethalves/dont-auto-ungrab-overlays
don't automatically unhook overlays from hands unless they were grabbable overlays
|
2017-03-06 12:32:18 -08:00 |
|
Thijs Wenker
|
6ded937b25
|
Merge pull request #9809 from Menithal/21201
WL#21201 Snap-together Magnetic blocks
|
2017-03-06 21:30:53 +01:00 |
|
Seth Alves
|
a2d2c41f02
|
remove debug print
|
2017-03-06 11:45:49 -08:00 |
|
Menithal
|
01ba44c572
|
Fixed print
|
2017-03-06 21:32:27 +02:00 |
|
ZappoMan
|
faba160331
|
more CR feedback
|
2017-03-06 11:10:04 -08:00 |
|
Menithal
|
d50a0e33a9
|
CR. Run through Lint ECMAScript 5 standard
Meaning all const are out, non-variable definitions are out, etc
|
2017-03-06 21:07:16 +02:00 |
|
Andrew Meadows
|
6ea6477c73
|
Merge pull request #9683 from jherico/cache_flush
Clear caches on domain switch
|
2017-03-06 11:05:44 -08:00 |
|
howard-stearns
|
632cdc1b38
|
semicolons and whitespace per coding standard
|
2017-03-06 11:04:12 -08:00 |
|
ZappoMan
|
af97e9bdd9
|
CR feedback
|
2017-03-06 10:49:38 -08:00 |
|
Dante Ruiz
|
b6671d92c8
|
removed duplicated audio devices
|
2017-03-06 18:46:57 +00:00 |
|
Seth Alves
|
6ac576c9e6
|
Merge branch 'master' of github.com:highfidelity/hifi into dont-auto-ungrab-overlays
|
2017-03-06 10:43:43 -08:00 |
|
Seth Alves
|
19a31d7630
|
don't automatically unhook overlays from hands unless they were grabbable overlays
|
2017-03-06 10:15:53 -08:00 |
|
Zach Fox
|
0000b8fb21
|
OMG I think it's actually fully working
|
2017-03-06 10:03:42 -08:00 |
|
Zach Fox
|
685bd95105
|
I think I'm done. Not straightforward!
|
2017-03-06 10:03:42 -08:00 |
|