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

3450 commits

Author SHA1 Message Date
samcake
84525aabec Merge pull request #4959 from ZappoMan/team-teaching-entitysmartpointer 
TEAM TEACHING BRANCH - Entity Smart Pointers
 2015-05-26 13:56:47 -07:00
Howard Stearns
3c718af43f Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples 2015-05-26 13:26:02 -07:00
Sam Gateau
ad0b0cfade FIxing one more issue with compilation on ubuntu regarding the template functions specializationand the namespace 2015-05-26 11:40:35 -07:00
samcake
dd9d758da1 Fixing the compilation issue for real 2015-05-26 10:53:23 -07:00
Sam Gateau
0083ba6f85 trying again 2015-05-25 17:39:31 -07:00
Sam Gateau
ad054a640e Fixing a problem with Mac/ubuntu build maybe 2015-05-25 17:21:03 -07:00
Howard Stearns
cbf4e09a10 Remove global collision event. 2015-05-25 16:10:50 -07:00
Sam Gateau
f0ab6d96f5 merge with upstream team-teaching 2015-05-24 19:45:37 -07:00
Sam Gateau
35b8d45bee Insert a first scene and the engine in the Application and render a first Item 2015-05-24 17:03:43 -07:00
ZappoMan
9988f2d1cd EnitityItem smart pointers 2015-05-22 22:38:02 -07:00
ZappoMan
8b78fc4190 EnitityItem smart pointers 2015-05-22 17:57:50 -07:00
Ryan Huffman
47d9cf42c5 Remove unused lodManager 2015-05-22 16:04:05 -07:00
Ryan Huffman
05f8ba558f Update RenderArgs construction in paintGL 2015-05-22 16:02:24 -07:00
Ryan Huffman
d1a5662ca7 Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
 2015-05-22 15:33:40 -07:00
Ryan Huffman
3f22b5f8b3 Add RenderArgs to more render methods 2015-05-22 15:25:53 -07:00
Sam Gateau
a28c99bb40 Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk 2015-05-22 14:40:00 -07:00
Sam Gateau
e7e3eb2b7c FIrst version of the design for the Engine, the Tasks and a DrawTask. Introduced the ItemFilter 2015-05-22 12:58:18 -07:00
Andrew Meadows
461d08c0a9 merge upstream/master into andrew/bispinor 2015-05-22 11:35:02 -07:00
Atlante45
20ff43e29a Don't sync by default 2015-05-22 20:29:25 +02:00
Ryan Huffman
6fd474a1a3 Fix comment 2015-05-22 09:56:21 -07:00
Ryan Huffman
4a4c9c75fc Add gpu::context to RenderArgs and start using RenderArgs in place of the flags 2015-05-22 09:50:51 -07:00
Andrew Meadows
01cc629224 fix crashes during init and shutdown 2015-05-22 09:20:08 -07:00
Atlante45
e5aa696dda syncInputStateCache 2015-05-22 17:39:08 +02:00
Andrew Meadows
67f5d0773d some list management of AvatarMotionStates 2015-05-21 14:40:47 -07:00
ZappoMan
946878006d Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching 2015-05-20 18:46:32 -07:00
samcake
496898273c Merge pull request #4846 from jherico/dk1 
Second attempt at fixing the HMD eye projections, without breaking the camera this time.
 2015-05-20 17:02:28 -07:00
Brad Hefta-Gaub
79023763ef Merge pull request #4869 from ctrlaltdavid/20543 
CR for #20543 - Option to auto-mute mic if step away from PC when face tracking is enabled
 2015-05-20 14:47:31 -07:00
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
Brad Davis
827d7f6221 Merge branch 'master' into dk1 2015-05-20 09:41:20 -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
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
Brad Davis
6797174b97 Fix picking in the HMD 2015-05-14 19:15:47 -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
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
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
Sam Cake
8324268ec8 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-05-13 11:32:39 -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
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
David Rowe
8a3c8e0d9a Merge branch 'master' into 20532 
Conflicts:
	interface/src/devices/DdeFaceTracker.cpp
 2015-05-12 17:41:12 -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
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.

Conflicts:
	interface/src/Camera.h
 2015-05-12 14:47:44 -07:00
samcake
6e8c067bcb Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff" 2015-05-12 14:34:43 -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
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
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
Sam Gateau
f2c4e04a5a clean up for pr 2015-05-11 14:06:10 -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
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
David Rowe
5092e385b1 Disable "calibrate" menu item if webcam isn't enabled 2015-05-08 18:39:22 -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
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