overte

mirror of https://github.com/overte-org/overte.git synced 2025-05-15 12:39:59 +02:00

Author	SHA1	Message	Date
Andrew Meadows	8359e672bb	merge upstream/master into andrew/ragdoll	2014-09-17 17:56:35 -07:00
Stephen Birarda	7848c63fae	handle name location shortcut explicitly to work around bug	2014-09-17 14:43:48 -07:00
Andrew Meadows	489871d0d6	added MyAvatar.setMotorVelocity() & friends for JS	2014-09-16 17:09:32 -07:00
Andrzej Kapolka	bfaac9eae1	Deferred lighting tweaks.	2014-09-15 18:38:10 -07:00
Andrzej Kapolka	580d591dc4	Working on getting glow to work with deferred lighting.	2014-09-15 17:11:36 -07:00
Andrzej Kapolka	0f3a020b5d	Working on getting particles/entities to work with deferred lighting; normalize normals from buffer.	2014-09-15 16:07:48 -07:00
Andrzej Kapolka	467a9582c7	Somehow my reverting the ambient occlusion effect didn't take.	2014-09-15 13:29:03 -07:00
Andrzej Kapolka	4475759461	Revert the normal-based ambient occlusion; I wasn't crazy about the look of it. Will perhaps revisit later.	2014-09-15 11:52:44 -07:00
Andrzej Kapolka	af546e6b05	Fix for shadows in rear view mirror.	2014-09-12 19:18:31 -07:00
Andrzej Kapolka	e36ff0d238	Fix deferred lighting for rear view mirror.	2014-09-12 18:56:07 -07:00
Andrzej Kapolka	53933fc9c6	Working on deferred lighting for models.	2014-09-12 17:09:07 -07:00
Andrzej Kapolka	3d48a5b872	Merge branch 'master' of https://github.com/highfidelity/hifi into deference	2014-09-12 15:39:52 -07:00
Brad Hefta-Gaub	e69e90b5b4	Merge pull request #3405 from thoys/20017 Code Review for Job #20017	2014-09-12 15:34:50 -07:00
Stephen Birarda	3b21348a63	make sure AddressManager signal is connected to before file event	2014-09-12 15:22:51 -07:00
Stephen Birarda	29dae39ad7	handle location lookup for offline user or not found	2014-09-12 15:01:08 -07:00
Andrzej Kapolka	d0f30dfd45	Merge branch 'master' of https://github.com/highfidelity/hifi into deference	2014-09-12 14:44:45 -07:00
Thijs Wenker	df0cbd54fc	Merge branch 'master' of https://github.com/highfidelity/hifi into 20017 Conflicts: interface/src/Application.cpp	2014-09-12 23:04:05 +02:00
Brad Hefta-Gaub	b209b70094	Merge pull request #3404 from birarda/data-web-domain-lookup initial transition to new metaverse API	2014-09-12 13:45:40 -07:00
Brad Hefta-Gaub	fc33de28a0	Merge pull request #3399 from huffman/19831 Code Review for Job #19831	2014-09-12 13:45:20 -07:00
Stephen Birarda	f0ead98a2a	put back LocationScriptingInterface so it works prior to replacement	2014-09-12 13:28:18 -07:00
Thijs Wenker	dd47b7afc6	Merge branch 'master' of https://github.com/highfidelity/hifi into 20017 Conflicts: interface/src/scripting/WindowScriptingInterface.cpp	2014-09-12 22:04:21 +02:00
Stephen Birarda	348bcdb37a	resolve conflicts on merge with upstream master	2014-09-12 11:23:16 -07:00
Stephen Birarda	93ff34baaa	force address bar lookup through handleLookupString	2014-09-12 11:21:38 -07:00
Stephen Birarda	ab7df8679d	fix broken hifi linking	2014-09-12 11:19:22 -07:00
Stephen Birarda	b77a3f4904	cleanup application file event handler	2014-09-12 10:15:51 -07:00
Stephen Birarda	1f2020d169	some url handling repairs, move existing error reply handlers to new format	2014-09-12 10:13:33 -07:00
Stephen Birarda	7896119228	remap two goToUrl calls to AddressManager	2014-09-12 09:56:40 -07:00
Andrzej Kapolka	76728e4fb1	Merge branch 'master' of https://github.com/highfidelity/hifi into deference	2014-09-11 18:07:33 -07:00
Andrzej Kapolka	e6f37544fd	Use deferred lighting for voxels as well as metavoxels.	2014-09-11 18:06:56 -07:00
Philip Rosedale	8428b1a4ba	Merge pull request #3401 from chansensturm/audio-noise New stereo audio panning object	2014-09-11 17:53:55 -07:00
Craig Hansen-Sturm	ecae9d5e85	compiler warnings	2014-09-11 17:20:15 -07:00
Stephen Birarda	b56ea5c936	centralize path creation from position and orientation to AddressManager	2014-09-11 17:17:47 -07:00
Andrzej Kapolka	c2b58c9781	Move deferred lighting into its own class.	2014-09-11 16:39:17 -07:00
Stephen Birarda	de24842cf0	fix stuck drive keys for Avatar when modifier released	2014-09-11 11:48:26 -07:00
Ryan Huffman	4315d63fb5	Merge branch 'master' of github.com:highfidelity/hifi into 19831	2014-09-11 11:13:13 -07:00
Stephen Birarda	aaabe6b1e1	handle domain changes via address bar	2014-09-11 10:45:45 -07:00
Stephen Birarda	dd1b23044f	hook meta+enter up to address bar display	2014-09-11 10:24:04 -07:00
Stephen Birarda	71f2c0b542	initial addition of the AddressManager with location switch hooked up	2014-09-11 10:14:00 -07:00
Andrzej Kapolka	fe249ef348	Make sure the frustum that we use for culling contains the current camera information.	2014-09-10 15:51:10 -07:00
Andrzej Kapolka	423e6d0594	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-09-10 13:51:46 -07:00
Andrzej Kapolka	2cba7b37bf	Attempting to fix 3DTV/Oculus deferred lighting/ambient occlusion.	2014-09-10 13:51:14 -07:00
wangyix	7a2897fb6b	fixes/patches for win32/vs2013 startup and shutdown	2014-09-10 12:24:59 -07:00
Thijs Wenker	cb907c1891	GlobalServicesScriptingInterface added, functions and properties functional	2014-09-10 13:57:38 +02:00
Andrzej Kapolka	a9eb35448a	Comment fix.	2014-09-08 15:39:20 -07:00
Andrzej Kapolka	e9964c71c9	Fix for rear view mirror.	2014-09-08 14:13:28 -07:00
Andrzej Kapolka	1ef9126482	Migrating to device-independent coordinates.	2014-09-08 13:59:19 -07:00
Brad Hefta-Gaub	a77739f31c	Merge pull request #3369 from ctrlaltdavid/20007 Code Review for Job #20007	2014-09-06 15:36:29 -07:00
David Rowe	5ebe6962a4	Make scripts loaded with Script.load() not persist	2014-09-06 09:59:47 -07:00
Andrzej Kapolka	0b2d0a0b07	Fix for mouse events.	2014-09-05 17:30:19 -07:00
Andrzej Kapolka	c2cd23a54c	Mouse coordinate fix.	2014-09-05 17:07:37 -07:00
Andrzej Kapolka	5bdad18ade	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-09-05 16:45:15 -07:00
Andrzej Kapolka	7f6b3d3649	Dimension fixes for Retina displays.	2014-09-05 16:44:45 -07:00
Andrzej Kapolka	37b4fe5166	Fix for deferred lighting/ambient occlusion when glow effect is disabled.	2014-09-05 14:16:12 -07:00
Andrzej Kapolka	b278857091	Wireframe option, fix for shadow menu group.	2014-09-05 13:51:22 -07:00
Ryan Huffman	e590f992f6	Merge branch 'master' of git://github.com/highfidelity/hifi into 19831	2014-09-05 10:18:02 -07:00
Ryan Huffman	d54dc5f2aa	Merge branch 'master' of github.com:highfidelity/hifi into 19935 Conflicts: interface/src/Menu.h	2014-09-04 12:05:17 -07:00
Clément Brisset	cc6d70c5ab	Merge pull request #3336 from huffman/19995 Code Review for Job #19995	2014-09-04 11:37:35 -07:00
AndrewMeadows	8223481ecb	Merge pull request #3341 from huffman/19967 Code Review for Job #19967	2014-09-03 16:51:19 -07:00
AndrewMeadows	bd55da4a83	Merge pull request #3335 from ZappoMan/virtualEntities Model Server to Entity Server Refactoring	2014-09-03 15:48:58 -07:00
MarcelEdward	e62834c197	This patch updates Application::updateLocationInServer() in Application.cpp The online status is updated when the position is send to the data web, a avatar gets an offline status if the data web did not get an update in the last 30 seconds. This function had an LastLocationObject in which only send in the location info to the data web in case the location changed. Removed the last location so the position of the avatar is send to the data web every 5 seconds, so that the online status remains online if the avatar is still online and does not switch to offline when the avatar does not move.	2014-09-03 16:43:39 +02:00
Ryan Huffman	ece3390b4e	Fix bug with dropping hifi images not working on Windows URLs on Windows included three forward-slashes, ex `file:///C:...`. Using `toLocalFile()` correctly stringifies the location.	2014-09-01 22:14:28 -07:00
ZappoMan	2bcad6ab2b	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: assignment-client/src/Agent.cpp examples/editModels.js	2014-08-28 21:19:56 -07:00
David Rowe	1d3a176f5f	Rename method	2014-08-28 13:53:47 -07:00
David Rowe	46c1a9d59a	Make login dialog automatically show only once per domain visit	2014-08-28 11:25:13 -07:00
ZappoMan	30e00bbd69	final pass on entities import/export/overlays working as well as production	2014-08-27 11:34:50 -07:00
Craig Hansen-Sturm	e941e58626	merge HEAD with PR-3281	2014-08-26 18:25:40 -07:00
ZappoMan	b14158385c	first cut at getting pastEntities() working	2014-08-26 16:47:32 -07:00
ZappoMan	4895ee32f7	test and fix issues with exportEntities()	2014-08-26 15:59:49 -07:00
Ryan Huffman	e38d8f7afd	Update all locations that update settings to call bumpSettings()	2014-08-26 07:47:22 -07:00
ZappoMan	58759d344f	cleanup in prep for PR	2014-08-25 10:56:43 -07:00
Ryan Huffman	b0361025b0	Remove custom behavior from running scripts widget	2014-08-21 14:32:38 -07:00
Andrew Meadows	7e4c72445e	JS scripts set joint animation priorities	2014-08-20 17:14:59 -07:00
ZappoMan	ef86d86234	split out entity rendering into subclasses, improved rendering of models	2014-08-20 15:49:50 -07:00
Clément Brisset	c76afe7d4a	Merge pull request #3298 from PhilipRosedale/master First cut of Spacebar-to-fly with Oculus and Faceshift, stabilize Faceshift head jittering	2014-08-20 10:16:25 -07:00
Philip Rosedale	8e958b49c0	Merge pull request #3303 from Atlante45/record_feature Record feature JS API + File Format	2014-08-19 21:25:18 -07:00
Atlante45	b13604f968	JS API for recording	2014-08-19 16:43:26 -07:00
Ryan Huffman	284c4d8ac0	Merge branch 'master' of github.com:highfidelity/hifi into 19864 Conflicts: interface/CMakeLists.txt	2014-08-19 11:59:53 -07:00
Philip Rosedale	7b86f668a6	Add SPACE to scripting JS, change reset to apostrophe	2014-08-18 23:22:55 -07:00
Atlante45	6d567e67a9	Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature	2014-08-18 15:41:19 -07:00
ZappoMan	32d5eb3cea	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: assignment-client/CMakeLists.txt interface/CMakeLists.txt libraries/entities/CMakeLists.txt libraries/models/src/ModelEditPacketSender.cpp libraries/models/src/ModelEditPacketSender.h libraries/models/src/ModelItem.cpp libraries/models/src/ModelItem.h libraries/octree/src/OctreeEditPacketSender.cpp libraries/octree/src/OctreeEditPacketSender.h libraries/octree/src/OctreePacketData.h libraries/octree/src/OctreeQuery.cpp libraries/particles/src/ParticleEditPacketSender.cpp libraries/particles/src/ParticleEditPacketSender.h libraries/script-engine/CMakeLists.txt tests/octree/CMakeLists.txt	2014-08-18 15:16:35 -07:00
Clément Brisset	a6f0c9bb01	Merge pull request #3288 from nivardus/19616 Code Review for Job #19616	2014-08-18 14:44:29 -07:00
Atlante45	1d30b52ec2	Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature	2014-08-18 14:23:40 -07:00
Atlante45	52640c8482	Various tweaks and code cleanup	2014-08-18 14:23:29 -07:00
Atlante45	acb55ce65e	Switched audio play back to AudioInjector out of Audio	2014-08-18 12:31:44 -07:00
AndrewMeadows	4b7208ac53	Merge pull request #3280 from huffman/19907 Code Review for Job #19907	2014-08-18 10:20:01 -07:00
Atlante45	47685b0e88	Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature	2014-08-17 12:56:19 -07:00
Atlante45	6592a6dca2	Fix for custom URL schemes	2014-08-15 10:28:22 -07:00
Ryan Huffman	7d11994cce	Add cursor hiding to gracefulControls.js	2014-08-14 22:37:23 -07:00
Bennett Goble	e21392f553	Merge branch 'master' into 19616	2014-08-14 18:37:11 -04:00
Atlante45	2981132395	Merge branch 'master' of https://github.com/highfidelity/hifi into record_feature	2014-08-14 11:39:44 -07:00
Ryan Huffman	a2e7c9b75c	Update build for speechRecognizer	2014-08-13 14:53:26 -07:00
wangyix	db0fbcab97	merge with upstream	2014-08-13 11:09:55 -07:00
Atlante45	73a3a13c59	More recording work	2014-08-12 18:15:48 -07:00
Stephen Birarda	4bf7bbe0df	if enable VR mode is re-checked then attempt to re-connect to Oculus	2014-08-12 15:20:04 -07:00
Philip Rosedale	9933c011d7	Remove filtered eye position from head	2014-08-12 14:31:40 -07:00
Ryan Huffman	0296d0deeb	Add domain connection status to window title	2014-08-11 18:43:26 -07:00
ZappoMan	275a5c4a47	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities	2014-08-08 15:13:55 -07:00
Bennett Goble	46007e2c56	Merge branch 'master' into 19616	2014-08-08 17:38:53 -04:00
ZappoMan	027b1d58cc	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: interface/src/Application.h interface/src/entities/EntityTreeRenderer.h interface/src/models/ModelTreeRenderer.cpp libraries/models/src/ModelItem.h libraries/models/src/ModelTree.h	2014-08-08 14:26:56 -07:00
Stephen Birarda	45afce48f7	remember old session UUID in AvatarHashMap to work around ghosting	2014-08-08 13:14:03 -07:00
Ryan Huffman	9127ac24a0	Move speechRecognizer to Menu	2014-08-07 17:45:27 -07:00
wangyix	1153a76ab1	new option knobs added, no new behavior yet	2014-08-07 16:37:36 -07:00
AndrewMeadows	2653b33b67	Merge pull request #3257 from Atlante45/referentials Referentials	2014-08-06 14:12:18 -07:00
Atlante45	b360b6c55d	PR cleanup + JS API	2014-08-05 17:07:03 -07:00
Atlante45	d9dde06c14	Various tweaks to referentials	2014-08-04 14:59:15 -07:00
Atlante45	15cbfa0715	Merge branch 'master' of https://github.com/highfidelity/hifi into referentials	2014-08-04 12:45:57 -07:00
ZappoMan	3a8c5018ee	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: interface/src/Application.h libraries/entities/src/EntityTreeElement.h libraries/models/src/ModelItem.cpp libraries/models/src/ModelItem.h libraries/models/src/ModelTree.cpp libraries/models/src/ModelTree.h libraries/models/src/ModelTreeElement.cpp libraries/networking/src/PacketHeaders.h libraries/octree/src/OctreeEditPacketSender.cpp libraries/octree/src/OctreeEditPacketSender.h	2014-08-04 12:01:23 -07:00
Atlante45	8d1438a44c	Plugged in dde face tracker	2014-08-04 10:28:52 -07:00
Bennett Goble	b634f8d8c0	Merge branch 'master' into 19616	2014-08-03 14:08:09 -04:00
Bennett Goble	bd409f2de4	importVoxels() JS override: specify file and location	2014-08-03 14:01:37 -04:00
Brad Hefta-Gaub	e9286e5700	Merge pull request #3238 from ctrlaltdavid/19824 Code Review for Job #19824	2014-08-01 16:35:16 -07:00
Brad Hefta-Gaub	211bed946f	Merge pull request #3232 from huffman/19783 Code Review for Job #19783	2014-08-01 16:34:50 -07:00
Ryan Huffman	d01d605b40	Add ModelItemProperties::copyFromNewModelItem	2014-08-01 13:52:00 -07:00
Ryan Huffman	3e572cdf76	Add SpeechRecognizer to js and speechControl.js	2014-08-01 13:44:40 -07:00
Ryan Huffman	ffb178cb43	Add SpeechRecognizer	2014-08-01 13:44:06 -07:00
David Rowe	f3b4f708a5	Add Script.load() JavaScript method	2014-07-31 21:50:07 -07:00
Atlante45	ee4b7664b0	Merge branch 'master' of https://github.com/highfidelity/hifi into referentials	2014-07-31 13:39:23 -07:00
Atlante45	5fd3fd9f8f	Moved MyAvatar update at the end of Application::update() to have latest data for simulation	2014-07-31 11:54:39 -07:00
Ryan Huffman	3e2bb0f168	Add more complete error handling for import/export models	2014-07-31 10:40:45 -07:00
ZappoMan	77e1867b11	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: assignment-client/src/Agent.cpp assignment-client/src/Agent.h examples/editModels.js interface/src/Application.h	2014-07-31 10:34:23 -07:00
Stephen Birarda	453c37f4b9	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-server-auth	2014-07-31 10:05:40 -07:00
Ryan Huffman	a39a7e2356	Update exportModels implementation	2014-07-31 01:13:17 -07:00
Ryan Huffman	01737e18b2	Update LocalModelOverlay to work prorperly with translations	2014-07-30 19:06:10 -07:00
Ryan Huffman	06294b403b	Add pasteModels	2014-07-30 18:31:58 -07:00
Stephen Birarda	db25cd9d2c	call PaymentManager when an OctreeEditPacketSender needs to pay	2014-07-30 18:07:08 -07:00
Brad Hefta-Gaub	d6e6cfd585	Merge pull request #3216 from wangyix/inbound_audio_stream Audio ringbuffer classes refactored into subclasses of InboundAudioStream	2014-07-30 18:00:17 -07:00
Stephen Birarda	9c1dd7c4a4	fix call to connect in Application	2014-07-30 17:35:49 -07:00
Stephen Birarda	99daa062c0	trigger domainSettingsReceived slot when connected to domain	2014-07-30 17:35:33 -07:00
Stephen Birarda	363cef6d8a	move satoshi costs to VoxelEditPacketSender	2014-07-30 17:33:37 -07:00
wangyix	daeb2a898d	added staticDesiredJitterBufferFrames feature; AudioMixer crashing moved some callbacks from Application::updateAvatar() to Application::update()	2014-07-30 15:35:40 -07:00
wangyix	d49970d010	maxFramesOverDesired added; settable from domain page and preferences	2014-07-29 15:57:32 -07:00
ZappoMan	378b555046	fix entity server name and sending to servers when voxels not enabled	2014-07-28 21:21:54 -07:00
Zu	4016f8ca44	Merge branch 'master' into add_cara_face_tracker	2014-07-29 12:21:40 +08:00
ZappoMan	805a88b73b	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: examples/editModels.js interface/src/entities/EntityTreeRenderer.h libraries/models/src/ModelsScriptingInterface.cpp libraries/script-engine/src/ScriptEngine.cpp	2014-07-28 13:39:35 -07:00
wangyix	6fc5c74c0b	renamed ringbuffer variables to audiostream	2014-07-28 13:08:53 -07:00
Atlante45	1849ec8e07	Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels_zFighting Conflicts: examples/editVoxels.js	2014-07-25 16:39:39 -07:00
Ryan Huffman	d777e4be53	Merge branch 'master' of git://github.com/highfidelity/hifi into 19783 Conflicts: interface/src/scripting/WindowScriptingInterface.cpp interface/src/scripting/WindowScriptingInterface.h	2014-07-25 15:53:36 -07:00
Atlante45	72a31ec8fc	Removed magic number to use DEFAULT_NEAR/FAR_CLIP	2014-07-25 10:56:44 -07:00
AndrewMeadows	73ec862474	Merge pull request #3207 from PhilipRosedale/master Velocity filter head position for less jitter in camera	2014-07-25 09:50:21 -07:00
Zu	2d921924bf	added: Cara Face Tracker added: decode cara udp packets added: head rotation added: hook into hifi interface	2014-07-25 16:52:29 +08:00
Philip Rosedale	a5d6b2282e	Merge pull request #3201 from wangyix/master moved audio stats to own overlay; audio stats now reset when audiomixer is killed;	2014-07-24 21:40:43 -07:00
Philip Rosedale	9a83be618a	Merge pull request #3191 from Atlante45/make_scriptEngine_a_qScriptEngine ScriptEngine now inherit from QScriptEngine	2014-07-24 21:38:13 -07:00
Philip Rosedale	a1b74c5272	remove unused code	2014-07-23 23:07:37 -07:00
Philip Rosedale	5aecbe690d	made calculateAverageEyePosition private, changed to getEyePosition() where used outside head	2014-07-23 22:56:59 -07:00
Philip Rosedale	00fdc37822	add velocity filtering to eyePosition to reduce camera jitter from faceshift	2014-07-23 22:45:50 -07:00
Philip Rosedale	f05855dcc2	Merge pull request #3199 from ey6es/master Fix for shadows in close-up inset mirror.	2014-07-23 17:49:55 -07:00
wangyix	a36c9e872e	merged with upstream	2014-07-23 15:36:37 -07:00
Atlante45	e1365a2927	Forgot one change	2014-07-23 14:19:47 -07:00
Thijs Wenker	9d5c81bd67	Merge branch 'master' of https://github.com/worklist/hifi	2014-07-23 16:59:23 +02:00
Thijs Wenker	b6cb19c2f6	FEATURE: Allows detecting simulated cursors in JS, this allows JS-developers to track all cursors separately. By using the deviceID. (deviceID 0 = default mouse-cursor , 1500 and 1501 hydra cursors)	2014-07-23 16:55:59 +02:00
Andrzej Kapolka	9cf0d6c851	Fix for shadows in close-up inset mirror.	2014-07-22 19:19:13 -07:00
Philip Rosedale	4f52098da1	tuning tweaks to world and avatar lights	2014-07-22 20:23:23 -04:00
Andrzej Kapolka	be028c2b01	Fixes for local lights.	2014-07-22 14:13:51 -07:00
wangyix	847bc28990	Audio stats now reset when AudioMixer is killed	2014-07-22 10:27:26 -07:00
barnold1953	03bc3a9ff8	Added checkable menu option for laser toggle	2014-07-21 12:35:46 -07:00
barnold1953	c6bda4bf16	Moved sixense laser stuff to MyAvatar	2014-07-18 15:26:18 -07:00
Brad Hefta-Gaub	d8d6d08958	Merge pull request #3145 from samcake/19734 19734 - Leapmotion support	2014-07-17 08:45:55 -07:00
Andrzej Kapolka	3be00b972d	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-07-15 18:11:54 -07:00
ZappoMan	5869039bf3	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities	2014-07-15 14:26:07 -07:00
ZappoMan	2baac96665	Merge branch 'master' of https://github.com/highfidelity/hifi into virtualEntities Conflicts: examples/sit.js interface/src/Application.cpp libraries/models/src/ModelItem.cpp libraries/models/src/ModelsScriptingInterface.cpp	2014-07-15 10:04:40 -07:00
Andrzej Kapolka	e32bab5b04	Beginnings of some metavoxel scriptability, to create some test landscapes.	2014-07-14 14:32:55 -07:00
TonyPeng	1aa20dff60	Expose light directions and colors for the avatar list in AvatarManager. Light parameter changes within the script will effect all the avatars currently in AvatarManager.	2014-07-14 13:59:57 -07:00
Andrew Meadows	456a3c3739	cleanup Leapmotion initialization removes warning about unused variable	2014-07-14 09:26:42 -07:00
Andrew Meadows	8ffc3aa73d	merge upstream/master into andrew/thermonuclear (AKA samcake/19734) Conflicts: interface/src/Application.cpp	2014-07-14 09:10:27 -07:00
Brad Hefta-Gaub	a94e077a75	Merge pull request #3153 from wangyix/quick_audio_PR Added more stats to AudioStreamStats; Added template classes RingBufferHistory and MovingMinMaxAvg	2014-07-11 11:42:55 -07:00
wangyix	a7ef7647ed	application stats tracking and packing updated;	2014-07-10 16:54:26 -07:00
wangyix	b4c9e51011	Audio now periodically sends downstream audio stats to audiomixer	2014-07-10 14:14:29 -07:00
barnold1953	a785ceb3da	Restored UI fade animation	2014-07-09 17:33:41 -07:00
barnold1953	56ff74dd56	Removed ApplicationOverlay::resize()	2014-07-09 16:39:05 -07:00
barnold1953	6e92beeb1c	Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK Conflicts: interface/src/Application.cpp interface/src/ui/ApplicationOverlay.h	2014-07-09 16:32:02 -07:00
samcake	c6e308bc87	fixes after first review - lots of cleaning of the syntax to respect the coding standard - Fixed the device tracker singleton for clean destruction - introduced the Factory for the Leapmotion itstead of a naked constructor	2014-07-09 15:52:57 -07:00
Andrew Meadows	6ffa09f9e6	modified scope of devices stats	2014-07-09 13:58:54 -07:00
Andrew Meadows	3d6752ad90	merge upstream/master into andrew/inertia Conflicts: interface/src/Application.cpp	2014-07-09 12:52:00 -07:00
Andrew Meadows	d26585728b	Improved stat accumulation and context names	2014-07-09 11:53:53 -07:00
barnold1953	862f311306	Fixed full screen mirror mode for non oculus	2014-07-09 11:29:33 -07:00
Ryan Huffman	874b542c0c	Add import/export/paste model functionality to editModels.js	2014-07-09 04:13:53 -07:00
Clément Brisset	3f24feeb1d	Merge pull request #3143 from PhilipRosedale/master Add Low Velocity Filter for hand movement as menu option	2014-07-08 23:22:46 -07:00
Clément Brisset	2003dc41df	Merge pull request #3138 from ctrlaltdavid/19836 Code Review for Job #19836	2014-07-08 23:16:32 -07:00
Philip Rosedale	c50d9ae3e4	Hand low velocity filter as a menu option	2014-07-08 22:22:27 -07:00
barnold1953	b5a9f50ae7	Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK	2014-07-08 17:15:35 -07:00
ZappoMan	e800d5457b	Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities	2014-07-08 13:02:31 -07:00
Atlante45	a225df63f6	Removed deprecated moveToThread()	2014-07-07 11:40:03 -07:00
samcake	abacefa723	Merge remote-tracking branch 'upstream/master' into 19734 Conflicts: interface/CMakeLists.txt interface/src/avatar/SkeletonModel.cpp	2014-07-05 19:25:46 -07:00
samcake	fca3a6aa13	Merge branch 'master' of https://github.com/highfidelity/hifi into 19734	2014-07-05 18:10:59 -07:00
David Rowe	2ad2b6cd1c	Resize the overlay framebuffer when the application window is resized	2014-07-03 18:23:37 -07:00
David Rowe	97ca6d70fa	Fixed performance timer scope	2014-07-03 17:15:46 -07:00
David Rowe	8b04a9c8b6	Add toggle for user interface display - "/" toggles UI (incl. stats if displayed); menu View > User Interface - "%" = toggle status; menu View > Stats - Acts on normal, 3DTV, and Oculus display.	2014-07-03 16:19:05 -07:00
barnold1953	ba997334ff	Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK	2014-07-03 16:10:26 -07:00
barnold1953	bf2959675f	First pass at laser oculus UI pointer	2014-07-03 16:09:54 -07:00
Atlante45	8e1b8334a1	Fixed invokeMethod unable to find method + fixed children in different thread	2014-07-03 14:46:17 -07:00
ZappoMan	ec0c350f60	Merge branch 'master' of https://github.com/worklist/hifi into virtualEntities Conflicts: interface/src/Application.cpp interface/src/DatagramProcessor.cpp libraries/script-engine/src/ScriptEngine.cpp	2014-07-03 14:20:40 -07:00
Brad Hefta-Gaub	b8071d8050	Merge pull request #3113 from birarda/master initial pass at MIDI input for scripting	2014-07-03 13:40:25 -07:00
Brad Hefta-Gaub	dbdce32b68	Merge pull request #3107 from wangyix/master prune missing sequence numbers before sending NACK; AudioRingBuffer frame length can now be specified;	2014-07-03 13:32:31 -07:00
Stephen Birarda	15619b5a98	don't require RtMidi if it isn't present	2014-07-03 13:30:14 -07:00
Stephen Birarda	f1e2ba1267	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-07-03 09:25:03 -07:00
Brad Hefta-Gaub	67910a5ba2	Merge pull request #3115 from Barnold1953/OculusSDK 3DTV UI overlay + Oculus fixes	2014-07-02 21:45:34 -07:00
Brad Hefta-Gaub	1b29b7c120	Merge pull request #3114 from Atlante45/deleted_user_activity_logger_unnecessary_callback Removed json callback	2014-07-02 21:45:19 -07:00
Atlante45	69533c25c2	Fix script not being loaded at startup	2014-07-02 17:54:21 -07:00
barnold1953	edcf4d04f8	Fixed bug when switching from normal view to oculus	2014-07-02 17:05:06 -07:00
barnold1953	ee30a446e9	Fixed 3rd person camera for non oculus	2014-07-02 16:45:05 -07:00
barnold1953	a859094d4a	Clickable 3D UI in 3DTV	2014-07-02 16:40:02 -07:00
Atlante45	1ac38c9884	Switched call to setCache to invokeMethod	2014-07-02 14:31:19 -07:00
Stephen Birarda	55d8b763c5	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-07-02 09:42:32 -07:00
barnold1953	67ecde7d31	Made tree editor voxel world stationary and not crash	2014-07-01 21:39:19 -07:00
Atlante45	c5a997a567	Switched Application to NetworkAccessManager	2014-07-01 17:43:25 -07:00
ZappoMan	865566414c	Merge branch 'master' of https://github.com/worklist/hifi into renameModelsToEntities Conflicts: interface/src/entities/EntityTreeRenderer.cpp libraries/entities/src/EntityItem.h libraries/models/src/ModelItem.cpp libraries/models/src/ModelTree.cpp libraries/models/src/ModelTreeElement.cpp libraries/models/src/ModelsScriptingInterface.cpp tests/octree/CMakeLists.txt tests/octree/src/ModelTests.cpp	2014-07-01 16:32:47 -07:00
Atlante45	e9826250cb	CR	2014-07-01 12:57:39 -07:00
Atlante45	958367f579	Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity Conflicts: interface/src/devices/OculusManager.cpp	2014-07-01 12:45:42 -07:00
barnold1953	1a1050cb06	Added back _raiseMirror usage for mirror mode.	2014-07-01 12:31:48 -07:00
wangyix	fd051310da	prune missing set before constructing nack packets; make MAX_REASONALBE_SEQUENCE_GAP global and sentPacketHistory to use that value as the default history size	2014-07-01 12:01:51 -07:00
Stephen Birarda	f389e3a6da	resolve conflicts on merge with upstream master	2014-07-01 11:02:25 -07:00
Brad Hefta-Gaub	df51d26625	Merge pull request #3094 from wangyix/seqNumberStats Fixed bugs and improved overflow handling in AudioRingBuffer; Added audio stream stats packets; Added seq numbers and tracking to audio packets;	2014-07-01 10:54:35 -07:00
Brad Hefta-Gaub	a88c92ea17	Merge pull request #3099 from Barnold1953/OculusSDK Oculus SDK Upgrade	2014-07-01 10:43:39 -07:00
barnold1953	80bfb0766b	Fixed warnings	2014-07-01 10:28:40 -07:00
Stephen Birarda	5ba4a4dbb5	initial pass of MIDI implementation that bubbles events to JS	2014-07-01 09:53:18 -07:00
samcake	a8b875d32e	Merge remote-tracking branch 'origin/LeapMotion' into 19734	2014-07-01 03:20:26 -07:00
samcake	3ce455aba4	Support for LeapMotion and worklist 19734 - Introduce the DeviceTracker class to abstract all the possible devices - Introduce the MotionTracker ( a DeviceTracker ) that contains a transform tree of joints - Add Leapmotion class as a MotionTracker and the support for the Leapmotion sdk in external - Add InputController as the abstraction of a MotionTracker/Joint for Javascript	2014-07-01 03:15:26 -07:00
Atlante45	2015861e13	Fixed spelling mistake	2014-06-30 20:10:53 -07:00
Atlante45	7c797449ab	Comments + connectedDevice	2014-06-30 19:02:43 -07:00
wangyix	f51a77ce45	reset the incoming audio seq stats in Application::nodeKilled when audiomixer is killed	2014-06-30 18:00:29 -07:00
Atlante45	1a2fd4483b	Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity	2014-06-30 17:54:34 -07:00
Atlante45	d102795314	Added application version to logger	2014-06-30 17:18:49 -07:00
barnold1953	1cd2066e79	Added option to disable glow effect for 10fps boost for oculus	2014-06-30 17:13:47 -07:00
Atlante45	f33ad8a100	Adding logger calls	2014-06-30 17:10:17 -07:00
Atlante45	e9dffc0681	Removed testing code	2014-06-30 14:31:39 -07:00
Atlante45	ff8694d5c5	Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity	2014-06-30 14:30:17 -07:00
wangyix	c789f3c6b9	merge with upstream	2014-06-30 14:13:34 -07:00
barnold1953	6e954e7f53	Merge branch 'master' of https://github.com/highfidelity/hifi into OculusSDK	2014-06-30 11:44:49 -07:00
barnold1953	ffab329af4	Made camera line up with eyes in mirror mode	2014-06-30 11:39:33 -07:00
barnold1953	d109ef6fe1	Proper mirror and third person mode in Oculus	2014-06-30 11:33:22 -07:00
David Rowe	9449ad7192	Add missing script engine hash key code changes The script engine hash key changed starting at commit [62f85d] on 11 Jun.	2014-06-29 19:40:53 -07:00
Clément Brisset	9eba4b01f0	Merge pull request #3092 from ctrlaltdavid/19789 Code Review for Job #19789	2014-06-27 17:28:48 -07:00
wangyix	0ae58bd7f9	added senderUUID arg to seq stats	2014-06-27 15:39:11 -07:00
barnold1953	508fed9146	Add ability for FBO to have a different res than glWidget	2014-06-27 11:44:05 -07:00
barnold1953	67c5281205	Fixed CMake for oculus. Gave Oculus its own camera for minimum latency.	2014-06-26 17:10:53 -07:00
wangyix	cb48825561	added seq number to all Audio types, untested	2014-06-26 16:52:23 -07:00
ZappoMan	ccc9eabd33	first cut at renaming Models to Entities	2014-06-26 16:39:52 -07:00
Atlante45	8d00a8d535	Merge branch 'master' of https://github.com/highfidelity/hifi into add_interface_to_log_user_activity Conflicts: libraries/networking/src/LimitedNodeList.cpp	2014-06-26 14:56:15 -07:00
Atlante45	9d393bbe8c	Added some functions to UserActivityLogger + made logAction public	2014-06-26 14:55:11 -07:00
Clément Brisset	463ac9cc74	Merge pull request #3078 from PhilipRosedale/master Improved toy ball, JS calls for palm position, concertCamera.js	2014-06-26 11:03:48 -07:00
wangyix	2ec04fb756	replaced old seqnum tracking code with SequenceNumberStats	2014-06-25 17:20:57 -07:00
David Rowe	9fb64386aa	Fix stopping scripts in the script editor	2014-06-25 11:44:58 -07:00
Philip Rosedale	95a66a06af	Merge branch 'master' of https://github.com/worklist/hifi	2014-06-25 02:57:54 -07:00
Ryan Huffman	3bec59fd33	Fix unindented line	2014-06-24 20:38:46 -07:00
Ryan Huffman	5ece424a45	Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 Conflicts: interface/ui/runningScriptsWidget.ui	2014-06-24 20:27:44 -07:00
Stephen Birarda	5f4baaffa5	revert credit balance rounding	2014-06-24 16:25:41 -07:00
Philip Rosedale	81e7f8e0a5	Merge branch 'master' of https://github.com/worklist/hifi	2014-06-24 16:21:35 -07:00
Ryan Huffman	173be2c89d	Merge branch 'master' of git://github.com/highfidelity/hifi into 19644	2014-06-24 12:01:04 -07:00
Ryan Huffman	f249020d6d	Clean up redundant if statement	2014-06-24 11:50:54 -07:00
Ryan Huffman	652543cdca	Update _scriptEngineHash to work with duplicate running scripts	2014-06-24 11:46:35 -07:00
Philip Rosedale	556578b8dc	first pass - hair as vertlet strands	2014-06-24 09:30:11 -07:00
Stephen Birarda	ed5c05a61b	fix rounding of credit balance in application title	2014-06-23 13:25:32 -07:00
Ryan Huffman	108fa36d24	Disable the ability to load a script multiple times It won't show up correctly in running scripts, and can cause it to end up running in the background unnoticed. Also added an error message for when a script doesn't load.	2014-06-20 16:32:42 -07:00
Brad Hefta-Gaub	f2b2784fa9	Merge pull request #3045 from wangyix/edit_nack_pull Changed octree data NACK handling to repeatedly NACK missing seq numbers, like edit NACKs	2014-06-18 15:02:40 -07:00
wangyix	29723d0ef3	changed octree data nacks to repeatedly nack missing seq nums	2014-06-18 13:36:54 -07:00
Brad Hefta-Gaub	c49ff59725	Merge pull request #3037 from wangyix/edit_nack_pull Edit nack pull	2014-06-18 11:43:25 -07:00
Ryan Huffman	7a08ac76d2	Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 Conflicts: interface/src/Menu.cpp interface/ui/preferencesDialog.ui	2014-06-17 20:27:16 -07:00
Brad Hefta-Gaub	dead474e6b	Merge pull request #3034 from Barnold1953/OculusOverlay New Oculus Magnification Windows	2014-06-17 17:29:09 -07:00
Brad Hefta-Gaub	cee6f1be6a	Merge pull request #3031 from stojce/19755 Code Review for Job #19755	2014-06-17 17:28:55 -07:00
wangyix	6e71523346	added OctreeEditPacketSender::nodeKilled(), no locks yet also added nodeKilled() calls to the 3 editsenders in Application::nodeKilled()	2014-06-17 10:58:44 -07:00
barnold1953	3052996a9e	Pressing trigger and bumper at same time toggles UI	2014-06-17 10:37:15 -07:00
Ryan Huffman	5843425db9	Fix scripts being loaded on start even if they don't exist Application::loadScript should not store a reference to a script until it has been successfully loaded. Previously if a script didn't exist it would be "loaded" and show up in the running scripts window, but wouldn't have been successfully loaded, and wouldn't be running anything at all.	2014-06-17 09:18:58 -07:00
Stojce Slavkovski	f1e008853c	Merge branch 'master' of https://github.com/highfidelity/hifi into 19755	2014-06-15 12:36:14 +02:00
Brad Hefta-Gaub	e8ba3c8bb1	Merge pull request #3019 from ctrlaltdavid/19769 Code Review for Job #19769	2014-06-12 17:31:53 -07:00
Stojce Slavkovski	1959768513	Merge branch 'master' of https://github.com/highfidelity/hifi into 19755	2014-06-13 00:45:06 +02:00
barnold1953	762751ef6a	Store the last mouse move input type for application overlay	2014-06-12 10:47:11 -07:00
barnold1953	84e01e6b25	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-06-11 17:22:30 -07:00
barnold1953	eff097638c	Implementd sixense mouse emulation	2014-06-11 17:02:08 -07:00
Brad Hefta-Gaub	107fbf8c29	Merge pull request #3012 from wangyix/master added OctreePacketProcessor::nodeKilled to Application::nodeKilled instead of connecting it to NodeList::nodeKilled	2014-06-11 16:00:59 -07:00
wangyix	ac0b037f0f	removed connect(); put call into Application::nodeKilled OctreePacketReceiver::nodeKilled() doesn't get called when NodeList::nodeKilled() is emitted for some unknown reason	2014-06-11 15:25:00 -07:00
Ryan Huffman	5ef9e3b3c0	Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 Conflicts: interface/src/Application.cpp	2014-06-11 14:34:59 -07:00
Ryan Huffman	355fe01490	Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/ui/PreferencesDialog.cpp interface/src/ui/RunningScriptsWidget.cpp interface/ui/preferencesDialog.ui interface/ui/runningScriptsWidget.ui	2014-06-11 13:30:47 -07:00
wangyix	a8c9780004	updated connect() to qt5 format	2014-06-11 12:13:27 -07:00
Brad Hefta-Gaub	62f85d0794	Merge pull request #3004 from matsukaze/master Job #19766 BUG: Stop or reload all scripts crashes interface	2014-06-11 11:51:03 -07:00
wangyix	fc07ceb412	added killNode() slot for _packetCounts garbage collection	2014-06-11 10:54:44 -07:00
matsukaze	679846267e	Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3 Same comments as before, but without the local files changes mistakenly checked in.	2014-06-10 22:42:01 -04:00
matsukaze	1e1cc69287	Revert "Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3" This reverts commit `46f2ab73bc`.	2014-06-10 22:37:34 -04:00
matsukaze	46f2ab73bc	Job #19766 BUG: Stop or reload all scripts crashes interface fixed, part 3 Move the conversion of scriptName to QUrl to the beginning of Application::loadScript. Use the scriptURLString to query the _scriptEngineHash map.	2014-06-10 22:29:58 -04:00
matsukaze	a48f38b1d2	Revert "Job #19766 BUG: Stop or reload all scripts crashes interface fix, part 2." This reverts commit `b4e9840865`.	2014-06-10 21:32:23 -04:00
David Rowe	39e3deb9b9	Add menu item that toggles VR display mode Toggles the display mode if a Rift is found connected at program start.	2014-06-10 15:03:07 -07:00
wangyix	b96b6c9857	added default constructor for NetworkPacket updated param comments in ReceivedPacketProcessor	2014-06-10 12:24:47 -07:00
wangyix	d84beee3e4	VoxelPacketProcessor -> OctreePacketProcessor added nodes bookkeeping in ReceivedPacketProcessor; added check in sendNack() to not send NACKs to nodes that have sent packets that are waiting in the message queue.	2014-06-10 11:05:51 -07:00
matsukaze	b4e9840865	Job #19766 BUG: Stop or reload all scripts crashes interface fix, part 2. Keep the scriptUrl internal to the ScriptEngine class and refer to it externally by the file name string. Change the ScriptEngine constructor to accept a filename QString, instead of a QUrl. Resolve constructor ambiguity in Particle, which creates anonymous ScriptEngine.	2014-06-09 23:15:45 -04:00
wangyix	ffda98fe0b	var name change again	2014-06-09 17:50:29 -07:00
wangyix	4665df4d1f	nackdisable to disablenack	2014-06-09 17:41:20 -07:00
wangyix	de61029f05	Added dev menu option to disable nack packets	2014-06-09 17:30:09 -07:00
Stojce Slavkovski	3a6cbc257c	Merge branch 'master' of https://github.com/worklist/hifi into 19755	2014-06-10 00:08:28 +02:00
matsukaze	c8c8bccbf3	Job #19766 BUG: Stop or reload all scripts crashes interface fixed. QUrl(name).toString() does not equal name, therefore removing name from ScriptEngineHash was failing, and a dangling pointer was left in the script engine hash map.	2014-06-09 17:52:50 -04:00
wangyix	e45f2fed4b	changed writelock to readlock plus a coding standard fix	2014-06-09 13:42:45 -07:00
wangyix	aa694d6967	removed debug code	2014-06-09 12:35:26 -07:00
wangyix	529dd827a2	moved around code in sendNack() a bit	2014-06-09 12:00:19 -07:00
wangyix	3bc457d4d2	added octree scene stats locking and unlocking	2014-06-09 11:14:02 -07:00
Stojce Slavkovski	8de2bdfb99	expose account details via AccountScriptingInterface	2014-06-07 23:17:49 +02:00
Stojce Slavkovski	9810335adf	Merge branch 'master' of https://github.com/worklist/hifi into 19755	2014-06-07 10:33:41 +02:00
Stojce Slavkovski	fea1433ced	Add initial mybalance script	2014-06-07 10:32:36 +02:00
wangyix	5286090812	removed interface print statements	2014-06-06 17:52:48 -07:00
wangyix	b39559d860	packet recovery seems to be working Seems to impact FPS a lot. OctreeSceneStats is not being locked (causes freezing, need to find out why).	2014-06-06 17:44:30 -07:00
wangyix	d21a8e73ff	Merge remote-tracking branch 'upstream/master' into packet_recovery_pull	2014-06-06 15:05:29 -07:00
wangyix	0b1bffa83c	added random packet drops; ready to test	2014-06-06 15:03:54 -07:00
wangyix	bd2148d4b7	added write lock/unlock ...for _octreeSceneStatsLock	2014-06-06 14:33:53 -07:00
wangyix	5c47485562	client-side nack sending complete; ready to test	2014-06-06 14:27:51 -07:00
wangyix	8cd5ec3b54	started work on sending nack packets from client	2014-06-06 11:50:34 -07:00
barnold1953	f0f7d0c55f	Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay Conflicts: interface/src/ui/ApplicationOverlay.cpp	2014-06-05 12:17:09 -07:00
barnold1953	e60c671c05	Switched Oculus UI to hemisphere. Added curved semicircle UI	2014-06-04 17:24:20 -07:00
Andrew Meadows	7807388b08	merge upstream/master into andrew/inertia Conflicts: interface/src/renderer/Model.cpp	2014-06-04 14:28:23 -07:00
Andrew Meadows	d3f51fe38e	FinalOrientation -> FinalOrientationInWorldFrame	2014-06-04 10:41:17 -07:00
barnold1953	edf5d5bda1	Fixed bug that disabled cursor for windows	2014-06-04 08:38:01 -07:00
barnold1953	036bdf5d07	Removed pointless 1.0f	2014-06-03 15:26:12 -07:00
barnold1953	611c68d0d8	Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay	2014-06-03 15:23:58 -07:00
barnold1953	d1b7882c6f	Mouse input and magnification for Oculus Overlay	2014-06-03 15:23:17 -07:00
Kai Ludwig	23b56bf174	start timer BEFORE moving it to another thread, because Qt otherwise will protest and the timer does not run at all - at least on windows. this fixes restarted servers not getting properly recognized by the interface - at least on windows.	2014-06-03 20:10:55 +02:00
Brad Hefta-Gaub	6061330826	Merge pull request #2973 from matsukaze/master Job #19700 BUG: Crash in NodeBounds::draw() fixed.	2014-06-02 22:41:02 -07:00
barnold1953	90754e320d	Curved Oculus overlay around camera as a semicircle	2014-06-02 16:05:07 -07:00
barnold1953	863e2c56ae	Fixed mirror mode for non-headless models.	2014-06-02 10:41:10 -07:00
matsukaze	46d45a2d43	Job #19700 BUG: Crash in NodeBounds::draw() fixed. QMap and QReadWriteLock are orthogonal. Combined them into a wrapper class called NodeToJurisdictionMap, replacing typedef. This allows us to avoid changing method signatures wherever NodeToJurisdictionMap is used. The lock is bound with the map and is available to all clients of the NodeToJurisdictionMap. The lock allows multi-threaded access to the map. Fixed compiler warning in NodeBounds.cpp regarding loss of precision during conversion of double to GLfloat.	2014-06-02 05:55:58 -04:00
AndrewMeadows	5b74829318	Merge pull request #2955 from ey6es/cascade Basic cascaded shadow maps for increased shadow draw distance.	2014-05-29 18:57:44 -07:00
Andrzej Kapolka	1eace78e47	Hide distances; they no longer need to be publicly visible.	2014-05-29 17:46:25 -07:00
ZappoMan	ac22cebde1	more performance stats debugging	2014-05-29 17:41:40 -07:00
Andrzej Kapolka	34091128d8	Distance tweak.	2014-05-29 17:22:59 -07:00
Andrzej Kapolka	67921c474e	Merge branch 'master' of https://github.com/highfidelity/hifi into cascade	2014-05-29 17:09:09 -07:00
Andrzej Kapolka	0b4484a153	Trying a different way of determining the cascade threshold distances.	2014-05-29 16:49:51 -07:00
Andrzej Kapolka	09231f01f3	Retain "simple" shadows, supply cascaded as option.	2014-05-29 12:48:41 -07:00
ZappoMan	e6966c2155	add improved detailed rendering and FPS debugging stats	2014-05-29 12:12:23 -07:00
AndrewMeadows	b849c07faf	Merge pull request #2945 from huffman/19725 Code Review for Job #19725	2014-05-29 09:06:43 -07:00
AndrewMeadows	31237003db	Merge pull request #2944 from Barnold1953/master Disable oculus overlay until it is curved.	2014-05-29 09:01:52 -07:00
AndrewMeadows	21f045ebe0	Merge pull request #2939 from huffman/19648 Code Review for Job #19648	2014-05-29 08:53:31 -07:00
Andrzej Kapolka	ff77644caa	Progress on selecting cascades.	2014-05-28 18:35:30 -07:00
Andrzej Kapolka	698ecbf9c5	Fix for shadow map rendering.	2014-05-28 15:58:45 -07:00
Ryan Huffman	8f6ad2faab	Add 'Load default scripts' button to preferences	2014-05-28 15:27:50 -07:00
Andrzej Kapolka	c3f6cab199	Working on cascading shadow maps.	2014-05-28 15:20:09 -07:00
barnold1953	9311eeb8f5	Fixed compiler warning	2014-05-28 14:41:30 -07:00
barnold1953	ebfb11c1ce	Renamed OverlayRenderer to ApplicationOverlay and moved it up a directory	2014-05-28 10:46:46 -07:00
barnold1953	35e63757ed	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-28 09:25:55 -07:00
Andrzej Kapolka	62eeeaa1c6	Fix for Windows build failure.	2014-05-27 18:12:15 -07:00
barnold1953	5665e4d278	Merge branch 'master' of https://github.com/highfidelity/hifi Conflicts: interface/src/Application.cpp interface/src/Application.h	2014-05-27 16:16:27 -07:00
barnold1953	75580cfd0f	Made Overlay appear as flat image in front of camera in Oculus Rift. It needs to be a curved surface instead.	2014-05-27 16:13:56 -07:00
Andrzej Kapolka	2b54d627c0	Try rounding to nearest texel unit to reduce shimmer.	2014-05-27 14:25:27 -07:00
Andrzej Kapolka	3f478b1939	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-27 12:31:12 -07:00
Andrzej Kapolka	edaa251e5f	Provide option to disable avatar shadowing.	2014-05-27 11:43:34 -07:00
Mohammed Nafees	5055b18a4b	Merge branch master from upstream	2014-05-28 00:02:15 +05:30
barnold1953	d1a4192ac5	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-27 11:20:23 -07:00
barnold1953	d4f66a4a3d	Added OverlayRenderer class and moved displayOverlay from Application to OverlayRenderer.	2014-05-27 11:19:45 -07:00
Andrzej Kapolka	70ab33b65b	Some tricks to avoid shadow artifacts: render back faces to shadow buffer, use polygon offset.	2014-05-27 10:54:18 -07:00
Ryan Huffman	099777ef8c	Merge branch 'master' of git://github.com/highfidelity/hifi into 19648 Conflicts: interface/src/Application.cpp interface/src/Application.h	2014-05-26 10:01:44 -07:00
Ryan Huffman	c362731226	Add support to load script engines not based on a file	2014-05-26 09:57:37 -07:00
Clément Brisset	6bb933996f	Merge pull request #2920 from ZappoMan/aacube Add RayPick support for models	2014-05-24 17:03:59 -07:00
Stephen Birarda	fe05beb88d	remove an unneeded debug	2014-05-23 17:41:58 -07:00
Stephen Birarda	714e29c887	fix credit amount in window title	2014-05-23 17:37:36 -07:00
Stephen Birarda	1e9589c19e	fix an implicit cast to float	2014-05-23 16:18:21 -07:00
Stephen Birarda	1b00cda068	don't use powf for credit conversions	2014-05-23 16:12:34 -07:00
Brad Hefta-Gaub	50e812a82b	Merge pull request #2913 from talentraspel/19680 locking against crash	2014-05-23 15:08:20 -07:00
Kai Ludwig	7fb9e3a7e6	spaces instead of tabs.	2014-05-23 20:25:20 +02:00
Kai Ludwig	107c142532	_voxelFades needs locking.	2014-05-23 20:21:00 +02:00
ZappoMan	ee523ff373	Merge branch 'master' of https://github.com/worklist/hifi into aacube	2014-05-23 11:17:59 -07:00
ZappoMan	39ed7f7b65	renaming of AABox to AACube, introduction of actual AABox	2014-05-23 10:45:04 -07:00
Stephen Birarda	164d3c5fb3	make sure balance is cleared on logout and re-launch	2014-05-22 15:06:16 -07:00
Stephen Birarda	79f09605d5	show credit balance in window title	2014-05-22 14:55:43 -07:00
Atlante45	ea1359c10f	Clean up log	2014-05-22 11:11:22 -07:00
Mohammed Nafees	ad49b5c2e1	Show OS notification when user is not logged in	2014-05-22 16:53:07 +05:30
Ryan Huffman	2eeb3f5f2f	Update loadScript to optionally activate main window	2014-05-21 16:56:51 -07:00
barnold1953	5b366fe714	Merge branch 'master' of https://github.com/highfidelity/hifi Conflicts: interface/src/Application.cpp	2014-05-21 16:01:28 -07:00
barnold1953	97c0a2fc98	Made mirror view remain constant no matter what the avatar scale is set to.	2014-05-21 15:32:23 -07:00
Ryan Huffman	4115e0fab2	Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 Conflicts: interface/src/Application.cpp interface/ui/preferencesDialog.ui	2014-05-21 13:42:37 -07:00
barnold1953	21f03a4fb5	Made oculus camera modes only active when AllowOculusCameraModeChange is checked.	2014-05-21 12:43:44 -07:00
barnold1953	3bc8e0f726	Made third person work with oculus	2014-05-21 11:21:12 -07:00
Brad Hefta-Gaub	a88de84b1e	Merge pull request #2875 from binaryking/19666 Code Review for Job #19666	2014-05-21 11:02:29 -07:00
Mohammed Nafees	1714f7fb27	Merge branch master from upstream	2014-05-21 11:29:19 +05:30
barnold1953	eb5b0c4ddf	Made OR work with different camera modes.	2014-05-20 17:43:46 -07:00
Stephen Birarda	e3dd6509d8	remove dependency on GnuTLS for later replacement with OpenSSL	2014-05-20 10:47:11 -07:00
Andrzej Kapolka	5ebb2659a4	Fixed initialization order warning.	2014-05-17 19:02:14 -07:00
Andrzej Kapolka	c8f2dae7bd	Fix for stopping scripts on Windows.	2014-05-17 18:45:54 -07:00
Philip Rosedale	d54ff7a2cf	Merge pull request #2869 from huffman/19630 Code Review for Job #19630	2014-05-16 16:00:05 -07:00
Andrzej Kapolka	956c5d2eb6	More joystick fixes.	2014-05-16 14:24:49 -07:00
Andrzej Kapolka	a7234fd8d3	Stuff the joystick and position bits into the palms.	2014-05-16 12:10:21 -07:00
Ryan Huffman	b48b8aab12	Merge branch 'master' of git://github.com/highfidelity/hifi into 19630 Conflicts: interface/src/Application.cpp	2014-05-16 11:48:58 -07:00
Mohammed Nafees	c7acc80ad0	Fixes the log window to prevent halting of Interface when the log is long and the window is opened	2014-05-16 08:36:56 +05:30
Ryan Huffman	21819ce3b4	Merge branch '19630' of github.com:huffman/hifi into 19630 Conflicts: interface/src/Menu.h	2014-05-15 14:37:05 -07:00
Ryan Huffman	7a3826b72a	Add Node border display	2014-05-15 14:35:01 -07:00
Stephen Birarda	8e9defad3e	send an updated address to data-server with domain (when changed)	2014-05-15 12:18:24 -07:00
Brad Hefta-Gaub	4c05f4f374	Merge pull request #2857 from ctrlaltdavid/interface_log_dir Fix interface log file location	2014-05-15 08:58:53 -07:00
Ryan Huffman	cfb1e5ac4e	Merge branch 'master' of git://github.com/highfidelity/hifi into 19644 Conflicts: interface/ui/runningScriptsWidget.ui	2014-05-14 17:33:47 -07:00
David Rowe	dbfa60ff1b	Fix interface log file location Put in \High Fidelity\Interface\Logs rather than \interface\Logs.	2014-05-14 14:46:48 -07:00
Andrzej Kapolka	498f9e73ac	Merge branch 'master' of https://github.com/highfidelity/hifi into priority Conflicts: interface/src/avatar/SkeletonModel.cpp	2014-05-14 10:23:44 -07:00
Ryan Huffman	146b9958cb	Fix style issue	2014-05-14 09:41:13 -07:00
Ryan Huffman	a1d5d44bc1	Update RunningScripts to be created after Menu has been created	2014-05-14 01:45:07 -07:00
Ryan Huffman	d59bedfa96	Fix running scripts not properly updated when done programmatically Add a slot to Application to receive ScriptEngine::finished signals. Notify the Running scripts widget of stopped scripts so it can properly move them to the recent scripts list.	2014-05-13 22:25:08 -07:00
Andrzej Kapolka	eceb600de7	More work on PrioVR integration.	2014-05-13 14:44:24 -07:00
Andrzej Kapolka	f2ba2a48f2	Merge branch 'master' of https://github.com/highfidelity/hifi into priority	2014-05-13 11:38:51 -07:00
Kai Ludwig	90d577a48c	Stats area is now always right of mirror display, regardless if mirror display is enabled or not as there is always a remaining audio meter. Display, resize and click cases have been adapted by removing the condition for checking display status of mirror.	2014-05-13 00:37:36 +02:00
Andrzej Kapolka	e0486b2654	Starting on PrioVR integration.	2014-05-12 15:25:25 -07:00
Stojce Slavkovski	ac8d27ee3a	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-11 09:53:22 +02:00
Philip Rosedale	6a5affba3d	Merge pull request #2826 from ey6es/master Fix for scripts' not correctly removing/reattaching on restart, don't render head attachments in first person mode.	2014-05-09 15:32:50 -07:00
Philip Rosedale	e1717b1c53	Fix bug with mirror settings not initialized	2014-05-09 15:02:47 -07:00
Andrzej Kapolka	b9fecb8b92	Wait for scripts to finish before restarting them.	2014-05-09 14:34:13 -07:00
Stojce Slavkovski	863a8887d3	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-08 20:29:26 +02:00
Stojce Slavkovski	a1c31522ba	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-08 20:09:36 +02:00
Philip Rosedale	2797d0ab3b	removed hand trying to follow mouse and other cruft	2014-05-08 00:09:07 -07:00
Philip Rosedale	538e785208	Merge pull request #2815 from ZappoMan/modelserver More Model Improvements & some other tweaks	2014-05-07 20:59:04 -07:00
Philip Rosedale	e6a8c79f9f	Added more arrow controls to move camera when in mirror mode, new guitar chords.	2014-05-07 16:51:22 -07:00
ZappoMan	37ca6efc7c	correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn't	2014-05-07 11:48:32 -07:00
Philip Rosedale	fc962749c0	Arrow keys adjust distance from camera in mirror mode, air guitar script	2014-05-06 22:41:08 -07:00
Stojce Slavkovski	490ec23d8c	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-07 07:38:48 +02:00
Stojce Slavkovski	8ee282e7d2	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-06 22:01:48 +02:00
Andrzej Kapolka	9421af9f10	Fix for attachments' not appearing in rear view mirror head mode.	2014-05-06 11:14:48 -07:00
Andrzej Kapolka	2a32700a30	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-05 17:03:31 -07:00
Stojce Slavkovski	7f96f81c24	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-05 00:55:37 +02:00
Andrzej Kapolka	e0400dbd9c	Working on allowing attachment models to be uploaded.	2014-05-04 15:23:31 -07:00
Andrzej Kapolka	2bc605e193	Merge pull request #2779 from PhilipRosedale/master Remove dead ‘play slaps’ code	2014-05-04 13:33:03 -07:00
Stojce Slavkovski	d93480458f	Posting Image to forum	2014-05-04 18:30:58 +02:00
Stojce Slavkovski	cec3ce78b9	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-03 21:12:39 +02:00
Philip Rosedale	ab0e854336	Removed session UUID from interface title bar	2014-05-03 11:33:39 -07:00
Stojce Slavkovski	b2c1afe1bd	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-03 09:52:19 +02:00
Andrzej Kapolka	93cb5fc330	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-02 17:21:51 -07:00
Philip Rosedale	9aac74035c	Merge pull request #2771 from birarda/oauth-ds restrict access to domains using user roles retreived from data-web	2014-05-02 17:09:52 -07:00
Andrzej Kapolka	6f3b3acc86	Remove pushback entirely for other avatars.	2014-05-02 16:27:39 -07:00
Stephen Birarda	53eddab43c	fix typo for OAuth header include	2014-05-02 15:52:50 -07:00
Andrzej Kapolka	f3948d5e62	If "collide with avatars" is off, don't attempt camera pushback.	2014-05-02 15:02:40 -07:00
Stephen Birarda	aa2931d9bb	resolve conflicts on merge with upstream/master	2014-05-02 10:39:17 -07:00
Stephen Birarda	4936fb3857	expose access token from AccountManager	2014-05-02 10:34:29 -07:00
Stojce Slavkovski	852756e84d	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-02 19:03:11 +02:00
AndrewMeadows	ac549977be	Merge pull request #2770 from ZappoMan/modelserver Fix a couple bugs in Models	2014-05-02 10:01:44 -07:00
ZappoMan	b8eb441468	removed debugging	2014-05-02 09:31:28 -07:00
ZappoMan	715e6b8e60	debugging model editing	2014-05-02 09:10:30 -07:00
Philip Rosedale	69f0611a06	Correction to actually pick closest	2014-05-02 09:05:09 -07:00
Philip Rosedale	03b59055fd	merge conflict fix	2014-05-02 07:10:43 -07:00
Philip Rosedale	4089d54389	Avatar makes eye contact with the person nearest to gaze direction	2014-05-02 00:21:14 -07:00
AndrewMeadows	05e5277084	Merge pull request #2764 from ZappoMan/modelserver Model Server, Renderer, Scripting, etc	2014-05-01 15:39:12 -07:00
Stephen Birarda	d942054015	cleanup re-display of OAuthWebView	2014-05-01 12:44:42 -07:00
Thijs Wenker	df6df759a3	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-05-01 21:08:20 +02:00
Thijs Wenker	9667748156	- Style fixes - ScriptHightlighting qouting RegEx fix ( "hello" + " " + "world" // the text between two quote entities isn't red anymore )	2014-05-01 21:07:46 +02:00
Stephen Birarda	7d3157b1a0	trust high fidelity root CA cert for OAuth redirect	2014-05-01 11:54:51 -07:00
AndrewMeadows	2ad31793e2	Merge pull request #2756 from PhilipRosedale/master Added back ability to see/debug head/gaze position with ‘Head Mouse'	2014-05-01 11:51:58 -07:00
Stephen Birarda	56c24ce8b7	present QWebView for OAuth authorization in interface	2014-05-01 11:09:35 -07:00
Thijs Wenker	a33c18c15d	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-05-01 14:49:50 +02:00
Philip Rosedale	223d9cf32e	Added back ability to see/debug head and eye gaze position with ‘Head Mouse’	2014-04-30 21:29:50 -07:00
Ryan Huffman	9e684a0bc8	Add registerGetterSetter to remove need for getEngine()	2014-04-30 11:17:36 -07:00
ZappoMan	0182a6d895	models working end to end	2014-04-30 11:12:49 -07:00
Thijs Wenker	7125b6ab8e	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 Conflicts: interface/src/Application.cpp	2014-04-30 20:08:11 +02:00
Ryan Huffman	65fd2a7724	Merge remote-tracking branch 'upstream/master' into 19612 Conflicts: interface/src/Menu.cpp	2014-04-30 09:57:17 -07:00
Ryan Huffman	0570849df5	Add Window and location to global script object	2014-04-30 09:38:57 -07:00
ZappoMan	58c852d210	Merge branch 'master' of https://github.com/worklist/hifi into modelserver	2014-04-30 09:29:06 -07:00
ZappoMan	aac42058ac	first cut at modelserver	2014-04-30 09:25:52 -07:00
Ryan Huffman	8ee90715bd	Revert changes to call to saveSettings in Application	2014-04-29 17:20:15 -07:00
Ryan Huffman	fa9e37daad	Remove unneeded qDebug()	2014-04-29 17:16:12 -07:00
Ryan Huffman	e0ec0f681f	Fix code not compliant with coding standards	2014-04-29 16:50:13 -07:00
Ryan Huffman	edcff0b67f	Merge remote-tracking branch 'upstream/master' into RunningScripts Conflicts: interface/src/Application.cpp interface/src/ui/FramelessDialog.cpp interface/src/ui/FramelessDialog.h	2014-04-29 16:28:36 -07:00
Thijs Wenker	14e9cb770c	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-04-29 23:30:15 +02:00
Thijs Wenker	fc2ed9f9fb	Use same load/save dialog behavior as in main application for ScriptEditor, this will keep track of the last directory that was used to load a script.	2014-04-29 22:03:51 +02:00
Clément Brisset	7c21fab50c	Merge pull request #2736 from SydoxX/master Fix CustomUrl	2014-04-29 12:07:44 -07:00
Konstantin	65706ae5f7	Re-add customUrl.startWith	2014-04-29 20:59:33 +02:00
Konstantin	14b91aa04b	Remove 0,0,0 entry	2014-04-29 20:49:40 +02:00
Andrew Meadows	c7dbc5984f	add local gravity option parameter for MyAvatar	2014-04-28 16:40:22 -07:00
Konstantin	f829a5b323	Fix CustomUrl Fixed custom url so that hifi://domain/ works. Also goes earlier to the location.	2014-04-27 00:29:38 +02:00
Andrew Meadows	b05a315b5a	merge upstream/master into andrew/inertia Conflicts: interface/src/avatar/MyAvatar.cpp	2014-04-25 14:52:44 -07:00
Ryan Huffman	225c022511	Update RunningScriptsWidget to use FramelessDialog	2014-04-25 10:10:50 -07:00
Ryan Huffman	84e7b1598c	Merge remote-tracking branch 'upstream/master' into RunningScripts	2014-04-25 08:45:54 -07:00
Andrew Meadows	0b5c1b0a9a	add MyAvatar::_motionBehaviors (for obeyGravity) Also reconcile Menu checkable set vs script-set collision groups.	2014-04-24 15:43:03 -07:00
Leonardo Murillo	a21991c5c2	Fixing xml parsing	2014-04-24 16:22:34 -06:00
Leonardo Murillo	f4c98a8fa4	Fixing xml parsing	2014-04-24 16:21:49 -06:00
Leonardo Murillo	27002a9406	Casting to QUrl	2014-04-24 15:10:37 -06:00
Leonardo Murillo	ad0f0118bc	fixes for new versioning:	2014-04-24 15:01:37 -06:00
Stojce Slavkovski	fc6d1b6575	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-04-24 22:48:57 +02:00
Mohammed Nafees	29d64373b4	Merge branch master	2014-04-24 18:52:59 +05:30
Mohammed Nafees	dd74ea64e7	Further changes for child like behaviour	2014-04-24 17:18:24 +05:30
Atlante45	f68d2d16a8	Inserted a char by mistake	2014-04-23 11:05:16 -07:00
Atlante45	ceb5208102	CR	2014-04-23 11:00:44 -07:00
Atlante45	ae566c55f6	Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday	2014-04-23 10:38:29 -07:00
Stojce Slavkovski	e9962241be	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-04-23 18:12:49 +02:00
Philip Rosedale	ee929f2551	Merge pull request #2712 from matsukaze/master Job #19574. Add new audio oscilloscope.	2014-04-22 20:22:57 -07:00
AndrewMeadows	94fabf7875	Merge pull request #2709 from ZappoMan/shared_and_weak_pointers Voxel/Particle Server Performance Improvements	2014-04-22 10:28:39 -07:00
Atlante45	ddf14b0842	Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday	2014-04-22 10:22:30 -07:00
Thijs Wenker	59cc930556	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-04-22 13:12:38 +02:00
matsukaze	6e575bc8af	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-22 06:54:53 -04:00
matsukaze	ff7a1bd60f	Job #19574 . Add audio oscilloscope.'	2014-04-22 06:53:59 -04:00
Atlante45	fd20686f0f	Removed Systime.h includes	2014-04-21 17:23:06 -07:00
Atlante45	681aab5bf0	Remove printf and replace them by qDebug()	2014-04-21 16:17:45 -07:00
Atlante45	0479aaba46	Some gettimeofday removal fixes	2014-04-21 15:26:43 -07:00
Atlante45	f7f30e118c	More gettimeofday cleanup	2014-04-21 15:17:11 -07:00
Thijs Wenker	9faee0d82d	- Style - Script Editor can run script file once at time, but you can still start multiple scripts through the original ways.	2014-04-21 21:37:49 +02:00
ZappoMan	25a859f95e	Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers	2014-04-21 10:12:34 -07:00
Stojce Slavkovski	5223673087	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-04-21 11:22:29 +02:00
Thijs Wenker	23068b0356	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-04-21 05:26:42 +02:00
Thijs Wenker	c016d6557e	- few Adjustments in Application class for Script editor - Shortkey for script editor (Alt+S) - highlighter: bold true/false , single line comments - Run scripts from the editor works - More icons from Maximillian, Thanks - Run on the fly checkbox, works if the script is running. - Load/save features	2014-04-21 05:25:28 +02:00
Brad Hefta-Gaub	b9dd276e32	Merge pull request #2700 from SydoxX/PageUp/Down Add PageUp/Down to controls	2014-04-20 20:20:14 -07:00
Stojce Slavkovski	550cf6b8ea	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-04-19 18:05:01 +02:00
Konstantin	615f8b8dad	Fix spacing	2014-04-19 16:35:48 +02:00
Konstantin	6c376d6fa6	Add PageUp/Down to controls When you press PageUp/Down now you fly up and down.	2014-04-19 15:02:57 +02:00
Atlante45	8a7a590602	Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool Conflicts: interface/src/ui/Stats.cpp	2014-04-18 16:07:08 -07:00
Atlante45	aa73527157	Some code cleaning	2014-04-18 15:58:56 -07:00
Brad Hefta-Gaub	16cd2ca5c3	Merge pull request #2680 from SydoxX/master URL scheme to go to location	2014-04-18 15:34:12 -07:00
ZappoMan	334f688e4e	add support for sending unverified datagrams to nodes	2014-04-18 15:30:45 -07:00
Konstantin	d489e9dcd4	Fix format	2014-04-18 23:55:45 +02:00
AndrewMeadows	aaac7ac82c	Merge pull request #2688 from ey6es/master Added head translation for Faceplus.	2014-04-18 13:45:00 -07:00
AndrewMeadows	a10aaa537e	Merge pull request #2692 from ZappoMan/moonshot added wet/dry mix, and alternate distance attenuation features	2014-04-18 10:34:55 -07:00
ZappoMan	fa787adce2	added wet/dry mix, and alternate distance attenuation features	2014-04-18 08:55:32 -07:00
Konstantin	6d1f4ed942	Fix format	2014-04-18 01:13:06 +02:00
Andrzej Kapolka	3af02a3327	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-17 16:07:48 -07:00
Andrzej Kapolka	0a2670ea23	Detabbed.	2014-04-17 13:42:29 -07:00
Andrzej Kapolka	a12b90c65b	Add head translation to Faceplus. Closes #2684 .	2014-04-17 13:34:37 -07:00
Stojce Slavkovski	27c2255adf	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-04-17 20:52:30 +02:00
Andrzej Kapolka	21fa833f19	Merge branch 'master' of https://github.com/highfidelity/hifi into animate Conflicts: interface/src/Application.cpp libraries/shared/src/SharedUtil.cpp libraries/shared/src/SharedUtil.h	2014-04-17 10:58:34 -07:00
Andrew Meadows	db717b980b	merge upstream/master into andrew/inertia Conflicts: interface/src/Application.cpp	2014-04-17 08:40:25 -07:00
Konstantin	8120700787	Added urlGoTo	2014-04-17 00:03:11 +02:00
Andrew Meadows	83dc8717aa	bumpSettings on load/stop script	2014-04-16 14:46:49 -07:00
Andrew Meadows	9ab1b76484	use new Qt connect syntax for compile-time checks	2014-04-16 13:28:54 -07:00
Andrew Meadows	6b23da40d6	use correct name for signal connect	2014-04-16 12:18:40 -07:00
ZappoMan	bdf39186de	Merge branch 'master' of https://github.com/worklist/hifi into moonshot	2014-04-15 21:04:15 -07:00
Andrzej Kapolka	8cbad1bf54	More work on animation loading.	2014-04-15 19:37:28 -07:00
Stephen Birarda	5904d19603	Merge pull request #2637 from birarda/authentication add optional DTLS option for domain-server to node communication	2014-04-14 10:24:17 -07:00
ZappoMan	7a993939bf	Merge branch 'master' of https://github.com/worklist/hifi into moonshot Conflicts: interface/interface_en.ts interface/src/Application.cpp interface/src/Application.h interface/src/Menu.h libraries/shared/src/SharedUtil.h	2014-04-14 09:43:29 -07:00
ZappoMan	ddd2b0843c	more work on new diffusion model	2014-04-13 20:43:40 -07:00
Stojce Slavkovski	4d0ed5796e	Merge branch 'master' of https://github.com/worklist/hifi into 19507 Conflicts: interface/interface_en.ts	2014-04-12 08:45:23 +02:00
Leonardo Murillo	f84249ac6c	switching to https	2014-04-11 19:58:49 -06:00
Andrew Meadows	5ac7be8945	merge upstream/master -> andrew/inertia	2014-04-11 12:20:00 -07:00
Andrzej Kapolka	d6534d6026	Tweak to zoom on pushback.	2014-04-11 11:10:22 -07:00
Andrzej Kapolka	b7725f094d	Trying the narrowing effect with pushback for other avatars.	2014-04-11 10:19:16 -07:00
Andrzej Kapolka	00e2ff93e3	Playing around with zooming in while pulling back.	2014-04-11 10:08:44 -07:00
Andrzej Kapolka	d712588b36	Better rolloff.	2014-04-10 17:35:47 -07:00
Andrew Meadows	a436b59971	save settings for change in: identity, position	2014-04-10 17:14:51 -07:00
Andrzej Kapolka	197adce4de	Fall intersection off with angle to other avatar.	2014-04-10 17:14:49 -07:00
Andrzej Kapolka	475528f112	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-10 15:00:32 -07:00
Andrzej Kapolka	6cf971c849	More intersection-avoidance tweaks.	2014-04-10 14:51:43 -07:00
Andrzej Kapolka	873541dd7b	Trying out basic pushback for other avatars.	2014-04-10 11:56:17 -07:00
Atlante45	2cc2149647	Glow when you talk, flash when you clip closes #2592	2014-04-10 11:55:30 -07:00
Andrzej Kapolka	f61c746b4a	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-10 09:45:23 -07:00
Philip Rosedale	e08dfeae2a	Merge pull request #2642 from Atlante45/persistant_script_location Persistant script location	2014-04-09 22:16:20 -07:00
Philip Rosedale	de6b55644b	Merge pull request #2636 from ey6es/faceplus Basic Faceplus integration, cleanup for handling the various face trackers.	2014-04-09 22:13:34 -07:00
Andrzej Kapolka	9f58264cb6	Working on plane collisions, pushing back camera from intersecting avatars.	2014-04-09 18:07:56 -07:00
Atlante45	fad71266a1	Merge branch 'master' of https://github.com/highfidelity/hifi into persistant_script_location	2014-04-09 17:35:12 -07:00
Atlante45	2b44b03a27	Added temp fix to ModelUploader dialog too	2014-04-09 17:34:17 -07:00
Stephen Birarda	cf47418d58	remove the audio scope	2014-04-09 17:16:29 -07:00
Atlante45	e33da2a741	Some QSettings cleanup + persistant script location	2014-04-09 17:08:50 -07:00
Stephen Birarda	1c861fbecb	resolve conflicts on merge with upstream master	2014-04-09 15:36:15 -07:00
Andrzej Kapolka	f707719f4e	Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus	2014-04-09 15:34:29 -07:00
Andrzej Kapolka	ef8eb00778	Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus	2014-04-09 15:23:11 -07:00
Andrzej Kapolka	ead05c4d99	Tab fixes.	2014-04-09 15:22:53 -07:00
Stephen Birarda	c208af2246	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-09 15:10:48 -07:00
Andrzej Kapolka	28d3eae12b	Move Faceplus reading to its own thread to avoid blocking the main one.	2014-04-09 14:52:27 -07:00
Stephen Birarda	d4f2c9e631	Merge branch 'master' of https://github.com/highfidelity/hifi into authentication	2014-04-09 14:40:14 -07:00
Stephen Birarda	973fb95c9d	Merge pull request #2630 from AndrewMeadows/scripting Expose MyAvatar.sessionUUID to JS	2014-04-09 13:07:37 -07:00
Andrzej Kapolka	79455d5850	More Faceplus work. Starting to get results.	2014-04-09 13:07:02 -07:00
Andrew Meadows	4b306401af	use slot to change AvatarData::_sessionUUID	2014-04-09 11:32:52 -07:00
stojce	8d45a53af9	Merge branch 'master' of https://github.com/worklist/hifi into 19507 Conflicts: interface/interface_en.ts	2014-04-09 19:53:48 +02:00
stojce	7b26317eaf	Merge branch 'master' of https://github.com/worklist/hifi into 19548	2014-04-09 18:55:17 +02:00
stojce	ce85e67a42	Modify icons in Interface "mirror"	2014-04-09 18:54:59 +02:00
Stephen Birarda	684c6b5372	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
Stephen Birarda	974d8c0427	prepare header files for regex run against cpp	2014-04-09 09:35:05 -07:00
Andrew Meadows	229d6cefa2	merge upstream/master into andrew/scripting	2014-04-09 08:17:33 -07:00
Andrew Meadows	b8232b5dfd	AvatarData now stores sessionUUID	2014-04-09 08:11:15 -07:00
Andrzej Kapolka	5b0e7f818d	More work on Faceplus integration/cleaning up support for multiple face trackers.	2014-04-08 18:03:49 -07:00
Andrzej Kapolka	597d750af9	Better radius.	2014-04-08 15:25:10 -07:00
Andrzej Kapolka	083e9076a9	Missed a spot.	2014-04-08 15:17:05 -07:00
Andrzej Kapolka	faf8c35358	Head height's kind of screwy; let's use the eye position.	2014-04-08 15:01:56 -07:00
Andrzej Kapolka	add7bb26ed	Use the head height to determine the pushback amount.	2014-04-08 14:55:46 -07:00
Andrzej Kapolka	5776514e6a	Working on pushing the mirror camera back to prevent intersecting the near clip plane. Closes #2617.	2014-04-08 14:48:01 -07:00
Stephen Birarda	6681754994	Merge branch 'master' of https://github.com/highfidelity/hifi into authentication	2014-04-08 14:26:10 -07:00
Brad Hefta-Gaub	8e097be28d	Merge pull request #2614 from Atlante45/undo_redo_system Undo redo system	2014-04-08 08:30:29 -10:00
Brad Hefta-Gaub	c865df8b82	Merge pull request #2613 from Atlante45/more_upload_work More upload work	2014-04-08 08:16:07 -10:00
Mohammed Nafees	ba7c696786	child like behaviour for the widget	2014-04-08 23:38:49 +05:30
Atlante45	eaca699a6d	Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_work	2014-04-08 10:35:23 -07:00
Stephen Birarda	080b0d7221	Merge branch 'master' of https://github.com/highfidelity/hifi into authentication	2014-04-08 10:28:14 -07:00
Atlante45	174f37f531	Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system	2014-04-08 10:20:58 -07:00
Andrzej Kapolka	a157c67901	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-04-08 09:56:07 -07:00
Atlante45	d213cd7840	More work on Undo/Redo	2014-04-07 17:10:15 -07:00
Atlante45	b21fe02fa2	Put ModelUploder on a different thread, not to block the rendering of the main window	2014-04-07 13:46:38 -07:00
Andrew Meadows	84d7e39d72	merge upstream/master into avatar-interaction	2014-04-07 10:05:25 -07:00
Andrew Meadows	d902580d6f	Add Collision metatype to JS script system	2014-04-07 10:03:10 -07:00
Stephen Birarda	69504b0a9d	proper cleanup of CA credentials on DTLSClientSession side	2014-04-07 09:47:51 -07:00
Stephen Birarda	efcf506383	resolve conflicts on merge with upstream master	2014-04-07 09:32:08 -07:00
ZappoMan	dfd6411a4f	add hooks for local audio echo, first cut at diffusion	2014-04-06 10:11:11 -07:00
ZappoMan	593fc6c963	lots of knobs and dials	2014-04-04 17:29:39 -07:00
Andrzej Kapolka	1c822542c1	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-04-04 15:29:13 -07:00
Andrew Meadows	01c42c741c	fix #2567 thrust + oculus doesn't change body rot	2014-04-04 14:46:54 -07:00
Andrzej Kapolka	550a8fdb99	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-04-04 13:00:51 -07:00
ZappoMan	c35d6bdb0c	add reflection stats to stats display, add pre-delay, add toggle for separate ears, add surface randomness	2014-04-04 11:25:43 -07:00
Stephen Birarda	fd8e32190e	perform cleanup of GnuTLS structures across targets	2014-04-04 11:08:53 -07:00
Stephen Birarda	85933545cd	add GnuTLS init to Application	2014-04-04 10:59:58 -07:00
Stephen Birarda	e2224e0f0c	cleanup node silence timing and use for DTLS timeouts	2014-04-04 10:56:04 -07:00
Andrew Meadows	5e2b8bb2c3	connect SIGNAL to SIGNAL to avoid forwarding slot	2014-04-04 10:43:06 -07:00
Mohammed Nafees	eae95a57b7	UI alignment changes	2014-04-04 23:12:56 +05:30
Andrzej Kapolka	38022d2440	Fix for voxelizing models.	2014-04-04 00:33:33 -07:00
Atlante45	ba4ccc22ef	Changed FstReader name to ModelUploader	2014-04-03 16:19:33 -07:00
Lucas Crisman	793179dc72	Merge branch 'master' of git://github.com/worklist/hifi into 19498 Conflicts: interface/src/Application.cpp	2014-04-03 16:24:32 -03:00
Mohammed Nafees	f3121e1bf6	Removed the animation, placed UI elements according to mockup	2014-04-03 22:33:45 +05:30
ZappoMan	3808cfa83d	latest work	2014-04-03 08:55:48 -07:00
Mohammed Nafees	2ef8277d0f	Make the widget move and resize along with the main window	2014-04-03 18:04:26 +05:30
ZappoMan	42efb0db65	glue in processSpatialAudio()	2014-04-02 18:18:17 -07:00
Atlante45	4a1687c023	Merge branch 'master' of https://github.com/highfidelity/hifi into HEAD Conflicts: interface/interface_en.ts interface/src/Application.cpp	2014-04-02 18:16:30 -07:00
Atlante45	5acc8313ba	Manual merge	2014-04-02 18:07:55 -07:00
ZappoMan	ec9884833b	first cut at reflections	2014-04-02 17:45:34 -07:00
Andrew Meadows	aad945c180	merge upstream/master into "improved URL scheme" Conflicts: interface/interface_en.ts	2014-04-02 17:45:01 -07:00
Lucas Crisman	76921d9b52	Merge branch 'master' of git://github.com/worklist/hifi into 19498	2014-04-02 17:18:27 -03:00
Mohammed Nafees	5e8bd8d050	Resolve conflicts	2014-04-02 13:00:48 +05:30
Mohammed Nafees	d85d4fea5d	Added the new Running Scripts widget	2014-04-02 12:46:57 +05:30
Lucas Crisman	1a468ab8ca	Merge branch 'master' of git://github.com/worklist/hifi into 19498 Conflicts: interface/src/Application.cpp	2014-04-02 01:26:25 -03:00
Philip Rosedale	ca863e77f4	Merge branch 'master' of https://github.com/worklist/hifi Conflicts: interface/interface_en.ts	2014-04-01 21:14:51 -07:00
Philip Rosedale	0b792985d3	Tweaks to VU meter, tone injector, and fix to noise gate	2014-04-01 16:43:18 -07:00
Philip Rosedale	36c41a1fd3	test other way of doing loudness	2014-04-01 15:35:46 -07:00
Stephen Birarda	62041d91a8	rename NodeList DomainInfo to DomainHandler	2014-04-01 13:09:35 -07:00
Andrzej Kapolka	fb37ef5bca	Fix for annoying intermittent seg fault on Linux exit. Closes #2542 .	2014-04-01 11:25:39 -07:00
AndrewMeadows	f12da05722	Merge pull request #2581 from Atlante45/more_upload_fixes More upload fixes	2014-04-01 09:51:25 -07:00
James Brotchie	19b8f101d8	Improved hifi:// style URL scheme handling. First steps towards implementing #1463. - Moved url parsing code from Application::event to Menu::goTo(QString). - Handle destination component of URL as either a @username, #place, or x-xx,y-yy,z-zz style coordinate. - Added support for entering hifi:// style URL into @ invoked goto menu option.	2014-04-01 11:31:43 +10:00
Philip Rosedale	81d1eb7ed2	removed unused procedural movement code	2014-03-31 18:24:58 -07:00
Atlante45	77f5a50738	Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes	2014-03-31 17:19:45 -07:00
Philip Rosedale	3babb5e0bf	Merge branch 'master' of https://github.com/worklist/hifi	2014-03-31 07:25:46 -07:00
James Brotchie	6880160bc0	Remember most recently opened script location. Previously when running a script from a file you were always taken back to your desktop directory. Now you will be taken to the location of your most recently opened script.	2014-03-31 22:08:38 +10:00
Philip Rosedale	27f0214032	first pass audio VU scope	2014-03-28 23:09:51 -07:00
Philip Rosedale	78ee8706d6	Merge branch 'master' of https://github.com/worklist/hifi	2014-03-28 16:48:15 -07:00
Andrzej Kapolka	361276d133	Use a spherical estimate of the shadowed region to avoid growing and shrinking it as we turn around. Also, might as well render shadows for the billboards.	2014-03-27 16:19:21 -07:00
Philip Rosedale	c8cacf75f3	Merge branch 'master' of https://github.com/worklist/hifi	2014-03-27 15:16:11 -07:00
Philip Rosedale	41e9017953	more audio level meter work, improved gun	2014-03-27 15:14:38 -07:00
Andrzej Kapolka	077df3906f	Make sure we reset our LOD adjustments before we switch back from throttling the renderer.	2014-03-27 15:02:26 -07:00
Atlante45	11f40258b3	Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_fixes	2014-03-27 10:12:34 -07:00
stojce	d3dff7a121	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-03-27 17:57:03 +01:00
stojce	d90e15ad58	Don't show share dialog for anonymous users	2014-03-27 17:56:42 +01:00
Philip Rosedale	101de1e0e5	Merge branch 'master' of https://github.com/worklist/hifi	2014-03-26 23:24:44 -07:00
Andrzej Kapolka	52c8a865f1	Provide a means of tracking resource download progress. Until we have a user-friendly progress meter/throbber, put the download progress in the extended stats.	2014-03-26 15:53:19 -07:00
Atlante45	718b8f7eb9	Changed back to upload either head or skeleton	2014-03-26 15:07:19 -07:00
stojce	04c149eabd	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-03-26 18:26:39 +01:00
Philip Rosedale	d90244c01e	first pass, clipping audio meter	2014-03-25 22:31:44 -07:00
Lucas Crisman	8ed30d9da2	Merge branch 'master' of git://github.com/worklist/hifi into 19498 Conflicts: interface/src/Application.cpp	2014-03-25 14:43:40 -03:00
stojce	5e350df128	Merge branch 'master' of https://github.com/worklist/hifi into 19507 Conflicts: interface/interface_en.ts	2014-03-25 17:47:05 +01:00
ZappoMan	f10d5e23f8	set firstRun so it only happens once	2014-03-25 00:57:29 -07:00
ZappoMan	571ecf0964	add first cut at firstrun support	2014-03-25 00:45:31 -07:00
ZappoMan	c34b64e296	add load script from URL support	2014-03-25 00:17:19 -07:00
Andrzej Kapolka	7bc0c8eff0	Missed a spot.	2014-03-24 15:07:57 -07:00
Andrzej Kapolka	f1fd8175d2	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-03-24 14:53:00 -07:00
Andrzej Kapolka	210af25396	When rendering avatar shadows, check bounds against shadow frustum. Closes	2014-03-24 14:52:02 -07:00
Andrzej Kapolka	62884f1f4f	Don't use textures/fancy shaders when rendering shadow map. Closes #2270 .	2014-03-24 13:15:03 -07:00
Lucas Crisman	e545c2ac65	Stats tweaks: fonts adjustments	2014-03-24 14:57:40 -03:00
ZappoMan	82d620b1d9	add support for AudioDevice scripting interface, and switching audio input/output device on the fly	2014-03-23 11:26:27 -07:00
stojce	e2eb34b6c9	Layout setup image ratio fixed image centre position	2014-03-23 07:03:20 +01:00
ZappoMan	938959a9f6	expose application settings to JS	2014-03-22 21:20:35 -07:00
ZappoMan	a56b7e341d	reorganize files in interface directory	2014-03-22 20:22:05 -07:00
ZappoMan	c70bbda10a	kill local voxels on domain change	2014-03-21 18:16:28 -07:00
Lucas Crisman	5fe59acb87	Stats variable width for panels	2014-03-21 14:10:00 -03:00
Atlante45	746d109025	Merge branch 'master' of https://github.com/highfidelity/hifi into inspect_js	2014-03-20 16:10:33 -07:00
Atlante45	39a6e03476	Modified MyAvatar to support more JS	2014-03-20 12:09:33 -07:00
Andrzej Kapolka	20ae5c15f7	Added a "flat" mode for environments that makes them follow you around on the X/Z axes. The default environment is flat. Closes #2378.	2014-03-20 12:09:20 -07:00
Andrzej Kapolka	f92f45df63	Keep track of keys pressed, synthesize release events when focus is lost. Closes #2375.	2014-03-20 11:17:36 -07:00
Brad Hefta-Gaub	2a03cf1bab	make throttle rendering not adjust LOD	2014-03-14 17:17:38 -07:00
Andrzej Kapolka	b721533f0b	Make chat a dock widget, since that's the behavior it's emulating anyway (and for some reason, the current strategy causes a problem on at least Ryan's and my machine).	2014-03-14 10:43:12 -07:00
Andrzej Kapolka	95e59d7004	Merge branch 'master' of https://github.com/highfidelity/hifi Conflicts: interface/interface_en.ts interface/src/Menu.h	2014-03-13 16:56:06 -07:00
Andrzej Kapolka	5f6f4b3d37	Fixes required since enabling Faceshift is now the default.	2014-03-13 16:45:27 -07:00
Andrzej Kapolka	9d1278b663	Wait until we know that Faceshift didn't connect before we attempt to initialize Visage.	2014-03-13 16:18:47 -07:00
Dimitar Dobrev	85a15a2284	Moved the chat from a window to a built-in panel.	2014-03-14 01:12:25 +02:00
Atlante45	423f26f669	Review comments	2014-03-13 15:26:02 -07:00
Atlante45	0748682119	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader	2014-03-13 15:04:49 -07:00
Andrzej Kapolka	b2a29cb84f	Fixes for Linux build.	2014-03-13 10:56:19 -07:00
Atlante45	51585acd25	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader	2014-03-13 10:53:24 -07:00
Atlante45	424afaa36b	Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels Conflicts: interface/interface_en.ts	2014-03-12 15:59:17 -07:00
AndrewMeadows	bed8617846	Merge pull request #2277 from ZappoMan/server_scale_testing Voxel/Particle Server Scaling Work	2014-03-12 15:24:29 -07:00
Atlante45	a2acdc01ab	Merge branch 'master' of https://github.com/highfidelity/hifi into editVoxels Conflicts: interface/interface_en.ts	2014-03-12 12:21:56 -07:00
Atlante45	9402a5852c	Fixed review comments	2014-03-12 12:20:43 -07:00
Andrzej Kapolka	e249b29b45	Merge pull request #2268 from AndrewMeadows/radians prefer radians over degrees	2014-03-12 12:10:29 -07:00
Atlante45	5cb9ea8402	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar_uploader	2014-03-12 11:49:20 -07:00
Atlante45	b9ee60ba41	FstReader not a member anymore	2014-03-12 11:47:47 -07:00
AndrewMeadows	1f80a5a074	Merge pull request #2269 from ey6es/master Fix for white flashes when loading avatars, performance improvements.	2014-03-12 11:43:13 -07:00
ZappoMan	4b60c549e7	add LOD to overlay display	2014-03-12 11:10:52 -07:00
Dimitar Dobrev	4c26f025ac	Enabled 'Enter' to open the chat. Deleted the now obsolete ChatEntry.	2014-03-12 20:04:22 +02:00
ZappoMan	a95fd55172	suppress sending of extra queries when the client's view hasn't changed	2014-03-12 01:11:21 -07:00
ZappoMan	4d0b762de3	some hacking on full scene debuggin	2014-03-11 20:33:53 -07:00
Andrew Meadows	793a760272	merge upstream master into "radians" project	2014-03-11 17:28:36 -07:00
Andrew Meadows	aa8c2fc8cb	use radians instead of degrees (almost) everywhere	2014-03-11 17:26:58 -07:00
Andrzej Kapolka	bf9929e64d	Since the bucky balls are showing up in the hot spots list when profiling, don't simulate them if they're disabled.	2014-03-11 17:16:49 -07:00
Clement	dcaef45f2e	More work on editVoxel.js	2014-03-11 16:01:21 -07:00
Stephen Birarda	d1623e6e4d	fixes for warnings produced by Xcode 5.1	2014-03-11 11:45:13 -07:00
ZappoMan	7fb872c1d7	remove dead VoxelSceneStats class and clean up Voxel Stats to be OctreeStats	2014-03-08 23:53:44 -08:00
Atlante45	8faaa28bc1	FST ploader base	2014-03-07 11:55:02 -08:00
Andrzej Kapolka	44374732fa	Further joint bits.	2014-03-06 19:30:24 -08:00
Stephen Birarda	8cbdf5d94a	Merge branch 'master' of https://github.com/highfidelity/hifi into resources	2014-03-06 15:49:45 -08:00
Stephen Birarda	ac66f09157	Merge pull request #2194 from AndrewMeadows/cleanup g++ warnings	2014-03-06 15:49:22 -08:00
Stephen Birarda	87d908a3bc	resolve conflicts on merge with upstream master	2014-03-06 15:03:03 -08:00
Stephen Birarda	2d10995d01	Merge pull request #2219 from ZappoMan/cruft_removal Fix Crash and Cruft Removal	2014-03-06 15:01:31 -08:00
Stephen Birarda	27d486c0a1	resolve conflicts on merge with upstream master	2014-03-06 14:47:58 -08:00
Stephen Birarda	b705ec560f	cleanup resources directory references by copying beside the executable	2014-03-06 11:46:49 -08:00
Stephen Birarda	403f91c988	update resource references to use Qt resource system	2014-03-06 10:41:11 -08:00
Stephen Birarda	90d4bbee78	Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm	2014-03-06 09:16:22 -08:00
ZappoMan	7a8d26247a	remove piemenu	2014-03-05 21:03:32 -08:00
Andrzej Kapolka	82011905be	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-03-05 18:10:55 -08:00
ZappoMan	a54e401377	Merge branch 'master' of https://github.com/worklist/hifi into particle_collions_penetration Conflicts: libraries/script-engine/src/Vec3.cpp	2014-03-05 18:04:57 -08:00
Andrzej Kapolka	3930b3e824	Display names are great, but not in the shadow map. Closes #2208 .	2014-03-05 17:44:08 -08:00
Stephen Birarda	ede32b5f1a	resolve conflicts on merge with upstream master	2014-03-05 15:31:00 -08:00
ZappoMan	d89cb2bf5e	added penetration support to particle collisions JS callbacks	2014-03-05 15:03:54 -08:00
Stephen Birarda	395263ff3d	add time to the interface logs - closes #2205	2014-03-05 09:55:06 -08:00
ZappoMan	c031359a54	fix infinite reloading of missing script files	2014-03-04 16:20:17 -08:00
Stephen Birarda	7451cfe130	remove glm so it is referenced only externally	2014-03-04 15:19:47 -08:00
Atlante45	f90062b38c	Merge branch 'master' of https://github.com/highfidelity/hifi into freeglut_fix	2014-03-04 13:18:22 -08:00
Atlante45	3c99cf162d	Fix was at the wrong spot	2014-03-04 13:17:19 -08:00
Andrew Meadows	16a5af1a8e	fix warning about signed/unsigned comparison	2014-03-04 11:53:08 -08:00
ZappoMan	d5e7e98b5e	Merge pull request #2192 from Atlante45/freeglut_fix fix for windows	2014-03-04 11:51:14 -08:00
Atlante45	9767846c91	fix for windows	2014-03-04 11:06:23 -08:00
Atlante45	84f8e6ee19	Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels	2014-03-03 17:55:30 -08:00
Atlante45	f1ce034c35	Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels	2014-03-03 16:47:42 -08:00
Atlante45	ef9ff0fa74	Put initialization and deletion of localVoxelSystems on render thread	2014-03-03 16:46:25 -08:00
Andrzej Kapolka	64c4e58160	Tie the avatar LOD distance multiplier to the LOD parameter calculated for voxels.	2014-03-03 16:34:28 -08:00
Andrzej Kapolka	85083d74bc	Fix for annoying "QThreadStorage" warning.	2014-03-03 13:39:01 -08:00
Stephen Birarda	60eb588e96	remove some unecessary null pointer checks	2014-03-03 11:36:01 -08:00
ZappoMan	9d5e33d75d	removed unused highlight voxel	2014-03-03 04:09:33 -08:00
ZappoMan	cb4219b775	remove HoverVoxel	2014-03-02 19:23:00 -08:00
ZappoMan	5f6a60e786	removed more VoxelSystem wrappers, call VoxelTree directly	2014-03-02 16:40:27 -08:00
ZappoMan	f0e73d2f98	removed VoxelSystem::findRayIntersection() use tree directly	2014-03-02 15:46:33 -08:00
ZappoMan	ded7328959	clean up application access to deleteVoxelAt()/createVoxel()/getVoxelAt() to access VoxelTree directly	2014-03-02 15:17:49 -08:00
ZappoMan	c5197b390e	removed a bunch of cruft from VoxelSystem	2014-03-02 12:13:00 -08:00
ZappoMan	7d45cc857b	fix warning	2014-03-01 12:53:01 -08:00
Atlante45	af691e1f75	Some comments and debug messages	2014-02-28 15:14:01 -08:00
Atlante45	fb10676121	Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels	2014-02-28 11:32:27 -08:00
Philip Rosedale	bae16e24e8	new audio buffer display text, cleanup drawText()	2014-02-27 23:17:39 -08:00
Philip Rosedale	5f8c5d36da	Merge branch 'master' of https://github.com/worklist/hifi	2014-02-27 20:29:35 -08:00
Andrzej Kapolka	73ec568b4b	Further work on request limiting.	2014-02-27 19:28:45 -08:00
Andrzej Kapolka	5d4ed4c85e	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-02-27 18:14:18 -08:00
Andrzej Kapolka	29f7954d20	Factored out bits common to resource caches, added global limit on number of resources being requested at any one time.	2014-02-27 18:13:40 -08:00
Philip Rosedale	7ce380a333	relocate mute button, audio scope	2014-02-27 18:02:53 -08:00
Atlante45	2ee7974fa8	Merge branch 'master' of https://github.com/highfidelity/hifi into local_voxels	2014-02-27 17:53:59 -08:00
Philip Rosedale	f06b30e024	remove audio barograph latency display	2014-02-27 17:45:47 -08:00
ZappoMan	1cc6288899	add back in entry point for import voxels	2014-02-27 15:41:36 -08:00
ZappoMan	b7f62eabf0	clean up more menu items	2014-02-27 15:25:39 -08:00
Atlante45	b07081407a	Made commom string name static const	2014-02-27 14:47:05 -08:00
Atlante45	0026002ecb	Added domain and clipboard to the local trees	2014-02-27 14:38:18 -08:00
ZappoMan	8d53fc9671	Merge branch 'master' of https://github.com/worklist/hifi into seeing_voxels	2014-02-27 01:05:20 -08:00
Stephen Birarda	7067cf2ab3	fix go to user and address update for new API	2014-02-26 13:40:49 -08:00
ZappoMan	1e404404c3	next pass at seeing voxels	2014-02-26 13:35:59 -08:00
Andrzej Kapolka	1265f83f68	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-02-26 12:12:18 -08:00
Andrzej Kapolka	8644280eb5	Make sure our mode is fully established before we use the mirror camera to render the billboard. Closes #2103.	2014-02-26 12:11:03 -08:00
ZappoMan	7a2419a5bd	removed old menu items for voxel protocol options	2014-02-26 01:54:32 -08:00
ZappoMan	5b1037cc63	switching to OctreeQuery instead of VoxelQuery	2014-02-26 01:22:53 -08:00
Philip Rosedale	46469612c7	Merge pull request #2108 from ZappoMan/remove_cpp_voxel_editing Remove cpp voxel editing	2014-02-25 22:07:54 -08:00
ZappoMan	5fdf114ff0	removed more cruft	2014-02-25 21:53:20 -08:00
ZappoMan	869b35a7aa	remove old c++ implementation of voxel tools	2014-02-25 21:38:10 -08:00
ZappoMan	d3594808d9	some cruft cleanup	2014-02-25 20:45:49 -08:00
ZappoMan	42ddc82ac4	possible fix to windows assert	2014-02-25 20:23:38 -08:00
Stephen Birarda	bf3b5c07d5	Merge pull request #2093 from ZappoMan/menu_js Adds support for editing application Menus to JS	2014-02-25 17:40:39 -08:00
Andrzej Kapolka	8554c1dfbf	Force a minimum convergence distance on the eyes. Closes #2100 .	2014-02-25 16:50:59 -08:00
ZappoMan	81bff60645	change singleton approach to not require delete	2014-02-25 14:53:57 -08:00
ZappoMan	e03c7be5ef	moved MenuScriptingInterface to own files	2014-02-25 14:33:37 -08:00
Stephen Birarda	ce3d6d2fca	reset nodelist if domain-server stops talking to you, closes #2092	2014-02-25 13:07:39 -08:00
ZappoMan	263d682fb9	Merge branch 'master' of https://github.com/worklist/hifi into menu_js	2014-02-25 12:20:15 -08:00
Stephen Birarda	b09ed1dff1	present a login window on app start	2014-02-25 10:53:13 -08:00
Philip Rosedale	e637e48598	Merge pull request #2076 from birarda/authentication groundwork for secure node communication via data-server	2014-02-25 10:07:55 -08:00
ZappoMan	03f8885cad	first cut at menus JS	2014-02-24 19:09:22 -08:00
Andrzej Kapolka	c71b10f639	Added toggles for rendering bucky balls, particles.	2014-02-24 17:43:47 -08:00
Philip Rosedale	fa3b109e1d	Merge branch 'master' of https://github.com/worklist/hifi	2014-02-24 16:43:39 -08:00
Stephen Birarda	f20808b47f	remove option to drive from transmitter	2014-02-24 15:11:02 -08:00
Stephen Birarda	4a4001a049	remove pairing logic from interface	2014-02-24 15:03:10 -08:00
Stephen Birarda	9771e1bb12	resolve conflicts on merge with upstream master	2014-02-24 12:06:10 -08:00
Andrzej Kapolka	e40fe85c36	Updating the camera mode every frame screws with the scripts, so revert to updating it when the menu changes.	2014-02-24 11:42:47 -08:00
Andrzej Kapolka	8efc4d52ba	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-02-24 11:34:12 -08:00
Andrzej Kapolka	d80b52dc9f	Fixes for camera mode transitions, seeing inside head.	2014-02-24 11:33:52 -08:00
Stephen Birarda	a8493ecaa2	cleanup login/logout in menu, logout only when in	2014-02-24 11:11:36 -08:00
ZappoMan	6ea2c81e68	fix reload of scripts	2014-02-24 10:10:00 -08:00
Philip Rosedale	246bb1fd2d	Physics test ‘buckyballs’ moved to application.cpp	2014-02-24 00:06:50 -08:00
Andrzej Kapolka	8745ca3139	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-02-23 20:13:23 -08:00
Andrzej Kapolka	e470b1c41d	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels Conflicts: assignment-client/src/metavoxels/MetavoxelServer.cpp interface/src/MetavoxelSystem.cpp	2014-02-21 18:26:40 -08:00
Stephen Birarda	6df317e8e6	update user's domain in data-server after connection to new one	2014-02-21 16:22:17 -08:00
Andrzej Kapolka	ac02609bc2	The basic billboard behavior, closes #1864 .	2014-02-21 15:38:49 -08:00
Stephen Birarda	340248ac43	resolve conflicts on merge with upstream master	2014-02-21 15:16:15 -08:00
Stephen Birarda	a49893689e	store username in local settings so it doesn't need to be reloaded	2014-02-21 15:05:57 -08:00
Stephen Birarda	76e6c9342f	parse username returned from data-server	2014-02-21 14:41:43 -08:00
Andrzej Kapolka	10ce2cb3f0	Working on sending the billboards over the network.	2014-02-21 11:49:29 -08:00
Andrzej Kapolka	495447fc0d	Merge branch 'master' of https://github.com/highfidelity/hifi into bilbo	2014-02-21 10:19:52 -08:00
Andrzej Kapolka	18ea1d6a85	More work on billboards.	2014-02-21 10:16:06 -08:00
Andrzej Kapolka	d8321bd419	Merge pull request #2034 from birarda/master fixes for scripted avatars	2014-02-21 10:14:41 -08:00
Andrzej Kapolka	6b90a3994d	Working on avatar billboards.	2014-02-20 19:22:59 -08:00
Andrzej Kapolka	09ad4046f8	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-02-20 17:20:07 -08:00
Stephen Birarda	2408d909ba	resolve conflicts on merge with upstream master	2014-02-20 12:12:29 -08:00
Andrzej Kapolka	4dab2eb694	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-02-20 10:45:19 -08:00
Stephen Birarda	7f9794d52b	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-02-20 10:14:47 -08:00
Stephen Birarda	6f84230d9d	resolve conflicts on merge with upstream/master	2014-02-20 10:14:36 -08:00
ZappoMan	0e8cab7349	added Clipboard.nudgeVoxel() and added support for calling clipboard opertations with VoxelDetail as well as xyzs	2014-02-19 20:09:35 -08:00
Stephen Birarda	ee9f8937e3	fix a silly typo	2014-02-19 18:03:34 -08:00
ZappoMan	3a8a880a8b	Merge branch 'master' of https://github.com/worklist/hifi into js_clipboard	2014-02-19 17:49:22 -08:00
Stephen Birarda	4ee416ba96	fixes for scripted avatars, closes #2033	2014-02-19 16:55:24 -08:00
Atlante45	b69bdccc8f	Merge branch 'master' of https://github.com/highfidelity/hifi into fix_import	2014-02-19 16:11:31 -08:00
Stephen Birarda	57538af8fd	give a separate QNetworkAccessManager to the AccountManager	2014-02-19 14:19:00 -08:00
Stephen Birarda	5f130872af	repair usage of INI file for QSettings	2014-02-19 14:09:18 -08:00
Jose Carlos	828508bbf1	merged from master	2014-02-19 23:01:13 +01:00
Stephen Birarda	0b4021ea43	switch to ini settings file by default for Interface, closes #2029	2014-02-19 13:17:53 -08:00
Atlante45	406768bf12	Code style fixes	2014-02-19 13:13:17 -08:00
Stephen Birarda	78c246f1ba	repair to saveSnapshot call from interface	2014-02-19 13:08:57 -08:00
Stephen Birarda	ff7a49d8c2	resolve conflicts on merge with upstream master	2014-02-19 13:07:26 -08:00
Atlante45	919891d73c	Merge branch 'master' of https://github.com/highfidelity/hifi into fix_import	2014-02-19 12:38:08 -08:00
Atlante45	f24cd0ceba	Added switch to pasteMode after successful import.	2014-02-19 12:34:38 -08:00
Andrzej Kapolka	4e7a7892ec	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-02-19 12:06:55 -08:00
ZappoMan	897da67118	Merge branch 'master' of https://github.com/worklist/hifi into js_clipboard	2014-02-19 10:54:05 -08:00
Andrzej Kapolka	3c4d2aa199	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-02-19 10:29:57 -08:00
Andrew Meadows	c24cbdadc1	Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup Conflicts: interface/src/avatar/MyAvatar.cpp	2014-02-19 10:00:51 -08:00
ZappoMan	bf814410ac	first cut at exposing clipboard support to JavaScript	2014-02-19 00:10:16 -08:00
Andrew Meadows	4010f3ab3f	Remove Avatar::_head, use AvatarData::_headData	2014-02-18 17:41:46 -08:00
Andrzej Kapolka	9c4143e1be	Working on gaze deflection.	2014-02-18 17:03:43 -08:00
Andrzej Kapolka	ada2594ad1	Working on getting the head translation, too.	2014-02-18 16:36:54 -08:00
Andrzej Kapolka	f83254882a	Attempting to get the head rotation from Visage.	2014-02-18 16:07:08 -08:00
Stephen Birarda	949f79e945	hook up request for domain registration information for Interface	2014-02-18 15:38:43 -08:00
Jose Carlos	59f8851b50	Merge remote-tracking branch 'upstream/master' into 19489	2014-02-19 00:05:16 +01:00
Jose Carlos	46ed506196	Display names are shown when distance is below a threshold Used polygon offset to render display names Saved model view and projection matrices in order to save glGetDoublev calls	2014-02-19 00:04:00 +01:00
Andrew Meadows	4b58d04c17	Merge branch 'master' of ssh://github.com/highfidelity/hifi into camera-occlusion	2014-02-18 15:00:39 -08:00
Stephen Birarda	b57a5cea6a	complete access token request flow after login window presentation	2014-02-18 14:27:52 -08:00
Stephen Birarda	8a0136efe1	more work on authentication, show login window when domain asks	2014-02-18 13:21:32 -08:00
Stephen Birarda	c762b92e5a	replace DataServerClient and Profile with AccountManager	2014-02-18 11:27:37 -08:00
Stephen Birarda	37f1f7ba4f	add a DomainInfo class to hold domain information	2014-02-18 09:59:22 -08:00
Andrzej Kapolka	5513524705	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-02-17 21:48:37 -08:00
Andrzej Kapolka	494685140b	Various bits of work on spanners.	2014-02-17 21:44:32 -08:00
Andrew Meadows	48f28ecee7	Merge branch 'master' of ssh://github.com/highfidelity/hifi into camera-occlusion Conflicts: interface/src/Menu.h interface/src/avatar/Avatar.cpp	2014-02-17 12:12:47 -08:00
Andrew Meadows	6ce028bbab	Simplifiy API for camera mode transitions Specify the "period" for the transition rather than the "rate".	2014-02-17 10:27:33 -08:00
stojce	13485065a5	Merge branch 'master' of https://github.com/worklist/hifi into 19497	2014-02-17 18:59:44 +01:00
ZappoMan	dd0909659a	Merge branch 'master' of https://github.com/worklist/hifi into overlaysupport	2014-02-16 19:20:06 -08:00
Philip Rosedale	37e1c00828	Merge pull request #2002 from ZappoMan/lowerLODnoFPSdrop Automatically Adjust LOD	2014-02-16 18:14:24 -08:00
ZappoMan	5abf908874	added 3D cube overlay support	2014-02-16 11:36:06 -08:00
ZappoMan	2eac9c293f	first working version of scriptable Overlays	2014-02-14 15:37:47 -08:00
ZappoMan	8e284a55b1	Merge branch 'master' of https://github.com/worklist/hifi into overlaysupport	2014-02-14 10:50:35 -08:00
stojce	0ddc475928	Merge branch 'master' of https://github.com/worklist/hifi into 19497	2014-02-14 18:30:54 +01:00
stojce	d5b87fbe8a	Merge branch 'master' of https://github.com/worklist/hifi into 19494	2014-02-14 18:28:34 +01:00
ZappoMan	cd137b2b12	tweak to reload scripts	2014-02-13 21:00:20 -08:00
ZappoMan	9d841ce918	add Stop All Scripts and Reload All Scripts	2014-02-13 18:19:20 -08:00
ZappoMan	caab3afb69	add menu item for auto adjust LOD	2014-02-13 14:26:30 -08:00
stojce	ab4164a6df	#19505 - Add domain & orientation parsing to hifi:// protocol handler	2014-02-13 22:44:10 +01:00
ZappoMan	e9259db944	Merge branch 'master' of https://github.com/worklist/hifi into lowerLODnoFPSdrop	2014-02-13 12:20:29 -08:00
stojce	08c8f47cd4	added SNAPSHOT_EXTENSION constant	2014-02-13 20:05:59 +01:00
ZappoMan	156fa6dc5a	more tweaks, removed old clouds	2014-02-13 11:03:35 -08:00
ZappoMan	20a6f4eea9	first cut at auto-LOD adjustment	2014-02-12 21:22:21 -08:00
stojce	f002cda1de	Merge branch 'master' of https://github.com/worklist/hifi into 19494	2014-02-12 17:53:07 +01:00
ZappoMan	8e3e7c1537	first experimental cut at overlay image	2014-02-11 17:18:24 -08:00
stojce	83d1d54bc2	Merge branch 'master' of https://github.com/worklist/hifi into 19497	2014-02-12 02:13:04 +01:00
stojce	68584c654b	Allow drag-and-drop of snapshots into Interface	2014-02-12 02:12:52 +01:00
ZappoMan	8acb6d13d5	move hydra thrust and view code into JS example	2014-02-10 15:25:09 -08:00
stojce	1ac583edca	Merge branch 'master' of https://github.com/worklist/hifi into 19494	2014-02-10 22:57:55 +01:00
Stephen Birarda	27305c7a43	change default domain to root, don't double load domains on startup	2014-02-10 10:23:06 -08:00
ZappoMan	e35df7904b	cleanup bad merge	2014-02-09 12:32:12 -08:00
ZappoMan	fe1a6b8f29	improvements to rotating gesture detection	2014-02-09 12:29:57 -08:00
ZappoMan	dca0b05927	added easier support for calculating multitouch rotating behavior including deltaAngle, isRotating, rotating(direction) properties	2014-02-09 12:08:17 -08:00
ZappoMan	3bf8dd87e8	Merge branch 'master' of https://github.com/worklist/hifi into more_events	2014-02-09 10:32:14 -08:00
stojce	75ad4fdee9	Merge branch 'master' of https://github.com/worklist/hifi into 19494	2014-02-09 17:48:04 +01:00
stojce	b05967a514	Custom URL handler	2014-02-09 17:47:46 +01:00
ZappoMan	d2b3e74f5d	added isPinching and isPinchOpening to touch events	2014-02-09 02:02:42 -08:00
Philip Rosedale	cfa7f5e6ca	Add drag to add more voxels, turn off hover orbit voxels until in the script as function key	2014-02-08 23:17:04 -08:00
Philip Rosedale	9655e93432	Remove re-coloring of voxels on hover or click, anticipating switch to scripted behavior	2014-02-08 19:13:43 -08:00
ZappoMan	ef7dee4387	Merge branch 'master' of https://github.com/worklist/hifi into ray_cast_scripting	2014-02-07 18:34:43 -08:00
Andrew Meadows	3894fc0cb8	Minor comment change.	2014-02-07 17:44:43 -08:00
ZappoMan	802f72c732	more ray picking and intersection work	2014-02-07 15:06:32 -08:00
Stephen Birarda	455442088c	Merge branch 'master' of https://github.com/highfidelity/hifi into mesh-through-mixer	2014-02-07 13:45:14 -08:00
Andrzej Kapolka	3e2ba9fb7e	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-02-07 11:26:55 -08:00
Andrzej Kapolka	67bef20f93	Have eyes converge on hovered avatar/voxel. Closes #1883 .	2014-02-07 11:26:15 -08:00
ZappoMan	2157349804	added Camera.computePickRay()	2014-02-07 09:40:52 -08:00
ZappoMan	77e7f336d5	scriptable camera	2014-02-06 20:03:57 -08:00
Stephen Birarda	97a7369c76	remove senderWithAddress from NodeList	2014-02-06 14:43:46 -08:00
Stephen Birarda	a823722d27	add writeDatagram helper to NodeList to insert md5 hash	2014-02-06 14:28:58 -08:00
Stephen Birarda	e72f6d16cc	rename NodeList ownerUUID to sessionUUID	2014-02-06 11:43:23 -08:00
Stephen Birarda	6f638fa62c	have domain-server create a UUID for unidentified nodes, closes #1840	2014-02-06 10:34:34 -08:00
Stephen Birarda	f92f9ec0c2	Merge branch 'master' of https://github.com/highfidelity/hifi into authentication	2014-02-06 09:28:03 -08:00
Philip Rosedale	4d55f35b1b	Merge pull request #1903 from ZappoMan/delete_voxel_glitch fix slight glitch in last child delete from larger voxel	2014-02-06 08:17:51 -08:00
Brad Hefta-Gaub	8fbce35944	fix slight glitch in last child delete from larger voxel	2014-02-06 03:44:21 -08:00
Brad Hefta-Gaub	a16b3a34e4	fix stutter while spinning	2014-02-06 02:18:28 -08:00
ZappoMan	4410fbb3f2	Merge branch 'master' of https://github.com/worklist/hifi into remove_local_cache	2014-02-05 20:47:35 -08:00
ZappoMan	f657a3efe9	remove local cache option	2014-02-05 20:02:01 -08:00
Andrew Meadows	aa3a1a9a72	Stop rendering our head in first person camera mode.	2014-02-05 15:35:57 -08:00
Stephen Birarda	adaa36a51d	repairs to key-framed URL sending through avatar-mixer	2014-02-04 15:28:27 -08:00
Stephen Birarda	26c961dc66	send identity packets when changes occur between keyframes	2014-02-04 14:24:13 -08:00
Stephen Birarda	8bf3b7586b	initial movement of mesh/skeleton URLs out of data-server through avatar-mixer	2014-02-04 13:02:33 -08:00
ZappoMan	2cf2e693b9	fix debug to properly work with outputBufferBits()	2014-02-04 12:29:55 -08:00
ZappoMan	c739c2452a	Merge pull request #1832 from birarda/script-timer hide ScriptEngine calls from JS	2014-02-03 12:45:41 -08:00
Andrew Meadows	cb186b10db	Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup Conflicts: interface/src/Application.cpp	2014-02-03 12:29:44 -08:00
Stephen Birarda	028eec7164	don't allow calls to init, run, evaluate from JS	2014-02-03 10:33:31 -08:00
Stephen Birarda	40a963cf92	some application destructor cleanup	2014-01-31 17:50:51 -08:00
Andrew Meadows	a5aff81881	Merge branch 'master' of ssh://github.com/highfidelity/hifi into cleanup	2014-01-31 17:44:13 -08:00
Andrew Meadows	ed93d8db39	Moving headMouse, transmitter, and touchYaw/Pitch stuff into MyAvatar.	2014-01-31 17:42:48 -08:00
Stephen Birarda	d65a3ee174	spacing cleanup in Application and ScriptEngine	2014-01-31 17:38:53 -08:00
Stephen Birarda	8fc55bd196	add user UUID to application window title	2014-01-31 14:56:04 -08:00
Andrew Meadows	a7ffb7df1d	Moved LookAtTargetAvatar stuff from AvatarManager to MyAvatar.	2014-01-31 13:17:12 -08:00
AndrewMeadows	f277e00780	Merge pull request #1785 from birarda/post-event repairs to VoxelImporter to remove warning, closes #1758	2014-01-31 11:23:01 -08:00
Stephen Birarda	217135a8d6	repairs to VoxelImporter to remove QCoreApplication warning	2014-01-31 11:00:44 -08:00
AndrewMeadows	bed63513a9	Merge pull request #1745 from ZappoMan/scripting_work support for global collision callbacks in JS	2014-01-31 10:42:44 -08:00
AndrewMeadows	0badc02a93	Merge pull request #1776 from birarda/bent-avatars repair ping packet parsing in creation of reply, fix AvatarMixer crash with UNIX client	2014-01-31 10:25:20 -08:00
Stephen Birarda	a5b0675f24	sendPingPackets method need not be static	2014-01-31 09:58:29 -08:00
Andrew Meadows	1b99bc90cf	Removing AvatarManager::clear() as unecessary during class destruction.	2014-01-30 18:02:04 -08:00
stojce	21ab08b31a	Merge branch 'master' of https://github.com/worklist/hifi into 19493	2014-01-30 22:23:54 +01:00
stojce	d2464d89e3	#19493 - @ function can jump to locations as well as avatars	2014-01-30 22:23:31 +01:00
Stephen Birarda	84ef757af4	fix avatar count, HandData crash (closes #1754 )	2014-01-30 09:45:09 -08:00
ZappoMan	ed0a2a5a18	Merge branch 'master' of https://github.com/worklist/hifi into scripting_work Conflicts: libraries/shared/src/SharedUtil.cpp libraries/shared/src/SharedUtil.h libraries/voxels/src/VoxelEditPacketSender.cpp	2014-01-29 19:49:36 -08:00
ZappoMan	08b06cc59c	support for global collision callbacks in JS	2014-01-29 17:52:17 -08:00
Andrew Meadows	82a4b7a4d1	Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions Conflicts: interface/src/Application.cpp	2014-01-29 13:20:42 -08:00
Stephen Birarda	33edcea5fb	resolve conflicts on merge with upstream master	2014-01-29 12:23:06 -08:00
Andrew Meadows	d757f20d22	Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions Conflicts: interface/src/Application.cpp	2014-01-29 11:41:39 -08:00
ZappoMan	b36cc0bcf9	removed old cruft around mousePitch in Head and unified pitch	2014-01-29 02:09:49 -08:00
ZappoMan	9d87d58723	Merge branch 'master' of https://github.com/worklist/hifi into more_scripting Conflicts: libraries/particles/src/ParticlesScriptingInterface.cpp	2014-01-28 20:36:35 -08:00
ZappoMan	305e69def6	really get controller key, mouse, etc scripting working	2014-01-28 19:47:45 -08:00
Andrew Meadows	677341d207	fix for crash bug #1728 . Moving _myAvatr to live in AvatarManager. Application still has a pointer to it. Unfortunately the order of Application initialization and destruction matters very much.	2014-01-28 18:04:42 -08:00
ZappoMan	5addc35cd8	hacking on controller events	2014-01-28 14:58:08 -08:00
Andrew Meadows	167acb8873	Adding avatars back into ParticleCollisionSystem. Had to add Application::_myAvatar to the AvatarManager list so that particles would properly collide.	2014-01-28 14:16:34 -08:00
Stephen Birarda	423e1598f0	use NodeSet in place of QSet<NodeType_t> where possible	2014-01-28 13:41:39 -08:00
Stephen Birarda	4de270b832	cleanup Node types, closes #1726	2014-01-28 13:38:33 -08:00
Stephen Birarda	cda06d1cb3	replace uint64_t with quint64 for Qt friendlyness	2014-01-28 12:35:42 -08:00
Stephen Birarda	3a706a2759	repair the count of avatars and servers	2014-01-28 12:31:25 -08:00
Stephen Birarda	2aaa9ce3f6	resolve conflicts on merge with upstream master	2014-01-28 12:30:43 -08:00
Stephen Birarda	4103cc1cde	packet header changes and beginning of conversion to QByteArray	2014-01-28 10:36:08 -08:00
ZappoMan	1681dbb57b	Merge branch 'master' of https://github.com/worklist/hifi into particle_meshes	2014-01-28 09:26:54 -08:00
Andrew Meadows	c4f429dcd0	Merge branch 'master' of ssh://github.com/highfidelity/hifi into fix-particle-avatar-collisions	2014-01-27 18:05:39 -08:00
Andrew Meadows	2b5675b077	Fix issue #1684 : particles collide against avatars again. This a quick and dirty fix to resurrect particle-avatar collisions. We rebuild and pass a list of AvatarData* to the ParticleCollisionManager every call to update().	2014-01-27 18:01:53 -08:00
stojce	4d1992485f	removed unused QSound reference	2014-01-27 21:17:17 +01:00
stojce	40ea552981	filename format changes - new wav file - changed filename format	2014-01-27 20:35:06 +01:00
stojce	74801da07f	#19491 - Implement in-app snapshots	2014-01-27 18:07:03 +01:00
ZappoMan	62b7e6e58d	implement local edits in ParticleScriptingInterface	2014-01-27 09:00:34 -08:00
ZappoMan	c17476c985	Merge pull request #1683 from kordero/19487 Code Review for Job #19487	2014-01-25 12:25:44 -08:00
Lucas Crisman	28d6171be5	Merge branch 'master' of git://github.com/worklist/hifi into 19487	2014-01-25 11:24:51 -03:00
Lucas Crisman	f56e4b0820	build error fix	2014-01-25 11:24:33 -03:00
stojce	f4698065ce	Merge branch 'master' of https://github.com/worklist/hifi into 19483	2014-01-25 07:39:17 +01:00
ZappoMan	f02bc95908	clear particles when switching domains	2014-01-24 11:07:27 -08:00
Lucas Crisman	759448bef7	resolving reverted change on last merge	2014-01-24 15:13:14 -03:00
Lucas Crisman	cece4add27	Merge branch 'master' of git://github.com/worklist/hifi into 19487 Conflicts: interface/src/Application.cpp interface/src/Application.h	2014-01-24 15:01:24 -03:00
Lucas Crisman	482c501f3b	stats reduction on mirror enabled	2014-01-24 10:35:03 -03:00
Lucas Crisman	ef107e0a54	timer positioning when toggling BandwithMeter	2014-01-24 08:14:26 -03:00
Lucas Crisman	43d1678d18	position/sizes tweaks / moving stats and osciloscope when mirror is ON	2014-01-24 07:56:01 -03:00
Lucas Crisman	c3aa8167d6	click on stats to expand/contract them	2014-01-24 07:18:45 -03:00
Lucas Crisman	a2f8a61a69	stats font & color changes, styling audio & bandwidth meters	2014-01-24 05:06:55 -03:00
stojce	0c2e55a53b	Merging with master - resolve conflicts on GeometryCache	2014-01-24 07:31:22 +01:00
Stephen Birarda	10cfd628aa	resolve conflicts on merge with upstream master	2014-01-23 17:52:30 -08:00
Lucas Crisman	f818b07dc8	Merge branch 'master' of git://github.com/worklist/hifi into 19487	2014-01-23 22:18:33 -03:00
AndrewMeadows	6120416cbb	Merge pull request #1627 from ey6es/metavoxels Basic metavoxel editing interface (doesn't actually perform any edits yet).	2014-01-23 16:37:22 -08:00
Andrzej Kapolka	e80eb03ba9	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels Conflicts: interface/src/Application.cpp	2014-01-23 16:13:42 -08:00
Stephen Birarda	4ebd5795fc	handle merge with nodelist-patches branch	2014-01-23 16:01:52 -08:00
Stephen Birarda	80106979a5	replace packetSenderNotify with signal/slot combo	2014-01-23 15:55:36 -08:00
Stephen Birarda	ed9118fd67	more NodeList QSet changes, closes #1660	2014-01-23 15:28:46 -08:00
Stephen Birarda	c432a34cfb	fix rendering of Avatars	2014-01-23 14:51:29 -08:00
Stephen Birarda	9ab1fc4c2c	resolve conflicts on merge with upstream/master	2014-01-23 14:43:04 -08:00
Stephen Birarda	2e548fb39c	complete migration of Avatar list to AvatarManager	2014-01-23 14:41:11 -08:00
Philip Rosedale	f0417d187f	Merge branch 'master' of https://github.com/worklist/hifi	2014-01-23 12:40:56 -08:00
Stephen Birarda	a9f1984676	add an AvatarManager that will keep Avatars in Application thread	2014-01-23 11:59:24 -08:00
Andrzej Kapolka	61d97454d7	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-01-23 11:54:08 -08:00
Andrzej Kapolka	b32b0a495a	Remove eyes' hovering on mouse avatar, voxels. Closes #1643 .	2014-01-23 11:49:34 -08:00
Philip Rosedale	c882104046	Merge branch 'master' of https://github.com/worklist/hifi	2014-01-23 11:43:08 -08:00
Philip Rosedale	5e77f5643d	Merge pull request #1630 from birarda/nodelist-set change node types of interest to a QSet	2014-01-23 11:42:37 -08:00
Stephen Birarda	24bed09473	DatagramProcessor need not be a pointer in Application	2014-01-23 11:13:03 -08:00
Stephen Birarda	b5a72ef669	more nodelist repairs for concurrency issues	2014-01-23 11:11:22 -08:00
Lucas Crisman	95837b89c0	Merge branch 'master' of git://github.com/worklist/hifi into 19487	2014-01-23 15:54:14 -03:00
Andrzej Kapolka	a5b0fe38ec	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-01-23 10:52:03 -08:00
Philip Rosedale	89414eb8f2	Merge branch 'master' of https://github.com/worklist/hifi	2014-01-23 10:47:18 -08:00
Stephen Birarda	7efc9e2e78	move datagram processing back to separate thread	2014-01-23 10:32:23 -08:00
Philip Rosedale	bacfa15065	Merge branch 'master' of https://github.com/worklist/hifi	2014-01-22 16:35:01 -08:00
Stephen Birarda	ec04d5450b	Merge branch 'master' of https://github.com/highfidelity/hifi into nodelist-set	2014-01-22 16:16:47 -08:00
Andrzej Kapolka	ff4795d9a5	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-01-22 15:59:02 -08:00
stojce	becbd4cb1c	Merge branch 'master' of https://github.com/worklist/hifi into 19483	2014-01-23 00:54:05 +01:00
stojce	7c4784bfbc	Merge branch 'master' of https://github.com/worklist/hifi into 19483	2014-01-23 00:07:17 +01:00
Stephen Birarda	abddb969a5	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-01-22 14:47:44 -08:00
Stephen Birarda	e9e2557576	change node types of interest to a QSet	2014-01-22 14:47:04 -08:00
Andrzej Kapolka	e552134cf5	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels Conflicts: interface/src/Application.cpp	2014-01-22 14:19:26 -08:00
Philip Rosedale	5e4fad2476	Merge branch 'master' of https://github.com/worklist/hifi	2014-01-22 14:17:15 -08:00
Andrzej Kapolka	c6deb0c450	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-01-22 13:58:44 -08:00
Andrzej Kapolka	064f0cd3ab	Basic drag-out behavior for metavoxel editing.	2014-01-22 13:55:14 -08:00
Lucas Crisman	cba616e6f2	Merge branch 'master' of git://github.com/worklist/hifi into 19487	2014-01-22 18:36:41 -03:00
Philip Rosedale	d068b668d8	add marker spheres at 1 meter away from origin for better avatar size testing	2014-01-22 12:48:10 -08:00
Lucas Crisman	a94fbe3ff5	voxels stats fixes	2014-01-22 17:42:34 -03:00
Stephen Birarda	a9ce6c7467	use NodeList ownerUUID for DataServerScriptingInterface, fix double UUID send	2014-01-22 12:00:26 -08:00
Stephen Birarda	d57aec9793	don't use separate NodeList owner UUID and Avatar UUID	2014-01-22 11:48:04 -08:00
Lucas Crisman	d86aa227a4	UI stats improvements: first cut	2014-01-22 16:42:09 -03:00
Brad Hefta-Gaub	aacad00791	Merge branch 'master' of git://github.com/worklist/hifi into new_particle_scripting_interface Conflicts: interface/src/Application.cpp	2014-01-22 11:16:21 -08:00
Andrzej Kapolka	15021b6ebc	More work on metavoxel editing (track mouse ray intersection with grid).	2014-01-22 11:11:12 -08:00
stojce	7b1e64593c	Merge branch 'master' of https://github.com/worklist/hifi into 19483	2014-01-22 18:41:00 +01:00
Stephen Birarda	6b44172467	hook the user's avatar object into the Interface ScriptEngine	2014-01-22 09:13:25 -08:00
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	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	105fb42b34	rewrite mesh and skeleton requests from data-server	2014-01-21 16:46:04 -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
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
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
aw	0eed041deb	scripts save on exit and load on entry	2014-01-20 22:58:01 -08:00
Stephen Birarda	d405d31edf	add data-server to hifi repo, abstract DataServerClient	2014-01-20 14:42:50 -08:00
Brad Hefta-Gaub	b4b3720fcf	move creatorTokenID management into Particle static members	2014-01-20 12:56:35 -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	825c64e1d0	Anything obviously wrong?	2014-01-20 10:57:10 -06:00
stojce	daffadbac4	Merge branch 'master' of https://github.com/worklist/hifi into 19483	2014-01-19 13:59:20 +01: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
Stephen Birarda	594165782a	repair badly scoped usage of QMutexLocker	2014-01-17 16:20:22 -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
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
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	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
stojce	36d21e812d	Merge branch 'master' of https://github.com/worklist/hifi into 19483	2014-01-17 19:46:02 +01:00
Andrzej Kapolka	0e7692dfea	When the mouse is hidden, just look straight forward.	2014-01-16 16:59:50 -08:00
stojce	669ab213ef	fixing merge	2014-01-17 00:08:25 +01:00
Brad Hefta-Gaub	1cfbfe6611	fix 3d mode switch on/off issue	2014-01-16 14:54:08 -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	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
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
Andrzej Kapolka	2c7b6b9696	Skeleton removal checkpoint; compiles, but there are a few bits missing.	2014-01-15 15:14:50 -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
Leonardo Murillo	1b687848d1	Unneeded include	2014-01-15 12:47:19 -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	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
Stephen Birarda	e76a37f48b	resolve conflicts on merge with upstream master	2014-01-14 16:26:02 -08:00
Stephen Birarda	599e3bb9e5	resolve conflicts on merge with upstream master	2014-01-14 16:15:58 -08:00
Stephen Birarda	77ee27e5d7	resolve conflicts on merge with upstream master	2014-01-14 16:12:42 -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
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

... 21 22 23 24 25 ...

3495 commits