ZappoMan
|
f3f9325a42
|
fixed comment
|
2014-04-15 12:45:28 -07:00 |
|
ZappoMan
|
57513610fd
|
recalc on any attribute changes
|
2014-04-15 12:43:02 -07:00 |
|
ZappoMan
|
60c6b27ab2
|
cleanup code a bit, add support for diffusions even with no ray intersection
|
2014-04-15 11:38:11 -07:00 |
|
Atlante45
|
c323249039
|
Remove bad change
|
2014-04-15 10:38:28 -07:00 |
|
Stojce Slavkovski
|
1a3e6595c5
|
Allow users to set the destination of Snapshots
|
2014-04-15 19:36:02 +02:00 |
|
Atlante45
|
08b24343e5
|
Added sounds provided by grayson and randomized their use.
|
2014-04-15 10:34:18 -07:00 |
|
ZappoMan
|
8a16986294
|
add sliders for reflection, diffusion, absorption
|
2014-04-15 09:58:35 -07:00 |
|
ZappoMan
|
1ed5512925
|
remove old mode, replaced by new mode
|
2014-04-14 21:02:09 -07:00 |
|
ZappoMan
|
7448e0ab16
|
move to sub menu
|
2014-04-14 20:28:20 -07:00 |
|
Andrzej Kapolka
|
38c0e99cbe
|
More work on animation loading.
|
2014-04-14 18:12:32 -07:00 |
|
Andrzej Kapolka
|
a2dc58f7f9
|
Moved FBX code to its own library so that we can use it for bots.
|
2014-04-14 17:15:58 -07:00 |
|
ZappoMan
|
839df97687
|
make audio sliders initialize to defaul starting points
|
2014-04-14 16:46:25 -07:00 |
|
ZappoMan
|
6639fc737a
|
include diffusion ratio in point attenuation
|
2014-04-14 16:45:55 -07:00 |
|
Andrzej Kapolka
|
c5ffe54a91
|
Working on loading animation data.
|
2014-04-14 16:26:30 -07:00 |
|
ZappoMan
|
588231cebf
|
reconcile old and new implmentations so that 0 fan out produces same results
|
2014-04-14 15:36:20 -07:00 |
|
Clément Brisset
|
f61d72fcf0
|
Merge pull request #2660 from huffman/19554
19554 Continue refining Chat
|
2014-04-14 14:35:08 -07:00 |
|
Ryan Huffman
|
06235decae
|
Move ChatWindow isAtBottom and moveToBottom outside of HAVE_QXMPP
|
2014-04-14 14:10:12 -07:00 |
|
Andrzej Kapolka
|
01ca37f64e
|
Merge branch 'master' of https://github.com/highfidelity/hifi into animate
|
2014-04-14 14:09:11 -07:00 |
|
ZappoMan
|
8a6da915ae
|
fix predelay in the diffusion case
|
2014-04-14 13:25:01 -07:00 |
|
Stephen Birarda
|
d8cc626ed8
|
Merge pull request #2667 from birarda/master
more cleanup to build guide for windows
|
2014-04-14 12:41:46 -07:00 |
|
Stephen Birarda
|
55172c6f43
|
more cleanup to BUILD guide for windows
|
2014-04-14 12:39:45 -07:00 |
|
Stephen Birarda
|
4f10c4b5d4
|
Merge pull request #2666 from birarda/master
fix for DLL section of build guide
|
2014-04-14 12:36:56 -07:00 |
|
Stephen Birarda
|
d3776afc93
|
fix for DLL section in BUILD guide
|
2014-04-14 12:36:13 -07:00 |
|
Stephen Birarda
|
2a38c01668
|
Merge pull request #2665 from birarda/master
changes to build guide for win32 GnuTLS
|
2014-04-14 12:32:28 -07:00 |
|
ZappoMan
|
5e42daaa51
|
fix predelay in the diffusion case
|
2014-04-14 12:32:23 -07:00 |
|
Stephen Birarda
|
1aacba3b46
|
changes to Windows instructions for GnuTLS
|
2014-04-14 12:31:53 -07:00 |
|
Andrzej Kapolka
|
873620e601
|
Make sure we set the texture data even if the texture URL is invalid.
|
2014-04-14 12:27:15 -07:00 |
|
ZappoMan
|
0d308e7cb9
|
more cleanup add support for enable/disable rendering of paths
|
2014-04-14 11:58:49 -07:00 |
|
Ryan Huffman
|
4ae148ff19
|
Update chat window to not allow movement while docked
|
2014-04-14 11:34:35 -07:00 |
|
Ryan Huffman
|
f698f3375a
|
Update resource urls for chat window close button
|
2014-04-14 11:34:27 -07:00 |
|
Ryan Huffman
|
aaddecd024
|
Merge remote-tracking branch 'upstream/master' into 19554
Conflicts:
interface/resources/resources.qrc
interface/ui/chatWindow.ui
|
2014-04-14 11:20:49 -07:00 |
|
Andrzej Kapolka
|
e5f6445a6a
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-04-14 11:04:32 -07:00 |
|
Stephen Birarda
|
0f9a00aacf
|
Merge pull request #2664 from birarda/authentication
update cmake required version
|
2014-04-14 10:57:50 -07:00 |
|
Stephen Birarda
|
c5c8327359
|
update required version of cmake to 2.8.12.2
|
2014-04-14 10:57:34 -07:00 |
|
Stephen Birarda
|
8f23b12081
|
Merge pull request #2662 from birarda/authentication
update build guide with extra info for GnuTLS
|
2014-04-14 10:52:09 -07:00 |
|
Stephen Birarda
|
70191111c7
|
remove GnuTLS DLL tip since DLL section is right below
|
2014-04-14 10:51:36 -07:00 |
|
Stephen Birarda
|
95abc74d83
|
add GnuTLS to example windows folder structure
|
2014-04-14 10:50:57 -07:00 |
|
Stephen Birarda
|
1c7f8c87bc
|
don't codify directories in OS X section
|
2014-04-14 10:50:03 -07:00 |
|
Stephen Birarda
|
6cb5497242
|
codify some library names and fix some other spelling
|
2014-04-14 10:49:11 -07:00 |
|
Stephen Birarda
|
007a477400
|
fix a typo in build guide
|
2014-04-14 10:46:42 -07:00 |
|
Stephen Birarda
|
6b4a7d365f
|
update build guide with extra info for GnuTLS
|
2014-04-14 10:43:42 -07:00 |
|
ZappoMan
|
5630ed65af
|
more cleanup
|
2014-04-14 10:35:55 -07:00 |
|
Andrzej Kapolka
|
880736c30e
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-04-14 10:24:58 -07:00 |
|
Stephen Birarda
|
5904d19603
|
Merge pull request #2637 from birarda/authentication
add optional DTLS option for domain-server to node communication
|
2014-04-14 10:24:17 -07:00 |
|
Andrzej Kapolka
|
25d25b1472
|
Merge pull request #2658 from AndrewMeadows/inertia
don't render avatar boundary shapes in first person
|
2014-04-14 10:23:43 -07:00 |
|
ZappoMan
|
d3a9c6940c
|
some audio reflection cleanup
|
2014-04-14 10:12:08 -07:00 |
|
ZappoMan
|
7a993939bf
|
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
Conflicts:
interface/interface_en.ts
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.h
libraries/shared/src/SharedUtil.h
|
2014-04-14 09:43:29 -07:00 |
|
ZappoMan
|
ddd2b0843c
|
more work on new diffusion model
|
2014-04-13 20:43:40 -07:00 |
|
ZappoMan
|
22f7facc4e
|
first cut at new version of audio refelctor
|
2014-04-13 19:41:54 -07:00 |
|
ZappoMan
|
030de00e88
|
first cut at new version of audio refelctor
|
2014-04-13 19:11:25 -07:00 |
|