Andrew Meadows
|
30d7ffb303
|
fix warning about signed unsigned compare
|
2017-03-08 17:17:49 -08:00 |
|
Dante Ruiz
|
2a275a4f4b
|
removed tab at the end of word
|
2017-03-09 00:15:02 +00:00 |
|
Andrew Meadows
|
5847f86db8
|
fix crash when unpacking too many joints
|
2017-03-08 16:12:03 -08:00 |
|
Dante Ruiz
|
b878f164fb
|
minimize diff again
|
2017-03-09 00:10:38 +00:00 |
|
Seth Alves
|
3d309f57d4
|
Merge pull request #9831 from sethalves/fix-3d-line-bounds
fix Line3DOverlays bound updates
|
2017-03-08 16:09:54 -08:00 |
|
Dante Ruiz
|
f6d799c048
|
minimize diff
|
2017-03-09 00:09:32 +00:00 |
|
Dante Ruiz
|
561bd27c38
|
minimize diff
|
2017-03-09 00:08:50 +00:00 |
|
Dante Ruiz
|
5f7a0ea8fc
|
Close tablet when switching form HMD to desktop and vice versa
|
2017-03-09 00:05:26 +00:00 |
|
Clément Brisset
|
52fb6ed4c9
|
Merge pull request #9837 from Atlante45/new-stable
Trivial PR to trigger build
|
2017-03-08 14:31:15 -08:00 |
|
Atlante45
|
a0befa7f95
|
Trivial PR to trigger build
|
2017-03-08 14:28:44 -08:00 |
|
Dante Ruiz
|
ce105e0329
|
fix double tablets when reloading scripts
|
2017-03-08 22:21:57 +00:00 |
|
Atlante45
|
97c376a09c
|
Revert "avoid unnecessary copy of priority_queue"
This reverts commit e54812430e.
|
2017-03-08 14:08:58 -08:00 |
|
Atlante45
|
50288bd4ba
|
Revert "remove unused variable"
This reverts commit 92a32b4651.
|
2017-03-08 14:08:56 -08:00 |
|
Atlante45
|
a68674adcc
|
Revert "remove unnecessary context brackets"
This reverts commit 0657ca1e5e.
|
2017-03-08 14:08:54 -08:00 |
|
Atlante45
|
188287e345
|
Revert "minor cleanup"
This reverts commit 14e7392a89.
|
2017-03-08 14:08:52 -08:00 |
|
Atlante45
|
9a9f07df71
|
Revert "expand avatar update time budget"
This reverts commit 4bbbcb61be.
|
2017-03-08 14:08:48 -08:00 |
|
Atlante45
|
8bf9b70915
|
Revert "don't blend animations for otherAvatars"
This reverts commit faa272c67c.
|
2017-03-08 14:08:33 -08:00 |
|
Dante Ruiz
|
881213259d
|
Merge branch 'master' of github.com:highfidelity/hifi into toolbar-window-dont-close
|
2017-03-08 21:44:20 +00:00 |
|
Dante Ruiz
|
59b4fa5fd7
|
Close toolbar windows when scripts are reloaded
|
2017-03-08 21:44:04 +00:00 |
|
Andrew Meadows
|
31fc50b38c
|
Merge pull request #9828 from kunalgosar/recorderFix
Fixed bug where recording sends you to (0, 0, 0)
|
2017-03-08 09:24:29 -08:00 |
|
Seth Alves
|
a67f8ac0ed
|
Merge pull request #9807 from Menithal/21166-remove-limit
#9761 Cloneable Improvement
|
2017-03-08 07:15:06 -08:00 |
|
Seth Alves
|
adc3581d63
|
remove override of locationChanged which was keeping the render-bounds of Line3DOverlays from updating during calls to editOverlay
|
2017-03-07 19:32:34 -08:00 |
|
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 |
|
kunalgosar
|
d2a2ba1846
|
Fixed recording bug
|
2017-03-07 17:19:21 -08:00 |
|
Thijs Wenker
|
097db9a7f9
|
- debug message removal (oops)
- smaller timer textbox, allows you to grab around the edges and still drag the toolbar
|
2017-03-08 01:41:20 +01:00 |
|
Thijs Wenker
|
b21bd3afa9
|
Make the time and slider follow the record.js toolbar
|
2017-03-08 01:14:11 +01:00 |
|
Thijs Wenker
|
6b26f5f3a3
|
Fix the timer display
|
2017-03-08 00:09:56 +01:00 |
|
Thijs Wenker
|
b954d5b0e9
|
stop the playback after the clip stopped playing rather than pause. Allows you to click play again without having to move the position back.
|
2017-03-08 00:08:57 +01:00 |
|
Thijs Wenker
|
b54d6cb0e1
|
stop avatar controller while playing back a recording, which makes it not collide anymore
|
2017-03-08 00:07:49 +01: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 |
|
Chris Collins
|
bb03e08e16
|
Merge pull request #9801 from highfidelity/RC-35
Beta Release 35 - Includes up to Developer Release 6106
|
2017-03-07 11:04:21 -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 |
|
Atlante45
|
c52c43e23d
|
Remove weighted offset, special case downward pressure
|
2017-03-07 06:28:25 -08: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 |
|