Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-10 14:47:22 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
12220 commits 25 branches 0 tags 1.1 GiB
Commit graph

6119 commits

Author SHA1 Message Date
Brad Hefta-Gaub
16cd2ca5c3 Merge pull request #2680 from SydoxX/master 
URL scheme to go to location
 2014-04-18 15:34:12 -07:00
ZappoMan
334f688e4e add support for sending unverified datagrams to nodes 2014-04-18 15:30:45 -07:00
Stephen Birarda
0a7ea17d43 fix a geometry race condition crash 2014-04-18 15:10:15 -07:00
Konstantin
d489e9dcd4 Fix format 2014-04-18 23:55:45 +02:00
Brad Hefta-Gaub
57a221f343 Merge pull request #2689 from AndrewMeadows/inertia 
improved collision shapes for head models
 2014-04-18 14:06:45 -07:00
AndrewMeadows
aaac7ac82c Merge pull request #2688 from ey6es/master 
Added head translation for Faceplus.
 2014-04-18 13:45:00 -07:00
Thijs Wenker
d2d3937e08 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-18 20:58:36 +02:00
Andrew Meadows
54153a70a3 merge upstream/master into andrew/inertia 2014-04-18 11:30:26 -07:00
Andrew Meadows
26487aad06 more correct bounding shapes for Models 2014-04-18 11:19:21 -07:00
AndrewMeadows
a10aaa537e Merge pull request #2692 from ZappoMan/moonshot 
added wet/dry mix, and alternate distance attenuation features
 2014-04-18 10:34:55 -07:00
ZappoMan
2dc39512a2 CR feedback 2014-04-18 10:19:09 -07:00
ZappoMan
fa787adce2 added wet/dry mix, and alternate distance attenuation features 2014-04-18 08:55:32 -07:00
Stephen Birarda
77202af20d add debug for erase from AvatarHashMap, repair check for display name 2014-04-17 18:05:22 -07:00
Stephen Birarda
f8106e5063 add an AvatarHashMap to the Agent 2014-04-17 17:49:55 -07:00
Stephen Birarda
47d4ef0b2d add a method to determine if avatar with display name exists 2014-04-17 17:44:41 -07:00
Stephen Birarda
e75d14139f fix avatar kill behaviour 2014-04-17 17:21:38 -07:00
Stephen Birarda
69d3360675 add a convenience method to AvatarHashMap to check for avatar removal 2014-04-17 16:48:24 -07:00
Stephen Birarda
e303ce1a12 move some Avatar management to AvatarHashMap 2014-04-17 16:37:40 -07:00
Atlante45
a040c997d8 ModelUploader update 2014-04-17 16:30:23 -07:00
Andrew Meadows
cfdbdad2d8 improved method for disabling bad joint shapes 2014-04-17 16:22:35 -07:00
Konstantin
6d1f4ed942 Fix format 2014-04-18 01:13:06 +02:00
Andrzej Kapolka
3af02a3327 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-17 16:07:48 -07:00
Andrzej Kapolka
197127fbde Added ability to read FBX textures embedded in FBX files. 2014-04-17 15:42:23 -07:00
Andrew Meadows
3072161a30 improved collision shapes of models 2014-04-17 15:18:46 -07:00
Andrew Meadows
3acc518e8a make float literals obey the coding standard 2014-04-17 15:18:15 -07:00
Andrzej Kapolka
0a2670ea23 Detabbed. 2014-04-17 13:42:29 -07:00
Andrzej Kapolka
a12b90c65b Add head translation to Faceplus. Closes #2684. 2014-04-17 13:34:37 -07:00
Andrzej Kapolka
21fa833f19 Merge branch 'master' of https://github.com/highfidelity/hifi into animate 
Conflicts:
	interface/src/Application.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/shared/src/SharedUtil.h
 2014-04-17 10:58:34 -07:00
Andrew Meadows
e139a6dc95 remove warnings about signed-unsigned comparison 2014-04-17 08:46:41 -07:00
Andrew Meadows
db717b980b merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/Application.cpp
 2014-04-17 08:40:25 -07:00
Thijs Wenker
b2e969d1c5 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-17 13:03:44 +02:00
ZappoMan
9fc650dd6e CR feedback 2014-04-16 17:10:26 -07:00
ZappoMan
b269a26441 CR feedback 2014-04-16 17:08:06 -07:00
ZappoMan
4c6471caa4 fix typo 2014-04-16 16:43:01 -07:00
ZappoMan
836913f1f0 Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-16 15:21:15 -07:00
ZappoMan
3cb109ec89 clean up 2014-04-16 15:21:04 -07:00
ZappoMan
2e0c5fc81b implement support for comb filter suppression window 2014-04-16 15:13:20 -07:00
Konstantin
fca4e2abba Update Application.h 2014-04-17 00:09:58 +02:00
Konstantin
b3ce36f130 Changed goTo's to statics 2014-04-17 00:04:27 +02:00
Konstantin
d55fb60862 Added urlGoTo 2014-04-17 00:03:33 +02:00
Konstantin
8120700787 Added urlGoTo 2014-04-17 00:03:11 +02:00
Andrew Meadows
83dc8717aa bumpSettings on load/stop script 2014-04-16 14:46:49 -07:00
Thijs Wenker
154176402e Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-16 23:41:58 +02:00
Thijs Wenker
0b644b5738 ctrl+shift+s to open the script editor 2014-04-16 22:58:44 +02:00
ZappoMan
b00a67cb57 added support for local audio spatialization independent of inbound audio 2014-04-16 13:55:39 -07:00
Andrew Meadows
ddb8ac9ad4 merge upstream/master into andrew/inertia 2014-04-16 13:40:10 -07:00
Andrew Meadows
9ab1b76484 use new Qt connect syntax for compile-time checks 2014-04-16 13:28:54 -07:00
AndrewMeadows
7dc8f2ae3c Merge pull request #2657 from ey6es/master 
Added tools to adjust avatar LOD to LOD tools dialog.  Closes #2624.
 2014-04-16 12:59:47 -07:00
Atlante45
9d372bfe3c Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday 2014-04-16 12:44:27 -07:00
Andrew Meadows
6b23da40d6 use correct name for signal connect 2014-04-16 12:18:40 -07:00
Atlante45
8cfc8faa01 Removed gettimeofday in Audio 2014-04-16 12:08:17 -07:00
Thijs Wenker
8e6130091d Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-16 11:28:46 +02:00
Stojce Slavkovski
c67e42be5e Moved function into .cpp 2014-04-16 07:46:15 +02:00
ZappoMan
ba361b0f62 add local audio stats 2014-04-15 21:50:44 -07:00
ZappoMan
67de87d114 added slider for local audio attenuation 2014-04-15 21:31:35 -07:00
ZappoMan
bdf39186de Merge branch 'master' of https://github.com/worklist/hifi into moonshot 2014-04-15 21:04:15 -07:00
ZappoMan
040df97be2 more cleanup 2014-04-15 20:23:47 -07:00
ZappoMan
82d9c50dc5 moved all local processing to AudioReflector 2014-04-15 20:11:53 -07:00
ZappoMan
a46d3fd254 first cut at local audio spatialization working 2014-04-15 19:57:37 -07:00
Andrzej Kapolka
8cbad1bf54 More work on animation loading. 2014-04-15 19:37:28 -07:00
matsukaze
8779e3d048 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-15 20:36:50 -04:00
ZappoMan
523cc4bdfe revert some code 2014-04-15 16:30:47 -07:00
ZappoMan
a7cbf7f667 revert some code 2014-04-15 16:26:46 -07:00
ZappoMan
585024d70e resample the local audio before sending it to any registered listeners 2014-04-15 16:04:33 -07:00
Thijs Wenker
e66822c6ee ScriptEditor: Syntax highlighting update 2014-04-16 00:55:06 +02:00
ZappoMan
f9b6585435 some cleanup 2014-04-15 15:20:03 -07:00
ZappoMan
5bc8c83706 loop and variable name cleanup 2014-04-15 15:16:55 -07:00
ZappoMan
e514c95642 variable names cleanup to match coding standard 2014-04-15 14:47:38 -07:00
ZappoMan
24f0f37eb9 cleanup 2014-04-15 14:21:28 -07:00
ZappoMan
f12ac3b036 some cleanup 2014-04-15 14:14:51 -07:00
ZappoMan
5a0963a731 cleaned up comments and range protected some settings 2014-04-15 13:58:31 -07:00
ZappoMan
579710e4bd some cleanup 2014-04-15 13:36:20 -07:00
ZappoMan
cd23b95b42 revert back to using QByteArray for processReceivedAudio() 2014-04-15 13:16:52 -07:00
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
Stojce Slavkovski
1a3e6595c5 Allow users to set the destination of Snapshots 2014-04-15 19:36:02 +02: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
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
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
Thijs Wenker
1634e574d7 Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 2014-04-15 00:40:48 +02:00
ZappoMan
588231cebf reconcile old and new implmentations so that 0 fan out produces same results 2014-04-14 15:36:20 -07:00
Thijs Wenker
af47510b05 Initial script editor widget / icons made by MaximillianMerlin ty 2014-04-15 00:30:01 +02:00
Ryan Huffman
06235decae Move ChatWindow isAtBottom and moveToBottom outside of HAVE_QXMPP 2014-04-14 14:10:12 -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
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
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
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