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
Clément Brisset
7f8ac5013d
Merge pull request #4818 from sethalves/no-grab-gravity
...
while grabbing an entity, zero out its gravity.
2015-05-11 16:06:00 +02:00
Atlante45
beba293d96
Hide Skybox/Atmosphere prps when not needed
2015-05-11 15:54:30 +02:00
Atlante45
94765f0c53
Add print type
2015-05-11 15:54:14 +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
d6475a4634
Merge pull request #4814 from howard-stearns/empty-faces
...
Handle empty face groups...
2015-05-10 17:36:33 -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
Anthony J. Thibault
ede42285b1
Improvements to particle entity.
...
* Changed particle geometry to billboarded quads
* Added texture support
* Added ajt-test.js particle test script.
* GeometryCache support for batched quads with texCoords.
* Bug fix for infinite loop if _lifetime was very large.
* Don't reset the simulation on animation loop.
* stop emitting particles on animation stop, but keep simulating until there are no more living particles.
* Removed some trailing whitespace
2015-05-10 17:13:46 -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
8da3490a4c
when grabbing an entity, zero out its gravity.
2015-05-10 09:32:03 -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
Stephen Birarda
be03a65dc7
remember the pid of previous child processes
2015-05-08 17:30:22 -07:00
Stephen Birarda
7b91dbfe07
wait on all children simultaneously
2015-05-08 17:24:20 -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
2916596948
put back call to clearAccessCache
2015-05-08 16:54:35 -07:00
Stephen Birarda
acac2f5a22
don't init if Settings not init
2015-05-08 16:51:27 -07:00
Brad Hefta-Gaub
8d211957e0
Merge pull request #4812 from howard-stearns/edit-script-typo
...
Edit script typo
2015-05-08 16:25:29 -07:00
Brad Hefta-Gaub
a517e773f4
Merge pull request #4786 from ctrlaltdavid/20530
...
CR for #20530 - Add DDE calibration
2015-05-08 16:25:02 -07:00
Stephen Birarda
ddb52348bc
don't force use of Settings to all QCoreApplication
2015-05-08 16:24:39 -07:00
Stephen Birarda
83cd50c7ae
use waitOnChildren again from checkSpares
2015-05-08 16:24:20 -07:00
Stephen Birarda
ba2ccc1e98
change waitOnChildren syntax in AC monitor
2015-05-08 16:23:44 -07:00
Howard Stearns
abc99267af
Typo was making edit.js fail and impossible to debug.
2015-05-08 16:19:39 -07:00
Howard Stearns
37eb455e38
Merge branch 'master' of https://github.com/highfidelity/hifi into objReader-tweak
2015-05-08 16:06:53 -07:00
Brad Hefta-Gaub
5bab226d64
Merge pull request #4811 from AndrewMeadows/isothermal
...
remove verbose log about failure to build shape
2015-05-08 15:55:16 -07:00
Brad Hefta-Gaub
bfb2b278ee
Merge pull request #4791 from jherico/scale
...
Fixing scale resolution issues
2015-05-08 15:54:24 -07:00
