Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-14 14:14:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
25840 commits 25 branches 0 tags 1.1 GiB
Commit graph

12054 commits

Author SHA1 Message Date
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
333da93642 Updated face tracker mute icons 2015-05-05 23:20:23 -07: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
David Rowe
e689b6a869 Remove leading Unicode control chars 2015-05-01 12:07:00 -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
Philip Rosedale
0322e64a79 Merge pull request #4718 from ctrlaltdavid/20513 
CR for 20513 - Adapt DDE control of eyes to be predominantly open or closed
 2015-04-30 20:13:59 -07:00
Brad Hefta-Gaub
3477bc5323 Merge pull request #4732 from sethalves/json-skip-default-values 
Json skip default values
 2015-04-30 17:56:24 -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
Seth Alves
a0ad7a22a6 Merge branch 'master' of github.com:highfidelity/hifi into json-skip-default-values 2015-04-30 11:28:33 -07:00
Seth Alves
f75b599288 don't save default values in json file 2015-04-30 11:28:27 -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
475c399d22 Menu polish on OSX 2015-04-29 02:54:47 -07:00
Brad Davis
87ef98005d menu polish 2015-04-29 02:42:57 -07:00
Bradley Austin Davis
75f6ad3b99 Working on menus look 2015-04-29 00:43:18 -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
c685874b05 Merge pull request #4705 from birarda/avatar-mixer-throttling 
add macro to recursively correctly handle OS X bundle resources
 2015-04-28 01:19:36 -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
d1d1830b2f Importing peferred dialog look from browser branch 2015-04-28 00:26:24 -07:00
Brad Davis
1f9f4270d7 Working on browsers and look of dialogs 2015-04-28 00:24:18 -07:00
Brad Davis
f86b9f62b9 Adding key to trigger a browser window 2015-04-27 23:16:35 -07:00
Brad Davis
694c215da1 Merge branch 'vr_menus' into browser 2015-04-27 23:00:32 -07:00
Brad Davis
b0eccc40c2 Fix crash cause when Menu::instance() is before offscreen ui startup 2015-04-27 22:58:09 -07:00
Brad Davis
4bb5e562ea Browser work 2015-04-27 22:39:48 -07:00
David Rowe
d6eb04c3b0 Fix audio-driven mouth viewed by others 2015-04-27 21:43:57 -07:00
Brad Davis
19ca543c2c Cleaning up code and tweaking menu layout 2015-04-27 19:07:53 -07:00
Brad Davis
7bd8bbf565 Merge branch 'vr_menus' into infoview 2015-04-27 18:33:45 -07:00
Brad Davis
10b5935063 Let QML take care of more of the height/width stuff 2015-04-27 18:11:19 -07:00
ZappoMan
62a421361c fix crash in scripts using useAvatar methods 2015-04-27 16:58:34 -07:00
Stephen Birarda
ec2f54b90a add a macro to recursively correctly handle resources 2015-04-27 16:02:52 -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
Brad Davis
1beaf18d1b Prevent the login dialog from spawning the address bar on enter keys 2015-04-27 16:00:23 -07:00
Brad Davis
fd28baac8c Working on message box and addressbar tweaks 2015-04-27 15:42:20 -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
Bradley Austin Davis
ca16d37ce5 Mac testing 2015-04-27 12:46:34 -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
Brad Davis
0b1df891af Backporting visual work from branch 2015-04-27 10:53:58 -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
fa31ba0754 Info-view 2015-04-26 10:37:14 -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
Brad Davis
a96f69a673 Switching to a wrapper mechanism for VR menus 2015-04-25 16:20:15 -07:00
David Rowe
6071e44ba4 Regularize debug messages for Faceshift and DDE 2015-04-25 11:35:14 -07:00
David Rowe
c37eb3de8a Fix DDE shutdown 2015-04-25 11:34:50 -07:00
David Rowe
736691e3ec Refactor face tracking FPS calculation 2015-04-25 11:33:32 -07:00
Seth Alves
b69cba1aba respond to code-review 2015-04-25 10:50:18 -07:00
Brad Davis
ee30588fd4 More menu work 2015-04-25 10:41:06 -07:00
Seth Alves
0fb1a83e3b quiet compiler, remove some trailing control-Ms 2015-04-25 09:20:00 -07:00
Atlante45
ba507cef98 Fix a few warnings 2015-04-25 11:01:02 +02:00
Brad Davis
fbdb9b143e Merge branch 'ui-refactor' into m_and_m 
Conflicts:
	interface/resources/qml/HifiMenu.qml
	interface/resources/qml/MessageDialog.qml
	interface/resources/qml/Root.qml
	interface/resources/qml/TestRoot.qml
	interface/resources/qml/controls/Dialog.qml
	interface/src/Application.cpp
	interface/src/ui/LoginDialog.cpp
	libraries/ui/src/MessageDialog.cpp
	libraries/ui/src/MessageDialog.h
	libraries/ui/src/OffscreenQmlDialog.h
	libraries/ui/src/OffscreenUi.cpp
	libraries/ui/src/OffscreenUi.h
	tests/ui/src/main.cpp
 2015-04-24 18:02:12 -07:00
Brad Davis
9fbd5d79e4 Removing duplicate declaration 2015-04-24 17:46:56 -07:00
Brad Davis
dab8761c71 Merge remote-tracking branch 'upstream/master' into ui-refactor 2015-04-24 16:46:48 -07:00
Brad Davis
e7b8efc2d9 Cleaning up unused stuff 2015-04-24 16:44:48 -07:00
Brad Davis
08d60c6a01 Fixing message dialog 2015-04-24 16:19:39 -07:00
Brad Davis
e5df17eb99 Merge pull request #4691 from ZappoMan/defaultAvatars 
fix default avatars on first run
 2015-04-24 16:17:26 -07:00
Brad Hefta-Gaub
dbb1e3c820 Merge pull request #4682 from jherico/offscreen 
Attempting to fix backspace issue in new UI
 2015-04-24 16:10:42 -07:00
Brad Hefta-Gaub
4fccb74855 Merge pull request #4692 from huffman/checkbox-fix 
Checkbox fix
 2015-04-24 16:08:52 -07:00
Clément Brisset
23ac8b1c8c Merge pull request #4693 from ctrlaltdavid/faceshift-fps 
Log Faceshift FPS after a reset
 2015-04-24 23:59:37 +02:00
David Rowe
e33f3c9d00 Remove unnecessary #include 2015-04-24 13:42:56 -07:00