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
Bradley Austin Davis
0751443a01
Merge branch 'master' into scale
2015-05-08 15:03:24 -07:00
Atlante45
6d0ca40aae
Set pointer to nullptr after delete
2015-05-08 18:21:42 +02: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
c4e9807259
Merge branch 'master' into 20531
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
2015-05-07 21:01:22 -07: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
Andrew Meadows
0942ed5654
Merge pull request #4790 from ctrlaltdavid/face-mute-shortcut
...
Add shortcut key for face tracker muting
2015-05-07 16:56:19 -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
f761ba521a
Quiet compiler
2015-05-07 20:16:03 +02:00
Seth Alves
ddec6d5207
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-07 09:54:09 -07:00
David Rowe
0eeff526d5
Add shortcut key for face tracker muting
2015-05-07 08:51:59 -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
Atlante45
00571dad00
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-07 10:13:59 +02:00
Sam Gateau
bba7dcfe5f
Try to fix the transform stack issue in 1st person
2015-05-06 23:32:02 -07:00
Seth Alves
fabff7fdf4
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-06 18:26:00 -07: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
Philip Rosedale
72da678bc2
Merge pull request #4785 from jherico/scale
...
Fix ensmallened overlay UI
2015-05-06 15:30:01 -07:00
Bradley Austin Davis
561d275dda
Fix ensmallened overlay UI
2015-05-06 15:18:17 -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
Bradley Austin Davis
3c10d29d53
Removing another reference to oculus manager
2015-05-06 14:09:43 -07:00
David Rowe
1fdf2c7803
Don't flash whole screen when audio clips
2015-05-06 13:35:53 -07:00
Bradley Austin Davis
351246fac1
Fixing new image texture use from last upstream merge
2015-05-06 12:50:20 -07:00
David Rowe
4cd4dee84d
Use average coefficient values to zero out bias
...
Adjust control thresholds to suit.
2015-05-06 12:26:44 -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
David Rowe
a6dd08fea8
Calculate average coefficient values
2015-05-06 11:38:14 -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
Clément Brisset
9f8e52652b
Merge pull request #4771 from ctrlaltdavid/20526
...
CR for #20526 - Fix Mixamo avatar clipping in HMD view
2015-05-06 20:17:07 +02:00
David Rowe
e1b5e7caf6
Add DDE calibration count-down
2015-05-06 11:13:19 -07:00
Brad Hefta-Gaub
b27154186b
Merge pull request #4779 from jherico/hmd_tools
...
Fix for HMDTools targeting wrong screen on OSX
2015-05-06 10:46:55 -07:00
Bradley Austin Davis
de49057f17
Fix for HMDTools targeting wrong screen on OSX
2015-05-06 10:32:45 -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
David Rowe
eb438e9ccb
Can use same clipping calc for non-Oculus
2015-05-06 09:58:14 -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
7a5fe8a34e
quiet compiler
2015-05-06 09:05:13 -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
9c1d73747f
Merge branch 'master' into 20526
2015-05-06 08:24:57 -07:00
Atlante45
6d2fe945af
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-06 09:53:57 +02:00
David Rowe
ceeb1dd81f
Remove unused DDE member variables
2015-05-05 21:15:33 -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
Seth Alves
4a7fe50084
Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1
2015-05-05 16:43:43 -07:00
Andrew Meadows
419cfee775
more correct fix for invalid DeviceProxy crash bug
2015-05-05 15:06:51 -07:00
Andrew Meadows
0d4d5d024e
revert last change (fix for invalid DeviceProxy)
2015-05-05 14:59:22 -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
Atlante45
429c1e1231
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-05 21:33:55 +02: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
Sam Gateau
6d02d4d25e
adding skybox step by step
2015-05-05 11:40:00 -07:00
Andrew Meadows
00bea4d274
fix crash for NULL deviceProxy
2015-05-05 11:05:28 -07:00
samcake
61f6139f4f
Merge pull request #4764 from ZappoMan/atmosphereInZones
...
First cut at adding "Atmosphere" support to zone
2015-05-05 11:00:58 -07:00
Bradley Austin Davis
d2a8681139
Merge branch 'master' into infoview
2015-05-05 10:31:19 -07:00
Andrew Meadows
aa5a59c3dc
merge upstream/master into andrew/nova
...
Conflicts:
libraries/entities/src/EntityItem.cpp
libraries/physics/src/PhysicsEngine.cpp
2015-05-05 10:24:17 -07:00
Atlante45
aa10dc3991
Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones
2015-05-05 15:04:11 +02:00
Philip Rosedale
e9476029fb
Merge pull request #4724 from jherico/menu_polish
...
Menu polish
2015-05-04 23:44:06 -07:00
David Rowe
7afd990e2e
Fix Mixamo avatar clipping in HMD view
2015-05-04 22:27:41 -07:00
Philip Rosedale
d52d3513a4
Merge pull request #4768 from jherico/track-camera
...
Remove camera wobble caused by having a face tracker enabled
2015-05-04 18:01:47 -07:00
ZappoMan
77232e35f8
Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones
2015-05-04 17:16:33 -07:00
Bradley Austin Davis
dc1b5a262f
Remove camera wobble cause by the face tracker and by idle animations
2015-05-04 17:03:33 -07:00
ZappoMan
32ef0c2010
removed some dead code
2015-05-04 15:49:21 -07:00
ZappoMan
741323e6c1
wire up atmosphere.hasStars property
2015-05-04 14:19:13 -07:00
Sam Gateau
b36775e781
After a very long debate it's clear that we shouldn;t have change the a and d keys behavior, so we bring them back but with a twist, now RIghtButton + A or D strafe right and left making the controller equivalent to everquest, world of warcraft
2015-05-04 13:57:40 -07:00
ZappoMan
4561c59203
wire up zone to environment atmosphere rendering
2015-05-04 13:49:43 -07:00
Bradley Austin Davis
098a9bd70e
Fixing sixense and restoring lookat
2015-05-04 13:10:16 -07:00
Stephen Birarda
a039d5f28c
Merge pull request #4753 from samcake/orange
...
Introducing UserInputMapper
2015-05-04 14:26:51 -04:00
Sam Gateau
fad623ae48
ANd really add the 2 files we need
2015-05-04 10:47:33 -07:00
Sam Gateau
936eefd4f0
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2015-05-04 10:41:32 -07:00
Sam Gateau
c7153bcc14
fixing commetns from review
2015-05-04 10:40:11 -07:00
Stephen Birarda
aeb04cf9c3
use existing numerical constant in Avatar
2015-05-04 10:28:28 -07:00
Stephen Birarda
6cff75f7c1
resolve conflicts on merge with upstream/master
2015-05-04 10:05:44 -07:00
Bradley Austin Davis
fb3e309a64
Merge branch 'master' into plugins_pt1
2015-05-04 10:00:13 -07:00
Stephen Birarda
7eb965f24f
Merge pull request #4756 from thoys/patch-4
...
Fix for RealSense menu item
2015-05-04 12:46:25 -04:00
Thijs Wenker
9a6e442b25
Fix for RealSense menu item
...
This was missed while moving to the new MenuWrapper class.
2015-05-04 18:07:48 +02:00
Atlante45
12fcb35717
Made RenderArgs a default ctor
2015-05-04 17:22:46 +02:00
Atlante45
fc1519c078
Quiet compiler
2015-05-04 16:49:33 +02:00
Sam Gateau
3921156978
fix end of line
2015-05-04 01:09:25 -07:00
Sam Gateau
b7bacccce7
Fine tunning on windows
2015-05-04 00:54:54 -07:00
samcake
8e65ce34d1
FINe tune the scales for the Mac Book
2015-05-03 23:47:43 -07:00
Sam Gateau
116e29ae57
adjust the timer for touch event to work around the missing touch begin / touch end
2015-05-03 18:40:55 -07:00
Sam Gateau
ae14396fd7
adjust the key mapping for mac book and the scales
2015-05-03 18:03:27 -07:00
samcake
d2e61dba05
Make the nw mapper work for th einputs
2015-05-03 17:34:39 -07:00
Sam Gateau
c9b296693c
bringing the UserInputMapper to the application
2015-05-03 15:45:19 -07:00
Seth Alves
0341caad95
quiet compiler
2015-05-03 11:10:52 -07:00
Andrew Meadows
fef84730bf
remake foundation for CollisionEvents
2015-05-03 09:27:15 -07:00
Brad Davis
e72756ab99
Merge remote-tracking branch 'upstream/master' into plugins_pt1
...
Conflicts:
libraries/render-utils/src/TextureCache.cpp
2015-05-02 00:51:50 -07:00
Brad Davis
302aa9db47
Removing access to the gl widget and display managers
2015-05-02 00:49:52 -07:00
Philip Rosedale
d7cc76e48b
Merge pull request #4735 from jherico/menu_fix
...
Prevent the menu from coming up when alt is applied as a modifier to touch or mouse events
2015-05-02 00:35:49 -07:00
Stephen Birarda
0dbc4780ab
use numerical constants header from LeapMotion
2015-05-01 17:18:35 -07:00
Andrew Meadows
0a102575ee
fix simulation ownership infection
2015-05-01 16:56:00 -07:00
Stephen Birarda
b9c9ff6a14
clean up various warnings
2015-05-01 16:49:13 -07:00
Stephen Birarda
edade7baba
resolve conflicts on merge with upstream master
2015-05-01 16:24:16 -07:00
Andrew Meadows
3031d55c8e
merge upstream/master into andrew/nova
2015-05-01 11:03:51 -07:00
Andrew Meadows
b023fe582a
make things compile
2015-05-01 10:44:50 -07:00
Brad Davis
1e2106e831
Whitespace removal
2015-05-01 10:36:03 -07:00
Stephen Birarda
94739cf8d3
move number constants out of SharedUtil to NumericalConstants
2015-05-01 10:26:53 -07:00
Andrew Meadows
4cb469dd79
cleanup how MotionStates are deleted from physics
...
also fixed some compile errors
removed cruft
2015-05-01 08:28:32 -07:00
David Rowe
7bc995be5e
Add camera muting icons
2015-04-30 23:14:24 -07:00
David Rowe
528f73897c
Make double click face tracking toggle button reset tracking
2015-04-30 23:14:23 -07:00
David Rowe
bc05159504
Add face tracking toggle button beside microphone toggle button
2015-04-30 23:14:22 -07:00
David Rowe
d053379831
Add "Mute Face Tracking" menu item
2015-04-30 23:14:21 -07:00
Brad Davis
57b7be3abe
Prevent the menu from coming up when alt is applied as a modifier to touch or mouse events
2015-04-30 17:43:16 -07:00
David Rowe
e45ecbe2c8
Merge branch 'master' into 20513
...
Conflicts:
interface/src/devices/DdeFaceTracker.cpp
interface/src/devices/DdeFaceTracker.h
2015-04-30 17:22:35 -07:00
David Rowe
807eab9fc4
Fix typo
2015-04-30 12:59:09 -07:00
Stephen Birarda
17142a532f
add stats for max FRD and num avatars last frame
2015-04-30 10:09:23 -07:00
David Rowe
b6890be73d
Adjust eyebrow filter strength
2015-04-30 08:06:46 -07:00
David Rowe
42a4fd8884
Add velocity filtering of DDE eyebrows
2015-04-30 07:55:02 -07:00
David Rowe
81e23eab28
Coding standard
2015-04-29 22:15:49 -07:00
Brad Hefta-Gaub
40d2e97d44
Merge pull request #4673 from ctrlaltdavid/20496
...
CR for 20496 - Modify lobby.js to work as avatar selector
2015-04-29 21:51:08 -07:00
Andrew Meadows
31ab16ac62
move stuff into ObjectMotionState
2015-04-29 16:16:44 -07:00
Andrew Meadows
5a388a0c14
Merge pull request #4722 from birarda/avatar-mixer-debug
...
add option to display AvatarData receive stats with display name
2015-04-29 10:00:24 -07:00
Andrew Meadows
ab38572620
new PhysicsEngine API is mostly in place
...
doesn't compile, of course
large code movements are done
non-physical kinematics have been lost --
will readd in PhysicalEntitySimuation class
2015-04-29 09:48:02 -07:00
Bradley Austin Davis
c4349e797f
Merge remote-tracking branch 'upstream/master' into infoview
2015-04-29 00:15:32 -07:00
Brad Hefta-Gaub
7414201845
Merge pull request #4721 from ctrlaltdavid/20514
...
DO NOT MERGE - QA for 20514 - Move "Stereo Audio" option into developerMenu.js
2015-04-28 20:44:09 -07:00
Stephen Birarda
f9a25d7089
add Menu option to toggle Avatar receive stats
2015-04-28 18:27:54 -07:00
Stephen Birarda
f2dcacffd0
show avatar data receive rate by default with display name
2015-04-28 18:27:42 -07:00
Brad Davis
0fb8884f9c
Merge branch 'browser' into infoview
...
Conflicts:
tests/ui/src/main.cpp
2015-04-28 17:54:04 -07:00
samcake
ff2b1af18c
Merge pull request #4720 from ZappoMan/hackTest
...
Fix entities rendering wrong when avatar scale !== 1.0
2015-04-28 17:30:15 -07:00
Brad Davis
fb2ea3185e
Merge branch 'master' into infoview
2015-04-28 16:42:20 -07:00
Stephen Birarda
404cd67bb7
Merge pull request #4716 from sethalves/assignment-client-exits
...
assignment-client shouldn't try to save contents of its nonexistent address bar
2015-04-28 19:40:44 -04:00
Brad Davis
60ee137004
Merge remote-tracking branch 'upstream/master' into browser
2015-04-28 16:40:37 -07:00
ZappoMan
664d126465
remove scale from Camera class since it was only used by avatar and was causing problems with no obvious benefit
2015-04-28 16:34:33 -07:00
ZappoMan
aec0bd1693
dont change camera scale with avatar scale
2015-04-28 16:26:17 -07:00
samcake
85cd6cbff2
Merge pull request #4700 from jherico/vr_menus
...
VR menus
2015-04-28 15:59:46 -07:00
Andrew Meadows
14b6ee608a
more PhysicalEntitySimulation implementation
...
with changes to API's accordingly (does not compile yet)
2015-04-28 15:07:37 -07:00
ZappoMan
bfbad539e0
hack test
2015-04-28 14:54:58 -07:00
David Rowe
9576ad19a7
Move "Stereo Audio" option into developerMenu.js
...
And rename it "Stereo Input" to better relect what it does.
2015-04-28 14:14:10 -07:00
Seth Alves
28ad80936a
assignment-client shouldn't try to save contents of its nonexistent address bar. interface still needs to save the address.
2015-04-28 13:21:14 -07:00
David Rowe
1d7420d0dc
Adapt DDE control of eyes to be predominantly open or closed
2015-04-28 12:53:11 -07:00
Andrew Meadows
087d0a027d
merge upstream/master into andrew/nova
2015-04-28 10:07:49 -07:00
Andrew Meadows
34974272af
proposal for PhysicsEngine API in Application
2015-04-28 10:06:05 -07:00
Andrew Meadows
e646ff6847
Merge pull request #4708 from ctrlaltdavid/fix-audio-mouth
...
Fix audio-driven mouth viewed by others
2015-04-28 09:28:22 -07:00
Clément Brisset
bc8f6708b6
Merge pull request #4698 from ctrlaltdavid/fps-facetracker
...
Facetracker FPS refactor
2015-04-28 14:04:17 +02:00
Brad Davis
f49f37ac89
Merge pull request #4670 from thoys/fix-run_one_interface_per_user
...
Multiple instances of interface on Windows (one per user)
2015-04-28 01:22:21 -07:00
Brad Davis
f467abcf91
Merge branch 'vr_menus' into browser
2015-04-28 01:18:03 -07:00
Brad Davis
9836ffed97
Merge branch 'vr_menus' into infoview
...
Conflicts:
tests/ui/src/main.cpp
2015-04-28 01:17:51 -07:00
Brad Davis
b4e9dbedbc
Merge remote-tracking branch 'upstream/master' into vr_menus
2015-04-28 00:28:57 -07:00
Brad Davis
f86b9f62b9
Adding key to trigger a browser window
2015-04-27 23:16:35 -07:00
Brad Davis
b0eccc40c2
Fix crash cause when Menu::instance() is before offscreen ui startup
2015-04-27 22:58:09 -07:00
David Rowe
d6eb04c3b0
Fix audio-driven mouth viewed by others
2015-04-27 21:43:57 -07:00
Brad Davis
7bd8bbf565
Merge branch 'vr_menus' into infoview
2015-04-27 18:33:45 -07:00
ZappoMan
62a421361c
fix crash in scripts using useAvatar methods
2015-04-27 16:58:34 -07:00
Brad Davis
59b8b80148
Merge remote-tracking branch 'upstream/master' into vr_menus
...
Conflicts:
interface/src/Menu.cpp
2015-04-27 16:02:13 -07:00
Andrew Meadows
72deb2e49b
merge upstream/master into andrew/thermonuclear
...
Conflicts:
libraries/entities/src/EntityItem.h
libraries/physics/src/EntityMotionState.cpp
2015-04-27 12:54:21 -07:00
Seth Alves
bdc6bb3c2d
Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic
2015-04-27 12:20:58 -07:00
Brad Davis
14b660baf7
Merge branch 'vr_menus' into infoview
...
Conflicts:
tests/ui/src/main.cpp
2015-04-27 11:43:49 -07:00
Brad Davis
76ce34a74b
Scanning for code style
2015-04-27 11:41:10 -07:00
Brad Davis
d55d467d3f
Tweaking VR menu for PR
2015-04-27 11:35:57 -07:00
Brad Davis
1a912787c2
Merge branch 'ui-refactor' into vr_menus
2015-04-27 11:05:14 -07:00
Brad Davis
a12bfd95f4
Merge remote-tracking branch 'upstream/master' into ui-refactor
...
Conflicts:
libraries/render-utils/src/MatrixStack.h
2015-04-27 10:59:57 -07:00
Seth Alves
b23427a3c8
hook up menu-items to control debug rendering of collision hulls and owned simulations
2015-04-27 10:32:47 -07:00
Seth Alves
2cdbe8bf7b
merge from upstream
2015-04-27 09:57:36 -07:00
Seth Alves
e007617112
hook up menu-items to control debug rendering of collision hulls and owned simulations
2015-04-27 09:56:24 -07:00
Brad Davis
b216689b45
Removing old infoview, testing new dialogs
2015-04-27 00:02:11 -07:00
Brad Davis
198224c4ec
Merge branch 'ui-refactor' into menu2
2015-04-25 16:48:05 -07:00
Brad Davis
7c16fd05c1
Merge branch 'master' into ui-refactor
2015-04-25 16:35:43 -07:00
