Howard Stearns
c5b8dd51d8
Fix https://app.asana.com/0/32622044445063/34195351184789
...
Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked.
Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.
2015-05-20 11:07:03 -07:00
Seth Alves
a769cfdaf2
client decides on new entity-ids, keep EntityItemID class
2015-05-20 10:42:19 -07:00
Brad Davis
827d7f6221
Merge branch 'master' into dk1
2015-05-20 09:41:20 -07:00
Atlante45
9b49936d29
TextRenderer memory leak
2015-05-20 16:41:47 +02:00
Andrew Meadows
2f4162f447
cleanup of AvatarManger API
2015-05-19 16:53:30 -07:00
Seth Alves
f9d46b0cb5
interface decides on entityIDs rather than bouncing a temporary id through the entity server
2015-05-19 14:25:23 -07:00
Andrew Meadows
f86c419988
stubbery for collidable avatars
2015-05-19 14:15:26 -07:00
Atlante45
a9a0c9f387
Render 3D overlays before entities
...
This gets rid of some issues due to entities moving to render pipeline
2015-05-18 17:13:32 +02:00
Atlante45
a7ee10001a
Remove used deprecated methods
...
Also added a warning on the single one in use right now,
so that it gets deleted once it is moved to the rendering pipeline
2015-05-18 16:37:28 +02:00
Sam Cake
580339e99f
Merge branch 'master' of https://github.com/highfidelity/hifi into yellow
2015-05-15 17:24:59 -07:00
Sam Cake
e9ff06df24
FIx the issue where the view frustum used in the skybox wasn;t in sync with the true camera, except if shadows is on, THe one call missing is now always executed
2015-05-15 17:22:29 -07:00
Philip Rosedale
36b396b9ef
Merge pull request #4881 from ctrlaltdavid/fix-binary-eyelid
...
Fix visibility of binary eyelid control menu item
2015-05-15 17:19:15 -07:00
Philip Rosedale
0d00393eff
Merge pull request #4854 from ctrlaltdavid/fix-facetracker-rotation
...
Fix facetracker rotation
2015-05-15 17:17:30 -07:00
David Rowe
d3cb6a9334
Fix visibility of binary eyelid control menu item
2015-05-15 09:40:32 -07:00
Brad Davis
6797174b97
Fix picking in the HMD
2015-05-14 19:15:47 -07:00
Seth Alves
41d77e6146
Merge pull request #4852 from AndrewMeadows/nova
...
improved distributed simulation ownership negotiation
2015-05-14 11:40:49 -07:00
Ryan Huffman
0cd60782e7
Add error handling to JSConsole
2015-05-14 11:00:30 -07:00
Philip Rosedale
e0e026c639
Merge pull request #4862 from birarda/master
...
fixes for other avatar receive stats rendering
2015-05-14 10:19:09 -07:00
Andrew Meadows
81d06e0dc3
Merge upstream/master into andrew/nova
...
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/entities/src/EntityItemProperties.cpp
2015-05-14 10:09:55 -07:00
Brad Hefta-Gaub
d1f52231be
Merge pull request #4863 from samcake/orange
...
Using the skymap for ambient lighting
2015-05-14 09:12:46 -07:00
David Rowe
ff7b2016b4
Add option to auto mute microphone after lose face tracking
2015-05-14 08:50:43 -07:00
David Rowe
95a565627c
Make DDE isTracking() behave the same as Faceshift's
2015-05-14 08:49:44 -07:00
Brad Davis
e20d2ffb15
Merge typo
2015-05-13 21:39:04 -07:00
Brad Davis
c94b8b6e30
Merge branch 'master' into dk1
...
Conflicts:
interface/src/devices/OculusManager.cpp
interface/src/devices/TV3DManager.cpp
2015-05-13 21:25:56 -07:00
Brad Hefta-Gaub
77019eafa7
Merge pull request #4831 from jherico/plugins_pt2
...
Display plugins part 2
2015-05-13 20:40:33 -07:00
Brad Hefta-Gaub
3b7acae8a2
Merge pull request #4850 from jherico/web-entity
...
Web entity
2015-05-13 17:02:55 -07:00
Sam Cake
d13106f4c9
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-05-13 16:00:42 -07:00
Stephen Birarda
57fa3d8c53
fixes for other avatar receive stats rendering
2015-05-13 14:43:31 -07:00
Brad Davis
3b7e8a69b5
Attempting to fix threading issues with web entities
2015-05-13 14:00:41 -07:00
Bradley Austin Davis
a0097bcff8
Fixing offscreen rendering on retina display, even without a proxy window
2015-05-13 12:26:46 -07:00
Seth Alves
80749195e6
don't ddeTracker->init if HAVE_DDE isn't set
2015-05-13 11:44:42 -07:00
David Rowe
7319c7b767
Fix face-tracked head rotation for Faceshift, also
2015-05-13 11:35:04 -07:00
David Rowe
5050171d30
Fix face-tracked head disappearing into body
...
Normalize quaternion to ensure that acos(r.w) is valid (r.w <= 1.0) and
r.w = 1.0 when r.x = r.y = r.z = 0.0.
2015-05-13 11:34:19 -07:00
Sam Cake
8324268ec8
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-05-13 11:32:39 -07:00
Philip Rosedale
96b761357b
Merge pull request #4853 from huffman/remove-scripts-tip
...
Remove scripts 'Tip' label and fix tool window heights
2015-05-13 11:21:49 -07:00
Philip Rosedale
a5c49b7a13
Merge pull request #4813 from ctrlaltdavid/20532
...
CR for 20532 - Default face tracking to Use Camera for first time users
2015-05-13 11:06:46 -07:00
Brad Davis
9b6c20d93c
Merge remote-tracking branch 'upstream/master' into web-entity
2015-05-13 09:49:53 -07:00
Bradley Austin Davis
fc825f6632
Fixing the loading of local HTML so it works on both OSX and win32
2015-05-13 09:46:24 -07:00
Ryan Huffman
7ff9422717
Fix runningScripts and tool window height
2015-05-13 09:45:18 -07:00
Ryan Huffman
8e5438a4ad
Remove scripts 'Tip' label
2015-05-13 09:32:17 -07:00
Andrew Meadows
fb34a5ba84
renaming and cleanup
2015-05-13 08:44:10 -07:00
Philip Rosedale
b658c26799
Merge pull request #4840 from jherico/menu
...
Only display new menu in VR mode
2015-05-13 08:15:04 -07:00
Brad Davis
a8d343bbf1
Working on web entities
2015-05-13 00:27:57 -07:00
Sam Cake
04d3f690dc
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-05-12 23:12:37 -07:00
Sam Cake
536fff4502
Trying to create the SH from the skybox cubemap
2015-05-12 23:11:52 -07:00
Brad Davis
e9b83e1c02
Working on web entities
2015-05-12 21:15:54 -07:00
David Rowe
8a3c8e0d9a
Merge branch 'master' into 20532
...
Conflicts:
interface/src/devices/DdeFaceTracker.cpp
2015-05-12 17:41:12 -07:00
Philip Rosedale
349886c146
Merge pull request #4847 from birarda/domain-paths
...
add initial support for local paths in domain
2015-05-12 17:09:13 -07:00
Philip Rosedale
65277e0573
Merge pull request #4836 from ctrlaltdavid/20535
...
CR for #20535 - Improve DDE eyelid control
2015-05-12 17:00:02 -07:00
Brad Davis
8c4f802dbf
Merge remote-tracking branch 'upstream/master' into web-entity
...
Conflicts:
libraries/entities/src/EntityItemProperties.h
libraries/entities/src/EntityTypes.h
2015-05-12 15:56:02 -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
Brad Davis
f42e0c696a
Merge branch 'master' into menu
2015-05-12 14:58:42 -07:00
Brad Davis
41d587bd2e
Revert "Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff""
...
This reverts commit 6e8c067bcb
2015-05-12 14:47:44 -07:00
Brad Davis
32c1b5e4c5
Merge remote-tracking branch 'upstream/master' into dk1
...
Conflicts:
interface/src/Camera.h
2015-05-12 14:46:34 -07:00
Brad Davis
02a6b557dd
Restoring position as a slot
2015-05-12 14:45:38 -07:00
Brad Davis
64d0aa39dd
Merge branch 'master' into dk1
2015-05-12 14:43:33 -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
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
Brad Davis
f844dcd25f
Only display new menu in VR mode
2015-05-12 09:05:24 -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
9bf4cf1262
Merge pull request #4830 from ZappoMan/moreZoneProperties
...
New Zone Features
2015-05-12 14:28:01 +02:00
Brad Davis
666caf0d59
Working on fixing DK1 and santizing the transform stuff
2015-05-12 00:44:30 -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
David Rowe
909aaab434
Better preference description
2015-05-11 17:19:50 -07:00
David Rowe
d92aca72a0
Fix typo
2015-05-11 17:11:53 -07:00
David Rowe
5832259643
Add preferences slider for webcam eyelid closing threshold
2015-05-11 17:11:52 -07:00
David Rowe
667ad9b0cb
Add menu option to enable/disable binary webcam eyelid control
2015-05-11 17:11:51 -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
Brad Davis
69937d21f2
Addressing the actual gcc bug
2015-05-11 14:40:10 -07:00
Brad Davis
44238d02ae
Tweak the tv 3d manager to get around apparent GCC bug
2015-05-11 14:30:59 -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
b29fbfe693
Merge branch 'magnifier' into plugins_pt2
2015-05-11 13:59:07 -07:00
Brad Davis
e58976fe5a
Fix magnifier location
2015-05-11 13:56:49 -07:00
Brad Davis
abab54aed8
Working on display plugins
2015-05-11 13:08:53 -07:00
Brad Davis
6a5c7b8b42
Merge remote-tracking branch 'upstream/master' into plugins_pt2
...
Conflicts:
libraries/script-engine/src/MenuItemProperties.cpp
2015-05-11 12:40:17 -07:00
Brad Davis
1624ca4120
Merge branch 'master' into plugins_pt2
2015-05-11 12:32:49 -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
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
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
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
David Rowe
5092e385b1
Disable "calibrate" menu item if webcam isn't enabled
2015-05-08 18:39:22 -07:00
David Rowe
15b8dc4144
Don't start calibration if the camera is muted
2015-05-08 18:18:15 -07:00
David Rowe
e26147fc94
Do a reset at the end of calibration
2015-05-08 18:17:59 -07:00
David Rowe
b3b735032d
Automatically calibrate if Use Camera is enabled
...
Do at start up or when Use Camera is first enabled per program run.
2015-05-08 18:16:59 -07:00
David Rowe
9f6bc080c9
Default face tracking to Use Camera for first-time users
...
First time start up with face tracking enabled.
2015-05-08 17:45:21 -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
Bradley Austin Davis
03bd17ed49
Rebasing onto scale changes
2015-05-08 15:09:46 -07:00
