13201 commits

Author	SHA1	Message	Date
Brad Davis	69fa18c6c0	Working on overlay in plugins	2015-06-26 18:08:10 -07:00
Sam Gondelman	2f0fcba1eb	key binding fixes as suggested by ctrlaltdavid, start in 3rd person if crashed in independent mode	2015-06-26 17:28:02 -07:00
Ryan Huffman	760a5bfa37	Fix call to atan2 when params are 0	2015-06-26 17:23:06 -07:00
Brad Davis	d8dad5b86f	Fixing bad merge	2015-06-26 17:17:56 -07:00
Brad Davis	5ce79d6800	Merge remote-tracking branch 'upstream/master' into plugins	2015-06-26 17:14:45 -07:00
Brad Davis	4417c00ae4	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/Application.h interface/src/Menu.h	2015-06-26 17:02:16 -07:00
Howard Stearns	9a04fdf10a	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds	2015-06-26 16:24:27 -07:00
Howard Stearns	98f165f2ae	Avatar collision sounds. ... collisionsSoundURL can be set in preferences: Currently defaults to https://s3.amazonaws.com/hifi-public/sounds/Collisions-hitsandslaps/airhockey_hit1.wav. Can be empty, which means no sound, rather than restoring default. MyAvatar.collisionSoundURL can read/written in scripts. Preloads when set, so that it won't have to fetch on first collision. Plays at start of collision only, with volume proportional to "velocity change"^2.	2015-06-26 16:23:16 -07:00
Ryan Huffman	abe8cfe90f	Fix avatar displayname to point towards camera ... Previously it used the camera orientation, which means all display names have the same orientation, and will all rotate when you turn your head. Instead, you only want to change the orientation of a particular display name when you move.	2015-06-26 16:17:11 -07:00
Stephen Birarda	9b84eabd18	Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo	2015-06-26 14:40:01 -07:00
Seth Alves	bc7271769c	merge from master	2015-06-26 14:29:40 -07:00
Stephen Birarda	18e2b62ecc	initial image replacement for hyperlink preview	2015-06-26 14:12:26 -07:00
ericrius1	0a7c787109	created a custom pipeline that is a static class variable for renderable quad entity item	2015-06-26 13:44:54 -07:00
David Rowe	1898c6bd55	Merge branch 'master' into 20547 ... Conflicts: libraries/networking/src/PacketHeaders.cpp libraries/networking/src/PacketHeaders.h	2015-06-26 13:05:51 -07:00
Stephen Birarda	522b715628	remove comment, styling cleanup	2015-06-26 11:41:34 -07:00
Stephen Birarda	c6df573933	fix some OS X warnings, add description to tooltip	2015-06-26 10:50:31 -07:00
Seth Alves	c95db5672a	include argument-packing version in serialized argument data	2015-06-26 10:01:45 -07:00
Seth Alves	f5f1d0829c	Merge branch 'physics-lock-entity-tree' of github.com:sethalves/hifi into actions-over-wire	2015-06-26 07:20:51 -07:00
Seth Alves	a0d77c061c	lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does	2015-06-26 07:00:28 -07:00
Brad Hefta-Gaub	63812f28ad	Merge pull request #5206 from SamGondelman/cameraMode ... fix bug that was preventing camera mode switches	2015-06-25 18:55:13 -07:00
Seth Alves	7c26641560	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-25 17:40:27 -07:00
bwent	e3526467c7	Revert changes to ModelPropertiesDialog	2015-06-25 16:04:02 -07:00
David Rowe	f47cff1332	Remove duplicate method call	2015-06-25 15:41:27 -07:00
David Rowe	377979e380	Make field of view preference change be applied immediately	2015-06-25 15:41:10 -07:00
bwent	aa865680ab	Added faceCamera property to Text Entities ... …and removed from base	2015-06-25 15:38:38 -07:00
Sam Gondelman	56944afd39	avatar doesn't move in independent mode, alphabetized menu options	2015-06-25 12:36:36 -07:00
David Rowe	d38a5a1771	Back out saccade speed limit	2015-06-25 07:38:06 -07:00
Brad Hefta-Gaub	6c4a4866d3	Merge pull request #5202 from Atlante45/overlay ... Overlay have correct bounds	2015-06-24 19:00:55 -07:00
Brad Hefta-Gaub	77bbb23a1e	Merge pull request #5175 from hyperlogic/ajt/first-person-avatar ... Render a different model when in first person view.	2015-06-24 18:54:47 -07:00
Anthony J. Thibault	c480c85f85	Fixes for switching between fullAvatar and head & body avatars while in first person. ... Need to always add _skeletonModel to the main scene when switching to head/body avatar. Need to always remove _firstPersonSkeletonModel from main scene when switching to head/body avatar.	2015-06-24 17:35:23 -07:00
Atlante45	55c490043f	Restore InterfaceConfig.h includes	2015-06-24 16:13:42 -07:00
Atlante45	e3d22ef94b	Fix overlays getBounds + code cleanup	2015-06-24 16:13:42 -07:00
Anthony J. Thibault	71639a7466	Fix for switching avatars while mirror is not enabled. ... When the avatar is changed via set*URL, we need to set the associated model visibility appropriately. This way when it gets added to the scene later in preRender, initWhenReady, it will render with the correct visibility settings.	2015-06-24 16:10:47 -07:00
Anthony J. Thibault	3853395298	Bug fixes for switching between head/body and full body avatars ... The head model visibility is now updated in preRender() Moved the near clip plane in a bit more Invalidate head bone vector on LOD switching. Removed _currentSkeletonModel pointer, instead use _prevShouldDrawHead to detect when we should flip the visibility bit.	2015-06-24 16:10:47 -07:00
Anthony J. Thibault	b88d7c2e05	Added FIXME comment to preRender	2015-06-24 16:10:47 -07:00
Anthony J. Thibault	8f03ead74e	Bug fix for two piece avatars. ... The head was not rendering	2015-06-24 16:10:47 -07:00
Anthony J. Thibault	99a03bac21	Render a different model when in first person view. ... Currently this model is identical to the third person model, except that the head bones have been 'cauterized' by applying a zero scale transform. This allows us to set the near clip back to a reasonable value.	2015-06-24 16:10:47 -07:00
Brad Hefta-Gaub	734a11e12a	Merge pull request #5199 from jherico/scale_rez_fix ... Fixing misplaced UI on scale resolution	2015-06-24 16:10:33 -07:00
Atlante45	233d92c315	Some code cleanup	2015-06-24 15:44:47 -07:00
Atlante45	31a98c5b40	Replace pos/rot by a transform in Base3DOverlay ... Also keep getBounds a pure virtual methods	2015-06-24 15:44:47 -07:00
Atlante45	c22f1aa7e1	Overlay2D return correct getBounds	2015-06-24 15:44:46 -07:00
Atlante45	e8da8e374c	Simplify Overlays payloadGetBounds	2015-06-24 15:44:46 -07:00
Atlante45	6bb21b7a48	Use dynamic_pointer_cast instead of static_cast	2015-06-24 15:44:45 -07:00
Brad Hefta-Gaub	1cb7d0c1a5	Merge pull request #5194 from jherico/qml_warnings ... Removing qml warnings	2015-06-24 15:42:36 -07:00
Clément Brisset	6db4184748	Merge pull request #5171 from huffman/fix-edit-rotate ... Fix edit.js rotation display	2015-06-24 15:35:15 -07:00
Sam Gondelman	19ec080e2b	Merge with master	2015-06-24 15:04:03 -07:00
Philip Rosedale	0bef506be2	Merge pull request #5190 from jherico/mirror_zoom ... Mirror zoom	2015-06-24 14:43:14 -07:00
Ryan Huffman	4df1bea4ec	Merge pull request #5167 from SamGondelman/hmdControls ... hmdControls.js for movement when wearing an HMD	2015-06-24 14:40:31 -07:00
Philip Rosedale	b7c64ef246	Merge pull request #5193 from SamGondelman/master ... hydra dead zone to prevent drifting	2015-06-24 13:52:48 -07:00
Brad Davis	a5428ae24a	Merge remote-tracking branch 'upstream/master' into plugins	2015-06-24 10:39:31 -07:00
Seth Alves	28582ed14d	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-23 19:50:35 -07:00
Brad Davis	5818805931	Fixing some merge issues	2015-06-23 17:34:44 -07:00
Andrew Meadows	1ceed98ca2	Merge pull request #5166 from jherico/64bit ... Enable Windows 64 bit builds	2015-06-23 17:03:42 -07:00
Brad Davis	8f8bda327c	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/devices/OculusManager.cpp interface/src/devices/OculusManager.h	2015-06-23 16:54:32 -07:00
Brad Davis	fb2fb06371	Fixing misplaced UI on scale resolution, PC edition	2015-06-23 15:42:32 -07:00
Seth Alves	146f51faac	quiet compiler	2015-06-23 15:26:43 -07:00
Ryan Huffman	8a1f446f05	Fix textoverlay3d text position	2015-06-23 14:43:41 -07:00
Sam Gondelman	778e19ac11	fixed camera mode issue	2015-06-23 11:45:08 -07:00
Brad Davis	da031b039c	Removing qml wanrings	2015-06-23 10:58:52 -07:00
Sam Gondelman	c1fdbeb3b4	hydra dead zone to prevent drifting	2015-06-23 10:52:44 -07:00
Seth Alves	6e34678a59	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-23 10:48:21 -07:00
Ryan Huffman	3e576fea92	Remove vertical scaling from Text3DOverlay	2015-06-23 10:27:01 -07:00
Sam Gondelman	824c219fa0	started fixing camera mode issue	2015-06-23 09:26:38 -07:00
Bradley Austin Davis	07dce3856a	Fixing some math functions	2015-06-22 20:10:21 -07:00
Bradley Austin Davis	62af30761e	Fixing inverted mirror zoom setting	2015-06-22 20:07:51 -07:00
Seth Alves	bd1c9f0be5	quiet compiler	2015-06-22 19:56:14 -07:00
Seth Alves	32be044d6a	quiet compiler	2015-06-22 19:56:00 -07:00
Bradley Austin Davis	f833121032	Fixing the initial missing UI on retina displays, again	2015-06-22 19:55:52 -07:00
Seth Alves	cc3854be8a	quiet compiler	2015-06-22 19:55:43 -07:00
Seth Alves	7eafe2d48d	quiet compiler	2015-06-22 19:55:25 -07:00
Seth Alves	f579027430	quiet compiler	2015-06-22 19:55:15 -07:00
Seth Alves	20f173a474	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-22 19:36:09 -07:00
Seth Alves	300a879ff4	Merge pull request #5186 from AndrewMeadows/antimony ... fix crash when other avatar disconnects unexpectedly	2015-06-22 19:34:13 -07:00
Brad Hefta-Gaub	de39049a56	Merge pull request #5187 from jherico/fix_overlay_backgrounds ... Fix the 2D text overlay backgrounds to stop using a previously bound …	2015-06-22 17:32:06 -07:00
Brad Hefta-Gaub	ee85ad8bf8	Merge pull request #5185 from jherico/mouse_flicker ... Removing flickering mouse cursor in HMD	2015-06-22 17:23:40 -07:00
Brad Hefta-Gaub	81541e6013	Merge pull request #5180 from jherico/hmd_offset ... Fixing HMD position offset bug in picking & stereo rendering in HMD	2015-06-22 17:22:26 -07:00
Bradley Austin Davis	ce3d1bd9a4	Fix the 2D text overlay backgrounds to stop using a previously bound texture	2015-06-22 16:19:31 -07:00
Andrew Meadows	ce9dfc098b	unhook motionstate before removing avatar	2015-06-22 15:40:26 -07:00
Andrew Meadows	b7c728a794	assert AvatarMotionState unhooked before delete	2015-06-22 15:40:02 -07:00
Seth Alves	f75506bf1b	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-22 15:37:10 -07:00
Brad Davis	967fc62da7	Working on syncing with master	2015-06-22 13:46:03 -07:00
Brad Davis	9f98547390	Merge branch 'master' into plugins	2015-06-22 13:35:40 -07:00
Brad Davis	1cfc0b2e42	Fixing mac/linux compilation	2015-06-22 12:06:08 -07:00
Brad Davis	8c9deb9d16	Removing flickering mouse cursor in HMD	2015-06-22 12:04:55 -07:00
Brad Davis	4cd1c52987	Fixing HMD position offset bug in picking & stereo rendering in HMD	2015-06-22 11:20:48 -07:00
Philip Rosedale	293a88b3d4	Merge pull request #5158 from ctrlaltdavid/20545 ... DO NOT MERGE - QA for #20545 - Eye saccades are too jittery and too fast	2015-06-22 10:31:10 -07:00
Brad Davis	3231bbba5a	Merge remote-tracking branch 'upstream/master' into overlay ... Conflicts: interface/src/Application.cpp	2015-06-22 09:44:16 -07:00
Seth Alves	bce8b0cc1b	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-22 07:19:55 -07:00
samcake	be8ae9580d	Merge pull request #5177 from bwent/doubleClickEvent ... Expose mouseDoublePressEvents to js	2015-06-22 11:13:05 +02:00
Seth Alves	3afdcfd6d1	quiet compiler	2015-06-21 18:12:58 -07:00
Bradley Austin Davis	02510790c3	Fixing projection during star rendering	2015-06-21 17:16:30 -07:00
Brad Davis	012b0973b9	removing cruft	2015-06-21 14:26:19 -07:00
Bradley Austin Davis	5bbfb97c37	Fixing blurry UI on retina displays	2015-06-21 13:31:18 -07:00
Seth Alves	746033f3bd	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-21 07:34:48 -07:00
Brad Davis	e66b2d4141	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-20 22:54:45 -07:00
Brad Hefta-Gaub	13c5c830d7	Merge pull request #5173 from huffman/fix-line-bounds ... Add correct line3doverlay bounds	2015-06-20 11:39:08 -07:00
Bradley Austin Davis	577962cb67	Merge branch 'master' into overlay	2015-06-20 10:37:55 -07:00
Seth Alves	5381e6e9bb	entity server has its own version of actions which simply remember the encoded arguments. Entities with actions don't experience simulateKinematicMotion	2015-06-19 16:20:07 -07:00
Brad Davis	3ab8025b82	Responding to Sam's comments	2015-06-19 16:14:05 -07:00
Sam Gondelman	a0d4b7ec7c	without script, doesn't limit you to constant degree turns	2015-06-19 16:11:43 -07:00
Niraj Venkat	482f12be8c	Returning ref to stack to view controller	2015-06-19 16:05:45 -07:00
bwent	c315bcec24	Expose mouseDoublePressEvents to js	2015-06-19 15:52:27 -07:00
Brad Davis	cc6b589ae5	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-19 14:48:38 -07:00
Brad Davis	99c217184b	Fixing the mic/camera buttons and the mirror UI buttons	2015-06-19 14:46:39 -07:00
Niraj Venkat	03c10d15e6	Adding lambdas and removing dead code	2015-06-19 14:37:21 -07:00
Niraj Venkat	054e12a315	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-06-19 11:22:50 -07:00
Niraj Venkat	b15e7cec21	Back and forward are red if not possible	2015-06-19 11:17:56 -07:00
Sam Gondelman	e78ce8055a	hmdControls turns on when you enter VR mode, turns off when you exit, can toggle with CTRL+G	2015-06-19 11:17:36 -07:00
Ryan Huffman	ff66eb584d	Add correct line3doverlay bounds	2015-06-19 10:48:07 -07:00
Ryan Huffman	665baff665	Merge branch 'master' of github.com:highfidelity/hifi into fix-edit-rotate ... Conflicts: interface/src/ui/overlays/Circle3DOverlay.cpp libraries/render-utils/src/RenderDeferredTask.cpp libraries/render-utils/src/RenderDeferredTask.h	2015-06-19 10:07:57 -07:00
Ryan Huffman	690e2e38f2	Move circle3d and text overlays to batches	2015-06-19 09:45:13 -07:00
Seth Alves	89ec3c21b4	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-19 09:36:11 -07:00
Clément Brisset	5192796851	Merge pull request #5168 from samcake/daft ... Improving the rendering job architecture	2015-06-19 18:00:39 +02:00
Sam Gateau	598d0a5375	Just remove these changes on SkeletonModel.cpp	2015-06-19 17:44:56 +02:00
Atlante45	9c7f24eeb6	Add culled option for simple programs	2015-06-19 16:50:38 +02:00
Atlante45	67473ac254	Fix rotation handle crash	2015-06-19 16:40:42 +02:00
Sam Gateau	9adfdb06fe	undo local modif to SKeletonModel.cpp	2015-06-19 11:00:27 +02:00
Sam Gateau	31633eca10	IMproving the probe system and cleaning the engine script	2015-06-19 10:41:40 +02:00
Sam Gateau	b09991d75b	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-06-19 09:35:40 +02:00
Brad Davis	9bef5f011b	Reverting mirror functionality	2015-06-19 00:03:46 -07:00
Brad Davis	0fa6ac175f	Merge branch 'master' into overlay	2015-06-18 21:56:11 -07:00
Brad Davis	d65e5882aa	Working on 64 bit builds	2015-06-18 21:44:12 -07:00
Sam Gondelman	aab8161fa4	remove unused function	2015-06-18 18:57:04 -07:00
Niraj Venkat	afc2db6c6a	address bar commit	2015-06-18 18:25:48 -07:00
Brad Davis	48b27acc79	Merge remote-tracking branch 'upstream/master' into overlay ... Conflicts: interface/src/Application.cpp interface/src/ui/ApplicationOverlay.cpp	2015-06-18 18:17:59 -07:00
Brad Hefta-Gaub	a7a53d8be7	Merge pull request #5148 from SamGondelman/rotationModes ... center player in view mode	2015-06-18 18:02:47 -07:00
Seth Alves	32cf669d8b	moving toward sending actions over wire	2015-06-18 17:51:41 -07:00
Brad Hefta-Gaub	750ce250fa	Merge pull request #5150 from SamGondelman/mouseLook ... mouse look script	2015-06-18 17:41:20 -07:00
Niraj Venkat	894a245318	Further changes to address bar	2015-06-18 17:35:50 -07:00
Philip Rosedale	2f080a8e29	Merge pull request #5147 from sethalves/more-actions ... offset action	2015-06-18 17:35:50 -07:00
Niraj Venkat	55b6efb1e9	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-06-18 15:48:37 -07:00
Seth Alves	816726efdc	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-18 15:33:46 -07:00
Niraj Venkat	5645491170	Further changes to address bar	2015-06-18 15:09:13 -07:00
Niraj Venkat	1be303e3ed	Address bar polish	2015-06-18 15:07:27 -07:00
Brad Davis	edfb25bfe2	Removing debug define for VR overlay	2015-06-18 15:05:32 -07:00
Seth Alves	021dc64789	merge from upstream	2015-06-18 15:03:09 -07:00
Seth Alves	3c90c851e9	start on code to de/serialize actions	2015-06-18 15:01:34 -07:00
Sam Gondelman	53bbd519a3	two new customizable actions for use in js	2015-06-18 14:37:09 -07:00
Brad Davis	68595ef5dc	Delete sync object after use	2015-06-18 14:27:19 -07:00
Bradley Austin Davis	e75b1a6794	Merge branch 'temp' into overlay	2015-06-18 14:03:25 -07:00
Bradley Austin Davis	96ac5070f6	Adding some more protection to the viewport	2015-06-18 14:00:17 -07:00
Sam Gondelman	fd0efd91ff	added shift action, added timers and fast mode to hmdControls.js	2015-06-18 13:59:37 -07:00
Bradley Austin Davis	7bbaf026f3	use a monospace font on all platforms	2015-06-18 13:33:37 -07:00
Seth Alves	99afd07395	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-18 12:45:40 -07:00
Brad Davis	1243c54767	More merge bugs	2015-06-18 12:44:57 -07:00
Brad Davis	4404917003	Fix HMD projection post-merge	2015-06-18 11:16:25 -07:00
David Rowe	c88ba2c6d1	Increase the saccade interval	2015-06-18 10:41:51 -07:00
David Rowe	0c7c5f6301	Limit the speed of eye saccades	2015-06-18 10:21:36 -07:00
Seth Alves	53b5c8e6e7	more merge fallout	2015-06-18 10:19:12 -07:00
Seth Alves	b258aeaa3d	merge from master	2015-06-18 10:04:14 -07:00
Sam Gondelman	f752534f7c	actionEvent signal, captureActions, began work on hmdControls.js	2015-06-18 09:52:36 -07:00
Atlante45	d0f27f1648	Change display names size	2015-06-18 15:23:53 +02:00
Atlante45	c38fa46eb1	Increase anti z-fighting value	2015-06-18 15:23:53 +02:00
Atlante45	045a6a6ad9	Use render args frustum	2015-06-18 15:23:52 +02:00
Atlante45	be261cd038	Increase anti z-fighting value	2015-06-18 15:23:52 +02:00
Atlante45	fb6de91cbe	HACK Prevent head hight value explosion	2015-06-18 15:23:51 +02:00
Atlante45	3b41a8f209	Cancel display names roll ... This is annoying in HMD	2015-06-18 15:23:51 +02:00
Atlante45	e1b5a3c204	Fix display name transform ... They now have a fixed pixel size and ar pixel aligned	2015-06-18 15:23:51 +02:00
Atlante45	d7b9a1b032	Cleanup TextRenderer3D methods args	2015-06-18 15:23:49 +02:00
Atlante45	47634a48a6	Make renderDisplayName const	2015-06-18 15:22:49 +02:00
samcake	89fe1c47be	preping for debug the jobs	2015-06-18 13:02:06 +02:00
Brad Davis	5c4fa77acd	Merge branch 'temp' into overlay	2015-06-18 00:59:31 -07:00
Brad Davis	acdf7c48d9	Adding more explicit error checking	2015-06-18 00:53:19 -07:00
Brad Davis	a83a4fb0a1	Merge remote-tracking branch 'upstream/master' into overlay ... Conflicts: interface/src/Application.cpp interface/src/devices/OculusManager.cpp interface/src/ui/ApplicationOverlay.cpp	2015-06-17 19:53:31 -07:00
Seth Alves	c6a0630aa5	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-17 19:10:37 -07:00
Bradley Austin Davis	4633cabcec	Merge remote-tracking branch 'upstream/master' into ovr6	2015-06-17 17:07:43 -07:00
David Rowe	67206332e6	Make individual reload buttons reload scripts	2015-06-17 16:11:30 -07:00
David Rowe	2a00586e21	Fix missing hack ... Matches hack in stopScript().	2015-06-17 16:11:29 -07:00
David Rowe	17f7d76025	Redownload scripts that are loaded via Script.load() when reloading all	2015-06-17 16:11:28 -07:00
David Rowe	5dab977c28	Add a reload script button after each script in list of running scripts	2015-06-17 16:11:26 -07:00
David Rowe	f220d40bb8	Re-download scripts upon Reload All	2015-06-17 16:11:25 -07:00
Bradley Austin Davis	1705eb8f80	Reverting some changes, putting overlay rendering in its own state manager	2015-06-17 16:08:19 -07:00
Brad Davis	8a1b519071	Working on overlays	2015-06-17 16:06:06 -07:00
Brad Davis	f2261b5ed5	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 15:34:50 -07:00
Brad Davis	2ab3f42c6a	Merge pull request #5124 from venkatn93/master ... New address bar with forward and back buttons	2015-06-17 15:33:10 -07:00
Seth Alves	fbfa73af2d	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-17 15:18:17 -07:00
Brad Davis	ae1c9603b9	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 15:13:04 -07:00
Sam Gondelman	0157997126	fix findDevice	2015-06-17 14:42:11 -07:00
Niraj Venkat	225e2ebfdc	Fixing build issues and finishing up address bar	2015-06-17 14:27:16 -07:00
ZappoMan	58ee5217e3	fix some warnings	2015-06-17 14:08:02 -07:00
Niraj Venkat	9b9aba48f0	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-06-17 13:50:30 -07:00
Bradley Austin Davis	11fff7c6e5	debugging stack on OSX	2015-06-17 13:49:42 -07:00
Niraj Venkat	1328ea6199	Calling AddressManager back and forward functions	2015-06-17 13:41:41 -07:00
Seth Alves	ac491dabdb	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-17 13:20:14 -07:00
Bradley Austin Davis	2172445db7	Merge remote-tracking branch 'upstream/master' into ovr6	2015-06-17 12:56:41 -07:00
Ryan Huffman	220a78eede	Merge pull request #5149 from SamGondelman/master ... fix compile issue if you don't have sdl2	2015-06-17 12:33:10 -07:00
Sam Gondelman	a37b089b33	merge with master	2015-06-17 12:17:09 -07:00
Brad Davis	4282c044ef	Working on mirror and overlay	2015-06-17 12:01:39 -07:00
Sam Gondelman	45a5f1364a	fix compile issue if you don't have sdl2	2015-06-17 11:56:44 -07:00
Seth Alves	3e758a8f43	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-17 11:53:12 -07:00
Andrew Meadows	61f62f96b0	Merge pull request #5129 from SamGondelman/master ... Integrating gamepads/hydras to input mapping system, zooming	2015-06-17 11:39:38 -07:00
Brad Davis	1e90aaf9c3	Working on overlays still, mirror rendering and overlay order	2015-06-17 11:35:30 -07:00
Seth Alves	85564199c6	git rid if pull-to-point action (spring handles this). add new action which tries to maintain an entity's distance from a given point	2015-06-17 11:22:10 -07:00
Sam Gondelman	17322645f2	added mouselook script, reticle and icons need changes	2015-06-17 11:17:38 -07:00
Brad Davis	5ded9e7eb9	Merge remote-tracking branch 'upstream/master' into overlay	2015-06-17 10:50:01 -07:00
ZappoMan	467609f2b6	standardize skybox and atmosphere batch	2015-06-17 09:44:26 -07:00
ZappoMan	af5a910f58	Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix	2015-06-17 09:36:16 -07:00
ZappoMan	ea98581d22	reorganize files to cleanup headers	2015-06-17 09:18:00 -07:00
ZappoMan	b5731135dd	cleanup	2015-06-17 09:08:41 -07:00
ZappoMan	2356a071dd	some cleanup	2015-06-17 08:48:04 -07:00
Sam Gateau	3176c8e93c	polish before PR	2015-06-17 17:09:33 +02:00
samcake	d703748ec3	trying to solve the rendering of overlay3d	2015-06-17 16:44:02 +02:00
Seth Alves	02d7aa30ab	don't check QtWidgets header for -Wdouble-promotion	2015-06-17 07:02:37 -07:00
Sam Gateau	5c547037f2	Migrating the overaly 3d rendering in their own job and their own shader	2015-06-17 15:54:20 +02:00
samcake	cc65ad3ffb	IMproving the JOb interface	2015-06-17 15:52:11 +02:00
Brad Davis	2bf53b625e	Working on overlays and stats	2015-06-17 02:00:13 -07:00
Sam Gateau	0653be445a	Merge branch 'batch-overlay' of https://github.com/huffman/hifi into yellow	2015-06-17 10:39:45 +02:00
ZappoMan	006899d73f	more hacking almost working	2015-06-16 22:23:14 -07:00
Brad Davis	4762e1a00c	Merge remote-tracking branch 'upstream/master' into overlay ... Conflicts: interface/src/Application.cpp	2015-06-16 21:01:00 -07:00
Brad Davis	659fa2387c	Working on overlays / stats	2015-06-16 21:00:13 -07:00
ZappoMan	569971582d	more hacking on trying to port atmospheres to the new pipeline	2015-06-16 18:39:35 -07:00
Seth Alves	508ae276c6	enable -Wdouble-promotion	2015-06-16 18:23:10 -07:00
ZappoMan	722ac618f5	Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereBatchFix	2015-06-16 17:08:15 -07:00
Ryan Huffman	d47f5a2abb	Update Rectangle, Grid, and Billboard overlays to use batches	2015-06-16 16:45:53 -07:00
ZappoMan	167e7d1377	first cut at atmospheres in batch (doesn't work)	2015-06-16 14:05:14 -07:00
Andrew Meadows	7721f6de96	Merge pull request #5134 from birarda/master ... add goBack and goForward to AddressManager	2015-06-16 13:50:20 -07:00
Philip Rosedale	7ead2bc46b	Merge pull request #5120 from ctrlaltdavid/20576 ... DO NOT MERGE - QA for #20576 - Play sound when mic is muted	2015-06-16 13:27:01 -07:00
Stephen Birarda	1af4b1c54c	cleanup handleUrl call, add disabling of Menu items	2015-06-16 13:17:13 -07:00
Brad Davis	02d33f6086	Working on overlay rendering	2015-06-16 12:14:42 -07:00
Sam Gondelman	156adb1a98	one more coding standard fix	2015-06-16 11:34:59 -07:00
Sam Gondelman	814e22364a	coding standard fixes	2015-06-16 11:30:28 -07:00
Sam Gondelman	1ecc954656	coding standard fixes	2015-06-16 10:25:30 -07:00
Sam Gondelman	68a08d969d	code review fixes	2015-06-16 10:19:40 -07:00
Brad Davis	4f8ea3f624	Merge remote-tracking branch 'upstream/master' into ovr6	2015-06-16 09:58:20 -07:00
Brad Davis	ba13b7820c	Working on overlay refactor	2015-06-16 09:58:03 -07:00
Ryan Huffman	8241a2170b	Update cube, line, and sphere overlays to use batches	2015-06-16 09:50:42 -07:00
Stephen Birarda	8e46043f14	add fixed back/forward, buttons to menu	2015-06-16 08:41:21 -07:00
Sam Gateau	9be87758fd	Improving the design of the Jobs and varying	2015-06-16 15:00:47 +02:00
Brad Davis	1bae590389	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/Application.cpp	2015-06-15 16:13:02 -07:00
Sam Gondelman	22961fcc9d	added camera mode to keep player in center of view	2015-06-15 15:44:56 -07:00
Sam Gondelman	4090fd6aa1	attempt to fix build errors	2015-06-15 12:53:14 -07:00
Sam Gondelman	40bd747080	added trigger buttons to hydra, removed hydraMove.js from default scripts	2015-06-15 11:13:07 -07:00
Leonardo Murillo	c065269ba7	Merging with upstream	2015-06-15 11:58:52 -06:00
Sam Gondelman	fe576c6baf	hands reset when hydras disconnect	2015-06-15 10:23:24 -07:00
Brad Davis	00d8fe75ab	Breaking up overlay into rendering and compositing classes	2015-06-13 17:36:08 -07:00
Brad Davis	e44b21ee0b	Working on functional overlays	2015-06-13 10:36:52 -07:00
Brad Davis	737e418878	Revert "Revert "Merge pull request #5106 from jherico/render_cursor"" ... This reverts commit 0cdc2b53fe.	2015-06-13 10:02:54 -07:00
Brad Davis	dac4a242c1	Removing cruft	2015-06-12 19:47:05 -07:00
Sam Gondelman	1a8df6509f	userinputmapper supports hydra, but some hydra events still register as mouse events	2015-06-12 18:22:56 -07:00
Brad Davis	6fea9a39b2	Trying to get overlay input working	2015-06-12 17:36:13 -07:00
Brad Davis	15d214f335	Initial pass at OpenVR	2015-06-12 17:29:05 -07:00
Brad Davis	a26373bd3a	Fixing merge problem	2015-06-12 17:28:38 -07:00
ZappoMan	648f9bebdf	add LOD stats to the default stats	2015-06-12 15:58:26 -07:00
Philip Rosedale	c834937472	Merge pull request #5122 from huffman/fix-rear-view-mirror ... Fix rear view mirror	2015-06-12 15:49:38 -07:00
Brad Davis	7955eeda28	Merge branch 'master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/ui/ApplicationOverlay.h	2015-06-12 15:49:35 -07:00
Philip Rosedale	b628df45bc	Merge pull request #5121 from ZappoMan/attemptRevertOverlaysBork2 ... REVERT recent changes to overlays that seem to be breaking stuff	2015-06-12 13:50:53 -07:00
Ryan Huffman	ad77374732	Fix setting of _renderMode	2015-06-12 13:03:33 -07:00
ZappoMan	0cdc2b53fe	Revert "Merge pull request #5106 from jherico/render_cursor" ... This reverts commit 4d18bd7cec, reversing changes made to 24fda9a733.	2015-06-12 12:57:24 -07:00
David Rowe	e16116ce78	Have auto mute mic upon losing camera tracking disabled by default	2015-06-12 12:33:42 -07:00
ZappoMan	87951ff7b3	quick hack to fix stats texture bleed through	2015-06-12 11:24:56 -07:00
Sam Gondelman	b4e108cd3b	added zooming to default joystick controls	2015-06-12 10:16:00 -07:00
Atlante45	228f8c2e61	Fix a few items rendering without pipeline	2015-06-12 17:34:16 +02:00
Howard Stearns	27f40ea881	Signal Audio.disconnected, and use new hello/goodbye sounds in resources.	2015-06-11 20:33:30 -07:00
Sam Gondelman	72cc070f0a	enabled remappable zooming (with keyboard: shift + w, shift + s, and others), switches to first person if you zoom in a lot	2015-06-11 18:24:32 -07:00
Brad Davis	09cfe004a1	Combining with new cursor render code	2015-06-11 16:55:23 -07:00
Sam Gondelman	2bdef6205e	added more available inputs to joystick and keyboardmousedevice	2015-06-11 16:20:46 -07:00
Brad Davis	9148b866bb	Merge branch 'render_cursor' into cursor_manager ... Conflicts: interface/src/ui/ApplicationOverlay.cpp	2015-06-11 16:19:57 -07:00
Sam Gondelman	b8b61e7c62	integrated joysticks with userinputmapper, enabling plug-in-and-play controllers and input mapping with js	2015-06-11 15:51:21 -07:00
Brad Davis	92f22bc6d5	Magic number and build errors	2015-06-11 15:40:16 -07:00
Brad Davis	d3cdbc389a	Code cleanup	2015-06-11 15:05:08 -07:00
Brad Davis	b7cd1ea72a	Merge remote-tracking branch 'upstream/master' into render_cursor	2015-06-11 15:04:56 -07:00
Brad Davis	bc206633f5	Fixing overlay rendering in HMD	2015-06-11 14:56:21 -07:00
Brad Hefta-Gaub	24fda9a733	Merge pull request #5085 from SamGondelman/master ... Exposing Input Key Binding To JavaScript	2015-06-11 14:41:34 -07:00
Andrew Meadows	a3c5ea1b58	Merge pull request #5088 from sethalves/actions ... spring action with rotation and position target, rework grab script to use it	2015-06-11 13:23:57 -07:00
Seth Alves	8ed9a3ca02	add handedness setting to avatar-hold action. update stick.js to allow use of hydra	2015-06-11 11:04:19 -07:00
Sam Gondelman	0e8ec81837	fixed lambda capture	2015-06-11 09:41:59 -07:00
Sam Gateau	7685fe2229	Clean up on the item interface and introduction of the Layered concept, fixing the highliting box of the edit tool	2015-06-11 06:40:21 -07:00
Brad Davis	fa27550df4	Merge remote-tracking branch 'upstream/master' into render_cursor	2015-06-11 02:21:02 -07:00
Brad Davis	ef52035300	Working on functional overlays	2015-06-11 02:20:51 -07:00
Clément Brisset	d448a3be7f	Merge pull request #5101 from ZappoMan/fix-attachments ... Get avatar attachments rendering again	2015-06-11 10:35:49 +02:00
Brad Davis	ac0fc5d974	Working on oculus overlay code	2015-06-11 00:57:58 -07:00
Philip Rosedale	b32994b359	Merge pull request #5083 from ctrlaltdavid/20551 ... CR for Job #20551 - Create a directory button that opens up the Directory. Similar to the marketplace	2015-06-10 22:32:25 -07:00
Seth Alves	4216308b9b	Merge branch 'master' of github.com:highfidelity/hifi into actions	2015-06-10 19:05:25 -07:00
Seth Alves	eccf4eb8a8	hold action works	2015-06-10 17:05:49 -07:00
ZappoMan	139855f487	handle remove attachment case	2015-06-10 16:13:17 -07:00
ZappoMan	e06422825a	mostly getting attachments working again	2015-06-10 15:46:54 -07:00
Seth Alves	1c0c7f0fe3	Merge branch 'master' of github.com:highfidelity/hifi into actions	2015-06-10 15:30:28 -07:00
Sam Gateau	1f62fb4b6f	Adding standard vertex and pixel shaders for drawing texture in applicationOverlay	2015-06-10 15:24:29 -07:00
Brad Davis	7f6a49688a	Merge branch 'master' into plugins ... Conflicts: interface/resources/qml/AddressBarDialog.qml interface/src/Application.cpp interface/src/Application.h interface/src/Environment.cpp interface/src/Environment.h interface/src/devices/TV3DManager.cpp interface/src/ui/ApplicationOverlay.h interface/src/ui/overlays/LocalModelsOverlay.cpp	2015-06-10 14:21:48 -07:00
Bradley Austin Davis	1dfc9c89eb	Fix doubled cursor on OSX	2015-06-10 13:57:48 -07:00
Leonardo Murillo	3bd0c7bd87	Code Review changes	2015-06-10 14:35:52 -06:00
Brad Davis	ca1af77763	Working on cursor manager	2015-06-10 13:24:56 -07:00
Leonardo Murillo	869461a01b	Code Review changes	2015-06-10 14:14:00 -06:00
Leonardo Murillo	8f72763f17	Merge branch 'master' of github.com:highfidelity/hifi into auto-updater	2015-06-10 13:18:20 -06:00
Seth Alves	3dcc6c9b8c	make action-factory interface and subclass it in Interface. this allows an action to use avatar data. the login the AvatarActionHold is still bogus.	2015-06-10 12:04:44 -07:00
Brad Davis	7374fb84e8	Working on fixing overlays with team-teaching merge	2015-06-10 09:36:14 -07:00
ZappoMan	aa05d9f67c	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments	2015-06-10 08:53:33 -07:00
Atlante45	8570fe0c19	Shared ptr tweaks	2015-06-10 15:02:26 +02:00
Atlante45	3af8bec3d7	Fix ghost avatars/displaynames	2015-06-10 14:59:27 +02:00
ZappoMan	dbae2c34ba	Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments	2015-06-09 21:55:25 -07:00
ZappoMan	e0adb8e38a	render avatar attachments as model payload items	2015-06-09 12:57:04 -07:00
David Rowe	01b1e9c4ed	Signal domain changes for those handled by ICE as well as not	2015-06-09 12:33:14 -07:00
Brad Hefta-Gaub	fb4e5a70bd	Merge pull request #5077 from jherico/render_cursor ... Always use GL rendered cursor & fix broken cursor after merge	2015-06-09 12:09:24 -07:00
Brad Davis	78ab6a03af	Fixing broken cursor rendering from team-teaching merge	2015-06-09 11:47:19 -07:00
Brad Davis	e5a9fa8cdc	Fixing broken declarations	2015-06-09 11:20:23 -07:00
Brad Davis	78c3ba0e2c	Removing dead code	2015-06-09 10:25:21 -07:00
Brad Davis	64bb120712	Be a little less heavy handed with the GPU sync	2015-06-09 10:25:05 -07:00
Sam Gondelman	0769593ca8	added getters/setters for Inputs and InputChannels	2015-06-09 10:20:36 -07:00
Sam Gondelman	d3a4eec5c5	removed dead code, magic numbers	2015-06-09 09:56:40 -07:00
Leonardo Murillo	1d785c714b	Merge branch 'master' of github.com:highfidelity/hifi into auto-updater	2015-06-09 09:01:50 -06:00
Brad Davis	5680d58a19	Removing oglplus requirement for linux and mac	2015-06-09 03:09:10 -07:00
Brad Davis	6147844f93	Merge branch 'master' into ovr6 ... Conflicts: interface/src/Application.cpp interface/src/avatar/SkeletonModel.cpp interface/src/devices/OculusManager.h	2015-06-09 00:44:06 -07:00
Seth Alves	983ae5b2f0	quiet compiler, fix some whitespace	2015-06-08 21:19:37 -07:00
Brad Davis	c360dde71a	Merge branch 'master' into render_cursor ... Conflicts: interface/src/Application.cpp	2015-06-08 20:18:32 -07:00
ZappoMan	1dca379e1a	dead code removal machine	2015-06-08 15:06:44 -07:00
ZappoMan	b50b7dd500	CR feedback	2015-06-08 14:36:31 -07:00
ZappoMan	8fa31ec521	dead code removal machine	2015-06-08 14:30:31 -07:00
Leonardo Murillo	bd16072053	Conflict fixing	2015-06-08 15:00:06 -06:00
Leonardo Murillo	7aee293df4	Buttons are connected and execting old functions	2015-06-08 14:56:46 -06:00
ZappoMan	24c8e7d0e6	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-08 13:50:50 -07:00
Leonardo Murillo	edce36f5a1	Checkpoint - buttons in place	2015-06-08 14:29:10 -06:00
Leonardo Murillo	bd85ce1312	Auto Update checkpoint - dialog is QML and populated with real data	2015-06-08 13:55:28 -06:00
ZappoMan	5d6112d9c5	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-08 12:29:32 -07:00
Brad Davis	b3534210e4	Always use GL rendered cursor	2015-06-08 11:51:35 -07:00
Stephen Birarda	666830c04d	add a sound once first AM packet received	2015-06-08 11:30:12 -07:00
Leonardo Murillo	83b7054138	Merge branch 'master' of github.com:highfidelity/hifi into auto-updater	2015-06-08 11:55:47 -06:00
Atlante45	36dfec7827	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching	2015-06-08 19:20:33 +02:00
Brad Davis	5faa53d7e9	Working on OVR SDK 0.6	2015-06-08 10:17:34 -07:00
Atlante45	141d8fa055	Use setUniformTexture	2015-06-08 18:55:13 +02:00
Atlante45	31e565868d	Bind simple textured program	2015-06-08 17:15:50 +02:00
Atlante45	8eeb5e435c	Enable/Disable texture for avatar billboards	2015-06-08 17:13:37 +02:00
Atlante45	d3eaa4755c	Partial fix to billboards	2015-06-08 16:43:38 +02:00
Atlante45	34bdcebbf6	More display name work	2015-06-08 16:28:15 +02:00
Atlante45	2bee021a66	Fix Avatar display names	2015-06-08 15:26:17 +02:00
Sam Gateau	de61f4ea0b	Gettting th ehighlight on transparent to work	2015-06-08 02:52:13 -07:00
Bradley Austin Davis	5a52a389be	Working on SDK 0.6	2015-06-07 23:23:21 -07:00
Brad Davis	de268c47b3	Working on 0.6	2015-06-07 18:25:16 -07:00
Bradley Austin Davis	6a60da2a6c	Working on SDK 0.6	2015-06-07 17:58:33 -07:00
Brad Davis	119f37a178	Working on SDK 0.6	2015-06-07 14:34:40 -07:00
David Rowe	8c1ece8865	Fix #include for Unix	2015-06-07 13:57:02 -07:00
David Rowe	36312e7bb4	Remove circular login dialog variation	2015-06-07 13:57:01 -07:00
David Rowe	162395e7fe	Make login password and register links work	2015-06-07 13:56:56 -07:00
David Rowe	a2f262f659	Add basic username, password, login, and error functionality and styling	2015-06-07 13:56:54 -07:00
David Rowe	511832c273	New login dialog background with circular and rectangular variations ... Developer menu item toggles between the two.	2015-06-07 13:56:53 -07:00
Bradley Austin Davis	b56fbd4744	Working on SDK 0.6	2015-06-07 13:56:06 -07:00
Brad Davis	94cd0762bd	Merge pull request #5059 from ctrlaltdavid/20560 ... CR for #20560 - Re-style QML Login Window	2015-06-07 13:19:14 -07:00
Brad Davis	f614268667	Moving windows to SDK 0.6 ... Working on SDK 0.6 for windows Working on SDK 0.6 for windows	2015-06-07 01:40:44 -07:00
Leonardo Murillo	68b419deec	Syncing	2015-06-05 17:11:32 -06:00
David Rowe	7fb434613c	Fix #include for Unix	2015-06-05 15:57:09 -07:00
David Rowe	c7c355c19f	Remove circular login dialog variation	2015-06-05 15:37:25 -07:00
Leonardo Murillo	2236ccf0e1	Merge branch 'master' of github.com:highfidelity/hifi into auto-updater	2015-06-05 16:18:03 -06:00
Leonardo Murillo	dea80d1757	Styling update dialog and working towards passing build details from c++ to qml	2015-06-05 16:17:54 -06:00
Brad Davis	aac527f32c	Merge remote-tracking branch 'upstream/master' into plugins	2015-06-05 13:49:37 -07:00
Niraj Venkat	827d8bd854	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-06-05 13:33:41 -07:00
Niraj Venkat	a3f19e9d4c	Fixing title bar update on teleport	2015-06-05 13:33:14 -07:00
ZappoMan	f8a2fff5a7	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-05 11:06:10 -07:00
ZappoMan	7ebe64b52f	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-05 11:01:17 -07:00
Seth Alves	4e10c28b41	merge from upstream	2015-06-05 10:31:13 -07:00
Seth Alves	edb3622c85	Merge pull request #5037 from AndrewMeadows/inertia ... collision groups for physical objects	2015-06-05 10:26:28 -07:00
Brad Davis	16f55c7557	Fix the skybox jiggle in the HMD	2015-06-05 09:52:56 -07:00
ZappoMan	807cc3db24	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-05 09:37:39 -07:00
Ryan Huffman	b22ed34825	Merge pull request #5051 from ZappoMan/team-teaching-optimize-offset ... TEAM TEACHING - improvements to avatar part clipping	2015-06-05 09:26:45 -07:00
Leonardo Murillo	01236e0159	Merge branch 'master' of github.com:highfidelity/hifi into auto-updater	2015-06-05 09:48:44 -06:00
David Rowe	977eae9f86	Make login password and register links work	2015-06-05 08:42:33 -07:00
Brad Davis	1b7efe9a02	Working on display plugins	2015-06-05 00:00:57 -07:00
Sam Gateau	3a93409080	Merging the day after the flight back to france, getting all the fixes	2015-06-04 23:02:05 -07:00
Seth Alves	9a67f35b59	Merge branch 'master' of github.com:highfidelity/hifi into actions	2015-06-04 19:02:46 -07:00
David Rowe	3388406984	Add basic username, password, login, and error functionality and styling	2015-06-04 18:48:21 -07:00
Eric Levin	5e15c14539	added sanitization for invalid line points data. Fixed bug where occasionally wrong view frustum would be sent to script"	2015-06-04 16:45:32 -07:00
ZappoMan	5146e51d9f	improvements to avatar part clipping	2015-06-04 16:44:46 -07:00
Sam Gondelman	984d449bf9	exposed input key bindings to js to enable key remapping	2015-06-04 16:29:58 -07:00
David Rowe	afc2f374e5	New login dialog background with circular and rectangular variations ... Developer menu item toggles between the two.	2015-06-04 14:39:28 -07:00
Atlante45	94ba84a84c	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod	2015-06-04 18:48:15 +02:00
Atlante45	93b44e6846	Collect stats on translucent/opaque mesh parts	2015-06-04 18:46:47 +02:00
ZappoMan	d2deef97cc	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-04 09:24:37 -07:00
Atlante45	8e21d9c14b	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod	2015-06-04 18:11:17 +02:00
Clément Brisset	7ffe7b31a6	Merge pull request #5041 from ZappoMan/team-teaching-all-entities ... TEAM TEACHING - overlays and entities, fix to shrunken avatars	2015-06-04 18:00:44 +02:00
Atlante45	a4340b17e9	Remove deprecated render stats	2015-06-04 14:47:04 +02:00
Atlante45	41be3fee87	Merge branch 'fix_world_box' of github.com:Atlante45/hifi into lod	2015-06-04 14:39:32 +02:00
Atlante45	96be60c0cf	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod	2015-06-04 14:22:12 +02:00
Atlante45	54b0a03fae	Fix wrong enum used	2015-06-04 13:56:21 +02:00
Atlante45	6dc3bf9285	Fix world box messing up everything	2015-06-04 13:48:39 +02:00
Brad Davis	c86742decb	Merge branch 'master' into plugins	2015-06-04 00:29:24 -07:00
Sam Gateau	329a3b4c7d	force the worldbox to use the simple program which should fix its rendering	2015-06-03 23:29:32 -07:00
ZappoMan	f1f48afd61	more hacking on overlay build busters	2015-06-03 21:17:10 -07:00
ZappoMan	8ec2b55ad8	more hacking on overlay build busters	2015-06-03 21:06:08 -07:00
ZappoMan	b5b37ce2f5	more hacking on overlay build busters	2015-06-03 20:53:56 -07:00
ZappoMan	4438263014	more hacking on overlay build busters	2015-06-03 20:46:59 -07:00
Seth Alves	4414b67837	Merge branch 'master' of github.com:highfidelity/hifi into actions	2015-06-03 20:43:22 -07:00
ZappoMan	6eb9091a01	fix build buster	2015-06-03 20:30:01 -07:00
ZappoMan	bb623eaaed	fix build buster	2015-06-03 19:53:21 -07:00
Leonardo Murillo	4f93328759	Merge branch 'master' of github.com:highfidelity/hifi into auto-updater	2015-06-03 19:39:00 -06:00
Leonardo Murillo	b60597aa90	AutoUpdate is now a singleton invoked via Dependency Manager, first steps towards QML update notification	2015-06-03 19:38:54 -06:00
ZappoMan	49fa407cd5	fix build buster	2015-06-03 17:57:23 -07:00
Brad Davis	17ebcdd1be	Working on display plugins	2015-06-03 17:15:00 -07:00
ZappoMan	7fde574a2a	make model overlays acutally use sub mesh payload items	2015-06-03 16:33:58 -07:00
Stephen Birarda	cf67d22ec7	Merge pull request #5036 from venkatn93/master ... Fixed snapshot bug. Snapshots now save and load ok	2015-06-03 18:57:29 -04:00
Niraj Venkat	29a15453ac	Visual studio tab issues fixed	2015-06-03 15:35:04 -07:00
Niraj Venkat	4db110a6e1	Final fixes. Snapshot should be good now	2015-06-03 15:09:45 -07:00
Niraj Venkat	92248d23e7	more indentation changes	2015-06-03 14:59:07 -07:00
Niraj Venkat	694272ffaa	"fixed" formatting issues and code cleanup	2015-06-03 14:48:25 -07:00
Niraj Venkat	57004c61c7	Fixed snapshot bug. Snapshots now save and load ok	2015-06-03 14:29:39 -07:00
Andrew Meadows	ec0b4a956a	move collision group consts to shared lib	2015-06-03 14:13:51 -07:00
Ryan Huffman	d6878c20b5	Merge branch 'team-teaching' of github.com:highfidelity/hifi into world-box-batch	2015-06-03 12:03:44 -07:00
Andrew Meadows	7b6cc59d30	basic support for collision groups	2015-06-03 11:40:48 -07:00
Sam Gateau	b339aa683a	adding caps for opaque and transparent draw jobs and the ui in js so we can debug the rendered items	2015-06-03 11:25:45 -07:00
Atlante45	7654533888	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod	2015-06-03 19:47:51 +02:00
Atlante45	82133f4e7b	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod	2015-06-03 19:47:18 +02:00
ZappoMan	7c40b666e8	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api	2015-06-03 09:52:40 -07:00
Ryan Huffman	8864a1f298	Merge branch 'team-teaching' of github.com:highfidelity/hifi into world-box-batch	2015-06-03 09:38:17 -07:00
Atlante45	9df1b05184	Introduce outsideEngineDetails	2015-06-03 18:08:43 +02:00
Brad Hefta-Gaub	8b120ea8cd	Merge pull request #5029 from huffman/avatar-batches ... Team Teaching - Avatar batches	2015-06-03 09:06:10 -07:00
Ryan Huffman	b8f3c42712	Update renderWorldBox to use batches	2015-06-03 09:03:04 -07:00
Atlante45	bbf1837796	Introduced RenderDetails/Stats don't pull details ... - Regrouped everything stat in a struct - Details are set into the stats	2015-06-03 16:14:23 +02:00
Brad Davis	a663771853	Merge remote-tracking branch 'upstream/master' into plugins	2015-06-03 00:17:52 -07:00
ZappoMan	2a2be789e4	remove direct call to head/face render since it's a payload item	2015-06-02 22:21:17 -07:00
ZappoMan	ff54334fe1	more work on making avatar models (face included) use render payloads	2015-06-02 22:10:53 -07:00
ZappoMan	a7feca0727	more work on making avatar models (face included) use render payloads	2015-06-02 22:10:00 -07:00
Ryan Huffman	847eccca84	Remove gl polygon offset calls	2015-06-02 22:02:50 -07:00
ZappoMan	c9c434bc8c	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api	2015-06-02 21:04:33 -07:00
ZappoMan	adcb62eb18	more hacking and cleanup	2015-06-02 21:03:34 -07:00
Seth Alves	a31a5a1554	main actions interface is in EntityItem. changes in actions are queued up and applied before simulation step	2015-06-02 19:40:20 -07:00
Leonardo Murillo	4b316c6937	Merge branch 'master' of github.com:highfidelity/hifi into auto-updater	2015-06-02 19:32:19 -06:00
Leonardo Murillo	cefdbc3126	Checkpoint auto updater	2015-06-02 19:32:03 -06:00
Sam Gateau	640071dd35	Avoiding any setVIewTransform in payloadREnder and introducing monitoring values	2015-06-02 18:23:53 -07:00
Ryan Huffman	c4dbf6dae8	Update Avatar rendering to use batches	2015-06-02 17:06:41 -07:00
ZappoMan	4ce27f1483	first cut at rendering avatars as individual model items	2015-06-02 16:54:47 -07:00
Sam Gateau	903837ab4f	exposing some controls on the engine to js for debugging	2015-06-02 15:57:37 -07:00
Sam Gateau	3c7eb4de6d	merging with upstream	2015-06-02 14:48:53 -07:00
Andrew Meadows	2702e07863	Merge pull request #5015 from sethalves/polyvox ... PolyVox improvements -- depends on #5008	2015-06-02 14:34:49 -07:00
Sam Gateau	453fa87654	making sure the proj and view matrix are correctly assigned	2015-06-02 14:31:40 -07:00
Brad Hefta-Gaub	507158e510	Merge pull request #5021 from Atlante45/lod ... Team Teaching - LOD shouldRender in render engine	2015-06-02 12:21:25 -07:00
Brad Davis	9d5a462a63	Working on UI in oculus	2015-06-02 12:18:00 -07:00
Sam Gateau	901717fb2c	trying to fix the issues of model disappearing	2015-06-02 11:52:22 -07:00
ZappoMan	5459b8402c	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-02 11:25:23 -07:00
Sam Gateau	ef2d8a0dbe	tuesday morning rendering poor performances networking issue	2015-06-02 10:58:56 -07:00
Atlante45	c012a581a6	Set shouldRender method	2015-06-02 19:26:39 +02:00
David Rowe	fb379f6c00	Fix crash when setting avatar body with Preferences dialog closed	2015-06-02 08:37:45 -07:00
Philip Rosedale	90dd730a25	Merge pull request #4940 from ctrlaltdavid/20544 ... CR for 20544 - Make eyelids follow iris as head tilts	2015-06-01 23:36:07 -07:00
Brad Davis	f22682fe39	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/Application.h	2015-06-01 22:59:10 -07:00
Sam Gateau	cd7914ad9d	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk	2015-06-01 17:31:39 -07:00
Brad Davis	a483dd27ba	Trying to get widgets / windows working	2015-06-01 17:31:18 -07:00
Sam Gateau	bd7c22e715	Trying to transfer the rnedering from displaySide to RenderDeferredTask	2015-06-01 17:31:00 -07:00
ZappoMan	d4af454834	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-06-01 14:42:35 -07:00
Stephen Birarda	12bcbbf338	Merge pull request #5012 from ctrlaltdavid/20555 ... DO NOT MERGE - QA for #20555 - Re-style QML Address Bar	2015-06-01 17:08:00 -04:00
samcake	50f3d2d12b	Merge pull request #5014 from ZappoMan/team-teaching-scene-api ... TEAM TEACHING - report correct part bounds	2015-06-01 13:55:55 -07:00
ZappoMan	750d9c0616	poor mans version of mesh part bounds	2015-06-01 12:53:09 -07:00
samcake	98c0cd7d23	Merge pull request #5009 from ZappoMan/team-teaching-scene-api ... TEAM TEACHING - hacking on rendering mesh parts	2015-06-01 12:24:27 -07:00
ZappoMan	4b46fc3ad9	cleanup Model::renderPart()	2015-06-01 11:11:27 -07:00
ZappoMan	1b8572640b	more hacking sams tweaks	2015-06-01 09:07:32 -07:00
David Rowe	e41b4c1b7b	Add new address bar dialog error message ... Implemented as a new simple InformationDialog so that can try it out without reworking MessageDialog immediately for all QML UI.	2015-06-01 09:01:11 -07:00
Sam Gateau	83c4a52454	Cleaning for PR	2015-05-31 19:34:03 -07:00
Sam Gateau	33d397a440	A fist update solution for the item	2015-05-31 19:10:37 -07:00
Brad Davis	23d6725a6a	Consolidating GL display plugins	2015-05-31 00:24:19 -07:00
Sam Gateau	ddec8fd26f	Trying to find a good solution for update message & data	2015-05-30 13:57:05 -07:00
Brad Davis	fec214c552	Working on consistent input response	2015-05-30 02:01:11 -07:00
Sam Gondelman	c19115a485	actually fixed billboard	2015-05-29 16:53:01 -07:00
Brad Davis	2758718c8d	Merge remote-tracking branch 'upstream/master' into plugins ... Conflicts: interface/src/ui/DialogsManager.cpp interface/src/ui/DialogsManager.h	2015-05-29 16:50:59 -07:00
Brad Davis	912c003d58	Making (most) plugins into a library	2015-05-29 16:49:11 -07:00
Sam Gondelman	4c83c6918d	fixed avatar billboards not displaying	2015-05-29 16:44:16 -07:00
Sam Gateau	7bde81e95f	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft	2015-05-29 15:50:31 -07:00
Sam Gateau	f04f3bda72	Introducing the RenderDeferredTask class which moves the current rendering pipeline into the render::ENgine scheme	2015-05-29 15:44:14 -07:00
samcake	f8a90684ce	Merge pull request #5000 from huffman/scene-overlay ... Team Teaching - Move overlay rendering to Scene pipeline	2015-05-29 15:31:46 -07:00
Ryan Huffman	b37a023041	Remove all overlays from Scene on desctruction	2015-05-29 14:55:53 -07:00
Ryan Huffman	3f5b115c67	Move _overlays after scene in Application so it destructs first	2015-05-29 14:55:32 -07:00
Ryan Huffman	667dccbb87	Add Item::INVALID_ITEM_ID and use in overlays	2015-05-29 13:43:49 -07:00
Sam Gateau	eef8077417	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk	2015-05-29 13:20:43 -07:00
Seth Alves	1a26421414	Merge branch 'master' of github.com:highfidelity/hifi into created-time-is-a-property	2015-05-29 13:04:45 -07:00
Atlante45	d8168811b3	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-29 19:58:22 +02:00
Seth Alves	b0f6826d17	Merge pull request #4995 from birarda/domain-dtls ... speed up initial connection to domains	2015-05-29 10:50:01 -07:00
Howard Stearns	8e245ec4c2	getCollisionEvents has a side-effect on state (removing END events from further consideration), so it must be called once per step. ... Otherwise entities never get to see end events. Also, entity collision processing should only be done when there are outgoing changes (just like for avatar).	2015-05-29 09:59:21 -07:00
Ryan Huffman	b4806f5aac	Fix render::PendingChanges using render::Scene::PendingChanges	2015-05-29 09:40:52 -07:00
Ryan Huffman	0e5cf273ab	Fix AABox bounds handling in Overlays	2015-05-29 09:40:23 -07:00
Ryan Huffman	b21d0a3a53	Remove Overlays::renderWorld from Application	2015-05-29 09:40:03 -07:00
Brad Davis	a94f257381	Working on plugin library	2015-05-29 09:03:44 -07:00
Ryan Huffman	2222468e89	Remove Overlays::renderWorld	2015-05-29 08:53:40 -07:00
Ryan Huffman	874f722504	Remove unused Avatar::Pointer typedef	2015-05-29 08:51:37 -07:00
Ryan Huffman	1089490658	Move overlay rendering to Scene	2015-05-29 08:51:25 -07:00
Seth Alves	0cf9afd8ec	attempt to save _created as an iso date in utc	2015-05-28 21:21:57 -07:00
Sam Gateau	dd9cafcd09	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk	2015-05-28 18:14:41 -07:00
Sam Gateau	3f8bdc14c4	reinserting culling, lod and depth sort to the rendering	2015-05-28 18:01:31 -07:00
Stephen Birarda	5749fefcd5	have show DS connect refresh existing dialog	2015-05-28 17:07:57 -07:00
Stephen Birarda	7f86ca3f10	refresh the network dialog if it is already up	2015-05-28 17:07:20 -07:00
Brad Davis	1c49dde6f8	Merge branch 'master' into plugins ... Conflicts: CMakeLists.txt	2015-05-28 14:30:19 -07:00
Brad Hefta-Gaub	1c3398f27e	Merge pull request #4991 from ZappoMan/team-teaching ... TEAM TEACHING - merge from master	2015-05-28 13:52:18 -07:00
Howard Stearns	0f30ec2ccc	Undo the merge with the broken master checking. What could go wrong?	2015-05-28 13:48:27 -07:00
Howard Stearns	810c766f77	When an entity is added or changed with a collisionSoundURL, cache it so that it is ready to play on the first hit.	2015-05-28 12:50:02 -07:00
ZappoMan	1029a8af7c	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api	2015-05-28 12:38:16 -07:00
ZappoMan	a0e51469d3	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-28 12:36:34 -07:00
ZappoMan	2fba5a0928	more work on simple renderable	2015-05-28 12:19:43 -07:00
Andrew Meadows	2a4cd468e4	Merge pull request #4979 from sethalves/polyvox ... initial pass at Polyvox Entity Type	2015-05-28 10:43:50 -07:00
Seth Alves	065f19d527	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-28 10:31:44 -07:00
Brad Davis	171b6d18d0	Merge branch 'master' into plugins ... Conflicts: interface/src/ui/ApplicationOverlay.cpp	2015-05-28 10:31:20 -07:00
Atlante45	bca80addef	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into text-renderer	2015-05-28 16:13:24 +02:00
Seth Alves	a91a7942a4	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-28 06:59:39 -07:00
Atlante45	10c2f3f561	More TextRenderer work	2015-05-28 14:51:57 +02:00
Brad Davis	e5bec42512	Fix mouse emulation picking and pointer positioning for the hydra	2015-05-27 23:36:00 -07:00
Andrew Meadows	4e073c77b3	Merge pull request #4978 from sethalves/fix-4973 ... recreate PR #4973 with some additional changes -- removed const keywo…	2015-05-27 21:11:28 -07:00
ZappoMan	763e6dd97b	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-27 19:58:11 -07:00
Seth Alves	4fa6f388b9	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-27 18:20:59 -07:00
Brad Hefta-Gaub	bcc24c9762	Merge pull request #4975 from huffman/scene-avatar ... Team Teaching - Move avatar rendering to Scene pipeline	2015-05-27 17:13:10 -07:00
Brad Hefta-Gaub	5da3a9440e	Merge pull request #4964 from howard-stearns/remove-global-collision-and-update-examples ... [REQUIRES #4962] Remove global collision and update examples	2015-05-27 16:09:14 -07:00
Stephen Birarda	734798a365	fix move of connection steps to LNL	2015-05-27 15:50:31 -07:00
Ryan Huffman	ea6b620d8a	Add declarations for avatar payload functions	2015-05-27 14:53:49 -07:00
Seth Alves	386b3301f4	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-27 14:46:37 -07:00
Seth Alves	bfa0e9c234	recreate PR #4973 with some additional changes -- removed const keyword from qinvokables for avatar getter methods such as getVelocity	2015-05-27 14:44:23 -07:00
Seth Alves	ba0467aafe	Revert "removed const keyword from Q_INVOKABLE for avatar getter methods such…"	2015-05-27 14:10:45 -07:00
Seth Alves	7f99f261c2	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-27 13:59:13 -07:00
Ryan Huffman	c5a3edee09	Fix error with duplicate variable names	2015-05-27 13:13:52 -07:00
Ryan Huffman	00db7fca70	Update avatar rendering to set displayLookAtVectors	2015-05-27 13:11:29 -07:00
Ryan Huffman	825e071ac0	Add overrides to MyAvatar::render*	2015-05-27 13:02:48 -07:00
Ryan Huffman	c13254a9c4	Merge branch 'team-teaching' of github.com:highfidelity/hifi into scene-avatar ... Conflicts: interface/src/Application.cpp	2015-05-27 12:44:52 -07:00
Brad Davis	810db39233	Working on oculus rendering	2015-05-27 12:42:05 -07:00
Ryan Huffman	f972e84d6c	Move avatar renedering to Scene	2015-05-27 12:40:26 -07:00
Ryan Huffman	389d5556f5	Update Avatar*Pointers to use std::*_ptr instead of Q*Pointer	2015-05-27 12:36:55 -07:00
David Rowe	a2272d3f42	Fix Windows C4351 build warning ... VS2013 warns about default initialization of arrays because it behaved differently in previous versions. Default initialization is what we expect now that we're using VS2013 so we can disable this warning globally.	2015-05-27 11:49:00 -07:00
Eric Levin	eb0f35e041	removed const keyword from qinvokables for avatar getter methods such as getVelocity	2015-05-27 11:44:37 -07:00
ZappoMan	4654ed95ac	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api	2015-05-27 10:40:24 -07:00
ZappoMan	2516066e1d	some hacking	2015-05-27 10:40:07 -07:00
Howard Stearns	4b4bf9fd90	Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples	2015-05-27 09:29:06 -07:00
Seth Alves	c80f2970fd	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-27 07:37:51 -07:00
Sam Gateau	58e3fe695c	Refining once more for sir gcc on Ubuntu	2015-05-27 01:32:40 -07:00
Sam Gateau	a5c5cc9b70	First Item really rendering , for the WorldBox, desigining more of the RenderContext and task interface	2015-05-27 01:15:14 -07:00
Brad Davis	dd87707c7b	Merge remote-tracking branch 'upstream/master' into plugins	2015-05-26 18:36:12 -07:00
Brad Davis	b5e6b737c4	Working on display plugins	2015-05-26 17:32:41 -07:00
Stephen Birarda	9cb6ccaa46	thread safe timing of domain connection	2015-05-26 16:49:18 -07:00
Seth Alves	55028f6cb0	voxel data sent over wire and saved to json	2015-05-26 16:34:35 -07:00
Stephen Birarda	08affbfd0d	fix table size calculations	2015-05-26 16:14:12 -07:00
Stephen Birarda	5b5518077d	fix headers and stats for domain connection timing	2015-05-26 15:51:00 -07:00
Stephen Birarda	61029fd0b1	add ability to display domain connection times	2015-05-26 15:22:25 -07:00
ZappoMan	20ceb72d92	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-26 15:01:26 -07:00
Stephen Birarda	626f22191c	add a QAbstractTableModel for domain connection steps	2015-05-26 14:17:02 -07:00
Andrew Meadows	16e5710325	Merge pull request #4954 from ZappoMan/entitysmartpointers ... EnitityItem smart pointers	2015-05-26 14:05:03 -07:00
Sam Gateau	e5755f52e5	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into daft	2015-05-26 13:57:10 -07:00
samcake	84525aabec	Merge pull request #4959 from ZappoMan/team-teaching-entitysmartpointer ... TEAM TEACHING BRANCH - Entity Smart Pointers	2015-05-26 13:56:47 -07:00
Howard Stearns	3c718af43f	Merge branch 'master' of https://github.com/highfidelity/hifi into remove-global-collision-and-update-examples	2015-05-26 13:26:02 -07:00
Sam Gateau	ad0b0cfade	FIxing one more issue with compilation on ubuntu regarding the template functions specializationand the namespace	2015-05-26 11:40:35 -07:00
Atlante45	76fc59675b	Merge branch 'team-teaching' into text-renderer	2015-05-26 20:01:26 +02:00
Atlante45	46c86f7c10	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-26 20:01:00 +02:00
samcake	dd9d758da1	Fixing the compilation issue for real	2015-05-26 10:53:23 -07:00
Stephen Birarda	f28ade1075	log connection times for eventual stats display	2015-05-26 10:37:44 -07:00
ZappoMan	c92e7bed87	andrews CR feedback	2015-05-26 09:44:02 -07:00
ZappoMan	d1520c5502	andrews CR feedback	2015-05-26 09:23:27 -07:00
Sam Gateau	0083ba6f85	trying again	2015-05-25 17:39:31 -07:00
Sam Gateau	ad054a640e	Fixing a problem with Mac/ubuntu build maybe	2015-05-25 17:21:03 -07:00
Howard Stearns	cbf4e09a10	Remove global collision event.	2015-05-25 16:10:50 -07:00
Brad Davis	e651c722c3	Merge remote-tracking branch 'upstream/master' into plugins	2015-05-25 15:22:28 -07:00
Sam Gateau	f0ab6d96f5	merge with upstream team-teaching	2015-05-24 19:45:37 -07:00
Sam Gateau	35b8d45bee	Insert a first scene and the engine in the Application and render a first Item	2015-05-24 17:03:43 -07:00
ZappoMan	9988f2d1cd	EnitityItem smart pointers	2015-05-22 22:38:02 -07:00
Atlante45	a44054f9db	Make TextureCache::getImageTexture static	2015-05-23 03:24:26 +02:00
ZappoMan	8b78fc4190	EnitityItem smart pointers	2015-05-22 17:57:50 -07:00
Brad Davis	e69362dadc	Working on stereo rendering	2015-05-22 17:51:59 -07:00
Stephen Birarda	69f1cd80e6	immediately send ICE heartbeat once data present	2015-05-22 16:29:01 -07:00
Ryan Huffman	47d9cf42c5	Remove unused lodManager	2015-05-22 16:04:05 -07:00
Ryan Huffman	05f8ba558f	Update RenderArgs construction in paintGL	2015-05-22 16:02:24 -07:00
Ryan Huffman	1d12744781	Remove commented out code	2015-05-22 15:34:19 -07:00
Ryan Huffman	d1a5662ca7	Merge branch 'team-teaching' of github.com:highfidelity/hifi into ctx ... Conflicts: libraries/entities-renderer/src/EntityTreeRenderer.cpp	2015-05-22 15:33:40 -07:00
Ryan Huffman	3f22b5f8b3	Add RenderArgs to more render methods	2015-05-22 15:25:53 -07:00
Brad Hefta-Gaub	ce613d4960	Merge pull request #4947 from samcake/punk ... Introducing the Engine and its Tasks	2015-05-22 15:15:16 -07:00
ZappoMan	160898ce96	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-22 14:55:29 -07:00
Sam Gateau	a28c99bb40	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk	2015-05-22 14:40:00 -07:00
Brad Hefta-Gaub	dec1686228	Merge pull request #4943 from Atlante45/simple_program ... TEAM TEACHING - Simple program uses transform stack	2015-05-22 14:39:13 -07:00
Sam Gateau	373ccd07ec	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into punk	2015-05-22 13:14:57 -07:00
Sam Gateau	e7e3eb2b7c	FIrst version of the design for the Engine, the Tasks and a DrawTask. Introduced the ItemFilter	2015-05-22 12:58:18 -07:00
Andrew Meadows	461d08c0a9	merge upstream/master into andrew/bispinor	2015-05-22 11:35:02 -07:00
Atlante45	20ff43e29a	Don't sync by default	2015-05-22 20:29:25 +02:00
Andrew Meadows	0431e8da36	put avatar body in right spot, and give it mass	2015-05-22 11:08:56 -07:00
Brad Hefta-Gaub	da8f99508c	Merge pull request #4871 from huffman/console-error ... Add error handling to JSConsole	2015-05-22 10:57:18 -07:00
Ryan Huffman	5ac02f66ca	Remove const from ApplicationOverlay::renderOverlay	2015-05-22 09:58:20 -07:00
Ryan Huffman	6fd474a1a3	Fix comment	2015-05-22 09:56:21 -07:00
Atlante45	c6ce5e7680	PerformanceTimer deactivated when not in use	2015-05-22 18:54:40 +02:00
Ryan Huffman	4a4c9c75fc	Add gpu::context to RenderArgs and start using RenderArgs in place of the flags	2015-05-22 09:50:51 -07:00
David Rowe	c530c530ef	Make eyelids follow iris as head tilts - for DDE and no face tracking	2015-05-22 09:24:41 -07:00
Andrew Meadows	01cc629224	fix crashes during init and shutdown	2015-05-22 09:20:08 -07:00
Atlante45	e5aa696dda	syncInputStateCache	2015-05-22 17:39:08 +02:00
Atlante45	f089143cf1	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching	2015-05-22 17:16:51 +02:00
Atlante45	5d2187cedf	Remove non batch call to bind/releaseSimpleProgram	2015-05-22 16:37:02 +02:00
David Rowe	a0c3c974a9	Throttle DDE face acquisition attempts in order to reduce CPU usage	2015-05-21 19:44:38 -07:00
Brad Davis	ac93d2c721	Working on display plugins	2015-05-21 18:50:11 -07:00
Andrew Meadows	ac8cac9783	avatars use DYNAMIC motion	2015-05-21 16:37:10 -07:00
Andrew Meadows	2e3973dfdd	impl AvatarMotionState::set/getWorldTransform()	2015-05-21 15:34:30 -07:00
Andrew Meadows	67f5d0773d	some list management of AvatarMotionStates	2015-05-21 14:40:47 -07:00
Brad Davis	c0d84cfc54	Merge branch 'master' into plugins ... Conflicts: interface/src/Application.cpp	2015-05-21 11:04:06 -07:00
ZappoMan	c7fb8fab85	Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching-scene-api	2015-05-21 10:36:22 -07:00
ZappoMan	e1c5c5b12e	Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into team-teaching-scene-api	2015-05-20 18:42:54 -07:00
Seth Alves	38edc27cbb	Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux	2015-05-20 18:24:40 -07:00
samcake	496898273c	Merge pull request #4846 from jherico/dk1 ... Second attempt at fixing the HMD eye projections, without breaking the camera this time.	2015-05-20 17:02:28 -07:00
Seth Alves	782402b4c8	Merge branch 'master' of github.com:highfidelity/hifi into no-id-swap-redux	2015-05-20 14:53:05 -07:00
Brad Hefta-Gaub	79023763ef	Merge pull request #4869 from ctrlaltdavid/20543 ... CR for #20543 - Option to auto-mute mic if step away from PC when face tracking is enabled	2015-05-20 14:47:31 -07:00
Seth Alves	124ff68cee	make EntityItemID a subclass of QUuid	2015-05-20 14:22:08 -07:00
Howard Stearns	c5b8dd51d8	Fix https://app.asana.com/0/32622044445063/34195351184789 ... Handle collision events when we do other updates (and their entity scripts) rather than when we do the physic updates while the tree is locked. Given that, remove the check that kept sound from playing (or scripts from running) when we would have deadlocked, because now we don't.	2015-05-20 11:07:03 -07:00
Seth Alves	a769cfdaf2	client decides on new entity-ids, keep EntityItemID class	2015-05-20 10:42:19 -07:00
Brad Davis	827d7f6221	Merge branch 'master' into dk1	2015-05-20 09:41:20 -07:00
Atlante45	9b49936d29	TextRenderer memory leak	2015-05-20 16:41:47 +02:00
Andrew Meadows	2f4162f447	cleanup of AvatarManger API	2015-05-19 16:53:30 -07:00
Seth Alves	f9d46b0cb5	interface decides on entityIDs rather than bouncing a temporary id through the entity server	2015-05-19 14:25:23 -07:00
Andrew Meadows	f86c419988	stubbery for collidable avatars	2015-05-19 14:15:26 -07:00
Atlante45	a9a0c9f387	Render 3D overlays before entities ... This gets rid of some issues due to entities moving to render pipeline	2015-05-18 17:13:32 +02:00
Atlante45	a7ee10001a	Remove used deprecated methods ... Also added a warning on the single one in use right now, so that it gets deleted once it is moved to the rendering pipeline	2015-05-18 16:37:28 +02:00
Brad Davis	7f2552c690	Merge branch 'master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/ui/ApplicationOverlay.cpp interface/src/ui/PreferencesDialog.cpp	2015-05-16 22:38:15 -07:00
Sam Cake	580339e99f	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-05-15 17:24:59 -07:00
Sam Cake	e9ff06df24	FIx the issue where the view frustum used in the skybox wasn;t in sync with the true camera, except if shadows is on, THe one call missing is now always executed	2015-05-15 17:22:29 -07:00
Philip Rosedale	36b396b9ef	Merge pull request #4881 from ctrlaltdavid/fix-binary-eyelid ... Fix visibility of binary eyelid control menu item	2015-05-15 17:19:15 -07:00
Philip Rosedale	0d00393eff	Merge pull request #4854 from ctrlaltdavid/fix-facetracker-rotation ... Fix facetracker rotation	2015-05-15 17:17:30 -07:00
David Rowe	d3cb6a9334	Fix visibility of binary eyelid control menu item	2015-05-15 09:40:32 -07:00
Brad Davis	6797174b97	Fix picking in the HMD	2015-05-14 19:15:47 -07:00
Seth Alves	41d77e6146	Merge pull request #4852 from AndrewMeadows/nova ... improved distributed simulation ownership negotiation	2015-05-14 11:40:49 -07:00
Ryan Huffman	0cd60782e7	Add error handling to JSConsole	2015-05-14 11:00:30 -07:00
Philip Rosedale	e0e026c639	Merge pull request #4862 from birarda/master ... fixes for other avatar receive stats rendering	2015-05-14 10:19:09 -07:00
Andrew Meadows	81d06e0dc3	Merge upstream/master into andrew/nova ... Conflicts: libraries/entities/src/EntityItem.cpp libraries/entities/src/EntityItemProperties.cpp	2015-05-14 10:09:55 -07:00
Brad Hefta-Gaub	d1f52231be	Merge pull request #4863 from samcake/orange ... Using the skymap for ambient lighting	2015-05-14 09:12:46 -07:00
David Rowe	ff7b2016b4	Add option to auto mute microphone after lose face tracking	2015-05-14 08:50:43 -07:00
David Rowe	95a565627c	Make DDE isTracking() behave the same as Faceshift's	2015-05-14 08:49:44 -07:00
Brad Davis	e20d2ffb15	Merge typo	2015-05-13 21:39:04 -07:00
Brad Davis	c94b8b6e30	Merge branch 'master' into dk1 ... Conflicts: interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp	2015-05-13 21:25:56 -07:00
Brad Hefta-Gaub	77019eafa7	Merge pull request #4831 from jherico/plugins_pt2 ... Display plugins part 2	2015-05-13 20:40:33 -07:00
Brad Hefta-Gaub	3b7acae8a2	Merge pull request #4850 from jherico/web-entity ... Web entity	2015-05-13 17:02:55 -07:00
Sam Cake	d13106f4c9	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-05-13 16:00:42 -07:00
Stephen Birarda	57fa3d8c53	fixes for other avatar receive stats rendering	2015-05-13 14:43:31 -07:00
Brad Davis	3b7e8a69b5	Attempting to fix threading issues with web entities	2015-05-13 14:00:41 -07:00
Bradley Austin Davis	a0097bcff8	Fixing offscreen rendering on retina display, even without a proxy window	2015-05-13 12:26:46 -07:00
Seth Alves	80749195e6	don't ddeTracker->init if HAVE_DDE isn't set	2015-05-13 11:44:42 -07:00
David Rowe	7319c7b767	Fix face-tracked head rotation for Faceshift, also	2015-05-13 11:35:04 -07:00
David Rowe	5050171d30	Fix face-tracked head disappearing into body ... Normalize quaternion to ensure that acos(r.w) is valid (r.w <= 1.0) and r.w = 1.0 when r.x = r.y = r.z = 0.0.	2015-05-13 11:34:19 -07:00
Sam Cake	8324268ec8	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-05-13 11:32:39 -07:00
Philip Rosedale	96b761357b	Merge pull request #4853 from huffman/remove-scripts-tip ... Remove scripts 'Tip' label and fix tool window heights	2015-05-13 11:21:49 -07:00
Philip Rosedale	a5c49b7a13	Merge pull request #4813 from ctrlaltdavid/20532 ... CR for 20532 - Default face tracking to Use Camera for first time users	2015-05-13 11:06:46 -07:00
Brad Davis	9b6c20d93c	Merge remote-tracking branch 'upstream/master' into web-entity	2015-05-13 09:49:53 -07:00
Bradley Austin Davis	fc825f6632	Fixing the loading of local HTML so it works on both OSX and win32	2015-05-13 09:46:24 -07:00
Ryan Huffman	7ff9422717	Fix runningScripts and tool window height	2015-05-13 09:45:18 -07:00
Andrew Meadows	fb34a5ba84	renaming and cleanup	2015-05-13 08:44:10 -07:00
Philip Rosedale	b658c26799	Merge pull request #4840 from jherico/menu ... Only display new menu in VR mode	2015-05-13 08:15:04 -07:00
Brad Davis	a8d343bbf1	Working on web entities	2015-05-13 00:27:57 -07:00
Sam Cake	04d3f690dc	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-05-12 23:12:37 -07:00
Sam Cake	536fff4502	Trying to create the SH from the skybox cubemap	2015-05-12 23:11:52 -07:00
David Rowe	8a3c8e0d9a	Merge branch 'master' into 20532 ... Conflicts: interface/src/devices/DdeFaceTracker.cpp	2015-05-12 17:41:12 -07:00
Philip Rosedale	349886c146	Merge pull request #4847 from birarda/domain-paths ... add initial support for local paths in domain	2015-05-12 17:09:13 -07:00
Philip Rosedale	65277e0573	Merge pull request #4836 from ctrlaltdavid/20535 ... CR for #20535 - Improve DDE eyelid control	2015-05-12 17:00:02 -07:00
Brad Davis	8c4f802dbf	Merge remote-tracking branch 'upstream/master' into web-entity ... Conflicts: libraries/entities/src/EntityItemProperties.h libraries/entities/src/EntityTypes.h	2015-05-12 15:56:02 -07:00
Stephen Birarda	8c9a14cd9d	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-paths	2015-05-12 15:04:59 -07:00
Brad Davis	f42e0c696a	Merge branch 'master' into menu	2015-05-12 14:58:42 -07:00
Brad Davis	41d587bd2e	Revert "Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"" ... This reverts commit 6e8c067bcb. Conflicts: interface/src/Camera.h	2015-05-12 14:47:44 -07:00
Brad Davis	32c1b5e4c5	Merge remote-tracking branch 'upstream/master' into dk1 ... Conflicts: interface/src/Camera.h	2015-05-12 14:46:34 -07:00
Brad Davis	02a6b557dd	Restoring position as a slot	2015-05-12 14:45:38 -07:00
Brad Davis	64d0aa39dd	Merge branch 'master' into dk1	2015-05-12 14:43:33 -07:00
samcake	6e8c067bcb	Revert "Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff"	2015-05-12 14:34:43 -07:00
Stephen Birarda	332601b91c	final fixes for path query from DS	2015-05-12 14:34:14 -07:00
samcake	7c255738af	Merge pull request #4837 from jherico/dk1 ... Fixing HMD asymmetrical projections (esp DK1) and santizing the transform stuff	2015-05-12 12:30:32 -07:00
Brad Davis	f844dcd25f	Only display new menu in VR mode	2015-05-12 09:05:24 -07:00
Atlante45	00864afe53	Quiet compiler	2015-05-12 17:06:40 +02:00
Clément Brisset	91939ff4ed	Merge pull request #4832 from jherico/magnifier ... Fix magnifier location	2015-05-12 14:32:23 +02:00
Clément Brisset	9bf4cf1262	Merge pull request #4830 from ZappoMan/moreZoneProperties ... New Zone Features	2015-05-12 14:28:01 +02:00
Brad Davis	666caf0d59	Working on fixing DK1 and santizing the transform stuff	2015-05-12 00:44:30 -07:00
Brad Hefta-Gaub	f56b5fcdcd	Merge pull request #4833 from samcake/blue ... Clean the cube map loading behavior	2015-05-11 18:40:42 -07:00
Seth Alves	866a6fba9b	Merge pull request #4823 from birarda/master ... repairs to AC stop and clean shutdown	2015-05-11 18:11:52 -07:00
David Rowe	5832259643	Add preferences slider for webcam eyelid closing threshold	2015-05-11 17:11:52 -07:00
David Rowe	667ad9b0cb	Add menu option to enable/disable binary webcam eyelid control	2015-05-11 17:11:51 -07:00
ZappoMan	a2a1bf4e8c	make stars fade in as sun drops below horizon	2015-05-11 16:32:27 -07:00
Stephen Birarda	68af209417	call Setting::init from Interface setupEssentials	2015-05-11 16:20:03 -07:00
Brad Davis	69937d21f2	Addressing the actual gcc bug	2015-05-11 14:40:10 -07:00
Brad Davis	44238d02ae	Tweak the tv 3d manager to get around apparent GCC bug	2015-05-11 14:30:59 -07:00
ZappoMan	73428ec12d	add support to not displace very large clipboards on import	2015-05-11 14:21:58 -07:00
Sam Gateau	f2c4e04a5a	clean up for pr	2015-05-11 14:06:10 -07:00
Brad Davis	b29fbfe693	Merge branch 'magnifier' into plugins_pt2	2015-05-11 13:59:07 -07:00
Brad Davis	e58976fe5a	Fix magnifier location	2015-05-11 13:56:49 -07:00
Brad Davis	abab54aed8	Working on display plugins	2015-05-11 13:08:53 -07:00
Brad Davis	6a5c7b8b42	Merge remote-tracking branch 'upstream/master' into plugins_pt2 ... Conflicts: libraries/script-engine/src/MenuItemProperties.cpp	2015-05-11 12:40:17 -07:00
Brad Davis	1624ca4120	Merge branch 'master' into plugins_pt2	2015-05-11 12:32:49 -07:00
Seth Alves	ead200b77a	remove unneeded code	2015-05-11 12:03:10 -07:00
Seth Alves	9bd101ee2a	oops	2015-05-11 12:01:59 -07:00
Seth Alves	de9e74a725	put max-octree-pps in Application rather than in the Octree	2015-05-11 12:01:13 -07:00
Seth Alves	83748096ef	max pps for an octree-query is a per-query thing, not an application-wide thing. move the settings-related max-octree-pps stuff into the entity tree	2015-05-11 11:37:53 -07:00
Stephen Birarda	8c6715e4fc	resolve conflicts on merge with upstream/master	2015-05-11 11:10:22 -07:00
Sam Gateau	72c3270ec6	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2015-05-11 10:48:29 -07:00
Clément Brisset	421ebeb3d7	Merge pull request #4795 from birarda/sequence-numbers ... add sequence number support to NL, don't double send data from AvatarMixer	2015-05-11 19:23:33 +02:00
Philip Rosedale	c3828e4152	Merge pull request #4782 from ctrlaltdavid/20531 ... DO NOT MERGE - QA for #20531 - Don't flash whole screen when audio clips	2015-05-11 10:18:07 -07:00
Sam Gateau	d51904b7b3	fixing file	2015-05-09 11:43:21 -07:00
Sam Gateau	5a11143a5d	Using the skybox cubemap for ambient lighting	2015-05-09 11:40:46 -07:00
David Rowe	5092e385b1	Disable "calibrate" menu item if webcam isn't enabled	2015-05-08 18:39:22 -07:00
David Rowe	15b8dc4144	Don't start calibration if the camera is muted	2015-05-08 18:18:15 -07:00
David Rowe	e26147fc94	Do a reset at the end of calibration	2015-05-08 18:17:59 -07:00
David Rowe	b3b735032d	Automatically calibrate if Use Camera is enabled ... Do at start up or when Use Camera is first enabled per program run.	2015-05-08 18:16:59 -07:00
David Rowe	9f6bc080c9	Default face tracking to Use Camera for first-time users ... First time start up with face tracking enabled.	2015-05-08 17:45:21 -07:00
Bradley Austin Davis	230d1701b4	Merge remote-tracking branch 'upstream/master' into plugins	2015-05-08 17:14:39 -07:00
Brad Hefta-Gaub	a517e773f4	Merge pull request #4786 from ctrlaltdavid/20530 ... CR for #20530 - Add DDE calibration	2015-05-08 16:25:02 -07:00
Stephen Birarda	ddb52348bc	don't force use of Settings to all QCoreApplication	2015-05-08 16:24:39 -07:00
Bradley Austin Davis	9f8a384c72	Merge branch 'plugins_pt2' into plugins	2015-05-08 16:05:51 -07:00
Brad Hefta-Gaub	bfb2b278ee	Merge pull request #4791 from jherico/scale ... Fixing scale resolution issues	2015-05-08 15:54:24 -07:00
Bradley Austin Davis	03bd17ed49	Rebasing onto scale changes	2015-05-08 15:09:46 -07:00
Bradley Austin Davis	0751443a01	Merge branch 'master' into scale	2015-05-08 15:03:24 -07:00
Bradley Austin Davis	5f12af75bd	Tweaking to match master	2015-05-08 11:11:46 -07:00
Bradley Austin Davis	9974eb0357	Merge branch 'master' into plugins	2015-05-08 10:49:28 -07:00
Atlante45	6d0ca40aae	Set pointer to nullptr after delete	2015-05-08 18:21:42 +02:00
Clément Brisset	55bcb992d9	Merge pull request #4796 from sethalves/fix-octree-max-pps ... Fix octree max pps	2015-05-08 16:28:42 +02:00
Clément Brisset	cc4ec8edda	Merge pull request #4799 from ctrlaltdavid/destroy-trackers ... Delete Leap and RealSense devices on shutdown	2015-05-08 16:17:00 +02:00
Bradley Austin Davis	5e821b4447	Updating plugins	2015-05-07 22:32:28 -07:00
David Rowe	c4e9807259	Merge branch 'master' into 20531 ... Conflicts: interface/src/ui/ApplicationOverlay.cpp	2015-05-07 21:01:22 -07:00
David Rowe	e20df0e2bf	Delete Leap and RealSense devices on shutdown ... Leaving them running prevents a clean shutdown on Windows when running Interface.exe from a command line: the interface.exe process stays alive preventing Interface from being run again from the command line without manually terminating the running process.	2015-05-07 18:28:49 -07:00
Andrew Meadows	0942ed5654	Merge pull request #4790 from ctrlaltdavid/face-mute-shortcut ... Add shortcut key for face tracker muting	2015-05-07 16:56:19 -07:00
Seth Alves	c1e3500f3c	voxelDetailsForCode returns a ratio, cubeinfrustrum takes meters	2015-05-07 16:01:08 -07:00
Stephen Birarda	305835ea79	Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers	2015-05-07 15:38:35 -07:00
David Rowe	cac6ae1148	Merge branch 'master' into 20530	2015-05-07 13:34:42 -07:00
Bradley Austin Davis	efa88ba122	Merge branch 'scale' into plugins	2015-05-07 12:52:13 -07:00
Bradley Austin Davis	c31d36be59	Fixing scale resolution issues	2015-05-07 12:01:56 -07:00
Seth Alves	d52a45b57e	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-07 11:30:46 -07:00
Atlante45	f761ba521a	Quiet compiler	2015-05-07 20:16:03 +02:00
Seth Alves	ddec6d5207	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-07 09:54:09 -07:00
David Rowe	0eeff526d5	Add shortcut key for face tracker muting	2015-05-07 08:51:59 -07:00
Atlante45	cafaeed822	Restore polygon mode after entities rendering ... Default setting are causing issues so we just reset the polygon mode since this won't matter once everything has moved to the new rendering pipeline.	2015-05-07 13:34:22 +02:00
Atlante45	00571dad00	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-07 10:13:59 +02:00
Sam Gateau	bba7dcfe5f	Try to fix the transform stack issue in 1st person	2015-05-06 23:32:02 -07:00
Bradley Austin Davis	b73ce81a2d	Working on plugin architecture	2015-05-06 22:28:34 -07:00
Seth Alves	fabff7fdf4	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-06 18:26:00 -07:00
Bradley Austin Davis	28c873ba59	Merge branch 'master' into plugins	2015-05-06 16:37:59 -07:00
David Rowe	afce981d83	Merge branch 'master' into 20530 ... Conflicts: interface/src/Application.cpp interface/src/devices/DdeFaceTracker.cpp interface/src/devices/DdeFaceTracker.h	2015-05-06 16:27:33 -07:00
Seth Alves	e73503a53d	Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1	2015-05-06 16:05:13 -07:00
Andrew Meadows	584b643791	lock entitySimulation during physics simulation	2015-05-06 16:01:00 -07:00
Philip Rosedale	72da678bc2	Merge pull request #4785 from jherico/scale ... Fix ensmallened overlay UI	2015-05-06 15:30:01 -07:00
Bradley Austin Davis	561d275dda	Fix ensmallened overlay UI	2015-05-06 15:18:17 -07:00
Bradley Austin Davis	0d509ceeea	Working on merging	2015-05-06 15:07:31 -07:00
Seth Alves	a057d7dfa3	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-06 14:41:54 -07:00
Brad Hefta-Gaub	5551997cdc	Merge pull request #4780 from samcake/blue ... Add support for Skybox and rendering path of background according to Zones	2015-05-06 14:41:06 -07:00
Seth Alves	fe06ce2931	pull from upstream	2015-05-06 14:31:22 -07:00
Bradley Austin Davis	77a9f7fa2a	Merge branch 'plugins_pt1' into plugins	2015-05-06 14:22:13 -07:00
Bradley Austin Davis	3c10d29d53	Removing another reference to oculus manager	2015-05-06 14:09:43 -07:00
David Rowe	1fdf2c7803	Don't flash whole screen when audio clips	2015-05-06 13:35:53 -07:00
Bradley Austin Davis	351246fac1	Fixing new image texture use from last upstream merge	2015-05-06 12:50:20 -07:00
David Rowe	4cd4dee84d	Use average coefficient values to zero out bias ... Adjust control thresholds to suit.	2015-05-06 12:26:44 -07:00
Sam Gateau	1b5185abeb	fix the conditional on the texture pointer which was wrong and bring back atmosphere sky dome	2015-05-06 12:19:19 -07:00
Seth Alves	a72ac3ead2	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-06 12:19:04 -07:00
Bradley Austin Davis	ea6f840fdb	Merge remote-tracking branch 'upstream/master' into plugins_pt1	2015-05-06 12:18:04 -07:00
Brad Hefta-Gaub	4de6d645e5	Merge pull request #4701 from jherico/infoview ... Infoviews & Browser in QML	2015-05-06 12:12:21 -07:00
Bradley Austin Davis	fc73676b4d	Merge branch 'master' into plugins_pt1	2015-05-06 11:43:25 -07:00
David Rowe	a6dd08fea8	Calculate average coefficient values	2015-05-06 11:38:14 -07:00
Bradley Austin Davis	4c22e637d7	Merge remote-tracking branch 'upstream/master' into off_axis	2015-05-06 11:28:03 -07:00
Bradley Austin Davis	c832fd969a	Removing off-axis projection from menu	2015-05-06 11:26:46 -07:00
Seth Alves	238a41f2b9	pull from upstream	2015-05-06 11:22:18 -07:00
Clément Brisset	9f8e52652b	Merge pull request #4771 from ctrlaltdavid/20526 ... CR for #20526 - Fix Mixamo avatar clipping in HMD view	2015-05-06 20:17:07 +02:00
David Rowe	e1b5e7caf6	Add DDE calibration count-down	2015-05-06 11:13:19 -07:00
Brad Hefta-Gaub	b27154186b	Merge pull request #4779 from jherico/hmd_tools ... Fix for HMDTools targeting wrong screen on OSX	2015-05-06 10:46:55 -07:00
Bradley Austin Davis	de49057f17	Fix for HMDTools targeting wrong screen on OSX	2015-05-06 10:32:45 -07:00
Stephen Birarda	5b1514a390	Merge branch 'master' of https://github.com/highfidelity/hifi into sequence-numbers	2015-05-06 10:12:17 -07:00
David Rowe	eb438e9ccb	Can use same clipping calc for non-Oculus	2015-05-06 09:58:14 -07:00
Philip Rosedale	e2541c4243	Merge pull request #4740 from ctrlaltdavid/20518 ... CR for #20518 - Mute camera button next to mute audio button	2015-05-06 09:54:42 -07:00
Sam Gateau	c86a8b3944	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2015-05-06 09:54:08 -07:00
Sam Gateau	dc81a3ecc2	Cube texture are working with the GL backend, useing it in SKybox successfullly	2015-05-06 09:53:36 -07:00
Seth Alves	7a5fe8a34e	quiet compiler	2015-05-06 09:05:13 -07:00
Seth Alves	ff104bb915	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-06 08:55:06 -07:00
David Rowe	9c1d73747f	Merge branch 'master' into 20526	2015-05-06 08:24:57 -07:00
Atlante45	6d2fe945af	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-06 09:53:57 +02:00
David Rowe	ceeb1dd81f	Remove unused DDE member variables	2015-05-05 21:15:33 -07:00
David Rowe	91a06ea3c4	Add "Calibrate Camera" menu item for DDE face tracking	2015-05-05 21:15:32 -07:00
David Rowe	b519884609	Fix lobby not displaying in HMD mode ... This usage of Glower is similar to that in renderAvatarBillboard(). Both may indicate that something needs changing in the graphics pipeline.	2015-05-05 20:54:12 -07:00
David Rowe	1c21874f00	Make face tracker mute action start / stop face tracker	2015-05-05 16:51:31 -07:00
Seth Alves	4a7fe50084	Merge branch 'master' of github.com:highfidelity/hifi into dice-on-table-1	2015-05-05 16:43:43 -07:00
Andrew Meadows	419cfee775	more correct fix for invalid DeviceProxy crash bug	2015-05-05 15:06:51 -07:00
Andrew Meadows	0d4d5d024e	revert last change (fix for invalid DeviceProxy)	2015-05-05 14:59:22 -07:00
David Rowe	35dbb9491c	Merge branch 'master' into 20518	2015-05-05 13:13:49 -07:00
Seth Alves	8aafce6382	Merge branch 'nova' of github.com:AndrewMeadows/hifi into dice-on-table-1	2015-05-05 12:53:28 -07:00
Atlante45	429c1e1231	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-05 21:33:55 +02:00
Stephen Birarda	6b3cf1ba4a	remove dependency of PacketHeaders on NodeList	2015-05-05 12:19:42 -07:00
Sam Gateau	13482575d2	merge	2015-05-05 12:03:45 -07:00
Sam Gateau	6d02d4d25e	adding skybox step by step	2015-05-05 11:40:00 -07:00
Andrew Meadows	00bea4d274	fix crash for NULL deviceProxy	2015-05-05 11:05:28 -07:00
samcake	61f6139f4f	Merge pull request #4764 from ZappoMan/atmosphereInZones ... First cut at adding "Atmosphere" support to zone	2015-05-05 11:00:58 -07:00
Bradley Austin Davis	d2a8681139	Merge branch 'master' into infoview	2015-05-05 10:31:19 -07:00
Andrew Meadows	aa5a59c3dc	merge upstream/master into andrew/nova ... Conflicts: libraries/entities/src/EntityItem.cpp libraries/physics/src/PhysicsEngine.cpp	2015-05-05 10:24:17 -07:00
Atlante45	aa10dc3991	Merge branch 'master' of https://github.com/highfidelity/hifi into display_zones	2015-05-05 15:04:11 +02:00
Philip Rosedale	e9476029fb	Merge pull request #4724 from jherico/menu_polish ... Menu polish	2015-05-04 23:44:06 -07:00
David Rowe	7afd990e2e	Fix Mixamo avatar clipping in HMD view	2015-05-04 22:27:41 -07:00
Philip Rosedale	d52d3513a4	Merge pull request #4768 from jherico/track-camera ... Remove camera wobble caused by having a face tracker enabled	2015-05-04 18:01:47 -07:00
ZappoMan	77232e35f8	Merge branch 'master' of https://github.com/highfidelity/hifi into atmosphereInZones	2015-05-04 17:16:33 -07:00
Bradley Austin Davis	dc1b5a262f	Remove camera wobble cause by the face tracker and by idle animations	2015-05-04 17:03:33 -07:00
ZappoMan	32ef0c2010	removed some dead code	2015-05-04 15:49:21 -07:00
ZappoMan	741323e6c1	wire up atmosphere.hasStars property	2015-05-04 14:19:13 -07:00
Sam Gateau	b36775e781	After a very long debate it's clear that we shouldn;t have change the a and d keys behavior, so we bring them back but with a twist, now RIghtButton + A or D strafe right and left making the controller equivalent to everquest, world of warcraft	2015-05-04 13:57:40 -07:00
ZappoMan	4561c59203	wire up zone to environment atmosphere rendering	2015-05-04 13:49:43 -07:00
Bradley Austin Davis	098a9bd70e	Fixing sixense and restoring lookat	2015-05-04 13:10:16 -07:00
Bradley Austin Davis	8119e3d629	Merging back from part 1	2015-05-04 11:35:28 -07:00
Stephen Birarda	a039d5f28c	Merge pull request #4753 from samcake/orange ... Introducing UserInputMapper	2015-05-04 14:26:51 -04:00
Sam Gateau	fad623ae48	ANd really add the 2 files we need	2015-05-04 10:47:33 -07:00
Sam Gateau	936eefd4f0	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-05-04 10:41:32 -07:00
Sam Gateau	c7153bcc14	fixing commetns from review	2015-05-04 10:40:11 -07:00
Stephen Birarda	aeb04cf9c3	use existing numerical constant in Avatar	2015-05-04 10:28:28 -07:00
Stephen Birarda	6cff75f7c1	resolve conflicts on merge with upstream/master	2015-05-04 10:05:44 -07:00
Bradley Austin Davis	fb3e309a64	Merge branch 'master' into plugins_pt1	2015-05-04 10:00:13 -07:00
Stephen Birarda	7eb965f24f	Merge pull request #4756 from thoys/patch-4 ... Fix for RealSense menu item	2015-05-04 12:46:25 -04:00
Thijs Wenker	9a6e442b25	Fix for RealSense menu item ... This was missed while moving to the new MenuWrapper class.	2015-05-04 18:07:48 +02:00
Atlante45	12fcb35717	Made RenderArgs a default ctor	2015-05-04 17:22:46 +02:00
Atlante45	fc1519c078	Quiet compiler	2015-05-04 16:49:33 +02:00
Sam Gateau	3921156978	fix end of line	2015-05-04 01:09:25 -07:00
Sam Gateau	b7bacccce7	Fine tunning on windows	2015-05-04 00:54:54 -07:00
samcake	8e65ce34d1	FINe tune the scales for the Mac Book	2015-05-03 23:47:43 -07:00
Sam Gateau	116e29ae57	adjust the timer for touch event to work around the missing touch begin / touch end	2015-05-03 18:40:55 -07:00
Sam Gateau	ae14396fd7	adjust the key mapping for mac book and the scales	2015-05-03 18:03:27 -07:00
samcake	d2e61dba05	Make the nw mapper work for th einputs	2015-05-03 17:34:39 -07:00
Sam Gateau	c9b296693c	bringing the UserInputMapper to the application	2015-05-03 15:45:19 -07:00
Seth Alves	0341caad95	quiet compiler	2015-05-03 11:10:52 -07:00
Andrew Meadows	fef84730bf	remake foundation for CollisionEvents	2015-05-03 09:27:15 -07:00
Brad Davis	e72756ab99	Merge remote-tracking branch 'upstream/master' into plugins_pt1 ... Conflicts: libraries/render-utils/src/TextureCache.cpp	2015-05-02 00:51:50 -07:00
Brad Davis	302aa9db47	Removing access to the gl widget and display managers	2015-05-02 00:49:52 -07:00
Philip Rosedale	d7cc76e48b	Merge pull request #4735 from jherico/menu_fix ... Prevent the menu from coming up when alt is applied as a modifier to touch or mouse events	2015-05-02 00:35:49 -07:00
Stephen Birarda	0dbc4780ab	use numerical constants header from LeapMotion	2015-05-01 17:18:35 -07:00
Andrew Meadows	0a102575ee	fix simulation ownership infection	2015-05-01 16:56:00 -07:00
Stephen Birarda	b9c9ff6a14	clean up various warnings	2015-05-01 16:49:13 -07:00
Stephen Birarda	edade7baba	resolve conflicts on merge with upstream master	2015-05-01 16:24:16 -07:00
Brad Davis	e6c241b75b	Merge branch 'master' into plugins	2015-05-01 15:16:06 -07:00
Brad Davis	d8415ce79b	Working on display plugins	2015-05-01 15:14:50 -07:00
Andrew Meadows	3031d55c8e	merge upstream/master into andrew/nova	2015-05-01 11:03:51 -07:00
Andrew Meadows	b023fe582a	make things compile	2015-05-01 10:44:50 -07:00
Brad Davis	1e2106e831	Whitespace removal	2015-05-01 10:36:03 -07:00
Brad Davis	a482fa0a6d	Working on plugin rendering model:	2015-05-01 10:35:15 -07:00
Stephen Birarda	94739cf8d3	move number constants out of SharedUtil to NumericalConstants	2015-05-01 10:26:53 -07:00
Andrew Meadows	4cb469dd79	cleanup how MotionStates are deleted from physics ... also fixed some compile errors removed cruft	2015-05-01 08:28:32 -07:00
David Rowe	7bc995be5e	Add camera muting icons	2015-04-30 23:14:24 -07:00
David Rowe	528f73897c	Make double click face tracking toggle button reset tracking	2015-04-30 23:14:23 -07:00
David Rowe	bc05159504	Add face tracking toggle button beside microphone toggle button	2015-04-30 23:14:22 -07:00
David Rowe	d053379831	Add "Mute Face Tracking" menu item	2015-04-30 23:14:21 -07:00
Brad Davis	ba4ae3762d	Working on merging in master	2015-04-30 22:01:03 -07:00
Brad Davis	57b7be3abe	Prevent the menu from coming up when alt is applied as a modifier to touch or mouse events	2015-04-30 17:43:16 -07:00
David Rowe	e45ecbe2c8	Merge branch 'master' into 20513 ... Conflicts: interface/src/devices/DdeFaceTracker.cpp interface/src/devices/DdeFaceTracker.h	2015-04-30 17:22:35 -07:00
David Rowe	807eab9fc4	Fix typo	2015-04-30 12:59:09 -07:00
Brad Davis	031b294ae5	Merge branch 'master' into plugins ... Conflicts: interface/src/Application.cpp interface/src/Camera.cpp interface/src/Camera.h interface/src/ui/ApplicationOverlay.cpp interface/src/ui/ApplicationOverlay.h libraries/render-utils/src/GlowEffect.cpp libraries/render-utils/src/GlowEffect.h libraries/render-utils/src/TextureCache.cpp	2015-04-30 12:14:07 -07:00
Brad Davis	2fa92af4ab	Merge branch 'plugins2' into plugins ... Conflicts: interface/src/Application.cpp interface/src/plugins/Plugin.h interface/src/plugins/render/OculusBaseRenderPlugin.cpp interface/src/plugins/render/OculusBaseRenderPlugin.h interface/src/plugins/render/RenderPlugin.h interface/src/plugins/render/Tv3dRenderPlugin.cpp interface/src/plugins/render/Tv3dRenderPlugin.h interface/src/ui/ApplicationOverlay.cpp interface/src/ui/ApplicationOverlay.h	2015-04-30 11:04:06 -07:00
Stephen Birarda	17142a532f	add stats for max FRD and num avatars last frame	2015-04-30 10:09:23 -07:00
David Rowe	b6890be73d	Adjust eyebrow filter strength	2015-04-30 08:06:46 -07:00
David Rowe	42a4fd8884	Add velocity filtering of DDE eyebrows	2015-04-30 07:55:02 -07:00
David Rowe	81e23eab28	Coding standard	2015-04-29 22:15:49 -07:00
Brad Hefta-Gaub	40d2e97d44	Merge pull request #4673 from ctrlaltdavid/20496 ... CR for 20496 - Modify lobby.js to work as avatar selector	2015-04-29 21:51:08 -07:00
Andrew Meadows	31ab16ac62	move stuff into ObjectMotionState	2015-04-29 16:16:44 -07:00
Andrew Meadows	5a388a0c14	Merge pull request #4722 from birarda/avatar-mixer-debug ... add option to display AvatarData receive stats with display name	2015-04-29 10:00:24 -07:00
Andrew Meadows	ab38572620	new PhysicsEngine API is mostly in place ... doesn't compile, of course large code movements are done non-physical kinematics have been lost -- will readd in PhysicalEntitySimuation class	2015-04-29 09:48:02 -07:00
Bradley Austin Davis	c4349e797f	Merge remote-tracking branch 'upstream/master' into infoview	2015-04-29 00:15:32 -07:00
Brad Hefta-Gaub	7414201845	Merge pull request #4721 from ctrlaltdavid/20514 ... DO NOT MERGE - QA for 20514 - Move "Stereo Audio" option into developerMenu.js	2015-04-28 20:44:09 -07:00
Stephen Birarda	f9a25d7089	add Menu option to toggle Avatar receive stats	2015-04-28 18:27:54 -07:00
Stephen Birarda	f2dcacffd0	show avatar data receive rate by default with display name	2015-04-28 18:27:42 -07:00
Brad Davis	0fb8884f9c	Merge branch 'browser' into infoview ... Conflicts: tests/ui/src/main.cpp	2015-04-28 17:54:04 -07:00
samcake	ff2b1af18c	Merge pull request #4720 from ZappoMan/hackTest ... Fix entities rendering wrong when avatar scale !== 1.0	2015-04-28 17:30:15 -07:00
Brad Davis	fb2ea3185e	Merge branch 'master' into infoview	2015-04-28 16:42:20 -07:00
Stephen Birarda	404cd67bb7	Merge pull request #4716 from sethalves/assignment-client-exits ... assignment-client shouldn't try to save contents of its nonexistent address bar	2015-04-28 19:40:44 -04:00
Brad Davis	60ee137004	Merge remote-tracking branch 'upstream/master' into browser	2015-04-28 16:40:37 -07:00
ZappoMan	664d126465	remove scale from Camera class since it was only used by avatar and was causing problems with no obvious benefit	2015-04-28 16:34:33 -07:00
ZappoMan	aec0bd1693	dont change camera scale with avatar scale	2015-04-28 16:26:17 -07:00
samcake	85cd6cbff2	Merge pull request #4700 from jherico/vr_menus ... VR menus	2015-04-28 15:59:46 -07:00
Andrew Meadows	14b6ee608a	more PhysicalEntitySimulation implementation ... with changes to API's accordingly (does not compile yet)	2015-04-28 15:07:37 -07:00
ZappoMan	bfbad539e0	hack test	2015-04-28 14:54:58 -07:00
David Rowe	9576ad19a7	Move "Stereo Audio" option into developerMenu.js ... And rename it "Stereo Input" to better relect what it does.	2015-04-28 14:14:10 -07:00
Seth Alves	28ad80936a	assignment-client shouldn't try to save contents of its nonexistent address bar. interface still needs to save the address.	2015-04-28 13:21:14 -07:00
David Rowe	1d7420d0dc	Adapt DDE control of eyes to be predominantly open or closed	2015-04-28 12:53:11 -07:00
Andrew Meadows	087d0a027d	merge upstream/master into andrew/nova	2015-04-28 10:07:49 -07:00
Andrew Meadows	34974272af	proposal for PhysicsEngine API in Application	2015-04-28 10:06:05 -07:00
Andrew Meadows	e646ff6847	Merge pull request #4708 from ctrlaltdavid/fix-audio-mouth ... Fix audio-driven mouth viewed by others	2015-04-28 09:28:22 -07:00
Clément Brisset	bc8f6708b6	Merge pull request #4698 from ctrlaltdavid/fps-facetracker ... Facetracker FPS refactor	2015-04-28 14:04:17 +02:00
Brad Davis	f49f37ac89	Merge pull request #4670 from thoys/fix-run_one_interface_per_user ... Multiple instances of interface on Windows (one per user)	2015-04-28 01:22:21 -07:00
Brad Davis	f467abcf91	Merge branch 'vr_menus' into browser	2015-04-28 01:18:03 -07:00
Brad Davis	9836ffed97	Merge branch 'vr_menus' into infoview ... Conflicts: tests/ui/src/main.cpp	2015-04-28 01:17:51 -07:00
Brad Davis	b4e9dbedbc	Merge remote-tracking branch 'upstream/master' into vr_menus	2015-04-28 00:28:57 -07:00
Brad Davis	f86b9f62b9	Adding key to trigger a browser window	2015-04-27 23:16:35 -07:00
Brad Davis	b0eccc40c2	Fix crash cause when Menu::instance() is before offscreen ui startup	2015-04-27 22:58:09 -07:00
David Rowe	d6eb04c3b0	Fix audio-driven mouth viewed by others	2015-04-27 21:43:57 -07:00
Brad Davis	7bd8bbf565	Merge branch 'vr_menus' into infoview	2015-04-27 18:33:45 -07:00
ZappoMan	62a421361c	fix crash in scripts using useAvatar methods	2015-04-27 16:58:34 -07:00
Brad Davis	59b8b80148	Merge remote-tracking branch 'upstream/master' into vr_menus ... Conflicts: interface/src/Menu.cpp	2015-04-27 16:02:13 -07:00
Andrew Meadows	72deb2e49b	merge upstream/master into andrew/thermonuclear ... Conflicts: libraries/entities/src/EntityItem.h libraries/physics/src/EntityMotionState.cpp	2015-04-27 12:54:21 -07:00
Seth Alves	bdc6bb3c2d	Merge branch 'master' of github.com:highfidelity/hifi into detect-ballistic	2015-04-27 12:20:58 -07:00
Brad Davis	14b660baf7	Merge branch 'vr_menus' into infoview ... Conflicts: tests/ui/src/main.cpp	2015-04-27 11:43:49 -07:00
Brad Davis	76ce34a74b	Scanning for code style	2015-04-27 11:41:10 -07:00
Brad Davis	d55d467d3f	Tweaking VR menu for PR	2015-04-27 11:35:57 -07:00
Brad Davis	1a912787c2	Merge branch 'ui-refactor' into vr_menus	2015-04-27 11:05:14 -07:00
Brad Davis	a12bfd95f4	Merge remote-tracking branch 'upstream/master' into ui-refactor ... Conflicts: libraries/render-utils/src/MatrixStack.h	2015-04-27 10:59:57 -07:00
Seth Alves	b23427a3c8	hook up menu-items to control debug rendering of collision hulls and owned simulations	2015-04-27 10:32:47 -07:00
Seth Alves	2cdbe8bf7b	merge from upstream	2015-04-27 09:57:36 -07:00
Seth Alves	e007617112	hook up menu-items to control debug rendering of collision hulls and owned simulations	2015-04-27 09:56:24 -07:00
Brad Davis	b216689b45	Removing old infoview, testing new dialogs	2015-04-27 00:02:11 -07:00
Brad Davis	198224c4ec	Merge branch 'ui-refactor' into menu2	2015-04-25 16:48:05 -07:00
Brad Davis	7c16fd05c1	Merge branch 'master' into ui-refactor	2015-04-25 16:35:43 -07:00
Brad Davis	a96f69a673	Switching to a wrapper mechanism for VR menus	2015-04-25 16:20:15 -07:00
David Rowe	6071e44ba4	Regularize debug messages for Faceshift and DDE	2015-04-25 11:35:14 -07:00
David Rowe	c37eb3de8a	Fix DDE shutdown	2015-04-25 11:34:50 -07:00
David Rowe	736691e3ec	Refactor face tracking FPS calculation	2015-04-25 11:33:32 -07:00
Seth Alves	b69cba1aba	respond to code-review	2015-04-25 10:50:18 -07:00
Brad Davis	ee30588fd4	More menu work	2015-04-25 10:41:06 -07:00
Seth Alves	0fb1a83e3b	quiet compiler, remove some trailing control-Ms	2015-04-25 09:20:00 -07:00
Atlante45	ba507cef98	Fix a few warnings	2015-04-25 11:01:02 +02:00
Brad Davis	fbdb9b143e	Merge branch 'ui-refactor' into m_and_m ... Conflicts: interface/resources/qml/HifiMenu.qml interface/resources/qml/MessageDialog.qml interface/resources/qml/Root.qml interface/resources/qml/TestRoot.qml interface/resources/qml/controls/Dialog.qml interface/src/Application.cpp interface/src/ui/LoginDialog.cpp libraries/ui/src/MessageDialog.cpp libraries/ui/src/MessageDialog.h libraries/ui/src/OffscreenQmlDialog.h libraries/ui/src/OffscreenUi.cpp libraries/ui/src/OffscreenUi.h tests/ui/src/main.cpp	2015-04-24 18:02:12 -07:00
Brad Davis	9fbd5d79e4	Removing duplicate declaration	2015-04-24 17:46:56 -07:00
Brad Davis	dab8761c71	Merge remote-tracking branch 'upstream/master' into ui-refactor	2015-04-24 16:46:48 -07:00
Brad Davis	08d60c6a01	Fixing message dialog	2015-04-24 16:19:39 -07:00
Brad Davis	e5df17eb99	Merge pull request #4691 from ZappoMan/defaultAvatars ... fix default avatars on first run	2015-04-24 16:17:26 -07:00
Brad Hefta-Gaub	dbb1e3c820	Merge pull request #4682 from jherico/offscreen ... Attempting to fix backspace issue in new UI	2015-04-24 16:10:42 -07:00
Brad Hefta-Gaub	4fccb74855	Merge pull request #4692 from huffman/checkbox-fix ... Checkbox fix	2015-04-24 16:08:52 -07:00
Clément Brisset	23ac8b1c8c	Merge pull request #4693 from ctrlaltdavid/faceshift-fps ... Log Faceshift FPS after a reset	2015-04-24 23:59:37 +02:00
David Rowe	e33f3c9d00	Remove unnecessary #include	2015-04-24 13:42:56 -07:00
Ryan Huffman	547b0e5ee6	Update style of webview to only be set when 'fusion' exists	2015-04-24 13:42:03 -07:00
Andrew Meadows	7cd9023e23	build Avatar shape on SkeletonModel load	2015-04-24 13:26:26 -07:00
Andrew Meadows	79cb55eabc	rename setJointStates() --> initJointStates()	2015-04-24 13:26:26 -07:00
Andrew Meadows	c4395e75bb	cleanup and comments	2015-04-24 13:26:26 -07:00
Brad Davis	99a6e1f86c	Breaking up offscreen UI work	2015-04-24 13:21:21 -07:00
Brad Davis	1ff8c67576	More work on menus and some code cleanup	2015-04-24 12:54:11 -07:00
David Rowe	a141ebbf93	Log Faceshift FPS after a reset	2015-04-24 12:49:41 -07:00
Ryan Huffman	df591f9ad7	Set style of webview	2015-04-24 11:49:33 -07:00
ZappoMan	37928dcd6d	fix default avatars on first run	2015-04-24 11:30:18 -07:00
Atlante45	fb5a0c8b01	Only send touchUpdateEvent if it is one ... ie. not for touchBeginEvent	2015-04-24 18:50:45 +02:00
Clément Brisset	9c5f384080	Merge pull request #4683 from ctrlaltdavid/dde-revert ... Revert DDE start-up permission change	2015-04-24 14:34:00 +02:00
Clément Brisset	efc5e5d52b	Merge pull request #4684 from ctrlaltdavid/dde-fps ... Log DDE FPS after a reset	2015-04-24 14:28:26 +02:00
Brad Davis	c0d562ed55	Merge branch 'offscreen' into m_and_m	2015-04-23 23:45:11 -07:00
Brad Davis	a4619c8e59	Merge branch 'master' into offscreen	2015-04-23 23:41:36 -07:00
Brad Davis	1d316a1872	Still working on menus	2015-04-23 23:41:09 -07:00
Brad Davis	f17387fab4	Working on menus	2015-04-23 21:23:21 -07:00
David Rowe	1678d77af6	Log DDE FPS after a reset	2015-04-23 17:18:32 -07:00
Brad Davis	8cb298a55b	Working on menus	2015-04-23 14:23:15 -07:00
Brad Davis	3ba0df5201	Fixing headers	2015-04-23 14:23:13 -07:00
Brad Davis	8269b9925b	Adding first pass at message box	2015-04-23 14:23:12 -07:00
Brad Davis	a9d65f168b	Working on marketplace dialog	2015-04-23 14:23:11 -07:00
David Rowe	d10621f329	Revert DDE start-up permission change	2015-04-23 14:16:59 -07:00
Brad Davis	ae804357d8	Attempting to fix backspace issue in new UI	2015-04-23 14:10:54 -07:00
Brad Hefta-Gaub	ad7293d4ad	Merge pull request #4679 from jherico/offscreen ... Fix a couple of bugs with the new offscreen UI	2015-04-23 12:45:51 -07:00
Brad Davis	ac7b373231	Throttle rendering needs to ensure it's active context	2015-04-23 10:27:28 -07:00
Ryan Huffman	b31f95a002	Fix cube rendering not working with transparency	2015-04-23 09:34:23 -07:00
Brad Hefta-Gaub	82d3302d1b	Merge pull request #4644 from jherico/offscreen ... Working on new-UI implementations of address bar and login	2015-04-23 07:17:45 -07:00
Brad Davis	eab4ad9ea9	More coding standard stuff	2015-04-22 20:16:41 -07:00
Brad Davis	732e9723cd	Messed up rename	2015-04-22 19:24:43 -07:00
Brad Davis	c4d2bd2cda	More coding standard fixes	2015-04-22 19:18:09 -07:00
Brad Davis	8d8c4babba	Coding standard fixes	2015-04-22 19:06:22 -07:00
David Rowe	35e2b87a70	Rename DDE menu items	2015-04-22 13:15:57 -07:00
David Rowe	649d4736cd	Merge branch 'master' into dde-miscellaneous	2015-04-22 13:00:40 -07:00
David Rowe	63d0efcdec	Open and close avatar selector with Ctrl-A	2015-04-22 09:48:09 -07:00
Brad Davis	e68f149aac	Fixing bad merge	2015-04-21 13:18:53 -07:00
Brad Davis	7a33474245	Merge remote-tracking branch 'upstream/master' into offscreen ... Conflicts: interface/src/Menu.cpp	2015-04-21 13:02:38 -07:00
Seth Alves	284215d46a	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-21 09:53:15 -07:00
Thijs Wenker	85e9a794a3	ability to run multiple interfaces on single Windows machine by switching user accounts (or using run as)	2015-04-21 03:58:39 +02:00
Seth Alves	64c23b8e8b	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-20 16:56:24 -07:00
David Rowe	1af17fa9e7	Use voice to control DDE mouth ... Add voice blend coefficient values to DDE values.	2015-04-20 16:14:36 -07:00
Clément Brisset	b64d7fc17c	Merge pull request #4662 from birarda/remove-visage ... remove visage support	2015-04-20 20:06:21 +02:00
David Rowe	766087c032	Run DDE "readonly" ... Try to fix some people having to run Interface in admin mode on Windows	2015-04-20 10:29:53 -07:00
David Rowe	8268dc95ac	Include DDE reset in sensors reset	2015-04-20 10:28:17 -07:00
Seth Alves	f452e47577	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-20 08:49:33 -07:00
Brad Hefta-Gaub	29971a5c59	Merge pull request #4664 from samcake/orange ... Teaching Project, Cleaning the interface for the default Sun light properties and more	2015-04-19 09:57:04 -07:00
Brad Davis	16efa2a46f	Improving toggle visibility and loading behavior	2015-04-17 16:59:04 -07:00
Stephen Birarda	511240da5a	remove Visage from FaceTracker comment	2015-04-17 14:29:51 -07:00
Stephen Birarda	6b615c1ba1	remove Visage from menu header	2015-04-17 14:28:20 -07:00
David Rowe	931c46345e	Move visibility methods into DiscoverabilityManager	2015-04-17 14:15:50 -07:00
Stephen Birarda	30e580e207	remove visage from Menu	2015-04-17 13:42:30 -07:00
Stephen Birarda	604bc2abe1	remove visage related files	2015-04-17 13:40:31 -07:00
Stephen Birarda	3055359d4c	remove visage references from Application	2015-04-17 13:40:18 -07:00
Sam Gateau	11879f6142	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-17 13:04:00 -07:00
Philip Rosedale	3814fbc0c2	Merge pull request #4658 from ctrlaltdavid/dde-filtering ... DO NOT MERGE - DDE filtering	2015-04-17 15:41:03 -04:00
Seth Alves	292ba20cf3	pull andrew's measure-acceleration branch	2015-04-17 11:35:12 -07:00
Sam Gateau	f1e0d5855e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-17 11:33:39 -07:00
David Rowe	ee48024831	Remove uninitialized method reference	2015-04-17 11:31:48 -07:00
David Rowe	6b085ca668	Move method out of Menu class	2015-04-17 10:53:04 -07:00
David Rowe	c823fcd083	Code tidying	2015-04-17 10:35:48 -07:00
Clément Brisset	516acee1c7	Merge pull request #4647 from huffman/fix-multiple-scripts-on-restart ... Fix stop/reload all scripts affecting already-stopped scripts	2015-04-17 16:29:23 +02:00
Clément Brisset	e780d8e482	Merge pull request #4648 from ctrlaltdavid/dde-shutdown ... Terminate DDE process gracefully	2015-04-17 16:28:32 +02:00
Brad Davis	fd0c130dc2	Working on simplifying new dialog creation	2015-04-16 22:20:49 -07:00
Bradley Austin Davis	759acfa175	Working on getting the offscreen UI working on retina	2015-04-16 19:30:31 -07:00
Sam Gateau	b5b146b81b	Training Team: improving the sun lighting interface to javascript to enable / disable the earthSkyModel, assign explicitely the SUnDirection and getter, and expose a AmbientINtensity to control the amount of the ambient lighting contribution ... Expose these to javascript	2015-04-16 17:35:37 -07:00
ZappoMan	41e7b75a8d	revert mac version of HMD tools back to meta-H	2015-04-16 17:14:18 -07:00
David Rowe	d60ee3b6e2	Add velocity filtering to DDE eyelids	2015-04-16 16:28:22 -07:00
David Rowe	c46f21152f	Add velocity filtering to DDE head movement ... Based on filtering code in Faceshift.cpp.	2015-04-16 15:47:02 -07:00
David Rowe	3e484ee208	Add menu item for enabling DDE filtering	2015-04-16 15:04:25 -07:00
David Rowe	23d56f5bd0	Remove current DDE filtering	2015-04-16 14:51:55 -07:00
Brad Davis	a624ff43c4	Nothing to see here, move along	2015-04-16 14:10:29 -07:00
Brad Davis	ce6b7e7aec	Merge branch 'master' into offscreen ... Conflicts: interface/src/Menu.cpp	2015-04-16 14:02:40 -07:00
Andrew Meadows	1acb90e23a	merge upstream/master into andrew/isothermal	2015-04-16 13:48:47 -07:00
Sam Gateau	9466cf9345	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-16 10:27:13 -07:00
Clément Brisset	3c67c69745	Merge pull request #4651 from ZappoMan/HMDToolsTweaks ... Some small tweaks	2015-04-16 16:10:43 +02:00
Bradley Austin Davis	f700607a65	Working on OSX functionality	2015-04-15 23:08:55 -07:00
ZappoMan	ffb5ea50b1	expose avatar settings to JS	2015-04-15 17:00:50 -07:00
ZappoMan	1a1fe11111	switch HMD tools hot-key	2015-04-15 17:00:20 -07:00
Andrew Meadows	4bef5b7b73	Merge pull request #4638 from Triplelexx/myavatar-targetvelocity ... Myavatar targetvelocity	2015-04-15 14:22:02 -07:00
Brad Davis	aba2b395a6	Working on testing the QML ui	2015-04-15 12:35:30 -07:00
David Rowe	2f970ae962	Terminate DDE process gracefully	2015-04-15 11:07:00 -07:00
Sam Gateau	cd1bbb2855	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-15 10:16:28 -07:00
Brad Hefta-Gaub	72f9ae3e85	Merge pull request #4643 from ctrlaltdavid/fix-auto-start-animation ... Fix auto start animation	2015-04-15 10:14:26 -07:00
Clément Brisset	d6ee1c708d	Merge pull request #4642 from ZappoMan/avatarUI ... New Avatar UI	2015-04-15 19:13:23 +02:00
Brad Davis	1563b05278	Merge branch 'master' into offscreen	2015-04-15 10:01:15 -07:00
Ryan Huffman	f8e4ff8072	Update Application:stopAllScripts to skip finished scripts	2015-04-15 09:54:30 -07:00
Brad Hefta-Gaub	6d6b66f19a	Merge pull request #4641 from huffman/window-close-quit ... Quit application when main window is closed	2015-04-15 09:42:52 -07:00
Sam Gateau	5ebbdaca05	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-15 09:00:50 -07:00
Sam Gateau	1046356abb	FIx the include that was using the wrong \ in the path...	2015-04-15 09:00:20 -07:00
Brad Hefta-Gaub	a105f579ce	Merge pull request #4621 from jherico/oculus_crash ... Attempt to stop the crashing on exit caused by the Oculus SDK	2015-04-15 08:52:17 -07:00
Atlante45	2f2be70eb8	Merge branch 'master' of https://github.com/highfidelity/hifi into generated_ratio	2015-04-15 17:30:57 +02:00
Atlante45	c2c1ccc2b7	Remove generated audio options from menu	2015-04-15 15:50:22 +02:00
Brad Davis	d14d5f3d29	Working on new-UI implementations of address bar and login	2015-04-15 00:36:04 -07:00
Sam Gateau	fec52f6b10	Removing almost all the QFramebufferObject (instead in overlay layer) in favor of gpu::Framebuffer, eveyrthing seems to work properly	2015-04-14 18:27:24 -07:00
David Rowe	2c5201f116	Fix animation not automatically starting at start-up	2015-04-14 16:54:14 -07:00
ZappoMan	ae16bab7c2	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI ... Conflicts: interface/src/Application.cpp interface/src/Application.h	2015-04-14 13:13:15 -07:00
ZappoMan	174e9f2133	more tweaks to preferences UI	2015-04-14 12:38:29 -07:00
Brad Davis	bdfb6449f7	Working on decoupling rendering	2015-04-14 12:08:39 -07:00
Ryan Huffman	4d34ba7bdf	Update main window to quit app when closed	2015-04-14 10:57:47 -07:00
ZappoMan	9262585bab	first cut at moving avatar appearance into separate dialog box	2015-04-14 10:38:22 -07:00
Andrew Meadows	abb40ca080	cleanup: split stats dump out of stepSimulation	2015-04-14 09:00:36 -07:00
Sam Gateau	c34c5f6075	adding the Fremabuffer to be used for shadows and main rendering	2015-04-14 08:47:52 -07:00
Brad Davis	9f0d410387	Working on decoupling rendering	2015-04-13 23:15:51 -07:00
David Rowe	f509d08378	Handle DDE already running	2015-04-13 23:12:13 -07:00
David Rowe	b7f7cebb80	Handle DDE stopping unexpectedly	2015-04-13 22:41:17 -07:00
David Rowe	3b6a35c38f	Merge branch 'master' into 20447	2015-04-13 17:22:34 -07:00
David Rowe	13c038879d	Don't repeat constant values	2015-04-13 17:13:03 -07:00
David Rowe	2c4f049851	Change OSX DDE program path per build system requirements	2015-04-13 17:11:27 -07:00
Triplelexx	722ac46668	Merge branch 'master' into myavatar-targetvelocity	2015-04-14 00:11:10 +01:00
Triplelexx	d2b643d389	Add targetVelocity into MyAvatar simulation ... MyAvatar sets a target velocity to achieve, this is parsed in the preSimulation controller step.	2015-04-13 23:57:08 +01:00
Andrew Meadows	f969517ab0	Merge pull request #4633 from Atlante45/master ... Fix ghost avatars	2015-04-13 08:45:01 -07:00
Andrew Meadows	0a5ae8e7e1	Merge pull request #4610 from thoys/20367 ... CR for Job #20367 - Enable getPublicScripts, and getRunningScripts	2015-04-13 08:42:39 -07:00
Atlante45	809c7919aa	Fix ghost avatars	2015-04-13 15:57:36 +02:00
Andrew Meadows	e9159304d2	Merge pull request #4617 from sethalves/acceleration-and-owner-in-wire-protocol ... Acceleration and owner in wire protocol	2015-04-10 09:07:47 -07:00
Thijs Wenker	cf403a7ad8	Merge branch 'master' of https://github.com/worklist/hifi into 20367	2015-04-09 23:47:20 +02:00
Thijs Wenker	0cb5ee5bd1	- Scripts JS object renamed to ScriptDiscoveryService. ... - Renamed Example script file for the ScriptDiscoveryService. - Moved ScriptDiscoveryService functions to the RunningScriptWidget	2015-04-09 23:46:49 +02:00
samcake	91d6046051	Merge pull request #4622 from jherico/starfield_hack_fix ... Ensure blending is enabled during starfield rendering	2015-04-09 09:45:14 -07:00
Seth Alves	73a1265624	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-09 09:21:06 -07:00
Brad Davis	5efb960645	Ensure blending is enabled during starfield rendering	2015-04-09 09:18:53 -07:00
Brad Davis	f496175fb9	Attempt to stop the crashing on exit caused by the Oculus SDK	2015-04-09 09:17:23 -07:00
Clément Brisset	36631dd3a3	Merge pull request #4608 from ctrlaltdavid/fix-animation-not-starting ... CR for Animation fixes	2015-04-09 11:39:13 +02:00
Seth Alves	30a8b61df3	quiet compiler	2015-04-08 15:39:21 -07:00
Philip Rosedale	b949353b0b	Merge pull request #4611 from AndrewMeadows/isentropic ... use DynamicCharacterController	2015-04-08 08:03:01 -07:00
Brad Davis	9b34003e2d	Merge pull request #4599 from Atlante45/fix_quit_vrmode_on_close ... Quit VRMode before aboutToQuit runs	2015-04-07 17:06:29 -07:00
Philip Rosedale	af3073e6c3	Merge pull request #4584 from jherico/menu ... Stop the menu from breaking on leaving HMD mode	2015-04-07 16:41:41 -07:00
Andrew Meadows	40c94fa00e	merge upstream/master into andrew/isentropic	2015-04-07 16:23:38 -07:00
Andrew Meadows	b5f0c57dd1	jumping and hovering works with dynamic controller	2015-04-07 15:07:46 -07:00
Brad Davis	c1a1157df9	Merge branch 'master' into menu	2015-04-07 14:41:17 -07:00
David Rowe	09b929b729	Restart looped animation running at shutdown when Interface starts	2015-04-07 14:02:24 -07:00
David Rowe	670d455b90	Fix manually entered attachment model URL not being used	2015-04-07 13:47:37 -07:00
David Rowe	ccf3afadfb	Fix manually entered joint mask value not being applied	2015-04-07 13:43:58 -07:00
David Rowe	082a9196ff	Fix manually entered animation URL not being able to be started	2015-04-07 13:43:04 -07:00
Clément Brisset	61028d12b5	Merge pull request #4600 from jherico/render_crash_on_exit ... Ensure the frame timer doesn't re-engage on exit	2015-04-07 22:17:47 +02:00
Andrew Meadows	a47170b02c	Merge pull request #4601 from samcake/temp1 ... Introducing gpu::State and using it in the Model rendering path and more...	2015-04-07 12:48:42 -07:00
Brad Davis	2f4c3057f3	Merge pull request #4604 from Atlante45/oculus_pick_offset ... Oculus pick offset	2015-04-07 11:48:21 -07:00
Seth Alves	ef5dffecf6	fix filenames in comments	2015-04-07 10:03:14 -07:00
Seth Alves	9014397167	try again without macro	2015-04-07 09:59:04 -07:00
Seth Alves	e63b39f061	oops missed one	2015-04-07 09:15:40 -07:00
Seth Alves	fc5b442e12	interface is reserved, so use interfaceapp as the logging tag for interface. also experiment with a macro for logging	2015-04-07 09:15:11 -07:00
Thijs Wenker	af34add63c	added example for the new Scripts functions: ... example\misc\scriptsExample.js	2015-04-07 17:39:50 +02:00
Atlante45	5e3ed1c8e4	Compute correct mouse position	2015-04-07 17:15:16 +02:00
Atlante45	1cc4384404	Add new frame of reference for cursor	2015-04-07 17:13:30 +02:00
Atlante45	ae6ee54569	Fix ray collision not using inverse rot	2015-04-07 17:11:02 +02:00
Atlante45	73f9276c74	Fix warning	2015-04-07 17:10:31 +02:00
Thijs Wenker	a783f03025	New scripting functions Scripts.getPublic(), Scripts.getLocal() and Scripts.getRunning() functional.	2015-04-07 16:48:11 +02:00
Seth Alves	fb607e2b26	logging groups for library/shared and interface	2015-04-06 18:45:06 -07:00
Thijs Wenker	484b014fa7	Merge branch 'master' of https://github.com/worklist/hifi into 20367	2015-04-07 01:07:04 +02:00
Thijs Wenker	2b23108e61	ScriptsScripting Interface	2015-04-07 01:06:39 +02:00
Andrew Meadows	435ce106eb	Add DynamicCharacterController prototype	2015-04-06 16:03:13 -07:00
David Rowe	ce104e8c40	Merge branch 'master' into 20447	2015-04-06 15:18:19 -07:00
Brad Davis	74cf4b57b3	Ensure the frame timer doesn't re-engage on exit	2015-04-06 11:25:47 -07:00
Sam Gateau	7de54917b8	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-04-06 10:20:23 -07:00
Sam Gateau	ecdffadcb7	trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct	2015-04-06 10:17:31 -07:00
Sam Gateau	d6f74aa0ad	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-06 09:56:16 -07:00
Atlante45	a120e50cc0	Account for actual eye position in oculus pick ray	2015-04-06 18:29:02 +02:00
Andrew Meadows	96a834183f	Merge pull request #4594 from jherico/oculus3 ... Enable Direct HMD mode only on windows	2015-04-06 09:24:53 -07:00
Atlante45	a3f8076641	Quit VRMode before aboutToQuit runs	2015-04-06 17:55:48 +02:00
Clément Brisset	efbd74f539	Merge pull request #4597 from huffman/light-overlays ... Light overlays	2015-04-06 16:02:44 +02:00
Sam Gateau	10269bd556	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-04-05 18:37:28 -07:00
Sam Gateau	00817ab64f	MErging with origin/orange, brinign the fix for shadows	2015-04-05 18:36:39 -07:00
David Rowe	765d66eee5	Fix running without DDE available	2015-04-04 19:20:44 -07:00
David Rowe	65c1fea689	Increase DDE head translation to make avatar better reflect RL	2015-04-04 19:08:23 -07:00
David Rowe	1eb5716ab7	Shut down DDE when Interface shuts down	2015-04-04 19:04:47 -07:00
David Rowe	00f5469fa8	Add menu item that resets DDE tracking	2015-04-04 17:31:32 -07:00
Seth Alves	e06dada756	Merge pull request #4592 from AndrewMeadows/thermonuclear ... profiling for physics simulation	2015-04-04 15:00:44 -07:00
David Rowe	0d42c7a1c1	Start and stop DDE as separate process	2015-04-03 19:16:07 -07:00
David Rowe	f6bf1d4141	Disable DDE code if not Windows or OSX	2015-04-03 17:41:19 -07:00
ZappoMan	0bc1b02895	improvements to tracking model names	2015-04-03 17:24:53 -07:00
ZappoMan	50479d5d5e	set name to Default when using default url	2015-04-03 17:06:54 -07:00
ZappoMan	1a463a0256	more work on improved avatar UI adding model names and backward compatible support	2015-04-03 17:03:22 -07:00
Bradley Austin Davis	f75ddb95f5	Enable Direct HMD mode only on windows	2015-04-03 17:01:21 -07:00
Ryan Huffman	ce2c23de51	Fix color not working for wire circle3d	2015-04-03 16:28:12 -07:00
ZappoMan	aaf191b6dc	first cut at new avatar preferences UI	2015-04-03 14:31:43 -07:00
Sam Gateau	423434af10	FInd one of the issue with shadows for avatars	2015-04-03 12:34:30 -07:00
Sam Gateau	7718680091	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-03 10:33:24 -07:00
Andrew Meadows	88ee1c313a	Merge pull request #4583 from huffman/fix-script-editor-icons ... Update script editor to set icons programatically	2015-04-03 09:31:58 -07:00
Bradley Austin Davis	44c9d4a742	Working on removing some of the warnings in the xcode build	2015-04-02 16:12:44 -07:00
Andrew Meadows	2089a8c2dd	temporary debug setup: dump physics stats on F key	2015-04-02 15:33:06 -07:00
Andrew Meadows	eaef08abd5	add break to Key_Comma switch case	2015-04-02 15:25:55 -07:00
Sam Gateau	f96079f4f9	fixed the getViewFUrstum warning in DEBUG mode	2015-04-02 14:43:15 -07:00
Brad Davis	605cf19f6f	Merge pull request #4565 from ctrlaltdavid/20422 ... CR for #20422 - Add the ability to manage friends via Interface	2015-04-02 14:10:40 -07:00
Andrew Meadows	a824403132	Merge pull request #4582 from sethalves/island ... Comma toggles rendering of collision hulls; more changes to vhacd stuff	2015-04-02 10:37:17 -07:00
Bradley Austin Davis	8a757a4b6e	Further work on menu handling on OSX in fullscreen / VR mode	2015-04-02 10:27:11 -07:00
Bradley Austin Davis	fb2b1204db	Stop the menu from breaking on leaving HMD mode	2015-04-02 10:16:52 -07:00
Seth Alves	41ec2fdbe3	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-02 09:19:54 -07:00
Ryan Huffman	df5a03b447	Update script editor to set icons programatically	2015-04-02 09:10:47 -07:00
Andrew Meadows	fc4e6e9355	merge upstream/master into andrew/bispinor	2015-04-02 09:04:15 -07:00
Andrew Meadows	f804b2311d	remove hover-friendly behavior	2015-04-02 08:40:47 -07:00
Clément Brisset	01dc1b058c	Merge pull request #4580 from birarda/master ... use non-persistent settings to avoid lobby crash confusion	2015-04-02 17:37:24 +02:00
David Rowe	349cc3241d	Restore minimized windows to view	2015-04-01 18:59:34 -07:00
David Rowe	49de54de48	Use improved WebWindowClass for friends window	2015-04-01 18:58:59 -07:00
Seth Alves	abf83bcf9e	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-01 18:26:26 -07:00
Seth Alves	79b1a6aeb0	comma key toggles rendering of collision hulls	2015-04-01 17:45:47 -07:00
Stephen Birarda	b27a86fb25	always render yourself, handle change of render values elsewhere	2015-04-01 17:36:43 -07:00
Andrew Meadows	b537625e59	Merge pull request #4574 from ZappoMan/crashOnExit ... fix crash on shutdown related to entity scripts connecting to signals	2015-04-01 17:26:33 -07:00
Brad Hefta-Gaub	ad27d7353b	Merge pull request #4386 from jherico/oculus_old_renderer ... DO NOT MERGE - Update Oculus SDK integration	2015-04-01 17:17:32 -07:00
Stephen Birarda	ee088e12f3	leverage scene scripting values to toggle rendering	2015-04-01 17:06:06 -07:00
Brad Hefta-Gaub	e5757575de	Merge pull request #4578 from samcake/orange ... tweak the default specular value for the Primitive entities to less shiny	2015-04-01 16:36:53 -07:00
Bradley Austin Davis	58908f44ef	Fixing crash on exit when using (or used) VR mode	2015-04-01 16:05:46 -07:00
Sam Gateau	4a6046b07c	tweak the default specular value for the Primitive entities (sphere and cubes) so they do not shine so much	2015-04-01 15:50:04 -07:00
Bradley Austin Davis	fd47d4f3a5	Working on putting some more timing measurement into the code	2015-04-01 15:47:51 -07:00
Andrew Meadows	b37384d759	exit hover now not quite automatic when over floor ... remove MyAvatar::jump() method for more general API	2015-04-01 15:13:27 -07:00
David Rowe	96e888864a	Merge branch 'master' into 20422	2015-04-01 14:56:48 -07:00
Stephen Birarda	526c9217a1	fix signup link from login dialog	2015-04-01 14:43:56 -07:00
Bradley Austin Davis	3b77118baa	Merge branch 'master' into oculus_old_renderer	2015-04-01 14:09:29 -07:00
Andrew Meadows	245729cba8	fix for avatar unable to jump into hover on mac	2015-04-01 13:47:40 -07:00
ZappoMan	aac824fb99	fix crash on shutdown	2015-04-01 13:47:25 -07:00
Bradley Austin Davis	a7dc1d26e6	Working on SDK vs client distortion performance differences	2015-04-01 13:23:55 -07:00
Sam Gateau	3b92910a91	Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters	2015-04-01 12:22:35 -07:00
David Rowe	e519928320	Move friends window to own class	2015-04-01 11:38:32 -07:00
ZappoMan	da9a8e8a97	CR feedback	2015-04-01 09:27:58 -07:00
ZappoMan	827e37b920	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI	2015-04-01 09:09:50 -07:00
Bradley Austin Davis	e520a62bcf	Merge branch 'master' into oculus_old_renderer	2015-04-01 09:09:06 -07:00
Sam Gateau	ad11503466	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-03-31 23:12:17 -07:00
Stojce Slavkovski	8514a39812	Use constants for URLs	2015-04-01 07:24:16 +02:00
David Rowe	e06f28b7c5	Merge branch 'master' into 20422 ... Conflicts: examples/users.js interface/src/Application.cpp	2015-03-31 21:01:54 -07:00
Bradley Austin Davis	db9ab3e699	Merge branch 'master' into oculus_old_renderer	2015-03-31 18:25:34 -07:00
Bradley Austin Davis	eb816f7f6a	Adding support for eye per frame mode and offscreen render scaling	2015-03-31 18:24:58 -07:00
Philip Rosedale	d57959503b	Merge pull request #4560 from AndrewMeadows/bispinor ... improved bounding shape calculation for Mery model	2015-03-31 18:19:34 -07:00
Sam Gateau	0d721ec1e9	merging	2015-03-31 17:47:05 -07:00
Sam Gateau	9b63739a72	Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations	2015-03-31 17:35:34 -07:00
Andrew Meadows	ef10e5734d	bounding box for skeleton with bad mesh weights	2015-03-31 16:53:33 -07:00
Stephen Birarda	61806935bb	add a networking constants class with metaverse URL	2015-03-31 16:40:21 -07:00
ZappoMan	d68143675a	first simple pass at using marketplace windows in preferences	2015-03-31 16:24:27 -07:00
Brad Hefta-Gaub	b6f670a8d8	Merge pull request #4554 from samcake/yellow ... Better support for Nvidia Optimus Laptop	2015-03-31 15:56:01 -07:00
Bradley Austin Davis	a7eebfd002	Merge remote-tracking branch 'upstream/master' into oculus_old_renderer	2015-03-31 15:42:01 -07:00
Sam Gateau	b4d11e2eb5	Add the needed global variable exported to enable the nvidia gpu on optimus platform (laptops with intel integrated) also log the opengl version and gpu and driver used	2015-03-31 15:18:59 -07:00
Bradley Austin Davis	6757dfcc0c	Working on 0.5.0.1 port and addressing the direct HMD/v-sync conflict	2015-03-31 14:52:21 -07:00
David Rowe	154dacf791	Fix typo	2015-03-31 14:21:56 -07:00
Bradley Austin Davis	c4c6cf82a2	Working on migration to SDK 0.5.0.1	2015-03-31 13:27:11 -07:00
Bradley Austin Davis	56b5ad2e6b	Merge branch 'master' into oculus_old_renderer	2015-03-31 11:10:23 -07:00
Philip Rosedale	5325478940	Merge pull request #4528 from ZappoMan/avatarUI ... Support for Auto-detecting FST type, and adding type hint to FST files when packaged	2015-03-30 21:31:22 -07:00
Sam Gateau	ee4b9a483b	found the issue brekaing the render, i didn't do the Blend enable sync properly	2015-03-30 18:04:44 -07:00
Philip Rosedale	ce05d3104a	Merge pull request #4535 from ZappoMan/scriptCaching ... Script caching & Fix to Stack Overflow Crash on Windows with lots of entity scripts	2015-03-30 18:02:52 -07:00
ZappoMan	64fdca7d6d	fix no root joint warning	2015-03-30 17:32:42 -07:00
Sam Gateau	ee3ec3fe1a	found the issue brekaing the render, i didn't do the Blend enable sync properly	2015-03-30 17:28:58 -07:00
ZappoMan	3475bfb396	fix typos	2015-03-30 17:04:47 -07:00
Bradley Austin Davis	5e5bdec88d	Merge branch 'master' into oculus_old_renderer	2015-03-30 16:36:00 -07:00
Andrew Meadows	9b13f186e3	remove character from PhysicsEngine on shutdown	2015-03-30 15:51:58 -07:00
ZappoMan	36657c9473	first cut at script caching	2015-03-30 14:36:48 -07:00
Andrew Meadows	10af59296d	Merge pull request #4499 from sethalves/multi-hull-collisions ... Multi hull collisions	2015-03-30 12:11:56 -07:00
Andrew Meadows	2404fb126f	Merge pull request #4527 from sethalves/valgrind ... Valgrind told me to do it	2015-03-30 11:56:17 -07:00
Seth Alves	186cb1ec7a	merge from upstream	2015-03-30 11:28:47 -07:00
Sam Gateau	ab9be0cb41	Merge branch 'master' of https://github.com/highfidelity/hifi into temp1	2015-03-30 10:11:08 -07:00
Sam Gateau	2a58a65a8f	back to the office monday morning, State almost working in the full piupeline	2015-03-30 10:10:39 -07:00
Seth Alves	7de15cda87	quiet compiler	2015-03-30 09:30:13 -07:00
Philip Rosedale	099a2b5319	Merge pull request #4521 from ctrlaltdavid/20416 ... CR for Job #20416 - Update notification.js to include a notification about being blocked from a server	2015-03-30 08:49:29 -07:00
David Rowe	cbf2012bf5	Add menu items that set visibility ... And synchronize visibility settings between Interface and users.js.	2015-03-29 18:35:56 -07:00
ZappoMan	3bda65f4fe	if installing a body, and you have no head, make your head the default head	2015-03-28 19:19:11 -07:00
ZappoMan	80df8caefb	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI	2015-03-28 18:43:03 -07:00
Seth Alves	fc1e45fc58	valgrind says this is used before it's initialized	2015-03-28 17:10:46 -07:00
Seth Alves	986bc71e93	quiet compiler	2015-03-28 17:10:26 -07:00
David Rowe	be69c0b58f	Add add/remove friends menu item ... This must display the dialog whether or not users.js is running. Both C++ and JavaScript need to open or restore the same dialog, hence a new dialog rather than using WebWindow with its JavaScript baggage.	2015-03-28 13:05:23 -07:00
ZappoMan	002fba8018	first cut at predicting FST type for set avatar	2015-03-27 16:56:03 -07:00
ZappoMan	baa2f947e5	classifying FSTReader and moving ModelType into that class	2015-03-27 16:30:00 -07:00
Seth Alves	fd69a54f10	Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions	2015-03-27 15:55:20 -07:00
Andrew Meadows	5b85a2aa44	merge upstream/master into andrew/inertia	2015-03-27 13:56:54 -07:00
Andrew Meadows	be5fdbf217	enable avatar collisions by default ... also remove old gravity features	2015-03-27 13:36:20 -07:00
ZappoMan	6189926105	add type hint to FST in model packager	2015-03-27 13:23:29 -07:00
Philip Rosedale	6550b4e311	Merge pull request #4509 from AndrewMeadows/inertia ... character transitions into "hover" when stepping over abyss	2015-03-27 13:16:36 -07:00
David Rowe	90c1da2094	Merge branch 'master' into 20416 ... Conflicts: examples/notifications.js	2015-03-27 12:13:29 -07:00
Brad Hefta-Gaub	2255c30d58	Merge pull request #4512 from Atlante45/ordered_fst ... Hint order for FST files	2015-03-27 09:41:50 -07:00
Andrew Meadows	e75bb3cd9c	merge upstream/master into andrew/inertia	2015-03-27 08:14:36 -07:00
Stephen Birarda	647e2d7829	Merge pull request #4517 from ZappoMan/menuCleanup ... menu and display tweaks at Philip's request	2015-03-26 20:06:16 -07:00
Andrew Meadows	821ac605f5	smoother motion on steps ... faster motion when "flying" cleanup of MyAvatar::updatePosition()	2015-03-26 19:48:52 -07:00
Seth Alves	16875338bf	Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions	2015-03-26 18:55:43 -07:00
Seth Alves	7da87d6e15	set up a way to request ResourceCache downloads from a non-networking thread.	2015-03-26 18:37:55 -07:00
Stephen Birarda	ba82436d95	add user heartbeat if they choose not to send location	2015-03-26 16:50:40 -07:00
ZappoMan	6cff99f9d6	menu and display tweaks	2015-03-26 16:36:46 -07:00
Atlante45	716e9bfe4f	Hint order for FST files	2015-03-26 15:40:48 +01:00
ZappoMan	9e34dda7c9	Merge branch 'master' of https://github.com/highfidelity/hifi into LODUITweaks	2015-03-25 16:54:37 -07:00
Brad Hefta-Gaub	918154e407	Merge pull request #4491 from huffman/export-json ... Update export entities to export as JSON	2015-03-25 16:49:23 -07:00
ZappoMan	c031ce15a7	dead code	2015-03-25 16:45:51 -07:00
ZappoMan	19feeacc51	dead code	2015-03-25 16:38:57 -07:00
ZappoMan	f46067b634	better tracking of being done with downshifting	2015-03-25 16:30:33 -07:00
Clément Brisset	b81e89ad3d	Merge pull request #4488 from ctrlaltdavid/20407 ... CR for 20407 - Make Sixense emulate mouse only if controllers aren't at the base	2015-03-26 00:24:17 +01:00
ZappoMan	68e730af45	handle throttle render case and clean up code logic to be more obvious	2015-03-25 15:48:50 -07:00
Seth Alves	c0b1ff4a57	Merge pull request #4500 from AndrewMeadows/inertia ... avatar can jump when using CharacterController	2015-03-25 14:48:54 -07:00
Ryan Huffman	1c0e7e26a2	Merge pull request #4507 from birarda/friends-only-location ... make friends-only discoverability mode work as described	2015-03-25 13:48:08 -07:00
Stephen Birarda	f075674415	Merge pull request #4502 from huffman/webwindow-open-url ... Add more functionality to WebWindow (get/set url, raise)	2015-03-25 13:25:29 -07:00
ZappoMan	0c2a630a59	Merge branch 'master' of https://github.com/highfidelity/hifi into LODUITweaks	2015-03-25 12:51:21 -07:00
ZappoMan	ec2b11640c	more tweaks to LOD logic	2015-03-25 12:51:13 -07:00
Stephen Birarda	7a9c1e20ab	use new AccountManager API in DiscoverabilityManager	2015-03-25 12:04:47 -07:00
Stephen Birarda	89e5fef808	send friends_only key for discoverability	2015-03-25 11:46:08 -07:00
Leonardo Murillo	c3c1d4a5ae	Switching to .com	2015-03-25 12:36:37 -06:00
Ryan Huffman	bb4417acc6	Merge branch 'master' of github.com:highfidelity/hifi into webwindow-open-url	2015-03-25 10:49:24 -07:00
Clément Brisset	e6ac502fb5	Merge pull request #4497 from huffman/update-edit-help ... Update edit help	2015-03-25 14:09:22 +01:00
Andrew Meadows	d497620976	avatar can jump with E key when walking	2015-03-24 23:05:46 -07:00
Andrew Meadows	b87360f0f5	merge upstream/master into andrew/inertia	2015-03-24 17:41:07 -07:00
Andrew Meadows	44eca08fa4	PhysicsEngine doesn't need AvatarData ... MyAvatar now owns its CharacterController fix for bug of phantom collision obj when avatar's physics are disabled	2015-03-24 17:38:35 -07:00
Philip Rosedale	fe61387121	Merge pull request #4498 from ZappoMan/LODUITweaks ... Some LOD UI Tweaks	2015-03-24 17:34:27 -07:00
Ryan Huffman	d54526b8bb	Merge branch 'master' of git://github.com/highfidelity/hifi into webwindow-openurl	2015-03-24 15:43:36 -07:00
ZappoMan	b67cf3af24	more tweaks to LOD tools dialog	2015-03-24 14:33:06 -07:00
ZappoMan	f43b8bbe8e	make AvatarLODMultiplier based on octreeSizeScale	2015-03-24 13:59:46 -07:00
Ryan Huffman	3f986229d1	Rename edit-entities-commands.html to edit-commands.html	2015-03-24 13:43:10 -07:00
ZappoMan	619428c325	move LOD FPS settings to Preferences	2015-03-24 13:32:22 -07:00
Stephen Birarda	1a6865b41b	send immediate location update when domain changes	2015-03-24 13:15:30 -07:00
Ryan Huffman	2fc0ef80d0	Add SVO_JSON_EXTENSION to accepted extensions	2015-03-24 10:40:46 -07:00
Ryan Huffman	6d932508ff	Add support for .svo.json extension	2015-03-24 10:27:53 -07:00
ZappoMan	fa122a227b	tweaks to the LOD Tools UI	2015-03-23 16:44:07 -07:00
Ryan Huffman	61dc31ffe7	Update export entities to export as JSON	2015-03-23 14:09:45 -07:00
David Rowe	cb6abfb2e6	Display notification if domain connection refused	2015-03-23 12:05:56 -07:00
ZappoMan	9fb53e3d72	CR feedback	2015-03-23 11:13:42 -07:00
David Rowe	3de7222007	Make Sixense emulate mouse only if controllers aren't at the base	2015-03-23 09:06:15 -07:00
ZappoMan	19c8e526e1	add guards to _jointStates array size	2015-03-23 08:47:06 -07:00
Bradley Austin Davis	1d56266044	Merge branch 'master' into oculus_old_renderer	2015-03-20 09:56:54 -07:00
Brad Hefta-Gaub	3d6d79ae3a	Merge pull request #4478 from sethalves/maximum-capacity ... Maximum capacity redux	2015-03-20 09:28:22 -07:00
Brad Hefta-Gaub	96bfb96936	Merge pull request #4468 from ctrlaltdavid/20399 ... CR for 20399 - Fix near field clipping on avatars with large heads	2015-03-19 20:02:17 -07:00
Andrew Meadows	a7dbd6779f	Merge pull request #4467 from huffman/avatar-thrust ... Fix thrust not being applied w/ Physics + Avatar	2015-03-19 16:40:10 -07:00
ZappoMan	5f825211df	Merge branch 'master' of https://github.com/highfidelity/hifi into dragDropLinkAvatars	2015-03-19 15:12:06 -07:00
Seth Alves	baa8e9c86f	remove uneeded #includes	2015-03-19 13:05:30 -07:00
Seth Alves	817a6130ef	return a reason as part of the domain server's connection-denied packet. Don't apply max-capacity check to users in the editors list	2015-03-19 13:01:57 -07:00
ZappoMan	24132968fe	oops	2015-03-19 12:41:44 -07:00
ZappoMan	26670f9e41	remove unneeded debug	2015-03-19 12:15:12 -07:00
ZappoMan	c5314aceac	more DRYing up of code	2015-03-19 11:57:57 -07:00
ZappoMan	5814a14152	removed dead code	2015-03-19 11:42:00 -07:00
ZappoMan	e6cefa946c	more DRYing of code	2015-03-19 11:41:03 -07:00
ZappoMan	3c41ecd091	cleanup accepted files implementation	2015-03-19 11:29:41 -07:00
Brad Davis	31c7c93aa3	Merge branch 'master' into oculus_old_renderer	2015-03-19 10:05:22 -07:00
ZappoMan	8e0141b8e9	first cut at fst drag/drop support	2015-03-19 08:48:13 -07:00
samcake	c0a66a05f4	Merge pull request #4463 from ZappoMan/LODTweaks ... MVP Task - tweaks to automatic-LOD adjustments & Display warning when LOD is decreased	2015-03-18 16:55:39 -07:00
Brad Davis	872012856f	Merge branch 'master' into oculus_old_renderer	2015-03-18 15:35:49 -07:00
Brad Davis	0c465ce2b5	Merge pull request #4460 from ZappoMan/runJSFiles ... MVP task - Allow a script to be added to a users "running script" from the marketplace	2015-03-18 12:52:44 -07:00
David Rowe	c114442325	Merge branch 'master' into 20399	2015-03-18 12:44:29 -07:00
David Rowe	648a2e3b1d	Set clip distance on rendering frustum rather than camera ... This fixes wrong clipping distance used for rendering in FPV if also have rear view mirror.	2015-03-18 12:43:49 -07:00
ZappoMan	8239a295cb	Merge branch 'master' of https://github.com/highfidelity/hifi into LODTweaks	2015-03-18 11:54:05 -07:00
ZappoMan	a2e012f7a9	Merge branch 'master' of https://github.com/highfidelity/hifi into runJSFiles	2015-03-18 11:53:19 -07:00
Brad Davis	07ee350c09	Removing reported logspam from release builds	2015-03-18 10:24:53 -07:00
Brad Hefta-Gaub	53ae4b48bc	Merge pull request #4459 from ctrlaltdavid/20400 ... CR for 20400 - Name tags going through the head	2015-03-17 21:54:13 -07:00
Brad Hefta-Gaub	a5294ae3fa	Merge pull request #4436 from sethalves/persist-entities-as-json ... Optionally persist entities as json	2015-03-17 21:53:17 -07:00
Brad Davis	d066271e4e	Merging from master	2015-03-17 18:28:58 -07:00
Brad Hefta-Gaub	55d9560c9e	Merge pull request #4469 from jherico/frustumFetchCheck ... Fix broken aspect ratio in mirror	2015-03-17 17:06:21 -07:00
Brad Davis	1662230289	Adding some fixmes to the code, since globals are evil and such checks should be confined to debug mode only	2015-03-17 16:44:29 -07:00
David Rowe	7b54443bda	Adjust clip distance as HMD head moves backwards	2015-03-17 16:33:20 -07:00
David Rowe	a04bd09b83	Set clip near distance per skeleton model if no separate head model	2015-03-17 16:32:59 -07:00
Brad Davis	e616308911	Adding runtime check to ensure that the correct frustum is fetched during rendering	2015-03-17 16:28:44 -07:00
Ryan Huffman	870f1112e4	Fix thrust not being applied w/ Physics + Avatar	2015-03-17 16:17:44 -07:00
Brad Davis	895a0d7b85	Correcting frustum usage by the avatar renderer that was causing aspect ratio problem	2015-03-17 16:14:35 -07:00
Brad Davis	c88f6f8f07	Adding some documentation on the change	2015-03-17 13:49:06 -07:00
ZappoMan	1e03335012	implement scripting interface for LODManager	2015-03-17 13:18:29 -07:00
Brad Davis	71e59cfa88	Fix: Mini-mirror doesn't render avatar head when in first person mode	2015-03-17 13:15:15 -07:00
Ryan Huffman	d097b4409e	Add title to non-toolbar WebWindows	2015-03-17 10:40:51 -07:00
ZappoMan	e5be8d01b6	tweaks to automatic-LOD adjustments	2015-03-17 10:36:39 -07:00
Ryan Huffman	1e1c60847b	Add WebWindow::getURL	2015-03-17 09:07:01 -07:00
Ryan Huffman	8088b01356	Add WebWindow::raise	2015-03-17 09:06:48 -07:00
Ryan Huffman	46f6c9f888	Add WebWindow::setURL	2015-03-17 09:06:31 -07:00
ZappoMan	749bc1ee9b	support for loading of JS files by drag, web page urls, and openfile events	2015-03-17 08:38:39 -07:00
Brad Hefta-Gaub	d33d3afb52	Merge pull request #4454 from Atlante45/fix_mouse_visible_in_oculus ... Hide cursor at MainWindow level when in VRMode	2015-03-17 08:06:05 -07:00
Atlante45	1f8a874ce6	Hide cursor in 3D TV mode too	2015-03-17 12:34:13 +01:00
David Rowe	d08a25f1a3	A more realistic default head height	2015-03-16 15:48:10 -07:00
David Rowe	913527eaa3	Calculate head height based on skeleton model mesh if no head model ... This fixes the problem of some skeleton models with heads having display names rendering through them.	2015-03-16 15:47:54 -07:00
Brad Davis	0d0e3b5eeb	Merge remote-tracking branch 'upstream/master' into oculus_old_renderer	2015-03-16 12:22:51 -07:00
Brad Davis	5aa4277d9b	Removing a superfluous clear from Application.cpp. It's only required in client distortion mode	2015-03-16 12:22:35 -07:00
Atlante45	c5010c4d55	Hide cursor at MainWindow level when in VRMode	2015-03-16 14:19:24 +01:00
Seth Alves	806280f9cc	Merge branch 'linux-tools-window-freakout' of github.com:sethalves/hifi into persist-entities-as-json	2015-03-15 09:00:24 -07:00
Seth Alves	bfa38521ed	linux desktops are often configured as point-to-focus. don't autohide tools window on linux	2015-03-15 07:59:32 -07:00
Seth Alves	6c4b808813	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-15 07:10:56 -07:00
David Rowe	08c95555dd	Calculate head height based on model mesh rather than joints ... This fixes the problem of some head models having display names rendering through them.	2015-03-14 09:47:47 -07:00
Brad Davis	f699a9c6f2	Merge remote-tracking branch 'upstream/master' into oculus_old_renderer	2015-03-13 20:31:06 -07:00
Stephen Birarda	dcff4f5956	use HIGH_FIDELITY_USER_AGENT for DataWebPage	2015-03-13 18:25:17 -07:00
Stephen Birarda	859f81cdd7	some & squishes missed in review	2015-03-13 18:12:31 -07:00
Stephen Birarda	641581a825	Merge pull request #4446 from huffman/marketplace-window ... Marketplace window	2015-03-13 17:51:44 -07:00
Ryan Huffman	235b5d77ae	Add missing include to DataWebPage	2015-03-13 17:38:36 -07:00
Ryan Huffman	47e63719ee	Handle svo request in DataWebPage as import requests	2015-03-13 17:35:33 -07:00
Ryan Huffman	aca509d5cc	Add Application::improtSVOFromURL	2015-03-13 17:35:06 -07:00
Philip Rosedale	009551c4dd	Merge pull request #4441 from AndrewMeadows/isentropic ... more correct shape for avatar collision capsule	2015-03-13 17:33:16 -07:00
Ryan Huffman	9d5c0cf4e3	Add layout to WebWindowClass to that it maximizes the webview	2015-03-13 17:25:24 -07:00
Ryan Huffman	1193d86d7b	Update webwindow to use datawebview	2015-03-13 16:39:25 -07:00
Ryan Huffman	d512a67c8a	Merge branch 'master' of github.com:highfidelity/hifi into edit-lights-overlays	2015-03-13 14:13:56 -07:00
Ryan Huffman	53b5c7e971	Update WebWindow to raise when being set to visible	2015-03-13 14:11:01 -07:00
Ryan Huffman	dc3453a878	Add Window.raiseMainWindow()	2015-03-13 14:10:46 -07:00
Stephen Birarda	2b08c20900	Merge pull request #4440 from birarda/master ... remove the close activity from Interface	2015-03-13 13:46:59 -07:00
Ryan Huffman	7ef1964a52	Add user agent for WebWindow	2015-03-13 11:52:02 -07:00
Ryan Huffman	93cdb3a293	Add option for non-tool window WebWindows	2015-03-13 11:51:40 -07:00
Ryan Huffman	2a84d9a6ab	Fix issue with .svo's not loading when the url has parameters	2015-03-13 10:06:49 -07:00
Andrew Meadows	924ebe1e54	propagate skeleton's bounding box into AvatarData	2015-03-13 09:39:47 -07:00
Andrew Meadows	645fc7dbc9	remove unused variable	2015-03-13 09:39:06 -07:00
Brad Davis	7e50d6359e	Merge remote-tracking branch 'upstream/master' into oculus_old_renderer	2015-03-12 22:54:44 -07:00
Brad Hefta-Gaub	fadd1a09e5	Merge pull request #4433 from ZappoMan/fix3DTV ... fix rendering of models in 3D TV mode	2015-03-12 16:42:37 -07:00
Brad Hefta-Gaub	a6b5a73844	Merge pull request #4431 from ZappoMan/windowsMenuAssert ... Fix windows assert	2015-03-12 16:42:10 -07:00
Andrew Meadows	be252147e2	merge upstream/master into andrew/isentropic	2015-03-12 16:38:59 -07:00
Andrew Meadows	6bd857c4ea	update Avatar in PhysicsEngine on load new body	2015-03-12 16:35:12 -07:00
Andrew Meadows	1f3a267b16	compute correct bounding shape dimensions	2015-03-12 16:34:47 -07:00
Andrew Meadows	2fad4153a9	remove unused Avatar::getBoundingRadius()	2015-03-12 16:34:27 -07:00
Stephen Birarda	0fe843db01	Revert "remove the launch activity from UserActivityLogger" ... This reverts commit bc6ac9081f.	2015-03-12 15:53:05 -07:00
Stephen Birarda	bc6ac9081f	remove the launch activity from UserActivityLogger	2015-03-12 15:08:05 -07:00
Stephen Birarda	0b55a0f123	remove the close event from UserActivityLogger	2015-03-12 15:06:44 -07:00
Stephen Birarda	471e55c8ce	fix some lingering warnings	2015-03-12 12:36:39 -07:00
Stephen Birarda	09e2c0987e	use Dependency customDeleter for Application NL	2015-03-12 12:27:48 -07:00
Stephen Birarda	7bfc747748	Revert "Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList"" ... This reverts commit 9269b2a0b2.	2015-03-12 12:13:32 -07:00
Ryan Huffman	ebf70f818a	Merge branch 'master' of git://github.com/highfidelity/hifi into edit-light-2 ... Conflicts: examples/editEntities.js	2015-03-12 11:39:26 -07:00
Seth Alves	b945ce5e7a	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-12 11:38:01 -07:00
Stephen Birarda	9269b2a0b2	Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList"	2015-03-12 11:28:07 -07:00
Stephen Birarda	4da9186045	Merge pull request #4429 from birarda/master ... NOT MERGEABLE: graceful cleanup on Application dtor for NodeList	2015-03-12 11:26:56 -07:00
Seth Alves	4aa7b0eb0f	provide defaults for anything entity properties read from a map	2015-03-12 11:19:47 -07:00
ZappoMan	bbcce6a891	fix rendering of models in 3D TV mode	2015-03-12 10:59:12 -07:00
Stephen Birarda	3279e19b3d	Merge pull request #4430 from Atlante45/update_login_on_launch ... Update Login menu item on creation	2015-03-12 10:55:07 -07:00
Seth Alves	898b9f4af3	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-12 10:24:05 -07:00
Seth Alves	90f6b798b1	don't mess with tools window in this branch	2015-03-12 10:11:37 -07:00
Seth Alves	fb93d08dd8	change how tool window acts on linux	2015-03-12 09:13:29 -07:00
ZappoMan	cd52bab2e8	Merge branch 'master' of https://github.com/highfidelity/hifi into windowsMenuAssert	2015-03-12 08:59:51 -07:00
Atlante45	52c0ba817a	Remove dead code	2015-03-12 16:32:09 +01:00
Atlante45	d858956ad8	Merge branch 'master' of https://github.com/highfidelity/hifi into package_models	2015-03-12 16:31:03 +01:00
Brad Hefta-Gaub	f91a19a918	Merge pull request #4424 from huffman/open-svo ... Handle drag-n-dropped .svos and using interface to open .svo files	2015-03-12 08:15:25 -07:00
Atlante45	decd240f60	Update Login menu item on startup after creation	2015-03-12 14:53:11 +01:00
Atlante45	bcfd4b50be	Merge branch 'master' of https://github.com/highfidelity/hifi into package_models	2015-03-12 14:18:37 +01:00
ZappoMan	b798761ec5	test fix for Austin's repro	2015-03-11 23:55:53 -07:00
Seth Alves	2a06816f71	added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting	2015-03-11 23:09:15 -07:00
Seth Alves	87ac38c3df	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-11 18:35:13 -07:00
Brad Hefta-Gaub	356dbbec72	Merge pull request #4399 from ctrlaltdavid/20369 ... Fix for 20369	2015-03-11 18:09:07 -07:00
Stephen Birarda	d7e99594ae	make the application the parent of the node thread	2015-03-11 18:04:32 -07:00
Stephen Birarda	7a8e94f1e5	remove extra debug information for node thread cleanup	2015-03-11 17:18:49 -07:00
Stephen Birarda	69bc6c9761	Merge pull request #4426 from ZappoMan/fixAvatarManagerCrash ... some cleanup of dead code related to timers	2015-03-11 17:14:40 -07:00
Stephen Birarda	5d9a3811ca	more graceful cleanup for Application NodeList and DatagramProcessor	2015-03-11 17:14:20 -07:00
Stephen Birarda	9f754e40d0	move all silent node timers into LimitedNodeList	2015-03-11 16:59:06 -07:00
ZappoMan	cab6cc8c75	fix crash on exit related to AvatarManager using TextureCach resources	2015-03-11 16:30:21 -07:00
ZappoMan	e87e0a1e0b	some cleanup of dead code related to timers	2015-03-11 16:27:04 -07:00