Brad Hefta-Gaub
4e2c514eb1
fix mac warning
2016-02-19 18:27:25 -08:00
Brad Hefta-Gaub
04fa37324f
tweak to virtual desktop size, to make text more readable, 240d horz FOV
2016-02-19 18:24:32 -08:00
Brad Hefta-Gaub
2810be8787
fix scripts to use new API
2016-02-19 17:57:49 -08:00
Brad Hefta-Gaub
1fa6e294e7
allow mouse to move outside of the overlay extents
2016-02-19 17:49:33 -08:00
Brad Hefta-Gaub
7219a925d2
remove getTrueMouse()
2016-02-19 14:17:28 -08:00
Brad Hefta-Gaub
d9aa5d8857
cleanup dead code
2016-02-19 13:25:53 -08:00
Brad Hefta-Gaub
7be5811f34
tweak to UI size, clean up screen to overlay
2016-02-19 13:22:37 -08:00
Brad Hefta-Gaub
d1e1067e5a
allow hydra mouse to know the correct size of screen to target
2016-02-18 22:30:31 -08:00
Brad Hefta-Gaub
dd8e5fd199
removed dead code
2016-02-18 20:21:42 -08:00
Brad Hefta-Gaub
bc5d4cfb7f
better handling of mouse capture to account for overlapping child windows
2016-02-18 20:20:30 -08:00
Brad Hefta-Gaub
0de5c1cf71
don't capture the mouse if you're not the active window or if a menu is popped up
2016-02-18 17:11:40 -08:00
Brad Hefta-Gaub
adcadedc65
slight rework of handleRealMouseMoveEvent
2016-02-18 14:40:55 -08:00
Brad Hefta-Gaub
843039f741
fix mac warnings
2016-02-18 12:04:38 -08:00
Brad Hefta-Gaub
935af6d2cc
clean up debug logs
2016-02-18 12:01:03 -08:00
Brad Hefta-Gaub
0467930c57
Merge branch 'master' of https://github.com/highfidelity/hifi into hmdHacking
...
Conflicts:
examples/controllers/handControllerGrab.js
2016-02-18 10:30:43 -08:00
Brad Hefta-Gaub
c4fc3e4057
more work on dragging in hmd
2016-02-18 10:07:37 -08:00
Chris Collins
e3ae2baa7b
Merge pull request #7123 from ericrius1/editProps
...
added collidesWith property to entities list
2016-02-18 09:11:18 -08:00
Brad Hefta-Gaub
279519b6d5
hmd mouse check point
2016-02-18 08:44:22 -08:00
Brad Hefta-Gaub
8b8b99c7e0
HMD mouse checkpoint
2016-02-17 21:19:01 -08:00
Brad Hefta-Gaub
a3766a93ea
Merge pull request #7128 from sethalves/fix-energy
...
minor adjustments to avatar-energy code
2016-02-17 20:04:35 -08:00
Brad Hefta-Gaub
39592a583f
Merge pull request #7130 from ericrius1/editFix
...
fixed edit bug
2016-02-17 20:02:36 -08:00
ericrius1
5f5af9c6a0
fixed edit bug
2016-02-17 17:45:57 -08:00
James B. Pollack
5aa2979a86
Merge pull request #7127 from sethalves/BUGS
...
fix far-trigger
2016-02-17 16:29:44 -08:00
James B. Pollack
89039747a2
Update entityProperties.html
...
lowercase 'static' like other props
2016-02-17 16:22:14 -08:00
Anthony Thibault
e863da5a68
Merge pull request #7118 from jherico/hmd_mono
...
Remove distortion on HMD previews, both mono and stereo
2016-02-17 15:39:48 -08:00
Brad Davis
8289c39a2a
Removing flicker from OpenVR mirror
2016-02-17 14:48:24 -08:00
Seth Alves
af1640ac4e
adjust avatar-energy code to avoid editing local tree and then not telling the entity-server about it
2016-02-17 14:36:18 -08:00
ericrius1
19cd3ec152
checkboxes working
2016-02-17 13:12:17 -08:00
Seth Alves
64e50c5329
keep search-line from freezing during a far-trigger
2016-02-17 12:35:23 -08:00
Seth Alves
784dc2b538
Merge pull request #7124 from samcake/red
...
Fixing the disappearing avatars maybe ?
2016-02-17 12:05:04 -08:00
Seth Alves
69caf1df4d
fix far-trigger
2016-02-17 12:04:25 -08:00
ericrius1
94fdf6b091
checkboxes working
2016-02-17 11:59:14 -08:00
ericrius1
f85916e808
checkbox keeps getting checked...
2016-02-17 10:27:53 -08:00
Brad Hefta-Gaub
38430d8d2c
Merge pull request #7112 from howard-stearns/snap-turn-preference
...
Snap turn preference
2016-02-17 09:19:38 -08:00
Brad Hefta-Gaub
d5c349abec
Merge pull request #7114 from samcake/hdr
...
Adding Ambient lighting to transparent surfaces
2016-02-17 09:08:38 -08:00
Andrew Meadows
07df96b6b3
Merge pull request #7125 from hyperlogic/tony/ik-bugfix
...
AnimInverseKinematics: fix for extra twist in lowerSpine joints.
2016-02-17 08:56:16 -08:00
ericrius1
0f8f67ef0b
removing dynamic. need to add others
2016-02-16 19:34:32 -08:00
James B. Pollack
f2445e81e0
Merge pull request #7110 from ericrius1/particlesInEdit2
...
Particles in edit
2016-02-16 18:33:01 -08:00
ericrius1
168fb67d67
making collidesWith a checkbox
2016-02-16 18:19:12 -08:00
Howard Stearns
6d70584b5a
Change name and use only when in HMD.
2016-02-16 18:09:56 -08:00
Anthony J. Thibault
2d1304e070
AnimInverseKinematics: use glm::clamp for clarity.
2016-02-16 18:00:45 -08:00
ericrius1
ce2d76d3f3
made export settings a text area
2016-02-16 17:57:09 -08:00
Anthony J. Thibault
b5a72225db
AnimInverseKinematics: renamed variable for extra style points
2016-02-16 17:42:51 -08:00
Anthony J. Thibault
df21fffa4a
AnimInverseKinematics: fix for extra twist in lowerSpine joints.
...
* When computing tipPosition, for the next iteration of the CCD,
use the leverArm before it's projected onto the lowerSpine twist axis.
* fix for acos() that was going outside of valid domain. (-1.0, 1.0)
2016-02-16 17:31:39 -08:00
samcake
640bf81339
Forcing an update from teh avatar manager to the avatar renderItems when beeing updated
2016-02-16 17:19:31 -08:00
Brad Davis
d1583e8cbe
Fixing warnings
2016-02-16 17:00:00 -08:00
Brad Davis
d61f4fbb25
PR feedback
2016-02-16 16:44:16 -08:00
ericrius1
7a3443968d
added collides with property
2016-02-16 15:55:11 -08:00
ericrius1
c43500f38a
added textures field to particle explorer
2016-02-16 15:36:03 -08:00
ericrius1
023fd0607d
added alpha start
2016-02-16 15:29:42 -08:00