Seth Alves
bb3155ee61
obj file is now produced in /tmp
2017-01-31 14:29:42 -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
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
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
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
Atlante45
c65e884151
Don't set joint "set" flags for animation values
2017-01-30 16:04:54 -08:00
Anthony Thibault
5a0990fbe4
Merge pull request #9550 from hyperlogic/tablet-ui2
...
tablet-ui -> master, PR feedback
2017-01-30 14:20:28 -08:00
Ryan Huffman
e58c9326a0
Fix Entities.isChildOfParent crashing if given unknown ID
...
If an entity was not in the local tree a null deref crash would occur.
This commit makes sure the entity pointer is checked for null before it is used.
2017-01-30 13:48:33 -08:00
Ryan Huffman
f553656e36
Fix importing of PolyVox entities
...
PolyVox entities reference neighboring PolyVox entities in their entity
properties so that they can be stitched together. When importing, a new ID is
generated for each entity. When importing PolyVox entities, the
neighboring entity IDs were not updated to reflect the newly generated
IDs. This commit fixes that.
2017-01-30 13:33:42 -08:00
Andrew Meadows
6ef4420f37
remove commented out cruft
2017-01-30 13:21:23 -08:00
Andrew Meadows
31861d3192
use inverted collision for B-A event
2017-01-30 13:21:23 -08:00
Andrew Meadows
aa8e7d27db
move depth filtering closer to source
2017-01-30 13:21:23 -08:00
Andrew Meadows
b5537304a3
more correct CONTINUE collision event filter
2017-01-30 13:21:23 -08:00
Andrew Meadows
2541bfb1a8
only create collision events for owned entities
2017-01-30 13:21:23 -08:00
Andrew Meadows
2162a364a9
minor cleanup
2017-01-30 13:21:23 -08:00
Andrew Meadows
8cf7aee009
fix bug: second collision event with bad data
2017-01-30 13:21:23 -08:00
Andrew Meadows
b7cd8827f9
collision events for owned objects only
...
also: fewer entityID lookups for scripted collision sounds and events
2017-01-30 13:21:23 -08:00
Andrew Meadows
ed17c4fa16
fix an old typo about when to send collision event
2017-01-30 13:19:38 -08:00
Andrew Meadows
54b4612ee3
fix for missed START collision events
2017-01-30 13:18:26 -08:00
Anthony J. Thibault
0542945110
Moved SoundEffect into a separate compilation unit.
...
Also, fixed license header in TabletScriptingInterface, to include proper author and date.
2017-01-30 12:46:22 -08:00
Anthony J. Thibault
39d68828ab
Disable FXAA on tablet overlay in desktop mode.
...
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass. Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.
Two new shaders were introduced.
simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf
These are tailored to write into the main framebuffer instead of the g-buffer.
2017-01-30 11:24:59 -08:00
Anthony J. Thibault
a9b478888c
First cut of Web3DOverlays without FXAA applied.
2017-01-30 11:24:58 -08:00
howard-stearns
93414d802d
fetch entity filter script asynchronously (but reject edits while waiting)
2017-01-30 11:06:36 -08:00
Seth Alves
ac475300f6
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-30 08:15:29 -08:00
Seth Alves
4d78e37c96
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-01-29 18:00:12 -08:00
Seth Alves
d158f6afd1
hook up a way to get mesh out of polyvox
2017-01-28 20:42:14 -08:00
Seth Alves
541692c5ca
start on scripting interface to allow saving polyvox meshes to obj files
2017-01-28 15:38:18 -08:00
Seth Alves
1a511272b0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-27 13:06:22 -08:00
Thijs Wenker
a2da1e3dc1
Merge branch 'master' into fix-ac-playback-audio
2017-01-27 21:00:57 +01:00
Zach Pomerantz
38af24ad4a
Merge branch 'master' of github.com:highfidelity/hifi into audio/threaded-local
2017-01-27 14:57:27 -05:00
Dante Ruiz
006c3a99dc
fix tablet menu crashing
2017-01-27 19:04:53 +00:00
Bradley Austin Davis
8d45f43ba8
Disable sparse textures
2017-01-27 10:06:31 -08:00
Seth Alves
fa61bbe2a6
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 18:21:39 -08:00
Chris Collins
5ed376afc9
Merge pull request #9257 from ZappoMan/tuneAvatarInfo
...
avatar mixer bandwidth optimization
2017-01-26 17:33:57 -08:00
Thijs Wenker
cdc0f3ddd2
- make AC recording audio play with right encoding
...
- spelling fix
2017-01-27 01:19:11 +01:00
Zach Pomerantz
1c5228cb6d
fix AudioRingBuffer::appendData
2017-01-26 19:16:02 -05:00
Howard Stearns
866f9debcd
Merge pull request #9526 from highfidelity/edit-entity-filter
...
Edit entity filter (from branch)
2017-01-26 16:00:48 -08:00
Zach Pomerantz
3d526a1024
Merge branch 'master' of github.com:highfidelity/hifi into audio/threaded-local
2017-01-26 18:56:58 -05:00
ZappoMan
af426063ac
fix bad merge
2017-01-26 15:19:25 -08:00
ZappoMan
4c80422a73
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-26 14:34:58 -08:00
Seth Alves
db38503d57
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 13:48:59 -08:00
samcake
19858bda78
Merge pull request #9493 from AndrewMeadows/otherAvatars
...
optimize, prioritize, and timebox processing of avatar updates
2017-01-26 13:30:51 -08:00
