7174 commits

Author	SHA1	Message	Date
Philip Rosedale	e6a8c79f9f	Added more arrow controls to move camera when in mirror mode, new guitar chords.	2014-05-07 16:51:22 -07:00
Philip Rosedale	4e1eaf8337	Merge pull request #2809 from Atlante45/mute_env ... Mute environment	2014-05-07 16:18:23 -07:00
Andrew Meadows	a11b996a51	cleaner way to achieve the last commit	2014-05-07 16:00:39 -07:00
Andrew Meadows	2d3592e367	avoid resolving penetration twice	2014-05-07 15:58:00 -07:00
Andrew Meadows	b92bbafc26	prevent avatar from getting trapped in voxels	2014-05-07 15:21:12 -07:00
Atlante45	fd1f6befff	CR	2014-05-07 15:19:32 -07:00
Andrzej Kapolka	350fe5bf14	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-07 14:50:49 -07:00
Atlante45	6308c39aab	Fix for windows	2014-05-07 14:03:30 -07:00
Brad Hefta-Gaub	fec2ba71b5	Merge pull request #2807 from PhilipRosedale/master ... AirGuitar.js, arrow keys move fwd/back in mirror view	2014-05-07 13:15:35 -07:00
Atlante45	9d2df69bab	Merge branch 'master' of https://github.com/highfidelity/hifi into mute_env	2014-05-07 12:57:51 -07:00
Atlante45	40ed72989c	mute environment packet	2014-05-07 12:57:11 -07:00
Andrzej Kapolka	55b677dd02	Provide options for model translation: by default, pivot about mesh bounds' ... center; allow numeric translation or pivot about joint position.	2014-05-07 12:53:38 -07:00
ZappoMan	37ca6efc7c	correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn't	2014-05-07 11:48:32 -07:00
Andrew Meadows	9fc1c765d3	overhaul of CollisionInfo ... store Cube info for sphereAACube collisions	2014-05-07 11:40:00 -07:00
Philip Rosedale	a6fcf915af	Merge branch 'master' of https://github.com/worklist/hifi	2014-05-07 10:02:10 -07:00
Philip Rosedale	fc962749c0	Arrow keys adjust distance from camera in mirror mode, air guitar script	2014-05-06 22:41:08 -07:00
Stojce Slavkovski	490ec23d8c	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-07 07:38:48 +02:00
Andrzej Kapolka	d0537e7ead	Specular map support.	2014-05-06 17:32:10 -07:00
Clément Brisset	72e6ff3649	Merge pull request #2803 from ZappoMan/modelserver ... Model Server Bug Fixes/Bandwidth improvements	2014-05-06 17:18:25 -07:00
Brad Hefta-Gaub	439c873a68	Merge pull request #2794 from AndrewMeadows/thermonuclear ... misc maintenance and bug fixes	2014-05-06 16:51:28 -07:00
ZappoMan	91e4a89573	cleanup old references to node which are really elements	2014-05-06 15:47:18 -07:00
Andrew Meadows	80ed8e7cf0	disable environment gravity when not set in menu	2014-05-06 14:56:16 -07:00
Stojce Slavkovski	8ee282e7d2	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-06 22:01:48 +02:00
Andrzej Kapolka	432df1b65f	Only add each texture once.	2014-05-06 12:41:31 -07:00
Andrzej Kapolka	983a3af4b9	Attachment translations in world space.	2014-05-06 11:50:37 -07:00
Andrzej Kapolka	082ff760d6	Un-default the "OK" button so that we can press enter on the URL field.	2014-05-06 11:47:35 -07:00
Andrzej Kapolka	9421af9f10	Fix for attachments' not appearing in rear view mirror head mode.	2014-05-06 11:14:48 -07:00
Andrew Meadows	68b0e91630	gravity disabled by default	2014-05-06 11:09:13 -07:00
Andrew Meadows	8a630a148e	fix copy-n-paste typo	2014-05-06 11:03:51 -07:00
Andrzej Kapolka	72ebeffa5c	Scratch that; I just didn't understand how magic invisible disappearing scroll ... bars worked on OS X.	2014-05-06 10:59:28 -07:00
Andrzej Kapolka	c5fbf1b55f	Force the scroll bar.	2014-05-06 10:57:11 -07:00
Andrew Meadows	2d0e4fb94f	use START_LOCATION as default settings	2014-05-06 10:55:30 -07:00
Andrzej Kapolka	e0ecd611c9	Better attachment styling.	2014-05-06 10:53:54 -07:00
Andrzej Kapolka	a06697f2a1	Update attachment data on attachment delete.	2014-05-06 10:37:27 -07:00
Andrzej Kapolka	7eef1b56a2	Don't use the scale to determine the depth in Faceplus. Apparently it's not ... reliable.	2014-05-06 10:19:29 -07:00
Andrew Meadows	d1a262bb56	maintenance: replace implicit casts with explicit	2014-05-06 10:02:41 -07:00
Andrew Meadows	2ea10428c8	properly wrap XMPP stuff with "#ifdef HAVE_XMPP"	2014-05-06 09:34:44 -07:00
AndrewMeadows	7a191961cf	Merge pull request #2793 from PhilipRosedale/master ... Further improvements to avatar eye contact based on head direction	2014-05-06 09:08:19 -07:00
Stojce Slavkovski	0b03421046	trivial commit - trigger build	2014-05-06 08:37:49 +02:00
Stojce Slavkovski	aedc7eda3e	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-05-06 08:27:55 +02:00
Stojce Slavkovski	14fee3b727	trivial commit - trigger build	2014-05-06 08:27:46 +02:00
Philip Rosedale	bb20762083	Merge pull request #2791 from AndrewMeadows/thermonuclear ... fix avatar motor to point in direction of camera	2014-05-05 22:10:13 -07:00
Philip Rosedale	e3ab16997a	tweaks to roll (back to no magnify) and lookAt indicator dot	2014-05-05 22:06:28 -07:00
Philip Rosedale	e1a6a824a3	remove model loader debug	2014-05-05 20:28:12 -07:00
Philip Rosedale	e0c898bba0	Merge branch 'master' of https://github.com/worklist/hifi	2014-05-05 18:03:33 -07:00
Philip Rosedale	53baf5652e	avatar look at indicator smaller grey ball	2014-05-05 18:03:25 -07:00
Andrew Meadows	e33ef1a571	fix avatar motor to point in direction of camera	2014-05-05 17:35:23 -07:00
Andrzej Kapolka	710cc3ec2a	Comment fix.	2014-05-05 17:08:10 -07:00
Andrzej Kapolka	2a32700a30	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-05 17:03:31 -07:00
Philip Rosedale	da0b36ed5c	merge fix	2014-05-05 16:21:52 -07:00
Andrzej Kapolka	fd0a39df12	Always update attachments.	2014-05-05 16:19:33 -07:00
Philip Rosedale	691b1d6069	Added lookAt rendering bubble	2014-05-05 16:19:09 -07:00
Stojce Slavkovski	bcad49d0a9	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-05-06 01:05:13 +02:00
Stojce Slavkovski	519b36240c	build fix	2014-05-06 01:05:04 +02:00
Brad Hefta-Gaub	e59c4a9aa2	Merge pull request #2783 from AndrewMeadows/inertia ... improved avatar walking on voxels	2014-05-05 15:49:44 -07:00
Andrzej Kapolka	f37460e39a	Basic attachment rendering.	2014-05-05 15:46:09 -07:00
Stojce Slavkovski	a5c6d8d996	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-05-06 00:24:49 +02:00
AndrewMeadows	1c9cc03693	Merge pull request #2784 from ZappoMan/modelserver ... LOD support to Models & Particles, and some other tweaks	2014-05-05 15:13:18 -07:00
ZappoMan	b10d9e3903	add LOD support for model and particle rendering	2014-05-05 14:26:51 -07:00
Andrew Meadows	39196501f1	removed some unhelpful comments	2014-05-05 14:23:50 -07:00
Stephen Birarda	9ffd93a167	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-05 13:57:19 -07:00
Andrew Meadows	5ffd307926	Merge upstream/master into andrew/inertia ... Conflicts: interface/src/avatar/MyAvatar.h	2014-05-05 13:54:25 -07:00
Andrew Meadows	301c3c5649	don't ignore wall collisions when walking ... also reduced max walk speed	2014-05-05 13:47:11 -07:00
Andrzej Kapolka	65e34f9697	More work on attachment interface.	2014-05-05 13:41:50 -07:00
Andrew Meadows	0c78449cf7	reduce movement speed when walking	2014-05-05 13:28:42 -07:00
Andrew Meadows	815262b802	update _lastFloorContactPoint	2014-05-05 13:06:55 -07:00
Stojce Slavkovski	09c385ba0d	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-05-05 21:46:17 +02:00
Stojce Slavkovski	ccabe709b1	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-05 21:40:37 +02:00
Stojce Slavkovski	56e7900aa6	Merge fix	2014-05-05 21:36:05 +02:00
Andrew Meadows	ec65940212	remove debug #include <StreamUtils.h>	2014-05-05 12:34:56 -07:00
Andrew Meadows	6b129c86d0	reduce snagging when walking across voxel seams	2014-05-05 12:33:05 -07:00
Atlante45	31b5c39f16	Fix warnings	2014-05-05 11:17:11 -07:00
Atlante45	7f7cd6f654	Fix for OS X Fullscreen (closes #2414)	2014-05-05 11:15:55 -07:00
Andrzej Kapolka	e898b4a900	More attachment bits.	2014-05-04 17:24:15 -07:00
Andrzej Kapolka	53a2760905	More attachment bits.	2014-05-04 16:24:23 -07:00
Stojce Slavkovski	01ebefde11	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-05-05 01:24:15 +02:00
Stojce Slavkovski	7f96f81c24	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-05 00:55:37 +02:00
Stojce Slavkovski	f668cc8581	Discourse upload image ... - success message set - fixed signal/slots in QDialog w/QEventLoop - layout fixes	2014-05-05 00:55:24 +02:00
Andrzej Kapolka	e0400dbd9c	Working on allowing attachment models to be uploaded.	2014-05-04 15:23:31 -07:00
Andrzej Kapolka	2bc605e193	Merge pull request #2779 from PhilipRosedale/master ... Remove dead ‘play slaps’ code	2014-05-04 13:33:03 -07:00
Stojce Slavkovski	37664d3877	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-05-04 18:32:01 +02:00
Stojce Slavkovski	d93480458f	Posting Image to forum	2014-05-04 18:30:58 +02:00
Stojce Slavkovski	cec3ce78b9	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-03 21:12:39 +02:00
Stojce Slavkovski	c400630bc4	make post	2014-05-03 21:12:20 +02:00
Philip Rosedale	ab0e854336	Removed session UUID from interface title bar	2014-05-03 11:33:39 -07:00
Philip Rosedale	eb991b60ce	Remove dead ‘play slaps’ code	2014-05-03 09:08:26 -07:00
Stojce Slavkovski	b2c1afe1bd	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-03 09:52:19 +02:00
Andrzej Kapolka	3a4dfb92f6	Let's try using the neck parent rotation, rather than the neck, to fix ... separate heads.	2014-05-02 19:37:42 -07:00
Stephen Birarda	7921d33716	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-02 17:47:48 -07:00
Andrzej Kapolka	b458cd1297	Default joint mappings for Makehuman models.	2014-05-02 17:29:38 -07:00
Andrzej Kapolka	93cb5fc330	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-02 17:21:51 -07:00
Philip Rosedale	9aac74035c	Merge pull request #2771 from birarda/oauth-ds ... restrict access to domains using user roles retreived from data-web	2014-05-02 17:09:52 -07:00
Andrzej Kapolka	4c49d00683	Scale adjustment for Makehuman models.	2014-05-02 17:01:07 -07:00
Stephen Birarda	1f35c07420	more repairs to OAuth signal/slot connection	2014-05-02 16:58:06 -07:00
Stephen Birarda	2dacc81960	use old signal/slot notation in OAuthWebViewHandler	2014-05-02 16:47:49 -07:00
Philip Rosedale	4c2a1426a9	Merge pull request #2775 from Atlante45/editModels_js ... Edit models js	2014-05-02 16:34:26 -07:00
Stephen Birarda	59ad09bfda	fix another missed casing issue	2014-05-02 16:34:06 -07:00
Andrzej Kapolka	6f3b3acc86	Remove pushback entirely for other avatars.	2014-05-02 16:27:39 -07:00
Stephen Birarda	1fda012364	fix another casing issue in OAuthWebViewHandler	2014-05-02 16:22:12 -07:00
Stephen Birarda	53eddab43c	fix typo for OAuth header include	2014-05-02 15:52:50 -07:00
Stojce Slavkovski	468b6b83a8	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-03 00:18:21 +02:00
Andrzej Kapolka	f3948d5e62	If "collide with avatars" is off, don't attempt camera pushback.	2014-05-02 15:02:40 -07:00
Stojce Slavkovski	39089ad5f2	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-05-02 23:52:27 +02:00
Stojce Slavkovski	4d8e1b5bd4	repled audio files	2014-05-02 23:52:12 +02:00
Atlante45	55ce204ee3	Merge branch 'master' of https://github.com/highfidelity/hifi into editModels_js	2014-05-02 14:50:52 -07:00
Andrzej Kapolka	71231268a5	Better head heights for headless skeletons.	2014-05-02 14:28:12 -07:00
Andrzej Kapolka	94a46b4a21	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-02 14:07:29 -07:00
Andrzej Kapolka	9d13740979	Better default scale, get eye positions from skeleton.	2014-05-02 14:06:54 -07:00
ZappoMan	8443bb0afc	fix a scale to fit bug, and add features to place models with hands	2014-05-02 13:19:33 -07:00
Stojce Slavkovski	9a1de7f057	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-05-02 22:17:59 +02:00
Stojce Slavkovski	d3fecd7a31	store discourse api key	2014-05-02 22:16:19 +02:00
Stephen Birarda	3a7f4a83b3	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-05-02 11:36:20 -07:00
Atlante45	ab0a0165c7	Working version of editModels.js	2014-05-02 11:19:12 -07:00
Andrew Meadows	5ac301a77e	set the _lastFloorContactPoint	2014-05-02 11:17:46 -07:00
Andrzej Kapolka	963434f784	Try using the head neck/eye rotation updates on the skeleton.	2014-05-02 11:04:52 -07:00
Andrew Meadows	d8cb84080c	stop avatar integration when standing at rest	2014-05-02 10:43:10 -07:00
Stephen Birarda	aa2931d9bb	resolve conflicts on merge with upstream/master	2014-05-02 10:39:17 -07:00
Stephen Birarda	4936fb3857	expose access token from AccountManager	2014-05-02 10:34:29 -07:00
Stojce Slavkovski	852756e84d	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-05-02 19:03:11 +02:00
AndrewMeadows	ac549977be	Merge pull request #2770 from ZappoMan/modelserver ... Fix a couple bugs in Models	2014-05-02 10:01:44 -07:00
Stojce Slavkovski	23da9d85a4	Merge branch '19597' of https://github.com/stojce/hifi; branch 'master' of https://github.com/worklist/hifi into 19597	2014-05-02 18:47:45 +02:00
ZappoMan	b8eb441468	removed debugging	2014-05-02 09:31:28 -07:00
ZappoMan	715e6b8e60	debugging model editing	2014-05-02 09:10:30 -07:00
Philip Rosedale	69f0611a06	Correction to actually pick closest	2014-05-02 09:05:09 -07:00
Philip Rosedale	03b59055fd	merge conflict fix	2014-05-02 07:10:43 -07:00
Philip Rosedale	4089d54389	Avatar makes eye contact with the person nearest to gaze direction	2014-05-02 00:21:14 -07:00
Andrzej Kapolka	3ebe1df6de	Merge branch 'master' of https://github.com/highfidelity/hifi ... Conflicts: interface/src/avatar/MyAvatar.h	2014-05-01 21:00:32 -07:00
Andrzej Kapolka	28b9033373	Recode textures on upload if they're uncompressed or bigger than our maximum ... size.	2014-05-01 18:51:57 -07:00
Andrzej Kapolka	322e12b9de	Allow users to clear the head URL and have no separate head model.	2014-05-01 17:55:16 -07:00
Andrzej Kapolka	b7e91e4fff	Need to open the temporary file in order to get the path.	2014-05-01 16:27:50 -07:00
Andrew Meadows	22bf10a9e7	repair addThrust() API so hydraMove.js works	2014-05-01 16:18:55 -07:00
Andrzej Kapolka	02c757c940	Forgot to remove debugging code.	2014-05-01 16:13:03 -07:00
Andrzej Kapolka	6caa928e64	More work on avatar customization.	2014-05-01 16:12:20 -07:00
AndrewMeadows	05e5277084	Merge pull request #2764 from ZappoMan/modelserver ... Model Server, Renderer, Scripting, etc	2014-05-01 15:39:12 -07:00
Brad Hefta-Gaub	1954672dd4	Merge pull request #2766 from huffman/19615 ... Worklist Job #19615 - Add programmatic access to "file browser" to Interface JavaScript	2014-05-01 15:23:42 -07:00
ZappoMan	8938c1c38b	fixed bad particle reference	2014-05-01 15:18:43 -07:00
Brad Hefta-Gaub	1dd51c93e5	Merge pull request #2765 from huffman/19623 ... Job #19623 - Update LoginDialog to be type Qt::WindowModality	2014-05-01 14:37:07 -07:00
ZappoMan	12daae0308	added missing files	2014-05-01 14:12:11 -07:00
Ryan Huffman	adadceb5ca	Merge remote-tracking branch 'upstream/master' into 19623	2014-05-01 13:56:25 -07:00
Andrzej Kapolka	c8877c31fe	More work on setting model properties before upload.	2014-05-01 13:25:23 -07:00
Stephen Birarda	5d5292b4b5	pull state as session UUID from OAuth URL	2014-05-01 12:50:44 -07:00
Stephen Birarda	d942054015	cleanup re-display of OAuthWebView	2014-05-01 12:44:42 -07:00
Stojce Slavkovski	c34e6266fb	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-05-01 21:27:09 +02:00
Stephen Birarda	66077d5616	present the OAuth webview only every 5 seconds	2014-05-01 12:18:40 -07:00
Thijs Wenker	df6df759a3	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-05-01 21:08:20 +02:00
Thijs Wenker	9667748156	- Style fixes ... - ScriptHightlighting qouting RegEx fix ( "hello" + " " + "world" // the text between two quote entities isn't red anymore )	2014-05-01 21:07:46 +02:00
Andrew Meadows	8d4dca31c5	add velocity model for controlling avatar motion	2014-05-01 12:05:34 -07:00
Stephen Birarda	ca2148178d	handle cleanup of OAuth web view when force closed	2014-05-01 12:01:08 -07:00
Stephen Birarda	7d3157b1a0	trust high fidelity root CA cert for OAuth redirect	2014-05-01 11:54:51 -07:00
AndrewMeadows	2ad31793e2	Merge pull request #2756 from PhilipRosedale/master ... Added back ability to see/debug head/gaze position with ‘Head Mouse'	2014-05-01 11:51:58 -07:00
ZappoMan	f7da070d77	more work, cleanup names, remove translation use snap to center	2014-05-01 11:29:17 -07:00
Stephen Birarda	d9033a8074	output SSL errors from OAuthWebViewHandler	2014-05-01 11:13:46 -07:00
Stephen Birarda	56c24ce8b7	present QWebView for OAuth authorization in interface	2014-05-01 11:09:35 -07:00
Ryan Huffman	5a5e628536	Add Window.browse to scripting environment	2014-05-01 10:51:58 -07:00
Stephen Birarda	2f0e311a99	return OAuth URL to interface clients when OAuth enabled	2014-05-01 10:19:05 -07:00
ZappoMan	293963c546	implement snap to center in model	2014-05-01 09:02:41 -07:00
ZappoMan	bb6444f5a9	more hacking got it working	2014-05-01 07:30:56 -07:00
Thijs Wenker	a33c18c15d	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-05-01 14:49:50 +02:00
Stojce Slavkovski	c5bceed880	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-05-01 13:10:51 +02:00
Philip Rosedale	223d9cf32e	Added back ability to see/debug head and eye gaze position with ‘Head Mouse’	2014-04-30 21:29:50 -07:00
Brad Hefta-Gaub	76a8afaf88	Merge pull request #2754 from huffman/19612 ... Job #19612 - Add New Scripting Features to Interface	2014-04-30 21:23:33 -07:00
Ryan Huffman	33ca387c86	Update goToURL to work with domains and user/location ... If the path starts with # or @ it's a location or user, respectively, otherwise it is a domain.	2014-04-30 21:12:04 -07:00
Ryan Huffman	a7dd19183e	Add default values for alert, confirm, and prompt	2014-04-30 19:02:28 -07:00
Ryan Huffman	8e63352d54	Fix Window.confirm() not working	2014-04-30 19:00:06 -07:00
Andrzej Kapolka	66e0cbf6ad	Working on FBX uploads (i.e., without FST).	2014-04-30 18:34:43 -07:00
ZappoMan	85484affa9	hacking	2014-04-30 17:55:54 -07:00
Atlante45	3a64ce733a	Fixed warning	2014-04-30 16:55:51 -07:00
Stojce Slavkovski	d6b7dac649	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-05-01 01:41:11 +02:00
Thijs Wenker	cf1baaf6ea	- Highlighting Fixes ( Single line comments in quoted text don't occur anymore. / Better number recognition) ... - Line numbers in ScriptEditor	2014-04-30 23:32:41 +02:00
Ryan Huffman	6c3e1c6aa5	Update LoginDialog to be type Qt::WindowModality ... Currently the login window will cover other windows, in particular the "welcome" window that pops up for new users. This allows those windows to be interacted with while still blocking interaction with the main window.	2014-04-30 13:54:41 -07:00
Ryan Huffman	9e684a0bc8	Add registerGetterSetter to remove need for getEngine()	2014-04-30 11:17:36 -07:00
ZappoMan	0182a6d895	models working end to end	2014-04-30 11:12:49 -07:00
Thijs Wenker	7125b6ab8e	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561 ... Conflicts: interface/src/Application.cpp	2014-04-30 20:08:11 +02:00
Andrew Meadows	db9221da6e	fix misspelled slot	2014-04-30 10:38:42 -07:00
Ryan Huffman	65fd2a7724	Merge remote-tracking branch 'upstream/master' into 19612 ... Conflicts: interface/src/Menu.cpp	2014-04-30 09:57:17 -07:00
Ryan Huffman	9a44b2b2fb	Remove unneeded include in WindowScriptingInterface	2014-04-30 09:40:50 -07:00
Ryan Huffman	ff51b22bfe	Add Menu::goToUrl	2014-04-30 09:39:48 -07:00
Ryan Huffman	0570849df5	Add Window and location to global script object	2014-04-30 09:38:57 -07:00
Ryan Huffman	b9f296ddb3	Add WindowScriptingInterface and LocationScriptingInterface	2014-04-30 09:38:30 -07:00
ZappoMan	58c852d210	Merge branch 'master' of https://github.com/worklist/hifi into modelserver	2014-04-30 09:29:06 -07:00
ZappoMan	aac42058ac	first cut at modelserver	2014-04-30 09:25:52 -07:00
Brad Hefta-Gaub	19b76e3331	Merge pull request #2750 from Atlante45/master ... Fixed QLINE_MIN_WIDTH warning on mac	2014-04-30 09:19:09 -07:00
Brad Hefta-Gaub	84e231acfa	Merge pull request #2734 from huffman/RunningScripts ... Running scripts	2014-04-30 09:18:53 -07:00
Thijs Wenker	c20381a0ea	EditorWindow on-top behavior fixed	2014-04-30 08:24:04 +02:00
Thijs Wenker	89aafd9c3f	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-04-30 07:58:29 +02:00
Atlante45	e9a01a39a2	Fixed QLINE_MIN_WIDTH warning on mac	2014-04-29 17:38:55 -07:00
Ryan Huffman	1551da9e99	Remove magic number in RunningScripts	2014-04-29 17:23:30 -07:00
Ryan Huffman	8ee90715bd	Revert changes to call to saveSettings in Application	2014-04-29 17:20:15 -07:00
Ryan Huffman	fa9e37daad	Remove unneeded qDebug()	2014-04-29 17:16:12 -07:00
Ryan Huffman	2ba0c8c237	Remove magic numbers from RunningScriptsWidget	2014-04-29 17:10:09 -07:00
Ryan Huffman	98a736a39c	Remove duplicate method declaration	2014-04-29 17:04:11 -07:00
Ryan Huffman	39c959d245	Clean up implementation of 1-9 in RunningScripts	2014-04-29 17:03:38 -07:00
Ryan Huffman	e0ec0f681f	Fix code not compliant with coding standards	2014-04-29 16:50:13 -07:00
Atlante45	7787cf97b6	Only glow body + fixed display name scale	2014-04-29 16:30:14 -07:00
Ryan Huffman	edcff0b67f	Merge remote-tracking branch 'upstream/master' into RunningScripts ... Conflicts: interface/src/Application.cpp interface/src/ui/FramelessDialog.cpp interface/src/ui/FramelessDialog.h	2014-04-29 16:28:36 -07:00
Thijs Wenker	87260a4c58	ability to load a script thats running from an external link into the ScriptEditor , followed by a save dialog	2014-04-30 00:58:22 +02:00
Stojce Slavkovski	785c9a3024	improved mention positioning ... removed achive manager	2014-04-30 00:25:27 +02:00
Andrew Meadows	34aaf98b53	cleanup around how boundary shape is computed	2014-04-29 15:16:50 -07:00
Thijs Wenker	5ea512f65a	ScriptEditorWindow not modal, but yet always on foreground	2014-04-29 23:53:46 +02:00
Thijs Wenker	14e9cb770c	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-04-29 23:30:15 +02:00
Stephen Birarda	69e279e2c6	IC-1, remove some spaces in BuckyBalls	2014-04-29 14:05:16 -07:00
Stojce Slavkovski	ca2c8d2fff	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-04-29 22:31:47 +02:00
Thijs Wenker	2ba39f951a	Merge branch '19561' of https://github.com/thoys/hifi into 19561 ... Conflicts: interface/src/Application.cpp interface/src/Application.h	2014-04-29 22:07:03 +02:00
Thijs Wenker	fc2ed9f9fb	Use same load/save dialog behavior as in main application for ScriptEditor, this will keep track of the last directory that was used to load a script.	2014-04-29 22:03:51 +02:00
Thijs Wenker	df14e1e6e4	Use same load/save dialog behavior as in main application for ScriptEditor, this will keep track of the last directory that was used to load a script.	2014-04-29 21:51:20 +02:00
Clément Brisset	7c21fab50c	Merge pull request #2736 from SydoxX/master ... Fix CustomUrl	2014-04-29 12:07:44 -07:00
Konstantin	65706ae5f7	Re-add customUrl.startWith	2014-04-29 20:59:33 +02:00
Konstantin	14b91aa04b	Remove 0,0,0 entry	2014-04-29 20:49:40 +02:00
Konstantin	ac8adad0e0	Remove 0,0,0 entry.	2014-04-29 20:49:20 +02:00
Stojce Slavkovski	029e20edda	Added XMPP archive manager	2014-04-29 20:40:12 +02:00
Stojce Slavkovski	d24b55871f	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-04-29 19:05:16 +02:00
Clément Brisset	4c42a403e7	Merge pull request #2738 from huffman/19598 ... Login window	2014-04-28 19:28:50 -07:00
Ryan Huffman	87c10e70cd	Add parentheses around conditionals for clarity	2014-04-28 18:31:50 -07:00
Andrew Meadows	ae3b58a33f	use setGravity() instead of setting it directly	2014-04-28 16:46:16 -07:00
Andrew Meadows	c7dbc5984f	add local gravity option parameter for MyAvatar	2014-04-28 16:40:22 -07:00
Stojce Slavkovski	963ad64d07	Fixed online user presence in chat window	2014-04-28 23:49:59 +02:00
Ryan Huffman	24350761ac	Update layout of login messages and move text to .ui file	2014-04-28 13:16:50 -07:00
Ryan Huffman	6f502777a5	Update forgot password URL	2014-04-28 12:03:54 -07:00
Andrew Meadows	a7c4b02f2d	merge new work into andrew/inertia	2014-04-28 09:52:06 -07:00
Ryan Huffman	fb42d9ccc6	Update login to move focus to password on fail	2014-04-28 09:21:37 -07:00
Ryan Huffman	45fdd00608	Merge remote-tracking branch 'upstream/master' into 19598 ... Conflicts: interface/src/ui/FramelessDialog.h	2014-04-28 09:13:00 -07:00
Ryan Huffman	01f66420de	Fix issue with icon being disabled on login window while authenticating	2014-04-28 09:11:09 -07:00
Ryan Huffman	81a0cbe761	Update Menu to use new login dialog	2014-04-28 09:01:13 -07:00
Ryan Huffman	9bf3b3c6bf	Add hideOnBlur and TOP position to FramelessDialog	2014-04-28 08:59:28 -07:00
Ryan Huffman	23397a4b10	Add LoginDialog	2014-04-28 08:55:03 -07:00
Stojce Slavkovski	0073db4abd	change to public chat room	2014-04-27 20:49:26 +02:00
Konstantin	ec410d105b	Fix CustomUrl ... Fixed custom url so that hifi://domain/ works.	2014-04-27 00:31:28 +02:00
Konstantin	f829a5b323	Fix CustomUrl ... Fixed custom url so that hifi://domain/ works. Also goes earlier to the location.	2014-04-27 00:29:38 +02:00
Stojce Slavkovski	5c7fb3eca5	Add chat mention notifications	2014-04-26 22:19:33 +02:00
Stojce Slavkovski	91d7bd252d	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-04-26 08:03:52 +02:00
Ryan Huffman	f889cef3aa	Remove the ability to drag the RunningScripts window	2014-04-25 16:15:11 -07:00
Ryan Huffman	792ab7e17e	Update icon for Load Script button	2014-04-25 15:57:10 -07:00
Andrew Meadows	b05a315b5a	merge upstream/master into andrew/inertia ... Conflicts: interface/src/avatar/MyAvatar.cpp	2014-04-25 14:52:44 -07:00
Andrew Meadows	c2f1507df1	move AVATAR_MOTION_OBEY_GRAVITY to libs	2014-04-25 14:16:42 -07:00
Andrew Meadows	ecae89489e	mispelled slot	2014-04-25 14:13:44 -07:00
Ryan Huffman	958238efa7	Cleanup implementation of script loading to reduce copy/paste	2014-04-25 12:45:26 -07:00
Ryan Huffman	8480d02414	Fix 1-9 keys not working in Running Scripts widget	2014-04-25 12:44:46 -07:00
Atlante45	8b4a910040	Fix timestamp timer not fired	2014-04-25 12:19:18 -07:00
Ryan Huffman	c3d8cce4a6	Add plus icon to LoadScript button	2014-04-25 10:30:56 -07:00
Ryan Huffman	61e8a20550	Update running scripts widget to forward mouse release events	2014-04-25 10:11:56 -07:00
Ryan Huffman	76d8090938	Disallow resizing of running scripts widget	2014-04-25 10:11:34 -07:00
Ryan Huffman	dd844437b6	Add option to disallow resizing in FramelessDialog	2014-04-25 10:11:22 -07:00
Ryan Huffman	225c022511	Update RunningScriptsWidget to use FramelessDialog	2014-04-25 10:10:50 -07:00
Ryan Huffman	84e7b1598c	Merge remote-tracking branch 'upstream/master' into RunningScripts	2014-04-25 08:45:54 -07:00
Philip Rosedale	9884d74f60	Merge pull request #2728 from Atlante45/fix_audio_jitter ... Fix audio jitter	2014-04-24 18:25:16 -07:00
Atlante45	cf7fe2306b	Fix audio jitter	2014-04-24 18:10:51 -07:00
Atlante45	01637e8037	Fix error introduced with gettimeofday removing + spelling mistake	2014-04-24 17:37:48 -07:00
Clément Brisset	fd8ec9b5c2	Merge pull request #2723 from huffman/19554-2 ... 19554 - Chat Updates	2014-04-24 16:44:22 -07:00
Ryan Huffman	d88897ccc7	Add error box when going to user/location that doesn't exist	2014-04-24 15:55:34 -07:00
Andrew Meadows	0b5c1b0a9a	add MyAvatar::_motionBehaviors (for obeyGravity) ... Also reconcile Menu checkable set vs script-set collision groups.	2014-04-24 15:43:03 -07:00
Leonardo Murillo	a21991c5c2	Fixing xml parsing	2014-04-24 16:22:34 -06:00
Leonardo Murillo	f4c98a8fa4	Fixing xml parsing	2014-04-24 16:21:49 -06:00
Ryan Huffman	b69fa73dfa	Unsplit a line in FramelessDialog	2014-04-24 14:54:57 -07:00
Ryan Huffman	7b09812028	Remove insertFromMimeData override in ChatMessageArea	2014-04-24 14:54:26 -07:00
Ryan Huffman	ccad0aed9e	Move ChatInputArea code in header to .cpp	2014-04-24 14:54:01 -07:00
Leonardo Murillo	27002a9406	Casting to QUrl	2014-04-24 15:10:37 -06:00
Ryan Huffman	a86af6b07f	Add Load Script button to RunningScripts Dialog	2014-04-24 14:05:09 -07:00
Leonardo Murillo	ad0f0118bc	fixes for new versioning:	2014-04-24 15:01:37 -06:00
Stojce Slavkovski	fc6d1b6575	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-04-24 22:48:57 +02:00
Stojce Slavkovski	8f2878953c	Merge branch 'master' of https://github.com/worklist/hifi into 19597	2014-04-24 22:48:11 +02:00
Stojce Slavkovski	b02883f84d	add limits to QXmppArchiveManager	2014-04-24 22:47:42 +02:00
Stojce Slavkovski	c968a4bdb6	set QXmppArchiveManager limits	2014-04-24 22:45:25 +02:00
Stojce Slavkovski	2c35fe433d	Try to load past messages with QXmppArchiveManager	2014-04-24 22:44:52 +02:00
Andrew Meadows	73d0674565	expose MyAvatar.collisionGroups to JS	2014-04-24 11:19:08 -07:00
Andrew Meadows	f07a418a27	namechange CollisionFlags --> CollisionGroups	2014-04-24 11:07:49 -07:00
Mohammed Nafees	29d64373b4	Merge branch master	2014-04-24 18:52:59 +05:30
Mohammed Nafees	dd74ea64e7	Further changes for child like behaviour	2014-04-24 17:18:24 +05:30
Andrzej Kapolka	4f8c1f9c65	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-23 16:09:23 -07:00
Clément Brisset	d441e6a453	Merge pull request #2717 from AndrewMeadows/inertia ... avatar bounding capsule collision against voxels	2014-04-23 16:06:14 -07:00
Ryan Huffman	0cba95e7ad	Reorder property initialization in FramelessDialog	2014-04-23 15:37:49 -07:00
Ryan Huffman	1774f6c9bd	Add threshold to auto scroll	2014-04-23 15:37:28 -07:00
Ryan Huffman	d56a4e169e	Add ChatInputArea	2014-04-23 15:24:21 -07:00
Andrew Meadows	10265a4a3e	temp disable of screen flash for avatar collisions	2014-04-23 14:37:24 -07:00
Andrew Meadows	96ca537400	removing unused motion-state timers	2014-04-23 13:44:25 -07:00
Andrzej Kapolka	2bac802407	One more unused variable.	2014-04-23 12:30:39 -07:00
Andrzej Kapolka	c8c3cf3664	Remove unused propagate option for applyRotationDelta.	2014-04-23 12:29:01 -07:00
Ryan Huffman	5fd585aab1	Fix error with cursor format getting reset when sending chat message	2014-04-23 12:26:59 -07:00
Andrzej Kapolka	d38d3db224	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-23 12:25:43 -07:00
Andrzej Kapolka	141250d51c	Don't constrain elbow when rotating forearm with wrist.	2014-04-23 12:22:24 -07:00
Andrew Meadows	203dac054a	remove unused MoveTarget stuff from MyAvatar	2014-04-23 12:19:48 -07:00
Andrew Meadows	39c193a679	remove unused getElapsedTime*() methods	2014-04-23 12:15:15 -07:00
Andrzej Kapolka	0386dec2a6	Provide option to align wrists with forearms.	2014-04-23 12:09:54 -07:00
Ryan Huffman	951d5004e1	Add ChatInputArea with custom paste	2014-04-23 11:57:43 -07:00
Andrew Meadows	37a5d9130f	move _thrust from Avatar to MyAvatar	2014-04-23 11:55:28 -07:00
Andrzej Kapolka	09bb51261a	Got that backwards.	2014-04-23 11:55:16 -07:00
Andrzej Kapolka	523498ee5b	Revert to using weight that doesn't depend on number of free joints.	2014-04-23 11:52:22 -07:00
Andrew Meadows	359c14e319	cleanup: remove unused Avatar::_mode ... The mode, if it is required, should probably eventually live in AvatarDAta since it will be determined by whatever engine is running the avatar (script or interface) and then broadcast to the rest of the world. When we need it we'll add it back in the right place.	2014-04-23 11:48:42 -07:00
Andrzej Kapolka	511fc8367f	More work on IK.	2014-04-23 11:34:34 -07:00
Atlante45	f68d2d16a8	Inserted a char by mistake	2014-04-23 11:05:16 -07:00
Atlante45	ceb5208102	CR	2014-04-23 11:00:44 -07:00
Ryan Huffman	c65d5f08ca	Merge remote-tracking branch 'upstream/master' into 19554-2	2014-04-23 10:54:51 -07:00
Ryan Huffman	9bea70ac54	Revert "Add emoticons to chat" ... This reverts commit 3c9b6264a8.	2014-04-23 10:49:22 -07:00
Andrzej Kapolka	f7bc1ae62c	Working on integrating rotation into IK.	2014-04-23 10:47:24 -07:00
Atlante45	ae566c55f6	Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday	2014-04-23 10:38:29 -07:00
Andrew Meadows	f46a5dc966	fix #2718 for warning about unused variable	2014-04-23 10:13:05 -07:00
Andrzej Kapolka	c471a55f1f	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-23 09:40:51 -07:00
Stojce Slavkovski	e9962241be	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-04-23 18:12:49 +02:00
Andrew Meadows	bfe1ee377b	remove warning about signed/unsigned comparison ... Also change n.f to be n.0f as per coding standard	2014-04-23 08:56:53 -07:00
Andrew Meadows	67d0920f81	merge upstream/master into andrew/inertia	2014-04-23 08:40:48 -07:00
Andrew Meadows	5992651c27	update avatar collision shapes when necessary	2014-04-22 20:55:28 -07:00
Philip Rosedale	ee929f2551	Merge pull request #2712 from matsukaze/master ... Job #19574. Add new audio oscilloscope.	2014-04-22 20:22:57 -07:00
matsukaze	d6e4f217f5	Expanded variable names.	2014-04-22 21:57:41 -04:00
matsukaze	1ff3b83644	Changed const color data and method signatures. ... Changed constant color data and method signatures from unsigned int to array of float. Changed glColor4f to glColor4fv.	2014-04-22 19:42:51 -04:00
matsukaze	015cbce322	Changed constant names for improved readability.	2014-04-22 18:57:22 -04:00
Andrew Meadows	364431328f	remove include StreamUtils.h	2014-04-22 14:26:40 -07:00
Andrew Meadows	0b9ebe4c08	avatar-voxels collisions work again	2014-04-22 11:51:36 -07:00
Clément Brisset	f64988f73d	Merge pull request #2711 from ZappoMan/quiet_logs ... quite the error messages about failed locks	2014-04-22 11:51:20 -07:00
Atlante45	3eeb3a539d	Fixed lack of resolution in usecTimestampNow()	2014-04-22 11:48:43 -07:00
ZappoMan	ae443a3136	fix headers	2014-04-22 11:27:50 -07:00
Andrew Meadows	f033990fae	merge upstream/master into andrew/inertia	2014-04-22 10:49:44 -07:00
Andrew Meadows	7537d240bb	toward working avatar-vs-voxel collisions again	2014-04-22 10:48:42 -07:00
AndrewMeadows	94fabf7875	Merge pull request #2709 from ZappoMan/shared_and_weak_pointers ... Voxel/Particle Server Performance Improvements	2014-04-22 10:28:39 -07:00
Atlante45	ddf14b0842	Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday	2014-04-22 10:22:30 -07:00
matsukaze	99cb1da5ec	Reverting inadvertently committed local changes.	2014-04-22 07:40:31 -04:00
Thijs Wenker	59cc930556	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-04-22 13:12:38 +02:00
Thijs Wenker	6c89521f1d	Style	2014-04-22 13:12:21 +02:00
matsukaze	6e575bc8af	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-22 06:54:53 -04:00
matsukaze	ff7a1bd60f	Job #19574. Add audio oscilloscope.'	2014-04-22 06:53:59 -04:00
ZappoMan	1846036659	quite the error messages about faild locks	2014-04-21 20:58:43 -07:00
Andrew Meadows	06794f33f3	add accessor for Model::_boundingShape	2014-04-21 18:23:19 -07:00
Atlante45	fd20686f0f	Removed Systime.h includes	2014-04-21 17:23:06 -07:00
Atlante45	681aab5bf0	Remove printf and replace them by qDebug()	2014-04-21 16:17:45 -07:00
Atlante45	0479aaba46	Some gettimeofday removal fixes	2014-04-21 15:26:43 -07:00
Atlante45	f7f30e118c	More gettimeofday cleanup	2014-04-21 15:17:11 -07:00
Thijs Wenker	70ac93c20d	Style	2014-04-21 21:44:50 +02:00
Thijs Wenker	e348f66151	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-04-21 21:40:01 +02:00
Thijs Wenker	9faee0d82d	- Style ... - Script Editor can run script file once at time, but you can still start multiple scripts through the original ways.	2014-04-21 21:37:49 +02:00
matsukaze	5b72a6dfcb	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-21 15:24:27 -04:00
Thijs Wenker	c1ed38f4de	Style	2014-04-21 21:23:39 +02:00
Atlante45	ab76e6a00c	Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday ... Conflicts: interface/src/Audio.cpp	2014-04-21 12:19:19 -07:00
ZappoMan	25a859f95e	Merge branch 'master' of https://github.com/worklist/hifi into shared_and_weak_pointers	2014-04-21 10:12:34 -07:00
Stojce Slavkovski	5223673087	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-04-21 11:22:29 +02:00
Thijs Wenker	77994ae0cb	header cleanup (hopefully the ubuntu test-build will like this)	2014-04-21 06:20:18 +02:00
Thijs Wenker	5bffb17643	#include <QMessageBox.h> -> #include <QMessageBox>	2014-04-21 05:51:34 +02:00
Brad Hefta-Gaub	697036bf47	Merge pull request #2701 from ZappoMan/master ... fix switching audio device bug	2014-04-20 20:29:57 -07:00
Thijs Wenker	23068b0356	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-04-21 05:26:42 +02:00
Thijs Wenker	c016d6557e	- few Adjustments in Application class for Script editor ... - Shortkey for script editor (Alt+S) - highlighter: bold true/false , single line comments - Run scripts from the editor works - More icons from Maximillian, Thanks - Run on the fly checkbox, works if the script is running. - Load/save features	2014-04-21 05:25:28 +02:00
Brad Hefta-Gaub	b9dd276e32	Merge pull request #2700 from SydoxX/PageUp/Down ... Add PageUp/Down to controls	2014-04-20 20:20:14 -07:00
ZappoMan	80dd0c3356	fix switching audio device bug	2014-04-20 20:18:56 -07:00
Stojce Slavkovski	550cf6b8ea	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-04-19 18:05:01 +02:00
Konstantin	615f8b8dad	Fix spacing	2014-04-19 16:35:48 +02:00
Konstantin	6c376d6fa6	Add PageUp/Down to controls ... When you press PageUp/Down now you fly up and down.	2014-04-19 15:02:57 +02:00
Brad Hefta-Gaub	d848326039	Merge pull request #2699 from Atlante45/glow_when_speaking_option ... Made glowing when speaking an option	2014-04-18 21:22:53 -07:00
Brad Hefta-Gaub	d0c10475d5	Merge pull request #2698 from Atlante45/master ... ModelUploader update to handle new behaviour	2014-04-18 21:21:09 -07:00
Atlante45	716bc58c2d	Fixed Jenkins failure	2014-04-18 18:10:11 -07:00
Atlante45	05545b684d	Made glowing when speaking an option	2014-04-18 17:47:21 -07:00
Andrzej Kapolka	e2558bdac0	Experimenting with tweaking the Euler angles so that z, rather than y, is in ... [-pi/2, pi/2].	2014-04-18 17:16:20 -07:00
Atlante45	c664b4a087	Fixed JSON parsing	2014-04-18 17:04:38 -07:00
Atlante45	1121773154	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-18 16:56:34 -07:00
Atlante45	8a7a590602	Merge branch 'master' of https://github.com/highfidelity/hifi into placement_tool ... Conflicts: interface/src/ui/Stats.cpp	2014-04-18 16:07:08 -07:00
Atlante45	d6e7caa4db	Removed Debug	2014-04-18 16:02:01 -07:00
Atlante45	b098a7a294	Fixed wire cube overlay not drawn with right line width	2014-04-18 15:59:37 -07:00
Atlante45	aa73527157	Some code cleaning	2014-04-18 15:58:56 -07:00
Brad Hefta-Gaub	16cd2ca5c3	Merge pull request #2680 from SydoxX/master ... URL scheme to go to location	2014-04-18 15:34:12 -07:00
ZappoMan	334f688e4e	add support for sending unverified datagrams to nodes	2014-04-18 15:30:45 -07:00
Stephen Birarda	0a7ea17d43	fix a geometry race condition crash	2014-04-18 15:10:15 -07:00
Andrzej Kapolka	743034c986	Need to transfer parent rotation to child.	2014-04-18 15:09:37 -07:00
Andrzej Kapolka	6add0dfb42	Tweaked Hydra "IK" to propagate delta rotations up the hierarchy while ... preserving joint constraints.	2014-04-18 15:04:42 -07:00
Konstantin	d489e9dcd4	Fix format	2014-04-18 23:55:45 +02:00
Andrzej Kapolka	27ef8f3b2b	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-18 14:26:54 -07:00
Andrzej Kapolka	30248747d6	Provide a means of visualizing the joint constraints.	2014-04-18 14:26:34 -07:00
Brad Hefta-Gaub	57a221f343	Merge pull request #2689 from AndrewMeadows/inertia ... improved collision shapes for head models	2014-04-18 14:06:45 -07:00
AndrewMeadows	aaac7ac82c	Merge pull request #2688 from ey6es/master ... Added head translation for Faceplus.	2014-04-18 13:45:00 -07:00
Thijs Wenker	d2d3937e08	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-04-18 20:58:36 +02:00
Andrew Meadows	54153a70a3	merge upstream/master into andrew/inertia	2014-04-18 11:30:26 -07:00
Andrew Meadows	26487aad06	more correct bounding shapes for Models	2014-04-18 11:19:21 -07:00
Andrzej Kapolka	4d77b11ae4	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-18 10:38:11 -07:00
AndrewMeadows	a10aaa537e	Merge pull request #2692 from ZappoMan/moonshot ... added wet/dry mix, and alternate distance attenuation features	2014-04-18 10:34:55 -07:00
ZappoMan	2dc39512a2	CR feedback	2014-04-18 10:19:09 -07:00
ZappoMan	fa787adce2	added wet/dry mix, and alternate distance attenuation features	2014-04-18 08:55:32 -07:00
Ryan Huffman	a552d48401	Merge remote-tracking branch 'upstream/master' into 19554-2	2014-04-17 20:02:05 -07:00
Ryan Huffman	c0ae2fd7ae	Add QDesktopServices header to Menu.cpp	2014-04-17 19:53:59 -07:00
Ryan Huffman	3c9b6264a8	Add emoticons to chat	2014-04-17 19:51:25 -07:00
Stephen Birarda	77202af20d	add debug for erase from AvatarHashMap, repair check for display name	2014-04-17 18:05:22 -07:00
Stephen Birarda	f8106e5063	add an AvatarHashMap to the Agent	2014-04-17 17:49:55 -07:00
Stephen Birarda	47d4ef0b2d	add a method to determine if avatar with display name exists	2014-04-17 17:44:41 -07:00
Stephen Birarda	e75d14139f	fix avatar kill behaviour	2014-04-17 17:21:38 -07:00
Stephen Birarda	69d3360675	add a convenience method to AvatarHashMap to check for avatar removal	2014-04-17 16:48:24 -07:00
Stephen Birarda	e303ce1a12	move some Avatar management to AvatarHashMap	2014-04-17 16:37:40 -07:00
Atlante45	a040c997d8	ModelUploader update	2014-04-17 16:30:23 -07:00
Andrew Meadows	cfdbdad2d8	improved method for disabling bad joint shapes	2014-04-17 16:22:35 -07:00
Konstantin	6d1f4ed942	Fix format	2014-04-18 01:13:06 +02:00
Andrzej Kapolka	3af02a3327	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-17 16:07:48 -07:00
Ryan Huffman	6437f76ed2	Update username/location match in chat to be more lenient	2014-04-17 15:50:40 -07:00
Andrzej Kapolka	197127fbde	Added ability to read FBX textures embedded in FBX files.	2014-04-17 15:42:23 -07:00
Ryan Huffman	4f236c6bf4	Add hifi link handling in chat for usernames and locations	2014-04-17 15:20:12 -07:00
Ryan Huffman	795ddbc7bf	Update ChatMessageArea to open urls via Menu::openUrl	2014-04-17 15:19:13 -07:00
Andrew Meadows	3072161a30	improved collision shapes of models	2014-04-17 15:18:46 -07:00
Ryan Huffman	e1e9c11189	Add Menu slot to open urls	2014-04-17 15:18:40 -07:00
Andrew Meadows	3acc518e8a	make float literals obey the coding standard	2014-04-17 15:18:15 -07:00
Ryan Huffman	e2954f8614	Fix color and size of font in timestamp chat messages	2014-04-17 13:49:10 -07:00
Andrzej Kapolka	0a2670ea23	Detabbed.	2014-04-17 13:42:29 -07:00
Ryan Huffman	48a7561644	Fix chat messages not being html escaped	2014-04-17 13:38:13 -07:00
Andrzej Kapolka	a12b90c65b	Add head translation to Faceplus. Closes #2684.	2014-04-17 13:34:37 -07:00
Ryan Huffman	7a25d0661f	Update style of chat messages	2014-04-17 13:20:00 -07:00
Ryan Huffman	c1fa6b41e4	Update chat window to use vertical layout	2014-04-17 13:19:36 -07:00
Stojce Slavkovski	27c2255adf	Merge branch 'master' of https://github.com/worklist/hifi into 19507	2014-04-17 20:52:30 +02:00
Andrzej Kapolka	21fa833f19	Merge branch 'master' of https://github.com/highfidelity/hifi into animate ... Conflicts: interface/src/Application.cpp libraries/shared/src/SharedUtil.cpp libraries/shared/src/SharedUtil.h	2014-04-17 10:58:34 -07:00
Ryan Huffman	606a48d555	Fix issue with pref dialog disappearing ... With the frameless dialog being updated to support different types of window, the pref dialog was no longer able to rely on it to keep itself open in certain cases. The window flags were also updated to update after a "browse" call rather than in the slot so that it would still execute in the case of cancelled selection.	2014-04-17 09:36:17 -07:00
Andrew Meadows	e139a6dc95	remove warnings about signed-unsigned comparison	2014-04-17 08:46:41 -07:00
Andrew Meadows	db717b980b	merge upstream/master into andrew/inertia ... Conflicts: interface/src/Application.cpp	2014-04-17 08:40:25 -07:00
Thijs Wenker	b2e969d1c5	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-04-17 13:03:44 +02:00
ZappoMan	9fc650dd6e	CR feedback	2014-04-16 17:10:26 -07:00
ZappoMan	b269a26441	CR feedback	2014-04-16 17:08:06 -07:00
ZappoMan	4c6471caa4	fix typo	2014-04-16 16:43:01 -07:00
ZappoMan	836913f1f0	Merge branch 'master' of https://github.com/worklist/hifi into moonshot	2014-04-16 15:21:15 -07:00
ZappoMan	3cb109ec89	clean up	2014-04-16 15:21:04 -07:00
ZappoMan	2e0c5fc81b	implement support for comb filter suppression window	2014-04-16 15:13:20 -07:00
Konstantin	fca4e2abba	Update Application.h	2014-04-17 00:09:58 +02:00
Konstantin	b3ce36f130	Changed goTo's to statics	2014-04-17 00:04:27 +02:00
Konstantin	d55fb60862	Added urlGoTo	2014-04-17 00:03:33 +02:00
Konstantin	8120700787	Added urlGoTo	2014-04-17 00:03:11 +02:00
Andrew Meadows	83dc8717aa	bumpSettings on load/stop script	2014-04-16 14:46:49 -07:00
Ryan Huffman	2de9848a37	Merge remote-tracking branch 'upstream/master' into 19554-2	2014-04-16 14:42:20 -07:00
Thijs Wenker	154176402e	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-04-16 23:41:58 +02:00
Ryan Huffman	23d68d538c	Fix bug where multiple user/location popups appear	2014-04-16 14:05:38 -07:00
Thijs Wenker	0b644b5738	ctrl+shift+s to open the script editor	2014-04-16 22:58:44 +02:00
ZappoMan	b00a67cb57	added support for local audio spatialization independent of inbound audio	2014-04-16 13:55:39 -07:00
Andrew Meadows	ddb8ac9ad4	merge upstream/master into andrew/inertia	2014-04-16 13:40:10 -07:00
Andrew Meadows	9ab1b76484	use new Qt connect syntax for compile-time checks	2014-04-16 13:28:54 -07:00
Ryan Huffman	e8b6b7ab4d	Update style of chat message links	2014-04-16 13:22:22 -07:00
AndrewMeadows	7dc8f2ae3c	Merge pull request #2657 from ey6es/master ... Added tools to adjust avatar LOD to LOD tools dialog. Closes #2624.	2014-04-16 12:59:47 -07:00
Atlante45	9d372bfe3c	Merge branch 'master' of https://github.com/highfidelity/hifi into removed_gettimeofday	2014-04-16 12:44:27 -07:00
Andrew Meadows	6b23da40d6	use correct name for signal connect	2014-04-16 12:18:40 -07:00
Atlante45	8cfc8faa01	Removed gettimeofday in Audio	2014-04-16 12:08:17 -07:00
Ryan Huffman	bfb879d3e6	Update chat textbox to use correct line height	2014-04-16 10:03:22 -07:00
Ryan Huffman	8aee81ae7c	Update username in chat to use correct line height	2014-04-16 10:02:54 -07:00
Ryan Huffman	cb1408d26d	Update chat window to use new Frameless Dialog ... The new dialog class needed to be updated to handle windows in different positions and windows that don't delete on close.	2014-04-16 10:01:35 -07:00
Ryan Huffman	4afea2d228	Remove chat window docking	2014-04-16 09:55:12 -07:00
Thijs Wenker	8e6130091d	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-04-16 11:28:46 +02:00
Stojce Slavkovski	c67e42be5e	Moved function into .cpp	2014-04-16 07:46:15 +02:00
ZappoMan	ba361b0f62	add local audio stats	2014-04-15 21:50:44 -07:00
ZappoMan	67de87d114	added slider for local audio attenuation	2014-04-15 21:31:35 -07:00
ZappoMan	bdf39186de	Merge branch 'master' of https://github.com/worklist/hifi into moonshot	2014-04-15 21:04:15 -07:00
ZappoMan	040df97be2	more cleanup	2014-04-15 20:23:47 -07:00
ZappoMan	82d9c50dc5	moved all local processing to AudioReflector	2014-04-15 20:11:53 -07:00
ZappoMan	a46d3fd254	first cut at local audio spatialization working	2014-04-15 19:57:37 -07:00
Andrzej Kapolka	8cbad1bf54	More work on animation loading.	2014-04-15 19:37:28 -07:00
matsukaze	8779e3d048	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-15 20:36:50 -04:00
ZappoMan	523cc4bdfe	revert some code	2014-04-15 16:30:47 -07:00
ZappoMan	a7cbf7f667	revert some code	2014-04-15 16:26:46 -07:00
ZappoMan	585024d70e	resample the local audio before sending it to any registered listeners	2014-04-15 16:04:33 -07:00
Thijs Wenker	e66822c6ee	ScriptEditor: Syntax highlighting update	2014-04-16 00:55:06 +02:00
ZappoMan	f9b6585435	some cleanup	2014-04-15 15:20:03 -07:00
ZappoMan	5bc8c83706	loop and variable name cleanup	2014-04-15 15:16:55 -07:00
ZappoMan	e514c95642	variable names cleanup to match coding standard	2014-04-15 14:47:38 -07:00
ZappoMan	24f0f37eb9	cleanup	2014-04-15 14:21:28 -07:00
ZappoMan	f12ac3b036	some cleanup	2014-04-15 14:14:51 -07:00
ZappoMan	5a0963a731	cleaned up comments and range protected some settings	2014-04-15 13:58:31 -07:00
ZappoMan	579710e4bd	some cleanup	2014-04-15 13:36:20 -07:00
ZappoMan	cd23b95b42	revert back to using QByteArray for processReceivedAudio()	2014-04-15 13:16:52 -07:00
ZappoMan	74828a3215	removed non-functional low pass filter	2014-04-15 12:54:59 -07:00
ZappoMan	9d49a53434	coding standard cleanup	2014-04-15 12:50:05 -07:00
ZappoMan	57513610fd	recalc on any attribute changes	2014-04-15 12:43:02 -07:00
ZappoMan	60c6b27ab2	cleanup code a bit, add support for diffusions even with no ray intersection	2014-04-15 11:38:11 -07:00
Stojce Slavkovski	1a3e6595c5	Allow users to set the destination of Snapshots	2014-04-15 19:36:02 +02:00
ZappoMan	8a16986294	add sliders for reflection, diffusion, absorption	2014-04-15 09:58:35 -07:00
ZappoMan	1ed5512925	remove old mode, replaced by new mode	2014-04-14 21:02:09 -07:00
ZappoMan	7448e0ab16	move to sub menu	2014-04-14 20:28:20 -07:00
Andrzej Kapolka	a2dc58f7f9	Moved FBX code to its own library so that we can use it for bots.	2014-04-14 17:15:58 -07:00
ZappoMan	6639fc737a	include diffusion ratio in point attenuation	2014-04-14 16:45:55 -07:00
Andrzej Kapolka	c5ffe54a91	Working on loading animation data.	2014-04-14 16:26:30 -07:00
Thijs Wenker	1634e574d7	Merge branch 'master' of https://github.com/highfidelity/hifi into 19561	2014-04-15 00:40:48 +02:00
ZappoMan	588231cebf	reconcile old and new implmentations so that 0 fan out produces same results	2014-04-14 15:36:20 -07:00
Thijs Wenker	af47510b05	Initial script editor widget / icons made by MaximillianMerlin ty	2014-04-15 00:30:01 +02:00
Ryan Huffman	06235decae	Move ChatWindow isAtBottom and moveToBottom outside of HAVE_QXMPP	2014-04-14 14:10:12 -07:00
ZappoMan	8a6da915ae	fix predelay in the diffusion case	2014-04-14 13:25:01 -07:00
ZappoMan	5e42daaa51	fix predelay in the diffusion case	2014-04-14 12:32:23 -07:00
Andrzej Kapolka	873620e601	Make sure we set the texture data even if the texture URL is invalid.	2014-04-14 12:27:15 -07:00
ZappoMan	0d308e7cb9	more cleanup add support for enable/disable rendering of paths	2014-04-14 11:58:49 -07:00
Ryan Huffman	4ae148ff19	Update chat window to not allow movement while docked	2014-04-14 11:34:35 -07:00
Ryan Huffman	aaddecd024	Merge remote-tracking branch 'upstream/master' into 19554 ... Conflicts: interface/resources/resources.qrc interface/ui/chatWindow.ui	2014-04-14 11:20:49 -07:00
ZappoMan	5630ed65af	more cleanup	2014-04-14 10:35:55 -07:00
Andrzej Kapolka	880736c30e	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-14 10:24:58 -07:00
Stephen Birarda	5904d19603	Merge pull request #2637 from birarda/authentication ... add optional DTLS option for domain-server to node communication	2014-04-14 10:24:17 -07:00
Andrzej Kapolka	25d25b1472	Merge pull request #2658 from AndrewMeadows/inertia ... don't render avatar boundary shapes in first person	2014-04-14 10:23:43 -07:00
ZappoMan	d3a9c6940c	some audio reflection cleanup	2014-04-14 10:12:08 -07:00
ZappoMan	7a993939bf	Merge branch 'master' of https://github.com/worklist/hifi into moonshot ... Conflicts: interface/interface_en.ts interface/src/Application.cpp interface/src/Application.h interface/src/Menu.h libraries/shared/src/SharedUtil.h	2014-04-14 09:43:29 -07:00
ZappoMan	ddd2b0843c	more work on new diffusion model	2014-04-13 20:43:40 -07:00
ZappoMan	22f7facc4e	first cut at new version of audio refelctor	2014-04-13 19:41:54 -07:00
ZappoMan	030de00e88	first cut at new version of audio refelctor	2014-04-13 19:11:25 -07:00
ZappoMan	38dbc56d1a	first cut at new version of audio refelctor	2014-04-13 19:09:28 -07:00
Ryan Huffman	2c10b55858	Remove extraneous debug messages	2014-04-12 01:09:29 -07:00
Ryan Huffman	8b904b91ea	Cleanup ChatMessageArea.cpp	2014-04-12 00:53:43 -07:00
Ryan Huffman	45402336ac	Add chat window dragging ... This was originally implemented by Mohammed Nafees, shared on Basecamp. I've noticed an issue with dragging across screens (monitors) where the chat window will jump vertically. I've tried debugging it, and ultimately it looks like an issue with the `move` method. The coordinates are valid (I tried using global coordinates as well), and the amount to move is correct, but when moving to coordinates on a different screen it doesn't do the right thing.	2014-04-12 00:25:58 -07:00
Ryan Huffman	13cf0c80e6	Fix chat message formatting and word wrapping ... By switching from a QLabel to a QTextBrowser widget more formatting options and word wrapping that breaks words is possible. It comes with an issue I have been unable to resolve * Selecting text and going down with the cursor will cause it to scroll. It's possible to increase padding to remove this behavior, but it doesn't look great.	2014-04-12 00:20:43 -07:00
Stojce Slavkovski	4d0ed5796e	Merge branch 'master' of https://github.com/worklist/hifi into 19507 ... Conflicts: interface/interface_en.ts	2014-04-12 08:45:23 +02:00
Philip Rosedale	e3eddadd10	Merge pull request #2651 from AndrewMeadows/avatar-interaction ... protection against bad avatar-avatar collisions	2014-04-11 21:23:57 -07:00
Leonardo Murillo	f84249ac6c	switching to https	2014-04-11 19:58:49 -06:00
Andrzej Kapolka	0ca68e4cb4	Adjust the size when we toggle the avatar LOD options.	2014-04-11 17:53:02 -07:00
Andrew Meadows	0ad841edfb	don't render avatar boundary shapes in first person	2014-04-11 17:44:51 -07:00
Andrzej Kapolka	39135d3d5f	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-11 16:37:49 -07:00
Andrew Meadows	fd3b317c09	merge	2014-04-11 16:36:42 -07:00
Andrzej Kapolka	2fdb8d935b	Merge pull request #2654 from Atlante45/remove_qrc_from_sources ... Remove qrc from sources	2014-04-11 16:35:48 -07:00
Andrzej Kapolka	4265617c3e	Add missing include.	2014-04-11 16:02:46 -07:00
Andrew Meadows	b5e7c30178	merge	2014-04-11 16:00:34 -07:00
Andrzej Kapolka	fe7a359545	Added tools to adjust avatar LOD to LOD tools dialog. Closes #2624.	2014-04-11 15:55:48 -07:00
Andrew Meadows	5ac7be8945	merge upstream/master -> andrew/inertia	2014-04-11 12:20:00 -07:00
Atlante45	c39434f4e3	Merge branch 'master' of https://github.com/highfidelity/hifi into remove_qrc_from_sources ... Conflicts: interface/resources/resources.qrc	2014-04-11 12:08:17 -07:00
Atlante45	100c3f8da4	Modify UIs that were using the qrc	2014-04-11 11:59:23 -07:00
Andrzej Kapolka	d6534d6026	Tweak to zoom on pushback.	2014-04-11 11:10:22 -07:00
Andrzej Kapolka	b7725f094d	Trying the narrowing effect with pushback for other avatars.	2014-04-11 10:19:16 -07:00
Andrzej Kapolka	00e2ff93e3	Playing around with zooming in while pulling back.	2014-04-11 10:08:44 -07:00
Andrew Meadows	f7862eb600	check for bad deltaTime during avatar-avatar collisions	2014-04-11 08:58:26 -07:00
AndrewMeadows	e850faee79	Merge pull request #2649 from ey6es/master ... Experimental "pushback" to avoid other avatars' intersecting the near clip plane.	2014-04-11 07:50:52 -07:00
Philip Rosedale	8ccc0a2081	Merge pull request #2650 from thoys/chatwindow-docking-feature ... Fixed docking of ChatWindow	2014-04-11 07:21:53 -07:00
Andrzej Kapolka	806bcc8e6f	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-10 18:49:52 -07:00
Andrzej Kapolka	d712588b36	Better rolloff.	2014-04-10 17:35:47 -07:00
Andrew Meadows	af158a3a94	save settings when any checkable menu item changes	2014-04-10 17:34:12 -07:00
Andrew Meadows	a436b59971	save settings for change in: identity, position	2014-04-10 17:14:51 -07:00
Andrzej Kapolka	197adce4de	Fall intersection off with angle to other avatar.	2014-04-10 17:14:49 -07:00
Andrew Meadows	66b6328687	protection against bad avatar-avatar collisions ... Also with logging if we encounter incorrectly large penetration depths	2014-04-10 16:58:52 -07:00
Thijs Wenker	f0463a5679	Fixed docking of ChatWindow ... Temporary Pin Icon, replace with a nice looking one please	2014-04-11 00:45:38 +02:00
Andrzej Kapolka	475528f112	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-10 15:00:32 -07:00
Andrzej Kapolka	6cf971c849	More intersection-avoidance tweaks.	2014-04-10 14:51:43 -07:00
Stojce Slavkovski	112c8946d6	Merge branch 'master' of https://github.com/worklist/hifi into 19508	2014-04-10 23:46:22 +02:00
Stephen Birarda	5f1e63bb4a	Merge pull request #2647 from AndrewMeadows/fix-crash ... fix crash: don't access null action	2014-04-10 14:44:01 -07:00
Stephen Birarda	11f5ee202a	Merge pull request #2646 from Atlante45/master ... Fixed dometime using wrong texdir	2014-04-10 14:43:36 -07:00
Atlante45	9c662acc9d	Modified max glow + don't glow you own avatar	2014-04-10 14:40:35 -07:00
Andrew Meadows	ac9ead36e2	fix crash: don't access null action ... In particular, don't crash on pressing Enter when lacking qxmpp support	2014-04-10 13:10:24 -07:00
Stojce Slavkovski	459fed5c7b	Merge branch 'master' of https://github.com/worklist/hifi into 19508	2014-04-10 21:52:37 +02:00
Atlante45	ea93be15f1	Fixed dometime using wrong texdir	2014-04-10 12:44:51 -07:00
Ryan Huffman	16a2367b29	Update chat window to only scroll when at the bottom ... It can be frustrating when scrolling up to read a message to have the window forcibly scrolled to the bottom when a new message appears.	2014-04-10 12:34:45 -07:00
Ryan Huffman	37f9f47488	Fix odd resizing of chat messages ... When calling updateGeometry on the message labels the layout system seems to resize the widgets in weird ways. There may be a different way to keep it from doing this.	2014-04-10 12:09:06 -07:00
Ryan Huffman	ff3ebd1eda	Fix centering of timestamp in chat window	2014-04-10 12:04:30 -07:00
Andrzej Kapolka	873541dd7b	Trying out basic pushback for other avatars.	2014-04-10 11:56:17 -07:00
Atlante45	2cc2149647	Glow when you talk, flash when you clip ... closes #2592	2014-04-10 11:55:30 -07:00
Ryan Huffman	2d481dda4e	Update chat menu to properly position itself when opening ... The previous implementation seemed to assume a full-screen main window - it will now open on the right side of the window, vertically centered, regardless of where the main window is.	2014-04-10 11:46:28 -07:00
Ryan Huffman	5099a0e061	Remove chat window opening animation	2014-04-10 11:41:10 -07:00
Stephen Birarda	3651eff3d6	cleanup Systime to gettimeofday without lean and mean windows	2014-04-10 11:24:54 -07:00
Andrzej Kapolka	a12dd916fa	More plane intersection bits.	2014-04-10 11:24:45 -07:00
Stephen Birarda	7c9e0927ab	define WIN32_LEAN_AND_MEAN before include windows.h in Systime	2014-04-10 11:17:03 -07:00
Stephen Birarda	ef418f09b3	don't let windows.h include winsock	2014-04-10 11:15:33 -07:00
Andrzej Kapolka	f61c746b4a	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-10 09:45:23 -07:00
Andrew Meadows	3755aee3e0	merge upstream/master into andrew/scripting ... Conflicts: interface/src/avatar/MyAvatar.cpp	2014-04-10 08:32:14 -07:00
Andrew Meadows	f9fb8b46a5	adding names to arguments in collisionWithAvatar() declaration	2014-04-10 07:53:39 -07:00
Andrew Meadows	4942e93daa	replace .f with .0f as per coding standard	2014-04-10 07:53:11 -07:00
Philip Rosedale	e08dfeae2a	Merge pull request #2642 from Atlante45/persistant_script_location ... Persistant script location	2014-04-09 22:16:20 -07:00
Philip Rosedale	de6b55644b	Merge pull request #2636 from ey6es/faceplus ... Basic Faceplus integration, cleanup for handling the various face trackers.	2014-04-09 22:13:34 -07:00
Philip Rosedale	3b2b075414	Merge pull request #2640 from birarda/kill-scope ... remove the audio scope	2014-04-09 22:11:02 -07:00
Philip Rosedale	d4bfffe518	Merge pull request #2628 from AndrewMeadows/oculus-with-thrust ... fix glitchy oculus when looking directly behind	2014-04-09 21:59:11 -07:00
Andrzej Kapolka	9f58264cb6	Working on plane collisions, pushing back camera from intersecting avatars.	2014-04-09 18:07:56 -07:00
Atlante45	ef89b8c386	Removed extra line	2014-04-09 17:37:37 -07:00
Atlante45	fad71266a1	Merge branch 'master' of https://github.com/highfidelity/hifi into persistant_script_location	2014-04-09 17:35:12 -07:00
Atlante45	2b44b03a27	Added temp fix to ModelUploader dialog too	2014-04-09 17:34:17 -07:00
Andrew Meadows	c88be1ac34	remove unnecessary change	2014-04-09 17:26:05 -07:00
Stephen Birarda	cf47418d58	remove the audio scope	2014-04-09 17:16:29 -07:00
Atlante45	e33da2a741	Some QSettings cleanup + persistant script location	2014-04-09 17:08:50 -07:00
Andrew Meadows	22d2f84cff	merge upstream/master into andrew/scripting	2014-04-09 15:38:56 -07:00
Andrzej Kapolka	f0dfb7fc38	Updated headers to match the new standard.	2014-04-09 15:38:54 -07:00
Stephen Birarda	1c861fbecb	resolve conflicts on merge with upstream master	2014-04-09 15:36:15 -07:00
Andrzej Kapolka	f707719f4e	Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus	2014-04-09 15:34:29 -07:00
Andrew Meadows	3a93096093	fixing floats to be *.0f instead of *.f	2014-04-09 15:31:26 -07:00
Andrzej Kapolka	ef8eb00778	Merge branch 'master' of https://github.com/highfidelity/hifi into faceplus	2014-04-09 15:23:11 -07:00
Andrzej Kapolka	ead05c4d99	Tab fixes.	2014-04-09 15:22:53 -07:00
Andrzej Kapolka	cbfaf9709e	Faceplus fixes.	2014-04-09 15:18:22 -07:00
Stephen Birarda	11d8d0596a	fix ModelUploader header after move	2014-04-09 15:15:43 -07:00
Stephen Birarda	c208af2246	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-09 15:10:48 -07:00
Andrzej Kapolka	28d3eae12b	Move Faceplus reading to its own thread to avoid blocking the main one.	2014-04-09 14:52:27 -07:00
Stephen Birarda	7dec499b79	fix accidental changes to Audio.cpp	2014-04-09 14:52:01 -07:00
Stephen Birarda	d4f2c9e631	Merge branch 'master' of https://github.com/highfidelity/hifi into authentication	2014-04-09 14:40:14 -07:00
Andrew Meadows	5fa1fd6b81	merge	2014-04-09 14:36:22 -07:00
Andrew Meadows	07b343ec03	emit events for hand-avatar collisions	2014-04-09 14:32:57 -07:00
Andrew Meadows	034f518d40	emit signal on avatar body-body collisions	2014-04-09 14:15:45 -07:00
Atlante45	7578b282e2	CR	2014-04-09 14:12:11 -07:00
Atlante45	b05b5a1c7b	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-09 14:11:22 -07:00
stojce	9ab61faacb	additional CR fixes	2014-04-09 22:32:15 +02:00
stojce	a1c6843bd4	CR Fixes	2014-04-09 22:14:35 +02:00
Andrew Meadows	e480064e66	rename more shapeShape() to be collideShapes()	2014-04-09 13:07:54 -07:00
Stephen Birarda	973fb95c9d	Merge pull request #2630 from AndrewMeadows/scripting ... Expose MyAvatar.sessionUUID to JS	2014-04-09 13:07:37 -07:00
Andrzej Kapolka	79455d5850	More Faceplus work. Starting to get results.	2014-04-09 13:07:02 -07:00
Andrew Meadows	f8e66b4e0d	remove cruft	2014-04-09 13:05:26 -07:00
stojce	c9605be193	Merge branch 'master' of https://github.com/worklist/hifi into 19508	2014-04-09 21:57:56 +02:00
Andrzej Kapolka	4d9f3a4aee	Added basic mappings to start off with.	2014-04-09 12:36:02 -07:00
Stephen Birarda	ae4b8348a2	fix header include guards via regex	2014-04-09 12:03:17 -07:00
Andrzej Kapolka	4deb052d5d	More work on Faceplus integration.	2014-04-09 11:54:55 -07:00
Stephen Birarda	0a9c7e3d74	add an include guard to Stats	2014-04-09 11:35:20 -07:00
Andrew Meadows	4b306401af	use slot to change AvatarData::_sessionUUID	2014-04-09 11:32:52 -07:00
Andrzej Kapolka	55e0035fc8	More progress on Faceplus integration.	2014-04-09 11:14:47 -07:00
stojce	8d45a53af9	Merge branch 'master' of https://github.com/worklist/hifi into 19507 ... Conflicts: interface/interface_en.ts	2014-04-09 19:53:48 +02:00
Stephen Birarda	2d755adfc0	repairs to good code blown away by regex	2014-04-09 10:46:20 -07:00
Stephen Birarda	86d236faef	repairs to date and author name in RearMirrorTools	2014-04-09 10:13:06 -07:00
Stephen Birarda	d2c6ea238e	repairs to starfield headers	2014-04-09 10:10:00 -07:00
Stephen Birarda	b5a641d60f	add back Util code blown away in merge	2014-04-09 10:04:19 -07:00
Stephen Birarda	b8bfe325a0	add back code blow away in regex replacements	2014-04-09 10:03:26 -07:00
stojce	7b26317eaf	Merge branch 'master' of https://github.com/worklist/hifi into 19548	2014-04-09 18:55:17 +02:00
stojce	ce85e67a42	Modify icons in Interface "mirror"	2014-04-09 18:54:59 +02:00
Stephen Birarda	684c6b5372	run regex header replacement on all cpp files	2014-04-09 09:35:42 -07:00
Stephen Birarda	974d8c0427	prepare header files for regex run against cpp	2014-04-09 09:35:05 -07:00
Andrew Meadows	2f97dd2574	sessionID --> sessionUUID for consistency	2014-04-09 08:22:35 -07:00
Andrew Meadows	229d6cefa2	merge upstream/master into andrew/scripting	2014-04-09 08:17:33 -07:00
Andrew Meadows	b8232b5dfd	AvatarData now stores sessionUUID	2014-04-09 08:11:15 -07:00
stojce	cc2f03fb49	Merge branch 'master' of https://github.com/worklist/hifi into 19508	2014-04-09 08:19:41 +02:00
Andrew Meadows	2eef95f67e	remove getAbsoluteHeadYaw() from the header	2014-04-08 18:44:34 -07:00
Andrew Meadows	f95542e4d6	merge upstream/master into oculus-with-thrust proj	2014-04-08 18:34:15 -07:00
Andrew Meadows	34aefe1b49	fix glitchy oculus when looking directly behind	2014-04-08 18:33:08 -07:00
Brad Hefta-Gaub	dc89026215	Merge pull request #2607 from thoys/hifi-win-default-device-fix ... windows default device fix	2014-04-08 15:30:02 -10:00
Andrzej Kapolka	5b0e7f818d	More work on Faceplus integration/cleaning up support for multiple face ... trackers.	2014-04-08 18:03:49 -07:00
Stephen Birarda	7ce91b3f96	fix headers who had their comments removed	2014-04-08 17:43:35 -07:00
Stephen Birarda	387179b38f	add Norman's tagline back to PrimitiveRenderer	2014-04-08 17:31:53 -07:00
Stephen Birarda	ab3a9af6bf	repair the starfield renderer	2014-04-08 17:31:30 -07:00
Stephen Birarda	6a51df9e38	initial regex replacement of headers	2014-04-08 17:30:36 -07:00
Stephen Birarda	f3cbd120ce	header comment tweaks prior to regex match	2014-04-08 17:19:23 -07:00
Atlante45	7e33ed0c91	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-04-08 16:35:46 -07:00
Atlante45	039450aeec	Checking model name is present in the .fst file	2014-04-08 16:35:07 -07:00
Andrzej Kapolka	597d750af9	Better radius.	2014-04-08 15:25:10 -07:00
Andrzej Kapolka	083e9076a9	Missed a spot.	2014-04-08 15:17:05 -07:00
Andrzej Kapolka	faf8c35358	Head height's kind of screwy; let's use the eye position.	2014-04-08 15:01:56 -07:00
Andrzej Kapolka	add7bb26ed	Use the head height to determine the pushback amount.	2014-04-08 14:55:46 -07:00
Andrzej Kapolka	5776514e6a	Working on pushing the mirror camera back to prevent intersecting the near ... clip plane. Closes #2617.	2014-04-08 14:48:01 -07:00
Thijs Wenker	6754a6ca69	Fixed some style	2014-04-08 23:45:27 +02:00
Stephen Birarda	6681754994	Merge branch 'master' of https://github.com/highfidelity/hifi into authentication	2014-04-08 14:26:10 -07:00
Atlante45	8ad7c3b239	Moved ModelUploader to interface + New error messages	2014-04-08 14:03:27 -07:00
Brad Hefta-Gaub	8e097be28d	Merge pull request #2614 from Atlante45/undo_redo_system ... Undo redo system	2014-04-08 08:30:29 -10:00
Brad Hefta-Gaub	c865df8b82	Merge pull request #2613 from Atlante45/more_upload_work ... More upload work	2014-04-08 08:16:07 -10:00
Mohammed Nafees	ba7c696786	child like behaviour for the widget	2014-04-08 23:38:49 +05:30
Andrzej Kapolka	ccd7106527	Include "InterfaceConfig" before QOpenGLFramebufferObject to fix Windows ... build.	2014-04-08 10:54:41 -07:00
Atlante45	eaca699a6d	Merge branch 'master' of https://github.com/highfidelity/hifi into more_upload_work	2014-04-08 10:35:23 -07:00
Stephen Birarda	080b0d7221	Merge branch 'master' of https://github.com/highfidelity/hifi into authentication	2014-04-08 10:28:14 -07:00
Andrzej Kapolka	d4706bba8a	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-04-08 10:21:13 -07:00
Atlante45	174f37f531	Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system	2014-04-08 10:20:58 -07:00
Brad Hefta-Gaub	2988239aed	Merge pull request #2615 from ey6es/master ... Add the download stats back (they got lost in a merge), provide a way for bots to address joints by name (by including indices in the FST file).	2014-04-08 07:20:00 -10:00
Andrzej Kapolka	5a61009099	Add metavoxel bandwidth to details.	2014-04-08 10:19:39 -07:00
Andrzej Kapolka	a157c67901	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-04-08 09:56:07 -07:00
Brad Hefta-Gaub	aad3085e08	Merge pull request #2611 from AndrewMeadows/avatar-speed ... fix for sometimes slow avatar	2014-04-08 06:54:21 -10:00
Andrzej Kapolka	fa05a48270	Provide a means of supplying the joint mappings in the FST file so that agent ... scripts can address joints by name. Closes #2526.	2014-04-07 17:55:36 -07:00
Atlante45	d213cd7840	More work on Undo/Redo	2014-04-07 17:10:15 -07:00
Atlante45	d7b3c8b8fa	Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system	2014-04-07 17:02:00 -07:00
Andrew Meadows	bf0eb69e2c	fix for sometimes slow avatar	2014-04-07 16:28:55 -07:00
Andrzej Kapolka	15e9d45dc3	Switched from storing Euler angles to using quaternions along with a ... quaternion editor. Also, use a default step of 0.01 for floats/doubles.	2014-04-07 15:41:42 -07:00
Andrew Meadows	79670563d4	AvatarData stores its sessionID	2014-04-07 14:42:49 -07:00
Andrzej Kapolka	0011276b0b	Added back the download stats, which got lost in a merge.	2014-04-07 14:19:17 -07:00
Atlante45	b21fe02fa2	Put ModelUploder on a different thread, not to block the rendering of the main window	2014-04-07 13:46:38 -07:00
Andrew Meadows	84d7e39d72	merge upstream/master into avatar-interaction	2014-04-07 10:05:25 -07:00
Andrew Meadows	d902580d6f	Add Collision metatype to JS script system	2014-04-07 10:03:10 -07:00
Thijs Wenker	e9922b6db9	windows default device fix: ... - fixed tabs>spaces - doesn't require atlbase anymore, so works on visual studio express	2014-04-07 18:50:13 +02:00
Stephen Birarda	69504b0a9d	proper cleanup of CA credentials on DTLSClientSession side	2014-04-07 09:47:51 -07:00
Stephen Birarda	efcf506383	resolve conflicts on merge with upstream master	2014-04-07 09:32:08 -07:00
Thijs Wenker	4335ba7b5a	windows default device fix	2014-04-07 17:01:24 +02:00
ZappoMan	dfd6411a4f	add hooks for local audio echo, first cut at diffusion	2014-04-06 10:11:11 -07:00
stojce	dd5a198740	Models browser fixes	2014-04-06 16:13:15 +02:00
stojce	ba5a092ad7	Frameless dialog position/size fixes ... Fixed frameless dialog size and position on main window resize and move	2014-04-06 15:30:30 +02:00
stojce	b45f61ec54	Merge branch 'master' of https://github.com/worklist/hifi into 19508	2014-04-05 16:29:57 +02:00
matsukaze	bcce1155e1	Merge branch 'master' of https://github.com/matsukaze/hifi_nocr	2014-04-05 00:56:28 -04:00
ZappoMan	593fc6c963	lots of knobs and dials	2014-04-04 17:29:39 -07:00
Andrzej Kapolka	404b804b2f	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-04-04 16:41:43 -07:00
Andrzej Kapolka	2d535f3b86	Removed debugging code.	2014-04-04 16:36:58 -07:00
Andrzej Kapolka	d2b0cc43dd	Extent tweaks.	2014-04-04 16:32:14 -07:00
Andrzej Kapolka	72d09a5cbe	Merge pull request #2605 from AndrewMeadows/say-no-to-warnings ... removing a warning about hidden virtual override	2014-04-04 16:00:57 -07:00
Andrzej Kapolka	1c822542c1	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-04-04 15:29:13 -07:00
Andrzej Kapolka	10288bce35	Merge pull request #2604 from AndrewMeadows/oculus-with-thrust ... fix #2567 thrust + oculus doesn't change body rotation	2014-04-04 15:19:44 -07:00
Andrzej Kapolka	1f3a5d09d9	Merge pull request #2593 from Atlante45/display_models_metadata ... Display models metadata	2014-04-04 15:18:18 -07:00
Andrew Meadows	403ad5e984	removing a warning about hidden virtual override	2014-04-04 15:18:12 -07:00
Atlante45	a0e70d0d2a	Merge branch 'master' of https://github.com/highfidelity/hifi into undo_redo_system	2014-04-04 14:53:12 -07:00
Andrew Meadows	01c42c741c	fix #2567 thrust + oculus doesn't change body rot	2014-04-04 14:46:54 -07:00
Andrzej Kapolka	3a125db1f8	Increase the rate at which we increase detail and put a limit on the LOD ... multiplier so that it never takes more than about five seconds to return to default detail. Also, since there seems to be a weird issue where OS X throttles the frame rate to 30 fps (independent of our own throttling), use that as the lower adjustment range.	2014-04-04 14:31:30 -07:00
Andrzej Kapolka	a2b94aa433	Working on render modes.	2014-04-04 14:22:01 -07:00
Andrzej Kapolka	550a8fdb99	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-04-04 13:00:51 -07:00
Mohammed Nafees	7b5c733d9e	Fixed spacing of number and script name in recently loaded list.	2014-04-05 01:10:02 +05:30
stojce	8dc6ca75a4	Merge branch 'master' of https://github.com/worklist/hifi into 19508 ... Conflicts: interface/interface_en.ts interface/resources/resources.qrc interface/src/Menu.cpp	2014-04-04 21:16:29 +02:00
Andrzej Kapolka	a0c7e4d3cc	Working on model rendering modes.	2014-04-04 11:45:03 -07:00
ZappoMan	c35d6bdb0c	add reflection stats to stats display, add pre-delay, add toggle for separate ears, add surface randomness	2014-04-04 11:25:43 -07:00
Stephen Birarda	fd8e32190e	perform cleanup of GnuTLS structures across targets	2014-04-04 11:08:53 -07:00
Stephen Birarda	85933545cd	add GnuTLS init to Application	2014-04-04 10:59:58 -07:00
Stephen Birarda	e2224e0f0c	cleanup node silence timing and use for DTLS timeouts	2014-04-04 10:56:04 -07:00
Andrew Meadows	5e2b8bb2c3	connect SIGNAL to SIGNAL to avoid forwarding slot	2014-04-04 10:43:06 -07:00
Mohammed Nafees	eae95a57b7	UI alignment changes	2014-04-04 23:12:56 +05:30
Mohammed Nafees	1ecdec7a5e	Minor changes. Added a sweet tooltip :)	2014-04-04 19:52:37 +05:30
ZappoMan	4c0f83913b	tweaks to bounce	2014-04-04 07:04:02 -07:00
Andrzej Kapolka	38022d2440	Fix for voxelizing models.	2014-04-04 00:33:33 -07:00
Andrzej Kapolka	1bf19111dc	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-04-03 23:57:30 -07:00
Andrzej Kapolka	dfaa98cc34	Blend when setting.	2014-04-03 23:51:49 -07:00
Andrzej Kapolka	d706e23012	Basic voxelization.	2014-04-03 23:47:31 -07:00
ZappoMan	f45f30234f	more tweaks to reflections	2014-04-03 23:03:06 -07:00
ZappoMan	98f0fe8619	latest pass, improved distance calulations, added menu item to remove original source	2014-04-03 18:57:08 -07:00
Atlante45	d3ce2c7640	Added undo/redo support to the client	2014-04-03 16:51:08 -07:00
Atlante45	42f47f5db2	Some alphabetical cleaning	2014-04-03 16:48:56 -07:00
ZappoMan	23e5452a89	next cut	2014-04-03 16:31:28 -07:00
ZappoMan	ed55700c27	Merge branch 'moonshot' of https://github.com/ZappoMan/hifi into moonshot ... Conflicts: interface/src/AudioReflector.cpp	2014-04-03 16:22:29 -07:00
matsukaze	9e157ff1c5	More audio fixes.	2014-04-04 16:17:49 -07:00
matsukaze	33d4cb6497	Merge branch 'moonshot' of https://github.com/ZappoMan/hifi into moonshot	2014-04-04 16:16:19 -07:00
matsukaze	33718684e6	More audio fixes.	2014-04-04 16:09:25 -07:00
matsukaze	836fda2c05	Clamp the audio summation.	2014-04-04 09:07:27 -07:00
ZappoMan	5872ec0569	checkpoint	2014-04-03 16:19:33 -07:00
Atlante45	ba4ccc22ef	Changed FstReader name to ModelUploader	2014-04-03 16:19:33 -07:00
AndrewMeadows	4a98f9f159	Merge pull request #2485 from kordero/19498 ... Code Review for Job #19498	2014-04-03 12:58:47 -07:00
ZappoMan	06adaa009c	add first cut at simple low pass filter	2014-04-03 12:40:35 -07:00
Lucas Crisman	793179dc72	Merge branch 'master' of git://github.com/worklist/hifi into 19498 ... Conflicts: interface/src/Application.cpp	2014-04-03 16:24:32 -03:00
Andrzej Kapolka	061d7719d4	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-04-03 11:55:50 -07:00
Andrzej Kapolka	22710af111	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels ... Conflicts: interface/interface_en.ts	2014-04-03 11:37:27 -07:00
Andrzej Kapolka	df4fd9df5f	Remove translations for now, but use correct translation keys for the only ... translations we had (days/weeks/etc.)	2014-04-03 11:30:06 -07:00
Andrzej Kapolka	407a6ecc70	More work on voxelizing.	2014-04-03 11:26:54 -07:00
Atlante45	df718c430a	Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata	2014-04-03 11:20:24 -07:00
Stephen Birarda	cc199364e2	Merge pull request #2596 from ddobrev/master ... Informed users who want to chat they have to log in first	2014-04-03 10:27:37 -07:00
Dimitar Dobrev	716858e6f6	Informed users who want to chat they have to log in first.	2014-04-03 20:09:54 +03:00
Mohammed Nafees	f3121e1bf6	Removed the animation, placed UI elements according to mockup	2014-04-03 22:33:45 +05:30
ZappoMan	1265e5b12d	just echo	2014-04-03 09:23:10 -07:00
Andrew Meadows	7a602aedd1	Fix crash: don't simulate until geometry exists	2014-04-03 09:06:49 -07:00
ZappoMan	3808cfa83d	latest work	2014-04-03 08:55:48 -07:00
matsukaze	09bcada263	Fixes to audio spatial processing.	2014-04-03 19:41:59 -07:00
Mohammed Nafees	2ef8277d0f	Make the widget move and resize along with the main window	2014-04-03 18:04:26 +05:30
Mohammed Nafees	e5d9812742	Major changes to the running scripts widget	2014-04-03 13:21:27 +05:30
Andrzej Kapolka	4375fe85f1	Working on voxelizing spanners using a set of six rendered images.	2014-04-02 18:56:18 -07:00
ZappoMan	7717a09f91	use QByteArray for processSpatialAudio() signal	2014-04-02 18:48:28 -07:00
ZappoMan	42efb0db65	glue in processSpatialAudio()	2014-04-02 18:18:17 -07:00
Atlante45	4a1687c023	Merge branch 'master' of https://github.com/highfidelity/hifi into HEAD ... Conflicts: interface/interface_en.ts interface/src/Application.cpp	2014-04-02 18:16:30 -07:00
Atlante45	5acc8313ba	Manual merge	2014-04-02 18:07:55 -07:00
Andrew Meadows	db40a955c9	merge upstream/master into "improved URL scheme" ... Conflicts: interface/interface_en.ts	2014-04-02 17:50:08 -07:00
ZappoMan	033e233d40	Merge branch 'moonshot' of https://github.com/ZappoMan/hifi into moonshot	2014-04-02 17:45:51 -07:00
matsukaze	f7d9269314	Modifications to support spatial audio processing.	2014-04-03 17:36:03 -07:00
ZappoMan	ec9884833b	first cut at reflections	2014-04-02 17:45:34 -07:00
Andrew Meadows	aad945c180	merge upstream/master into "improved URL scheme" ... Conflicts: interface/interface_en.ts	2014-04-02 17:45:01 -07:00
Andrew Meadows	715f2c53d5	merge upstream/master into avatar-interaction ... Conflicts: interface/interface_en.ts	2014-04-02 17:28:22 -07:00
Atlante45	c2f0545d96	Setup for actual metadata	2014-04-02 17:12:11 -07:00
Atlante45	cf20c448a3	Few tweaks before PR	2014-04-02 16:46:03 -07:00
Andrew Meadows	933cade6b0	Re-add fullUpdate hint to Model::simulate()	2014-04-02 16:34:33 -07:00
Atlante45	52df77b4b5	Final work on models metadata support	2014-04-02 16:25:35 -07:00
Lucas Crisman	76921d9b52	Merge branch 'master' of git://github.com/worklist/hifi into 19498	2014-04-02 17:18:27 -03:00
Andrew Meadows	97ba5250a5	Only simulate() Avatar Models when necessary ... Also: rebuild collision shapes when Model scale changes	2014-04-02 12:01:18 -07:00
Atlante45	b73598ae8a	Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata	2014-04-02 11:40:41 -07:00
Atlante45	e60e1929f3	Review comments	2014-04-02 11:36:52 -07:00
Mohammed Nafees	0fa910c61f	fix ubuntu build error	2014-04-02 16:16:23 +05:30
Mohammed Nafees	c358c6ff99	fixed signal parameter	2014-04-02 15:55:47 +05:30
Mohammed Nafees	5e8bd8d050	Resolve conflicts	2014-04-02 13:00:48 +05:30
Mohammed Nafees	d85d4fea5d	Added the new Running Scripts widget	2014-04-02 12:46:57 +05:30
Lucas Crisman	1a468ab8ca	Merge branch 'master' of git://github.com/worklist/hifi into 19498 ... Conflicts: interface/src/Application.cpp	2014-04-02 01:26:25 -03:00
Philip Rosedale	ca863e77f4	Merge branch 'master' of https://github.com/worklist/hifi ... Conflicts: interface/interface_en.ts	2014-04-01 21:14:51 -07:00
Philip Rosedale	389091ace6	Merge pull request #2587 from matsukaze/nocrAudioFixes ... Audio fixes for win OS.	2014-04-01 21:03:26 -07:00
matsukaze	d28d686ceb	Fix for missing voxel system on domain change. Fix for assertion failure thrown by Qt on exit.	2014-04-02 17:45:22 -07:00
matsukaze	f305b81655	Merge upstream master into audio fixes.	2014-04-02 17:34:41 -07:00
matsukaze	7542917922	Fix tab with space.	2014-04-02 14:22:17 -07:00
matsukaze	94a23b7ffc	Fix brace location and replace tab with space.	2014-04-02 14:15:20 -07:00
matsukaze	952ca928f1	More audio fixes. Fix audio buffer size on Win.	2014-04-02 12:28:22 -07:00
Philip Rosedale	e53bfe4ea1	Merge pull request #2585 from ey6es/master ... Align forearms with wrists again, fix for annoying intermittent seg fault on Linux exit.	2014-04-01 20:59:51 -07:00
Andrew Meadows	515593e41c	modify avatar thrust during collisions	2014-04-01 17:25:26 -07:00
Philip Rosedale	0b792985d3	Tweaks to VU meter, tone injector, and fix to noise gate	2014-04-01 16:43:18 -07:00
Andrzej Kapolka	865ca7de20	Align forearms with wrists. Closes #2577.	2014-04-01 16:01:29 -07:00
matsukaze	c3934d9e86	Fix heap corruption.	2014-04-01 15:49:08 -07:00
Philip Rosedale	36c41a1fd3	test other way of doing loudness	2014-04-01 15:35:46 -07:00
Stephen Birarda	62041d91a8	rename NodeList DomainInfo to DomainHandler	2014-04-01 13:09:35 -07:00
Andrew Meadows	b65855a384	merge upstream/master into avatar-interaction	2014-04-01 12:53:47 -07:00
Andrew Meadows	59bba99c6f	Resolve body-body collisions with other avatars	2014-04-01 12:48:17 -07:00
Atlante45	f87c82450a	Modified dialog default size	2014-04-01 12:20:08 -07:00
Atlante45	bdd5c291b0	Merge branch 'master' of https://github.com/highfidelity/hifi into display_models_metadata	2014-04-01 12:03:45 -07:00
Atlante45	03958f2fa0	work on metadata in the model browser + real time updates	2014-04-01 12:02:47 -07:00
Andrew Meadows	3d43956c11	bounding shape relative to model's root Joint	2014-04-01 11:39:40 -07:00
Andrew Meadows	9f9127b716	draw head bounding shape first	2014-04-01 11:39:24 -07:00
Andrzej Kapolka	fb37ef5bca	Fix for annoying intermittent seg fault on Linux exit. Closes #2542.	2014-04-01 11:25:39 -07:00
Andrzej Kapolka	afb5711879	Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels	2014-04-01 10:40:38 -07:00
Andrew Meadows	03d04e194d	Init bounding Extents for more correct shapes	2014-04-01 10:39:58 -07:00