Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-08-16 18:11:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
19444 commits 22 branches 0 tags 1.2 GiB
Commit graph

19444 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
fe9fab68bf don't exit app in full screen or hdm mode 2014-11-26 17:30:59 -08:00
Andrew Meadows
3781c23480 add entities to simulation after unpacking 2014-11-26 17:09:53 -08:00
Andrzej Kapolka
5710bfcf6c Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-26 16:19:16 -08:00
Andrzej Kapolka
0a329bbe3c More work on LOD rendering; now rendering in preview. 2014-11-26 16:18:57 -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
Andrzej Kapolka
790b085307 Rejiggering the heightfield renderer for LOD. 2014-11-26 13:02:11 -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
Andrew Meadows
d84f57fafa merge upstream/master into andrew/thermonuclear 2014-11-26 12:18:19 -08:00
Andrew Meadows
b543434a17 EntityTreeHeadlessViewer gets a simulation 2014-11-26 12:16:52 -08:00
Andrew Meadows
cda8ac85c1 EntityCollisionSystem moves to interface 
and interface connects EntityCollision system to EntityTree
 2014-11-26 12:15:24 -08:00
Andrew Meadows
cb6d9a4312 EntityServer gets a simuation 2014-11-26 12:14:17 -08:00
Andrew Meadows
dd3a7b9b9d EntitySimulation takes EntityItem* rather than ID 2014-11-26 12:12:43 -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
Andrzej Kapolka
1d9c7d7c72 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-26 10:56:23 -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
Andrzej Kapolka
f6a6e185cf Heightfield import simplifications. 2014-11-25 18:53:27 -08:00
Sam Gateau
ff4d28abeb hack a separate emissive information in the g-buffer 2014-11-25 18:27:49 -08:00
Andrzej Kapolka
7f14a66922 More work on heightfield quadtrees. 2014-11-25 18:27:09 -08:00
Sam Gateau
77077f4e9c hack a separate emissive information in the g-buffer 2014-11-25 18:17:28 -08:00
Andrzej Kapolka
a987e7ce10 When we set heightfield layers, break it up into quadtree. 2014-11-25 15:32:02 -08:00
Andrzej Kapolka
fc16207c08 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-11-25 14:11:08 -08:00
Andrzej Kapolka
8d3f4a627b Working on quadtree for heightfields. 2014-11-25 14:10:44 -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