Ryan Huffman
|
4f0683dc5e
|
Fix stretch tools not following mouse correctly
|
2014-12-01 15:07:03 -08:00 |
|
Ryan Huffman
|
da568c96ce
|
Add rotation degrees overlay
|
2014-12-01 12:24:51 -08:00 |
|
Ryan Huffman
|
fc5adef501
|
Update the tool window to use tabbed windows
|
2014-12-01 12:24:40 -08:00 |
|
Ryan Huffman
|
2c524cd70c
|
Darken colors of selection/highlight boxes
|
2014-12-01 12:24:34 -08:00 |
|
Ryan Huffman
|
1950ce5a4b
|
Add option for white grid color
|
2014-12-01 12:24:24 -08:00 |
|
Philip Rosedale
|
b0877414a4
|
Merge pull request #3880 from ZappoMan/bugFixes
oculus mirror lean hack
|
2014-12-01 12:01:20 -08:00 |
|
ZappoMan
|
6d7f799dbe
|
oculus mirror lean hack
|
2014-12-01 10:32:35 -08:00 |
|
AndrewMeadows
|
1b5b4c0b44
|
Merge pull request #3872 from ZappoMan/cleanupMenus
remove Entities developer menu items from C++ menu, make them available through script
|
2014-12-01 09:29:56 -08:00 |
|
Philip Rosedale
|
72ad8061ba
|
Merge pull request #3878 from birarda/master
changes required for AC to discover a local DS
|
2014-11-30 18:44:32 -08:00 |
|
Philip Rosedale
|
e44ca5a7f7
|
Merge pull request #3876 from ZappoMan/bugFixes
fixes the stutter in animation when observer moves
|
2014-11-30 18:44:21 -08:00 |
|
Stephen Birarda
|
59432e8d29
|
complete sharing of local domain-server port to local AC
|
2014-11-30 17:54:10 -08:00 |
|
Stephen Birarda
|
fed7d789f6
|
have the domain-server write its local port into shared memory
|
2014-11-30 17:29:18 -08:00 |
|
Brad Hefta-Gaub
|
b8be76d597
|
Merge pull request #3877 from samcake/fbx
Hack for avoiding lightmaps loading in starchamber
|
2014-11-30 15:30:39 -08:00 |
|
Sam Gateau
|
321d651d77
|
Hack for avoiding lightmaps loading in starchamber
|
2014-11-30 12:54:43 -08:00 |
|
Brad Hefta-Gaub
|
91fe014411
|
Merge pull request #3875 from PhilipRosedale/master
Auto-turn body when head yaw is beyond 45 degrees in HMD
|
2014-11-30 05:40:55 -08:00 |
|
Philip Rosedale
|
709a40516d
|
Add auto-turn of body when head is beyond 45 degrees
|
2014-11-29 12:17:38 -08:00 |
|
ZappoMan
|
5c2cc20313
|
fixes the stutter in animation when observer moves
|
2014-11-28 17:36:55 -08:00 |
|
Brad Hefta-Gaub
|
28091f5866
|
Merge pull request #3874 from ctrlaltdavid/fix-hydra-vr-cursors
Fix Hydra cursors in VR display
|
2014-11-28 13:46:31 -08:00 |
|
David Rowe
|
583e079d3a
|
Fix Hydra cursors in VR display
They weren't being drawn at the correct location an so weren't matching
up with location of voxel being added or deleted, for example.
|
2014-11-28 10:01:15 -08:00 |
|
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
|
c284303031
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-11-26 20:35:51 -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 |
|
Philip Rosedale
|
e822b191d0
|
Merge branch 'master' of https://github.com/worklist/hifi
|
2014-11-26 19:57:31 -08:00 |
|
Philip Rosedale
|
39042f61cd
|
1P mirror can lean fwd/back
|
2014-11-26 19:57:18 -08:00 |
|
ZappoMan
|
184acaedef
|
switch to single button for mode switching
|
2014-11-26 19:43:01 -08:00 |
|
ZappoMan
|
85ca03199e
|
remove Entities developer menu items from C++ menu, make them available through script
|
2014-11-26 17:53:41 -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 |
|