Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-23 03:33:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19225 commits 71 branches 56 tags 1.2 GiB
Commit graph

19225 commits

This branch
This branch
All branches
Author SHA1 Message Date
Brad Hefta-Gaub
8a86b2d239 Merge pull request #3873 from samcake/tot 
Fix lighmaps for VC demo 12/1/2014
 2014-11-27 13:01:10 -08:00
Sam Gateau
c78af1c982 fixing the bug when lighmaps are diasppearing in the <apartment>, i don;t understand why 2014-11-27 10:48:36 -08:00
Philip Rosedale
56b27a2595 Merge pull request #3871 from ZappoMan/HMDMode 
Various HMD Tools improvements
 2014-11-26 20:33:38 -08:00
ZappoMan
fe010b685a more HMD Tools improvements, better support for detecting adding/removing screens 2014-11-26 20:19:23 -08:00
ZappoMan
184acaedef switch to single button for mode switching 2014-11-26 19:43:01 -08:00
ZappoMan
fe9fab68bf don't exit app in full screen or hdm mode 2014-11-26 17:30:59 -08:00
Philip Rosedale
f0fa627892 Merge pull request #3869 from ctrlaltdavid/fix-leap-hands-in-face 
Fix Leap hands in face
 2014-11-26 15:49:29 -08:00
Philip Rosedale
91aca51dc6 Merge pull request #3868 from ZappoMan/HMDMode 
First cut at HMD Tools window
 2014-11-26 14:53:25 -08:00
ZappoMan
711f9f6905 fix bug where audio meter is incorrectly offset when in oculus mode 2014-11-26 12:34:47 -08:00
ZappoMan
2fc3fdc7e6 improve how cameras are reset when leaving vr mode 2014-11-26 12:26:02 -08:00
ZappoMan
208eb663bd prevent HMD tools from being moved to HMD screen 2014-11-26 12:07:39 -08:00
David Rowe
5871ecd85c Stop incrementing counter after limit reached 2014-11-26 12:03:27 -08:00
David Rowe
5f58c76842 Fix hands being put in face if Leap on HMD is set but Leap not connected 
The joints were reporting themselves as "active" even though the Leap
wasn't connected, both at startup if not connected and after unplugging.
 2014-11-26 12:03:10 -08:00
Brad Hefta-Gaub
b136f4c649 Merge pull request #3867 from AndrewMeadows/bispinor 
don't lookup entity by ID when deleting script
 2014-11-26 11:07:07 -08:00
ZappoMan
0c5a978411 fix crash in activateWindowAfterEnterMode in no oculus case 2014-11-26 10:53:38 -08:00
ZappoMan
ad6680553c snap cursor to center of HMD tools dialog when shown, or app when the dialog is hidden 2014-11-26 10:46:47 -08:00
Andrew Meadows
419e00cbdc fix typo from overwrite of gverb/readme.txt 2014-11-26 10:41:23 -08:00
Andrew Meadows
3262c9a8bd don't lookup entity when deleting script 2014-11-26 10:27:03 -08:00
ZappoMan
c580617921 better mirrored monitor support 2014-11-26 10:23:44 -08:00
ZappoMan
59eeeb9006 add debug details to HMDTools 2014-11-26 10:11:29 -08:00
Sam Gateau
fa375539d0 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-11-26 09:42:31 -08:00
ZappoMan
821cf46ee9 don't delete the HMDToolsDialog on hide, keep it around till app exit. 2014-11-26 09:11:26 -08:00
ZappoMan
ee46c781c4 expand comment 2014-11-26 08:40:11 -08:00
Philip Rosedale
7737994399 Merge pull request #3865 from ctrlaltdavid/20197 
CR for Job #20197 - Bug: Initial ping stats mis-reported
 2014-11-26 08:08:50 -08:00
ZappoMan
53ecf97df2 fix broken camera after leaving oculus/hmd mode 2014-11-25 21:58:26 -08:00
ZappoMan
e94db7bbc2 removed some debug, added a resetSensors() on exit of HMD mode 2014-11-25 20:37:13 -08:00
ZappoMan
f111fb2c4b added a comment to clarify why getCameraOrientation has an oculus special case 2014-11-25 20:36:39 -08:00
Sam Gateau
ff4d28abeb hack a separate emissive information in the g-buffer 2014-11-25 18:27:49 -08:00
Sam Gateau
77077f4e9c hack a separate emissive information in the g-buffer 2014-11-25 18:17:28 -08:00
Sam Gateau
cb1850e082 Merge branch 'master' of https://github.com/highfidelity/hifi into tot 2014-11-25 14:10:30 -08:00
ZappoMan
aa44906841 make HMD tools a checkable menu 2014-11-25 13:27:16 -08:00
Brad Hefta-Gaub
883fda241f Merge pull request #3864 from huffman/entity-tools-front-draw 
Update entity tools to draw grabbers in front
 2014-11-25 12:55:16 -08:00
ZappoMan
333f323856 Merge branch 'master' of https://github.com/highfidelity/hifi into HMDMode 2014-11-25 12:46:18 -08:00
ZappoMan
bc376a0a15 more improvements to HMD Tools 2014-11-25 12:46:00 -08:00
ZappoMan
6108f7d9cd fix bug in resetSensors moving cursor to center of window on multiple screen systems 2014-11-25 12:45:20 -08:00
Ryan Huffman
0b23b57e1e Update border comment in Cube3DOverlay 2014-11-25 12:43:01 -08:00
Ryan Huffman
75d560744b Update rotation handles to drawInFront = true 2014-11-25 12:34:03 -08:00
Brad Hefta-Gaub
c4ea6bac1d Merge pull request #3863 from huffman/overlay-front-draw 
Overlay Front Draw
 2014-11-25 12:27:21 -08:00
Ryan Huffman
2cb30c2157 Update color used for Cube3DOverlay border 2014-11-25 12:17:46 -08:00
Ryan Huffman
f8c8ed868e Update float that should be bool 2014-11-25 12:08:48 -08:00
Ryan Huffman
c5f2b3b588 Add borderSize to Cube3DOverlay 2014-11-25 12:05:13 -08:00
Ryan Huffman
b3ca6fda72 Update entity tool grabbers look and size 2014-11-25 12:04:11 -08:00
Ryan Huffman
b97870f32e Update extra entity tool stretch handles to be optionally visible 2014-11-25 12:01:29 -08:00
Brad Hefta-Gaub
969d178e44 Merge pull request #3862 from AndrewMeadows/bispinor 
more correct EntityItem list maintenance
 2014-11-25 11:59:48 -08:00
AndrewMeadows
450b365bb6 Merge pull request #3860 from ZappoMan/cleanupMenus 
remove spatial audio menu items
 2014-11-25 11:28:18 -08:00
Ryan Huffman
9020fee31a Merge branch 'master' of github.com:highfidelity/hifi into overlay-front-draw 2014-11-25 09:53:18 -08:00
Ryan Huffman
649ae4a448 Update 3D overlays to only use one list 2014-11-25 09:49:10 -08:00
ZappoMan
e35242345c first cut at HMD Tools dialog 2014-11-25 09:26:24 -08:00
ZappoMan
e9812d0608 added similarStrings() helper 2014-11-25 09:25:49 -08:00
ZappoMan
a28d74570d bug fixes in setFullscreen() and setEnableVRMode() 2014-11-25 09:25:22 -08:00