Andrzej Kapolka
222655d948
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 17:43:34 -07:00
Andrzej Kapolka
e723d0da0a
Merge pull request #2935 from AndrewMeadows/inertia
...
cleanup: move avatar specific stuff from Model to SkeletonModel
2014-05-27 17:41:14 -07:00
Stephen Birarda
21274dfc23
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 17:38:28 -07:00
Andrzej Kapolka
9796334160
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 17:26:56 -07:00
Andrzej Kapolka
7c12417653
Use multisampling on the shadow maps for the voxels, too.
2014-05-27 17:26:19 -07:00
barnold1953
216a73cf60
Fixed coding standard issues
2014-05-27 16:40:51 -07:00
Andrew Meadows
d1a8c18d10
simplified hand index constants
2014-05-27 16:32:29 -07:00
barnold1953
2570c55241
Touched up comments
2014-05-27 16:21:34 -07:00
barnold1953
5665e4d278
Merge branch 'master' of https://github.com/highfidelity/hifi
...
Conflicts:
interface/src/Application.cpp
interface/src/Application.h
2014-05-27 16:16:27 -07:00
barnold1953
75580cfd0f
Made Overlay appear as flat image in front of camera in Oculus Rift. It
...
needs to be a curved surface instead.
2014-05-27 16:13:56 -07:00
Brad Hefta-Gaub
36efa68938
Merge pull request #2933 from Atlante45/point_and_glow
...
Switched to findRayIntersection in editModels.js
2014-05-27 15:58:46 -07:00
Andrew Meadows
9f72d6ca3f
fix bug -- negate logic around invalid joint index
2014-05-27 15:53:20 -07:00
Atlante45
285bd0d2f2
Switched to findRayIntersection
2014-05-27 15:50:39 -07:00
Andrew Meadows
ae3b792a35
move face/head code from Model into SkeletonModel
2014-05-27 15:28:41 -07:00
Stephen Birarda
ce485c48b8
make scripted assignments passed in DS config static
2014-05-27 15:23:10 -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
Andrzej Kapolka
0b3486d27b
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 14:26:01 -07:00
Andrzej Kapolka
2b54d627c0
Try rounding to nearest texel unit to reduce shimmer.
2014-05-27 14:25:27 -07:00
Ryan Huffman
6ef8026215
Add console to script editor
2014-05-27 14:10:09 -07:00
Ryan Huffman
44c5e56a4b
Update JSConsole colors
2014-05-27 14:09:53 -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
Ryan Huffman
ca6cc86ca1
Add playSoundWave.js
2014-05-27 11:35:00 -07:00
Mohammed Nafees
5055b18a4b
Merge branch master from upstream
2014-05-28 00:02:15 +05:30
Ryan Huffman
aa47043d57
Fix WAV file support
...
The previous implementation assumed the file only contained RIFF, WAVE,
fmt, and data chunks. It is valid for other chunks to appear, so I
updated it to skip any chunks until it finds the "data" chunk.
2014-05-27 11:24:48 -07:00
barnold1953
d1a4192ac5
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-05-27 11:20:23 -07:00
barnold1953
d4f66a4a3d
Added OverlayRenderer class and moved displayOverlay from Application to
...
OverlayRenderer.
2014-05-27 11:19:45 -07:00
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
Ryan Huffman
4a0a9f8a36
Update console style
2014-05-27 08:57:29 -07:00
Ryan Huffman
9af0269151
Update console style
2014-05-27 08:05:56 -07:00
Ryan Huffman
b9248e0bbf
Update JSConsole to QWidget
2014-05-27 08:03:46 -07:00
Ryan Huffman
422c2eac67
Update showConsole -> toggleConsole and change shortcut
2014-05-27 07:29:48 -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
Ryan Huffman
1d7272cbbf
Add console.ui interface file
2014-05-26 10:18:04 -07:00
