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
68af209417
call Setting::init from Interface setupEssentials
2015-05-11 16:20:03 -07:00
Sam Gateau
f2c4e04a5a
clean up for pr
2015-05-11 14:06: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
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
Sam Gateau
72c3270ec6
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2015-05-11 10:48:29 -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
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
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
Brad Hefta-Gaub
bfb2b278ee
Merge pull request #4791 from jherico/scale
...
Fixing scale resolution issues
2015-05-08 15:54:24 -07:00
Clément Brisset
55bcb992d9
Merge pull request #4796 from sethalves/fix-octree-max-pps
...
Fix octree max pps
2015-05-08 16:28:42 +02:00
Clément Brisset
cc4ec8edda
Merge pull request #4799 from ctrlaltdavid/destroy-trackers
...
Delete Leap and RealSense devices on shutdown
2015-05-08 16:17:00 +02:00
David Rowe
e20df0e2bf
Delete Leap and RealSense devices on shutdown
...
Leaving them running prevents a clean shutdown on Windows when running
Interface.exe from a command line: the interface.exe process stays alive
preventing Interface from being run again from the command line without
manually terminating the running process.
2015-05-07 18:28:49 -07:00
Seth Alves
c1e3500f3c
voxelDetailsForCode returns a ratio, cubeinfrustrum takes meters
2015-05-07 16:01:08 -07:00
Stephen Birarda
305835ea79
Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers
2015-05-07 15:38:35 -07:00
David Rowe
cac6ae1148
Merge branch 'master' into 20530
2015-05-07 13:34:42 -07:00
Bradley Austin Davis
c31d36be59
Fixing scale resolution issues
2015-05-07 12:01:56 -07:00
Seth Alves
d52a45b57e
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-07 11:30:46 -07:00
Atlante45
cafaeed822
Restore polygon mode after entities rendering
...
Default setting are causing issues so we just reset the polygon mode
since this won't matter once everything has moved to the new rendering
pipeline.
2015-05-07 13:34:22 +02:00
David Rowe
afce981d83
Merge branch 'master' into 20530
...
Conflicts:
interface/src/Application.cpp
interface/src/devices/DdeFaceTracker.cpp
interface/src/devices/DdeFaceTracker.h
2015-05-06 16:27:33 -07:00
Seth Alves
e73503a53d
Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1
2015-05-06 16:05:13 -07:00
Andrew Meadows
584b643791
lock entitySimulation during physics simulation
2015-05-06 16:01:00 -07:00
Seth Alves
a057d7dfa3
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-06 14:41:54 -07:00
Brad Hefta-Gaub
5551997cdc
Merge pull request #4780 from samcake/blue
...
Add support for Skybox and rendering path of background according to Zones
2015-05-06 14:41:06 -07:00
Seth Alves
fe06ce2931
pull from upstream
2015-05-06 14:31:22 -07:00
Sam Gateau
1b5185abeb
fix the conditional on the texture pointer which was wrong and bring back atmosphere sky dome
2015-05-06 12:19:19 -07:00
Seth Alves
a72ac3ead2
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-06 12:19:04 -07:00
Bradley Austin Davis
ea6f840fdb
Merge remote-tracking branch 'upstream/master' into plugins_pt1
2015-05-06 12:18:04 -07:00
Brad Hefta-Gaub
4de6d645e5
Merge pull request #4701 from jherico/infoview
...
Infoviews & Browser in QML
2015-05-06 12:12:21 -07:00
Bradley Austin Davis
fc73676b4d
Merge branch 'master' into plugins_pt1
2015-05-06 11:43:25 -07:00
Bradley Austin Davis
4c22e637d7
Merge remote-tracking branch 'upstream/master' into off_axis
2015-05-06 11:28:03 -07:00
Bradley Austin Davis
c832fd969a
Removing off-axis projection from menu
2015-05-06 11:26:46 -07:00
Seth Alves
238a41f2b9
pull from upstream
2015-05-06 11:22:18 -07:00
Stephen Birarda
5b1514a390
Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers
2015-05-06 10:12:17 -07:00
Philip Rosedale
e2541c4243
Merge pull request #4740 from ctrlaltdavid/20518
...
CR for #20518 - Mute camera button next to mute audio button
2015-05-06 09:54:42 -07:00
Sam Gateau
c86a8b3944
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2015-05-06 09:54:08 -07:00
Sam Gateau
dc81a3ecc2
Cube texture are working with the GL backend, useing it in SKybox successfullly
2015-05-06 09:53:36 -07:00
Seth Alves
ff104bb915
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-06 08:55:06 -07:00
David Rowe
91a06ea3c4
Add "Calibrate Camera" menu item for DDE face tracking
2015-05-05 21:15:32 -07:00
David Rowe
b519884609
Fix lobby not displaying in HMD mode
...
This usage of Glower is similar to that in renderAvatarBillboard(). Both
may indicate that something needs changing in the graphics pipeline.
2015-05-05 20:54:12 -07:00
David Rowe
1c21874f00
Make face tracker mute action start / stop face tracker
2015-05-05 16:51:31 -07:00
David Rowe
35dbb9491c
Merge branch 'master' into 20518
2015-05-05 13:13:49 -07:00
Seth Alves
8aafce6382
Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1
2015-05-05 12:53:28 -07:00
Stephen Birarda
6b3cf1ba4a
remove dependency of PacketHeaders on NodeList
2015-05-05 12:19:42 -07:00
Sam Gateau
13482575d2
merge
2015-05-05 12:03:45 -07:00
