ZappoMan
|
74828a3215
|
removed non-functional low pass filter
|
2014-04-15 12:54:59 -07:00 |
|
ZappoMan
|
9d49a53434
|
coding standard cleanup
|
2014-04-15 12:50:05 -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 |
|
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 |
|
ZappoMan
|
6639fc737a
|
include diffusion ratio in point attenuation
|
2014-04-14 16:45:55 -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 |
|
ZappoMan
|
8a6da915ae
|
fix predelay in the diffusion case
|
2014-04-14 13:25:01 -07:00 |
|
ZappoMan
|
5e42daaa51
|
fix predelay in the diffusion case
|
2014-04-14 12:32:23 -07:00 |
|
ZappoMan
|
0d308e7cb9
|
more cleanup add support for enable/disable rendering of paths
|
2014-04-14 11:58:49 -07:00 |
|
ZappoMan
|
5630ed65af
|
more cleanup
|
2014-04-14 10:35:55 -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 |
|
ZappoMan
|
38dbc56d1a
|
first cut at new version of audio refelctor
|
2014-04-13 19:09:28 -07:00 |
|
Philip Rosedale
|
e3eddadd10
|
Merge pull request #2651 from AndrewMeadows/avatar-interaction
protection against bad avatar-avatar collisions
|
2014-04-11 21:23:57 -07:00 |
|
Leonardo Murillo
|
f84249ac6c
|
switching to https
|
2014-04-11 19:58:49 -06:00 |
|
Andrew Meadows
|
fd3b317c09
|
merge
|
2014-04-11 16:36:42 -07:00 |
|
Andrzej Kapolka
|
2fdb8d935b
|
Merge pull request #2654 from Atlante45/remove_qrc_from_sources
Remove qrc from sources
|
2014-04-11 16:35:48 -07:00 |
|
Andrew Meadows
|
b5e7c30178
|
merge
|
2014-04-11 16:00:34 -07:00 |
|
Andrew Meadows
|
5ac7be8945
|
merge upstream/master -> andrew/inertia
|
2014-04-11 12:20:00 -07:00 |
|
Atlante45
|
c39434f4e3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into remove_qrc_from_sources
Conflicts:
interface/resources/resources.qrc
|
2014-04-11 12:08:17 -07:00 |
|
Atlante45
|
100c3f8da4
|
Modify UIs that were using the qrc
|
2014-04-11 11:59:23 -07:00 |
|
Atlante45
|
18b364d9d9
|
Removed QResources from Interface
|
2014-04-11 11:57:25 -07:00 |
|
Andrzej Kapolka
|
d6534d6026
|
Tweak to zoom on pushback.
|
2014-04-11 11:10:22 -07:00 |
|
Andrzej Kapolka
|
b7725f094d
|
Trying the narrowing effect with pushback for other avatars.
|
2014-04-11 10:19:16 -07:00 |
|
Andrzej Kapolka
|
00e2ff93e3
|
Playing around with zooming in while pulling back.
|
2014-04-11 10:08:44 -07:00 |
|
Andrew Meadows
|
f7862eb600
|
check for bad deltaTime during avatar-avatar collisions
|
2014-04-11 08:58:26 -07:00 |
|
AndrewMeadows
|
e850faee79
|
Merge pull request #2649 from ey6es/master
Experimental "pushback" to avoid other avatars' intersecting the near clip plane.
|
2014-04-11 07:50:52 -07:00 |
|
Philip Rosedale
|
8ccc0a2081
|
Merge pull request #2650 from thoys/chatwindow-docking-feature
Fixed docking of ChatWindow
|
2014-04-11 07:21:53 -07:00 |
|
Andrzej Kapolka
|
806bcc8e6f
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-04-10 18:49:52 -07:00 |
|
Andrzej Kapolka
|
d712588b36
|
Better rolloff.
|
2014-04-10 17:35:47 -07:00 |
|
Andrew Meadows
|
af158a3a94
|
save settings when any checkable menu item changes
|
2014-04-10 17:34:12 -07:00 |
|
Andrew Meadows
|
a436b59971
|
save settings for change in: identity, position
|
2014-04-10 17:14:51 -07:00 |
|
Andrzej Kapolka
|
197adce4de
|
Fall intersection off with angle to other avatar.
|
2014-04-10 17:14:49 -07:00 |
|
Andrew Meadows
|
66b6328687
|
protection against bad avatar-avatar collisions
Also with logging if we encounter incorrectly large penetration depths
|
2014-04-10 16:58:52 -07:00 |
|
Stojce Slavkovski
|
3af3b29588
|
removed dependency on QT resource
|
2014-04-11 00:54:54 +02:00 |
|
Thijs Wenker
|
f0463a5679
|
Fixed docking of ChatWindow
Temporary Pin Icon, replace with a nice looking one please
|
2014-04-11 00:45:38 +02:00 |
|
Andrzej Kapolka
|
475528f112
|
Merge branch 'master' of https://github.com/highfidelity/hifi
|
2014-04-10 15:00:32 -07:00 |
|
Andrzej Kapolka
|
6cf971c849
|
More intersection-avoidance tweaks.
|
2014-04-10 14:51:43 -07:00 |
|
Stojce Slavkovski
|
112c8946d6
|
Merge branch 'master' of https://github.com/worklist/hifi into 19508
|
2014-04-10 23:46:22 +02:00 |
|
Stephen Birarda
|
5f1e63bb4a
|
Merge pull request #2647 from AndrewMeadows/fix-crash
fix crash: don't access null action
|
2014-04-10 14:44:01 -07:00 |
|
Stephen Birarda
|
11f5ee202a
|
Merge pull request #2646 from Atlante45/master
Fixed dometime using wrong texdir
|
2014-04-10 14:43:36 -07:00 |
|
Atlante45
|
9c662acc9d
|
Modified max glow + don't glow you own avatar
|
2014-04-10 14:40:35 -07:00 |
|
Andrew Meadows
|
ac9ead36e2
|
fix crash: don't access null action
In particular, don't crash on pressing Enter when lacking qxmpp support
|
2014-04-10 13:10:24 -07:00 |
|
Stojce Slavkovski
|
459fed5c7b
|
Merge branch 'master' of https://github.com/worklist/hifi into 19508
|
2014-04-10 21:52:37 +02:00 |
|