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
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
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
Ryan Huffman
2c10b55858 Remove extraneous debug messages 2014-04-12 01:09:29 -07:00
Ryan Huffman
8b904b91ea Cleanup ChatMessageArea.cpp 2014-04-12 00:53:43 -07:00
Ryan Huffman
45402336ac Add chat window dragging 
This was originally implemented by Mohammed Nafees, shared on Basecamp.

I've noticed an issue with dragging across screens (monitors) where the
chat window will jump vertically.  I've tried debugging it, and
ultimately it looks like an issue with the `move` method.  The
coordinates are valid (I tried using global coordinates as well), and
the amount to move is correct, but when moving to coordinates on a
different screen it doesn't do the right thing.
 2014-04-12 00:25:58 -07:00
Ryan Huffman
13cf0c80e6 Fix chat message formatting and word wrapping 
By switching from a QLabel to a QTextBrowser widget more formatting
options and word wrapping that breaks words is possible.  It comes with
an issue I have been unable to resolve

 * Selecting text and going down with the cursor will cause it to
   scroll.  It's possible to increase padding to remove this behavior,
   but it doesn't look great.
 2014-04-12 00:20:43 -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
Andrzej Kapolka
0ca68e4cb4 Adjust the size when we toggle the avatar LOD options. 2014-04-11 17:53:02 -07:00
Andrew Meadows
0ad841edfb don't render avatar boundary shapes in first person 2014-04-11 17:44:51 -07:00
Andrzej Kapolka
39135d3d5f Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-11 16:37:49 -07: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
Andrzej Kapolka
4265617c3e Add missing include. 2014-04-11 16:02:46 -07:00
Andrew Meadows
b5e7c30178 merge 2014-04-11 16:00:34 -07:00
Andrzej Kapolka
fe7a359545 Added tools to adjust avatar LOD to LOD tools dialog. Closes #2624. 2014-04-11 15:55:48 -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
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
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
Atlante45
ea93be15f1 Fixed dometime using wrong texdir 2014-04-10 12:44:51 -07:00
Ryan Huffman
16a2367b29 Update chat window to only scroll when at the bottom 
It can be frustrating when scrolling up to read a message to have the
window forcibly scrolled to the bottom when a new message appears.
 2014-04-10 12:34:45 -07:00
Ryan Huffman
37f9f47488 Fix odd resizing of chat messages 
When calling updateGeometry on the message labels the layout system
seems to resize the widgets in weird ways.  There may be a different way
to keep it from doing this.
 2014-04-10 12:09:06 -07:00
Ryan Huffman
ff3ebd1eda Fix centering of timestamp in chat window 2014-04-10 12:04:30 -07:00
Andrzej Kapolka
873541dd7b Trying out basic pushback for other avatars. 2014-04-10 11:56:17 -07:00
Atlante45
2cc2149647 Glow when you talk, flash when you clip 
closes #2592
 2014-04-10 11:55:30 -07:00
Ryan Huffman
2d481dda4e Update chat menu to properly position itself when opening 
The previous implementation seemed to assume a full-screen main window -
it will now open on the right side of the window, vertically centered,
regardless of where the main window is.
 2014-04-10 11:46:28 -07:00
Ryan Huffman
5099a0e061 Remove chat window opening animation 2014-04-10 11:41:10 -07:00
Stephen Birarda
3651eff3d6 cleanup Systime to gettimeofday without lean and mean windows 2014-04-10 11:24:54 -07:00
Andrzej Kapolka
a12dd916fa More plane intersection bits. 2014-04-10 11:24:45 -07:00
Stephen Birarda
7c9e0927ab define WIN32_LEAN_AND_MEAN before include windows.h in Systime 2014-04-10 11:17:03 -07:00
Stephen Birarda
ef418f09b3 don't let windows.h include winsock 2014-04-10 11:15:33 -07:00
Andrzej Kapolka
f61c746b4a Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-10 09:45:23 -07:00
Andrew Meadows
3755aee3e0 merge upstream/master into andrew/scripting 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-04-10 08:32:14 -07:00
Andrew Meadows
f9fb8b46a5 adding names to arguments in collisionWithAvatar() declaration 2014-04-10 07:53:39 -07:00
Andrew Meadows
4942e93daa replace .f with .0f as per coding standard 2014-04-10 07:53:11 -07:00
Philip Rosedale
e08dfeae2a Merge pull request #2642 from Atlante45/persistant_script_location 
Persistant script location
 2014-04-09 22:16:20 -07:00
Philip Rosedale
de6b55644b Merge pull request #2636 from ey6es/faceplus 
Basic Faceplus integration, cleanup for handling the various face trackers.
 2014-04-09 22:13:34 -07:00
Philip Rosedale
3b2b075414 Merge pull request #2640 from birarda/kill-scope 
remove the audio scope
 2014-04-09 22:11:02 -07:00
Philip Rosedale
d4bfffe518 Merge pull request #2628 from AndrewMeadows/oculus-with-thrust 
fix glitchy oculus when looking directly behind
 2014-04-09 21:59:11 -07:00
Andrzej Kapolka
9f58264cb6 Working on plane collisions, pushing back camera from intersecting avatars. 2014-04-09 18:07:56 -07:00
Atlante45
ef89b8c386 Removed extra line 2014-04-09 17:37:37 -07:00
Atlante45
fad71266a1 Merge branch 'master' of https://github.com/highfidelity/hifi into persistant_script_location 2014-04-09 17:35:12 -07:00
Atlante45
2b44b03a27 Added temp fix to ModelUploader dialog too 2014-04-09 17:34:17 -07:00
Andrew Meadows
c88be1ac34 remove unnecessary change 2014-04-09 17:26:05 -07:00
Stephen Birarda
cf47418d58 remove the audio scope 2014-04-09 17:16:29 -07:00
Atlante45
e33da2a741 Some QSettings cleanup + persistant script location 2014-04-09 17:08:50 -07:00
Andrew Meadows
22d2f84cff merge upstream/master into andrew/scripting 2014-04-09 15:38:56 -07:00
Andrzej Kapolka
f0dfb7fc38 Updated headers to match the new standard. 2014-04-09 15:38:54 -07:00
Stephen Birarda
1c861fbecb resolve conflicts on merge with upstream master 2014-04-09 15:36:15 -07:00
Andrzej Kapolka
f707719f4e Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus 2014-04-09 15:34:29 -07:00
Andrew Meadows
3a93096093 fixing floats to be *.0f instead of *.f 2014-04-09 15:31:26 -07:00
Andrzej Kapolka
ef8eb00778 Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus 2014-04-09 15:23:11 -07:00
Andrzej Kapolka
ead05c4d99 Tab fixes. 2014-04-09 15:22:53 -07:00
Andrzej Kapolka
cbfaf9709e Faceplus fixes. 2014-04-09 15:18:22 -07:00
Stephen Birarda
11d8d0596a fix ModelUploader header after move 2014-04-09 15:15:43 -07:00
Stephen Birarda
c208af2246 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 15:10:48 -07:00
Andrzej Kapolka
28d3eae12b Move Faceplus reading to its own thread to avoid blocking the main one. 2014-04-09 14:52:27 -07:00
Stephen Birarda
7dec499b79 fix accidental changes to Audio.cpp 2014-04-09 14:52:01 -07:00
Stephen Birarda
d4f2c9e631 Merge branch 'master' of https://github.com/highfidelity/hifi into authentication 2014-04-09 14:40:14 -07:00
Andrew Meadows
5fa1fd6b81 merge 2014-04-09 14:36:22 -07:00
Andrew Meadows
07b343ec03 emit events for hand-avatar collisions 2014-04-09 14:32:57 -07:00
Andrew Meadows
034f518d40 emit signal on avatar body-body collisions 2014-04-09 14:15:45 -07:00
Atlante45
7578b282e2 CR 2014-04-09 14:12:11 -07:00
Atlante45
b05b5a1c7b Merge branch 'master' of https://github.com/highfidelity/hifi 2014-04-09 14:11:22 -07:00
stojce
9ab61faacb additional CR fixes 2014-04-09 22:32:15 +02:00
stojce
a1c6843bd4 CR Fixes 2014-04-09 22:14:35 +02:00
Andrew Meadows
e480064e66 rename more shapeShape() to be collideShapes() 2014-04-09 13:07:54 -07:00
Stephen Birarda
973fb95c9d Merge pull request #2630 from AndrewMeadows/scripting 
Expose MyAvatar.sessionUUID to JS
 2014-04-09 13:07:37 -07:00
Andrzej Kapolka
79455d5850 More Faceplus work. Starting to get results. 2014-04-09 13:07:02 -07:00
Andrew Meadows
f8e66b4e0d remove cruft 2014-04-09 13:05:26 -07:00
stojce
c9605be193 Merge branch 'master' of https://github.com/worklist/hifi into 19508 2014-04-09 21:57:56 +02:00
Andrzej Kapolka
4d9f3a4aee Added basic mappings to start off with. 2014-04-09 12:36:02 -07:00
Stephen Birarda
ae4b8348a2 fix header include guards via regex 2014-04-09 12:03:17 -07:00
Andrzej Kapolka
4deb052d5d More work on Faceplus integration. 2014-04-09 11:54:55 -07:00
Stephen Birarda
0a9c7e3d74 add an include guard to Stats 2014-04-09 11:35:20 -07:00
Andrew Meadows
4b306401af use slot to change AvatarData::_sessionUUID 2014-04-09 11:32:52 -07:00
Andrzej Kapolka
55e0035fc8 More progress on Faceplus integration. 2014-04-09 11:14:47 -07:00