Stephen Birarda
51085350f1
remove quazip targeting from android build
2016-08-31 11:06:01 -07:00
Stephen Birarda
7c2fea4598
remove glew/oglplus requirement for android interface
2016-08-31 11:03:53 -07:00
Andrew Meadows
e5b63aa18f
remove cruft from updateModel() arguments
2016-08-31 10:54:02 -07:00
Zach Pomerantz
0e9ff04c4c
fix layered zone applications
2016-08-30 17:00:02 -07:00
Zach Pomerantz
bb39cdafda
fix applyPartial for last zone
2016-08-30 17:00:02 -07:00
Zach Pomerantz
abde84b068
fix async skybox tex loading
2016-08-30 17:00:02 -07:00
Seth Alves
3d436d4c26
bump entity protocol version
2016-08-30 16:23:11 -07:00
Ken Cooke
1a6af49b3d
Support for even more back-end sample rates
2016-08-30 16:10:11 -07:00
samcake
af68a2550e
Remve dead code
2016-08-30 14:53:37 -07:00
Ken Cooke
cb5bded7c1
Add support for more back-end sample rates
2016-08-30 14:37:33 -07:00
samcake
2a5ee5d6b1
Fixing the unit for the cpuTIme feed and the titles for the GPU PERf Plots
2016-08-30 14:28:52 -07:00
Ken Cooke
9187b4aa7d
More complete fix for audio threading failures. Qt keeps an internal Q_GLOBAL_STATIC list of devices, which is referenced at device start() but clobbered by availableDevices(). Now protected by a mutex.
2016-08-30 12:57:29 -07:00
samcake
b18c0d5325
Revert enabling sRGB for GLcontext pixel format
2016-08-30 12:44:35 -07:00
Seth Alves
53ff6a239d
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-30 12:39:35 -07:00
samcake
faef8a9930
Adding the timing for GPU support with a simpelr JobConfig
2016-08-30 12:22:21 -07:00
Chris Collins
188f5d5ace
Merge pull request #8545 from ZappoMan/fbx2016
...
support for fbx2016 format
2016-08-30 11:36:25 -07:00
Seth Alves
2a9ffc1529
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-30 10:26:14 -07:00
Ken Cooke
d2b33e00bd
Fix audio startup failures. Directly calling the static method QAudioDeviceInfo::availableDevices() was not thread-safe.
2016-08-30 10:13:08 -07:00
Seth Alves
7d13f9220c
fix math, renamed a couple variables
2016-08-30 09:55:42 -07:00
Stephen Birarda
74fac8c7c9
Merge pull request #8512 from birarda/shareable-address
...
add shareable address from default name, leverage for steam join/invite
2016-08-30 09:35:24 -07:00
Seth Alves
a9400119ab
Merge branch 'joints-for-controllers' of github.com:sethalves/hifi into arrow-actions
2016-08-30 09:13:16 -07:00
Seth Alves
f4eee8d480
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-30 09:12:53 -07:00
Brad Hefta-Gaub
7397b884e7
support for fbx2016 format
2016-08-30 09:07:39 -07:00
Seth Alves
314b7617ac
Merge pull request #8543 from hyperlogic/bug-fix/entity-pointer-events
...
Bug fix for click events received by entity scripts
2016-08-29 17:57:56 -07:00
Seth Alves
c022c2e705
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-29 17:43:53 -07:00
Brad Hefta-Gaub
f3d157c396
Merge pull request #8500 from jherico/gl_context
...
Custom OpenGL context creation
2016-08-29 16:22:21 -07:00
Anthony J. Thibault
e34aecde49
Bug fix for click events received by entity scripts
...
PointerEvent.isLeftButton should be true even on left button release events.
in a previous PR this behavior was changed. isLeftButton was used as a flag indicating the button state, which would be false on left button release events.
Because we have scripts that rely on the old behavior, I've changed it back to the original and introduced isPrimaryHeld properties instead.
2016-08-29 16:21:39 -07:00
Zach Pomerantz
f30308b68c
add deeply nested skyboxes
2016-08-29 13:57:14 -07:00
Zach Pomerantz
1971063b9a
clean up Procedural::parseShader
2016-08-29 13:56:39 -07:00
Zach Pomerantz
1e7c00c0c8
fix Skybox::clear to set _empty
2016-08-29 13:40:56 -07:00
Ken Cooke
28a99a7a03
Merge branch 'master' of https://github.com/highfidelity/hifi into low-latency-audio
2016-08-29 12:38:17 -07:00
Brad Davis
617633b85c
Moving to custom context creation
2016-08-29 11:21:54 -07:00
Zach Pomerantz
5f699072d9
allow black skybox
2016-08-29 10:58:09 -07:00
Seth Alves
55b68ad4b1
fix warning
2016-08-29 10:21:58 -07:00
Seth Alves
178a68c967
Merge branch 'master' of github.com:highfidelity/hifi into arrow-actions
2016-08-29 10:21:07 -07:00
Seth Alves
b31bb7bc06
Merge branch 'joints-for-controllers' of github.com:sethalves/hifi into arrow-actions
2016-08-29 08:22:44 -07:00
Seth Alves
3c90413ebb
don't render stray/invalid hand-lasers in HMD mode
2016-08-29 04:06:53 -07:00
Seth Alves
a729a95378
fix math
2016-08-28 21:03:32 -07:00
Seth Alves
670e85994d
fix arrow action
2016-08-28 20:05:29 -07:00
Seth Alves
3fb10d0eea
action for arrow flight, etc
2016-08-28 19:08:13 -07:00
Brad Davis
92fa1d5776
Use stream draw for object position updates
2016-08-27 15:08:38 -07:00
Seth Alves
76b72e32f0
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-27 09:06:45 -07:00
Brad Davis
587d015c57
Give names to offscreen contexts for easier debugging
2016-08-26 19:09:26 -07:00
Brad Davis
e4334be0cf
Use synchronous logging (may impact performance when debugging is enabled)
2016-08-26 19:08:15 -07:00
Brad Davis
1652965ac2
Destroy contexts properly
2016-08-26 19:07:44 -07:00
Brad Davis
95b5a23c7a
Properly destroy GL programs
2016-08-26 19:04:46 -07:00
Brad Davis
7ffa212006
Don't use textures that are in the transfer pipeline
2016-08-26 19:04:24 -07:00
Brad Hefta-Gaub
3d6691f3d1
Merge pull request #8527 from zzmp/fix/skybox-default-color
...
fix skybox default
2016-08-26 15:14:44 -07:00
Seth Alves
9884426ad8
replace debugging aborts with asserts
2016-08-26 06:13:33 -07:00
Zach Pomerantz
996346980d
clear the skybox between scenes
2016-08-25 18:08:22 -07:00
Zach Pomerantz
5e82093e69
set skybox clear color to empty color
2016-08-25 18:08:03 -07:00
Seth Alves
3b278adba3
Merge branch 'master' of github.com:highfidelity/hifi into joints-for-controllers
2016-08-25 17:28:18 -07:00
Brad Hefta-Gaub
9801ff075a
Merge pull request #8433 from samcake/hdr
...
Fix Screen Space ambient occlusion which was broken since a while
2016-08-25 16:57:24 -07:00
Brad Hefta-Gaub
10c465f591
Merge pull request #8525 from hyperlogic/bug-fix/web-entity-rendering
...
Improved web entity rendering
2016-08-25 16:49:00 -07:00
samcake
8cc65ea965
Adrressing review issues
2016-08-25 16:31:42 -07:00
Ken Cooke
1ab35797b1
Drastically reduce the audio capture buffering on Windows.
...
With device detection on another thread and WASAPI back-end, the large capture buffer (resulting from CALLBACK_ACCELERATOR_RATIO) is no longer needed.
2016-08-25 16:09:25 -07:00
samcake
09a70740a8
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-08-25 15:21:41 -07:00
Seth Alves
7c5b8cb75d
send faux joints to the avatar-mixer
2016-08-25 15:21:29 -07:00
Brad Hefta-Gaub
ac291a398d
Merge pull request #8329 from AndrewMeadows/render-collision-geometry
...
Render collision geometry
2016-08-25 15:15:28 -07:00
Andrew Meadows
2c8ab9b2b8
Merge pull request #8497 from hyperlogic/feature/improve-ik-quality
...
Raised max iterations for IK to 16 from 4
2016-08-25 15:06:11 -07:00
Zach Pomerantz
24162f0f3d
set skybox default color to empty color
2016-08-25 12:37:23 -07:00
samcake
9669234f9c
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-08-25 12:36:01 -07:00
Anthony J. Thibault
e82f6a90af
Improved web entity rendering
...
* fading now works properly
* web browsers are now fully opaque.
2016-08-25 11:04:23 -07:00
Seth Alves
39f52b3682
start on faux avatar joint that represent hand controllers
2016-08-25 10:58:23 -07:00
Andrew Meadows
c337cc92e5
remove crufty comment
2016-08-25 08:51:53 -07:00
Andrew Meadows
b95cb566cd
fix collision mesh for non-trivial registration
2016-08-24 22:26:56 -07:00
Andrew Meadows
502146b171
distribute reg offset to compound children
2016-08-24 22:26:56 -07:00
Andrew Meadows
19cd4648ad
scale collision render mesh correctly
2016-08-24 22:26:56 -07:00
Andrew Meadows
acaa77b75a
remove cruft from debug efforts
2016-08-24 22:26:56 -07:00
Andrew Meadows
e4317adcf1
remove cruft
2016-08-24 22:26:56 -07:00
Andrew Meadows
2f16aca114
remove cruft and fix typo in rebase
2016-08-24 22:26:56 -07:00
Andrew Meadows
d801b3521c
fix warnings on windows
2016-08-24 22:26:56 -07:00
Andrew Meadows
e554712259
remove entities-renderer dependency on physics lib
2016-08-24 22:26:56 -07:00
Andrew Meadows
48c73acae0
restore privacy of GeometryResourceWatcher methods
2016-08-24 22:26:56 -07:00
Andrew Meadows
269b7ae7c1
remove commented out cruft
2016-08-24 22:26:56 -07:00
Andrew Meadows
83426fd5a8
handle transitions to/from STATIC_MESH
...
when rendering collision geometry
2016-08-24 22:26:56 -07:00
Andrew Meadows
68dd66daec
create collision render geometry only when needed
2016-08-24 22:26:56 -07:00
Andrew Meadows
eb65be5478
remove cruft argument from allocateModel()
2016-08-24 22:26:56 -07:00
Andrew Meadows
b0a0293e6e
move compoundResource out of Model class
2016-08-24 22:26:56 -07:00
Andrew Meadows
ef597265d7
remove unimplemented declaration
2016-08-24 22:26:56 -07:00
Andrew Meadows
fe4198530f
don't render raw compound collision geometry
2016-08-24 22:26:56 -07:00
Andrew Meadows
191b7f0f39
variable namechange: Hull --> Mesh
2016-08-24 22:26:56 -07:00
Andrew Meadows
329c5432ed
_showCollisionHull --> _showCollisionGeometry
2016-08-24 22:26:56 -07:00
Andrew Meadows
1f84ef3053
compute normals for collision mesh geometry
2016-08-24 22:26:56 -07:00
Andrew Meadows
481d6990a3
trigger collision shape render mesh creation
2016-08-24 22:26:56 -07:00
Andrew Meadows
3b772d2fe6
fallback to SIMPLE_COMPOUND when can't do COMPOUND
2016-08-24 22:26:56 -07:00
Andrew Meadows
26f5d3cfaa
fix render geometry for collision shapes
2016-08-24 22:26:56 -07:00
Andrew Meadows
daff897fc4
const shapes, and use *MotionState::setShape()
2016-08-24 22:26:56 -07:00
Andrew Meadows
25fb7aacad
ShapeManager hands out const shape pointers
2016-08-24 22:26:56 -07:00
Andrew Meadows
6b0ae654ba
cleanup logic around creating RenderItems
2016-08-24 22:26:56 -07:00
Andrew Meadows
d8fa0d1dd1
segregateMeshGroups() --> createRenderItems()
2016-08-24 22:25:45 -07:00
Andrew Meadows
726928c14c
creae collision Geometry from mesh
2016-08-24 22:25:45 -07:00
Andrew Meadows
499150bbed
finish hook alert for new entity collision shape
2016-08-24 22:25:45 -07:00
Andrew Meadows
b2dfa49a6f
stubbery for alerting entity that shape changed
2016-08-24 22:25:45 -07:00
Andrew Meadows
1ed76ae442
added virtual ObjectMotionState::setShape()
2016-08-24 22:25:45 -07:00
Andrew Meadows
cbacb02010
more unit tests for CollisionRenderMeshCache
2016-08-24 22:25:45 -07:00
Andrew Meadows
b79af55e16
fix ref accounting for garbage collection
2016-08-24 22:25:45 -07:00
Andrew Meadows
06d40afeac
don't forget to use the transform of child shapes
2016-08-24 22:25:45 -07:00
Andrew Meadows
1e95e489cb
make mesh around btConvexShape, copy to model::Mesh
2016-08-24 22:25:45 -07:00
Andrew Meadows
d0295f3876
remove cruft include
2016-08-24 22:25:45 -07:00
Andrew Meadows
d59c997e64
remove stubbery, make physics lib depend on model
2016-08-24 22:25:45 -07:00
Andrew Meadows
8d3f592e68
rename class to be more correct
2016-08-24 22:25:45 -07:00
Andrew Meadows
9f26836b43
added basic CollisionGeometryCache container
2016-08-24 22:25:45 -07:00
Andrew Meadows
af1be8ccd4
remove whitespace
2016-08-24 22:25:45 -07:00
Andrew Meadows
e086792eac
enforce coding standards
2016-08-24 22:25:45 -07:00
Brad Davis
479d90a462
Merge remote-tracking branch 'upstream/stable'
2016-08-24 19:31:11 -07:00
Brad Davis
5cdb30357f
Add checking for failed downloads in the textures
2016-08-24 18:03:56 -07:00
Anthony J. Thibault
c2af948e25
Merge branch 'master' into feature/handheld-marketplace
2016-08-24 16:07:04 -07:00
Brad Davis
c5628b615c
Make sure we start fade in once an item becomes ready
2016-08-24 16:05:22 -07:00
Brad Hefta-Gaub
99ea180f09
Merge pull request #8495 from AndrewMeadows/faster-spherical-harmonics
...
speed up spherical harmonics calculation with minimal error
2016-08-24 15:57:42 -07:00
James B. Pollack
d9ebad7976
Merge pull request #8372 from elisa-lj11/zip_project
...
Added Clara.io to the marketplace
2016-08-24 15:53:58 -07:00
Anthony J. Thibault
1e95e067c0
warning fixes for llvm/gcc
2016-08-24 15:46:55 -07:00
Zach Pomerantz
6c99a33009
detect unset skybox
2016-08-24 11:03:07 -07:00
Ken Cooke
c0caea1ffd
PR feedback
2016-08-24 10:32:29 -07:00
Ken Cooke
b4d143fe13
PR feedback
2016-08-24 10:19:09 -07:00
Ken Cooke
8fbf5a9e8b
PR feedback
2016-08-24 10:16:43 -07:00
Zach Pomerantz
c740b263a8
detect unset skybox
2016-08-23 15:16:26 -07:00
Howard Stearns
89b00883dd
Merge pull request #8428 from highfidelity/discovery
...
Snapshot of Snapshot-Discovery to master
2016-08-23 14:32:10 -07:00
elisa-lj11
cdc5dde40e
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-23 11:22:43 -07:00
Stephen Birarda
fbe784155e
add a shareable address return to address manager
2016-08-23 11:19:14 -07:00
Stephen Birarda
edd4f5853e
use temporary domain name as place name on ID lookup
2016-08-23 11:19:14 -07:00
Stephen Birarda
2b5d862263
request shareable name in AddressManager once connected
2016-08-23 11:19:14 -07:00
Anthony J. Thibault
b2dff8aa77
Easier to click buttons on web entities with shaky hand controllers
...
There is an angular and time dead spot on webEntity for scrolling vs clicking.
Currently, it's 150 ms and 3 degrees. See POINTER_PRESS_TO_MOVE_DELAY and POINTER_PRESS_TO_MOVE_DEADSPOT_ANGLE
* Fix for warnings when clicking on window.open() links in WebEntity
2016-08-23 10:19:49 -07:00
Anthony J. Thibault
6be737993e
bug fix for sensorToWorld translation transmission
2016-08-23 10:13:07 -07:00
Anthony J. Thibault
c6ea64926c
Sensor space entity support
...
You can do this by parenting an entity to an avatar's -2 joint index.
This will mean that the entity will follow the avatar as it moves in the world, but
will not follow the avatar's position as it moves in sensor space. Essentially, this
gives you the ability to place objects in the user's physical room.
WebTablets now are located in this feature and no longer jitter.
2016-08-23 10:13:06 -07:00
Anthony J. Thibault
df17913801
Mipmap generation, trilinear,anisotropic filtering for OffscreenQmlSurface
2016-08-23 10:10:29 -07:00
Anthony J. Thibault
d607abc8f7
Add dpi to edit.js
...
Also, cap the maximum webEntity texture size to 4096
2016-08-23 10:10:27 -07:00
Anthony J. Thibault
31ed378dbf
Added dpi entity property for web-entities
2016-08-23 10:10:26 -07:00
Anthony J. Thibault
6704ae9ad4
Added dpi parameter to userData (this is temporary)
2016-08-23 10:09:17 -07:00
Brad Hefta-Gaub
21bc06f154
Merge pull request #8335 from hyperlogic/feature/hand-controller-web-entity-integration
...
handControllerGrab and web entity input integration
2016-08-23 09:59:25 -07:00
elisa-lj11
2d2cb45c5d
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-22 16:05:16 -07:00
Brad Hefta-Gaub
0397c6b6ca
Merge pull request #8471 from AndrewMeadows/dont-assert-on-bad-data
...
workaround bad FBXMesh data rather than assert
2016-08-22 14:21:48 -07:00
Anthony J. Thibault
d015c5cfb5
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-22 14:13:17 -07:00
samcake
4da712fbdf
Fixing bad include not respecting filename case (for linux)
2016-08-22 10:36:43 -07:00
Anthony J. Thibault
e1f7dfc4e1
Raised max iterations for IK to 16 from 4
...
* IK now returns early if solution is "good enough"
* IK now has nsight markers for profiling
2016-08-22 10:34:56 -07:00
samcake
44c6637160
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-08-22 10:32:06 -07:00
Andrew Meadows
d2d905fc86
speed up SH calculation with minimal error
2016-08-22 10:21:22 -07:00
sam
1e84f9dc90
back to noise seeded in image space
2016-08-21 23:37:24 -07:00
sam
4097fcb0f6
fixing the blurring issue
2016-08-21 00:27:43 -07:00
Seth Alves
9bcda1bb45
merge from upstream
2016-08-20 15:25:04 -07:00
Ken Cooke
4b2778f02d
Re-implement the continuous detection of device changes for all platforms, using a background thread. This prevents the glitches caused by calling checkDevices() on the audio processing thread.
2016-08-20 12:22:47 -07:00
samcake
9cdd079213
And again
2016-08-19 18:22:14 -07:00
howard-stearns
b8b345fb43
Merge branch 'master' of https://github.com/highfidelity/hifi into update-discovery-from-master2
2016-08-19 13:04:39 -07:00
elisa-lj11
4aab389305
Merge remote-tracking branch 'highfidelity/master' into zip_project
2016-08-19 11:32:37 -07:00
elisa-lj11
8bc9a92429
removed extraneous debug prints
2016-08-19 11:32:13 -07:00
samcake
5ad66a17ee
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-08-19 11:09:31 -07:00
samcake
6a076bcee4
PRoviding a fix for the macOS build
2016-08-19 11:09:12 -07:00
Anthony J. Thibault
8bb6bb7c6f
generalized keyboard focus interface
...
Removed dynamic casts to RenderableWebEntityItem, instead
virtual methods were added to EntityItem to facilitate this.
* bool wantsKeyboardFocus()
* void setProxyWindow()
* QObject* getEventHandler()
2016-08-19 10:56:52 -07:00
James B. Pollack
98f0290565
Merge pull request #8436 from huffman/feat/more-user-activity-data
...
Add more user activity data
2016-08-19 10:48:28 -07:00
Andrew Meadows
5b5ed220bc
add BufferView::Iterator operator<() and friend
2016-08-19 10:26:47 -07:00
Andrew Meadows
c3f165d9da
BufferView::Iterator doesn't support operator<
2016-08-19 10:15:37 -07:00
Andrew Meadows
304c313db7
minor cleanup
2016-08-19 10:15:30 -07:00
samcake
a4945fe45c
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-08-19 10:00:40 -07:00
howard-stearns
4d7d483c0e
use ceil
2016-08-19 09:51:58 -07:00
elisa-lj11
4c434e875e
fixed merge conflicts in Application.cpp
2016-08-19 09:46:22 -07:00
Ken Cooke
3583bdecbb
Fix for calculateDeviceToNetworkInputRatio() which was completely broken.
...
Running the audio back-end at 44.1k now works correctly.
2016-08-18 16:56:26 -07:00
Chris Collins
a9fbc4ec2c
Merge pull request #8448 from huffman/feat/domain-specify-backup-location
...
Add backup directory setting to domain server
2016-08-18 16:45:50 -07:00
howard-stearns
f6670a6374
new optional aspect-ratio argument to snapshot chain (javascript through
...
c++ display plugin). When non-zero, it pulls out the largest piece from
the center that maintains that ratio. Snapshot button uses 1.91.
2016-08-18 16:29:42 -07:00
Brad Hefta-Gaub
1cec7b2db0
Merge pull request #8429 from SamGondelman/loadingFade2
...
Don't do fade effect once physics kick in
2016-08-18 12:46:24 -07:00
Andrew Meadows
6446c7c302
make createShapeFromInfo() fail gently on bad data
2016-08-18 11:49:15 -07:00
Andrew Meadows
2ba35e6398
skip non-existant meshes
2016-08-18 11:48:56 -07:00
Seth Alves
15ce40ecf4
merge from upstream
2016-08-18 11:46:02 -07:00
Seth Alves
6b46b3082c
try, try again
2016-08-18 11:45:03 -07:00
Zach Pomerantz
813fefd599
reimplement buffer get for (c)end
2016-08-18 11:26:25 -07:00
Andrew Meadows
cb9a5466d5
workaround bad FBXMesh data rather than assert
2016-08-18 11:09:48 -07:00
Clément Brisset
d1fb723b01
Merge pull request #8444 from zzmp/fix/skybox
...
fix flashing in default skybox, and allow skybox lighting without textures
2016-08-18 11:07:09 -07:00
samcake
b5296410c3
Merge branch 'master' of https://github.com/highfidelity/hifi into hdr
2016-08-18 10:20:33 -07:00
Seth Alves
09b7a5188c
a few more
2016-08-18 10:15:35 -07:00
Seth Alves
722e88253d
missed one
2016-08-18 09:59:40 -07:00
Seth Alves
87dbfa7e47
add -Wsuggest-override to compile flags and deal with fallout
2016-08-18 09:51:41 -07:00
Ken Cooke
87d5ec2437
Bump protocol version. Audio packets are now exactly 10ms (240/480 samples).
2016-08-18 08:31:43 -07:00
Ken Cooke
46c94a938e
Updated HRTF to process in 240-sample blocks
2016-08-18 08:29:32 -07:00
Ken Cooke
f80304d68e
Change audio pipelines to process in exactly 10ms blocks (240 samples instead of 256).
...
This produces an integral number of samples when resampled to 44.1k or 48k, allowing a 44.1k back-end to work correctly without extra buffering or dynamic buffers sizes.
2016-08-18 08:27:20 -07:00
Ryan Huffman
d46af500c1
Fix wrong property name in entity activity tracking
2016-08-17 17:00:56 -07:00
Ryan Huffman
25b9d756ca
Update entity edit tracking to track count rather than bool
2016-08-17 16:54:04 -07:00
Anthony J. Thibault
7b248b440a
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-17 13:55:12 -07:00
elisa-lj11
5d19267d00
Safeguard against file corruption
...
This is what could be a temporary (or permanent) fix to users trying to
delete important files on their computer through JS
2016-08-17 11:10:38 -07:00
Brad Hefta-Gaub
1ad1c48adc
Merge pull request #8414 from jherico/logging_fix
...
Categorize some debug logging in FBX parsing
2016-08-17 09:07:27 -07:00
Brad Hefta-Gaub
cd28df6c2e
Merge pull request #8446 from sethalves/local-velocity-for-scripts
...
Local velocity for scripts
2016-08-17 09:06:54 -07:00
Brad Hefta-Gaub
f16cbbe270
Merge pull request #8445 from huffman/fix/procedural-entity-render
...
Fix transparency on procedural shapes
2016-08-17 09:04:31 -07:00
Anthony J. Thibault
d4e1f53581
Fix for inconsistent override warning in WebEntityItem.h
2016-08-16 17:48:28 -07:00
Ryan Huffman
727d59ab27
Add backup directory setting to domain server
2016-08-16 17:33:32 -07:00
Ken Cooke
7202d132c5
Remove 22050 from the preferred list of back-end sample rates.
2016-08-16 16:57:28 -07:00
Ken Cooke
2326696d54
Disabled the continuous polling for audio device changes on Windows.
...
It necessitated extra buffering to prevent periodic dropouts in the audio stream.
2016-08-16 16:53:51 -07:00
Anthony J. Thibault
7de8cc6422
Merge branch 'master' into feature/hand-controller-web-entity-integration
2016-08-16 16:49:57 -07:00
Ken Cooke
d9f12e44dc
Add resampler support for downsampling with variable-input constant-output buffering mode
2016-08-16 16:47:55 -07:00
Seth Alves
f5f88fbacc
Merge branch 'master' of github.com:highfidelity/hifi into local-velocity-for-scripts
2016-08-16 16:47:27 -07:00
Seth Alves
7bc1235c54
local velocity and angular velocity in scripts is now handled the way local position and rotation are
2016-08-16 16:47:13 -07:00
Anthony J. Thibault
36d87ddd7c
Added EntityItem::wantsHandControllerPointerEvents method
2016-08-16 16:23:45 -07:00
Stephen Birarda
3355a90e7d
Merge pull request #8413 from huffman/feat/atp-bandwidth
...
Add asset server bandwidth to stats
2016-08-16 15:54:11 -07:00
elisa-lj11
5d2fb68924
Fixed temp dir access
2016-08-16 15:47:57 -07:00
Ryan Huffman
dae8461773
Fix transparency on procedural shapes
2016-08-16 15:42:17 -07:00
Anthony J. Thibault
c407818d63
send pointer events from handControllerGrab.js to webEntities
2016-08-16 15:26:14 -07:00
Zach Pomerantz
d6d9871a96
unused var nits
2016-08-16 14:36:54 -07:00
elisa-lj11
9ea9baeadf
Making JS/QML safer (DOES NOT WORK)
2016-08-16 14:12:19 -07:00
Zach Pomerantz
8c559bc65d
use lights from nontextured skyboxes
2016-08-16 13:27:22 -07:00
howard-stearns
2ca1fda71b
Re add fix for hmd after merge
2016-08-16 12:02:49 -07:00
howard-stearns
2b75240771
Merge branch 'master' of https://github.com/highfidelity/hifi into discovery
2016-08-16 11:14:36 -07:00
Ryan Huffman
1d2ea3be03
Fix transparent items not being rendered correctly against procedural skybox
2016-08-15 16:35:25 -07:00
Zach Pomerantz
af915c7923
replace cube tex DSA transfer with EXT
2016-08-15 15:31:04 -07:00
