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 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
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
Sam Gateau
45e70c98f8
Fixed the cube map loading issue
2015-05-11 13:43:15 -07:00
ZappoMan
28bacb4d82
add center in zone button to edit.js
2015-05-11 13:26:52 -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
Stephen Birarda
7b903d29e7
fix missed conflict on merge with upstream/master
2015-05-11 12:58:00 -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
Brad Hefta-Gaub
09d7df9ee2
Merge pull request #4828 from howard-stearns/inline-entity-scripts
...
Inline entity scripts
2015-05-11 12:25:18 -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
ead200b77a
remove unneeded code
2015-05-11 12:03:10 -07:00
Seth Alves
9bd101ee2a
oops
2015-05-11 12:01:59 -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
Stephen Birarda
8c6715e4fc
resolve conflicts on merge with upstream/master
2015-05-11 11:10:22 -07:00
Nex Pro
fb9ff6e016
In some cases when the addMenuItem function was called the separator boolean was true by default.
...
This fix addresses this issue by setting it to false.
2015-05-11 18:50:54 +01:00
Sam Gateau
72c3270ec6
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2015-05-11 10:48:29 -07:00
Sam Gateau
f1fcce3ea0
refactoring th ecube texure loading to support 2 different layouts
2015-05-11 10:47:45 -07:00
Howard Stearns
8d362ce793
Merge branch 'master' of https://github.com/highfidelity/hifi into inline-entity-scripts
2015-05-11 10:44:01 -07:00
Clément Brisset
5160eb5b94
Merge pull request #4819 from ZappoMan/moreZoneProperties
...
More Zone Atmosphere Work: add automatic day/hour calculation
2015-05-11 19:38:27 +02:00
Seth Alves
d86b22f7c8
Merge pull request #4824 from howard-stearns/cache-mod-time
...
Cache mod time
2015-05-11 10:38:23 -07:00
Howard Stearns
0474477399
Merge branch 'master' of https://github.com/highfidelity/hifi into inline-entity-scripts
2015-05-11 10:32:15 -07:00
Clément Brisset
421ebeb3d7
Merge pull request #4795 from birarda/sequence-numbers
...
add sequence number support to NL, don't double send data from AvatarMixer
2015-05-11 19:23:33 +02:00
Philip Rosedale
c3828e4152
Merge pull request #4782 from ctrlaltdavid/20531
...
DO NOT MERGE - QA for #20531 - Don't flash whole screen when audio clips
2015-05-11 10:18:07 -07:00
Howard Stearns
57f0d9435d
Remove change that doesn't belong in this branch.
2015-05-11 10:17:31 -07:00
Howard Stearns
cdef09c9dd
Add comment (and force previous change to the right branch).
2015-05-11 10:12:03 -07:00
Howard Stearns
aed165809c
Use resource cache as long as it is no older than network resource.
...
This allows chache to be used when cdn provides different values for get-vs-head, or for cdn with different resource times in different requests of different sessions.
2015-05-11 10:01:49 -07:00
Stephen Birarda
2dc866755d
fix OS comments, remove test call from Agent
2015-05-11 09:56:10 -07:00
ZappoMan
4b8c6fc624
fix typo
2015-05-11 09:53:23 -07:00
Howard Stearns
17e3f3b48d
Merge branch 'master' of https://github.com/highfidelity/hifi into inline-entity-scripts
2015-05-11 09:35:31 -07:00
David Rowe
662f07a921
Better #if condition for clang
2015-05-11 09:31:12 -07:00
Clément Brisset
d2046c0685
Merge pull request #4821 from sethalves/fix-http-cache
...
Fix http cache
2015-05-11 18:19:00 +02:00
Brad Hefta-Gaub
12269ff475
Merge pull request #4822 from Atlante45/edit_js
...
Hide/Show Skybox/Atmosphere props only when needed
2015-05-11 09:10:03 -07:00
Brad Hefta-Gaub
9d573fa0fc
Merge pull request #4801 from Atlante45/fix_wireframe
...
Fix wireframe render for meshes with special properties
2015-05-11 09:07:47 -07:00
