Howard Stearns
1a87ca04da
Entity sound.
2015-05-13 13:18:02 -07:00
Stephen Birarda
ca87d64dc7
fix for audio-mixer shutdown hang, removing spaces
2015-05-13 12:03:21 -07:00
Philip Rosedale
349886c146
Merge pull request #4847 from birarda/domain-paths
...
add initial support for local paths in domain
2015-05-12 17:09:13 -07:00
Philip Rosedale
aea0824020
Merge pull request #4849 from sethalves/line-entity
...
bump protocol version for line entities
2015-05-12 16:34:50 -07:00
Seth Alves
db704874b9
bump protocol version for line entities
2015-05-12 16:02:45 -07:00
Brad Hefta-Gaub
7ad696895c
Merge pull request #4829 from jherico/info-view
...
Fixing info-view popup on every launch
2015-05-12 15:58:49 -07:00
Seth Alves
500bb13cbb
c++
2015-05-12 15:17:27 -07:00
Seth Alves
4e679c7e3a
use toGlm for color. remove some commented-out code
2015-05-12 15:08:26 -07:00
Stephen Birarda
8c9a14cd9d
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-paths
2015-05-12 15:04:59 -07:00
Brad Davis
4d53010ab0
Merge branch 'master' into info-view
2015-05-12 14:58:22 -07:00
samcake
6e8c067bcb
Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"
2015-05-12 14:34:43 -07:00
Stephen Birarda
332601b91c
final fixes for path query from DS
2015-05-12 14:34:14 -07:00
Stephen Birarda
7330e5255d
handle path query response from DS in NL/AM
2015-05-12 13:48:41 -07:00
Stephen Birarda
0562fee82a
Merge branch 'master' of https://github.com/highfidelity/hifi into domain-paths
2015-05-12 12:39:05 -07:00
samcake
7c255738af
Merge pull request #4837 from jherico/dk1
...
Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff
2015-05-12 12:30:32 -07:00
Stephen Birarda
e0ccc986b1
add a method to DS to respond to path query
2015-05-12 12:29:09 -07:00
Stephen Birarda
d8b17ffeb0
add packets for a path query and path response
2015-05-12 12:00:03 -07:00
Stephen Birarda
c66bd9b1aa
complete addition of paths to DS settings
2015-05-12 11:58:55 -07:00
Seth Alves
f647db3bf0
Merge branch 'master' of github.com:highfidelity/hifi into line-entity
2015-05-12 11:36:56 -07:00
Seth Alves
7a85bfa0d1
fix up grab.js to use line entity
2015-05-12 11:36:05 -07:00
ZappoMan
c81f6dc69c
fix particle properties
2015-05-12 11:03:16 -07:00
Seth Alves
38caed00ca
Attempt to draw line entity item
2015-05-12 10:25:50 -07:00
Bradley Austin Davis
14efe912a6
Because sometimes I just don't think things through
2015-05-12 09:20:02 -07:00
Brad Hefta-Gaub
cbaa503934
Merge pull request #4838 from Atlante45/quiet_compiler
...
Quiet compiler
2015-05-12 08:57:57 -07:00
Brad Hefta-Gaub
4d9e413b3f
Merge pull request #4820 from hyperlogic/ajt/particle-system-improvements
...
Improvements to particle entity.
2015-05-12 08:40:11 -07:00
Atlante45
00864afe53
Quiet compiler
2015-05-12 17:06:40 +02:00
Clément Brisset
9bf4cf1262
Merge pull request #4830 from ZappoMan/moreZoneProperties
...
New Zone Features
2015-05-12 14:28:01 +02:00
Brad Davis
666caf0d59
Working on fixing DK1 and santizing the transform stuff
2015-05-12 00:44:30 -07:00
Seth Alves
b484e95b77
Merge branch 'master' of github.com:highfidelity/hifi into line-entity
2015-05-11 20:11:30 -07:00
Seth Alves
4881b0c53c
copy box to make a new type of line entity item
2015-05-11 19:25:14 -07:00
Anthony Thibault
e1cbfcd901
Merge branch 'master' into ajt/particle-system-improvements
...
Conflicts:
libraries/networking/src/PacketHeaders.cpp
libraries/networking/src/PacketHeaders.h
2015-05-11 19:24:13 -07:00
Anthony Thibault
b3af515224
Particle entity improvements based on code review.
...
* Updated variable naming to match coding standards.
* Changed particle raw float arrays to vectors.
* Bug fix: changing maxParticles will no longer lead to memory corruption.
* Made particle ring buffer more explicit, added _particleTailIndex.
* Added getLivingParticleCount() private method.
* Moved integration and bounds code into private methods.
* Bug fix: high emit rates now properly integrate particles forward for the
remaing frame time, not the entire frame.
* Bug fix: new particles were not initiaized to origin.
* Added more particles to ajt-test.js.
* Bug fix: ajt-test.js script was not shutting down properly.
* Removed random seed, unless we have a psudo random number generator per
particle system instance, it's unlikely that this will preserve sync.
* Bumped packet version number.
2015-05-11 19:21:33 -07:00
Brad Hefta-Gaub
f56b5fcdcd
Merge pull request #4833 from samcake/blue
...
Clean the cube map loading behavior
2015-05-11 18:40:42 -07:00
Seth Alves
866a6fba9b
Merge pull request #4823 from birarda/master
...
repairs to AC stop and clean shutdown
2015-05-11 18:11:52 -07:00
samcake
449ca6df6d
fix the color blending on Mac
2015-05-11 17:27:22 -07:00
Sam Gateau
e6bba04151
Enable the color blending for the skybox
2015-05-11 17:05:45 -07:00
Sam Gateau
6c606f630e
adjust the alpha of the skybox to make it work with the glow effect
2015-05-11 15:22:13 -07:00
samcake
67b9dd248d
Fix glsl failed compilation on Mac
2015-05-11 14:25:05 -07:00
ZappoMan
73428ec12d
add support to not displace very large clipboards on import
2015-05-11 14:21:58 -07:00
Sam Gateau
f2c4e04a5a
clean up for pr
2015-05-11 14:06:10 -07:00
Sam Gateau
45e70c98f8
Fixed the cube map loading issue
2015-05-11 13:43:15 -07:00
Brad Hefta-Gaub
aade273b6c
Merge pull request #4827 from sethalves/refix-max-octree-pps-2
...
fix octree max-packet-per-second setting
2015-05-11 13:13:00 -07:00
Brad Davis
c0fc0a226b
Fixing info-view popup on every launch
2015-05-11 13:10:36 -07:00
Brad Davis
c12b74ebd0
Merge pull request #4816 from ctrlaltdavid/fix-pragma
...
Disable pragma that Windows doesn't know about
2015-05-11 12:30:54 -07:00
Brad Davis
e5dc3908ba
Merge pull request #4825 from Nex-Pro/Non-JSON-Menu-Items-Fix
...
Fix for addMenuItem separator boolean
2015-05-11 12:27:11 -07:00
Seth Alves
ddb907ae5f
inline setMaxQueryPacketsPerSecond
2015-05-11 12:15:52 -07:00
Seth Alves
635f49258d
formatting
2015-05-11 12:04:31 -07:00
Seth Alves
de9e74a725
put max-octree-pps in Application rather than in the Octree
2015-05-11 12:01:13 -07:00
Howard Stearns
51a29bdba6
Put back the script-fix that belongs in this branch.
2015-05-11 11:53:48 -07:00
Seth Alves
83748096ef
max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree
2015-05-11 11:37:53 -07:00
