Andrew Meadows
d1a8c18d10
simplified hand index constants
2014-05-27 16:32:29 -07:00
Andrew Meadows
9f72d6ca3f
fix bug -- negate logic around invalid joint index
2014-05-27 15:53:20 -07:00
Andrew Meadows
ae3b792a35
move face/head code from Model into SkeletonModel
2014-05-27 15:28:41 -07:00
Andrew Meadows
6efa417742
move hand/arm stuff from Model to SkeletonModel
2014-05-27 15:06:50 -07:00
Andrew Meadows
afc7660d74
merge upstream/master into andrew/inertia
2014-05-27 14:57:44 -07:00
AndrewMeadows
1348902c4b
Merge pull request #2931 from ZappoMan/aacube
...
Support improved Ray picking of models
2014-05-27 14:57:06 -07:00
Andrew Meadows
f7b8c4f0a0
remove unused Head::_gravity data memeber
2014-05-27 14:50:17 -07:00
ZappoMan
c63c0c0ce3
Merge branch 'master' of https://github.com/worklist/hifi into aacube
2014-05-27 13:39:45 -07:00
ZappoMan
8ec14568fe
support ray picking against the AABB for the rotated model extents
2014-05-27 13:39:32 -07:00
Andrew Meadows
07544c7b43
removal of unused getNeckRotation()
2014-05-27 12:52:44 -07:00
AndrewMeadows
5a5635761d
Merge pull request #2930 from ey6es/master
...
A couple tweaks to improve shadowing: render back faces into shadow map, use biased offset, add option to disable shadow on avatars.
2014-05-27 12:44:38 -07:00
Andrzej Kapolka
3f478b1939
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 12:31:12 -07:00
Andrzej Kapolka
e22d239d4d
What the heck; let's try using some multisampling on the shadow maps.
2014-05-27 12:30:45 -07:00
Brad Hefta-Gaub
ee66d87bec
Merge pull request #2929 from binaryking/19674
...
Code Review for Job #19674
2014-05-27 11:58:23 -07:00
Andrzej Kapolka
ee00a86915
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 11:44:10 -07:00
Andrzej Kapolka
edaa251e5f
Provide option to disable avatar shadowing.
2014-05-27 11:43:34 -07:00
Mohammed Nafees
5055b18a4b
Merge branch master from upstream
2014-05-28 00:02:15 +05:30
Brad Hefta-Gaub
517d51cba7
Merge pull request #2928 from PhilipRosedale/master
...
Improved playSound.js to work without a spatial controller
2014-05-27 11:04:25 -07:00
Andrzej Kapolka
70ab33b65b
Some tricks to avoid shadow artifacts: render back faces to shadow buffer,
...
use polygon offset.
2014-05-27 10:54:18 -07:00
Philip Rosedale
ab80e3dc84
improved playSound.js to work if no spatial controller attached
2014-05-27 10:32:55 -07:00
Brad Hefta-Gaub
13366d9ba1
Merge pull request #2926 from ctrlaltdavid/chat_window
...
Fix chat window scrolling
2014-05-27 10:07:34 -07:00
Brad Hefta-Gaub
d63374f656
Merge pull request #2927 from AndrewMeadows/inertia
...
Improved detection of floor surfaces
2014-05-27 09:33:50 -07:00
Brad Hefta-Gaub
cac2db4a8a
Merge pull request #2925 from talentraspel/19706
...
separate style handling for chat area and its context menu.
2014-05-27 09:31:24 -07:00
Andrew Meadows
9175ae20d6
Merge upstream/master into andrew/inertia
2014-05-26 16:26:15 -07:00
Andrew Meadows
51850076e4
more correct detection of floor surfaces
2014-05-26 16:24:47 -07:00
David Rowe
7c3d3976ee
Fix chat window scrolling to stay at bottom
...
Stay at bottom window when:
- There is new chat.
- People come and go from online list.
- Chat window hides and restores when application focus changes.
- Interface is minimized and restored.
2014-05-25 16:42:36 -07:00
David Rowe
97e5c928a4
Fix chat scroll bar widget jumping
...
Hovering over the chat window's scroll bar was causing it to jump
around. Replaced the 12px style spacing that was causing the problem
with a widget-based solution.
2014-05-25 16:41:01 -07:00
Kai Ludwig
78e311f885
separate style handling for chat area and its context menu.
2014-05-25 20:24:15 +02:00
Clément Brisset
6bb933996f
Merge pull request #2920 from ZappoMan/aacube
...
Add RayPick support for models
2014-05-24 17:03:59 -07:00
Clément Brisset
f71a9b5df7
Merge pull request #2924 from talentraspel/19680
...
added missing locking against crashing in Overlays::~Overlays()
2014-05-24 17:03:37 -07:00
ZappoMan
a98ac0782a
CR feedback
2014-05-24 16:37:32 -07:00
Kai Ludwig
587f60631f
missed a tab
2014-05-24 21:28:03 +02:00
Kai Ludwig
c832df0783
added missing locking against crashing in Overlays::~Overlays()
2014-05-24 21:22:34 +02:00
ZappoMan
9d9600aad5
fix max dimension
2014-05-23 22:08:31 -07:00
Clément Brisset
3e671c1968
Merge pull request #2922 from birarda/master
...
fix credit amount in window title
2014-05-23 17:43:04 -07:00
Philip Rosedale
f4c274dbe6
Merge branch 'master' of https://github.com/worklist/hifi
2014-05-23 17:41:58 -07:00
Stephen Birarda
fe05beb88d
remove an unneeded debug
2014-05-23 17:41:58 -07:00
Brad Hefta-Gaub
3c05aa74b0
Merge pull request #2921 from ey6es/master
...
Support for shadows falling on models (including self-shadowing).
2014-05-23 17:40:17 -07:00
Stephen Birarda
9df0f2c1e5
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-23 17:38:28 -07:00
Stephen Birarda
714e29c887
fix credit amount in window title
2014-05-23 17:37:36 -07:00
Philip Rosedale
ad1c205063
Merge branch 'master' of https://github.com/worklist/hifi
2014-05-23 17:17:54 -07:00
Andrzej Kapolka
632f87dc88
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-23 17:15:03 -07:00
Andrzej Kapolka
e48f02f2c5
Remove unused variable.
2014-05-23 17:13:27 -07:00
ZappoMan
efd0580cfb
add ray picking to the model scripting interface
2014-05-23 17:09:37 -07:00
Clément Brisset
965d5778d6
Merge pull request #2917 from stojce/19705
...
Code Review for Job #19705
2014-05-23 17:07:17 -07:00
Andrzej Kapolka
ac2137c3b6
Fixed a couple copy and paste errors.
2014-05-23 16:56:10 -07:00
Clément Brisset
fb7db04573
Merge pull request #2918 from PhilipRosedale/master
...
Ability to move both slowly and fast with hand controllers
2014-05-23 16:55:16 -07:00
Andrzej Kapolka
84b78429f2
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-23 16:37:25 -07:00
Andrzej Kapolka
67e3454a86
Missed a few files.
2014-05-23 16:37:12 -07:00
Philip Rosedale
ef989e7ca9
Merge branch 'master' of https://github.com/worklist/hifi
2014-05-23 16:37:06 -07:00
