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

5637 commits

Author SHA1 Message Date
Brad Hefta-Gaub
fe5a8d9da2 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/shared/src/PacketHeaders.cpp
 2014-01-21 20:21:22 -08:00
Andrzej Kapolka
0a3d6ae5e0 More work on metavoxel editing (grid, etc.) 2014-01-21 19:31:56 -08:00
Andrzej Kapolka
d473b002a8 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-21 17:20:24 -08:00
Andrzej Kapolka
230b66680f More work on the editor. 2014-01-21 17:20:12 -08:00
Stephen Birarda
8df40b5d60 clearly init the skeleton URL in profile 2014-01-21 17:07:40 -08:00
Stephen Birarda
105fb42b34 rewrite mesh and skeleton requests from data-server 2014-01-21 16:46:04 -08:00
Andrzej Kapolka
5b4447d0b9 More work on metavoxel editing. 2014-01-21 16:17:31 -08:00
Stephen Birarda
f13aa322fc resolve conflicts in merge with upstream/master 2014-01-21 16:01:12 -08:00
Brad Hefta-Gaub
90c841ff01 add findClosestParticle() to JS interface 2014-01-21 14:29:20 -08:00
Brad Hefta-Gaub
03a9253748 remove usage of ParticleEditHandle from application 2014-01-21 14:07:46 -08:00
Andrew Meadows
da0d2c4776 Removing unecessary #include. 2014-01-21 14:00:16 -08:00
stojce
19c4b2b2ec Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-21 22:51:32 +01:00
Brad Hefta-Gaub
97b0ed2cc5 implemented support for PACKET_TYPE_PARTICLE_ERASE 2014-01-21 13:24:35 -08:00
Stephen Birarda
e08f4d2eba more DataServerClient API tweaks 2014-01-21 13:13:57 -08:00
Andrzej Kapolka
d9589cd898 Starting on metavoxel editor dialog. 2014-01-21 11:43:15 -08:00
Andrzej Kapolka
5e908134ea Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-21 11:05:00 -08:00
Andrew Meadows
2a2f2f2da0 Remove debug cruft. 2014-01-21 10:45:43 -08:00
Andrew Meadows
e02c7bed18 Removing a magic number and collapsing two identical variables that hard-code the number of hands. 2014-01-21 10:11:20 -08:00
Stephen Birarda
3613773b79 cleanup DSC api, add scripting interface 2014-01-21 09:55:06 -08:00
Leonardo Murillo
a4c057b01f PR fix 2014-01-21 11:27:03 -06:00
Leonardo Murillo
18a6d74165 removing comment 2014-01-21 11:24:23 -06:00
Leonardo Murillo
b2ef07f485 PR Fixes 2014-01-21 11:17:43 -06:00
Leonardo Murillo
cc147bc8bf PR fixes 2014-01-21 10:39:29 -06:00
Leonardo Murillo
b972d4260c PR Fixes 2014-01-21 10:31:16 -06:00
Leonardo Murillo
a9c294099e Merge branch 'master' of github.com:/worklist/hifi 2014-01-21 10:00:00 -06:00
ZappoMan
6fd4903672 Merge pull request #1599 from hifialanwu/master 
#19488 scripts save on exit and load on entry
 2014-01-21 02:20:57 -08:00
Brad Hefta-Gaub
347933f1a5 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/particles/src/Particle.cpp
	libraries/particles/src/ParticleCollisionSystem.cpp
	libraries/particles/src/ParticleTreeElement.cpp
 2014-01-21 02:15:46 -08:00
aw
0eed041deb scripts save on exit and load on entry 2014-01-20 22:58:01 -08:00
Brad Hefta-Gaub
3bcd02f8e3 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/shared/src/PacketHeaders.cpp
 2014-01-20 20:25:52 -08:00
Andrzej Kapolka
bf9fc65de4 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-01-20 17:40:16 -08:00
Andrew Meadows
b0edc7ee6f Merge branch 'master' of ssh://github.com/highfidelity/hifi into paddle-fixes-2 2014-01-20 17:39:41 -08:00
Stephen Birarda
d9ae27953b move DataServerClient to shared for use in other targets 2014-01-20 17:12:52 -08:00
Stephen Birarda
80fcc87437 some spacing fixes in Profile 2014-01-20 17:09:03 -08:00
Stephen Birarda
0ac5ec0690 hook old data server functionality through profile 2014-01-20 17:05:31 -08:00
Stephen Birarda
cf40fb0ef8 repairs to new Qt'ed DataServer and DataServerClient 2014-01-20 16:55:14 -08:00
stojce
2b2ebea80b Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-21 00:59:05 +01:00
Stephen Birarda
d405d31edf add data-server to hifi repo, abstract DataServerClient 2014-01-20 14:42:50 -08:00
Andrzej Kapolka
804ce83fa6 Get the base position/orientation directly from the avatar to prevent 
jerkiness when flying with the Hydra.  Also, restore arm lengths when the
Hydra becomes inactive.
 2014-01-20 13:44:41 -08:00
Brad Hefta-Gaub
b4b3720fcf move creatorTokenID management into Particle static members 2014-01-20 12:56:35 -08:00
Andrzej Kapolka
81ab68a529 Store hand position relative to body orientation/position. 2014-01-20 12:44:09 -08:00
stojce
c785ecf5ed fixed file deselection 2014-01-20 21:43:43 +01:00
Andrew Meadows
61e1b25e70 ParticleTreeElement::_particles is now a QList<> instead of std::vector<> for faster erase() 2014-01-20 12:43:27 -08:00
Brad Hefta-Gaub
bc2830d0d3 Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-20 10:55:34 -08:00
Leonardo Murillo
3036142a38 Removing comments 2014-01-20 11:55:10 -06:00
Leonardo Murillo
04970be8a2 Removing comments 2014-01-20 11:52:26 -06:00
Leonardo Murillo
c9f2db1f90 Merge branch 'master' of github.com:/worklist/hifi 2014-01-20 11:51:29 -06:00
Leonardo Murillo
f6bc7a2c4b I think last fixes 2014-01-20 11:51:17 -06:00
stojce
62e9459c12 Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-20 18:32:57 +01:00
ZappoMan
17abbc4715 Merge pull request #1586 from PhilipRosedale/master 
Clap script and better bird sounds
 2014-01-20 09:06:28 -08:00
Leonardo Murillo
825c64e1d0 Anything obviously wrong? 2014-01-20 10:57:10 -06:00
stojce
f01c2fb935 deselect selected file; close dialog after import 2014-01-19 23:20:47 +01:00
stojce
daffadbac4 Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-19 13:59:20 +01:00
Leonardo Murillo
3d5d02d5b0 Some more changes 2014-01-18 20:33:29 -06:00
Leonardo Murillo
7748002db7 More PR related changes 2014-01-18 20:27:56 -06:00
Leonardo Murillo
cd9f2fd240 Pull Request fixes 2014-01-18 20:17:47 -06:00
Leonardo Murillo
865045aae7 Merge branch 'master' of github.com:/worklist/hifi 2014-01-17 19:24:54 -06:00
Philip Rosedale
2fe666aa63 Merge pull request #1583 from birarda/nodelist-container 
NodeList container repairs
 2014-01-17 17:23:16 -08:00
Andrzej Kapolka
341f60da76 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-17 17:10:46 -08:00
Philip Rosedale
4547f07739 added fountain script 2014-01-17 17:10:15 -08:00
Andrzej Kapolka
470b83a55b Got the sign backwards. 2014-01-17 17:04:22 -08:00
Andrzej Kapolka
765f98fadc Remove unused variables, change orbit pitch behavior (closes #1582). 2014-01-17 17:00:03 -08:00
Philip Rosedale
08c49bb68f Merge branch 'master' of https://github.com/worklist/hifi 2014-01-17 16:54:48 -08:00
Philip Rosedale
317af4c927 Merge pull request #1585 from AndrewMeadows/paddle-fixes 
Paddle fixes
 2014-01-17 16:50:10 -08:00
Andrew Meadows
0921999c3b Removing menu option for where to hold the ball -- we always hold from the finger tip (approximately). 2014-01-17 16:37:44 -08:00
Andrew Meadows
6c6a59b252 Hand now holds a ball a bit forward, which prevents the body from colliding with the ball on throw. 2014-01-17 16:36:50 -08:00
Andrew Meadows
aac1764243 Re-enabling particle-avatar collisions. 2014-01-17 16:30:07 -08:00
Stephen Birarda
594165782a repair badly scoped usage of QMutexLocker 2014-01-17 16:20:22 -08:00
Stephen Birarda
99cd6c8ce8 remove two unused variable warnings 2014-01-17 16:04:04 -08:00
Brad Hefta-Gaub
99f9ae9d3a implement new setProperties() getProperties() for Particle to allow setting all properties at once using a JS hash 2014-01-17 16:02:58 -08:00
Brad Hefta-Gaub
1e0f1adb16 added lifetime to particles 2014-01-17 14:59:40 -08:00
Leonardo Murillo
91defcfd03 Merge branch 'master' of github.com:/worklist/hifi 2014-01-17 16:28:30 -06:00
Brad Hefta-Gaub
d4331db45a Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface 
Conflicts:
	examples/gun.js
	libraries/script-engine/src/ScriptEngine.cpp
 2014-01-17 13:29:36 -08:00
ZappoMan
bb41fe6ddb Merge pull request #1573 from stojce/19484 
Code Review for Job #19484
 2014-01-17 13:25:59 -08:00
Leonardo Murillo
a13d7b084f Removing comment 2014-01-17 14:39:48 -06:00
Leonardo Murillo
99275dadd4 PR Changes 2014-01-17 14:39:34 -06:00
Leonardo Murillo
ff6a9b2052 PR fix 2014-01-17 14:05:38 -06:00
Leonardo Murillo
a4efe55bbf changing dev version 2014-01-17 14:02:57 -06:00
stojce
99feb36d19 Merge branch 'master' of https://github.com/worklist/hifi into 19484 2014-01-17 20:57:23 +01:00
stojce
01b9bd61ad Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-17 20:56:40 +01:00
Leonardo Murillo
9582fadef4 Last changes 2014-01-17 13:44:03 -06:00
Atlante45
08de50f578 Fixed mouseVoxel getting resized all the time when flying over smaller voxel 2014-01-17 20:36:43 +01:00
Leonardo Murillo
93e4dc7d5a PR Changes 2014-01-17 13:35:49 -06:00
Leonardo Murillo
e0761db6d1 Merge branch 'master' of github.com:/worklist/hifi 2014-01-17 13:35:18 -06:00
Philip Rosedale
f677198cc8 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-17 11:28:43 -08:00
Andrew Meadows
48796231ef Merge branch 'master' of ssh://github.com/highfidelity/hifi into paddle-fixes 2014-01-17 11:26:04 -08:00
Andrew Meadows
f08e639cb2 fixes for avatar paddle-hands, plus some hackery for demo 2014-01-17 11:22:50 -08:00
Leonardo Murillo
82ecc9cc36 Merge branch 'master' of github.com:/worklist/hifi 2014-01-17 13:06:59 -06:00
Leonardo Murillo
b8aaf4e813 CR fixes 2014-01-17 13:06:54 -06:00
Andrzej Kapolka
7a4353428e Fixed eye rotations. 2014-01-17 11:05:26 -08:00
stojce
4c77d9f1d2 fixing bad merge 2014-01-17 20:01:49 +01:00
Andrzej Kapolka
515cc5316c Get rid of code to decay pitch on movement. 2014-01-17 10:54:44 -08:00
stojce
13f223ff12 Merge branch 'master' of https://github.com/worklist/hifi into 19484 2014-01-17 19:46:44 +01:00
stojce
36d21e812d Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-17 19:46:02 +01:00
Philip Rosedale
0d838d2e73 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-17 08:50:36 -08:00
Andrzej Kapolka
7fcd1ccf29 Merge branch 'master' of https://github.com/highfidelity/hifi 2014-01-16 17:06:55 -08:00
Andrzej Kapolka
0e7692dfea When the mouse is hidden, just look straight forward. 2014-01-16 16:59:50 -08:00
Andrzej Kapolka
8c6c521b65 Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 16:38:07 -08:00
Andrzej Kapolka
c93e70e3cb Merge pull request #1563 from birarda/master 
have muting also mute local loopback, NodeList tweak
 2014-01-16 16:37:47 -08:00
stojce
669ab213ef fixing merge 2014-01-17 00:08:25 +01:00
Philip Rosedale
a4f13e8bdd Merge branch 'master' of https://github.com/worklist/hifi 2014-01-16 15:01:57 -08:00
Andrzej Kapolka
2e3c597d40 Scooping out more head bits. 2014-01-16 15:01:24 -08:00
Stephen Birarda
0ddf9520dd if audio is muted don't loopback local audio, fixes #1561 2014-01-16 14:55:09 -08:00
Brad Hefta-Gaub
1cfbfe6611 fix 3d mode switch on/off issue 2014-01-16 14:54:08 -08:00
Andrzej Kapolka
50d224661c Pruning more avatar bits. 2014-01-16 14:47:39 -08:00
stojce
2e5a1e1823 Merge 2014-01-16 23:15:02 +01:00
stojce
631106beb7 Rename mute menu 2014-01-16 23:10:23 +01:00
Andrzej Kapolka
cf40e76767 Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 13:55:28 -08:00
Stephen Birarda
c2148d2aea Merge pull request #1554 from ZappoMan/bugfixes 
Fix the issue with voxels randomly disappearing in the client
 2014-01-16 13:55:11 -08:00
Andrzej Kapolka
813c31050a Merge branch 'master' of https://github.com/highfidelity/hifi into debone 2014-01-16 13:54:55 -08:00
Andrzej Kapolka
865b495e6c Merge branch 'master' of https://github.com/worklist/hifi into debone 
Conflicts:
	interface/src/Audio.cpp
	interface/src/Menu.cpp
	interface/src/avatar/Avatar.h
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Webcam.cpp
	interface/src/devices/Webcam.h
	interface/src/renderer/FBXReader.cpp
 2014-01-16 13:35:03 -08:00
Brad Hefta-Gaub
a76f5a088c fixed comment 2014-01-16 13:19:21 -08:00
Brad Hefta-Gaub
a960330f34 fix voxel randomly disappearing bug 2014-01-16 13:17:41 -08:00
Brad Hefta-Gaub
f3074c1fcc Merge branch 'master' of git://github.com/worklist/hifi into generic_thread_fix 2014-01-16 12:55:55 -08:00
Brad Hefta-Gaub
76d5ef5bc6 removed dead code 2014-01-16 12:54:28 -08:00
Brad Hefta-Gaub
f97ab1dafe fixes leak of GenericThread and also fixes crash in octree servers on client disconnect 2014-01-16 12:53:32 -08:00
Andrzej Kapolka
3f08504e3e Replaced missing functionality. 2014-01-16 12:39:07 -08:00
Philip Rosedale
46bd677a4a Merge branch 'master' of https://github.com/worklist/hifi 2014-01-16 11:51:54 -08:00
Philip Rosedale
aa2ee2526e name file correctly 2014-01-16 11:51:46 -08:00
Brad Hefta-Gaub
8034538f41 removed redundant embedded ifdefs 2014-01-16 11:20:09 -08:00
stojce
150a667cd6 WL job #19484 
- Move 'Fly to voxel on click' menu item;
- add shortcut for muting audio ...
 2014-01-16 20:17:04 +01:00
Stephen Birarda
75152abe2c fix unused variable warnings and constructor ordering 2014-01-16 09:52:29 -08:00
stojce
a401d822a3 Merge 2014-01-16 18:39:21 +01:00
Andrew Meadows
1266ffd0ca merge of windows-build 
Conflicts:
	domain-server/src/DomainServer.cpp
	interface/src/Application.cpp
	interface/src/Menu.cpp
	libraries/avatars/src/AvatarData.h
	libraries/shared/src/NodeList.h
 2014-01-16 09:00:13 -08:00
Andrew Meadows
2e1c2f3a61 merge upstream with local repo 2014-01-15 17:13:59 -08:00
Stephen Birarda
d7388c2288 Merge pull request #1537 from ZappoMan/stephens_requests 
added option to disable local cache file
 2014-01-15 17:07:43 -08:00
ZappoMan
ec3699da3b Merge pull request #1543 from birarda/master 
perform a proper oculus teardown if it isn't present
 2014-01-15 17:04:52 -08:00
Andrew Meadows
4e51aee00b Merge latest upstream into local repo. 2014-01-15 17:04:33 -08:00
Andrew Meadows
4b94e53acf Removing Model::findSpherePenetrationWithJoint() which was experimental method that was not finally used. 2014-01-15 17:02:02 -08:00
Andrew Meadows
989b733de6 Removing magic numbers, but still only supporting 2 hands (the SkeletonModel currently has two hands hardcoded). 2014-01-15 16:59:49 -08:00
Stephen Birarda
0f7d86a111 perform a proper oculus teardown if it isn't present 2014-01-15 16:52:03 -08:00
Stephen Birarda
a694425823 clarify output for star generation time 2014-01-15 16:26:01 -08:00
Andrzej Kapolka
2c7b6b9696 Skeleton removal checkpoint; compiles, but there are a few bits missing. 2014-01-15 15:14:50 -08:00
Brad Hefta-Gaub
f445a391b7 added back arpa/inet.h and ifaddrs.h for mac and unix 2014-01-15 15:03:03 -08:00
stojce
50ad5a4ec8 alternate css background settings for selected items in QTreeView 2014-01-15 23:38:34 +01:00
stojce
9244bd5717 Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-15 23:14:58 +01:00
stojce
8e2879e5ff Layout fixes 2014-01-15 23:14:45 +01:00
Andrew Meadows
32f3621855 merge upstream work into local repo 2014-01-15 14:13:48 -08:00
Andrew Meadows
235b6f0c36 Adding disk collision proxy for hand paddles. 2014-01-15 14:05:57 -08:00
Andrew Meadows
ee6a3263bc Changing where the "hand palms" are drawn. Will back them up with collision proxies soon. 2014-01-15 14:02:17 -08:00
Leonardo Murillo
746b45d939 Moving ifdef to xml 2014-01-15 15:08:47 -06:00
Leonardo Murillo
9df1517f02 Merge branch 'master' of github.com:/worklist/hifi 2014-01-15 15:02:22 -06:00
Brad Hefta-Gaub
952365a1b7 clean up comments and tab spacing 2014-01-15 12:50:36 -08:00
Brad Hefta-Gaub
f1e98720d0 added option to disable local cache file 2014-01-15 12:29:54 -08:00
Brad Hefta-Gaub
477840904b Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-15 12:09:26 -08:00
ZappoMan
dfb70ee397 Merge pull request #1527 from PhilipRosedale/master 
New voxelBird example script
 2014-01-15 12:07:39 -08:00
Philip Rosedale
bade957a21 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-15 11:18:45 -08:00
stojce
b17d4a3ec9 Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-15 20:18:34 +01:00
Leonardo Murillo
1b687848d1 Unneeded include 2014-01-15 12:47:19 -06:00
Leonardo Murillo
f975c8ff69 Removing unneeded vars 2014-01-15 12:45:26 -06:00
Leonardo Murillo
f187ac0f98 Removing comment 2014-01-15 12:44:22 -06:00
Leonardo Murillo
dd2392f74b Finishing changes 2014-01-15 12:40:56 -06:00
Leonardo Murillo
049be6a569 Finishing changes 2014-01-15 12:40:40 -06:00
Brad Hefta-Gaub
7bfda0d60e removed pthread.h 2014-01-15 10:30:05 -08:00
Brad Hefta-Gaub
135cafb665 Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build 2014-01-15 10:21:40 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
 2014-01-15 10:20:21 -08:00
Lucas Crisman
73dfc5dd58 Merge branch 'master' of git://github.com/worklist/hifi into 19485 2014-01-15 14:50:59 -03:00
Lucas Crisman
24103740da equal sign shortcut for Reset Avatar Size on Application keyPress Event 2014-01-15 14:50:25 -03:00
Leonardo Murillo
80946b10b3 Merge 2014-01-14 22:12:37 -06:00
Leonardo Murillo
f9bb98680d Using Qt Designer .ui file instead of manually coding dialog 2014-01-14 21:57:28 -06:00
Brad Hefta-Gaub
eb55dd26e5 added glewInit 2014-01-14 19:18:01 -08:00
Philip Rosedale
a702c6a868 merge fix 2014-01-14 17:24:24 -08:00
Philip Rosedale
7f09aff297 Added voxelBird example script 2014-01-14 17:12:14 -08:00
Andrew Meadows
af3fae7bbf Merge upsteam master into current project (experimental hand paddles) 
Conflicts:
	interface/src/avatar/Avatar.cpp
	libraries/avatars/src/AvatarData.cpp
 2014-01-14 16:39:46 -08:00
Andrzej Kapolka
7e4fcb43f2 Merge branch 'master' of https://github.com/worklist/hifi into armstrong 2014-01-14 16:31:30 -08:00
Stephen Birarda
e76a37f48b resolve conflicts on merge with upstream master 2014-01-14 16:26:02 -08:00
Andrzej Kapolka
617453da8c Merge branch 'master' of https://github.com/worklist/hifi into armstrong 2014-01-14 16:22:41 -08:00
Andrew Meadows
761fdc9d84 Adding methods to Model for accessing hand info and computing hand collisions. 2014-01-14 16:19:57 -08:00
Stephen Birarda
540378262d Merge branch 'master' of https://github.com/worklist/hifi into domain-change 2014-01-14 16:19:37 -08:00
Andrzej Kapolka
242597bbda Merge branch 'master' of https://github.com/worklist/hifi into armstrong 2014-01-14 16:19:10 -08:00
Andrew Meadows
22679687c5 Minor cleanup: moved #include out of header and into cpp file. 2014-01-14 16:17:37 -08:00
Stephen Birarda
6b2f72f14d repair reference to _targetScale in MyAvatar 2014-01-14 16:17:07 -08:00
Andrzej Kapolka
4c2b67f6f3 Fix compile error. 2014-01-14 16:16:06 -08:00
Stephen Birarda
599e3bb9e5 resolve conflicts on merge with upstream master 2014-01-14 16:15:58 -08:00
Andrew Meadows
a08b7b3fd8 Adding initial Agent::findSphereCollision() implementation and removing some debug log spam. 2014-01-14 16:15:41 -08:00
Stephen Birarda
77ee27e5d7 resolve conflicts on merge with upstream master 2014-01-14 16:12:42 -08:00
Andrzej Kapolka
96a88e194c Merge branch 'master' of https://github.com/worklist/hifi into armstrong 2014-01-14 16:10:31 -08:00
Stephen Birarda
274989935d resolve conflicts on merge with upstream master 2014-01-14 16:09:12 -08:00
Stephen Birarda
767a241105 Merge remote-tracking branch 'upstream/master' into nodelist-container 2014-01-14 16:08:58 -08:00
Stephen Birarda
8676ac38f9 foreach spacing and reference repairs 2014-01-14 15:54:09 -08:00
Andrzej Kapolka
5d88953f12 First cut at stretching the arms out and aligning forearms with wrists. 
Closes #1423, #1504.
 2014-01-14 15:27:28 -08:00
Stephen Birarda
4ea14a51fc remove the SerialInterface 2014-01-14 13:14:15 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Stephen Birarda
bdc31a3b48 replace the DomainChangeListener class with a signal/slot combo 2014-01-14 11:38:05 -08:00
Stephen Birarda
9efb391ecf repair crazy references to node ponter from old iterator style 2014-01-14 10:50:06 -08:00
Stephen Birarda
57f977668f replace the Node mutex with a QMutex 2014-01-14 10:15:31 -08:00
Stephen Birarda
53d435006c more follow mode cleanup, fix silent node iterator 2014-01-14 10:07:26 -08:00
Stephen Birarda
cbcdeb570b pull all available datagrams in Application processDatagrams 2014-01-14 10:01:11 -08:00
Brad Hefta-Gaub
a39c20e4d4 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-14 09:18:52 -08:00
Leonardo Murillo
4a4b483532 Resolving conflicts 2014-01-14 10:31:47 -06:00
Leonardo Murillo
24bedc90a7 Resolving conflicts 2014-01-14 10:30:52 -06:00
Andrzej Kapolka
c163b513d2 Working on allowing visitors to modify, as well as read, data. 2014-01-13 18:09:28 -08:00
Stephen Birarda
3ab7a6d9d5 move network packet processing to main thread 2014-01-13 17:58:48 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Andrzej Kapolka
ce03853da5 Merge branch 'master' of https://github.com/worklist/hifi into retryagain 2014-01-13 16:13:38 -08:00
Andrzej Kapolka
0694a7d4a5 When we fail to download textures or geometry, retry after steadily increasing 
delays.  Closes #1471.
 2014-01-13 16:09:36 -08:00
Brad Hefta-Gaub
3af4703230 Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build 2014-01-13 15:58:28 -08:00
Brad Hefta-Gaub
2217d79200 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 2014-01-13 15:57:52 -08:00
Brad Hefta-Gaub
e60446a632 more windows build work 2014-01-13 15:57:31 -08:00
Brad Hefta-Gaub
392ff94ebe Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	interface/src/DataServerClient.cpp
	interface/src/avatar/MyAvatar.cpp
	libraries/avatars/src/AvatarData.h
 2014-01-13 15:06:26 -08:00
Andrzej Kapolka
f21436a29e Fix (hopefully) for warning on Windows build. 2014-01-13 15:02:46 -08:00
Brad Hefta-Gaub
b947d1e80c more surgical removal of WebCam with HAVE_LIBVPX 2014-01-13 15:00:15 -08:00
Andrzej Kapolka
9d831a2ab5 Orbit around voxel center, limit hover distance. 2014-01-13 14:43:59 -08:00
Brad Hefta-Gaub
b6b9ca881c removed more LIBVPX code by ifdef 2014-01-13 14:43:50 -08:00
stojce
4cb84bf617 Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-13 23:31:48 +01:00
stojce
06ecf03180 Layout fix (notes from Grayson) 2014-01-13 23:04:19 +01:00
Andrzej Kapolka
7abb7d9ccd Merge branch 'master' of https://github.com/worklist/hifi 2014-01-13 14:03:08 -08:00
Stephen Birarda
42e3bcfe91 allow fade scale to get smaller than minimum avatar scale 2014-01-13 13:52:41 -08:00
Andrzej Kapolka
2d5df38907 Persist the user orientation as well as the position, show up a couple meters 
in front of (and facing) target.  Closes #1367.
 2014-01-13 13:51:51 -08:00
Stephen Birarda
3f2c6504a6 fix for avatar scale bug, closes #1506 2014-01-13 12:27:47 -08:00
Brad Hefta-Gaub
83f62de69f removed some openGL hacks from windowshacks.h because we don't need them with correct setup 2014-01-13 12:16:35 -08:00
Brad Hefta-Gaub
3f03145386 fix ordering and includes for oculusmanager and 3dtv 2014-01-13 10:11:08 -08:00
Leonardo Murillo
ca16acef6b Checkpoint 2014-01-13 07:37:47 -06:00
Brad Hefta-Gaub
98efbade9b clean up windowshacks.h 2014-01-13 01:09:29 -08:00
Brad Hefta-Gaub
a290017746 more type mismatch warning fixes 2014-01-13 00:46:43 -08:00
Brad Hefta-Gaub
55babbf7b6 windows type mismatch warning fixes 2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
08c9dfbea7 fixed windows warnings related to truncating char 2014-01-12 23:32:03 -08:00
Brad Hefta-Gaub
9ccaba3ca8 snprintf windows fixes 2014-01-12 23:26:13 -08:00
Brad Hefta-Gaub
9e24996f39 more isnan() hacks 2014-01-12 23:11:06 -08:00
Brad Hefta-Gaub
a3022f538d more windows fixes 2014-01-12 23:08:01 -08:00
Brad Hefta-Gaub
d92d043e8f more windows build fixes 2014-01-12 22:52:06 -08:00
Brad Hefta-Gaub
2017f850c4 more windows float warning and error fixes 2014-01-12 22:07:37 -08:00
Brad Hefta-Gaub
19012e2f6d more windows build fixes isnan 2014-01-12 22:05:55 -08:00
Brad Hefta-Gaub
a8fc7f44c0 Merge branch 'windows_build' of https://github.com/ZappoMan/hifi into windows_build 2014-01-12 21:47:19 -08:00
Brad Hefta-Gaub
32792a8e66 move windowshacks 2014-01-12 21:46:55 -08:00
Brad Hefta-Gaub
2d8b2b2530 clean up windows warnings 2014-01-12 21:36:55 -08:00
Brad Hefta-Gaub
a94e371e5c fix more windows warnings 2014-01-12 21:27:25 -08:00
Brad Hefta-Gaub
c90c1e4063 more LIBVPX workarounds 2014-01-12 19:59:17 -08:00
Brad Hefta-Gaub
ff72e25a34 more windows build work 2014-01-12 15:31:06 -08:00
Brad Hefta-Gaub
08bb783777 more windows build work 2014-01-12 14:49:15 -08:00
Brad Hefta-Gaub
8d7cb5d0be add HAVE_LIBVPX around webcam implementation 2014-01-11 23:00:17 -08:00
Brad Hefta-Gaub
c7ec767565 near/far apparently don't work as variables in windows 2014-01-11 22:38:08 -08:00
Brad Hefta-Gaub
b0e913bfce add Audio back to win32 2014-01-11 22:30:55 -08:00
Brad Hefta-Gaub
6de68ce31c remove LIBVPX from webcam 2014-01-11 22:08:15 -08:00
Brad Hefta-Gaub
776f0e4585 fix up avatar.h and floats 2014-01-11 21:48:35 -08:00
Brad Hefta-Gaub
a34d4acb71 more windows build, first cut at getting opengl working, more disabling VPX 2014-01-11 21:39:45 -08:00
stojce
0c4bee8d12 save and restore dialog settings 2014-01-12 00:33:46 +01:00
stojce
623def0964 File filter 
Display extensions
 2014-01-11 21:03:49 +01:00
stojce
d81968df51 refactoring 2014-01-11 15:30:03 +01:00
stojce
227326e3b7 Import button opacity 2014-01-11 14:40:22 +01:00
stojce
382d061b30 Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-11 11:25:26 +01:00
Brad Hefta-Gaub
825c1c8876 fix windows warnings 2014-01-11 00:07:35 -08:00
Brad Hefta-Gaub
73c8dc495b changed all fmin to std::min 2014-01-10 21:42:08 -08:00
Brad Hefta-Gaub
26adabf130 removed voxel addSphere since it wasn't compiling and was old debug code 2014-01-10 21:39:03 -08:00
Brad Hefta-Gaub
731209d8cb remove unused PerfStats class more missing header changes 2014-01-10 19:47:23 -08:00
Brad Hefta-Gaub
5725a92cfe get rid of arpa/inet.h and netdb.h 2014-01-10 18:13:23 -08:00
Brad Hefta-Gaub
9bc4a3df41 switch from pthread mutex to QMutex 2014-01-10 18:01:36 -08:00
Andrew Meadows
e18ae78ce1 merge pull #1499 2014-01-10 16:30:22 -08:00
Andrew Meadows
f2d0d445c2 yet another merge after competing pull requests 2014-01-10 16:03:48 -08:00
Andrzej Kapolka
415935a594 Merge branch 'master' of https://github.com/worklist/hifi into fixery 2014-01-10 16:03:40 -08:00
Andrzej Kapolka
de0472cfc1 Merge pull request #1498 from birarda/remove-curl 
remove curl dependency by removing starfield loading from URL
 2014-01-10 16:02:17 -08:00
Andrzej Kapolka
355321c8b5 Merge branch 'master' of https://github.com/worklist/hifi into fixery 2014-01-10 16:01:18 -08:00
Andrew Meadows
8799ad133e merge again after some competing pull requests were processed 2014-01-10 16:00:08 -08:00
Andrew Meadows
d28ed70ca9 merge pull request 1446 2014-01-10 15:55:38 -08:00
Andrzej Kapolka
a7c14f1f17 Only register movement if the hand isn't new. 2014-01-10 15:53:50 -08:00
Philip Rosedale
ea0f7c1e05 Merge pull request #1475 from ZappoMan/local_voxel_cache 
Local voxel cache & some bug fixes
 2014-01-10 15:53:47 -08:00
Andrzej Kapolka
5283e51927 Start out disabled. 2014-01-10 15:51:12 -08:00
Andrzej Kapolka
a7e9434c96 Tweaked constants. 2014-01-10 15:50:14 -08:00
Stephen Birarda
1c3259c8cf remove the starfield URL loading code, closes #1497 2014-01-10 15:33:43 -08:00
Andrzej Kapolka
515b40ecc3 Attempt to disable Hydra hands after five seconds without movement. 2014-01-10 15:00:14 -08:00
stojce
a1207d28a0 Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-10 23:47:35 +01:00
stojce
80561b6861 removed size hint from sag icons 2014-01-10 23:47:18 +01:00
Andrzej Kapolka
38118fdab0 When we start setting the fake coefficients after we set the real ones, make 
sure all of the other coefficients are zero.
 2014-01-10 14:42:05 -08:00
stojce
d5e07a5c75 Add import configuration 
remove unused icons
remove redundant QLabels
 2014-01-10 23:26:58 +01:00
Andrzej Kapolka
4ae5203f38 Remove unused constant. 2014-01-10 14:10:33 -08:00
Andrzej Kapolka
9fa170494c I believe what we really want to decay is the mouse pitch. 2014-01-10 14:04:46 -08:00
Leonardo Murillo
1c2b27f0f4 Checkpoint 2014-01-10 15:18:24 -06:00
Andrzej Kapolka
e97970d961 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-10 12:27:04 -08:00
Andrzej Kapolka
131af0cf16 I believe this should fix the "Joint/model not in model list" errors. 2014-01-10 12:26:11 -08:00
Leonardo Murillo
da2f814b7a Merge branch 'master' of github.com:/worklist/hifi 2014-01-10 14:08:22 -06:00
Leonardo Murillo
ede32cfadc Checkpoint 2014-01-10 14:08:10 -06:00
Philip Rosedale
f0460bac5f Merge pull request #1492 from stojce/19466 
Code Review for Job #19466
 2014-01-10 11:19:43 -08:00
Brad Hefta-Gaub
50fa6be829 Merge branch 'master' of git://github.com/worklist/hifi into local_voxel_cache 2014-01-09 19:41:15 -08:00
ZappoMan
88232f320c Merge pull request #1469 from birarda/kill-leap 
remove leap integration
 2014-01-09 19:40:58 -08:00
Brad Hefta-Gaub
cdb4b8c5f3 Merge branch 'master' of git://github.com/worklist/hifi into local_voxel_cache 2014-01-09 18:52:34 -08:00
Leonardo Murillo
eb52ded4ad Styling + others 2014-01-09 20:34:02 -06:00
Leonardo Murillo
664a1a7677 Checkpoint 2014-01-09 20:12:39 -06:00
Brad Hefta-Gaub
5b14a4eed3 removed dead code 2014-01-09 14:52:40 -08:00
Brad Hefta-Gaub
6e95c52444 make local voxel cache properly switch to different cache file when switching domains 2014-01-09 14:51:04 -08:00
Leonardo Murillo
9dd37344b8 checkpoint 2014-01-09 16:14:51 -06:00
Brad Hefta-Gaub
c181d0a849 first cut at local voxel cache 2014-01-09 12:05:09 -08:00
Lucas Crisman
e1aa74a5df equal sign key as shortcut for Reset Avatar Size 2014-01-09 15:00:55 -03:00
stojce
5b678cb24d Layout fix 2014-01-09 18:15:39 +01:00
Leonardo Murillo
efb173e1d4 Preliminary update dialog work 2014-01-08 21:20:43 -06:00
stojce
6dc9ea8a2e Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-08 19:25:00 +01:00
Leonardo Murillo
d44126ac33 Get version XML and store latest version as application property 2014-01-08 08:30:50 -06:00
Leonardo Murillo
251416ab0a Merge branch 'master' of github.com:/worklist/hifi 2014-01-07 14:39:18 -06:00
stojce
cc543f4313 Added custom icons (QFileIconProvider) 2014-01-07 00:41:11 +01:00
Andrzej Kapolka
8b2212b6cf Fix for "red ball" issue with no skeleton: use avatar position for head 
position.
 2014-01-06 12:08:42 -08:00
Stephen Birarda
9eb31b48cc remove the Leap integration 2014-01-06 11:09:59 -08:00
Leonardo Murillo
314c4ffcfa Using applicationVersion() instead of const wherever version is specified 2014-01-06 09:24:29 -06:00
Leonardo Murillo
ba79b1b329 Using BUILD_VERSION to setApplicationVersion 2014-01-06 09:18:10 -06:00
stojce
8855a32526 removed unused widgets 2014-01-06 11:15:15 +01:00
stojce
11bf9b8a50 Merge branch 'master' of https://github.com/worklist/hifi into 19483 2014-01-05 23:45:37 +01:00
stojce
f0015939c4 removed unused elements from import dialog (preview box and import to clipboard checkbox) 2014-01-05 23:45:22 +01:00
Brad Hefta-Gaub
abf8e83c33 change Voxels JS interface to be more clear 2014-01-05 11:09:16 -08:00
Brad Hefta-Gaub
0df02618ee use ScriptEngine in Particle::collideWithXXX() methods so that we get all script interfaces 2014-01-04 03:16:47 -08:00
Andrzej Kapolka
2b15fdf78f Merge branch 'master' of https://github.com/worklist/hifi 2014-01-03 17:49:34 -08:00
Andrzej Kapolka
aa9fc290a5 Minimum chat circle radius from Ryan, basic avatar/voxel orbit behavior. 2014-01-03 16:46:11 -08:00
Andrew Meadows
6518e70688 Minor cast enforcement during initialization. 2014-01-03 16:27:57 -08:00
Andrew Meadows
1882c9e43b Merge branch 'elasticity' of https://github.com/PhilipRosedale/hifi into elasticity-fix 
Conflicts:
	libraries/particles/src/ParticleCollisionSystem.cpp
 2014-01-03 16:26:17 -08:00
Philip Rosedale
83101d3d11 reduce elasticity to be less than 1 2014-01-03 15:31:16 -08:00
Philip Rosedale
2cf5efc4a8 Merge pull request #1449 from PhilipRosedale/mirror 
Mirror
 2014-01-03 15:25:28 -08:00
Philip Rosedale
2286916fbb Don’t render head if inside it! 2014-01-03 15:00:42 -08:00
Philip Rosedale
65340f1667 Tweaked mirror distances 2014-01-03 14:33:54 -08:00
Stephen Birarda
91b07d93c8 Merge pull request #1440 from PhilipRosedale/buckyballs 
Removed some more old balls/hair/particle code, added local-only version of buckyballs to try playing with
 2014-01-03 14:21:29 -08:00
stojce
594a20e248 Merge branch 'master' of https://github.com/worklist/hifi into 19466 2014-01-03 22:53:30 +01:00
stojce
2814cca9af #19466 - Add avatar scale to preferences panel 2014-01-03 21:02:56 +01:00
Andrzej Kapolka
1003393101 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-03 11:11:04 -08:00
Stephen Birarda
a61e214c9a simplify loopback trigger for injected audio 2014-01-03 10:16:59 -08:00
ZappoMan
ec1f08b140 Merge pull request #1443 from birarda/master 
open up more audio to JS
 2014-01-03 10:12:44 -08:00
Stephen Birarda
f24eff33fe open up ASI playSound method to ScriptEngine 2014-01-03 09:38:05 -08:00
Stephen Birarda
443c94a88f repairs to AudioMixer and audio injection flow 2014-01-02 17:15:46 -08:00
Philip Rosedale
3fe972791c remove unused mohawk and hair physics 2014-01-02 17:12:34 -08:00
Philip Rosedale
2ad3aea729 Cleanup to move BuckyBalls prototype to own class file 2014-01-02 17:02:04 -08:00
ZappoMan
696afd7875 more warnings fixes 2014-01-02 16:18:49 -08:00
ZappoMan
f1da6bf90b fix various compiler warnings on gcc 2014-01-02 15:58:03 -08:00
Philip Rosedale
b9d68ec087 removed old ParticleSystem class 2014-01-02 15:53:11 -08:00
Philip Rosedale
739a02c022 merge fixes 2014-01-02 15:46:37 -08:00
Andrzej Kapolka
460a9aacb8 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-02 15:45:27 -08:00
Philip Rosedale
c286f84d97 removed trigger being used for toy ball catching 2014-01-02 15:38:21 -08:00
ZappoMan
366209668d Merge pull request #1431 from stojce/19463 
Code Review for Job #19463
 2014-01-02 15:38:15 -08:00
Andrzej Kapolka
f03139dbe5 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-02 15:38:07 -08:00
Andrzej Kapolka
ed4ad1cea9 Removed some unused code. 2014-01-02 15:37:56 -08:00
Stephen Birarda
594bd58774 add AudioScriptingInterface to expose playSound to JS 2014-01-02 15:35:28 -08:00
Philip Rosedale
8f48ca0e95 Merge pull request #1437 from ey6es/master 
Restore bent arm behavior when pointing (lost in ball removal).  Fix compile warning.
 2014-01-02 15:26:33 -08:00
Philip Rosedale
c47ace6d7f Merge pull request #1436 from birarda/master 
changes to audio injector for overlapped sounds in preparation for JS
 2014-01-02 15:24:47 -08:00
Stojce Slavkovski
3848028365 changed locking to QMutexLocker 2014-01-03 00:11:24 +01:00
Andrzej Kapolka
0461335887 Align hand with forearm in mouse-pointing mode. 2014-01-02 14:56:29 -08:00
Stojce Slavkovski
b7bcdf8f8c QMutex reference 2014-01-02 23:56:28 +01:00
Stojce Slavkovski
f583013776 Merge branch 'master' of https://github.com/worklist/hifi into 19463 2014-01-02 23:19:07 +01:00
Stojce Slavkovski
c0fcecad2c Jenkins build fix 2014-01-02 23:18:39 +01:00
Stojce Slavkovski
27e211de8d possible fix for jenkins build error 2014-01-02 23:10:21 +01:00
Andrzej Kapolka
7178147535 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-02 13:23:39 -08:00
Andrzej Kapolka
6c27569e9b Fix arm bending, compile warning. 2014-01-02 13:23:15 -08:00
Stephen Birarda
3a45fb8533 cleanup new API for sound injection 2014-01-02 12:31:01 -08:00
Stephen Birarda
674c19a570 leverage new AudioInjector API for throw and catch sounds 2014-01-02 12:17:18 -08:00
Stojce Slavkovski
31fa8ad1fb Merge branch 'master' of https://github.com/worklist/hifi into 19463 2014-01-02 21:06:28 +01:00
Andrew Meadows
68c09c5b74 Merge 'threedtv' of https://github.com/ZappoMan/hifi for pull 1430 2014-01-02 11:59:57 -08:00
Stephen Birarda
a0cf2c8fb1 Merge branch 'master' of https://github.com/worklist/hifi 2014-01-02 09:00:14 -08:00
Philip Rosedale
a9d21faa7e Merge branch 'master' of https://github.com/worklist/hifi into buckyballs 2014-01-01 10:45:38 -08:00
Philip Rosedale
d1e9c25d00 bucky balls! 2014-01-01 10:45:06 -08:00
ZappoMan
48b2d7d3fa scripting for particle to voxel collisions 2013-12-31 11:33:43 -08:00
ZappoMan
651d2d0c81 rename voxels and particles scripting interfaces 2013-12-31 09:41:35 -08:00
ZappoMan
9194a53410 change to setScript() since it does more than update 2013-12-30 15:55:57 -08:00
Stojce Slavkovski
cd4fcb993f removed unused 'LogDisplay' class 2013-12-29 23:52:26 +01:00
Stojce Slavkovski
aa75763b27 Merge branch 'master' of https://github.com/worklist/hifi into 19463 2013-12-29 22:54:41 +01:00
ZappoMan
788bb530f8 added comment 2013-12-28 13:02:27 -08:00
ZappoMan
47f45c3af1 make sure camera is configured on connect 2013-12-28 13:00:25 -08:00
ZappoMan
6f2a1b9802 cleanup 2013-12-28 12:51:50 -08:00
ZappoMan
32b2fb8f21 cleanup 2013-12-28 12:08:24 -08:00
ZappoMan
a43844447c first cut at 3D TV support 2013-12-28 10:07:33 -08:00
Philip Rosedale
e3a77ef139 tuning 2013-12-26 20:20:57 -08:00
Philip Rosedale
74380260b3 Grab includes rotation 2013-12-26 19:07:02 -08:00
Stojce Slavkovski
e0255721da Search keyword highlighter 2013-12-24 22:15:19 +01:00
Stojce Slavkovski
840d1a33ef Reveal log file 
- change log location lo application data folder
- reveal file in Finder (Explorer) implementation
 2013-12-23 21:23:47 +01:00
Stojce Slavkovski
505ed5bc64 Storing log to file - initial 2013-12-22 23:55:21 +01:00
Stojce Slavkovski
ee1eb25dfa replace LogDisplay with File logger 
- added abstract logger interface
 2013-12-22 18:56:53 +01:00
Stojce Slavkovski
3d44ab9939 Dialog layout 2013-12-22 15:06:40 +01:00
Philip Rosedale
9b3973c2e4 removed headers 2013-12-21 18:07:40 -08:00
Philip Rosedale
58a73dfede yet again remove the test _balls now that we have a particle server 2013-12-21 18:06:04 -08:00
Philip Rosedale
03d192574d typo 2013-12-20 22:57:35 -08:00
Philip Rosedale
bad47bd527 Fixed chat height 2013-12-20 15:33:56 -08:00
Stephen Birarda
10eb8985f4 remove the double catch sound 2013-12-20 15:29:12 -08:00
Philip Rosedale
cf3dc47c18 debug off 2013-12-19 23:16:04 -08:00
Philip Rosedale
b6ac73bb57 merge 2013-12-19 23:12:11 -08:00
Philip Rosedale
f4a28850cf Merge remote-tracking branch 'upstream/master' 2013-12-19 23:05:37 -08:00
Stephen Birarda
a01a17c30a hook throw and catch sounds to Hand class ball tests 2013-12-19 17:24:30 -08:00
Stephen Birarda
3f4b4178ff remove the test injector code from Application 2013-12-19 15:25:39 -08:00
Stephen Birarda
7ed609633a complete the test injector stub 2013-12-19 15:23:31 -08:00
Stephen Birarda
0eb22fdc60 Merge branch 'master' of https://github.com/worklist/hifi into injected-audio 2013-12-19 15:17:10 -08:00
Stephen Birarda
bdf8c4b9b2 implement threaded send for AudioInjector 2013-12-19 15:17:03 -08:00
Philip Rosedale
6a941a024d Merge remote-tracking branch 'upstream/master' 2013-12-19 15:01:58 -08:00
Philip Rosedale
38b59f96d3 Merge pull request #1412 from ZappoMan/bugfixes 
Implement support for adjusting particles to clock skew
 2013-12-19 15:01:01 -08:00
Philip Rosedale
9f7e79e3c1 bigger catch radius, tweak sounds, different new ball button 2013-12-19 14:59:15 -08:00
ZappoMan
d71bc248f4 support adjusting particles based on clockSkew 2013-12-19 14:49:58 -08:00
Leonardo Murillo
44a24496cc Missing line feed 2013-12-19 16:31:38 -06:00
Stephen Birarda
2409b5f784 complete inital test of AudioInjector API 2013-12-19 13:46:37 -08:00
ZappoMan
72649f1ac9 adjust flight times correctly in stats tracking 2013-12-19 13:29:45 -08:00
ZappoMan
bfbaf265dd first cut at added clockSkew support to nodes and PING/PING_REPLY 2013-12-19 13:14:14 -08:00
Stephen Birarda
4c15c54535 Merge branch 'master' of https://github.com/worklist/hifi into injected-audio 2013-12-19 12:42:06 -08:00
Stephen Birarda
b035f74f94 fix for build busters with changed AbstractAudioInterface 2013-12-19 12:39:57 -08:00
Stephen Birarda
eac3b6be65 add AudioInjector class to pull samples from URL and inject 2013-12-19 12:28:37 -08:00
Philip Rosedale
c0f3ec5b6a merge fix 2013-12-19 10:55:00 -08:00
Philip Rosedale
c287e37691 Reverted key mapping change since Andrzej fixed the underlying problem. 2013-12-19 10:02:43 -08:00
Philip Rosedale
77751df992 Revert "Switched voxel size (back) to key +,- because ZoomIn and ZoomOut don’t seem to trigger (at least on my mac)" 
This reverts commit d68a551940.
 2013-12-19 10:01:55 -08:00
ZappoMan
f7793a0f08 Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2013-12-19 09:51:07 -08:00
ZappoMan
e2b7e08398 revert back to timestamps, fix a couple other bugs 2013-12-19 09:50:53 -08:00
Leonardo Murillo
c3b222cfc2 Print assignment request details to log 2013-12-19 11:23:55 -06:00
Philip Rosedale
abd0951696 Merge remote-tracking branch 'upstream/master' 2013-12-18 20:55:57 -08:00
Philip Rosedale
09e5b8ea4a slaps sound only on impact with velocity 2013-12-18 20:55:27 -08:00
Philip Rosedale
9980065659 Merge pull request #1406 from ZappoMan/particle_blinky_bug 
Fix Particle Blinkiness on Clock Skew, and remove all global time stamps from wire formats
 2013-12-18 20:02:38 -08:00
ZappoMan
5b36953e81 cleanup clockSkew debug options and remove some chatty logs 2013-12-18 19:33:52 -08:00
Andrzej Kapolka
f10dccb1b8 Fix for menu shortcuts; just include widget library rather than using awkward 
workaround.
 2013-12-18 17:28:21 -08:00
Philip Rosedale
d68a551940 Switched voxel size (back) to key +,- because ZoomIn and ZoomOut don’t seem to trigger (at least on my mac) 2013-12-18 17:13:51 -08:00
ZappoMan
6b0d7c30f0 added debugging option for forced clock skew 2013-12-18 16:58:49 -08:00
ZappoMan
41490991ff Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 
Conflicts:
	interface/src/Application.h
 2013-12-18 15:50:03 -08:00
Andrzej Kapolka
3f0b5aa748 Build fix. 2013-12-18 13:56:30 -08:00
Stojce Slavkovski
d72c4e4f65 removed commented code 2013-12-18 20:40:15 +01:00
Stojce Slavkovski
45d926da41 CR fixes 2013-12-18 20:37:45 +01:00
ZappoMan
4f3f6c0327 fixed build buster 2013-12-18 10:42:35 -08:00
ZappoMan
8549894ff8 add support for palm and tip spatial data to JS interface 2013-12-18 09:53:47 -08:00
ZappoMan
efdef1ad35 added all buttons triggers and joysticks 2013-12-18 09:33:48 -08:00
ZappoMan
70e9781ad9 CR feedback new class names 2013-12-18 08:42:34 -08:00
Stojce Slavkovski
a2ad70524f Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-18 17:36:33 +01:00
Stojce Slavkovski
397eb13680 removed legacy resources path locator 2013-12-18 08:05:34 +01:00
Stojce Slavkovski
4c1226ffd9 Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-18 08:00:55 +01:00
Philip Rosedale
13be1ea825 added catch, throw, new ball sounds. Tuned ball speed for handball. 2013-12-17 22:08:52 -08:00
Philip Rosedale
b3bb33e48c Merge remote-tracking branch 'upstream/master' 2013-12-17 20:12:31 -08:00
Philip Rosedale
e6847961f5 reduced damping for thrown balls, turned off screen flash 2013-12-17 20:11:53 -08:00
ZappoMan
a59650beac Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 2013-12-17 19:50:39 -08:00
Andrzej Kapolka
45c31cece3 Removed insertion test code. 2013-12-17 18:23:12 -08:00
Andrzej Kapolka
a90dbe314b Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-17 18:10:39 -08:00
ZappoMan
a443570106 Merge pull request #1397 from birarda/master 
fix for 8 channel audio output
 2013-12-17 18:04:12 -08:00
Andrzej Kapolka
f7aa464bf2 Somehow, I overwrote this value in Camera. 2013-12-17 17:21:56 -08:00
Andrzej Kapolka
8ddf6297a5 Fixed Xcode warnings. 2013-12-17 17:13:41 -08:00
Andrzej Kapolka
6cffce5b31 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-17 16:57:25 -08:00
Andrzej Kapolka
e6a41b2003 Proof of concept sphere thing for metavoxels. 2013-12-17 16:56:52 -08:00
Stephen Birarda
c6dc93c28e fix for 8 channel output devices (HDMI capture) 2013-12-17 16:08:38 -08:00
Philip Rosedale
f08354c853 higher speed collisions to trigger a bounce sound 2013-12-17 15:36:26 -08:00
ZappoMan
4bfdce3910 Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 
Conflicts:
	libraries/avatars/src/HandData.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2013-12-17 15:25:12 -08:00
ZappoMan
a6e6205a57 first cut at scriptable controller 2013-12-17 15:23:09 -08:00
Stojce Slavkovski
4509b8dbe5 don't cut long lines 2013-12-17 23:16:16 +01:00
ZappoMan
ccd6058412 get abstract menu class to work 2013-12-17 13:55:17 -08:00
Andrzej Kapolka
a5c8531aa1 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2013-12-17 13:46:44 -08:00
Andrzej Kapolka
d535d3b115 More progress on getting values in and out of scripts. 2013-12-17 13:44:56 -08:00
Stojce Slavkovski
36109c090e 720px width 2013-12-17 22:41:38 +01:00
Stojce Slavkovski
9d3cc9a5b4 70% initial width 2013-12-17 22:32:36 +01:00
Stojce Slavkovski
4566114175 Log dialog geometry 2013-12-17 22:25:26 +01:00
Stojce Slavkovski
57b4148867 Dialog position / toggle 2013-12-17 22:12:24 +01:00
Stojce Slavkovski
3e1c857a2e Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-17 22:11:29 +01:00
ZappoMan
77d29153b6 Merge pull request #1390 from PhilipRosedale/slaps 
throwing from fingertips, less gravity, lighter target rendering
 2013-12-17 13:02:05 -08:00
Philip Rosedale
ae1cc99f3d throwing from fingertips, less gravity, lighter target rendering 2013-12-17 12:48:59 -08:00
Stojce Slavkovski
841d491b2f Merge branch 'master' of https://github.com/worklist/hifi into 19461 2013-12-17 20:44:51 +01:00
ZappoMan
a2f1b3e325 Merge branch 'master' of https://github.com/worklist/hifi into particle_blinky_bug 2013-12-17 11:35:49 -08:00
ZappoMan
4852aca86c Merge pull request #1386 from PhilipRosedale/slaps 
Hand games are now menu options, hydra hands in fixed L/R orientation, added slaps game
 2013-12-17 11:34:43 -08:00
ZappoMan
74d9c05c44 added particle server details to voxel stats dialog 2013-12-17 11:32:20 -08:00
Philip Rosedale
35e7cfddba Made drumming and slaps into menu choices from ‘Hand Options’ 2013-12-17 11:20:26 -08:00
Stojce Slavkovski
365d1eea10 Merge branch 'master' of https://github.com/worklist/hifi into 19461 
Conflicts:
	interface/src/Menu.h
 2013-12-17 20:15:40 +01:00
Stephen Birarda
8ece758107 spacing fix in Audio.cpp 2013-12-17 11:13:45 -08:00
Philip Rosedale
d6efcce28e Debugging render call for head/hand positions, debugging for ball injection 2013-12-17 11:08:38 -08:00
Stephen Birarda
cc5c04c82f remove doubling of right channel for injected audio 2013-12-17 10:31:32 -08:00
Stephen Birarda
a634881477 have linearResampling handle mono to stereo 48KHz conversion 2013-12-17 09:52:42 -08:00
Stephen Birarda
964558d514 add a QAudioOutput object for local loopback 2013-12-17 09:41:28 -08:00
Philip Rosedale
fc28034f37 hydra hands hard coded to LH and RH controllers, ball debugging 2013-12-17 09:41:13 -08:00
Philip Rosedale
d4bad3421f fix: get velocity from either hand or fingertip according to where ball is thrown from 2013-12-16 21:49:15 -08:00
Philip Rosedale
14d198f930 Merge remote-tracking branch 'upstream/master' into slaps 2013-12-16 21:20:05 -08:00
ZappoMan
e969331f5c implement catching of particles 2013-12-16 20:29:28 -08:00
ZappoMan
8f1fbec057 added versioning to SVO files and Particle inHand support 2013-12-16 19:49:22 -08:00
ZappoMan
d9f412406f better implementation of particle palm collisions 2013-12-16 18:12:47 -08:00
Stojce Slavkovski
cc6f7ed4cc display all log data on load 2013-12-17 03:07:57 +01:00
Philip Rosedale
4bf4ba22bd Merge remote-tracking branch 'upstream/master' into slaps 2013-12-16 18:00:02 -08:00
Philip Rosedale
03869e81fd Merge pull request #1380 from birarda/qt-for-portaudio 
move from 44.1 to 48 on audio
 2013-12-16 17:58:41 -08:00
Andrzej Kapolka
6385a73379 Working on scripty bits. 2013-12-16 17:53:53 -08:00
Philip Rosedale
be27f36a7e Merge remote-tracking branch 'upstream/master' into slaps 2013-12-16 17:37:22 -08:00
Philip Rosedale
6ab4839c3b it’s the other guys palms you want 2013-12-16 17:14:19 -08:00
Philip Rosedale
0d76b370df only check palms if active 2013-12-16 17:01:46 -08:00
Stephen Birarda
a31f15ee79 don't blow away a channel on local injection loopback 2013-12-16 16:57:30 -08:00
Stephen Birarda
efe05adcae fix audio graphs for new audio infrastructure 2013-12-16 16:52:04 -08:00
Stephen Birarda
30b22a13ad remove an unecessary condition in Audio.cpp 2013-12-16 16:30:04 -08:00
Stephen Birarda
bb93c64d8d some initial audio stat render fixes 2013-12-16 16:21:50 -08:00
Stephen Birarda
90ea978278 fix some clipping in procedural audio 2013-12-16 16:03:46 -08:00
Stephen Birarda
e5d2647e70 fix last input loudness for mouth movement with no depth camera 2013-12-16 16:01:03 -08:00
Stephen Birarda
89beff4253 fix the scope and last input loudness 2013-12-16 15:41:58 -08:00
Stephen Birarda
f7ed8cef8f fixes for all current headsets work 2013-12-16 15:31:05 -08:00
Stephen Birarda
6b644eb130 repair upsampling and local loopback by correcting for limits 2013-12-16 15:15:25 -08:00
Stojce Slavkovski
5a27ded669 Merge branch 'master' of https://github.com/worklist/hifi into 19461 
Conflicts:
	interface/src/Application.cpp
 2013-12-16 22:57:47 +01:00
Andrzej Kapolka
6888dc4eeb Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-16 13:44:44 -08:00
Andrzej Kapolka
0ca2320711 Working on guide/script support. 2013-12-16 13:44:24 -08:00
Stojce Slavkovski
e788d746d4 added dialog for log data 
- importing Inconsolata.otf on application level
- style sheet for dialog
- changed menu behaviour for log data
 2013-12-16 22:43:17 +01:00
Stephen Birarda
2d4a8ca997 fix scope for audio output 2013-12-16 12:19:19 -08:00
Stephen Birarda
cdc6f33128 fix scope for input 2013-12-16 12:16:08 -08:00
ZappoMan
6203e9dc2e Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/Hand.cpp
 2013-12-16 12:11:33 -08:00
ZappoMan
f8830ed9b1 cleaned up hand target code a bit 2013-12-16 12:04:16 -08:00
Stephen Birarda
1f9ca00317 drive input from buffer callback and output from network 2013-12-16 11:58:23 -08:00
Leonardo Murillo
4f1ff5b566 Using QStandardPaths for cache directory 2013-12-16 13:55:04 -06:00
ZappoMan
32c2aef29b temp remove debug verbosity 2013-12-16 11:36:19 -08:00
Leonardo Murillo
5ac125fdd8 Typo fix 2013-12-16 13:32:12 -06:00
Leonardo Murillo
06d14436bd Printing build version on title 2013-12-16 13:29:17 -06:00
ZappoMan
f9b7c23857 correct handleing of app shutdown and scripting enging termination 2013-12-16 11:26:30 -08:00
ZappoMan
af52be7860 tweaks to script engine shutdown behavior 2013-12-16 09:32:01 -08:00
ZappoMan
524a41468c multiple scripts running at same time, menu interface for scripts 2013-12-16 09:16:51 -08:00
Leonardo Murillo
3ca9cde500 Adding build sequence to Interface build 2013-12-16 11:03:49 -06:00
Philip Rosedale
893a3900d9 added palm collision sounds 2013-12-15 20:55:51 -08:00
Philip Rosedale
ce986c367e palms detect collision 2013-12-15 19:53:24 -08:00
ZappoMan
a220804fb0 properly connect signals and slots to shut down script properly, fix null termination in script file load 2013-12-14 14:23:33 -08:00
ZappoMan
dacaade9ed first cut at client scripts working 2013-12-14 13:54:25 -08:00
ZappoMan
e2fbb7beb4 first cut at splitting out scripting engine from agent to add to client 2013-12-14 08:14:38 -08:00
Philip Rosedale
21d7fe1277 Grab and move with button 4 2013-12-13 21:59:19 -08:00
ZappoMan
02d3d384ca added basic support for hit particles with the palm of the hand 2013-12-13 19:02:45 -08:00
Philip Rosedale
a04c544c17 Merge fixes 2013-12-13 16:35:11 -08:00
Philip Rosedale
b6ae9869c2 Merge pull request #1369 from ZappoMan/particle_voxel_collisions 
New Particle Features
 2013-12-13 15:46:00 -08:00
Andrzej Kapolka
c9b734dad3 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-13 15:28:03 -08:00
Andrzej Kapolka
41fdbcb30f Fix for crash that Philip was seeing. 2013-12-13 15:25:03 -08:00
Philip Rosedale
1b1fdd3dc4 add menu option for sixense filter 2013-12-13 15:21:32 -08:00
Andrzej Kapolka
41c7b9ce29 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/src/Application.cpp
 2013-12-13 15:00:05 -08:00
Andrzej Kapolka
50e4691568 Pointer attributes, cleanup. 2013-12-13 14:33:18 -08:00
ZappoMan
aaf4ff7dfc added lifetime to particles 2013-12-13 14:30:29 -08:00
ZappoMan
38d928fa4e make balls for both hands, allow you to change color, remove red wire simulation 2013-12-13 11:58:12 -08:00
Andrzej Kapolka
a10aca59f3 Visitor cleanup. 2013-12-12 18:29:23 -08:00
Philip Rosedale
caed884583 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-12 18:17:23 -08:00
Philip Rosedale
63243b2e14 merge fix 2013-12-12 17:58:37 -08:00
ZappoMan
f94e000e6b Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions 2013-12-12 17:52:33 -08:00
ZappoMan
5830f1134e add particle collisions with voxels 2013-12-12 17:52:22 -08:00
Stephen Birarda
25b7065298 changes for broken test 2013-12-12 17:19:54 -08:00
ZappoMan
21bdbe3128 Merge branch 'master' of https://github.com/worklist/hifi into edit_particles 2013-12-12 15:59:34 -08:00
ZappoMan
0560b16133 only render local toy ball sphere if there is an actual toy ball 2013-12-12 15:47:51 -08:00
ZappoMan
08591481a6 added shadows to particles 2013-12-12 15:44:06 -08:00
Andrzej Kapolka
4a7efa5ef9 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-12 15:36:48 -08:00
Andrzej Kapolka
652be27910 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
 2013-12-12 15:36:37 -08:00
Philip Rosedale
b87d5fe98c Merge branch 'master' of https://github.com/worklist/hifi 2013-12-12 15:36:13 -08:00
Philip Rosedale
99f6ce2733 merge fix 2013-12-12 15:36:06 -08:00
Philip Rosedale
d9573f6d6c Merge pull request #1362 from ZappoMan/edit_particles 
Implement Prune for Particle Tree to fix long run time stability.
 2013-12-12 15:34:35 -08:00
Andrzej Kapolka
c1aec11b32 More work on rendering voxels. 2013-12-12 15:14:19 -08:00
Stephen Birarda
acc90bf153 Merge pull request #1361 from murillodigital/master 
We can let qt find things on its own, which will let us add frameworks/p...
 2013-12-12 13:55:42 -08:00
ZappoMan
d3197ef8f9 fix crash, and remove gravity while in hand 2013-12-12 13:54:36 -08:00
Stephen Birarda
f17ee1af7a cleanup AudioRingBuffer API 2013-12-12 13:37:18 -08:00
Leonardo Murillo
939a9bf5c4 We can let qt find things on its own, which will let us add frameworks/plugins inside the bundle 2013-12-12 12:59:34 -08:00
ZappoMan
50b93d1e2b added easy access to creating a ParticleEditHandle for a know particle ID 2013-12-12 12:40:38 -08:00
Philip Rosedale
305a75c2b7 don’t render toy ball if hand controller trigger not pressed at all 2013-12-12 12:33:04 -08:00
ZappoMan
cd830efdd4 fixed typo 2013-12-12 12:26:12 -08:00
ZappoMan
1a6f730659 add findClosestParticle() 2013-12-12 12:24:07 -08:00
ZappoMan
a80acc6806 slight toy ball cleanup 2013-12-12 11:25:31 -08:00
ZappoMan
28c5d5b7bf removed unused variable 2013-12-12 11:01:37 -08:00
ZappoMan
e1b3b9d967 fixed indent, added some damping debugging 2013-12-12 10:59:28 -08:00
Stephen Birarda
d5aadf6598 repair linear resampling for same number of channels 2013-12-12 10:48:42 -08:00
ZappoMan
5ec8de1bf3 have ParticleEditHandle update local tree as well 2013-12-12 10:41:55 -08:00
ZappoMan
5d9b7c7f75 change toy ball to use ParicleEditHandle class 2013-12-12 10:26:55 -08:00
Stephen Birarda
b06af3cd6c copy all passed samples to AudioRingBuffer 2013-12-12 10:15:43 -08:00
ZappoMan
82b5c53551 Merge branch 'master' of https://github.com/worklist/hifi into edit_particles 2013-12-11 18:01:45 -08:00
Andrzej Kapolka
5ec9017d3b More metavoxel bits. 2013-12-11 18:00:17 -08:00
ZappoMan
4acadabaa5 adding better support for ParticleEditHandle to allow access to particles after being created 2013-12-11 17:46:18 -08:00
Philip Rosedale
2d72bea27a cleanup test toy ball throwing code 2013-12-11 17:35:02 -08:00
Andrzej Kapolka
dce9599201 More progress on generic attributes; color attributes. 2013-12-11 16:13:36 -08:00
ZappoMan
03c72134cb first cut at creatorTokenIDs for creating particles 2013-12-11 15:38:52 -08:00
Andrzej Kapolka
79a2e409a8 Basic voxel visitation with multiple attributes. 2013-12-11 13:52:52 -08:00
Philip Rosedale
bad5d82ceb Merge branch 'master' of https://github.com/worklist/hifi into XBOX_controller 2013-12-11 12:40:06 -08:00
Stephen Birarda
e27aa11216 remove a debug line 2013-12-11 12:03:14 -08:00
Stephen Birarda
af2fa15f55 initial work for change to 48KHz 2013-12-11 12:02:08 -08:00
ZappoMan
dd85f145d2 Merge branch 'master' of https://github.com/worklist/hifi into particle_details 2013-12-11 10:43:33 -08:00
Andrzej Kapolka
8ba2cf9a8b Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-11 10:30:30 -08:00
ZappoMan
1225e20fad fix flashy particles caused by server deleting octree elements while particles still exist 2013-12-11 09:54:30 -08:00
Andrzej Kapolka
88eeb17f28 More progress on metavoxels with generic attributes. 2013-12-10 17:53:11 -08:00
ZappoMan
03e892d4fd make shootParticle() work better 2013-12-10 17:42:55 -08:00
ZappoMan
ae1576b9f5 CR cleanup and add shootParticle() to application 2013-12-10 17:07:11 -08:00
Philip Rosedale
132b313c9c remove voxel glow on local add 2013-12-10 17:00:53 -08:00
Philip Rosedale
c9f96d1adf Basic joystick thrust/view drive behavior 2013-12-10 16:52:08 -08:00
ZappoMan
8bbdae0e64 fix extra debugging 2013-12-10 15:50:39 -08:00
Andrzej Kapolka
6ba750a963 More progress on generic attributes, metavoxel node management. 2013-12-10 15:44:48 -08:00
ZappoMan
cde7eb1f30 removed some dead code 2013-12-10 15:36:49 -08:00
ZappoMan
a8fff62832 removed some dead code 2013-12-10 15:36:07 -08:00
Philip Rosedale
0f0ee07f8c Merge branch 'master' of https://github.com/worklist/hifi 2013-12-10 14:06:11 -08:00
Stephen Birarda
9db662afaa Merge branch 'master' of github.com:worklist/hifi into qt-for-portaudio 2013-12-10 11:59:05 -08:00
ZappoMan
7a828794be more work with particles added javascript support to particle update 2013-12-10 11:27:18 -08:00
Andrzej Kapolka
c423205709 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-09 16:00:34 -08:00
Andrzej Kapolka
f268797bde Merge branch 'master' of https://github.com/worklist/hifi 2013-12-09 16:00:00 -08:00
Andrzej Kapolka
569425df88 Merge pull request #1348 from PhilipRosedale/narcissus 
Improved full screen mirror view to allow leaning
 2013-12-09 15:42:06 -08:00
Andrzej Kapolka
9641ca1e66 More efficient (though perhaps overkill) blendshape mapping. 2013-12-09 15:37:09 -08:00
ZappoMan
68a51f5205 added update to particle 2013-12-09 15:34:52 -08:00
Andrzej Kapolka
a431268815 Somewhat inefficient take on allowing blendshapes coefficients to apply 
multiple blendshapes.
 2013-12-09 15:21:20 -08:00
Philip Rosedale
83a1654d9c making toy ball 2013-12-09 15:12:28 -08:00
Andrzej Kapolka
9a3c44ce7d Enable alpha testing for models. 2013-12-09 14:49:37 -08:00
ZappoMan
d0944b0278 make particles spheres for now 2013-12-09 14:06:45 -08:00
Andrzej Kapolka
8f633f87e9 Fix for seg fault on Linux exit. 2013-12-09 13:32:02 -08:00
ZappoMan
2783770e2b got particles sending from server to client and rendering 2013-12-09 13:29:44 -08:00
Philip Rosedale
9616268da7 Improved full screen mirror view to allow leaning 2013-12-09 13:02:18 -08:00
Andrzej Kapolka
2381b2bbaf Get rid of initial glow. 2013-12-09 12:30:14 -08:00
ZappoMan
2ca628fdf1 first cut at particle renderer cleanup particle jurisdiction listener fix storage of particles 2013-12-09 11:45:32 -08:00
Andrzej Kapolka
c36e04c435 This should fix the erroneous persistence on startup. 2013-12-09 11:21:32 -08:00
Andrzej Kapolka
85f7995700 Don't apply ambient occlusion to avatars (just voxels). 2013-12-09 11:00:35 -08:00
Philip Rosedale
3bd8c53115 Fix to get other avatar’s model data 2013-12-07 11:36:51 -08:00
Andrzej Kapolka
039a2410b7 Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-06 17:51:24 -08:00
Andrzej Kapolka
4c2c8675e7 Merge pull request #1343 from PhilipRosedale/remove_avatar_balls 
Fix to jerky avatar movement, fix for rotation broken
 2013-12-06 17:51:11 -08:00
Philip Rosedale
4edb7decdf removed printf 2013-12-06 17:47:01 -08:00
Philip Rosedale
9195d60b71 Fix to jerky avatar movement, fix for rotation broken 2013-12-06 17:45:28 -08:00
Andrzej Kapolka
913b14893d Merge branch 'master' of https://github.com/worklist/hifi into metavoxels 2013-12-06 17:24:04 -08:00
Andrzej Kapolka
29870877a8 More work on metavoxel bits. 2013-12-06 17:12:29 -08:00
ZappoMan
91d6ef633d Merge pull request #1340 from PhilipRosedale/remove_avatar_balls 
Remove avatar balls
 2013-12-06 17:11:53 -08:00
Andrzej Kapolka
65c21105ae Merge pull request #1339 from PhilipRosedale/remove_avatar_touch 
Removed _avatarTouch class
 2013-12-06 17:11:41 -08:00
Philip Rosedale
66c5a10020 Fix chat message height 2013-12-06 16:47:13 -08:00
Philip Rosedale
4707733563 Removed avatar balls 2013-12-06 16:26:02 -08:00
ZappoMan
ba83fa462d Merge pull request #1336 from birarda/master 
some NodeList cleanup
 2013-12-06 15:59:33 -08:00
Philip Rosedale
0fcc2d8634 Removed _avatarTouch class 2013-12-06 15:11:01 -08:00
Stephen Birarda
bcdc066a98 don't set _lastInputLoudness if input is muted 2013-12-06 13:26:40 -08:00
Stephen Birarda
098010e099 don't crash if there is no output 2013-12-06 13:22:07 -08:00
Stephen Birarda
8f4e641ade remove NodeList threads that are deprecated 2013-12-05 17:11:58 -08:00
Andrzej Kapolka
d374716c7d Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 17:09:19 -08:00
Philip Rosedale
3f957bbf5d Rave out! 2013-12-05 16:46:11 -08:00
Andrzej Kapolka
16cfeff00d Ignore further up the hierarchy. 2013-12-05 16:37:40 -08:00
Andrzej Kapolka
02cd97deb1 Adjust palm collision size, use last free index when ignoring. 2013-12-05 16:28:33 -08:00
Philip Rosedale
a1027b7dda reverse Hz change because I’ve got some other stuff in there 2013-12-05 16:03:06 -08:00
Philip Rosedale
006472cb24 tweaked RGB->Hz for drum to make piano 2013-12-05 15:56:55 -08:00
Andrzej Kapolka
9ecef89c6c Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 15:36:56 -08:00
Andrzej Kapolka
ecff3a0542 Basic sphere/capsule-cone penetration test. 2013-12-05 15:36:34 -08:00
Philip Rosedale
e9e6f97084 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 15:26:14 -08:00
Stephen Birarda
3f9e00d977 fix a boneheaded mistake in AvatarMixer broadcastAvatarData 2013-12-05 15:10:01 -08:00
Andrzej Kapolka
d238d3c35a Called addPenetrations wrong. 2013-12-05 14:49:30 -08:00
Stephen Birarda
5e73e803e9 fixes for procedural audio input 2013-12-05 14:49:28 -08:00
Andrzej Kapolka
9be30acf82 Render the palm collision proxies. 2013-12-05 14:40:24 -08:00
Stephen Birarda
21076af739 hook audio loudness back to QAudioInput 2013-12-05 14:29:55 -08:00
Andrzej Kapolka
3c167da8a4 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 14:26:37 -08:00
Andrzej Kapolka
d2cb6f0243 Test hand against other avatars. 2013-12-05 14:19:13 -08:00
Andrzej Kapolka
b90c5bdae8 Option to render collision proxies, more general avatar penetration test, fix 
for meshes with only one joint influence.
 2013-12-05 14:00:38 -08:00
Philip Rosedale
a9bd6718ff Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 13:41:13 -08:00
Philip Rosedale
a7dacec63d Don’t render collision if not own avatar, don’t check for collisions with voxel tree if not me. 2013-12-05 13:36:00 -08:00
Stephen Birarda
487209e270 fix bandwidth meter for audio 2013-12-05 13:21:16 -08:00
Stephen Birarda
d1054b3cfc add received audio to buffer via queued connection 2013-12-05 13:17:16 -08:00
Stephen Birarda
80e1b5a4bc some logic and spacing fixes in the audio mixer 2013-12-05 13:05:29 -08:00
Stephen Birarda
d2f7dd2371 resolve conflicts on merge with upstream master 2013-12-05 12:13:11 -08:00
Andrzej Kapolka
1edfc90e5e Missed a scale multiplier. 2013-12-05 12:02:48 -08:00
Stephen Birarda
71aca69410 fix rendered scope for new Qt Audio 2013-12-05 11:36:45 -08:00
Philip Rosedale
0c4b66ef54 Merge pull request #1312 from ZappoMan/more_on_particle_server 
First cut at basic Particle Server
 2013-12-05 11:29:01 -08:00
Andrzej Kapolka
0ea0887f66 Add a scale factor to bone radii. 2013-12-05 11:21:56 -08:00
Andrzej Kapolka
9b3560d414 Skip the hands' parents as well as the hands themselves. 2013-12-05 11:10:22 -08:00
Stephen Birarda
6765ce2f1f some spacing cleanup in Audio 2013-12-05 10:23:06 -08:00
Stephen Birarda
6bbd944b6a wait for audio thread to quit on application exit 2013-12-05 10:21:30 -08:00
Andrzej Kapolka
193f676fcb Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 10:18:50 -08:00
ZappoMan
821b490ff1 added basic particle server renamed voxel packet names to fit standard 2013-12-04 21:00:17 -08:00
Philip Rosedale
8d518f85fe Turn off Sixense (kalman?) filtering, cleanup code 2013-12-04 17:55:32 -08:00
Stephen Birarda
0e3cb11863 use invokeMethod for Audio reset 2013-12-04 16:58:21 -08:00
Stephen Birarda
ab1cd7bd2c fix red/green display in audio debug rendering 2013-12-04 16:24:14 -08:00
Philip Rosedale
c1f96ab6b4 Merge branch 'master' of https://github.com/worklist/hifi 2013-12-04 15:49:30 -08:00
Philip Rosedale
0c32f94116 Better drums 2013-12-04 15:48:41 -08:00
Stephen Birarda
d722e0bf6a repairs to Audio class after merge with upstream master 2013-12-04 14:24:07 -08:00
Stephen Birarda
277aa9dd89 handle conflicts on merge with upstream master 2013-12-04 14:21:00 -08:00
Stephen Birarda
7df6210ba0 Merge remote-tracking branch 'upstream/master' into qt-for-portaudio 2013-12-04 14:20:44 -08:00
Stephen Birarda
560844c138 re-enable rendering and fix sampling algorithim 2013-12-04 13:55:27 -08:00
Stephen Birarda
e339155328 replace missing PortAudio with Qt audio 2013-12-04 12:54:33 -08:00
ZappoMan
2b27c91550 Merge branch 'master' of https://github.com/worklist/hifi into particle_server 
Conflicts:
	interface/src/VoxelSystem.cpp
	interface/src/VoxelSystem.h
 2013-12-04 11:40:54 -08:00
ZappoMan
bc715085a9 Merge pull request #1304 from PhilipRosedale/master 
Voxel drumming, search function to find leaf voxel containing a point
 2013-12-04 11:28:39 -08:00
Stephen Birarda
eb316a450a Merge pull request #1298 from ZappoMan/move_hideshow_to_thread 
Move Hide/Show local voxels to a dedicated thread
 2013-12-04 11:27:14 -08:00
ZappoMan
188d52c06e get client working in refactored mode 2013-12-04 10:05:37 -08:00
Philip Rosedale
2dfbaf605e Stars a bit dimmer, have horizon 2013-12-03 23:01:13 -08:00
ZappoMan
4e18eaa6c5 make addChildAtIndex() use createNewElement() so we get our correct classes 2013-12-03 20:40:48 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
Andrzej Kapolka
70ca1106b1 Working on testing the Leap/Hydra hands against the avatar body. 2013-12-03 17:28:36 -08:00
Philip Rosedale
b04d48a7b8 Longer drum sticks 2013-12-03 17:19:00 -08:00
Philip Rosedale
423b2e8e0f Highlight voxel being touched 2013-12-03 16:52:38 -08:00
Philip Rosedale
8fdd78dc26 Added drum sounds and voxel collision detection 2013-12-03 16:25:23 -08:00
Stephen Birarda
8fbd1e4cfb repairs after merge with upstream master 2013-12-03 12:28:44 -08:00
Stephen Birarda
3277cb49a6 Merge remote-tracking branch 'upstream/master' into cleanup 2013-12-03 12:21:03 -08:00
Andrzej Kapolka
905320a963 That didn't really help. What did help was simply ignoring the wrist 
constraints.
 2013-12-03 11:30:47 -08:00
Stephen Birarda
3301796997 change const HifiSockAddr in DataServerClient to remove error 2013-12-03 11:20:12 -08:00
Andrzej Kapolka
817946bed5 Attempting to rotate longitudinally at elbow, rather than wrist. 2013-12-03 11:05:38 -08:00
Philip Rosedale
a84e97c54a Removed obsolete HandControl class, files 2013-12-03 08:29:17 -08:00
Andrzej Kapolka
2633223f4e Compute the bone radii from the vertices. It's more error-prone than I 
expected, but it more or less works.
 2013-12-02 18:07:29 -08:00
Stephen Birarda
330eff72ce repair usage of DS as STUN server 2013-12-02 17:18:07 -08:00
Stephen Birarda
49191826af add check for pending datagrams before read 2013-12-02 14:08:49 -08:00
Stephen Birarda
141394a664 replace UDPSocket with QUDPSocket 2013-12-02 13:34:29 -08:00
ZappoMan
44f92fb47c Merge pull request #1297 from PhilipRosedale/master 
Voxel editing with hands, flying by pointing hands
 2013-12-02 12:46:04 -08:00
ZappoMan
858268b990 Merge pull request #1296 from stojce/19418 
Code review for #19418
 2013-12-02 12:44:06 -08:00
Andrzej Kapolka
b4466e3e34 Make sure we can still compile if we don't have the Linux Oculus dependencies. 2013-12-02 12:24:42 -08:00
ZappoMan
76b3bd4e6e Move Hide/Show local voxels to a dedicated thread so that it doesn't slow performance of voxel packet processing 2013-12-02 12:08:45 -08:00
Andrzej Kapolka
635eb7c52d Merge branch 'master' of https://github.com/worklist/hifi into noculus 2013-12-02 09:55:27 -08:00
Philip Rosedale
7ab9cc9c14 Voxel editing with hands, flying and rotation with hands 2013-12-02 00:17:06 -08:00
Philip Rosedale
2456c26207 changed function name so less confusing 2013-12-01 20:46:42 -08:00
Philip Rosedale
ea850368de First working voxel insertion at fingertip 2013-12-01 20:16:14 -08:00
Philip Rosedale
a9139b05e8 Drive with trigger pointing 2013-11-29 20:46:16 -08:00
Philip Rosedale
65ec91ec13 Add hand thrusters 2013-11-29 17:49:35 -08:00
Philip Rosedale
abca79ea3e Add button detection for hydra controller to palmData 2013-11-29 16:20:43 -08:00
Philip Rosedale
9680941500 Add palm velocity 2013-11-29 14:50:18 -08:00
Philip Rosedale
14129cd86d Merge pull request #1295 from ZappoMan/compressed_packets 
Major improvements to Voxel Packet "packing" and compression
 2013-11-29 10:06:36 -08:00
stojce
681a72746e Merge branch 'master' of https://github.com/worklist/hifi into 19418 2013-11-28 07:45:06 +01:00
Andrzej Kapolka
e84f5a59aa Merge branch 'master' of https://github.com/worklist/hifi into noculus 2013-11-27 16:17:30 -08:00
ZappoMan
0e501f4439 Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets 
Conflicts:
	interface/src/Menu.cpp
	interface/src/Menu.h
 2013-11-27 15:44:51 -08:00
ZappoMan
040ad1853e properly handle sequence numbers to not skip when supressing duplicate packets 2013-11-27 15:33:48 -08:00
ZappoMan
7f9d0849bd added more client side voxel stats including lost packets, out of order packets, and average flight time 2013-11-27 13:37:47 -08:00
Andrzej Kapolka
d8259f67f0 Re-request skeleton/face URLs on login. 2013-11-27 13:09:52 -08:00
Andrzej Kapolka
b294b328dd Only render ball avatars when "avatars as balls" is checked. 2013-11-27 12:56:31 -08:00
ZappoMan
21bf10b9bf added expandable server details to voxel stats dialog 2013-11-27 11:53:28 -08:00
Andrzej Kapolka
cabd6ccbad Advertise to others whether we have chat circling enabled, only include people 
with it enabled when doing the computations.
 2013-11-27 11:47:23 -08:00
ZappoMan
17e979dc9f improved client side stats, don't suppress initial stats message in server since it includes jurisdiction 2013-11-27 10:20:49 -08:00
ZappoMan
e389c5daa1 adding additional per server voxel stats 2013-11-27 08:25:24 -08:00
ZappoMan
3a16a4935d added additional flight time debugging 2013-11-26 22:43:49 -08:00
ZappoMan
dac211cebd pack more compressed sections into wire packets if there is room 2013-11-26 22:18:24 -08:00
ZappoMan
b7ee2ea2db add section size to compressed packets to allow packing of multiple sections 2013-11-26 19:47:14 -08:00
ZappoMan
77590b5b87 cleanup debug, readd fix to not recurse subtrees when node is colored 2013-11-26 19:23:21 -08:00
Andrzej Kapolka
7874a2aa85 Merge branch 'master' of https://github.com/worklist/hifi into noculus 2013-11-26 19:14:21 -08:00
Andrzej Kapolka
f6b3a6ceca The other part of the Oculus ambient occlusion fix. 2013-11-26 17:53:31 -08:00
ZappoMan
2ce9937126 major pass on cleaning up voxel packets to have flags, sequence numbers, and flight time, add compression menu item 2013-11-26 17:27:08 -08:00
Andrzej Kapolka
fa5f8b093c Screw it; just use the standard mouse hiding. 2013-11-26 15:07:40 -08:00
Andrzej Kapolka
bdba05785e Mouse pointer fix fix. 2013-11-26 15:00:49 -08:00
Andrzej Kapolka
600b05fcc9 Oculus mouse pointer fix. 2013-11-26 14:50:43 -08:00
Andrzej Kapolka
a557dc3ae2 Sign fix. 2013-11-26 14:31:19 -08:00
Andrzej Kapolka
b17f6a1c66 Spacing fix. 2013-11-26 14:16:52 -08:00
Andrzej Kapolka
39414bbd86 Farther down the path of demagicking the numbers and using the actual info 
reported by LibOVR>
 2013-11-26 13:56:34 -08:00
Andrzej Kapolka
c5406c47a6 Moved Oculus code out of Application, started on using StereoConfig to get 
actual values to replace the magic numbers.
 2013-11-26 11:59:06 -08:00
Philip Rosedale
534c5105b0 echo the right one 2013-11-26 11:46:11 -08:00
Philip Rosedale
f27039853c Merge branch 'master' of https://github.com/worklist/hifi 2013-11-26 11:25:26 -08:00
Philip Rosedale
09ca2a45db Add local audio monitor option, tweak turning with head 2013-11-26 11:25:06 -08:00
Stephen Birarda
ec909a6c13 add a mutex lock and unlock on Menu instance creation 2013-11-26 10:58:02 -06:00
stojce
901216f286 Merge branch 'master' of https://github.com/worklist/hifi into 19418 2013-11-26 07:14:58 +01:00
Andrzej Kapolka
1aaf6f2620 Mac library with RTTI enabled, prevent crash on startup when there's no 
Oculus.
 2013-11-25 18:36:23 -08:00
Andrzej Kapolka
0e0685af04 New Oculus software with Linux support. 2013-11-25 17:30:51 -08:00
Philip Rosedale
2cb701bce6 Added adjustment for hydra position to user (it matters) 2013-11-25 17:28:33 -08:00
ZappoMan
a60cf0f34e fix issue with copy 2013-11-25 15:52:30 -08:00
ZappoMan
63a82af449 allow client to set voxels MaxPPS in Preferences 2013-11-25 15:13:31 -08:00
ZappoMan
d13ebf6095 more menu cleanup removing developer options that are now defunct 2013-11-25 14:44:34 -08:00
ZappoMan
de26b950f8 cleanup menu defaults 2013-11-25 14:25:09 -08:00
ZappoMan
70213630e1 Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets 2013-11-25 13:38:22 -08:00
Philip Rosedale
d7b1eae446 Merge branch 'master' of https://github.com/worklist/hifi 2013-11-25 09:45:27 -08:00
ZappoMan
25511f99ec cleanup for coding standard 2013-11-24 15:22:44 -08:00
ZappoMan
e2f5069e6a more VoxelPacket compression tuning 2013-11-24 14:41:50 -08:00
ZappoMan
e65f74e06b moved compression into VoxelPacket class. works, but too slow for larger sizes 2013-11-23 21:40:50 -08:00
ZappoMan
57831b377f tweaks and cleanup 2013-11-23 14:07:09 -08:00
ZappoMan
4c0569fc60 removing compression from VoxelNodeData to eventually move it into VoxelPacket where it belongs 2013-11-23 13:55:21 -08:00
Philip Rosedale
a1ba36d543 Lean drive works with keys and no up/down 2013-11-22 20:08:44 -08:00
ZappoMan
7151d1679f Merge pull request #1288 from ey6es/master 
Have avatars glow/shrink out of existence when they log off or move to another domain/location.
 2013-11-22 16:48:12 -08:00
Andrzej Kapolka
083800dc59 Glow/shrink avatars when killed, send kill message when we move between 
domains, locations, etc.
 2013-11-22 16:23:40 -08:00
Andrzej Kapolka
092515e199 Send an explicit kill request to the avatar mixer (which will pass it along to 
the other clients) when we exit.
 2013-11-22 15:19:59 -08:00
Philip Rosedale
582a71990e Improved using faceshift to turn body 2013-11-22 15:08:16 -08:00
Andrzej Kapolka
eeeed84664 When Faceshift isn't connected, apply the audio-based blinking and brow/mouth 
movement to the new face models.
 2013-11-22 13:36:14 -08:00
Andrzej Kapolka
91b38313be Treat pitchFromTouch more like yawFromTouch, persist mouse pitch. 2013-11-22 11:28:33 -08:00
Andrzej Kapolka
b04a249079 Make this a constant. 2013-11-21 14:24:30 -08:00
Andrzej Kapolka
88a84c733e Stretch out shadow volume to encompass all avatars. 2013-11-21 14:14:09 -08:00
Andrzej Kapolka
053d6b1e71 Fix for Leap drive enabled without Leap. 2013-11-21 14:01:12 -08:00
Andrzej Kapolka
3137e9a3e6 Don't leave out the head when we draw our shadow. 2013-11-21 13:57:55 -08:00
Andrzej Kapolka
898135fbf2 Linear filtering for more smoothness. 2013-11-21 13:36:16 -08:00
Andrzej Kapolka
f0e5872b89 Lighten the shadows, remove some debug code. 2013-11-21 12:29:22 -08:00
ZappoMan
6c640752cd make compression optional 2013-11-21 12:04:13 -08:00
ZappoMan
a590f384a6 Merge branch 'master' of https://github.com/worklist/hifi into compressed_packets 2013-11-21 11:33:08 -08:00
Andrzej Kapolka
f38e74c51c Merge branch 'master' of https://github.com/worklist/hifi into shadowplay 2013-11-21 11:18:56 -08:00
Andrzej Kapolka
3cf47f8d5c Merge branch 'master' of https://github.com/worklist/hifi into shadowplay 2013-11-21 11:08:45 -08:00
Andrzej Kapolka
7bc65136c7 Merge branch 'master' of https://github.com/worklist/hifi into sicksense 2013-11-21 11:00:09 -08:00
Andrzej Kapolka
cd4ef08dae Merge pull request #1272 from ZappoMan/stats_crash_bug_fix 
fix to crash in client side VoxelSceneStats crash
 2013-11-21 10:59:57 -08:00
Andrzej Kapolka
dcc926a0db Working on the "real" shadow volume. 2013-11-20 20:36:54 -08:00
Andrzej Kapolka
758246309a Use compare mode. 2013-11-20 20:06:22 -08:00
Andrzej Kapolka
4bcc6fdc0d More progress on shadows. 2013-11-20 18:27:59 -08:00
Andrzej Kapolka
5cc5d9bba8 Progress towards shadow maps. 2013-11-20 16:23:54 -08:00
ZappoMan
6881d9fb36 fix to crash in client side VoxelSceneStats crash 2013-11-19 22:57:42 -08:00
Andrzej Kapolka
4e952b0f99 Clamp pitch from touch when adjusting it. 2013-11-19 16:40:29 -08:00
Andrzej Kapolka
69b5b81f34 Limit combined pitch. 2013-11-19 16:31:24 -08:00
Andrzej Kapolka
80e6606dd2 Adjusted constants, added reasonable starting base position. 2013-11-19 15:31:04 -08:00
Andrzej Kapolka
38c2abd6d8 First stab at Leap driving. 2013-11-19 15:10:02 -08:00
Andrzej Kapolka
bc523092ba Sniffing glue, wrong week, etc. 2013-11-19 11:59:25 -08:00
Andrzej Kapolka
ced1fca2e4 Missed another spot. 2013-11-19 11:57:01 -08:00
Andrzej Kapolka
3d82fe65b4 Forgot this part. 2013-11-19 11:53:57 -08:00
Andrzej Kapolka
1e7866ad02 Clamped values, adjusted them. 2013-11-19 11:51:32 -08:00
Andrzej Kapolka
df8fbf8f72 More general, angle-driven form of driving based on lean. 2013-11-19 11:09:02 -08:00
Andrzej Kapolka
5e933b0815 Working on basic Faceshift drive. 2013-11-18 18:06:01 -08:00
Andrzej Kapolka
f59b403103 Drive avatar with Sixense joysticks and triggers. 2013-11-18 16:20:00 -08:00
Andrzej Kapolka
0231ed133c Optional compilation for Sixense. 2013-11-18 12:09:52 -08:00
ZappoMan
c2cb6df61c first cut at compresses voxel packets 2013-11-18 09:46:32 -08:00
ZappoMan
73c1ef9997 fix macos menu placement for About, Preferences, and Quit 2013-11-17 00:01:32 -08:00
Andrzej Kapolka
9c401607b1 Missed the actual files. 2013-11-15 18:47:25 -08:00
Andrzej Kapolka
1f2fe5ddee Rudimentary Sixense (Razer Hydra) support. 2013-11-15 18:06:32 -08:00
Andrzej Kapolka
7249e5293c Added a slider in the preferences to control the amount of Faceshift eye 
deflection.
 2013-11-15 10:17:52 -08:00
Andrzej Kapolka
f7458cf934 Fix for pupil dilation on Ryan's face. 2013-11-14 15:21:54 -08:00
Andrzej Kapolka
d3d2c344e6 Set the head scale for other avatars. 2013-11-14 10:46:56 -08:00
Andrzej Kapolka
c358b9f0fd Don't track the mouse in mirror mode. 2013-11-14 10:19:35 -08:00
ZappoMan
34668e8716 add Paste To Voxel 2013-11-13 23:04:51 -08:00
Stephen Birarda
91c3327736 Merge pull request #1257 from ZappoMan/new_voxel_scene_stats 
Adds details about the connected voxel servers to allow debugging of client side jurisdictions
 2013-11-13 16:18:02 -08:00
ZappoMan
b6bc3cb166 handle changes in server list properly 2013-11-13 15:56:03 -08:00
ZappoMan
8de113e65c adding jurisdiction details to voxel stats dialog 2013-11-13 14:22:57 -08:00
Andrzej Kapolka
c76af1ca12 Scratch that; didn't work. 2013-11-13 13:58:14 -08:00
Andrzej Kapolka
76d8bd0a9c Finger IK, take two. 2013-11-13 13:53:41 -08:00
Andrzej Kapolka
3e4c5f84ed Only rotate if we have at least three active fingers. 2013-11-13 13:26:36 -08:00
Andrzej Kapolka
52a3071cb3 Order of update fix. 2013-11-13 12:29:43 -08:00
Andrzej Kapolka
332de0646d Orient the Leap hands relative to the body, not the head. 2013-11-13 12:22:54 -08:00
Andrzej Kapolka
d87dccd614 Alignment to pull elbows towards ground. 2013-11-13 12:06:08 -08:00
Andrzej Kapolka
c2e4a70685 Back to the cyclic coordinate descent algorithm (easier to apply joint 
constraints); Leap hands relative to eyes.
 2013-11-13 10:35:20 -08:00
Andrzej Kapolka
a36f9d52af Constraint fix, apply constraints to wrists. 2013-11-12 15:43:11 -08:00
Andrzej Kapolka
df30e3c851 As a hack, when we have an FBX face/body, position the camera to point at the 
origin and reposition the models based on the relative eye positions.  Fixes
the jitteriness in rear mirror mode.
 2013-11-12 12:28:07 -08:00
Andrzej Kapolka
feb2a150b7 Don't decay head roll/pitch when moving if Faceshift is active. 2013-11-08 18:05:24 -08:00
Andrzej Kapolka
dff2266aee Merge branch 'master' of https://github.com/worklist/hifi 2013-11-08 15:38:52 -08:00
Andrzej Kapolka
0eaaa89c9a Read the palm direction from the FST, use that to determine Leap rotations. 2013-11-08 15:38:20 -08:00
Andrzej Kapolka
3446337cc5 Trying incremental rotations for Leap palms. 2013-11-08 15:11:56 -08:00
Andrzej Kapolka
49c9d41dd5 Read and enforce angle constraints (untested). 2013-11-08 14:49:38 -08:00
philiprosedale
facf7094f0 Merge branch 'master' of https://github.com/worklist/hifi 2013-11-08 14:34:52 -08:00
Philip Rosedale
2991c8af61 screen does not flash when voxels are clicked 2013-11-08 14:34:22 -08:00
Philip Rosedale
f3b6e21a6d Voxel click to fly is now an option in the Tools Menu 2013-11-08 14:34:15 -08:00
Andrzej Kapolka
db9fa63112 Partial orchidectomy: removed (some of) Jeffrey's balls. 2013-11-08 11:19:35 -08:00
Philip Rosedale
d4fc85b197 Merge pull request #1226 from ey6es/master 
New IK method with "gravity" for more relaxed positions, Leap integration with new skeleton.
 2013-11-07 18:11:20 -08:00
Andrzej Kapolka
62134ebc4c Sign fix. 2013-11-07 18:00:21 -08:00
Andrzej Kapolka
11fedb23cd Try finding the fingers using the rotation about the palm. 2013-11-07 17:51:54 -08:00
Andrzej Kapolka
ebe3ef4b22 Toggle for the leap hands. 2013-11-07 17:20:52 -08:00
ZappoMan
1587cf0bbe some comment cleanup 2013-11-07 17:17:34 -08:00
ZappoMan
2c4ab63d2b tweaks to placement and wording of voxel stats 2013-11-07 17:11:35 -08:00
Andrzej Kapolka
f5889934a2 Derp, have to set the rotation after adjusting it. 2013-11-07 17:01:29 -08:00
Andrzej Kapolka
4bf4accba7 Rotate the palm according to the average finger direction. 2013-11-07 16:57:07 -08:00
ZappoMan
19515c80fd Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-07 16:44:34 -08:00
Andrzej Kapolka
55d31ee7f3 Render the body in first-person mode so that we can see our hands. 2013-11-07 16:37:51 -08:00
Andrzej Kapolka
d35356348b Demagicked a couple of numbers. 2013-11-07 16:24:46 -08:00
Andrzej Kapolka
dabb670f1a Merge branch 'master' of https://github.com/worklist/hifi 2013-11-07 16:21:06 -08:00
Andrzej Kapolka
a29dfe9c63 Yet another finger attempt. 2013-11-07 16:14:23 -08:00
Andrzej Kapolka
6ac3fe4c9c Merge pull request #1224 from birarda/master 
use virtual deleteOrDeleteLater in NodeData to handle AvatarVoxelSystem
 2013-11-07 15:44:41 -08:00
Stephen Birarda
5889d4122f use virtual deleteOrDeleteLater in NodeData to handle AvatarVoxelSystem 2013-11-07 15:41:10 -08:00
Andrzej Kapolka
c3049d4378 Another shot at the fingers. Not attempting IK on the anymore. 2013-11-07 14:25:01 -08:00
ZappoMan
64d5ccf91e add menu option for voxel server fade in/out and dont remove local voxels when server shuts down 2013-11-07 14:10:09 -08:00
Andrzej Kapolka
aec7dbca08 Attempting the fingers again. 2013-11-07 13:57:54 -08:00
Andrzej Kapolka
797645a209 More palm fixes. 2013-11-07 13:29:17 -08:00
Andrzej Kapolka
4360621daf Adjustments to wrist rotations. 2013-11-07 13:17:08 -08:00
Andrzej Kapolka
f0e72d8d0c Removed unused variable, debugging code. 2013-11-07 12:16:17 -08:00
Andrzej Kapolka
e6cd9a7368 Working on wiring up the fingers. 2013-11-07 12:12:48 -08:00
Andrzej Kapolka
be09d319b7 Gravity adjustments. 2013-11-06 17:58:05 -08:00
Andrzej Kapolka
1ae8a211bb Swap the palms if they're in the wrong order. 2013-11-06 17:34:40 -08:00
Andrzej Kapolka
afd3f6937c Derp; I don't want the length of the scale, I want the average of the 
components.
 2013-11-06 17:05:10 -08:00
Andrzej Kapolka
2e9625ebd5 Check palms' active state, apply rotations. 2013-11-06 16:57:30 -08:00
Andrzej Kapolka
2b4db0ea0e Apply Leap data directly to skeleton. 2013-11-06 16:47:03 -08:00
Andrzej Kapolka
d0cd9e9790 Active the hand when we have leap hand data. 2013-11-06 16:24:25 -08:00
Andrzej Kapolka
97cf9f2285 Cleanup on aisle 3. 2013-11-06 15:58:35 -08:00
Andrzej Kapolka
1706c7c97a New IK method: will be easier to add constraints, adds "gravity" influence to 
sap potential energy.
 2013-11-06 15:51:26 -08:00
Stephen Birarda
a4fcff6b19 only send fake event to the OGLWidget 2013-11-06 12:36:52 -08:00
Stephen Birarda
503de083f8 an actual patch for two finger mouselook fail after dialog 2013-11-06 12:27:45 -08:00
Andrzej Kapolka
c55f8c5900 Forgot to return a value. 2013-11-05 16:14:21 -08:00
Andrzej Kapolka
ae4db63368 Remove growing head behavior. 2013-11-05 16:11:12 -08:00
Andrzej Kapolka
9460fb87c2 Return arm to neutral position when mouse pointer is invisible. 2013-11-05 16:06:11 -08:00
Andrzej Kapolka
add8ccc877 Lower the deflection amount. 2013-11-05 14:31:41 -08:00
Andrzej Kapolka
092f1fa4c8 Shorten the long term average. 2013-11-05 14:10:53 -08:00
Andrzej Kapolka
6633b6a633 For now, don't perform avatar collisions unless we have a skeleton model. 2013-11-05 13:56:14 -08:00
Andrzej Kapolka
359083ee9d Sneak in a toggle for chat circling. 2013-11-05 12:30:38 -08:00
Andrzej Kapolka
afc5e0795c Merge branch 'master' of https://github.com/worklist/hifi 2013-11-05 12:13:40 -08:00
Andrzej Kapolka
0c8799bb3d Tweaks to voxel editing: edit from farther away, expand cubes to make sure 
they show up over voxels, initialize voxel scale with moused-over scale.
 2013-11-05 12:12:54 -08:00
Stephen Birarda
60e7c54303 fix some checks for empty inputs 2013-11-05 11:26:53 -08:00
Stephen Birarda
145efbda2d some dialog touchups and visual changes 2013-11-05 11:21:32 -08:00
ZappoMan
843e9da873 merge conflict fix 2013-11-05 10:47:05 -08:00
ZappoMan
581e0adecf Merge branch 'master' of https://github.com/worklist/hifi into new_voxel_scene_stats 
Conflicts:
	interface/src/Application.cpp
 2013-11-05 10:45:30 -08:00
ZappoMan
09dab892d3 first cut at new voxel scene stats 2013-11-05 10:29:56 -08:00
Andrzej Kapolka
b2ed29dbff Work around precision issues with multiplying matrices with high translation 
magnitudes (by using relative translation).
 2013-11-04 16:49:12 -08:00
Andrzej Kapolka
361f1f6adf Don't override the lookat positions we receive for others. 2013-11-04 14:07:05 -08:00
Andrzej Kapolka
490194c747 Rescale eye positions to compensate for growing heads. 2013-11-04 13:53:39 -08:00
Andrzej Kapolka
33c61937ab Remove unused parameters. 2013-11-04 11:31:05 -08:00
Andrzej Kapolka
acaac714e6 More smoothing. 2013-11-04 11:20:56 -08:00
Andrzej Kapolka
ce1ebf8d11 The Faceshift eye rotations are indeed relative to the head. 2013-11-04 10:57:29 -08:00
Andrzej Kapolka
65907a75a3 Merge branch 'master' of https://github.com/worklist/hifi into 321contact 
Conflicts:
	interface/src/Application.cpp
 2013-11-04 10:40:02 -08:00
ZappoMan
9bd27e2b2a fix stutter on rotating 2013-11-03 21:11:08 -08:00
ZappoMan
c18de72dd4 work on debugging stutter behavior, mostly debugging and cleanup 2013-11-03 19:06:06 -08:00
ZappoMan
c4a2b3c49b fix thinning in voxels as points by using correct points to calculate width of voxel based on camera position relative to voxel 2013-11-03 11:10:00 -08:00
stojce
3ac149b7a2 Fix for Qt 5.2 beta 2013-11-03 14:59:15 +01:00
Andrzej Kapolka
def3707041 I don't think Faceshift's gaze data is actually head-relative. 2013-11-01 18:28:35 -07:00
Andrzej Kapolka
a7683fa07f More tweaks to eye offsets. 2013-11-01 18:15:43 -07:00
Andrzej Kapolka
e4bf5358eb Attempt to use Faceshift eye data to deflect the default eye behavior. 2013-11-01 17:58:41 -07:00
Philip Rosedale
79fb92f195 Merge pull request #1170 from ZappoMan/point_shader 
first cut a variable point size point rendering
 2013-11-01 17:02:28 -07:00
Andrzej Kapolka
966f75db9b Sanity check to prevent crash in Model::simulate. 2013-11-01 14:47:25 -07:00
ZappoMan
13b558c033 removed dead code 2013-11-01 14:40:58 -07:00
ZappoMan
56aafabacd fixed up comments and style guide items 2013-11-01 14:39:55 -07:00
ZappoMan
6fd3c9714f fixed header file merge conflict 2013-11-01 14:37:46 -07:00
ZappoMan
f5d09c0218 fix comments and style 2013-11-01 14:36:20 -07:00
ZappoMan
b3aac56d29 first cut a variable point size point rendering 2013-11-01 14:33:06 -07:00
Andrzej Kapolka
d04b36bf48 Fix for GuyFinal rotation. 2013-11-01 14:25:26 -07:00
Andrzej Kapolka
62381e19b5 Only use hacky model translation with the old skeleton. 2013-11-01 13:33:50 -07:00
Andrzej Kapolka
c3e0f8bc1f Bump up the maximum eye angle slightly. 2013-11-01 10:48:09 -07:00
Andrzej Kapolka
4a011e0624 Pull out the weight access. 2013-10-31 17:10:35 -07:00
Andrzej Kapolka
fdc44f5ec4 Have the hand fall to the side when the mouse is hidden. 2013-10-31 16:06:42 -07:00
Andrzej Kapolka
1809c525f4 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 15:39:39 -07:00
Stephen Birarda
ddcaa513a1 fix broken build from merge in Skeleton 2013-10-31 15:38:00 -07:00
Andrzej Kapolka
b3b4c6e397 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 15:20:05 -07:00
Ryan
4db3d9606f Merge remote-tracking branch 'origin/master' 2013-10-31 14:55:00 -07:00
Andrzej Kapolka
70485a0ba9 Fix for meshes with no texture coordinates. 2013-10-31 14:52:36 -07:00
Andrzej Kapolka
55de8ceb85 Use blue default texture when we fail to load a normal map. 2013-10-31 14:46:51 -07:00
Andrzej Kapolka
070e755368 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 14:26:38 -07:00
Andrzej Kapolka
1a532be845 Smooth the normals. 2013-10-31 14:26:06 -07:00
ZappoMan
848e78aded CR feedback 2013-10-31 13:58:12 -07:00
ZappoMan
a04cd8e95c added menu item to enable extra debugging to help debug hq VS issue 2013-10-31 13:54:10 -07:00
Andrzej Kapolka
a15bff3857 Closer to mesh fix. 2013-10-31 13:49:06 -07:00
Andrzej Kapolka
09babeca5d Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 12:44:07 -07:00
Andrzej Kapolka
06713a44bf Merge branch 'master' of https://github.com/worklist/hifi 2013-10-31 12:42:05 -07:00
Andrzej Kapolka
bc796c63e3 Working on mesh fix. 2013-10-31 12:41:40 -07:00
ZappoMan
db08b20405 added more logging 2013-10-31 12:36:48 -07:00
ZappoMan
42b44064d3 CR feedback 2013-10-31 12:19:18 -07:00
ZappoMan
724ac4888f Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 2013-10-31 12:13:04 -07:00
ZappoMan
af1047f5e0 fix to how voxel servers are queried when they have no known jurisdiction 2013-10-31 12:06:18 -07:00
Stephen Birarda
7b9eb55bda fix the dialog mouselook bug 2013-10-31 11:32:19 -07:00
Ryan
8b781bf9cd Merge remote-tracking branch 'origin/master' 2013-10-31 08:59:09 -07:00
Ryan
1279f3c3bb Made the stick and ball radius much smaller so they don’t break through the new meshes. 2013-10-31 08:55:37 -07:00
Philip Rosedale
edf36f2a9e Merge pull request #1142 from lordwaym/starfield-fix 
Starfield fix and Milky Way
 2013-10-30 21:58:03 -07:00
Philip Rosedale
e47f433444 Merge pull request #1150 from ZappoMan/bugfixes 
Several Bug Fixes and Improvements
 2013-10-30 17:02:54 -07:00
ZappoMan
256428c6ae CR feedback 2013-10-30 16:55:39 -07:00
ZappoMan
054f49808f Merge branch 'master' of https://github.com/worklist/hifi into bugfixes 
Conflicts:
	libraries/voxel-server-library/src/VoxelSendThread.cpp
 2013-10-30 16:48:50 -07:00
Andrzej Kapolka
4ef3500096 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-30 16:45:09 -07:00
Andrzej Kapolka
9c5ebfcf77 If the skeleton has meshes, don't render the balls and sticks. 2013-10-30 16:44:40 -07:00
ZappoMan
606a6349c7 added abandoned voxels to stats, improved sizing behavior of voxel stats dialog 2013-10-30 15:28:44 -07:00
ZappoMan
14ddb89341 improve behavior of too more than _maxVoxels 2013-10-30 14:28:32 -07:00
ZappoMan
3f9631dd53 fix voxels as points menu to work correctly on startup 2013-10-30 14:14:34 -07:00
ZappoMan
0bbbd7efce fix Voxel Server Protocol menu options to work again 2013-10-30 14:00:56 -07:00
ZappoMan
d1fbe242ab Merge branch 'master' of https://github.com/worklist/hifi into lod_slider 2013-10-30 12:27:50 -07:00
Andrzej Kapolka
719a014118 Merge pull request #1149 from ey6es/master 
This should fix Stephen's crash on init.
 2013-10-30 12:27:17 -07:00
ZappoMan
e9d366fb80 Merge pull request #1147 from ey6es/ick 
Support for normap maps on loaded models.
 2013-10-30 12:26:56 -07:00
Andrzej Kapolka
d820611618 Looks like setCentralWidget is ending up calling the init functions in newer 
versions of Qt.  Initialize the network access manager before that happens.
 2013-10-30 12:25:43 -07:00
ZappoMan
375ef34bd5 Merge pull request #1141 from stojce/19447 
Code Review for Job #19447
 2013-10-30 12:23:32 -07:00
ZappoMan
98f09d7061 removed dead code 2013-10-30 12:21:05 -07:00
ZappoMan
e8f5c86c73 fix one call to calculateShouldRender() 2013-10-30 12:19:47 -07:00
ZappoMan
3a6f8ea66b Merge branch 'master' of https://github.com/worklist/hifi into lod_slider 2013-10-30 12:04:52 -07:00
Andrzej Kapolka
a7ade142fd Merge branch 'master' of https://github.com/worklist/hifi into ick 2013-10-30 11:57:31 -07:00
Andrzej Kapolka
156b3dd2e6 Sign change. Forgot we flip the texture coordinates. 2013-10-30 11:55:22 -07:00
ZappoMan
dd7eb66cec adjustable LOD tweaks 2013-10-30 11:53:16 -07:00
ZappoMan
580102bb38 more work on LOD slider 2013-10-30 11:01:37 -07:00
Andrzej Kapolka
06e050f1c1 Normal map support almost there. 2013-10-29 22:13:00 -07:00
ZappoMan
75721eb7ba first cut at user adjustable LOD 2013-10-29 16:17:11 -07:00
ZappoMan
fbc3a4d2c1 first cut at user adjustable LOD 2013-10-29 16:16:58 -07:00
ZappoMan
0253914b9b Merge pull request #1143 from birarda/assignment 
add node kill debugging, remove ground plane
 2013-10-29 15:40:39 -07:00
Lord Waymaster
2f3ba6bc13 Starfield fix and Milky Way 
Fixed bug where more stars were generated at the poles.

Added 'Milky Way' band in sky, customisable with MILKY_WAY_WIDTH,
MILKY_WAY_INCLINATION and MILKY_WAY_RATIO consts in Generator.cpp.
 2013-10-29 15:22:41 -07:00
Stephen Birarda
f6c265dcf3 remove the ground plane 2013-10-29 15:22:04 -07:00
stojce
a14242632a Rear view zoom level 
new zoom icons
save and restore state from settings
display zoomed out rear view when selected
 2013-10-29 20:51:14 +01:00
ZappoMan
3329d690ac flip mirror tools 2013-10-29 10:53:33 -07:00
Andrzej Kapolka
4e6edfc2db Fix for arm on old skeleton. 2013-10-28 17:28:10 -07:00
Andrzej Kapolka
003917423e Merge branch 'master' of https://github.com/worklist/hifi into ick 2013-10-28 17:04:53 -07:00
Andrzej Kapolka
4771982c30 Merge pull request #1131 from stojce/19443 
Code Review for Job #19443
 2013-10-28 17:04:36 -07:00
Andrzej Kapolka
e45446a0ee Oops; I broke the voxel attachments. 2013-10-28 16:36:31 -07:00
Andrzej Kapolka
e7b05f40ef Remove unused variables. 2013-10-28 16:07:07 -07:00
Andrzej Kapolka
6d8f8dc8ed Merge branch 'master' of https://github.com/worklist/hifi into ick 2013-10-28 15:59:42 -07:00
Andrzej Kapolka
6e76179ca3 Place hand based on mouse position, but make sure we don't point above the 
shoulders.
 2013-10-28 15:59:04 -07:00
Andrzej Kapolka
4f34d89c4a Added left hand/hand rotation setters in preparation for Leap integration. 2013-10-28 14:38:09 -07:00
Andrzej Kapolka
b56d47929b Extremely basic IK based on implementation of the cyclic coordinate descent 
algorithm.  Actually seems to work pretty well.
 2013-10-28 13:38:22 -07:00
ZappoMan
1c2e5eecd6 send VOXEL_QUERY to out of view voxel servers with PPS of 0 2013-10-28 12:07:02 -07:00
stojce
4fe9964e5a reset view 
- reset icon
- resetView signal
 2013-10-28 18:19:31 +01:00
stojce
b09e657ecc click mirror behaviour 
- shrink function - restore mirror window view and set forward
fullscreen view
 2013-10-27 09:57:00 +01:00
stojce
f675b198cb RearView Tools 
- moved to separate class
- new icon/button for restore view
-
 2013-10-26 21:10:05 +02:00
Stephen Birarda
99ee614d04 Merge pull request #1126 from donpdonp/19444 
19444 manage the window title, watch for username changes
 2013-10-25 13:59:38 -07:00
Don Park
e44b0af9b6 make updateWindowTitle public, call it after Menu loads data into the Profile 2013-10-25 11:36:50 -07:00
Don Park
248f59325c update the window title when the domain changes or the username changes 2013-10-25 11:05:50 -07:00
Andrzej Kapolka
b6f2498364 Pull the mirror camera back and narrow its field of view to reduce distortion. 
Also, have it point at the avatar's eyes like the full screen mirror.
 2013-10-25 11:04:34 -07:00
Andrzej Kapolka
09240dba27 Limit the eye rotation to 22.5 degrees. 2013-10-25 10:55:08 -07:00
Andrzej Kapolka
1e5ec3e84f Fix for models exported from Blender: remove type prefix from IDs. 2013-10-25 10:18:40 -07:00
Don Park
dc420beaf2 updateWindowTitle() 2013-10-25 10:09:34 -07:00
Philip Rosedale
6957d990e2 Merge pull request #1120 from ZappoMan/rate_control 
Only send PACKET_TYPE_VOXEL_QUERY messages to voxel servers that are in view.
 2013-10-24 22:17:41 -07:00
ZappoMan
660edddf66 only send PACKET_TYPE_VOXEL_QUERY to voxel servers in view 2013-10-24 18:38:33 -07:00
ZappoMan
37584244e6 only send PACKET_TYPE_VOXEL_QUERY to voxel servers in view 2013-10-24 18:37:31 -07:00
Philip Rosedale
bf07ffd714 Merge pull request #1118 from ZappoMan/rate_control 
add basic rate control, evenly divide packets per second between all connected voxel servers
 2013-10-24 18:08:33 -07:00
ZappoMan
76fb3c18a2 add basic rate control, evenly divide packets per second between all connected voxel servers 2013-10-24 17:35:30 -07:00
Andrzej Kapolka
08db294a5b Smooth gaze direction relative to window. 2013-10-24 17:23:21 -07:00
Andrzej Kapolka
4f3bacdd4c Use calculated eye position here. 2013-10-24 16:16:45 -07:00
Andrzej Kapolka
5f696bd72e Need to set lookat position to camera position before simulating in mirror 
mode.
 2013-10-24 16:06:44 -07:00
Andrzej Kapolka
8b6174f1fe Merge branch 'master' of https://github.com/worklist/hifi 2013-10-24 15:30:11 -07:00
Andrzej Kapolka
145e9337a2 Let's try actually using the average eye position as the camera location for 
first person and mirror mode.
 2013-10-24 15:20:46 -07:00
Philip Rosedale
f8369ea29a Merge pull request #1113 from ZappoMan/rate_control 
first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA
 2013-10-24 14:48:16 -07:00
Andrzej Kapolka
6554868fd8 Merge branch 'master' of https://github.com/worklist/hifi into attach 2013-10-24 14:23:48 -07:00
Andrzej Kapolka
bae4a17605 Voxel attachments. 2013-10-24 13:59:04 -07:00
ZappoMan
015adeedcb first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA 2013-10-24 13:22:31 -07:00
ZappoMan
8ac5f5070c Merge branch 'master' of https://github.com/worklist/hifi into view_is_similar 2013-10-23 17:59:00 -07:00
ZappoMan
b4c88a85f8 improvements to subtle moves for view frustum and voxel serving 2013-10-23 17:49:58 -07:00
Stephen Birarda
faa1c38820 update DS in data-server on profile change 2013-10-23 16:16:24 -07:00
Andrzej Kapolka
240f65b7c5 Scale fixes. 2013-10-23 16:15:03 -07:00
Andrzej Kapolka
a9df8a6b29 Partial fix for textures in exports from 3D Studio Max. 2013-10-23 15:56:09 -07:00
Andrzej Kapolka
41f73b5e9d Support for attaching models to joints. 2013-10-23 15:16:29 -07:00
ZappoMan
3efc277aae wrap more displaySide() items for not rendering when in mini rear view mode 2013-10-23 14:19:25 -07:00
ZappoMan
d31c3854ad fix merge issue 2013-10-23 12:06:11 -07:00
ZappoMan
ea844634a6 Merge branch 'master' of https://github.com/worklist/hifi into fix_mirror_mode 2013-10-23 11:59:47 -07:00
ZappoMan
55294e1de7 Merge pull request #1103 from ey6es/master 
As a temporary measure, restore the full screen mirror as a menu option.
 2013-10-23 11:59:39 -07:00
ZappoMan
46eadb5fb7 Merge branch 'master' of https://github.com/worklist/hifi into fix_mirror_mode 2013-10-23 11:58:47 -07:00
ZappoMan
161367c899 fix rear view mirror mode to only render self 2013-10-23 11:58:01 -07:00
Andrzej Kapolka
183a866e9e Remove code that will be added back in fullscreen mirror request. 2013-10-23 11:44:28 -07:00
Andrzej Kapolka
e8885332f2 Code review fixes. 2013-10-23 11:39:30 -07:00
Andrzej Kapolka
665551d690 Merge branch 'master' of https://github.com/worklist/hifi into ossome 2013-10-23 11:26:23 -07:00
Andrzej Kapolka
5334d9021e Merge branch 'master' of https://github.com/worklist/hifi 2013-10-23 11:22:04 -07:00
Andrzej Kapolka
71b4b8fe46 Use lowercase h to toggle full screen mirror, capital H for inset. 2013-10-23 10:54:39 -07:00
Philip Rosedale
b1364f589a Merge pull request #1102 from ZappoMan/keep_local_voxels 
added support for forceFullFrustum in hideOutOfView() this fixes inconci...
 2013-10-23 10:33:54 -07:00
Andrzej Kapolka
adc79be81c Add back the full screen mode as a menu option, temporarily. 2013-10-23 10:30:42 -07:00
ZappoMan
b05d6e25e3 remove two debug outs 2013-10-23 10:23:07 -07:00
ZappoMan
5d18b68a2e added support for forceFullFrustum in hideOutOfView() this fixes inconcistancies with voxel hiding showing 2013-10-23 10:14:41 -07:00
Andrzej Kapolka
cf78e21ea4 Merge branch 'master' of https://github.com/worklist/hifi into ossome 
Conflicts:
	interface/src/Application.cpp
 2013-10-23 10:06:56 -07:00
Andrzej Kapolka
a568e71e37 Merge pull request #1099 from stojce/19433 
Code Review for Job #19433
 2013-10-23 10:03:36 -07:00
Andrzej Kapolka
251b80b514 Merge branch 'master' of https://github.com/worklist/hifi into ossome 2013-10-23 10:03:22 -07:00
ZappoMan
6e31f74236 tweak to menu text order 2013-10-23 06:00:26 -07:00
ZappoMan
306b23d489 make Fast Voxel Pipeline the default behavior 2013-10-23 05:58:47 -07:00
ZappoMan
1430a083d1 make DontRemoveOutOfView the default behavior 2013-10-23 05:44:20 -07:00
ZappoMan
3c8e30c956 make HideOutOfView the default behavior 2013-10-23 05:38:33 -07:00
ZappoMan
1786049710 make use delta frustum in culling the default behavior 2013-10-23 05:30:15 -07:00
ZappoMan
370fe3dad9 make constant culling the default mode 2013-10-23 05:22:29 -07:00
stojce
9382268ee3 CR fixes 2013-10-23 09:30:26 +02:00
Andrzej Kapolka
247dfd3750 Merge branch 'master' of https://github.com/worklist/hifi into ossome 2013-10-22 17:27:14 -07:00
Andrzej Kapolka
cf98d900f9 Removed unused variable. 2013-10-22 17:26:42 -07:00
Andrzej Kapolka
9dd41f4206 Render sticks, use avatar colors. 2013-10-22 16:52:44 -07:00
Andrzej Kapolka
2e06965b1c I think this does the trick, finally. 2013-10-22 15:50:42 -07:00
Andrzej Kapolka
41775912d8 Back to using matrices. 2013-10-22 15:39:45 -07:00
Andrzej Kapolka
1f8bed9d9c More transform rejiggery. 2013-10-22 15:31:27 -07:00
Andrzej Kapolka
d393bdcea6 Wheeee, let's try a different way of applying the lean rotation. 2013-10-22 15:04:49 -07:00
Andrzej Kapolka
02a21ae9c0 New plan: let's get the skeleton working first, then work on the face. 2013-10-22 14:33:27 -07:00
Andrzej Kapolka
cd4b88acaa More rotation tweaks. 2013-10-22 13:39:51 -07:00
stojce
b728689c6d more camera fixes 2013-10-22 22:18:56 +02:00
stojce
1cea3b403b Fixed camera view options 
- fixed camera lens angle
- xamera distance
 2013-10-22 22:02:17 +02:00
Andrzej Kapolka
a33c7ce20c More work on extracting rotations. 2013-10-22 12:54:32 -07:00
stojce
2fcb246923 close button on rear mirror view 2013-10-22 20:42:31 +02:00
Philip Rosedale
d44a82fce1 Merge pull request #1097 from ZappoMan/keep_local_voxels 
Fixed bug in Keep Local Voxels
 2013-10-22 09:35:47 -07:00
ZappoMan
96cd8c5d97 fixed issue with delta frustums on hide out of view 2013-10-22 09:25:01 -07:00
Philip Rosedale
cab9e7f658 Merge pull request #1094 from birarda/assignment 
allow multiple buffers to be hooked to an individual node
 2013-10-21 20:29:10 -07:00
Andrzej Kapolka
9d89baa506 Apply the neck position. 2013-10-21 17:30:26 -07:00
Andrzej Kapolka
b5f2dcfa55 Use the head position from the loaded skeleton, if available. 2013-10-21 16:58:01 -07:00
ZappoMan
f618b3a88d removed some old comments 2013-10-21 16:19:03 -07:00
Andrzej Kapolka
349f7b363a More work on custom skeletons. 2013-10-21 16:14:38 -07:00
ZappoMan
f5efe2dd7f removed some old comments 2013-10-21 16:14:34 -07:00
ZappoMan
22a1d0a699 small tweak 2013-10-21 16:07:34 -07:00
Stephen Birarda
00446076b5 remove audio injectors that are starved and not added 2013-10-21 16:04:13 -07:00
ZappoMan
1b302f60f8 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-21 16:03:53 -07:00
ZappoMan
b8dfc387b4 added reset settings for Old vs New voxel culling mode 2013-10-21 16:02:10 -07:00
ZappoMan
2979a8e738 better working version of hideOutOfView voxel support 2013-10-21 15:30:14 -07:00
stojce
890313b8ca - fixed aspect ratio on mirror view 
- stop rendering voxel selectors on mirror view
 2013-10-21 23:55:08 +02:00
ZappoMan
f5a3fc07c4 added some debugging 2013-10-21 14:41:46 -07:00
ZappoMan
be67d6f8aa added some new debug menus 2013-10-21 14:41:07 -07:00
ZappoMan
023a521948 some debug timing and voxel stats display 2013-10-21 14:39:05 -07:00
Andrzej Kapolka
49acca3587 Fixes to load my test model. 2013-10-21 11:20:27 -07:00
stojce
7a0d828364 Merge branch 'master' of https://github.com/worklist/hifi into 19433 2013-10-21 17:46:28 +02:00
stojce
b45525ae21 Mirror View initial setup 2013-10-21 08:28:38 +02:00
ZappoMan
b0bfba3043 Merge pull request #1090 from PhilipRosedale/master 
Faceshift only notifies log on first fail to connect
 2013-10-20 21:28:30 -07:00
stojce
652892522e Merge branch 'master' of https://github.com/worklist/hifi into 19437 2013-10-19 09:06:41 +02:00
Andrzej Kapolka
871f97bd81 The Blender FBX has models that are also meshes. 2013-10-18 19:06:56 -07:00
Andrzej Kapolka
b294f5b13e Fix for weird links in Blender exports. 2013-10-18 18:43:07 -07:00
Andrzej Kapolka
b3384d0869 More fixes for text FBXs. 2013-10-18 18:23:08 -07:00
Andrzej Kapolka
a6a4ceebe4 Just check the last entry for the type. 2013-10-18 18:03:28 -07:00
Andrzej Kapolka
ec17b80b52 Adapt to the *other* kind of cluster. 2013-10-18 17:54:54 -07:00
Andrzej Kapolka
ea50d6f22e Forgot these guys. 2013-10-18 17:49:34 -07:00
Philip Rosedale
7ac9a87ad4 Merge pull request #1092 from birarda/master 
fix for Qt 5.1.1 preferences bug
 2013-10-18 17:33:40 -07:00
Andrzej Kapolka
7e174093e4 Factoring the FBX model code out to a shared base class. 2013-10-18 17:26:03 -07:00
Stephen Birarda
b6c4599a55 cleaup some unecessary defaults in Menu 2013-10-18 16:10:03 -07:00
Stephen Birarda
bdfc7fdb64 fix for preferences bug on 5.1.1 2013-10-18 16:07:05 -07:00
Philip Rosedale
bf842f01ba Merge branch 'master' of https://github.com/worklist/hifi 2013-10-18 14:37:49 -07:00
Philip Rosedale
e43758a115 Faceshift fail to connect only notifies log once 2013-10-18 14:36:57 -07:00
Andrzej Kapolka
b84a5679dd Fixed merge error. 2013-10-18 14:31:56 -07:00
Andrzej Kapolka
591cf98821 Merge branch 'master' of https://github.com/worklist/hifi into ossome 
Conflicts:
	interface/src/renderer/FBXReader.cpp
 2013-10-18 14:30:50 -07:00
Andrzej Kapolka
58b4139dbc Added support for RotationOffset, which the Lulu model uses. 2013-10-18 14:26:42 -07:00
Andrzej Kapolka
cd902c5e85 More work on importing the version of FBX exported by Blender. 2013-10-18 14:09:12 -07:00
Stephen Birarda
1965ff286b fix unix build buster for starfield 2013-10-18 09:16:55 -07:00
Stephen Birarda
1ddc52252a fix missing link to starfield implementation files 2013-10-18 09:01:44 -07:00
Lord Waymaster
25d5b38f5f Starfield modification to randomly generate stars 
Starfield now generates stars at startup rather than load them from the
server - approx. 50msec to load 50,000 stars.

STAR_COLORIZATION const in Generator.cpp is used to defined how
colorful the stars should be.

STARFIELD_NUM_STARS and STARFIELD_SEED sets the number of stars and the
random number seed used to generate the starfield.
 2013-10-17 23:24:03 -07:00
ZappoMan
ca7225e525 fix reset of VoxelSystem on eraseAllVoxels() 2013-10-17 18:45:52 -07:00
Andrzej Kapolka
778e432cc4 Merge branch 'master' of https://github.com/worklist/hifi into ossome 2013-10-17 17:33:03 -07:00
Andrzej Kapolka
c8b2ed0213 More progress on reading skeletons. 2013-10-17 17:30:34 -07:00
ZappoMan
001418649f show total memory usage for voxels 2013-10-17 17:08:46 -07:00
ZappoMan
a6664e442c fixed comment 2013-10-17 16:21:22 -07:00
ZappoMan
9b0cc14552 fix voxel nodes to work with new UUID format 2013-10-17 16:14:06 -07:00
Andrzej Kapolka
9ba3c3719f Working on skeleton loading, added support for FBX text format (exported by 
Blender).
 2013-10-17 15:45:57 -07:00
Stephen Birarda
80d2df6a49 fix audio ternary indentations 2013-10-17 15:12:34 -07:00
Stephen Birarda
73d3ecccf3 resolve conflicts on merge with upstream master 2013-10-17 14:37:58 -07:00
Stephen Birarda
8f1135feb7 more repairs to Agent and AvatarData for UUID transition 2013-10-17 14:35:42 -07:00
Philip Rosedale
c48856df52 Merge pull request #1075 from ZappoMan/voxelnode_memory_savings 
VoxelNode memory savings
 2013-10-17 14:26:40 -07:00
ZappoMan
9bd2499317 Merge pull request #1074 from PhilipRosedale/master 
Fixed audio mute not working, visualize gaze direction when showing head mouse
 2013-10-17 12:36:30 -07:00
ZappoMan
d566026026 Merge branch 'master' of https://github.com/worklist/hifi into voxelnode_memory_savings 2013-10-17 12:31:31 -07:00
Stephen Birarda
fa146e302d remove 16-bit node IDs and replace with UUIDs 2013-10-17 11:49:41 -07:00
PhilipRosedale
f6efccea06 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-17 11:07:45 -07:00
Andrzej Kapolka
36d4be4e3b These should actually start at two pi (that's the maximum distance). 2013-10-17 11:05:52 -07:00
PhilipRosedale
9643c1262c Fix mute button, visualize gaze direction when showing headMouse 2013-10-17 11:03:12 -07:00
Andrzej Kapolka
b25020b84a Need to halve the target angle, because both participants will be moving. 
Use randomness to resolve cases where two participants are on top of one
another.
 2013-10-17 10:58:33 -07:00
Stephen Birarda
6805b0e2c6 Merge branch 'master' of github.com:worklist/hifi into assignment 2013-10-17 09:23:25 -07:00
Stephen Birarda
012fccc72e send ping to AvM and VS for socket activation 2013-10-16 18:01:15 -07:00
Stephen Birarda
7de88898e1 activate appropriate socket after receiving ping reply 2013-10-16 17:51:32 -07:00
Andrzej Kapolka
121a7f8270 Widen the circle influence, increase the approach rate. 2013-10-16 17:48:28 -07:00
Andrzej Kapolka
a5a81a585e Fix for glow flickering. 2013-10-16 17:47:39 -07:00
Andrzej Kapolka
89d6c7905b Decrease the distance between members, increase the influence of the circle, 
don't rotate members.
 2013-10-16 17:21:09 -07:00
Philip Rosedale
c324933b8a Move to 'european' comfort distance for chat circle 2013-10-16 16:49:33 -07:00
Andrzej Kapolka
7a1f845189 Another rate adjustment. 2013-10-16 15:48:25 -07:00
Andrzej Kapolka
6df245908c Reduce the approach rate. 2013-10-16 15:41:38 -07:00
Andrzej Kapolka
50216ca4ad Base the number of people we include in the circle on whether we would 
actually fall in its radius (plus an expansion factor).
 2013-10-16 15:37:59 -07:00
Andrzej Kapolka
11fea386b6 First stab at chat circling mechanism. 2013-10-16 14:07:36 -07:00
Andrzej Kapolka
c9344d4382 Have textures default to white when they fail to load. 2013-10-16 11:00:41 -07:00
Philip Rosedale
67e035ee95 Merge pull request #1065 from machinelevel/dev4 
Add left-arm movement to remote avatars without changing network packet structure
 2013-10-16 09:29:01 -07:00
Eric Johnston
36f06720d0 Add left-arm movement to remote avatars without changing network packet structure. 
Move MyAvatar leap hand arm-movement into Avatar::updateLeapHandPositions(), to enable remote avatars to position fingertips and IK-arms based on Leap hand data.
 2013-10-16 08:21:35 -07:00
Andrzej Kapolka
6a265eacf2 Keep normal and dilatable textures in separate maps to fix crash on manly 
"man" model.
 2013-10-15 16:40:35 -07:00
Andrzej Kapolka
8631cc3264 Try to apply the blendshape scale. 2013-10-15 16:29:28 -07:00
Andrzej Kapolka
b04ed72b83 I forgot that the children are in reverse order. 2013-10-15 16:17:56 -07:00
Andrzej Kapolka
ba25087b3e Support for multiple mesh "parts" (with different materials), fix for 
untextured meshes.
 2013-10-15 15:58:34 -07:00
ZappoMan
6fff53a2dc next round of voxelnode size improvements 2013-10-15 14:43:51 -07:00
Andrzej Kapolka
0a5ba79bbe Merge branch 'master' of https://github.com/worklist/hifi into skinny 2013-10-15 14:01:53 -07:00
Andrzej Kapolka
66250ed488 Eye tweak. 2013-10-15 13:43:27 -07:00
Andrzej Kapolka
ce0d13feb4 Working on the neck transform. 2013-10-15 12:59:52 -07:00
Andrzej Kapolka
053c116481 Removed unused variable. 2013-10-15 11:57:42 -07:00
Andrzej Kapolka
d06acdd169 Per-pixel shading, material tweaks. 2013-10-15 11:50:29 -07:00
Philip Rosedale
746bce8626 All onscreen text, overlay OFF when stats are off 2013-10-15 11:01:22 -07:00
Andrzej Kapolka
e97cfb8cf8 Per-pixel specular for blend faces. 2013-10-14 19:59:13 -07:00
Andrzej Kapolka
124966d2e4 More progress on skinning. 2013-10-14 18:39:19 -07:00
Andrzej Kapolka
db30e729d4 More work towards skinning. 2013-10-14 16:46:17 -07:00
ZappoMan
924053f2ec added additional debugging of VoxelNode memory usage, shrunk size of VoxelNode by better alignment 2013-10-14 15:10:56 -07:00
ZappoMan
3425685119 first cut at added voxel node memory usage debugging to client and server 2013-10-14 12:09:44 -07:00
ZappoMan
8c5c1aeae7 Merge pull request #1058 from ZappoMan/hide_cursor 
make mouse cursor hiding more aware of focused window and bounds
 2013-10-14 11:50:21 -07:00
ZappoMan
6f9fdfba2f make mouse cursor hiding more aware of focused window and bounds 2013-10-14 11:39:48 -07:00
Andrzej Kapolka
ed0acd24f7 Merge branch 'master' of https://github.com/worklist/hifi into skinny 2013-10-14 10:40:30 -07:00
Eric Johnston
d5885acd75 Cleanup and simplification per feedback 2013-10-14 10:09:08 -07:00
Eric Johnston
7bc2cf6fa9 Leap interface and Avatar: left-hand IK works for Leap interface. 
This is in and smooth, and there's a decision to be made:
In the case where only one hand is visible, we have to decide if it's the left or right hand. Currently it's simple, based on which side it's detected on.
So far this seems to work best, in the (very) common case where hands go in/out of the sensor's field frequently.
We could also use a history-based heuristic to hold one hand as left/right, but that means that when it guesses wrong the error lingers.
Detecting handedness based on where the thumbs are would be better, but is unreliable on the Leap.
I went for the simple/clear version, but we can do whatever we want.
 2013-10-14 09:01:50 -07:00
Andrzej Kapolka
adc5d4d256 Merge branch 'master' of https://github.com/worklist/hifi into skinny 2013-10-11 17:55:38 -07:00
Andrzej Kapolka
cec0ee0b22 Working on processing the cluster/skin information. 2013-10-11 17:51:29 -07:00
Stephen Birarda
dc4548a91b Merge pull request #1054 from PhilipRosedale/i-can-always-move 
better movement near others
 2013-10-11 17:49:52 -07:00
Philip Rosedale
b071776c22 Merge pull request #1051 from ZappoMan/keep_local_voxels 
Clean up some crashes in client side handling of voxels
 2013-10-11 17:15:41 -07:00
Philip Rosedale
3cd4415e6d Merge pull request #1052 from ZappoMan/hide_cursor 
implement hide cursor on no mouse movement
 2013-10-11 17:14:29 -07:00
Philip Rosedale
6281a28f69 better movement near others 2013-10-11 17:00:25 -07:00
Stephen Birarda
6369e9959f change goToUser shortcut to @ 2013-10-11 15:25:17 -07:00
ZappoMan
e91127bc5c implement hide cursor on no mouse movement 2013-10-11 14:56:37 -07:00
stojce
355a1f3da3 Merge branch 'master' of https://github.com/worklist/hifi into 19435 
Conflicts:
	interface/src/avatar/Head.cpp
	interface/src/avatar/Head.h
 2013-10-11 22:54:59 +02:00
ZappoMan
f2ef80b704 Merge pull request #1049 from stojce/19426 
Code Review for Job #19426
 2013-10-11 12:54:13 -07:00
ZappoMan
c6df36a40b Merge pull request #1047 from stojce/19434 
Code Review for Job #19434
 2013-10-11 12:52:13 -07:00
ZappoMan
dfe23c9342 merge cleanup 2013-10-11 12:49:50 -07:00
stojce
112ae2bb89 #19437 Adjust bandwith meter to be fixed width, not rescaling 2013-10-11 20:25:58 +02:00
ZappoMan
4da19531ca Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-11 10:49:57 -07:00
Stephen Birarda
eebd38189b add killing of local voxels to domain change 2013-10-11 10:07:42 -07:00
stojce
a87346d39c Merge branch 'master' of https://github.com/worklist/hifi into 19426 2013-10-11 14:19:31 +02:00
ZappoMan
4be07ececb fixed a couple crashes and cleaned up some code 2013-10-11 01:30:09 -07:00
Philip Rosedale
bf3f507301 Merge pull request #1043 from birarda/master 
fix domain jumping with goToUser, remove planet environments
 2013-10-10 17:25:43 -07:00
Philip Rosedale
77cf08b8f8 Merge pull request #1044 from birarda/data-server 
don't goToUser without domain and position
 2013-10-10 17:21:58 -07:00
Stephen Birarda
2c181011b3 don't attempt to go to user without domain AND position 2013-10-10 16:48:26 -07:00
ZappoMan
fbcf66b232 Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 
Conflicts:
	interface/src/Menu.h
 2013-10-10 16:37:07 -07:00
Stephen Birarda
6f868a00eb reset environment on domain-server change 2013-10-10 16:34:35 -07:00
Stephen Birarda
aa0a97b959 use deleteLater to ensure that AvatarVoxelSystem delete is on correct thread 2013-10-10 16:23:22 -07:00
Andrzej Kapolka
6e012ea6d2 When computing average model color, skip eyes and weight rest by number of 
vertices.
 2013-10-10 16:04:42 -07:00
Philip Rosedale
43e01ee105 Merge pull request #1039 from birarda/data-server 
add ability to jump to a user's domain and location
 2013-10-10 15:37:21 -07:00
ZappoMan
c5d3f53bd6 Merge pull request #1037 from birarda/infoview 
fix InfoView full screen bug
 2013-10-10 15:29:55 -07:00
ZappoMan
3ad2a6edaa remove dead code 2013-10-10 15:28:55 -07:00
ZappoMan
f3aa82624f progress on keep local voxels 2013-10-10 15:28:06 -07:00
ZappoMan
0a6ddf108f progress on keep local voxels 2013-10-10 15:25:33 -07:00
ZappoMan
c86bad77c9 progress on keep local voxels 2013-10-10 15:23:22 -07:00
Andrzej Kapolka
42d3ee450b Fix for seg fault on exit. 2013-10-10 15:15:28 -07:00
Stephen Birarda
33e6e1925e handle get of multiple values in single packet 2013-10-10 13:50:03 -07:00
Andrzej Kapolka
4c073426c8 Ball and cone color from average geometry colors. 2013-10-10 13:41:50 -07:00
Stephen Birarda
7851251e5d indicate number of values being put to data-server 2013-10-10 11:51:18 -07:00
Stephen Birarda
d37ae7da1b include the number of keys with data-server get 2013-10-10 11:49:14 -07:00
Andrzej Kapolka
14dfa72284 Rotation fix. 2013-10-10 11:25:11 -07:00
Stephen Birarda
11437054a6 add line to fix InfoView full screen bug 2013-10-10 11:01:07 -07:00
Andrzej Kapolka
052c8246fa Let's use the "eye level" position. 2013-10-10 10:49:19 -07:00
Andrzej Kapolka
0881cd4c92 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-10 10:32:19 -07:00
Andrzej Kapolka
ea639afe44 Use the head joint position so that lean affects camera position in first 
person mode.
 2013-10-10 10:31:34 -07:00
Philip Rosedale
72273d1469 indent 2013-10-10 10:14:35 -07:00
Philip Rosedale
dd09d686fc indents 2013-10-10 09:53:43 -07:00
Philip Rosedale
d8dcb6aa44 bracket placement 2013-10-09 23:26:44 -07:00
Philip Rosedale
632dd2fa7d code review, added Doxygen style comments 2013-10-09 23:23:20 -07:00
Philip Rosedale
27a892fa55 Removed old head rotation code, menu items, added ability to turn off faceshift head rotation 2013-10-09 22:46:34 -07:00
Philip Rosedale
1d1e1f6d41 spacing 2013-10-09 17:21:39 -07:00
Philip Rosedale
5509324ffd Change particles to use vertex arrays, further speedups 2013-10-09 17:18:22 -07:00
Stephen Birarda
fb39ad0a55 comment out data-server packet queueing until sequencing is implemented 2013-10-09 17:03:02 -07:00
Stephen Birarda
4c148c6f3a ask data-server for domain + position of user from goToUser 2013-10-09 16:58:27 -07:00
Stephen Birarda
cd504e2293 use QString for DataServerClient keys 2013-10-09 16:50:54 -07:00
Stephen Birarda
3231776e76 add API for Profile userString and multiple value requests 2013-10-09 16:45:02 -07:00
Philip Rosedale
cabb5112dd Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 16:03:38 -07:00
Philip Rosedale
ab4b09ca39 More coding standard fixes to particle cloud 2013-10-09 16:03:06 -07:00
Stephen Birarda
d66137e314 add a Go To User option to the menu 2013-10-09 15:36:33 -07:00
Stephen Birarda
f7a0dd514e load NodeList and Profile settings with menu settings load 2013-10-09 15:23:07 -07:00
Andrzej Kapolka
083c5e34b2 Fix for non-Faceshift eye and mouth movement. 2013-10-09 15:11:14 -07:00
Philip Rosedale
4afa82d626 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 15:10:16 -07:00
Philip Rosedale
85a15a22fa Further code cleanup on particle cloud 2013-10-09 15:10:03 -07:00
Stephen Birarda
d3b95d19a1 send the user's last domain and position to data-server 2013-10-09 15:09:57 -07:00
Andrzej Kapolka
dfa3ea78da Reverse direction of eye offset. 2013-10-09 14:38:05 -07:00
Philip Rosedale
58d6c4c97a Cleaning up particle code 2013-10-09 14:28:00 -07:00
ZappoMan
d939d3aaae Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels 2013-10-09 14:02:40 -07:00
ZappoMan
c25b03dd58 first cut at keeping local voxels 2013-10-09 14:02:31 -07:00
Stephen Birarda
9112efaa36 move username change to Login, add lastPosition and lastDomain 2013-10-09 13:00:05 -07:00
Philip Rosedale
bcb3e082f6 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 12:17:43 -07:00
Andrzej Kapolka
604d6399eb Fix for grow/shrink rates. 2013-10-09 11:58:27 -07:00
Andrzej Kapolka
5511c02449 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 11:53:08 -07:00
Andrzej Kapolka
0a54c2f1e9 Tweaking the growing heads. 2013-10-09 11:52:56 -07:00
Philip Rosedale
8dc84fc841 Merge branch 'master' of https://github.com/worklist/hifi 2013-10-09 11:44:56 -07:00
Stephen Birarda
478214f9da fix Profile include from DataServerClient 2013-10-09 11:14:26 -07:00
Andrzej Kapolka
a679517596 Fix for jaundiced eyes. 2013-10-09 11:10:51 -07:00
Stephen Birarda
268a64d3d5 change data-server hostname to hifi global data-server 2013-10-09 10:27:02 -07:00
Stephen Birarda
f09888dd1b Merge branch 'master' of github.com:worklist/hifi into nameserver 2013-10-09 10:21:25 -07:00
Andrzej Kapolka
1b4daa8eb9 No glow on own avatar, only on others when farther than five units away. 2013-10-09 10:17:41 -07:00
Philip Rosedale
906f3c8c60 got basic cloud working 2013-10-08 23:15:29 -07:00
Philip Rosedale
afd553330a Merge branch 'master' of https://github.com/worklist/hifi 2013-10-08 22:24:34 -07:00
Philip Rosedale
ce2e31ddd5 reconnecting particle cloud 2013-10-08 22:21:55 -07:00
Philip Rosedale
69277ec8ba Added back field and cloud files 2013-10-08 21:49:13 -07:00
Stephen Birarda
9c6cdcc70b complete setting of user model from data-server 2013-10-08 15:39:04 -07:00
Andrzej Kapolka
87bdd2fb1a When in mirror mode and using a blend face, try to position the camera so as 
to look directly into the face's eyes.
 2013-10-08 15:09:56 -07:00
Stephen Birarda
233c1599bd leverage existing URL update rate for interim face model update solution 2013-10-08 14:25:53 -07:00
Andrzej Kapolka
3cca3dc894 Reset fix. 2013-10-08 14:06:04 -07:00
Stephen Birarda
10f29dfe90 ask the data-server for a face mesh on UUID change 2013-10-08 14:02:57 -07:00
Stephen Birarda
15ddd9989b ovverride UUID setter in Avatar for DataServerClient get request 2013-10-08 13:59:28 -07:00
Andrzej Kapolka
15f7b70269 Let's actually use the transform we constructed. 2013-10-08 13:54:54 -07:00
Stephen Birarda
b17e12460c shift get/set of face model URL to Profile class 2013-10-08 13:52:04 -07:00
Stephen Birarda
8bac70e4a5 pass UUID from data-server to avatar-mixer 2013-10-08 13:43:31 -07:00
Andrzej Kapolka
60306af3e9 Default springiness, allow springiness on non-blended meshes. 2013-10-08 13:35:02 -07:00
Stephen Birarda
6bd71da84e pack the UUID with the avatar data 2013-10-08 13:31:39 -07:00
Stephen Birarda
97966592e1 Merge branch 'master' of github.com:worklist/hifi into nameserver 2013-10-08 13:19:55 -07:00
Stephen Birarda
f5912f07a8 make sure username is not empty before requesting faceMesh 2013-10-08 12:45:18 -07:00
Stephen Birarda
d843285db7 save profile to settings, fix UUID storage 2013-10-08 12:40:09 -07:00
Stephen Birarda
ae59ce22b7 send an empty key when making a UUID request 2013-10-08 12:22:02 -07:00
Stephen Birarda
85edb93710 add a Profile class to hold user data from data-server 2013-10-08 12:13:45 -07:00
Stephen Birarda
56b71eb61a re-send data-server GET requests if they are unmatched 2013-10-08 11:33:14 -07:00
Andrzej Kapolka
506f667083 More springy, more damp. Removed unused variable. 2013-10-08 11:26:15 -07:00
Andrzej Kapolka
acaf7d4f88 Merge branch 'master' of https://github.com/worklist/hifi into springy 2013-10-08 11:22:03 -07:00
Andrzej Kapolka
6a043145d3 Merge branch 'master' of https://github.com/worklist/hifi into springy 
Conflicts:
	interface/src/renderer/FBXReader.cpp
 2013-10-08 11:21:47 -07:00
ZappoMan
5e6e15db41 Merge pull request #1025 from ZappoMan/voxel_render_modes 
two possible crash fixes
 2013-10-08 11:21:10 -07:00
Stephen Birarda
892614470e Merge branch 'master' of github.com:worklist/hifi into nameserver 2013-10-08 11:19:32 -07:00
Andrzej Kapolka
e3436eed91 Fixes for eyes rolling back in head, macaw head without mapping file. 2013-10-08 11:18:12 -07:00
Andrzej Kapolka
ce23b415e0 Fix for macaw head without mapping file. 2013-10-08 11:11:01 -07:00
Andrzej Kapolka
b22334730d Fix for eyes rolling back in head. 2013-10-08 11:01:31 -07:00
Andrzej Kapolka
184e0f4439 Merge branch 'master' of https://github.com/worklist/hifi into springy 2013-10-08 10:34:53 -07:00
ZappoMan
89a4ea6470 two possible crash fixes 2013-10-08 09:56:47 -07:00
stojce
a795a5b88f #19435 - Remove 'Perlin Face' option from menus and code 2013-10-08 18:23:51 +02:00
ZappoMan
aa80ec3497 cleanup code for PR 2013-10-07 19:46:52 -07:00
ZappoMan
54364a235d tighten up mutex locks to keep at 60 fps 2013-10-07 19:43:45 -07:00
Andrzej Kapolka
b0bc122a48 Got some actual damped oscillation going. 2013-10-07 18:02:03 -07:00
Stephen Birarda
7964f360ab add method to DataServerClient to resend unmatched packets 2013-10-07 17:52:21 -07:00
ZappoMan
f6981feacf added various render mode options, including voxels as points 2013-10-07 17:46:22 -07:00
Andrzej Kapolka
3448ceccd2 Progress towards a spring-mass model. 2013-10-07 17:25:46 -07:00
Stephen Birarda
26d5e2cfec clear the face model URL if the username is changed in preferences 2013-10-07 17:24:07 -07:00
Stephen Birarda
4b62026c25 shore up receipt of face mesh URL from data-server 2013-10-07 17:06:38 -07:00
Stephen Birarda
b33843fddc ask for a mesh if username is present on login or is changed 2013-10-07 13:52:46 -07:00
Stephen Birarda
e9e77d8276 set username instead of UUID in Interface preferences 2013-10-07 13:35:16 -07:00
Stephen Birarda
f36fd47ef7 store username and not UUID for MyAvatar 2013-10-07 12:17:47 -07:00
stojce
16d10775dc #19434 restore window position on start 
- store position and size on app end
- restore position and size on app start
 2013-10-07 21:04:36 +02:00
Stephen Birarda
98f435ccc2 link mesh URL and UUID in prefs to data server client 2013-10-07 12:03:04 -07:00
Stephen Birarda
fea3ca8229 pack string representation of UUID for data server communication 2013-10-07 10:58:26 -07:00
Stephen Birarda
5a7d21f529 add UUID helper class to get UUID string without braces 2013-10-07 10:56:23 -07:00
Stephen Birarda
13232a4c0b stubbing of mechanism to confirm packets sent to data server 2013-10-07 10:45:54 -07:00
Stephen Birarda
4cc9f29c83 initial stub of data server client code in Interface 2013-10-07 09:55:08 -07:00
stojce
61b213804a #19426 - Add a mute control to the interface 
- OpenGL overlay icon
- mute control
- icons
 2013-10-05 13:18:35 +02:00
ZappoMan
5f6fb3a3ae added some timing debugging 2013-10-05 00:55:34 -07:00
ZappoMan
3001917e10 added debugging 2013-10-04 22:49:05 -07:00
ZappoMan
6fce838e2e remove comment 2013-10-04 21:38:47 -07:00
ZappoMan
0c70a05732 make view frustum oversend and don't remove oversend in client 2013-10-04 21:36:21 -07:00
Andrzej Kapolka
a704a29864 Include a mapping for the names generated by the FBX export. 2013-10-04 17:56:36 -07:00
Andrzej Kapolka
08426fbd9c Handle index-to-direct normals (exported by the Faceshift rig FBX). 2013-10-04 17:49:18 -07:00
Andrzej Kapolka
325ac73d0a Apply color to ambient material property, too. 2013-10-04 17:04:50 -07:00
Andrzej Kapolka
5f26177560 Fix for URLs' not being sent: setting the scale calls createMohawk, which 
reseeds the random number generator, breaking "shouldDo."
 2013-10-04 13:42:03 -07:00
Andrzej Kapolka
b281facf45 Remove references to ambient, use the requested alpha. 2013-10-04 10:53:19 -07:00
Andrzej Kapolka
51c868fd28 Apply (some) FBX material properties to rendered meshes. 2013-10-03 18:12:58 -07:00