2066 commits

Author	SHA1	Message	Date
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	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
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
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
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
Andrzej Kapolka	9d831a2ab5	Orbit around voxel center, limit hover distance.	2014-01-13 14:43:59 -08: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
Leonardo Murillo	ca16acef6b	Checkpoint	2014-01-13 07:37:47 -06:00
Brad Hefta-Gaub	55babbf7b6	windows type mismatch warning fixes	2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub	d92d043e8f	more windows build fixes	2014-01-12 22:52:06 -08:00
Brad Hefta-Gaub	08bb783777	more windows build work	2014-01-12 14:49:15 -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	731209d8cb	remove unused PerfStats class more missing header changes	2014-01-10 19:47:23 -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
Leonardo Murillo	1c2b27f0f4	Checkpoint	2014-01-10 15:18:24 -06: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
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
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
Leonardo Murillo	efb173e1d4	Preliminary update dialog work	2014-01-08 21:20:43 -06:00
Leonardo Murillo	d44126ac33	Get version XML and store latest version as application property	2014-01-08 08:30:50 -06: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
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
Philip Rosedale	2cf5efc4a8	Merge pull request #1449 from PhilipRosedale/mirror ... Mirror	2014-01-03 15:25:28 -08:00
Philip Rosedale	65340f1667	Tweaked mirror distances	2014-01-03 14:33:54 -08: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	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
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
Stojce Slavkovski	cd4fcb993f	removed unused 'LogDisplay' class	2013-12-29 23:52:26 +01: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
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	ee1eb25dfa	replace LogDisplay with File logger ... - added abstract logger interface	2013-12-22 18:56:53 +01: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	38b59f96d3	Merge pull request #1412 from ZappoMan/bugfixes ... Implement support for adjusting particles to clock skew	2013-12-19 15:01:01 -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
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
Stojce Slavkovski	45d926da41	CR fixes	2013-12-18 20:37:45 +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
ZappoMan	a59650beac	Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface	2013-12-17 19:50:39 -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
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
Stojce Slavkovski	3e1c857a2e	Merge branch 'master' of https://github.com/worklist/hifi into 19461	2013-12-17 22:11:29 +01:00
ZappoMan	74d9c05c44	added particle server details to voxel stats dialog	2013-12-17 11:32:20 -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
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	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
Stephen Birarda	bb93c64d8d	some initial audio stat render fixes	2013-12-16 16:21:50 -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
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
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
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
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	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
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
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
ZappoMan	d3197ef8f9	fix crash, and remove gravity while in hand	2013-12-12 13:54:36 -08:00
ZappoMan	50b93d1e2b	added easy access to creating a ParticleEditHandle for a know particle ID	2013-12-12 12:40:38 -08:00
ZappoMan	28c5d5b7bf	removed unused variable	2013-12-12 11:01:37 -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
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
ZappoMan	03c72134cb	first cut at creatorTokenIDs for creating particles	2013-12-11 15:38: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
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	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
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
ZappoMan	68a51f5205	added update to particle	2013-12-09 15:34:52 -08:00
Philip Rosedale	83a1654d9c	making toy ball	2013-12-09 15:12:28 -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
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	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
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	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	8f4e641ade	remove NodeList threads that are deprecated	2013-12-05 17:11:58 -08:00
Philip Rosedale	3f957bbf5d	Rave out!	2013-12-05 16:46:11 -08:00
Stephen Birarda	3f9e00d977	fix a boneheaded mistake in AvatarMixer broadcastAvatarData	2013-12-05 15:10:01 -08:00
Stephen Birarda	21076af739	hook audio loudness back to QAudioInput	2013-12-05 14:29:55 -08:00
Stephen Birarda	d1054b3cfc	add received audio to buffer via queued connection	2013-12-05 13:17:16 -08:00
Stephen Birarda	d2f7dd2371	resolve conflicts on merge with upstream master	2013-12-05 12:13:11 -08:00
Stephen Birarda	71aca69410	fix rendered scope for new Qt Audio	2013-12-05 11:36:45 -08:00
Stephen Birarda	6bbd944b6a	wait for audio thread to quit on application exit	2013-12-05 10:21:30 -08:00
ZappoMan	821b490ff1	added basic particle server renamed voxel packet names to fit standard	2013-12-04 21:00:17 -08:00
Stephen Birarda	0e3cb11863	use invokeMethod for Audio reset	2013-12-04 16:58:21 -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	9faef65ccc	first cut at splitting out octree base classes	2013-12-03 17:32:02 -08:00
Philip Rosedale	423b2e8e0f	Highlight voxel being touched	2013-12-03 16:52:38 -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
Philip Rosedale	a84e97c54a	Removed obsolete HandControl class, files	2013-12-03 08:29:17 -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	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	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
Andrzej Kapolka	e84f5a59aa	Merge branch 'master' of https://github.com/worklist/hifi into noculus	2013-11-27 16:17:30 -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	b294b328dd	Only render ball avatars when "avatars as balls" is checked.	2013-11-27 12:56:31 -08:00
ZappoMan	3a16a4935d	added additional flight time debugging	2013-11-26 22:43:49 -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	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
Andrzej Kapolka	0e0685af04	New Oculus software with Linux support.	2013-11-25 17:30:51 -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
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
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	3137e9a3e6	Don't leave out the head when we draw our shadow.	2013-11-21 13:57:55 -08:00
Andrzej Kapolka	f0e5872b89	Lighten the shadows, remove some debug code.	2013-11-21 12:29:22 -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	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	38c2abd6d8	First stab at Leap driving.	2013-11-19 15:10:02 -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	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
ZappoMan	b6bc3cb166	handle changes in server list properly	2013-11-13 15:56:03 -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
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
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
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
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	add8ccc877	Lower the deflection amount.	2013-11-05 14:31:41 -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
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	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
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
ZappoMan	b3aac56d29	first cut a variable point size point rendering	2013-11-01 14:33: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
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	af1047f5e0	fix to how voxel servers are queried when they have no known jurisdiction	2013-10-31 12:06:18 -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
ZappoMan	606a6349c7	added abandoned voxels to stats, improved sizing behavior of voxel stats dialog	2013-10-30 15:28:44 -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
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	3a6f8ea66b	Merge branch 'master' of https://github.com/worklist/hifi into lod_slider	2013-10-30 12:04:52 -07:00
ZappoMan	580102bb38	more work on LOD slider	2013-10-30 11:01:37 -07:00
ZappoMan	fbc3a4d2c1	first cut at user adjustable LOD	2013-10-29 16:16:58 -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
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	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
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	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
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	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
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	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	71b4b8fe46	Use lowercase h to toggle full screen mirror, capital H for inset.	2013-10-23 10:54:39 -07:00
Andrzej Kapolka	adc79be81c	Add back the full screen mode as a menu option, temporarily.	2013-10-23 10:30:42 -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	306b23d489	make Fast Voxel Pipeline the default behavior	2013-10-23 05:58:47 -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
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
stojce	2fcb246923	close button on rear mirror view	2013-10-22 20:42:31 +02:00
ZappoMan	1b302f60f8	Merge branch 'master' of https://github.com/worklist/hifi into keep_local_voxels	2013-10-21 16:03:53 -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	023a521948	some debug timing and voxel stats display	2013-10-21 14:39:05 -07:00
stojce	b45525ae21	Mirror View initial setup	2013-10-21 08:28:38 +02:00
Andrzej Kapolka	7e174093e4	Factoring the FBX model code out to a shared base class.	2013-10-18 17:26:03 -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
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
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
Stephen Birarda	73d3ecccf3	resolve conflicts on merge with upstream master	2013-10-17 14:37:58 -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	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	9643c1262c	Fix mute button, visualize gaze direction when showing headMouse	2013-10-17 11:03:12 -07:00
Stephen Birarda	012fccc72e	send ping to AvM and VS for socket activation	2013-10-16 18:01:15 -07:00
ZappoMan	6fff53a2dc	next round of voxelnode size improvements	2013-10-15 14:43:51 -07:00
Philip Rosedale	746bce8626	All onscreen text, overlay OFF when stats are off	2013-10-15 11:01:22 -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	6f9fdfba2f	make mouse cursor hiding more aware of focused window and bounds	2013-10-14 11:39:48 -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
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
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
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
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
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	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
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	27a892fa55	Removed old head rotation code, menu items, added ability to turn off faceshift head rotation	2013-10-09 22:46:34 -07:00
Stephen Birarda	f7a0dd514e	load NodeList and Profile settings with menu settings load	2013-10-09 15:23:07 -07:00
Philip Rosedale	4afa82d626	Merge branch 'master' of https://github.com/worklist/hifi	2013-10-09 15:10:16 -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
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	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	f09888dd1b	Merge branch 'master' of github.com:worklist/hifi into nameserver	2013-10-09 10:21:25 -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
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
Stephen Birarda	85edb93710	add a Profile class to hold user data from data-server	2013-10-08 12:13:45 -07:00
Stephen Birarda	892614470e	Merge branch 'master' of github.com:worklist/hifi into nameserver	2013-10-08 11:19:32 -07:00
ZappoMan	f6981feacf	added various render mode options, including voxels as points	2013-10-07 17:46:22 -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
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
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
Philip Rosedale	e9a21e284a	Merge pull request #1011 from ZappoMan/voxeleditsender_improvements ... VoxelEditPacketSender class improvements	2013-10-02 21:25:10 -07:00
ZappoMan	aac6d409d2	delete voxels locally on edit to match add behavior	2013-10-02 17:00:19 -07:00
ZappoMan	cc0009976b	first cut and handling buffering of edit packets when voxel servers are unknown	2013-10-02 15:02:23 -07:00
PhilipRosedale	26618f45f8	use clamp instead of min, max	2013-10-02 10:50:41 -07:00
PhilipRosedale	6d2585a732	faceshift drives head mouse, improved reticle	2013-10-02 10:46:31 -07:00
PhilipRosedale	99c866dba4	Merge branch 'master' of https://github.com/worklist/hifi	2013-10-01 16:10:30 -07:00
PhilipRosedale	7dd1a7525e	starting to add faceshift head mouse	2013-10-01 16:10:22 -07:00
Philip Rosedale	cebd8e5f4b	Merge pull request #997 from birarda/assignment ... file of static assignments for DS	2013-10-01 13:47:10 -07:00
ZappoMan	793a14e25a	first cut at new faster voxel pipeline	2013-10-01 10:37:14 -07:00
Philip Rosedale	a22b3d28bf	Merge branch 'master' of https://github.com/worklist/hifi	2013-09-30 12:44:07 -07:00
Philip Rosedale	f30ff1704a	Fix to make touch-look MUCH smoother for flying around	2013-09-30 12:43:25 -07:00
Philip Rosedale	7a74432bef	Merge pull request #994 from ZappoMan/voxel_geo_shader ... removed old normal support from voxel system only using global normals	2013-09-30 11:37:09 -07:00
Stephen Birarda	bb32da12f1	complete removal of fervor and C++11 array	2013-09-30 10:30:18 -07:00
ZappoMan	b6fe8befdc	removed old normal support from voxel system only using global normals	2013-09-30 09:29:04 -07:00
Philip Rosedale	9645cd9831	Click on voxels as way of moving around	2013-09-28 15:18:59 -07:00
stojce	a0f23d409e	Merging changes	2013-09-28 13:16:50 +02:00
stojce	bac228bdb8	Merge branch 'master' of https://github.com/worklist/hifi	2013-09-28 12:47:47 +02:00
Philip Rosedale	549b863665	Merge pull request #988 from ZappoMan/voxel_geo_shader ... voxel rendering performance and debugging improvements	2013-09-27 13:27:29 -07:00
ZappoMan	605c2f30cf	add memory usage debugging	2013-09-27 10:17:10 -07:00
ZappoMan	fb85add6b4	Merge pull request #986 from PhilipRosedale/master ... Faceshift rotates body, slow near others for easier positioning	2013-09-27 07:01:00 -07:00
Freddy	6b0f9314ba	Faceshift drives body rotation, remove gyro-driven rotation	2013-09-26 23:52:44 -07:00
ZappoMan	2487a55be9	add support for use of Byte normals	2013-09-26 19:04:19 -07:00
Philip Rosedale	0fbabe9891	Merge pull request #984 from ZappoMan/voxel_geo_shader ... Voxel Geometry Shader Experiment	2013-09-26 17:22:55 -07:00
ZappoMan	fd0cc3b417	style fixes	2013-09-26 16:33:37 -07:00
ZappoMan	7845340279	menu cleanup, support for on the fly switching of maxVoxels and useVoxelShader	2013-09-26 16:26:49 -07:00
ZappoMan	552d9fadd8	rearranged menus, some hacking on voxel shader	2013-09-26 14:51:57 -07:00
Andrzej Kapolka	4dec183262	Enlarge heads when they're moused over.	2013-09-26 12:07:13 -07:00
Andrzej Kapolka	63efeccb13	Renaming for clarity.	2013-09-25 17:38:37 -07:00
Freddy	36104d0b06	remove unused older voxel grab thrust	2013-09-23 23:04:27 -07:00
Freddy	027811e37c	Increase thrust while holding keys down to allow very fast speeds	2013-09-23 22:53:35 -07:00
ZappoMan	3d4341cee4	hacking on voxel geometry shader	2013-09-23 15:18:45 -07:00
Andrzej Kapolka	133ba3a00a	Set normals based on indices, cache face models.	2013-09-20 17:40:15 -07:00
Andrzej Kapolka	9d28aaefae	Merge branch 'master' of https://github.com/worklist/hifi into blendface	2013-09-19 18:00:46 -07:00
Andrzej Kapolka	94d6f00f65	Parenting the info view to the menu is preventing the menu from showing up on ... Linux. Let's try not doing that.	2013-09-19 17:47:50 -07:00
Andrzej Kapolka	5c841616dc	Merge branch 'master' of https://github.com/worklist/hifi into blendface	2013-09-19 16:37:26 -07:00
Andrzej Kapolka	a04ced633e	Include the face model URL in the same packet as the avatar voxel URL.	2013-09-19 16:35:25 -07:00
Stephen Birarda	bbbdc4f88c	fixes for InfoView ownership and display	2013-09-18 16:42:51 -07:00
Stephen Birarda	8a901382a3	get rid of local and domain options in interface	2013-09-18 14:01:32 -07:00
Stephen Birarda	ab85c4109d	use QHostInfo and QHostAddress for DS changes in NodeList	2013-09-18 13:29:53 -07:00
ZappoMan	2d545c8adb	Merge pull request #924 from stojce/19418 ... Code Review for Job #19418	2013-09-14 14:00:09 -07:00
LionTurtle	6613ad0591	Arrow keys now also control nudge guide. Avatar position is now fixed ... during nudge.	2013-09-13 18:10:52 -07:00
LionTurtle	394e660ac3	Use WASD to move nudge guide instead of mouse. ... Nudge can be completed with return/enter key now. Nudge is now accessible in any voxelEditMode.	2013-09-13 17:51:10 -07:00
LionTurtle	67bbcc4d9b	Put upper bound on increasing nudge precision (i.e. making the nudge ... less precise).	2013-09-13 14:08:21 -07:00
LionTurtle	0251349221	Change nudge UI to be more consistent with classic editing UI. ... Add menu option for Delete and fix delete for VoxelSelectMode.	2013-09-13 13:41:26 -07:00
stojce	921e88ea5d	Merge branch 'master' of https://github.com/worklist/hifi into 19418 ... Merge branch 'master'	2013-09-12 21:11:30 +02:00
LionTurtle	cef4837654	Fix voxel erase bug in nudge code. Fix rendering of nudge guide.	2013-09-11 16:43:50 -07:00
stojce	a362fdc2ed	name the current domain server	2013-09-10 21:51:50 +02:00
stojce	114cc065bd	Merge branch 'master' of https://github.com/worklist/hifi into 19418	2013-09-10 21:05:44 +02:00
ZappoMan	befbc1b93a	Merge pull request #916 from LionTurtle/master ... Nudge	2013-09-10 11:16:12 -07:00
LionTurtle	30c8af222d	Merge remote-tracking branch 'upstream/master'	2013-09-10 11:10:50 -07:00
LionTurtle	3b464094d9	Remove magic numbers, fix spacing, and other code clean up in nudge code.	2013-09-10 11:09:50 -07:00
Philip Rosedale	4245f33c3c	Merge pull request #915 from ey6es/master ... Subtract the long term average from the eye gaze directions. Best solution I've found so far for aligning the gaze.	2013-09-10 09:36:04 -07:00
LionTurtle	f41533fee6	Add nudgeVoxel shading in grid. Fix erase bug.	2013-09-09 18:23:37 -07:00
LionTurtle	b0803c1267	Merge remote-tracking branch 'upstream/master'	2013-09-09 16:54:34 -07:00
LionTurtle	ac878c9c63	UI for nudge completed!	2013-09-09 16:53:31 -07:00
Stephen Birarda	613334074f	leverage qDebug and custom message handler for verbose logging	2013-09-09 15:11:11 -07:00
Andrzej Kapolka	f8aee88a5b	Let's try subtracting the long-term average from the eye directions.	2013-09-09 14:30:26 -07:00
Andrzej Kapolka	ddf92b39c7	Fix for off-axis ambient occlusion.	2013-09-08 17:52:35 -07:00
stojce	fef70098a3	#19418 Load a local HTML file in a web view within Interface	2013-09-08 21:28:30 +02:00
Andrzej Kapolka	699007691b	Simplification.	2013-09-06 17:50:16 -07:00
Andrzej Kapolka	1a767f3e08	Bump up the offset scale for Faceshift.	2013-09-06 16:52:32 -07:00
Andrzej Kapolka	38dd176506	Fix for off-by-one-frame error.	2013-09-06 16:43:22 -07:00
Andrzej Kapolka	f475163072	I believe this should fix the offset in mirror mode.	2013-09-06 16:20:13 -07:00
Andrzej Kapolka	26411a42b1	More focal length bits.	2013-09-06 15:07:15 -07:00
LionTurtle	d965789812	Switching nudge to cut/paste implementation. Preliminary.	2013-09-06 11:40:35 -07:00
Andrzej Kapolka	f8a74acb02	Special frustum handling for mirrored mode.	2013-09-06 10:19:17 -07:00
LionTurtle	59943dc2e8	Merge branch 'nudge' ... Conflicts: interface/src/Menu.cpp libraries/voxels/src/VoxelTree.h	2013-09-05 17:58:39 -07:00
LionTurtle	868ef8bec6	Add VoxelNudgeMode and preliminary UI grid for nudging.	2013-09-05 17:42:25 -07:00
Andrzej Kapolka	32af1de3ac	For clarity, break the projection matrix update out of resizeGL.	2013-09-05 12:34:25 -07:00
Andrzej Kapolka	4961913fc4	Transmit the eye offset position along with the rest of the frustum ... parameters.	2013-09-05 12:20:15 -07:00
Andrzej Kapolka	dd8a40decd	Need to call resizeGL in order to update the projection matrix.	2013-09-05 11:41:16 -07:00
LionTurtle	647bd5b704	Got rid of delete in nudge. Create is already destructive.	2013-09-05 11:30:23 -07:00
LionTurtle	6e37bc3644	Nudge code working for nudge that is greater than or equal to leaf size.	2013-09-05 11:06:12 -07:00
Andrzej Kapolka	79408560d9	Tweaking the off-axis positions.	2013-09-04 17:48:54 -07:00
Andrzej Kapolka	1532b5d91a	Apply eye offset position based on Faceshift/webcam.	2013-09-04 17:33:57 -07:00
Andrzej Kapolka	a60be83fc7	Merge branch 'master' of https://github.com/worklist/hifi into shifty	2013-09-04 16:12:34 -07:00
Andrzej Kapolka	54116cbc85	Testing audio shutdown before menu destruction.	2013-09-04 16:04:36 -07:00
Andrzej Kapolka	834b671f5a	Merge branch 'master' of https://github.com/worklist/hifi into shifty	2013-09-04 15:32:15 -07:00
atlante45	b8c18bee2d	merge	2013-09-04 15:31:12 -07:00
Andrzej Kapolka	0a9db6a5ee	Moved device-related files to "devices" folder.	2013-09-04 12:15:36 -07:00
Andrzej Kapolka	5e23c79192	Tweaked feature scales, send recalibrate request on reset.	2013-09-04 11:55:55 -07:00
Andrzej Kapolka	679926ce42	Working on brow/mouth mapping.	2013-09-04 11:40:53 -07:00
Andrzej Kapolka	2c2f2fad5a	Lookat adjustment.	2013-09-04 10:53:07 -07:00
Andrzej Kapolka	0d593c4a3f	When Faceshift is active, use its eye directions rather than the mouse ray.	2013-09-04 10:46:11 -07:00
atlante45	1781abe937	Added Menu instance deletion in Application destructor.	2013-09-04 10:40:42 -07:00
atlante45	a1e433e189	Updated Application destructor	2013-09-04 10:24:10 -07:00
atlante45	f21a2798ff	Fixed _sharedVoxelSystemTree deleted twice	2013-08-30 10:37:55 -07:00
LionTurtle	62b29d26d2	Nudge function added. Testing nudge.	2013-08-29 18:17:06 -07:00
atlante45	fc991bf1ac	Some code reformating	2013-08-29 18:11:16 -07:00
atlante45	1dc8d8dd0c	Added LOD to preview + Shared voxelSystem for reduced memory consumption	2013-08-29 17:59:36 -07:00
Stephen Birarda	818355dc1a	implementing @problem's proposed changes to menus	2013-08-23 15:18:06 -07:00
Andrzej Kapolka	3682e32eb1	Yes, these should be consts.	2013-08-22 17:40:55 -07:00
Andrzej Kapolka	2cff4b6b3a	"Laser pointer" for transmitter.	2013-08-22 17:09:23 -07:00
Andrzej Kapolka	6dbaedd921	Merge branch 'master' of https://github.com/worklist/hifi ... Conflicts: interface/src/Application.cpp	2013-08-21 15:46:14 -07:00
Andrzej Kapolka	d63bb3afaa	Fixed glow/ambient occlusion with Oculus.	2013-08-21 15:44:57 -07:00
ZappoMan	18dbfd5cc7	Merge pull request #877 from Atlante45/separate_import_with_preview ... New paste behaviour	2013-08-21 13:44:17 -07:00
atlante45	bae0f7fa1b	New paste behaviour	2013-08-21 13:21:15 -07:00
ZappoMan	4bdaf7589f	Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions	2013-08-21 12:16:09 -07:00
atlante45	9003a7d40b	PR comments	2013-08-21 12:06:47 -07:00
atlante45	867303e673	Code cleanup	2013-08-21 11:33:10 -07:00
atlante45	3eb5ace715	merge + few efficiency ameliorations to importDialog	2013-08-20 18:04:25 -07:00
ZappoMan	d5f94d0f05	Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions	2013-08-20 11:42:51 -07:00
Stephen Birarda	d0ab8317c4	Merge pull request #865 from ey6es/ssao ... Basic screen space ambient occlusion effect. Defaults to off, because at the moment it slows things down substantially.	2013-08-20 10:37:01 -07:00
ZappoMan	5e7e6fc9d7	First cut at JurisdictionListener and PACKET_TYPE_VOXEL_JURISDICTION_REQUEST	2013-08-19 20:15:46 -07:00
Stephen Birarda	329253d8e4	move update checking later in init, add menu option	2013-08-19 17:17:26 -07:00
Stephen Birarda	65a63fb73e	move checkForUpdates to menu to have option in menu	2013-08-19 16:16:27 -07:00
atlante45	24531fdd10	Dialogbox for import fully functionnal	2013-08-19 15:54:51 -07:00
Andrzej Kapolka	dec4a4c422	Added toggle for ambient occlusion (defaults to off).	2013-08-19 11:45:43 -07:00
ZappoMan	2be85d439b	Merge branch 'master' of https://github.com/worklist/hifi into animation_server_jurisdictions ... Conflicts: interface/src/Application.cpp interface/src/VoxelPacketProcessor.cpp libraries/voxels/src/VoxelEditPacketSender.cpp	2013-08-19 11:13:38 -07:00
atlante45	b4157593c5	Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview	2013-08-19 10:54:35 -07:00
Andrzej Kapolka	c9f9be5d9a	Merge branch 'master' of https://github.com/worklist/hifi into ssao	2013-08-19 10:53:33 -07:00
Andrzej Kapolka	60b410cecd	We must set the window menu bar in order for it to show up on Linux/Windows.	2013-08-19 10:51:41 -07:00
Andrzej Kapolka	2c9a8dfebc	Merge branch 'master' of https://github.com/worklist/hifi into ssao ... Conflicts: interface/src/Application.h	2013-08-19 10:42:12 -07:00
atlante45	6b58e1bfec	merge	2013-08-16 20:24:18 -07:00
Stephen Birarda	98b144d675	Merge remote-tracking branch 'upstream/master' into menu	2013-08-16 15:59:09 -07:00
LionTurtle	c579f70611	Render lookatIndicator for cursor select even when gyros are on for ... more consistent behavior.	2013-08-16 11:44:23 -07:00
Andrzej Kapolka	3ddab484e0	Beginnings of ambient occlusion. Looks like an architectural drawing.	2013-08-15 17:52:31 -07:00
atlante45	68a1c56ad6	More work on import interface	2013-08-15 17:21:23 -07:00
Stephen Birarda	4a13f3b75a	move swatch reset to Menu	2013-08-15 15:52:47 -07:00
Stephen Birarda	0ec2b761e9	remove some extra methods after menu cleanup	2013-08-15 15:44:03 -07:00
Stephen Birarda	0667190d00	hook settings options in menu	2013-08-15 15:40:17 -07:00
Stephen Birarda	e18be2cb36	hook audio listening modes and complete cleanup for debug	2013-08-15 15:37:09 -07:00
Stephen Birarda	154c6b4f32	fix disabling of occlusion culling from menu	2013-08-15 15:32:44 -07:00
Stephen Birarda	c930d058b1	fix monochrome option menu hook	2013-08-15 15:23:26 -07:00
Stephen Birarda	e77aae157b	fix in view and occluded false colorization	2013-08-15 15:15:19 -07:00
Stephen Birarda	cf5c53281b	repair first couple of false colorize methods	2013-08-15 15:07:49 -07:00
atlante45	90a44acbc1	Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview	2013-08-15 14:59:51 -07:00
Stephen Birarda	f72f9d8735	fix hook to render pipeline warnings and kill local voxels	2013-08-15 14:57:40 -07:00
Stephen Birarda	474b0465a7	hook tree stat calculation to menu	2013-08-15 14:50:12 -07:00
Stephen Birarda	eb4508aafb	hook timing tests to Menu	2013-08-15 14:46:25 -07:00
Stephen Birarda	cd000cb7c1	remove the particle system from ground plane	2013-08-15 14:37:27 -07:00
ZappoMan	209c9f93ed	remove Application dependency from VoxelEditPacketSender class	2013-08-15 14:21:21 -07:00
Andrzej Kapolka	cceeb1c6ff	Merge branch 'master' of https://github.com/worklist/hifi into ssao	2013-08-15 13:11:12 -07:00
Andrzej Kapolka	28d306a228	Remove the code here; will be replacing it based on glow effect work.	2013-08-15 13:10:48 -07:00
ZappoMan	82782b6ec5	switched to using Application singleton	2013-08-15 13:10:41 -07:00
Stephen Birarda	89248cdf8d	fix voxel paint color assignment	2013-08-15 12:56:25 -07:00
Stephen Birarda	f864b6436d	fix isVoxelModeChecked comparisons	2013-08-15 12:51:33 -07:00
Stephen Birarda	0e4d54d5b0	voxel mode actions group cannot be exclusive	2013-08-15 12:48:48 -07:00
Stephen Birarda	4903122432	fix hooks to voxel stats dialog	2013-08-15 12:38:26 -07:00
Stephen Birarda	d257b70103	fixes for new Menu class after merge with upstream/master	2013-08-15 12:29:04 -07:00
Stephen Birarda	443203201e	Merge remote-tracking branch 'upstream/master' into menu	2013-08-15 12:22:37 -07:00
ZappoMan	2ae5a56b6e	Merge pull request #854 from ey6es/glow ... Three other glow techniques, with menu option to cycle between them.	2013-08-15 12:21:11 -07:00
Stephen Birarda	811fc87294	move avatar size changes to Avatar slots	2013-08-15 12:18:19 -07:00
Stephen Birarda	3a42bda0f2	repairs after merge with upstream master	2013-08-15 11:42:30 -07:00
Stephen Birarda	a2ed48ed1d	Merge remote-tracking branch 'upstream/master' into menu	2013-08-15 11:38:33 -07:00
Stephen Birarda	bbe239694e	move Avatar goHome to Avatar slot	2013-08-15 11:36:12 -07:00
Stephen Birarda	c6baa56022	update Q_OS_MAC ifdefs for Qt 5	2013-08-15 11:12:17 -07:00
Stephen Birarda	10109fff10	inlined spacing cleanup in Head, remove noise	2013-08-15 11:04:18 -07:00
ZappoMan	8e07bd42ea	removed app from SendVoxelsOperationArgs since its available as singleton	2013-08-15 10:51:56 -07:00
Stephen Birarda	46b064b7d6	initial decoupling of menu from Application	2013-08-15 10:46:51 -07:00
Andrzej Kapolka	3ad0b8b99d	Merge branch 'master' of https://github.com/worklist/hifi into ssao ... Conflicts: interface/src/Application.h	2013-08-15 10:06:22 -07:00
ZappoMan	beec5f60d8	renamed class to be more appropriate, added doxygen comments	2013-08-15 08:36:06 -07:00
Andrzej Kapolka	95fee434a7	Don't make the avatars glow; that was just for testing.	2013-08-14 17:37:50 -07:00
ZappoMan	d19e2d7490	merge repair	2013-08-14 14:23:13 -07:00
ZappoMan	153f444c32	merge repair	2013-08-14 14:22:50 -07:00
ZappoMan	4227d75942	merge repair	2013-08-14 14:21:25 -07:00
ZappoMan	4305ad552d	fix issue with JurisdictionMap being passed across wire	2013-08-14 14:19:06 -07:00
Andrzej Kapolka	15f129f32d	Added simple additive/blur-with-persist glow modes, means to cycle through ... modes.	2013-08-14 14:14:47 -07:00
ZappoMan	a43615e9dc	repair bad merge	2013-08-14 13:20:22 -07:00
ZappoMan	4477289501	repair bad merge	2013-08-14 13:18:41 -07:00
ZappoMan	f09dcfa4b7	Merge branch 'master' of https://github.com/worklist/hifi into voxel_sending_helper ... Conflicts: interface/src/Application.cpp interface/src/Application.h	2013-08-14 13:12:23 -07:00
Andrzej Kapolka	581b60995a	Merge branch 'master' of https://github.com/worklist/hifi into glow	2013-08-13 14:37:10 -07:00
atlante45	c095b6b0b3	Merge branch 'master' of https://github.com/worklist/hifi into separate_import_with_preview	2013-08-13 14:30:57 -07:00
Andrzej Kapolka	48bee0e52c	Gonna access that vector from two threads? Need to lock it.	2013-08-13 14:29:49 -07:00
Andrzej Kapolka	01cd0d2a1f	Have the glow effect add half of the original texture, too, and use it on the ... follow indicator.	2013-08-13 14:22:29 -07:00
Andrzej Kapolka	f6209b702c	Use glow effect for follow indicator.	2013-08-13 13:16:59 -07:00
Andrzej Kapolka	b05b43f027	Render to texture first, rather than copying from the frame buffer. Copying ... from the frame buffer requires it to have an alpha channel, which actually does something on OS X (meaning we have to set it to 1.0). We're going to want to render to texture anyway for SSAO (or other effects).	2013-08-13 12:27:52 -07:00
ZappoMan	d3ce3e4e60	some cleanup and fixing of memory issue	2013-08-13 11:37:57 -07:00
ZappoMan	60dedee739	make JurisdictionMap handle copy/move/assigment so that it will work in std::vector<> and std::map<>, switch application to have map of JurisdictionMap objects instead of just root codes	2013-08-13 11:08:43 -07:00
Andrzej Kapolka	c1f6794295	Merge branch 'master' of https://github.com/worklist/hifi into glow	2013-08-13 09:49:18 -07:00
ZappoMan	7d2c69f530	latest work on threaded sending	2013-08-12 16:55:58 -07:00
ZappoMan	4ea0de1637	deleting old dead code	2013-08-12 13:39:01 -07:00
Stephen Birarda	5b181bd351	add new Menu class for Application cleanup	2013-08-12 12:29:01 -07:00
ZappoMan	e7b3d41c33	make PacketReceiver derive from GenericThread	2013-08-12 12:04:05 -07:00
ZappoMan	70344cdaf2	move voxel receiving into class	2013-08-12 11:46:57 -07:00
ZappoMan	8e2fcffd5c	enabled Low Res sending while moving by default	2013-08-10 11:58:25 -07:00
ZappoMan	b5e2bc2093	implement threaded voxel processing	2013-08-10 11:35:59 -07:00
atlante45	f2305fd969	Added VoxelImporter class	2013-08-09 23:11:04 -07:00
Andrzej Kapolka	a3cee5d052	More efficiency for glow effect.	2013-08-09 16:16:02 -07:00
Andrzej Kapolka	9189a206b8	Merge branch 'master' of https://github.com/worklist/hifi into glow	2013-08-09 10:12:47 -07:00
Andrzej Kapolka	1828a105d4	Basic glow effect.	2013-08-08 16:55:45 -07:00
Stephen Birarda	da97cf75b4	Merge pull request #842 from Atlante45/master ... Follow mode improvements	2013-08-08 16:32:35 -07:00
Philip Rosedale	0e1149a8ef	Fixes per review	2013-08-08 16:11:51 -07:00
Philip Rosedale	d5a0b2ff93	Fixes per review	2013-08-08 16:10:07 -07:00
Philip Rosedale	43ad461275	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-08 16:01:02 -07:00
Philip Rosedale	45961b2b64	Collision and click sounds improved	2013-08-08 16:00:50 -07:00
atlante45	b1e975e96b	Don't show pie menu when on voxel	2013-08-08 15:48:33 -07:00
Andrzej Kapolka	5bca763c14	Merge branch 'master' of https://github.com/worklist/hifi into glow	2013-08-08 13:58:53 -07:00
Andrzej Kapolka	c929f67cc4	Update the *other* avatar mixer bandwidth stats.	2013-08-08 12:33:31 -07:00
Andrzej Kapolka	cb89f05a39	Merge branch 'master' of https://github.com/worklist/hifi into glow	2013-08-08 12:01:03 -07:00
Andrzej Kapolka	29912d053a	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-08 11:02:59 -07:00
Andrzej Kapolka	aca15d4aef	Disable specular highlights for ground and voxels.	2013-08-08 10:59:01 -07:00
ZappoMan	647c176631	make voxel server fades slightly smaller than bounds to prevent z-fighting	2013-08-08 09:57:48 -07:00
Andrzej Kapolka	9dbec35f6a	Merge pull request #823 from ZappoMan/master ... Display Frustum and resizeGL() cleanup	2013-08-07 16:29:34 -07:00
ZappoMan	cb211fbb04	CR feedback	2013-08-07 16:27:43 -07:00
ZappoMan	9f5f7d96da	Merge pull request #820 from Atlante45/master ... Display leap hand and rave glove in first person mode	2013-08-07 16:17:37 -07:00
ZappoMan	f4820143d7	cleanup resizeGL, and Display Frustum menus	2013-08-07 16:12:03 -07:00
Philip Rosedale	a4d1bc5b6e	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-07 14:43:49 -07:00
Philip Rosedale	0445da3221	Stop rotating more quickly, display avatar position and yaw stats	2013-08-07 14:42:57 -07:00
atlante45	6fb76d3dfe	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-07 14:30:18 -07:00
atlante45	c48652c2c3	Display leap hand and rave glove in first person mode	2013-08-07 14:28:21 -07:00
Andrzej Kapolka	e9b3cca3de	OpenGL fields of view are vertical, not horizontal.	2013-08-07 14:26:22 -07:00
Andrzej Kapolka	597842eba2	Starting on glow effect.	2013-08-07 14:17:52 -07:00
ZappoMan	153e8afd44	Merge pull request #816 from Atlante45/master ... Fix objects coming into near clip	2013-08-07 12:39:01 -07:00
ZappoMan	393723d8fb	changed delete voxel fade color	2013-08-07 12:36:26 -07:00
atlante45	19b9be3361	- Now P switch between first and third person view	2013-08-07 12:24:13 -07:00
ZappoMan	451b2bc595	added Sending Mode to on screen stats	2013-08-07 12:07:39 -07:00
ZappoMan	11b7e84a80	Merge pull request #811 from ey6es/master ... Several minor fixes for depth camera code.	2013-08-07 12:01:01 -07:00
Andrzej Kapolka	377adb30ae	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-07 11:14:48 -07:00
atlante45	ce12c51fce	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-07 11:13:26 -07:00
ZappoMan	96e6c2f9bd	Merge pull request #810 from ZappoMan/master ... quick fix crash in parseVoxelStats()	2013-08-07 11:11:46 -07:00
atlante45	08309e3aac	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-07 11:11:29 -07:00
ZappoMan	ccf3498ae5	quick fix crash in parseVoxelStats()	2013-08-07 11:11:03 -07:00
atlante45	f151b2cfc1	- Don't render body when in first person view	2013-08-07 10:58:30 -07:00
atlante45	132d03e291	Moved string when following to chest	2013-08-07 10:56:32 -07:00
ZappoMan	d893d4cf16	Merge pull request #807 from machinelevel/dev4 ... Rave tweaks: change the look of the hands, fix screen-darken	2013-08-07 10:49:59 -07:00
Eric Johnston	1fc4f17f7a	Rave tweaks: change the look of the hands, fix screen-darken ... Screen-darken is now a simple fullscreen draw Leap hands are now visible and match body lighting Fingertips are hidden and hand coloring matches body and arm "fake hands" aren't active unless they're chosen from the Debug menu.	2013-08-07 10:29:31 -07:00
Andrzej Kapolka	ca939fb6b8	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-07 10:18:45 -07:00
Jeffrey Ventrella	b007ab11d4	Merge remote-tracking branch 'upstream/master' into particles	2013-08-07 10:18:32 -07:00
Jeffrey Ventrella	253154ce6d	fixed mohawk physics bug	2013-08-07 10:17:53 -07:00
Andrzej Kapolka	f20ac7f4bc	Include received video data in bandwidth usage, clear webcam bits when it's ... been turned off.	2013-08-07 10:17:04 -07:00
Philip Rosedale	cdfabd7647	Merge pull request #805 from ZappoMan/master ... Tweaks for Grayson	2013-08-07 10:01:58 -07:00
ZappoMan	61560af28f	cleanup	2013-08-06 19:21:46 -07:00
ZappoMan	a5f472254d	removed ground plane grid, and changed start position	2013-08-06 19:15:26 -07:00
Philip Rosedale	7583e1cd14	Merge pull request #802 from ey6es/master ... Added a textured rendering mode for depth data that doesn't use video input; rather, it computes normals from the depth and uses local lighting.	2013-08-06 17:13:50 -07:00
Eric Johnston	378cb343ae	Rave tweaks per Ryan's request: Mood lighting for the avatars. This also sets us up to have light coming from the effects, if we want.	2013-08-06 16:45:15 -07:00
Andrzej Kapolka	2f2eaf8ae5	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-06 16:28:22 -07:00
Andrzej Kapolka	63aeb4df75	Merge branch 'master' of https://github.com/worklist/hifi ... Conflicts: interface/src/Application.cpp	2013-08-06 16:28:14 -07:00
Andrzej Kapolka	bd3c235fe4	Switching between textured and untextured modes.	2013-08-06 16:23:58 -07:00
atlante45	558255ca3d	- Made collision On by default	2013-08-06 16:13:31 -07:00
Philip Rosedale	426abbb55a	Merge pull request #799 from ZappoMan/fun_fade ... add fade effect to voxel add and delete, fix crash with audio injector	2013-08-06 15:09:43 -07:00
ZappoMan	634b69b545	Merge pull request #797 from machinelevel/dev4 ... Rave demo changes per Ryan's request: Darken the world when you're in ra...	2013-08-06 15:00:26 -07:00
ZappoMan	05452dc2aa	Merge pull request #796 from PhilipRosedale/touchLook ... Tune gyros, always fly in direction of sight, head always moves with gyros, adjustable view sensitivity	2013-08-06 14:59:28 -07:00
ZappoMan	facc9e1ee7	add fade effect to voxel add and delete, fix crash with audio injector	2013-08-06 14:55:40 -07:00
Eric Johnston	2e5dade413	Rave demo changes per Ryan's request: Darken the world when you're in rave mode, but leave the avatars and effects un-darkened. ... Also fixed a warning in AvatarData.cpp initialization	2013-08-06 14:29:30 -07:00
ZappoMan	6cf87fc120	Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers ... Conflicts: interface/src/Application.cpp	2013-08-06 13:49:42 -07:00
Philip Rosedale	ebd5c4832a	Merge branch 'master' of https://github.com/worklist/hifi into touchLook	2013-08-06 12:34:55 -07:00
Philip Rosedale	120bbbd506	Tuned gyro look, added better preferences	2013-08-06 12:34:45 -07:00
ZappoMan	c93ed450a2	Merge pull request #791 from Atlante45/stalking_indicator ... Stalking indicator	2013-08-06 12:33:26 -07:00
Philip Rosedale	abf64f3e7f	Merge pull request #792 from Atlante45/turn_off_collisions ... Add option to turn collisions on and off	2013-08-06 12:27:27 -07:00
ZappoMan	88e2e3dd3f	added visulization for voxel add/kill	2013-08-06 12:05:43 -07:00
atlante45	ddf1b06bf9	Add option to turn collisions on and off	2013-08-06 11:33:59 -07:00
atlante45	eb9f32b7cb	Merge branch 'master' of https://github.com/worklist/hifi into stalking_indicator	2013-08-06 11:07:58 -07:00
atlante45	32c155ef71	Render a string to show who is following who	2013-08-06 10:53:10 -07:00
ZappoMan	73510ec975	added notifications with jurisdiction details for when voxel servers come and go	2013-08-06 10:33:09 -07:00
Philip Rosedale	58cb852597	Touch-driven pitch happens immediately even when wearing gyros	2013-08-06 10:06:40 -07:00
Philip Rosedale	e5de67152e	Merge pull request #786 from Ventrella/particles ... Added member variables to Hand.cpp to manage rave glove mode switching	2013-08-05 19:26:55 -07:00
Philip Rosedale	d7dc07502c	Merge pull request #787 from machinelevel/dev4 ... Rave glove demo: network-glove fixes	2013-08-05 18:58:04 -07:00
Eric Johnston	d85ce81313	Rave glove demo: network-glove fixes ... After this change, people can see each other's rave glove performances. 1. Moved hand->simulate call into avatar->simulate so that it gets called on all avatars, not just mine. 2. Hide the rave stage, so it's out of the way while we figure out the best way to darken the world, if that's still desired.	2013-08-05 17:27:42 -07:00
ZappoMan	b016c08578	Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers ... Conflicts: libraries/avatars/src/HandData.h	2013-08-05 16:53:41 -07:00
ZappoMan	acd3acb81e	correctly handle freeing of memory for _jurisdictionRoot in VoxelSceneStats	2013-08-05 16:51:01 -07:00
Jeffrey Ventrella	2dbd0f7f31	Merge branch 'master' of https://github.com/worklist/hifi into particles	2013-08-05 16:31:49 -07:00
Jeffrey Ventrella	f51db292a4	ya	2013-08-05 16:26:32 -07:00
ZappoMan	07a61a3c8e	Merge pull request #782 from Atlante45/master ... few fixes on rescaling and following	2013-08-05 15:44:15 -07:00
atlante45	55e34558cb	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-05 15:26:43 -07:00
Andrzej Kapolka	36ae7dbd48	Normalize when we render the ground. This shouldn't be necessary, but it ... looks like various parts of the code rely on RESCALE_NORMAL, which is set but not unset in avatar/Head/Hand. We'll have to look at that more closely later on.	2013-08-05 15:24:21 -07:00
atlante45	29062c51b2	- changed according to review comments ... - added reset scale option	2013-08-05 15:23:40 -07:00
ZappoMan	f1a0edb471	Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers	2013-08-05 14:57:10 -07:00
ZappoMan	7ccab1a32c	Merge pull request #783 from LionTurtle/master ... Render other avatar's lookat to point at my camera if the other avatar is looking at my head.	2013-08-05 14:53:27 -07:00
Mark Peng	1790b0595c	Render other avatar's lookat to point at my camera if the other avatar ... is looking at my head.	2013-08-05 14:26:39 -07:00
atlante45	6c0ea0cf9c	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-05 14:11:14 -07:00
atlante45	3d853f5b90	- Smooth rescaling ... - stop following when leading avatar disconnect - set max far clip for no more crash with really big avatars	2013-08-05 14:05:58 -07:00
ZappoMan	14b7f58fef	Kills local voxels if voxel server is removed from NodeList ... - added notification hooks to NodeList - implemented hooks in VoxelSystem to kill local voxels when voxel server is killed	2013-08-05 13:47:18 -07:00
ZappoMan	fe877b0ec8	Merge pull request #779 from birarda/rave-audio ... fix resetting of song mix menu item after import is done	2013-08-05 12:27:47 -07:00
Stephen Birarda	25537f78a1	reset the song mix menu item after clip is done	2013-08-05 12:18:59 -07:00
Andrzej Kapolka	e8365c6b04	Merge branch 'master' of https://github.com/worklist/hifi into pointy	2013-08-05 11:42:17 -07:00
Andrzej Kapolka	03de2f3ea7	Render a green plane with fog, per Grayson's request.	2013-08-05 11:41:42 -07:00
Stephen Birarda	035f1c81b9	Merge pull request #770 from ZappoMan/tile_import ... made import work better when tile locations not included in file name	2013-08-05 10:56:53 -07:00
atlante45	1ee870be38	Fix pie menu appearing in selection mode	2013-08-05 10:35:10 -07:00
ZappoMan	cc9e4eaf45	CR feedback	2013-08-05 10:24:52 -07:00
ZappoMan	abc8bc332c	made import work better when tile locations not included in file name	2013-08-02 20:12:13 -07:00
ZappoMan	ce937247d1	added back getUprightEyeLevelPosition()	2013-08-02 18:47:21 -07:00
Mark Peng	5ef965018c	Fix bug where the lookatIndicator would draw and no longer update.	2013-08-02 18:13:49 -07:00
Mark Peng	da31cd441e	Merge remote-tracking branch 'upstream/master'	2013-08-02 18:08:28 -07:00
Mark Peng	26d6e826c5	Merge remote-tracking branch 'upstream/master'	2013-08-02 18:03:34 -07:00
Mark Peng	71a919f226	Switch back to avatar.getEyePosition() rather than ... avatar.getHead().getEyePosition() because of mysterious lag.	2013-08-02 18:02:37 -07:00
atlante45	ff27ee1c53	Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event	2013-08-02 18:00:42 -07:00
Stephen Birarda	8704964a0f	resolve conflicts on merge with upstream master	2013-08-02 17:56:19 -07:00
Stephen Birarda	d259180778	add option to audio menu to stop the mixed audio	2013-08-02 17:46:23 -07:00
atlante45	84eae284ea	Changed shifted and meta variable name	2013-08-02 17:44:21 -07:00
Mark Peng	ff67367221	Remove extra parenthesis.	2013-08-02 17:42:12 -07:00
Mark Peng	e0b7773521	Merge remote-tracking branch 'upstream/master' ... Conflicts: interface/src/Application.cpp interface/src/avatar/Head.cpp	2013-08-02 17:35:29 -07:00
Stephen Birarda	d56b715432	add menu option to mix RAW audio with microphone audio	2013-08-02 17:30:49 -07:00
Mark Peng	d7cd88a9a7	Fix camera positioning so that it is in between avatar's eyes. Plus ... some code clean up.	2013-08-02 17:30:26 -07:00
atlante45	d765b58551	Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event	2013-08-02 17:17:35 -07:00
atlante45	e9a53ed9b4	Changed avatar resizing shortcuts to plus and minus.	2013-08-02 17:14:57 -07:00
Stephen Birarda	447e332b6f	Merge pull request #760 from Atlante45/fix_key_press_event ... Fix key press event	2013-08-02 16:45:25 -07:00
Philip Rosedale	936209fd31	When no hovered voxel, lookAt vectors point to distant horizon	2013-08-02 16:37:49 -07:00
atlante45	8c112cbec3	Merge branch 'master' of https://github.com/worklist/hifi into fix_key_press_event	2013-08-02 16:37:18 -07:00
atlante45	1b4cdc003d	Fix shortcuts : done	2013-08-02 16:36:53 -07:00
Philip Rosedale	639b6be01a	Merge branch 'master' of https://github.com/worklist/hifi into Remove-body	2013-08-02 16:08:16 -07:00
Philip Rosedale	8aa8b5dbfe	Marker lines all the way out to 128Meters	2013-08-02 16:03:34 -07:00
Philip Rosedale	b9a8d6080e	Render world box goes out to edge of world.	2013-08-02 15:43:37 -07:00
atlante45	eb2a1ecedd	merge	2013-08-02 15:41:32 -07:00
atlante45	2e150b97de	Fixed shortcuts issues on mac	2013-08-02 15:24:09 -07:00
ZappoMan	db55160f9a	Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers	2013-08-02 14:40:39 -07:00
atlante45	f441295eb1	Merge branch 'pie_menu' of https://github.com/Atlante45/hifi into stalking_option	2013-08-02 14:15:07 -07:00
atlante45	1cae9fc6c7	merge	2013-08-02 14:14:21 -07:00
ZappoMan	55f7028726	Merge pull request #744 from PhilipRosedale/master ... Smoother movement, rotation, less distracting collision noises. Play sound on click voxel	2013-08-02 14:03:51 -07:00
Jeffrey Ventrella	28dd38c013	Merge remote-tracking branch 'upstream/master' into particles	2013-08-02 13:36:01 -07:00
ZappoMan	4c15964cdc	Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers	2013-08-02 11:44:09 -07:00
Jeffrey Ventrella	6ebe33bb0b	Merge remote-tracking branch 'upstream/master' into particles	2013-08-02 11:00:10 -07:00
Mark Peng	6cf42674d5	Merge remote-tracking branch 'upstream/master' ... Conflicts: interface/src/Application.cpp interface/src/Webcam.cpp interface/src/Webcam.h	2013-08-02 11:00:05 -07:00
Jeffrey Ventrella	8fc800acff	some work on hands	2013-08-02 10:59:04 -07:00
Andrzej Kapolka	11664f9446	Have the particle system default to off.	2013-08-02 10:12:21 -07:00
Philip Rosedale	1b5c79aa8a	Merge branch 'master' of https://github.com/worklist/hifi into Remove-body	2013-08-02 09:37:08 -07:00
ZappoMan	983db5f70d	Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers	2013-08-01 20:50:24 -07:00
Philip Rosedale	8f95534644	Fix jittering in view from body slowly following head	2013-08-01 16:04:38 -07:00
Andrzej Kapolka	0052221c33	Merge branch 'master' of https://github.com/worklist/hifi into pointy	2013-08-01 15:52:58 -07:00
atlante45	fdd01a6551	merge	2013-08-01 15:48:57 -07:00
ZappoMan	0a4fcdccb5	Merge branch 'master' of https://github.com/worklist/hifi into tile_import ... Conflicts: interface/src/Application.cpp	2013-08-01 15:44:28 -07:00
ZappoMan	a0ba788679	implement grid landscape import	2013-08-01 15:40:39 -07:00
Andrzej Kapolka	12f42358d5	Allow cycling between video send modes.	2013-08-01 15:39:53 -07:00
Philip Rosedale	9defa6255a	disable mouse wheel voxel scale change	2013-08-01 15:31:09 -07:00
atlante45	b6049c9a10	Merge branch 'master' of https://github.com/worklist/hifi into pie_menu	2013-08-01 15:28:35 -07:00
Mark Peng	6a6c51f80e	Add skeleton tracking toggle in options menu in interface.	2013-08-01 15:04:58 -07:00
Philip Rosedale	ef8daffa4d	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-01 15:00:27 -07:00
Philip Rosedale	fcf20a7ebc	Sound on click, but not on hover	2013-08-01 15:00:08 -07:00
Mark Peng	9ba0e3bb0c	Add reference lines to mouse voxel when adding/deleting voxels.	2013-08-01 13:03:17 -07:00
Philip Rosedale	bc1ac6b455	turn down collision sounds	2013-08-01 12:49:10 -07:00
Philip Rosedale	ba2c98a3eb	Merge branch 'master' of https://github.com/worklist/hifi	2013-08-01 10:12:13 -07:00
Stephen Birarda	71ab8ae4f8	some necessary changes for AvatarData transmission	2013-08-01 10:07:10 -07:00
Jeffrey Ventrella	6c1cc911d5	Merge remote-tracking branch 'upstream/master' into particles	2013-07-31 15:12:54 -07:00
Jeffrey Ventrella	89f36a7eb7	cleanup	2013-07-31 12:38:40 -07:00
Stephen Birarda	9e63b78a69	Merge branch 'master' of github.com:worklist/hifi into qt5	2013-07-31 11:35:24 -07:00
Philip Rosedale	98ec2efc01	Merge branch 'master' of https://github.com/worklist/hifi	2013-07-30 14:55:33 -07:00
ZappoMan	c7e3fe5ef6	Added false colorization by voxel server source ... - switched readBitstreamToTree() to take params struct for future expansion - switched readNodeData() to take params for future expansion - added sourceID to VoxelNode - fixed false colorize routines to correctly redraw by marking tree as dirty	2013-07-30 11:08:48 -07:00
ZappoMan	620fe12358	support for multiple voxel servers in ping stats	2013-07-29 16:31:14 -07:00
ZappoMan	c5ab321bd9	Merge branch 'master' of https://github.com/worklist/hifi into multiple_voxel_servers	2013-07-29 15:54:52 -07:00
Jeffrey Ventrella	a1eba53678	cleanup	2013-07-29 15:09:38 -07:00
Jeffrey Ventrella	f8392c0843	Merge remote-tracking branch 'upstream/master' into particles	2013-07-29 15:07:56 -07:00
ZappoMan	86bf268eef	first cut at multiple voxel servers	2013-07-29 14:56:33 -07:00
Mark Peng	bfd7f3a6c9	Remove rendering of your own avatar's lookatVectors. This fixes the ... behavior where if you are moving and jumping, you will occasionally see your own lookatVectors on your screen.	2013-07-29 12:25:01 -07:00
Mark Peng	bd663a8c22	Merge remote-tracking branch 'upstream/master'	2013-07-29 12:09:27 -07:00
Andrzej Kapolka	20360ad3e9	Make particle system update/render toggleable, fix GCC compile warnings.	2013-07-29 10:41:45 -07:00
Mark Peng	dd2655825a	Fix first person camera positioning to correspond to eyelevel. ... This makes sure the lookatVectors don't seem to point upwards when looking at you.	2013-07-26 16:08:17 -07:00
Jeffrey Ventrella	937574a6b5	cleanup	2013-07-26 15:25:13 -07:00
Jeffrey Ventrella	05e0bf3e84	added collision plane	2013-07-26 15:21:10 -07:00
Jeffrey Ventrella	8cecd67731	cleanup	2013-07-26 12:46:27 -07:00
Jeffrey Ventrella	ad00747c29	cleanup	2013-07-26 12:44:17 -07:00
Jeffrey Ventrella	9890cf72ce	added keyboard mode switching for rave glove effects	2013-07-26 12:37:37 -07:00
atlante45	f3c87b81ec	Avatar can follow but don't look at the same point for the moment	2013-07-25 16:14:47 -07:00
Stephen Birarda	08b94d731f	merge branch qt5 with upstream/master	2013-07-25 10:23:22 -07:00
Jeffrey Ventrella	5e2dcfee53	cleaned up some magic numbers	2013-07-24 16:52:37 -07:00
Jeffrey Ventrella	aee29a0ab1	cleaning up the particle system more	2013-07-24 16:37:13 -07:00
atlante45	68194f2037	Slot calling when pie menu on avatar.	2013-07-24 13:50:00 -07:00
Jeffrey Ventrella	288a218ae2	Merge remote-tracking branch 'upstream/master' into particles	2013-07-24 12:41:32 -07:00
atlante45	d165891fe6	New design for pie menus	2013-07-24 12:38:35 -07:00
Stephen Birarda	f27eb5e1d8	small code changes for qt5 compatibility	2013-07-24 12:06:55 -07:00
atlante45	177471e83b	First step toward follow mode	2013-07-24 11:24:28 -07:00
atlante45	fec25d374f	merge	2013-07-24 10:35:57 -07:00
ZappoMan	31a1e3e7b5	Merge pull request #720 from LionTurtle/master ... Fix eyePosition so that lookatVectors point directly to eyes,	2013-07-24 01:19:49 -07:00
Mark Peng	7177b71bc7	Replace var in renderLookatIndicator with const IDENTITY_UP	2013-07-24 00:19:25 -07:00
Jeffrey Ventrella	f85690c1c4	Merge remote-tracking branch 'upstream/master' into particles	2013-07-23 20:46:34 -07:00
ZappoMan	e7fb392f38	Merge branch 'master' of https://github.com/worklist/hifi into audio_select	2013-07-23 20:20:49 -07:00
ZappoMan	eb8c565350	dry up code	2013-07-23 20:08:57 -07:00
ZappoMan	a162643e1e	more removing of SourceID from classes	2013-07-23 19:21:43 -07:00
ZappoMan	c969570e8c	working on selected audio	2013-07-22 23:05:42 -07:00
Mark Peng	4e641eed2f	LookatIndicator now scales with the avatar's scale.	2013-07-22 17:11:11 -07:00
Mark Peng	0f1ac2b226	Fix eyePosition so that lookatVectors point directly to eyes, ... even when looking at someone from above.	2013-07-22 16:46:06 -07:00
ZappoMan	c301b799c5	first cut at selecting audio sources	2013-07-22 13:54:47 -07:00
Jeffrey Ventrella	8a55db53ce	merge	2013-07-22 10:42:18 -07:00
atlante45	13952a6f24	Merge with pie_menu	2013-07-21 15:22:43 -07:00
ZappoMan	c3fa37019e	replaced old voxel stats with new voxel stats	2013-07-21 05:18:35 -07:00
ZappoMan	86ad0da09f	Merge branch 'master' of https://github.com/worklist/hifi into voxel_stats	2013-07-20 11:35:10 -07:00
ZappoMan	e0f115298d	additional stats items	2013-07-20 11:28:12 -07:00
Jeffrey Ventrella	ad0ca748bb	added extra mode and improved particle system	2013-07-20 09:48:55 -07:00
Eric Johnston	0cdad1a313	Merge branch 'master' of https://github.com/worklist/hifi into dev4	2013-07-19 19:48:52 -07:00
Jeffrey Ventrella	05039b4e3e	adding rave glove modes and changing API of particle system to accommodate	2013-07-19 18:02:48 -07:00
ZappoMan	83290bc8b7	first cut at real voxel stats dialog box	2013-07-19 17:28:37 -07:00
atlante45	72774a5e20	First step toward pie menus	2013-07-19 17:01:38 -07:00
Jeffrey Ventrella	6e84481931	Merge remote-tracking branch 'upstream/master' into particles	2013-07-19 16:08:43 -07:00
Jeffrey Ventrella	7f3750f1f0	clean up	2013-07-19 16:08:19 -07:00
ZappoMan	2cc42f6773	support piggybacking voxel and voxel stats messages into single packet	2013-07-19 15:59:47 -07:00
Andrzej Kapolka	353f16b2d0	Style fixes.	2013-07-19 15:56:04 -07:00
Jeffrey Ventrella	d2d8019e73	Merge remote-tracking branch 'upstream/master' into particles	2013-07-19 15:51:14 -07:00
Jeffrey Ventrella	87d9aae328	improvements to particle system	2013-07-19 15:50:40 -07:00
Andrzej Kapolka	f70b4dcab2	Merge branch 'master' of https://github.com/worklist/hifi into pointy	2013-07-19 15:49:07 -07:00
ZappoMan	d9c8a59929	send voxel scene stats from server to client	2013-07-19 15:09:38 -07:00
Eric Johnston	262851346c	Rave Glove Demo: Leap Rework (simplification and elimination of redundant data passing) ... This version matches fingers based on Leap serialized ID's, avoiding finger-replacement-crosstalk.	2013-07-19 09:31:45 -07:00
Mark Peng	ceb743a65d	Remove unncessary import math.h (for reals).	2013-07-19 00:56:12 -07:00
Mark Peng	fc22240525	Remove unnecessary import math.h.	2013-07-19 00:55:31 -07:00
Mark Peng	a84c1c9e21	Merge remote-tracking branch 'upstream/master'	2013-07-19 00:46:52 -07:00
Mark Peng	927aea8bb4	Bug fix on lookatVectors (fixed scale in head.cpp). Added bool ... isLookingAtOtherAvatar. Basic halo indicator in Application.cpp.	2013-07-19 00:44:23 -07:00
Mark Peng	cfcb31172c	Merge remote-tracking branch 'upstream/master'	2013-07-18 21:08:08 -07:00
Andrzej Kapolka	b5a8c2710c	Merge branch 'master' of https://github.com/worklist/hifi into pointy ... Conflicts: interface/src/Application.h interface/src/Audio.h interface/src/Webcam.cpp	2013-07-18 18:09:57 -07:00
Stephen Birarda	ef7dc4a39a	if the hostname field is left blank reset to DEFAULT_DOMAIN_HOSTNAME	2013-07-18 17:42:25 -07:00
Stephen Birarda	01e6891fd3	save custom domain server hostname to QSettings	2013-07-18 17:23:52 -07:00
Philip Rosedale	c74287160f	merged	2013-07-18 16:52:56 -07:00
Philip Rosedale	4af92d46f3	Set lookAt to hovered voxel	2013-07-18 16:50:37 -07:00