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 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
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
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
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
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
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
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
Atlante45
e51040db53
CR
2015-05-11 14:31:22 +02:00
Atlante45
f941ca9601
Merge branch 'master' of https://github.com/highfidelity/hifi into fix_wireframe
2015-05-11 14:20:16 +02:00
Brad Hefta-Gaub
b572c13660
Merge pull request #4817 from sethalves/fix-octree-max-pps
...
undo mistaken change of setting name
2015-05-10 21:26:46 -07:00
Sam Gateau
9c27106435
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2015-05-10 18:04:53 -07:00
Seth Alves
e6023c59c1
if _reply is NULL, it doesn't make sense to worry about if it's finished loading or not.
2015-05-10 17:15:48 -07:00
Seth Alves
68e01d2bd9
quiet compiler
2015-05-10 17:03:42 -07:00
ZappoMan
17c3c1a18d
add support for automatic hour/day calculations and backward compatibility on stage properties
2015-05-10 15:22:02 -07:00
Seth Alves
34deba7fff
undo mistaken change of setting name
2015-05-09 17:59:45 -07:00
David Rowe
70f7329a7e
Disable pragma that Windows doesn't know about
2015-05-09 17:59:10 -07:00
Howard Stearns
6337158cfc
Fix "simple inline/"direct code injection" entity scripts fail to load" ( https://app.asana.com/0/32622044445063/33562012389754 )
2015-05-09 13:34:35 -07:00
Howard Stearns
c0a71da9e3
Handle empty face groups, such as in the rama cyclinder that crashed the Friday meeting ( http://headache.hungry.com/~seth/hifi/stickCollisionModel.obj ).
2015-05-09 13:16:34 -07:00
Sam Gateau
23ef568269
fixing file
2015-05-09 11:48:30 -07:00
Sam Gateau
d51904b7b3
fixing file
2015-05-09 11:43:21 -07:00
Sam Gateau
5a11143a5d
Using the skybox cubemap for ambient lighting
2015-05-09 11:40:46 -07:00
ZappoMan
0b6a815a20
moved zone stage properties into a group
2015-05-08 20:17:01 -07:00
Stephen Birarda
ebeba81233
make sure an ACM asks for PID in log
2015-05-08 17:37:48 -07:00
Philip Rosedale
72e1ea688a
Merge pull request #4808 from ZappoMan/moreZoneProperties
...
add has stars to edit.js & fix background mode: nothing bug
2015-05-08 17:10:45 -07:00
Stephen Birarda
acac2f5a22
don't init if Settings not init
2015-05-08 16:51:27 -07:00
