overte

mirror of https://github.com/overte-org/overte.git synced 2025-07-12 11:58:38 +02:00

Author	SHA1	Message	Date
Brad Davis	d4e637c5b8	Removing superfluous lighting and naked GL in mirror	2015-07-20 09:36:05 -07:00
Stephen Birarda	6b11495a20	resolve conflicts on merge with upstream master	2015-07-20 08:51:48 -07:00
Brad Davis	5159452335	Fixing invalid vector usage and strange picking crash	2015-07-19 23:03:46 -07:00
Brad Davis	4c3cfe1e82	Starfield jazz hands	2015-07-19 20:53:50 -07:00
Brad Davis	81543d9185	Removing unneeded undef	2015-07-19 19:06:21 -07:00
Brad Davis	f13152b2b4	Fixing reference to PI/2	2015-07-18 23:04:16 -07:00
Brad Davis	0da8b27fcf	Removing unused files	2015-07-18 22:53:43 -07:00
Brad Davis	5b494c23fd	More header cleanup	2015-07-18 22:38:26 -07:00
Brad Davis	35f7307f30	More header cleanup	2015-07-18 22:15:50 -07:00
Brad Davis	0056208565	Another whack at GL headers	2015-07-18 17:04:44 -07:00
Brad Davis	c446bb307d	Adding convenience return *this to many transform methods	2015-07-18 16:56:32 -07:00
Brad Davis	e4f6586c3c	Working on star rendering, removal of naked GL	2015-07-18 16:40:54 -07:00
Philip Rosedale	61c2b172d4	Merge pull request #5357 from ctrlaltdavid/scriptable-muting Mute / un-mute face tracking when menu item is changed from script	2015-07-18 15:45:01 -07:00
David Rowe	47fdbedfb2	Fix FPS throttle default	2015-07-18 15:22:47 -07:00
David Rowe	7b11d02eb2	Default Throttle FPS to disabled	2015-07-18 14:18:08 -07:00
David Rowe	d0489bf2a0	Add menu item, Developer > Render > Throttle FPS If Not Focus	2015-07-18 14:18:06 -07:00
Brad Davis	b7fdfd8663	Working on lighting	2015-07-18 10:55:53 -07:00
Brad Davis	d68618e206	Removing GL headers from most files, and some naked GL from application.cpp	2015-07-18 00:46:09 -07:00
Atlante45	256c786e28	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-17 17:59:19 -07:00
Sam Gateau	a0590182ad	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-17 17:44:54 -07:00
ZappoMan	98c078d995	move audio scope to the back	2015-07-17 17:44:29 -07:00
Sam Gateau	96e18af77b	trying to remove the naked gl calls aroiund the rearViewMirror	2015-07-17 17:44:25 -07:00
ZappoMan	ecab2538d7	quick hack to fix overlay ordering	2015-07-17 17:27:15 -07:00
Anthony J. Thibault	01c740f415	cleaning up plugin architecture, fixed hand controllers	2015-07-17 17:19:49 -07:00
Stephen Birarda	f8c832e50b	resolve conflicts on merge with upstream master	2015-07-17 16:48:46 -07:00
ZappoMan	26e8090ec1	Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL	2015-07-17 16:48:42 -07:00
Brad Hefta-Gaub	3ea348b73b	Merge pull request #5349 from jherico/marge Working on text rendering overlays	2015-07-17 16:47:48 -07:00
Niraj Venkat	0580c8477e	3-step groundwork for AO in the pipeline	2015-07-17 16:42:03 -07:00
ZappoMan	eb989fd725	fix the backround colors for text overlays, pending austins PR to really fix them	2015-07-17 16:38:05 -07:00
ZappoMan	695470b1c1	fix audio scope	2015-07-17 16:30:10 -07:00
ZappoMan	8692f51399	dead code cleanup	2015-07-17 16:15:02 -07:00
Stephen Birarda	1fd4a1f0c3	resolve conflicts on merge with upstream master	2015-07-17 16:07:45 -07:00
Stephen Birarda	54edc6f993	Merge branch 'master' of https://github.com/highfidelity/hifi into protocol	2015-07-17 16:04:45 -07:00
ZappoMan	c20c6e4b90	fix retina in an Austin approved manner	2015-07-17 16:01:32 -07:00
ZappoMan	03a44a1c80	fix retina	2015-07-17 15:45:42 -07:00
Atlante45	e3f7c33767	Fix index check in setJointRotation	2015-07-17 15:39:25 -07:00
ZappoMan	ccd2f98a76	one more try	2015-07-17 15:28:25 -07:00
Atlante45	3f4041595a	Fix compile error in connect	2015-07-17 15:26:04 -07:00
ericrius1	a44e5f949c	Merge branch 'master' into polyLineInProgress	2015-07-17 15:01:40 -07:00
Seth Alves	18197314c5	Merge branch 'master' of github.com:highfidelity/hifi into rig	2015-07-17 14:55:06 -07:00
Seth Alves	d287817829	give SkeletonModel created by MyAvatar a Rig pointer	2015-07-17 14:52:37 -07:00
Brad Hefta-Gaub	2df75f8bff	Merge pull request #5337 from bwent/audioStatsDialog Added a dialog box to display Audio Network Statistics	2015-07-17 14:45:51 -07:00
Bradley Austin Davis	3bfa8aae0b	Removing debug output	2015-07-17 14:34:24 -07:00
Brad Davis	914b47069b	Working on line height	2015-07-17 14:33:32 -07:00
Bradley Austin Davis	24643ca282	Working on line spacing	2015-07-17 14:19:39 -07:00
Brad Davis	6f998e5d28	Working on line spacing on mac	2015-07-17 13:32:31 -07:00
Seth Alves	bcd6b30ec3	move AnimationHandle from render-utils to animation. give Rig some jointstates and animation lists	2015-07-17 13:31:48 -07:00
ZappoMan	4dadf60724	some tweaks from Sam	2015-07-17 12:50:20 -07:00
Bradley Austin Davis	c5e0298f8d	Working on mac sizing	2015-07-17 12:22:38 -07:00
David Rowe	550e9224c5	Mute / un-mute face tracking when menu item is changed from script	2015-07-17 11:45:15 -07:00
ZappoMan	33464dfd6c	cleanup dead code	2015-07-17 11:35:42 -07:00
Stephen Birarda	7a13c867ae	quit the ScriptEngine thread once the script is done	2015-07-17 11:18:14 -07:00
Anthony J. Thibault	5fe4d06562	fixed input devices menu exclusivity	2015-07-17 11:11:31 -07:00
Stephen Birarda	e5722098f6	resolve conflicts on merge with upstream/master	2015-07-17 11:06:01 -07:00
Ryan Huffman	9725184b24	Move dataSent signal from PacketReceiver to LimitedNodeList	2015-07-17 11:05:07 -07:00
Brad Davis	ea74aac1d6	Working on cleaning up diff	2015-07-17 11:02:32 -07:00
bwent	b22fd3f4a0	fixed lagging issues	2015-07-17 10:58:30 -07:00
Ryan Huffman	68564a79b0	Merge branch 'protocol' of github.com:Atlante45/hifi into protocol	2015-07-17 09:59:05 -07:00
ZappoMan	efa2001325	Merge branch 'master' of https://github.com/highfidelity/hifi into removeNakeGL	2015-07-17 09:25:37 -07:00
Stephen Birarda	7d60b86f52	kill the PacketLister (AKA Huffman 1 : PacketListener 0)	2015-07-17 09:07:39 -07:00
Brad Davis	7f6bb552a3	Working on cleaning up diff	2015-07-16 20:51:37 -07:00
Anthony J. Thibault	65b76869fa	Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers	2015-07-16 18:47:55 -07:00
Anthony J. Thibault	e8da4b9586	merge with plugins, needs testing	2015-07-16 18:47:39 -07:00
Anthony J. Thibault	060f6c19a6	almost finished plugin architecture, general plugin improvements. menu actions don't work all the time, joint controllers need to be handled better, and activate/deactive aren't always called correctly	2015-07-16 18:16:59 -07:00
Stephen Birarda	ce6585ccc8	fix AC monitor and AM double register	2015-07-16 17:44:43 -07:00
Brad Davis	7e32bfb85e	Fixing mac/linux build	2015-07-16 17:35:05 -07:00
Atlante45	ceea5143e1	Avoid string copy	2015-07-16 16:55:37 -07:00
Atlante45	6ce710f237	Fix domain request denied reason read	2015-07-16 16:47:09 -07:00
ZappoMan	410e0a99ad	hacking on more naked GL	2015-07-16 16:45:58 -07:00
Brad Davis	ae882c8347	Merge remote-tracking branch 'upstream/master' into plugins Conflicts: interface/src/Application.cpp interface/src/Application.h interface/src/Menu.cpp interface/src/Menu.h interface/src/avatar/SkeletonModel.cpp interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp interface/src/ui/ApplicationCompositor.cpp interface/src/ui/overlays/LocalModelsOverlay.cpp	2015-07-16 16:37:55 -07:00
ZappoMan	069620b2d9	hacking on more naked GL	2015-07-16 16:36:48 -07:00
ZappoMan	09430b6596	hacking on more naked GL	2015-07-16 16:27:41 -07:00
ZappoMan	398075e45a	hacking on more naked GL	2015-07-16 16:26:28 -07:00
Stephen Birarda	eb0ed438ec	remove environment data packet	2015-07-16 16:23:57 -07:00
Anthony J. Thibault	157c20e57b	goToLocation should work properly in standing HMD mode	2015-07-16 16:04:08 -07:00
Anthony J. Thibault	ef0a157111	Fixes for oculus rift support * should work in standing and 'seated' mode * OculusBaseDisplayPlugin getModelView now only applies eye offset to match behavior from the OpenVRPlugin	2015-07-16 16:04:08 -07:00
Brad Davis	89faf85ad9	Working on text rendering overlays	2015-07-16 15:56:01 -07:00
David Rowe	f5b02c1731	Remove dead code Camera mode cannot be mirror	2015-07-16 14:06:42 -07:00
David Rowe	6c6e3eb758	Rename and refactor eye deflection slider	2015-07-16 14:05:34 -07:00
Atlante45	b4121eb464	Remove unnecessary move	2015-07-16 13:14:17 -07:00
David Rowe	9980233a0d	Use estimated eye pitch and yaw from DDE to deflect eyes	2015-07-16 13:03:33 -07:00
Stephen Birarda	05dd49a4c5	seek back after track of octree packet	2015-07-16 13:02:20 -07:00
David Rowe	228e8d4fc0	Velocity filter eye pitch and yaw	2015-07-16 12:37:47 -07:00
bwent	854a098180	keep track of channel id's within addChannel function, pass in when updating	2015-07-16 12:28:43 -07:00
Stephen Birarda	3d6b246782	check version against version in OPP	2015-07-16 12:18:27 -07:00
Stephen Birarda	61f23f6a5e	Merge branch 'master' of https://github.com/highfidelity/hifi into atp	2015-07-16 11:56:26 -07:00
Stephen Birarda	336967e580	fix edit packet sending from client	2015-07-16 11:17:49 -07:00
David Rowe	6b523ada2b	Calculate eye pitch and yaw from DDE coefficients	2015-07-16 10:48:21 -07:00
Seth Alves	75a35f9fcf	Merge branch 'rig' of github.com:howard-stearns/hifi into rig	2015-07-16 09:49:25 -07:00
Anthony J. Thibault	ce80bff7cb	Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers	2015-07-15 18:50:52 -07:00
Anthony J. Thibault	56e7af081e	input plugin architecture, fixed sixense	2015-07-15 18:50:44 -07:00
David Rowe	ba733f730b	Move towards saccade target at speed taking into account frame rate	2015-07-15 18:05:10 -07:00
David Rowe	8336b318e1	Scale saccade per target distance when calculating eye rotation So that saccades still show when looking into distance.	2015-07-15 18:05:09 -07:00
Anthony J. Thibault	7a3f53910f	fix compile error, oops	2015-07-15 17:50:47 -07:00
Anthony J. Thibault	442b701c9a	refactor of myAvatar sensor matrix updating Much simpler and maintanable. * updateFromHMDSensorMatrix is called at start of Application::update() It moves the avatar forward taking into account head motion in the room. * all other avatar manipulation call setPosition and setOrientation normally * Then at the end of Application::update() updateSensorToWorldMatrix is called. This ensures that rendering will use the correct camera position w.r.t. the body.	2015-07-15 17:38:12 -07:00
bwent	4c70c197e6	keep track of channel index with global variable	2015-07-15 17:19:57 -07:00
samcake	b7ac84e174	Merge pull request #5342 from ZappoMan/removeNakeGL remove some more dead code and naked gl	2015-07-15 17:07:55 -07:00
Howard Stearns	b87ed7dc18	Remove dead code.	2015-07-15 17:05:57 -07:00
Howard Stearns	01a3701b52	Merge pull request #5329 from SamGondelman/hydraFix Hydra hand and mouse fixes	2015-07-15 19:03:04 -05:00
Kevin M. Thomas	671263909a	Moved reload content item to nested Network menu item.	2015-07-15 19:47:37 -04:00
bwent	0654bb5e36	Pass by reference into initialize and update function, remove dead code	2015-07-15 16:40:55 -07:00
ZappoMan	d5a6e87a02	remove naked gl from Avatar::calculateDisplayNameTransform()	2015-07-15 16:34:23 -07:00
Kevin M. Thomas	b93ae7b527	Move reload content item to developer menu.	2015-07-15 19:25:18 -04:00
Stephen Birarda	6a02e6d001	resolve final conflict in Application	2015-07-15 16:23:23 -07:00
Stephen Birarda	05dde9d8f5	resolve conflicts on merge with upstream/master	2015-07-15 16:18:47 -07:00
bwent	c159068701	Make pointers member variables	2015-07-15 16:10:41 -07:00
Howard Stearns	6ca458b624	Instantiated in MyAvatar	2015-07-15 15:59:24 -07:00
ZappoMan	7795eaace6	remove more naked gl	2015-07-15 15:56:27 -07:00
ZappoMan	d1e511efcb	more naked gl cleanup, deleting dead code, tweaking comments so they don't give false positives in searching for more naked gl	2015-07-15 15:52:12 -07:00
Atlante45	8aa2892fde	Remove OctreePacketProcessor dtor	2015-07-15 15:35:13 -07:00
ZappoMan	2ad2c4d554	remove some dead code	2015-07-15 15:33:28 -07:00
Brad Hefta-Gaub	7d8f2e906b	Merge pull request #5340 from cozza13/20617 CR for Job #20617 - Change default Minimum Desktop FPS	2015-07-15 14:59:43 -07:00
samcake	de7aed1abc	Merge pull request #5338 from ZappoMan/removeGlowEffect Remove the glow effect.	2015-07-15 14:50:15 -07:00
Brad Hefta-Gaub	ae6e7f05b6	Merge pull request #5341 from samcake/daft Remove the glGet( viewport ) from DeferredLightingEffect	2015-07-15 14:26:08 -07:00
Niraj Venkat	0ee916fb6f	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar	2015-07-15 14:10:42 -07:00
Niraj Venkat	1b13f837bd	Porting AO to new pipeline	2015-07-15 14:10:17 -07:00
Atlante45	039bdc8900	Check dependencyManager return value	2015-07-15 14:06:39 -07:00
ZappoMan	849b584596	more GlowEctomy	2015-07-15 13:16:38 -07:00
Chris Collins	ff288fdd5d	While we work on FPS I have decreased the default LOD FPS While we work on FPS I have decreased the default LOD FPS. In a new users preferences this will now show as 15 desktop and 30 HMD.	2015-07-15 13:09:55 -07:00
Atlante45	aa517adb73	Fix Application inheritance formatting	2015-07-15 13:09:34 -07:00
ZappoMan	c17794849d	more GlowEctomy	2015-07-15 12:58:15 -07:00
ZappoMan	819fa852b8	first pass at GlowEctomy	2015-07-15 12:47:59 -07:00
bwent	70e3e7caa4	Merge branch 'master' into audioStatsDialog	2015-07-15 12:29:33 -07:00
bwent	2c24251b52	Clean up from previous commit	2015-07-15 11:41:26 -07:00
Sam Gateau	48f23a6eaf	Merge branch 'master' of https://github.com/highfidelity/hifi into daft	2015-07-15 11:29:41 -07:00
Stephen Birarda	8b5026a817	cleanup some warnings	2015-07-15 11:20:55 -07:00
bwent	5b0b7229ba	Added a dialog box to display audio network statistics	2015-07-15 11:10:39 -07:00
ZappoMan	6b06987700	remove dead code for magnifier	2015-07-15 10:48:07 -07:00
Stephen Birarda	e127c5c06d	rename Packet methods for clarity	2015-07-15 10:40:40 -07:00
Anthony J. Thibault	fb62fda2d2	started working on input plugin architecture	2015-07-15 10:26:48 -07:00
ZappoMan	0eeddddd6b	removed naked GL from drawOnHUD overlays.	2015-07-15 09:46:58 -07:00
ZappoMan	53c3e3d731	fix CR feedback	2015-07-15 09:03:07 -07:00
David Rowe	fc0ae17a87	Mirror head when using face tracker in fullscreen mirror Mirror translation, yaw, and roll in the same manner as done for HMD case, to mimic what you would expect to see in a mirror.	2015-07-15 07:27:55 -07:00
David Rowe	0af62ca946	Convert tabs to spaces	2015-07-15 07:27:54 -07:00
samcake	9df26c8488	removing naked glViewport from DeferredLightingEffect by adding the current viewport in renderArgs	2015-07-15 00:24:43 -07:00
samcake	c9112966ba	revert debug code	2015-07-14 22:00:32 -07:00
ZappoMan	e39ea72daf	removed dead code	2015-07-14 21:25:49 -07:00
ZappoMan	5d43c98ebc	fix image overlays to not use Naked GL	2015-07-14 20:56:36 -07:00
ZappoMan	8bb6616a25	remove nakedGL from skeleton IK constraint rendering	2015-07-14 18:47:35 -07:00
Sam Gateau	98a3141e11	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-14 18:38:21 -07:00
Anthony J. Thibault	9363ca2f97	Fix for camera matrix position when in Vive HMD.	2015-07-14 18:36:42 -07:00
Sam Gateau	440464f884	Trying to improve the GLBackendINtpu cahce a bit and thinking about moving to core profile	2015-07-14 18:35:11 -07:00
ZappoMan	5a927c4c90	remove dead code	2015-07-14 18:25:50 -07:00
Sam Gondelman	6a0df442f9	emulated mouse events don't get sent back to the keyboard (can't right click and drag with sixense, etc)	2015-07-14 17:59:59 -07:00
ZappoMan	f1b85aefa9	more dead code removal: NodeBounds	2015-07-14 17:59:20 -07:00
Sam Gondelman	f3cb25065f	can't move when hydras at base, hands can deactivate individually	2015-07-14 17:36:22 -07:00
ZappoMan	23b89a6f7d	remove naked gl/dead code from line and cube overlays	2015-07-14 17:04:07 -07:00
Atlante45	fbb6a94579	Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol	2015-07-14 16:36:28 -07:00
Philip Rosedale	17ec524253	Merge pull request #5324 from ZappoMan/fixLaggingTouch fix lagging touch events	2015-07-14 16:28:00 -07:00
Ryan Huffman	c6ffda12f9	Merge branch 'atp' of github.com:birarda/hifi into receive_packets	2015-07-14 16:21:57 -07:00
Stephen Birarda	e596733c8b	fix for stats grab from iterator	2015-07-14 16:21:34 -07:00
Ryan Huffman	ede9217483	Merge branch 'atp' of github.com:birarda/hifi into receive_packets	2015-07-14 16:15:01 -07:00
Stephen Birarda	e4849d29ec	re-use iterator when checking _octreeServerSceneStats	2015-07-14 16:14:43 -07:00
ZappoMan	68f4fe6566	fix lagging touch events	2015-07-14 16:03:44 -07:00
Ryan Huffman	bd345cdccd	Merge branch 'atp' of github.com:birarda/hifi into receive_packets Conflicts: libraries/networking/src/PacketReceiver.cpp	2015-07-14 15:59:16 -07:00
Stephen Birarda	bbe5a3d682	remove commented out call to resetCounters	2015-07-14 15:51:32 -07:00
Stephen Birarda	fb7cb7ff53	add the option for PacketReceiver to drop packets	2015-07-14 15:49:54 -07:00
Philip Rosedale	221a92eeee	Merge pull request #5322 from ctrlaltdavid/fix-eye-direction Fix eye directions so that they're correct when avatar leans backwards	2015-07-14 15:38:56 -07:00
Stephen Birarda	789235b8c7	make NodeList deleter be deleteLater	2015-07-14 15:28:38 -07:00
Ryan Huffman	56b5c9acff	Merge branch 'atp' of github.com:birarda/hifi into receive_packets Conflicts: assignment-client/src/entities/EntityServer.cpp domain-server/src/DomainServer.cpp	2015-07-14 14:53:45 -07:00
Ryan Huffman	677ffb7068	Remove redundant lookup for packetType	2015-07-14 14:50:36 -07:00
Stephen Birarda	e2188415fe	fix ref to qApp, connection to audioIO	2015-07-14 14:45:26 -07:00
Stephen Birarda	4dd3dd6386	swap m for comma in Menu	2015-07-14 14:44:04 -07:00
Stephen Birarda	23548a99bc	move NACK packet disabling to EntityEditPacketSender	2015-07-14 14:43:01 -07:00
Stephen Birarda	8d4c945874	cleanup audioIO connections in Application	2015-07-14 14:34:39 -07:00
Stephen Birarda	1f4ac0f17c	emit mutedByMixer signal for a noisy mute	2015-07-14 14:30:46 -07:00
Stephen Birarda	d617b71232	remove SharedNodePointer from some packet callbacks	2015-07-14 14:27:26 -07:00
Atlante45	bbb00b9d3a	Merge branch 'protocol' of https://github.com/birarda/hifi into protocol	2015-07-14 14:11:41 -07:00
David Rowe	bfad3ee02a	Fix eye directions so that they're correct when avatar leans backwards	2015-07-14 14:07:32 -07:00
Stephen Birarda	0637f589b5	add PacketListener to help unregister for packets	2015-07-14 13:52:38 -07:00
Anthony J. Thibault	aa66691a73	Merge branch 'sam/vive-hand-controllers' of github.com:hyperlogic/hifi into sam/vive-hand-controllers	2015-07-14 12:37:09 -07:00
Atlante45	a32f54da2f	Cleanup	2015-07-14 12:36:18 -07:00
Atlante45	7bf45308b6	Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart	2015-07-14 12:31:37 -07:00
Anthony J. Thibault	dbc18ce51f	merge with plugins	2015-07-14 12:30:47 -07:00
Anthony J. Thibault	9209e0745e	Added "Standing HMD Sensor Mode" checkbox to menu removed static bool isRoomTracking and instead moved into the View menu.	2015-07-14 12:12:38 -07:00
Brad Hefta-Gaub	049419cec7	Merge pull request #5307 from howard-stearns/remove-octreeFades Remove old octreeFade code that wasn't working anyway	2015-07-14 10:24:01 -07:00
Ryan Huffman	0edc909818	Merge branch 'protocol' of github.com:birarda/hifi into receive_packets Conflicts: assignment-client/src/audio/AudioMixer.cpp interface/src/Application.cpp libraries/networking/src/Packet.cpp	2015-07-14 10:21:31 -07:00
Stephen Birarda	821c16cbc4	resolve conflicts on merge with uptream/master	2015-07-14 09:52:20 -07:00
Brad Davis	684d466b44	Merge pull request #5308 from venkatn93/avatar Avatars rendered correctly based on Scene.shouldRenderAvatars	2015-07-14 09:06:49 -07:00
Niraj Venkat	ef3c6b25e0	More coding standard changes	2015-07-14 00:45:38 -07:00
Niraj Venkat	1f1a5f8e75	Coding standard and fixing pointers	2015-07-13 22:57:11 -07:00
Philip Rosedale	c81053fc83	Merge pull request #5318 from samcake/punk Fixing the ImageOverlay Bug	2015-07-13 22:25:46 -07:00
Anthony J. Thibault	158c1c6aa8	Removed some debugging prints and drawing	2015-07-13 20:41:19 -07:00
Brad Davis	f8144e4ee2	Merge branch 'master' into plugins	2015-07-13 19:52:53 -07:00
Brad Davis	fee5f7cd0f	Merge fixes	2015-07-13 19:07:44 -07:00
Clément Brisset	a432752c39	Merge pull request #5316 from ctrlaltdavid/20604 QA for #20604 - Add an "is looking at me" indicator above avatars' heads	2015-07-13 16:40:11 -07:00
Sam Gateau	f08c608195	Remove dead code	2015-07-13 16:33:04 -07:00
Sam Gateau	5555ccd225	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2015-07-13 16:19:09 -07:00
Sam Gateau	4743bbad80	Adding shaders to the lib for rendering simple textured quad and solve the ImageOverlay issue for edit.js	2015-07-13 16:18:39 -07:00
Clément Brisset	c99382ee74	Merge pull request #5287 from ctrlaltdavid/20607 CR for Job #20607 - Interface upgrade message has bad formatting	2015-07-13 16:07:17 -07:00
Clément Brisset	24eb4c8263	Merge pull request #5309 from sethalves/quiet-compiler quiet compiler	2015-07-13 15:55:35 -07:00
Stephen Birarda	34f9b1881e	fix registration of OctreePacketProcessor for set of types	2015-07-13 15:40:55 -07:00
Atlante45	c80df94b06	Update includes for moved files	2015-07-13 15:28:55 -07:00
Niraj Venkat	10e0a93ac0	Fix for avatar rendering not working on domain exit/entry	2015-07-13 15:22:00 -07:00
David Rowe	59f456a2f2	Add an "is looking at me" indicator above avatars' heads Menu item: Developer > Avatar > Show Who's Looking at Me	2015-07-13 14:16:39 -07:00
Anthony J. Thibault	454aa9b983	Optimization for computation of sensorMat During setPosition/setOrientation we used the cached inverse of the body matrix, instead of the somewhat convoluted previous code path.	2015-07-13 14:01:12 -07:00
Anthony J. Thibault	57731e7bd8	More refactoring of MyAvatar HMD Sensor math. Moved compuation of avatar postion using head/body joints int a helper method. Also we compute this once per frame in setHMDSensorMatrix instead of inside of every setPostion/setOrientation call.	2015-07-13 13:36:55 -07:00
Stephen Birarda	ca1ff9b0f5	fix a couple of compile errors for avatar changes	2015-07-13 13:34:36 -07:00
Stephen Birarda	859122db5d	update signature of callbacks for avatar packets	2015-07-13 13:32:46 -07:00
Stephen Birarda	d990420565	repairs to octree packet receiving in interface	2015-07-13 13:10:57 -07:00
Anthony J. Thibault	d07a02cef3	Refactor of MyAvatar and Application HMD sensor MyAvatar now uses a cached copy of the HMDSensor location, instead of calling into Application for every access. This allows us to simplify application to always return the most recent pose, instead of a different one pre and post physics. Added accessors to HMD Sensor in MyAvatar, besides being helpful, it also an optimization to avoid extracting quaternions from the HMD matrix on every access.	2015-07-13 12:56:33 -07:00
Brad Davis	9eb15d3d55	Merge remote-tracking branch 'upstream/master' into plugins Conflicts: interface/src/Application.cpp interface/src/GLCanvas.cpp interface/src/devices/OculusManager.cpp interface/src/devices/OculusManager.h libraries/render-utils/src/DeferredLightingEffect.cpp	2015-07-13 12:54:19 -07:00
Atlante45	957e6394a9	sendPacket function take Node& not a pointer	2015-07-13 11:57:20 -07:00
Stephen Birarda	264f39fa59	resolve conflicts on merge with upstream/master	2015-07-13 11:25:24 -07:00
Stephen Birarda	f3d5b8f7c6	add a missing semicolon	2015-07-13 11:18:20 -07:00
ericrius1	0ce6737b34	merged and normals flipping	2015-07-13 09:43:15 -07:00
Stephen Birarda	3d62162812	cleanup octree networking code to use new API	2015-07-13 09:40:26 -07:00
Howard Stearns	d1952583ab	Merge branch 'master' of https://github.com/highfidelity/hifi into remove-octreeFades	2015-07-13 07:24:08 -07:00
Seth Alves	fb23eb0faf	Merge pull request #5301 from samcake/yellow Rename gpu::Batch::setUniformTexture into gpu::Batch::setResourceTexture	2015-07-12 11:36:03 -07:00
Seth Alves	c17c9f1818	quiet compiler	2015-07-12 10:29:43 -07:00
Atlante45	80fe090a94	Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers	2015-07-10 20:20:03 -07:00
Andrew Meadows	9ce9c541de	fix activation of object when action changes	2015-07-10 18:45:40 -07:00
Anthony J. Thibault	ac9e1384c0	controllers render in right position, wrong rotation	2015-07-10 18:27:12 -07:00
Anthony J. Thibault	94918be949	another fix for viewing vive user in third person	2015-07-10 18:27:12 -07:00
Stephen Birarda	ffcd8e1613	update connection for packet version mismatch	2015-07-10 17:54:51 -07:00
Stephen Birarda	9ee62a8a38	fix for connection denied packet in Application	2015-07-10 17:52:51 -07:00
Niraj Venkat	f95bd3f7bd	Fixing build error	2015-07-10 17:46:20 -07:00
Niraj Venkat	bbd7b2a65e	Removed unused functions	2015-07-10 17:31:49 -07:00
Niraj Venkat	dacc6f66c0	Avatars rendered correctly based on Scene.shouldRenderAvatars	2015-07-10 17:26:56 -07:00
Howard Stearns	51be245159	Remove old octreeFade code that wasn't working anyway.	2015-07-10 16:55:45 -07:00
Atlante45	ec7e1df8c0	Move and rename menu item	2015-07-10 15:47:46 -07:00
Atlante45	a3848f08d2	Conditionnal fixes.	2015-07-10 15:36:17 -07:00
Sam Gateau	98f10e72ec	fix the wrong function name that happened missing a merge	2015-07-10 15:20:49 -07:00
Ryan Huffman	dee117500b	Remove process() from OctreePacketProcessor	2015-07-10 15:00:46 -07:00
Ryan Huffman	99aaefbd03	Fix and update signature of Application::handleDomainConnectionDeniedPacket	2015-07-10 15:00:29 -07:00
Ryan Huffman	6e53a5ad97	Update OctreePacketProcessor to use SharedNodePointer	2015-07-10 14:23:09 -07:00
Andrew Meadows	9cb7e86877	cleanup of AvatarActionHold deserialization	2015-07-10 12:34:12 -07:00
Atlante45	5cfa1605df	Made Texture safe with resource refresh	2015-07-10 12:28:06 -07:00
Sam Gateau	2c05349b06	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-10 11:10:07 -07:00
Sam Gateau	7fc9fd97ff	Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers.	2015-07-10 11:03:12 -07:00
Atlante45	4702b39130	Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart	2015-07-10 10:56:11 -07:00
Andrew Meadows	1759f0553d	Merge pull request #5290 from BingShearer/CrashFixes Crash fixes	2015-07-10 10:42:47 -07:00
Anthony J. Thibault	c69665e0fe	fix for goToLocation	2015-07-10 09:43:33 -07:00
Anthony J. Thibault	51e24ea466	head model follows HMD for observers	2015-07-10 09:20:38 -07:00
Ryan Huffman	78ff6477bd	Update OctreePacketProcessor to use QSharedPointer<NLPacket>	2015-07-10 08:45:21 -07:00
Brad Hefta-Gaub	33016e2797	Merge pull request #5293 from jherico/bart More profiling ranges and updated performance testing scripts	2015-07-09 19:10:45 -07:00
Brad Hefta-Gaub	af20969eb9	Merge pull request #5298 from jherico/lisa Restore audio scope	2015-07-09 19:03:29 -07:00
Anthony J. Thibault	653b0d7789	started working on rendering controllers	2015-07-09 19:03:11 -07:00
Brad Hefta-Gaub	74ef91550c	Merge pull request #5296 from venkatn93/master Entities are now added/removed from rendering based on Scene.shouldRenderEntities	2015-07-09 18:54:06 -07:00
Brad Davis	a92a7980d7	Restore audio scope	2015-07-09 17:49:25 -07:00
Andrew Meadows	270ea7af9e	Merge pull request #5292 from sethalves/palm-rotation action changes to allow "hold" action to track palm rotation	2015-07-09 17:44:28 -07:00
Niraj Venkat	007d662db1	Re-added for shouldRenderEntities	2015-07-09 17:40:14 -07:00
Niraj Venkat	706f85e4ce	Fixes to comply with coding standard	2015-07-09 17:31:38 -07:00
Seth Alves	d0d0b2a143	Merge pull request #5295 from birarda/master potential fix for windows domain connect cycling	2015-07-09 17:04:06 -07:00
Atlante45	bfeb095fb4	Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart	2015-07-09 16:30:56 -07:00
Anthony J. Thibault	b6c0ae4bea	Fix for flying in HMDMode with avatar collisons disabled	2015-07-09 16:29:43 -07:00
Niraj Venkat	adf5b95835	Changing formatting	2015-07-09 16:25:29 -07:00
Niraj Venkat	52095fd38d	Fixing merge	2015-07-09 16:23:40 -07:00
Niraj Venkat	1dce5f80cc	Entities are now added/removed from rendering based on Scene.shouldRenderEntities	2015-07-09 16:17:58 -07:00
Brad Davis	214405a0e5	Fixing typo	2015-07-09 16:06:27 -07:00
Ryan Huffman	2380fb23c3	Update OctreePacketProcessor to use NLPacket&	2015-07-09 16:05:52 -07:00
Stephen Birarda	efb89c281f	fix creation of QTimer parented by NodeList	2015-07-09 16:02:29 -07:00
Stephen Birarda	a4f1145f06	fix QTimer connection to nodeList	2015-07-09 16:01:41 -07:00
Stephen Birarda	408ecb9735	move domain server check in timer to node thread	2015-07-09 15:59:32 -07:00
Brad Davis	446f800aee	More profiling ranges and updated performance testing scripts	2015-07-09 15:43:30 -07:00
Ryan Huffman	6f9907a22d	Stub in process() for OctreePacketProcessor	2015-07-09 15:31:45 -07:00
Ryan Huffman	8da50d342c	Remove DatagramProcessor.h from Application	2015-07-09 15:31:01 -07:00
Ryan Huffman	5e65f422fa	Move mute environment handling to Application	2015-07-09 15:30:25 -07:00
Bing Shearer	99c563602f	Fixed Else case where _renderImage is true but the texture has 0 size, else case did not previously exist.	2015-07-09 15:25:37 -07:00
Seth Alves	2dc4922da3	bring over code from entity-level-locking branch	2015-07-09 15:23:05 -07:00
Seth Alves	5312beeaf4	if an action changes its own arguments, cause reserialisation	2015-07-09 14:50:31 -07:00
Seth Alves	a01fb6f1dc	if an action changes its own arguments, cause reserialisation	2015-07-09 14:32:34 -07:00
Bing Shearer	85f6fdb8cf	Fixed bug which would cause program to crash if there was no image associated with an overlay in windows build (see checkbox in sunLightExample)	2015-07-09 14:20:10 -07:00
Bing Shearer	25708678f6	Fixed shutdown procedure for Datagrams so that there is no crash on exit	2015-07-09 14:18:53 -07:00
Ryan Huffman	dd9dea7a97	Merge remote-tracking branch 'birarda/protocol' into receive_packets Conflicts: interface/src/DatagramProcessor.cpp interface/src/octree/OctreePacketProcessor.cpp libraries/entities/src/EntityEditPacketSender.cpp libraries/networking/src/LimitedNodeList.h libraries/networking/src/NLPacket.h	2015-07-09 14:08:35 -07:00
Stephen Birarda	1b4e333c49	Merge pull request #3 from birarda/atp initial networking API changes for new protocol	2015-07-09 16:51:37 -04:00
Seth Alves	050c472d6a	Merge branch 'master' of github.com:highfidelity/hifi into palm-rotation	2015-07-09 13:39:37 -07:00
Brad Hefta-Gaub	489a8b4b3d	Merge pull request #5285 from jherico/homer Move log file writing to a separate thread	2015-07-09 12:22:13 -07:00
Seth Alves	d197bf2a85	use palm rotation data in hold action	2015-07-09 12:18:32 -07:00
Stephen Birarda	a363f42bb2	pass const NLPacket& for all sendUnreliablePacket calls	2015-07-09 11:42:18 -07:00
Seth Alves	08d63b7fd8	first attempt at palm rotation	2015-07-09 11:03:02 -07:00
Anthony J. Thibault	2ac6b6cd32	misc. changes	2015-07-09 09:57:12 -07:00
Brad Davis	2fff560ff9	Fixing log file viewer	2015-07-09 09:54:35 -07:00
Ryan Huffman	3b7ad982a4	Update OctreePacketProcessor to use packet callbacks	2015-07-09 09:23:50 -07:00
Brad Hefta-Gaub	fb07956689	Merge pull request #5284 from hyperlogic/ajt/mirror-view-fix fix for mirror rendering on windows	2015-07-09 08:38:55 -07:00
Stephen Birarda	19c5f0b67c	resolve conflicts on merge with upstream/master	2015-07-08 22:54:36 -07:00
Brad Davis	63dfd570f1	Adding priority support to GenericThread	2015-07-08 22:54:31 -07:00
Stephen Birarda	8c2cf2cf25	fix an unused variable warning	2015-07-08 22:48:44 -07:00
Brad Davis	08d1364f81	Move file log persistence to a separate thread	2015-07-08 22:35:23 -07:00
Anthony J. Thibault	1be0e7ebc3	fix for mirror rendering on windows * added preScale to Transform class. * preScale by -1 about the xAxis instead of post scale. I think this was working on Mac due to the different code paths in GLBackendTransform::updateTransform for core vs legacy gl profile.	2015-07-08 21:33:27 -07:00
Brad Davis	b173ac397c	Merge pull request #5278 from samcake/yellow Adding more NSight instrumentation	2015-07-08 20:28:18 -07:00
Stephen Birarda	658ad6bd02	fix eachNode lambda in Application	2015-07-08 18:55:26 -07:00
Stephen Birarda	da3502eb6c	resolve conflicts on merge with upstream/master	2015-07-08 18:41:48 -07:00
Stephen Birarda	cf15cbc62f	fix a cast, move a packet	2015-07-08 18:37:25 -07:00
Stephen Birarda	c5840d085c	replace packet header size check with 0	2015-07-08 18:35:56 -07:00
Stephen Birarda	dfa5be1a0c	fix for killPacket in MyAvatar and DatagramProcessor header check	2015-07-08 18:35:04 -07:00
Brad Davis	625cc86f83	Merge pull request #5283 from ZappoMan/optimizeByteCountCoded Optimize ByteCountCoded<> to not do extra heap allocations	2015-07-08 18:35:02 -07:00
Stephen Birarda	dc7c268467	fixes for changed API in Application	2015-07-08 18:27:10 -07:00
Stephen Birarda	9c18277e9c	packet fixes in script-engine and Application	2015-07-08 18:24:49 -07:00
Atlante45	ee3a8b1b6e	Clear resource caches instead of restarting	2015-07-08 18:23:16 -07:00
ZappoMan	7790e35d24	added bytes consumed result to decode, and exit early after bytes consumed	2015-07-08 18:19:12 -07:00
Seth Alves	7bea4a54a3	Merge pull request #5274 from AndrewMeadows/argon cleanup of EntityActionInterface and friends	2015-07-08 17:54:52 -07:00
ZappoMan	e885ac1821	improved performance of ByteCountCoding<> decode	2015-07-08 17:32:51 -07:00
Anthony J. Thibault	0f30da64bc	added Plugin interface to ViveControllerManager mostly I just added this to add the isSupported method, so it wouldn't attempt to initialize if there was no HMD attached.	2015-07-08 16:31:52 -07:00
Ryan Huffman	1b5d526444	Add new packet processing to AvatarManager	2015-07-08 15:06:50 -07:00
Sam Gateau	4c44eb63da	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-08 14:25:41 -07:00
Sam Gateau	f992e875b4	Adding intrsumentation for nsight and hiding the nsight specific code in cpp	2015-07-08 14:25:13 -07:00
Sam Gondelman	64118d9118	started moving hydra to use UserInputMapper::Poses, needs testing	2015-07-08 13:38:48 -07:00
Ryan Huffman	c365ea60ad	Add packet listening to AvatarManager	2015-07-08 13:13:21 -07:00
Anthony J. Thibault	07141fd1e3	rotation and thrust work in both 2d and hmd mode known issue, hmd does thrust doesnt work when avatar collisons are disabled.	2015-07-08 12:25:57 -07:00
Atlante45	ed296850e2	Rename to clear cache and restart	2015-07-08 12:24:45 -07:00
Atlante45	39cb5100a3	Clear cache and restart first draft	2015-07-08 12:23:22 -07:00
Ryan Huffman	0b0446e527	Add handleComainConnectionDeniedPacket to Application	2015-07-08 11:54:22 -07:00
Ryan Huffman	b960d86f80	Remove datagramProcessor from Application	2015-07-08 11:54:06 -07:00
Philip Rosedale	574758eae9	Merge pull request #5252 from ctrlaltdavid/20601 DO NOT MERGE - QA for #20601 - Fix and improve eye gaze	2015-07-08 11:37:40 -07:00
Stephen Birarda	122fd61451	fix a bad replacement in DatagramProcessor	2015-07-08 10:44:40 -07:00
Stephen Birarda	818521864b	fix missed bad PacketType replacement	2015-07-08 10:27:32 -07:00
Ryan Huffman	9d25612ff8	Move DatagramProcessor to PacketProcessor	2015-07-08 10:24:30 -07:00
Ryan Huffman	e89dbe8541	Update PacketType in DatagramProcessor	2015-07-08 10:24:30 -07:00
Ryan Huffman	b1c09d71f7	Add packet listeners to DatagramProcessor	2015-07-08 10:21:15 -07:00
Stephen Birarda	74940a2132	replace lingering PacketTypes in old format	2015-07-08 10:18:13 -07:00
Andrew Meadows	a0a1b01ea9	coalesce dupe action data members: _id and _type	2015-07-07 17:50:08 -07:00
Andrew Meadows	e9df8cacc7	make some arguments const, cleanup some #includes	2015-07-07 17:50:08 -07:00
Andrew Meadows	77bd7b2821	some ObjectAction methods should be const	2015-07-07 17:50:08 -07:00
Anthony J. Thibault	754e55553a	modified rotation in MyAvatar::updatePosition, reenabled trackpad input	2015-07-07 17:29:46 -07:00
Anthony J. Thibault	15cf008f13	hand controllers and arrow keys now work	2015-07-07 17:29:45 -07:00
David Rowe	abc54f2e3f	Polished fonts, colors, etc.	2015-07-07 17:08:02 -07:00
Stephen Birarda	6c6143f21e	remove NetworkPacket and replace with NodePacketPair	2015-07-07 16:56:05 -07:00
David Rowe	b123e280d6	Add release numbers to associated text	2015-07-07 16:22:01 -07:00
Stephen Birarda	1f68ad892a	replace PacketList usage with NLPacketList	2015-07-07 16:14:57 -07:00
Stephen Birarda	11d5aa9803	fix queryPacket initialization in Application	2015-07-07 15:41:07 -07:00
Stephen Birarda	56880e8858	return fixes for NAK PacketLists	2015-07-07 15:33:03 -07:00
Stephen Birarda	45b549398d	use PacketList for application nack packets	2015-07-07 15:31:58 -07:00
Anthony J. Thibault	4f8cf0af8c	moved sdl2manager to input-plugins	2015-07-07 15:24:39 -07:00
Anthony J. Thibault	d75353eeb2	added left/right hand click actions, vive controller should be able to emulate mouse events	2015-07-07 14:35:55 -07:00
Atlante45	9889dcdd64	Merge branch 'atp' of https://github.com/birarda/hifi into protocol	2015-07-07 12:29:00 -07:00
Howard Stearns	1c2972bd7c	Expose avatar collisions to scripts, and include velocityChange in exposed collision data.	2015-07-07 11:49:55 -07:00
Stephen Birarda	e05470a11c	change to new packet sending in Application	2015-07-07 11:11:20 -07:00
Brad Davis	a04921e74b	Merge branch 'master' into plugins	2015-07-07 11:10:51 -07:00
Anthony J. Thibault	5293effc2e	more work in progress vive room tracking Found and disabled torso twist use an old copy of the hmd pose before physics, and the most up to date one after physics.	2015-07-07 00:12:48 -07:00
Atlante45	2ba6bd3afc	Double display name offset	2015-07-06 18:39:43 -07:00
Anthony J. Thibault	834b75f4c4	work in progress room scale tracking work. sensor to world matrix stored in MyAvatar override setPosition and setOrientation to move sensor to world matrix.	2015-07-06 18:25:42 -07:00
Atlante45	687f9dda4a	Restore old offset behaviors	2015-07-06 18:21:17 -07:00
Atlante45	541d9ae431	Merge branch 'master' of https://github.com/highfidelity/hifi into fix_billboard	2015-07-06 18:05:43 -07:00
Sam Gondelman	f69b755166	merge with hifi/plugins	2015-07-06 17:41:45 -07:00
Brad Davis	bd938d5f4c	Merge pull request #5263 from ZappoMan/inBoundStats Additional inbound entity stats	2015-07-06 17:12:19 -07:00
Brad Davis	95000eec3c	Merge remote-tracking branch 'upstream/master' into plugins Conflicts: interface/src/ui/overlays/LocalModelsOverlay.cpp	2015-07-06 16:22:03 -07:00
ZappoMan	05f28064bf	add stats for PPS for inbound from network into OctreePacketProcessor and processing out of OctreePacketProcessor	2015-07-06 16:03:42 -07:00
Atlante45	4a777f600f	Change DDE Packet struct name to avoid collision	2015-07-06 15:11:36 -07:00
Sam Gateau	fe633cd545	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-06 15:04:02 -07:00
David Rowe	5046f4c1ac	Update upgrade dialog - Strip out "<br />"s - Show information for all new versions since current, not just latest - Display scrollbar if content too long to show all at once - "version" / "versions" behind depending on if one or more - Align buttons with heading and text - Darken text so that is more readable	2015-07-06 13:19:42 -07:00
Brad Davis	21562c0766	Merge pull request #5258 from ericrius1/nakedGLStripping Removing naked GL calls from overlay code	2015-07-06 10:25:50 -07:00
Atlante45	85df510b4b	Use depth bias to avoid z-fighting on text3d overlays	2015-07-04 18:40:37 -07:00
Atlante45	9bf6c439aa	Use depth bias to avoid z-fighting on display name	2015-07-04 18:34:19 -07:00
Atlante45	32cf4dac78	Fix displayname z-fighting	2015-07-04 16:06:38 -07:00
ZappoMan	74733452da	some tweaks to make stats dialog more readable	2015-07-04 11:25:27 -07:00
ZappoMan	40cdd8646e	add packets per second to octree processing stats	2015-07-03 15:53:53 -07:00
David Rowe	3f38a835d8	Fix look-at vectors not rendering if not looking at me	2015-07-03 13:49:10 -07:00
Eric Levin	3d06b011aa	adding batch to renderHUD	2015-07-03 13:27:00 -07:00
ZappoMan	29a7584ee6	remove dead code	2015-07-03 11:29:59 -07:00
Eric Levin	9d3995ae25	Merge branch 'nakedGLStripping' of https://github.com/ericrius1/hifi into nakedGLStripping	2015-07-03 09:42:19 -07:00
Brad Davis	ba7c3a2c27	Attempting to get UI and navigation keys/mouse working	2015-07-03 07:10:33 -07:00
Brad Davis	2a1776303d	Merge remote-tracking branch 'upstream/master' into plugins Conflicts: interface/src/Application.cpp interface/src/avatar/SkeletonModel.cpp interface/src/devices/OculusManager.cpp interface/src/devices/TV3DManager.cpp	2015-07-03 06:17:35 -07:00
Brad Davis	ed5835ff05	Trying to get mac display plugins working:	2015-07-02 22:29:22 -07:00
Bradley Austin Davis	0034a14fc1	Working on mac functionality	2015-07-02 18:14:12 -07:00
Stephen Birarda	a9420d4212	replace controlled broadcast to nodes in Application	2015-07-02 17:55:26 -07:00
Sam Gondelman	3f6fbd058c	merge with standing-mode, hands relative to neck	2015-07-02 17:44:19 -07:00
ZappoMan	a54cf67064	add stats for processing time per packet	2015-07-02 17:28:53 -07:00
ZappoMan	8916dd2056	add stats for elements and entities per second	2015-07-02 17:00:35 -07:00
Stephen Birarda	0d64e82fe2	replace PacketType declarations with PacketType::Value	2015-07-02 16:38:52 -07:00
ZappoMan	0c0b8dbbc1	add stats for elements and entities per incoming packet	2015-07-02 16:19:13 -07:00
David Rowe	87ca7626d7	Merge branch 'master' into 20601	2015-07-02 15:45:32 -07:00
David Rowe	9efeda9716	Adjust gaze target for someone looking at me	2015-07-02 15:43:23 -07:00
Sam Gateau	8d8a902328	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-02 15:06:32 -07:00
ZappoMan	b568e895ec	Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats	2015-07-02 15:00:09 -07:00
Brad Hefta-Gaub	2a03f62bf2	Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership Actions over wire and improved simulation ownership	2015-07-02 14:57:27 -07:00
ericrius1	8be1fd28e5	stripping naked gl calls from overlays to allow vive and oculus plugins to work	2015-07-02 13:57:00 -07:00
David Rowe	3a92878544	Reinstate making someone looking at me look at my camera instead of face	2015-07-02 13:47:52 -07:00
ZappoMan	5c4d4893de	added bytes per edit stats	2015-07-02 13:44:28 -07:00
ZappoMan	63b585da0f	added updates per second stat	2015-07-02 13:28:12 -07:00
Brad Hefta-Gaub	b11172affb	Merge pull request #5254 from jherico/timing_menu_log Inhibiting log spam unless a menu item is selected	2015-07-02 12:48:01 -07:00
Brad Davis	d5fe6f0bdb	Inhibiting log spam unless a menu item is selected	2015-07-02 12:34:32 -07:00
Philip Rosedale	fba569d7db	Merge pull request #5218 from huffman/fix-hmd-displayname-orientation Fix avatar displayname to point towards camera	2015-07-02 12:19:40 -07:00
ZappoMan	b13a4b2a71	add edit update stats	2015-07-02 11:07:47 -07:00
ericrius1	ad97b28734	fixed merge conflicts	2015-07-02 11:01:40 -07:00
Clément Brisset	b616fff222	Merge pull request #5220 from howard-stearns/avatar-collision-sounds Avatar collision sounds	2015-07-02 10:27:24 -07:00
Sam Gondelman	81efd99ae4	merge with hifi/plugins	2015-07-02 10:13:28 -07:00
David Rowe	c20cd40275	Merge branch 'master' into 20601 Conflicts: interface/src/avatar/Head.cpp	2015-07-02 09:51:47 -07:00
Anthony J. Thibault	f0d8916d8a	First crack at room scale tracking from vive HMD. * modifed openvr plugin to return different eye pose matrices. * avatar position and physics body now follow the head. * orientation also follows head direction	2015-07-02 09:47:08 -07:00
Philip Rosedale	0905962d90	Merge pull request #5251 from ctrlaltdavid/20600 Fix Show Eye Focus and Show Look-at Vectors	2015-07-02 09:16:20 -07:00
Brad Hefta-Gaub	f16b8d5083	Merge pull request #5246 from jherico/inter_idle_timing Instrument the inter-idle time and tweaking the timeout setting	2015-07-02 09:01:44 -07:00
Howard Stearns	1f3a1f6ac8	Add comments re upcoming physics changes.	2015-07-02 10:07:14 -05:00
Howard Stearns	d0675c7f22	Side-effect new value before emit.	2015-07-02 09:56:02 -05:00
Bradley Austin Davis	54bbc841e2	Working on mac compilability	2015-07-01 23:03:33 -07:00
David Rowe	925fd71262	Fix rendering of look-at vectors	2015-07-01 22:45:47 -07:00
David Rowe	0df9ebeda3	Fix rendering of look-at avatar sphere postLighting is never true.	2015-07-01 22:45:13 -07:00
David Rowe	026f6d3690	Add mouth as third gaze target in addition to left and right eyes	2015-07-01 21:22:30 -07:00
David Rowe	4ced0dc6c4	Only deflect eyes for Faceshift; DDE doesn't provide eye pitch or yaw	2015-07-01 20:24:47 -07:00
Seth Alves	246861221c	rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready.	2015-07-01 20:17:21 -07:00
David Rowe	26cbb14f45	Alternative look-at gaze left/right with face trackers too Instead of looking at one or other eye depending on look direction.	2015-07-01 20:09:36 -07:00
Atlante45	7b5a5a339a	Use make_shared/create to make shared pointers	2015-07-01 19:46:06 -07:00
Atlante45	ee13407066	Fix smart pointer casts	2015-07-01 19:22:40 -07:00
Sam Gondelman	0333adb95b	moved controllers to input-plugins, they work now	2015-07-01 18:46:57 -07:00
David Rowe	fada70fe02	Remove redundant code	2015-07-01 18:32:33 -07:00
David Rowe	bc4c635106	Fix gazing at avatar (when no head tracking or HMD) Randomly look at avatar's left and right eyes if the face is visible. Otherwise just look at their head.	2015-07-01 18:31:16 -07:00
Sam Gateau	d019ef4373	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-01 18:12:11 -07:00
Sam Gateau	e8b11f1198	Exposing the display Item Status to js to turn it on/off	2015-07-01 17:27:41 -07:00
Brad Davis	88a733181e	Fixing comment to reflect code	2015-07-01 16:54:59 -07:00
Brad Davis	4cffa26c01	CR comments and fixing the microsecond display	2015-07-01 16:53:12 -07:00
Brad Davis	59027959b8	CR comments and fixing the average calculation	2015-07-01 16:30:42 -07:00
Brad Hefta-Gaub	af932fde29	Merge pull request #5247 from ericrius1/handRender Fixed broken rendering of hydra visualization paraphernalia	2015-07-01 16:21:32 -07:00
Brad Davis	0c88972f09	Instrument the inter-idle time and tweaking the timeout setting	2015-07-01 16:14:17 -07:00
ericrius1	a24df5c02f	added postLighting check back for rendering avatar Hands	2015-07-01 15:28:48 -07:00
ericrius1	f49f368ec3	removed dead commented out code	2015-07-01 15:16:34 -07:00
ericrius1	8129d0eb1f	hydra lasers are now rendering again	2015-07-01 15:12:37 -07:00
ericrius1	8b00864175	hydra hand spheres and lasers are rendering again	2015-07-01 15:04:19 -07:00
Sam Gondelman	e54060d6bb	more working on poses, LEFT_ and RIGHT_HAND input actions	2015-07-01 14:36:12 -07:00
Clément Brisset	eb3bddfe4c	Merge pull request #5209 from ctrlaltdavid/20589 QA for #20589 - Vertical field of view preference change should be applied immediately	2015-07-01 13:53:25 -07:00
Clément Brisset	ede2eec283	Merge pull request #5240 from ctrlaltdavid/fix-textoverlay-size Fix TextOverlay font size setting	2015-07-01 13:52:51 -07:00
David Rowe	6a48b56e0f	In mirror mode look directly at the camera in both normal and HMD view	2015-07-01 13:32:50 -07:00
David Rowe	efbccc3a4e	Fix storing Oculus eye positions	2015-07-01 13:32:50 -07:00
Brad Davis	b90bb48f73	Fixing display plugins definitions	2015-07-01 13:25:23 -07:00
David Rowe	e85eb246d2	Delete old TextRenderer after new one is in place	2015-07-01 13:19:46 -07:00
Philip Rosedale	8ed4000560	Merge pull request #5239 from SamGondelman/zooming DO NOT MERGE - quadratic zooming response	2015-07-01 12:22:23 -07:00
Seth Alves	5e2f7204b4	responses to code review	2015-07-01 10:29:42 -07:00
Brad Davis	cd63b8a49d	Fix inverted in/out mbps display on stats	2015-07-01 10:10:53 -07:00
Brad Davis	040f7c86ea	Working on plugin menu items	2015-07-01 09:05:26 -07:00
Sam Gondelman	a154c809c0	working on using UserInputMapper::Pose, merging	2015-06-30 17:34:34 -07:00
Sam Gondelman	1ea8e85fe8	Merge remote-tracking branch 'jherico/input-plugins' into sam/vive-hand-controllers	2015-06-30 17:30:37 -07:00
David Rowe	215c260c9e	Fix TextOverlay font size setting	2015-06-30 17:08:43 -07:00
Brad Davis	b2b571b5a1	Fixing app includes	2015-06-30 15:52:55 -07:00
Brad Davis	db1094418d	Restoring from plugins	2015-06-30 15:41:47 -07:00
Sam Gondelman	c9d205de3e	quadratic zooming response	2015-06-30 14:04:43 -07:00
Sam Gondelman	aaf84b47f3	Merge remote-tracking branch 'upstream/plugins' into sam/vive-hand-controllers	2015-06-30 10:37:06 -07:00
Brad Davis	e421141ec5	experimenting with input plugins	2015-06-30 09:52:54 -07:00
Seth Alves	0caa8be66e	ignore incoming changes for a hold action that's flagged as 'mine'	2015-06-29 19:50:19 -07:00
Seth Alves	88fc74374b	if a hold action is edited by a local script, mark it as 'mine'. if it's not 'mine', let the spring action handle the wire protocol	2015-06-29 19:27:10 -07:00
Sam Gondelman	a27196dfee	initial testing of hand controller tracking	2015-06-29 17:13:33 -07:00
Seth Alves	0a734c9d3d	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire-and-sim-ownership	2015-06-29 16:56:04 -07:00
Seth Alves	a0fd75c54f	don't enable hold actions from remote nodes	2015-06-29 16:08:37 -07:00
Seth Alves	fbede0a23f	guard against feeding bullet a NaN	2015-06-29 15:54:24 -07:00
Brad Davis	196a92c1b4	A little bit of display plugin API cleanup	2015-06-29 10:55:13 -07:00
Seth Alves	1d122060a6	merge andrew's sim-ownership branch	2015-06-29 09:50:38 -07:00
Howard Stearns	51782bd17d	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds	2015-06-29 09:30:44 -07:00
ericrius1	cf720f9e2e	merged master	2015-06-29 09:27:40 -07:00
Brad Davis	a923c044a3	Merge remote-tracking branch 'upstream/master' into plugins	2015-06-28 22:51:46 -07:00
Brad Davis	dcdf47dd66	Fix mouse interaction with overlays in HMDs	2015-06-28 22:51:26 -07:00
David Rowe	386b3d8ae3	Fix text overlay font rendering Use the same font size as used in TextRenderer to avoid scaling issues.	2015-06-27 14:02:49 -07:00
Seth Alves	0970f010a4	provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are	2015-06-27 13:31:00 -07:00
Howard Stearns	af4b804d37	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds	2015-06-27 12:50:13 -07:00
Seth Alves	97cd5b8b99	Merge pull request #5223 from SamGondelman/cameraMode misc. key binding/camera fixes	2015-06-27 10:55:34 -07:00
Seth Alves	7f609dca26	Merge branch 'cameraMode' of github.com:SamGondelman/hifi into actions-over-wire	2015-06-27 10:49:12 -07:00
Seth Alves	567d98dfab	Merge branch 'cursor_fix' of github.com:jherico/hifi into actions-over-wire	2015-06-27 10:45:34 -07:00
Howard Stearns	dc7360cdc2	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds	2015-06-27 08:37:30 -07:00
Brad Davis	7ca63a4ace	Fixing overlay rendering in plugins	2015-06-27 00:43:38 -07:00
Brad Davis	267d339ecc	Put the 2D plugin first for default usage, enable oculus, disable interleaved	2015-06-27 00:31:29 -07:00
Andrew Meadows	cf74dbe1dc	partial progress toward sim ownership negotiations works well for just a few objects but fails for piles committing some debug stuff that will have to be torn out later	2015-06-26 21:57:04 -07:00
Seth Alves	5ecc39b811	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-26 20:06:10 -07:00
Brad Davis	e6fade8c13	Prevent tooltips from appearing with stale data	2015-06-26 18:16:56 -07:00
Brad Davis	3b987c1e73	Fixing always-on link cursor	2015-06-26 18:14:31 -07:00
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

... 15 16 17 18 19 ...

13201 commits