Zach Pomerantz
|
e4cba14333
|
Avoid recreating model items when adding to scene
|
2016-03-31 10:46:51 -07:00 |
|
Zach Pomerantz
|
377a20e983
|
Use default texs for empty json
|
2016-03-31 10:46:51 -07:00 |
|
Zach Pomerantz
|
984bacdae3
|
Rearrange model entity render to reduce flicker
|
2016-03-31 10:46:51 -07:00 |
|
Zach Pomerantz
|
3de5f73a1f
|
Fixup model on tex load
|
2016-03-31 10:46:51 -07:00 |
|
Brad Davis
|
b53968fd64
|
Add automatic switching the Oculus headphones and mic when activating the plugin
|
2016-03-31 10:33:11 -07:00 |
|
Andrew Meadows
|
74633ca8c8
|
Merge pull request #7522 from ZappoMan/optimizeFindZones
optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently
|
2016-03-31 10:14:32 -07:00 |
|
Seth Alves
|
cfa847ba54
|
don't put empty folders at end of scripts tree. allow /~/ to work from outside scripts
|
2016-03-31 09:45:28 -07:00 |
|
Seth Alves
|
8299041997
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-load-from-disk
|
2016-03-31 09:44:56 -07:00 |
|
Brad Hefta-Gaub
|
2e129a398f
|
add example script for testing
|
2016-03-31 09:37:03 -07:00 |
|
Brad Hefta-Gaub
|
03f9a2b46f
|
more optimization in find best zone
|
2016-03-31 09:36:51 -07:00 |
|
Brad Hefta-Gaub
|
a7f93aa75c
|
Merge pull request #7519 from zzmp/fix/avatar-crash
Fix crash from updating/resetting avatar
|
2016-03-30 21:31:17 -07:00 |
|
David Rowe
|
2ac9f282c7
|
Merge branch 'master' into 20855
|
2016-03-31 17:00:09 +13:00 |
|
Seth Alves
|
ae971c0f30
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-load-from-disk
|
2016-03-30 20:58:44 -07:00 |
|
David Rowe
|
31b96c75ca
|
Tidying
|
2016-03-31 16:53:03 +13:00 |
|
David Rowe
|
f584d4d00c
|
Style parent joint index property as a number
|
2016-03-31 16:49:11 +13:00 |
|
David Rowe
|
751a37a1ff
|
Arrange more properties in rows
|
2016-03-31 16:48:40 +13:00 |
|
Brad Hefta-Gaub
|
30cb62f1aa
|
Merge pull request #7517 from zzmp/fix/qml-renderer
Check for valid qml gl context creation
|
2016-03-30 19:52:03 -07:00 |
|
Brad Hefta-Gaub
|
b76f8509aa
|
Merge branch 'master' of https://github.com/highfidelity/hifi into optimizeFindZones
|
2016-03-30 19:29:28 -07:00 |
|
Brad Hefta-Gaub
|
32a90b4709
|
Merge pull request #7521 from sethalves/fix-load-from-disk
fix script load from disk on windows
|
2016-03-30 19:29:11 -07:00 |
|
Seth Alves
|
c3b95e8284
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-load-from-disk
|
2016-03-30 19:12:31 -07:00 |
|
David Rowe
|
13ab854a9d
|
Reduce space between collapsed sections
In settings dialogs as well as entities editor.
|
2016-03-31 15:02:16 +13:00 |
|
Brad Hefta-Gaub
|
28978c8adb
|
optimize checkEnterLeaveEntities() to do distance check and stationary checks less frequently
|
2016-03-30 17:49:30 -07:00 |
|
Brad Hefta-Gaub
|
f0cc8c0dd3
|
Merge pull request #7491 from jherico/oculus_release
Update to latest Oculus SDK, add input device support
|
2016-03-30 17:42:32 -07:00 |
|
Brad Hefta-Gaub
|
89d41c55ea
|
Merge pull request #7520 from hyperlogic/tony/octree-tests
OctreeTests: added unit tests for EntityTreeElement child accessors
|
2016-03-30 17:30:12 -07:00 |
|
Clément Brisset
|
be07426d5a
|
Merge pull request #7515 from birarda/console-to-sandbox
rename the Server Console to Sandbox
|
2016-03-30 17:29:15 -07:00 |
|
Seth Alves
|
651d2c8954
|
fix script load from disk on windows
|
2016-03-30 17:27:36 -07:00 |
|
David Rowe
|
382b05e00b
|
Make expand/collapse icon larger
|
2016-03-31 13:13:13 +13:00 |
|
Clément Brisset
|
14934678fc
|
Merge pull request #7513 from birarda/ice-server-lockup
use NetworkAccessManager in IceServer for single QNAM instance
|
2016-03-30 17:05:13 -07:00 |
|
Stephen Birarda
|
d8b0dbf3bf
|
fix indentation for last inactive check timestamp
|
2016-03-30 16:58:35 -07:00 |
|
Anthony Thibault
|
26b9469df5
|
Merge pull request #7516 from hyperlogic/tony/show-collision-geometry-crash-fix
Model: fix for crash when displaying collision mesh
|
2016-03-30 16:48:07 -07:00 |
|
David Rowe
|
4189f46156
|
Make input text color change to black when selected
|
2016-03-31 12:32:36 +13:00 |
|
David Rowe
|
ba43843340
|
Disable right-click context menu
|
2016-03-31 12:27:08 +13:00 |
|
Anthony J. Thibault
|
f4d834b07b
|
OctreeTests: added unit tests for EntityTreeElement child accessors
|
2016-03-30 16:15:29 -07:00 |
|
Seth Alves
|
d9909fb7da
|
Merge pull request #7518 from hyperlogic/tony/model-hand-grab-fix
Model: Fix for equipped models not updating their matrices
|
2016-03-30 16:10:21 -07:00 |
|
samcake
|
c13e24438c
|
Merge pull request #7512 from zzmp/fix/light-buf-fmt
Correctly represent lighting framebuffer
|
2016-03-30 16:10:10 -07:00 |
|
Zach Pomerantz
|
6e0d6ee45b
|
Guard updateClusterMatrices from unloaded geo
|
2016-03-30 16:04:00 -07:00 |
|
Zach Pomerantz
|
00db095306
|
Guard against reset model geo on scene update
|
2016-03-30 15:49:45 -07:00 |
|
Brad Hefta-Gaub
|
84bbeef72b
|
Merge pull request #7511 from zzmp/guard/gl
Add GL checks
|
2016-03-30 15:47:16 -07:00 |
|
Brad Hefta-Gaub
|
eb61a4fee9
|
Merge pull request #7514 from zzmp/guard/model-tex
Add lock on model texs
|
2016-03-30 15:46:52 -07:00 |
|
Brad Hefta-Gaub
|
4a1e82892a
|
Merge pull request #7494 from sethalves/use-local-scripts
Use local scripts
|
2016-03-30 15:46:32 -07:00 |
|
Brad Hefta-Gaub
|
2381ab1cba
|
Merge pull request #7496 from kencooke/master
make self-reverb depend on wetDryMix
|
2016-03-30 15:44:20 -07:00 |
|
Brad Hefta-Gaub
|
e31546e172
|
Merge pull request #7509 from samcake/orange
Avoid the spot lights flickering in Home
|
2016-03-30 15:44:08 -07:00 |
|
Zach Pomerantz
|
02273e067a
|
Add GL checks
|
2016-03-30 15:20:21 -07:00 |
|
Anthony J. Thibault
|
f6344c34e7
|
Model: Fix for equipped models not updating their matrices
|
2016-03-30 15:19:35 -07:00 |
|
Zach Pomerantz
|
530cb40528
|
Check for valid qml gl context creation
|
2016-03-30 15:11:54 -07:00 |
|
samcake
|
6213e0859d
|
Expose to counters fro drawcalls, one for the API drawcalls and the other for gpu drawcalls spawned
|
2016-03-30 15:07:45 -07:00 |
|
Seth Alves
|
92981a6660
|
Merge pull request #7503 from sethalves/lock-tree-before-moving-av-children
lock entity-tree before moving entity-children of avatars
|
2016-03-30 15:05:38 -07:00 |
|
Seth Alves
|
e8f26b675a
|
try to fix path to osx scripts
|
2016-03-30 15:04:29 -07:00 |
|
Zach Pomerantz
|
01db2be6b8
|
Avoid JSON parsing texs every render cycle
|
2016-03-30 14:48:57 -07:00 |
|
Stephen Birarda
|
b6853a0679
|
fix packaged server console folder for OS X
|
2016-03-30 14:47:40 -07:00 |
|