Seth Alves
adaee0e62c
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-01-31 21:27:00 -08:00
Seth Alves
91e542a7a7
ModelScriptingInterface::meshToOBJ takes a list of MeshProxys instead of just one
2017-01-31 21:26:49 -08:00
Seth Alves
e7ec651bb1
Merge pull request #9576 from hyperlogic/bug-fix/tablet-ui-image-urls
...
tablet-ui: button icon images now work with http urls.
2017-01-31 21:03:05 -08:00
Chris Collins
42098edbeb
Merge pull request #9561 from thoys/entity-simulation-owner-fixes
...
Fix simulation owned entities not to go to origin after cache reload (+ small priority fix)
2017-01-31 20:54:52 -08:00
Chris Collins
8b94e64082
Merge pull request #9539 from huffman/feat/tealight-entity-server
...
Add tealight.js entity server script
2017-01-31 20:51:19 -08:00
Anthony J. Thibault
3c04f54e75
more fixes to third person tablet usage.
2017-01-31 18:22:38 -08:00
Anthony J. Thibault
008a58f9d7
Only reposition the tablet when camera mode changes, in HMD mode.
2017-01-31 18:03:48 -08:00
Anthony J. Thibault
c147b9bec0
Fix for tablets in third-person HMD mode.
2017-01-31 18:00:18 -08:00
Anthony J. Thibault
cf855391af
Added jsdocs for all button properties
2017-01-31 16:54:15 -08:00
Anthony J. Thibault
8f362861eb
tablet-ui: button icon images now work with http urls.
2017-01-31 16:53:25 -08:00
Seth Alves
9e8fcc0def
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-01-31 14:30:10 -08:00
Seth Alves
bb3155ee61
obj file is now produced in /tmp
2017-01-31 14:29:42 -08:00
Thijs Wenker
174a7ad5bd
Optimizations and style fixes from code review
2017-01-31 22:54:58 +01:00
Brad Hefta-Gaub
2fc6b4b0af
Merge pull request #9544 from humbletim/fix-rightclick-menu
...
Hide webview context menus when clicked
2017-01-31 13:03:50 -08:00
Thijs Wenker
3608998877
use dedicated bool rather than unreliable dirtyFlags to determine if the entityItem had ever bid for simulation ownership
2017-01-31 21:01:03 +01:00
Thijs Wenker
1a36d9a698
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-01-31 20:59:21 +01:00
samcake
04d5173328
Merge pull request #9530 from AndrewMeadows/computeBoundsOutsideLambda
...
compute Model's local bounds outside pending changes queue
2017-01-31 11:40:21 -08:00
Thijs Wenker
e445af74aa
Merge branch 'master' of https://github.com/highfidelity/hifi
2017-01-31 20:39:39 +01:00
Brad Hefta-Gaub
3bbb57599b
Merge pull request #9565 from kencooke/cpudetect-gcc-bugfix
...
Fix bug that causes GCC not to detect AVX2
2017-01-31 11:11:35 -08:00
Brad Hefta-Gaub
cff49ea5f3
Merge pull request #9556 from samcake/blue
...
Adding support for disabling texturing from the material
2017-01-31 10:39:44 -08:00
Brad Hefta-Gaub
485973368e
Merge pull request #9549 from kencooke/audio-wasapi-leakfix
...
Fix memory-leak in Windows audio stack (audiodg.exe grows without bound)
2017-01-31 10:38:24 -08:00
Brad Hefta-Gaub
c1834a033c
Merge pull request #9563 from birarda/entity-script-server
...
avoid recursion to unchanged octree elements with frustumless queries too
2017-01-31 09:40:20 -08:00
Seth Alves
5131d1edf2
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-01-31 09:22:16 -08:00
Seth Alves
6db9e7a0cf
Merge pull request #9393 from highfidelity/tablet-ui
...
Tablet UI
2017-01-31 09:16:59 -08:00
Seth Alves
2ffdc213a9
Merge pull request #9567 from sethalves/tablet-ui
...
Tablet ui
2017-01-31 08:58:33 -08:00
Seth Alves
7c2957cfa7
merge from upstream
2017-01-31 08:57:36 -08:00
Brad Hefta-Gaub
b597f3e098
Merge pull request #9267 from AndrewMeadows/report-all-collision-events
...
fix for missed START collision events
2017-01-31 08:54:58 -08:00
Brad Hefta-Gaub
459b2da6c3
Merge pull request #9558 from zfox23/FILTERS_FixFilters1
...
ENTITY FILTERS: Improve zone filter; maxVelocity filter; documentation
2017-01-31 08:52:49 -08:00
Brad Hefta-Gaub
6b97db66d5
Merge pull request #9458 from zzmp/audio/threaded-local
...
local audio bypass
2017-01-31 08:49:49 -08:00
Brad Hefta-Gaub
5287c94786
Merge pull request #9555 from huffman/fix/entity-is-child-of-crash
...
Fix Entities.isChildOfParent crashing if given unknown ID
2017-01-31 08:42:45 -08:00
Brad Hefta-Gaub
619bcdeed8
Merge pull request #9553 from huffman/fix/polyvox-import
...
Fix importing of PolyVox entities
2017-01-31 08:42:28 -08:00
David Kelly
8f924e338e
Merge pull request #9564 from davidkelly/dk/2708
...
Require password verification in domain-server settings
2017-01-31 08:35:36 -07:00
Seth Alves
094c4d6295
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into model-scripting
2017-01-31 05:03:59 -08:00
Seth Alves
7d80679652
Merge pull request #9566 from sethalves/tablet-ui
...
Tablet ui
2017-01-31 05:03:51 -08:00
Seth Alves
39d195fce2
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-31 05:02:07 -08:00
Seth Alves
17514a5022
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-01-31 04:57:16 -08:00
Brad Hefta-Gaub
87805fe4eb
Merge pull request #9559 from Atlante45/fix/animation-jitter
...
Fix animation jitter
2017-01-30 20:27:21 -08:00
Seth Alves
1ea11572a7
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-01-30 19:54:56 -08:00
Seth Alves
88948fa2b4
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into model-scripting
2017-01-30 19:54:50 -08:00
Clément Brisset
3d3e03ec8d
Merge pull request #9562 from highfidelity/AlanZimmerman-patch-1-1
...
Fix label typo in help graphic
2017-01-30 17:20:40 -08:00
Ken Cooke
2ce357db3a
Fix bug that causes GCC not to detect AVX2
2017-01-30 17:11:48 -08:00
Stephen Birarda
1b1ae48650
don't recurse on octree elements that have not changed
2017-01-30 17:01:45 -08:00
Alan Z
6e7260207f
Fix label typo in help graphic
...
fixes #2748 in Fogbugz
2017-01-30 16:51:22 -08:00
Thijs Wenker
c3f9663ab0
- Fix for simulation owned entities moving to 0,0,0 after cache reload
...
- Fix for simulation priority, use SCRIPT_GRAB_SIMULATION_PRIORITY in EntityItem::grabSimulationOwnership()
2017-01-31 01:25:59 +01:00
David Kelly
eaf033107c
Require password verification in domain-server settings
...
If you modify the security settings to use a username/password for
access to the domain server settings, we now have a second password
field which must match the first one you entered.
2017-01-30 17:13:13 -07:00
Zach Fox
18fd965c33
Add note about floats?
2017-01-30 16:07:43 -08:00
Atlante45
c65e884151
Don't set joint "set" flags for animation values
2017-01-30 16:04:54 -08:00
samcake
249ec80d74
Writting a better version of the no texture case
2017-01-30 15:48:48 -08:00
Zach Fox
740a0add8a
Updates
2017-01-30 15:47:04 -08:00
samcake
3c56bd2960
Adding support for disabling texturing from the material
2017-01-30 15:03:04 -08:00
