Philip Rosedale
65277e0573
Merge pull request #4836 from ctrlaltdavid/20535
...
CR for #20535 - Improve DDE eyelid control
2015-05-12 17:00:02 -07:00
Philip Rosedale
107faf39c4
Merge pull request #4844 from huffman/color-picker-reduce-size
...
Make edit color picker slimmer
2015-05-12 16:35:09 -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
4a533748f4
Merge pull request #4848 from PhilipRosedale/master
...
update position and rotation from the script, even though we should not have to
2015-05-12 16:13:29 -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
Brad Davis
fa416cf382
Merge pull request #4843 from sethalves/line-entity
...
Line entity
2015-05-12 15:51:04 -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
Brad Davis
4d53010ab0
Merge branch 'master' into info-view
2015-05-12 14:58:22 -07:00
samcake
81e9918a4c
Merge pull request #4845 from highfidelity/revert-4837-dk1
...
Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing t…
2015-05-12 14:36:56 -07:00
samcake
6e8c067bcb
Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"
2015-05-12 14:34:43 -07:00
Ryan Huffman
2e31cca7e5
Make edit color picker slimmer
2015-05-12 14:03:06 -07:00
Philip Rosedale
11ab97e0fc
update position and rotation from the script, even though we should not have to.
2015-05-12 13:11:11 -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
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
Stephen Birarda
2185cf1883
Merge pull request #4842 from ZappoMan/fixParticles
...
fix particle properties
2015-05-12 14:07:21 -04: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
Brad Hefta-Gaub
a32b4df6a5
Merge pull request #4841 from huffman/color-picker
...
Fix skybox color picker
2015-05-12 09:24:50 -07:00
Ryan Huffman
e673746d58
Fix skybox color picker
2015-05-12 09:22:53 -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
9e308cce21
Merge pull request #4839 from huffman/color-picker
...
Add color picker to entity properties
2015-05-12 08:58:41 -07:00
Brad Hefta-Gaub
cbaa503934
Merge pull request #4838 from Atlante45/quiet_compiler
...
Quiet compiler
2015-05-12 08:57:57 -07:00
Ryan Huffman
9f7e90d036
Add color picker to entity properties
2015-05-12 08:40:44 -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
91939ff4ed
Merge pull request #4832 from jherico/magnifier
...
Fix magnifier location
2015-05-12 14:32:23 +02:00
Clément Brisset
0bc12f40e6
Merge pull request #4834 from huffman/edit-draw-zone-boundaries
...
Remove old zone drawing
2015-05-12 14:29:42 +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
464925ecc7
Fixing the assignment client
2015-05-12 01:15:30 -07: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
David Rowe
909aaab434
Better preference description
2015-05-11 17:19:50 -07:00
David Rowe
d92aca72a0
Fix typo
2015-05-11 17:11:53 -07:00
David Rowe
5832259643
Add preferences slider for webcam eyelid closing threshold
2015-05-11 17:11:52 -07:00
David Rowe
667ad9b0cb
Add menu option to enable/disable binary webcam eyelid control
2015-05-11 17:11:51 -07:00
Sam Gateau
e6bba04151
Enable the color blending for the skybox
2015-05-11 17:05:45 -07:00
ZappoMan
a2a1bf4e8c
make stars fade in as sun drops below horizon
2015-05-11 16:32:27 -07:00
Stephen Birarda
68af209417
call Setting::init from Interface setupEssentials
2015-05-11 16:20:03 -07:00
Philip Rosedale
0e033cf700
Merge pull request #4835 from sethalves/no-grab-gravity
...
if two people grab an enitity at once, don't forget about the original gravity
2015-05-11 16:14:19 -07:00
Seth Alves
237eb72bec
if two people grab an enitity at once, don't forget about the original gravity
2015-05-11 16:01:50 -07:00
Ryan Huffman
24739d24e1
Fix calls to set draw zone boundaries
2015-05-11 15:23:39 -07:00
