Stephen Birarda
e88cfc913f
make sure viewpoint is prepended with slash
2015-05-12 15:45:13 -07:00
Stephen Birarda
89cb3d66e4
make sure paths are prepended with a slash
2015-05-12 15:39:22 -07:00
Stephen Birarda
edadaea604
add help text for domain-server paths
2015-05-12 15:30:25 -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
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
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
993984134c
add the path to DS response for path query
2015-05-12 12:48:01 -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
Stephen Birarda
3daabd262b
remove debugs from DSSettingsManager
2015-05-12 11:24:47 -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
Stephen Birarda
c49d73ea35
handle root key settings when updating
2015-05-12 10:25:11 -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
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
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
Stephen Birarda
f0aeaa1af8
handle sidebar badging for new root values
2015-05-11 18:07:33 -07:00
Stephen Birarda
542ce944ef
add paths, handling for non-grouped values
2015-05-11 17:44:35 -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
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
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
Ryan Huffman
6085aadbc7
Merge branch 'master' of github.com:highfidelity/hifi into edit-draw-zone-boundaries
...
Conflicts:
examples/libraries/zoneOverlayManager.js
2015-05-11 15:19:54 -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
Brad Davis
e58976fe5a
Fix magnifier location
2015-05-11 13:56:49 -07:00
Sam Gateau
45e70c98f8
Fixed the cube map loading issue
2015-05-11 13:43:15 -07:00
