17499 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ZappoMan	f6c07a5ada	first cut at making the rotate handles actually rotate	2014-10-09 17:37:56 -07:00
ZappoMan	b50e996ec8	added Vec3.orientedAngle()	2014-10-09 17:35:58 -07:00
ZappoMan	458475ee64	work on intersection with rotation overlays	2014-10-08 20:31:46 -07:00
ZappoMan	2004159778	implement basic support for planar overlay type intersections	2014-10-08 20:29:53 -07:00
ZappoMan	4558caf431	display current pitch/yaw/roll in rotation overlays	2014-10-08 19:30:43 -07:00
ZappoMan	18f3a208f7	fix property edit dialog box	2014-10-08 19:29:07 -07:00
ZappoMan	e544c06b92	correctly reselect entity after property edits to make sure handles move if dimensions or position changes	2014-10-08 19:28:40 -07:00
ZappoMan	1990419eeb	first cut at correct handle hide/show behavior and rotate overlay hide/show behavior	2014-10-08 15:15:49 -07:00
Clément Brisset	e4f5f11429	Merge pull request #3557 from birarda/master ... fix for window modalities	2014-10-08 11:53:48 -07:00
AndrewMeadows	4873528068	Merge pull request #3543 from birarda/domain-tunnel ... handle local socket changes when moving networks for auto networked domains	2014-10-08 11:36:56 -07:00
Philip Rosedale	905b52eab4	Merge pull request #3558 from ctrlaltdavid/leap-hand-fixes ... Leap hand fixes	2014-10-08 11:35:56 -07:00
Stephen Birarda	d064919cb0	fix a missed reference to NetworkAccessManager	2014-10-08 10:41:16 -07:00
David Rowe	a3cce3ae22	Fix Leap hand roll	2014-10-08 10:11:18 -07:00
Stephen Birarda	b0a99c48a7	don't force metavoxel editor to stay on top	2014-10-08 10:05:13 -07:00
Stephen Birarda	a8a8b81386	don't make long and address bar modal so they don't steal input	2014-10-08 10:00:50 -07:00
Stephen Birarda	3794e166ad	change LoginDialog modality so it doesn't steal input	2014-10-08 09:51:16 -07:00
AndrewMeadows	c56923d316	Merge pull request #3549 from ZappoMan/editToolsImprovements ... add tick marks to planar ellipse/circle overlays	2014-10-08 09:33:34 -07:00
Stephen Birarda	7773a94df7	resolve conflicts on merge with upstream master	2014-10-08 09:27:16 -07:00
Brad Hefta-Gaub	e38562b99d	Merge pull request #3555 from birarda/path-changes ... fix location hash suggestion in address bar	2014-10-08 09:24:58 -07:00
Philip Rosedale	244256bb91	Merge pull request #3482 from DaveDubUK/19970 ... Code Review for Job #19970	2014-10-07 15:37:15 -07:00
Stephen Birarda	6e81bde7bd	make position path clearer for address bar	2014-10-07 15:30:44 -07:00
Stephen Birarda	ec6b6999a0	fix for location hash in address bar	2014-10-07 15:29:57 -07:00
David Rowe	373d2f0532	Work-around for right hand roll on Windows is no longer needed	2014-10-07 14:50:29 -07:00
Leonardo Murillo	a10aeb8958	Merge pull request #3554 from birarda/path-changes ... repairs for new user scoped paths	2014-10-07 15:27:06 -06:00
Stephen Birarda	67fdfbb7f1	fix for user domains path in domain settings	2014-10-07 14:19:15 -07:00
Stephen Birarda	ea4c5a8900	repairs for new user scoped paths	2014-10-07 14:18:05 -07:00
Stephen Birarda	30740afe80	fix a typo in README.md	2014-10-07 12:42:29 -07:00
Grayson Stebbins	484d97a2b8	Update README.md ... Added section about documentation, turned Worklist URLs into links.	2014-10-07 10:20:15 -07:00
Grayson Stebbins	d1ea91bdf5	Update CONTRIBUTING.md ... Updated to new URLs for coding standard, worklist. Updated details on how to contribute via Worklist.	2014-10-07 10:15:09 -07:00
AndrewMeadows	c555c50b4c	Merge pull request #3553 from PhilipRosedale/master ... Bring initial walk speed down for easier maneuvering around people	2014-10-07 09:50:27 -07:00
Clément Brisset	3283c861b1	Merge pull request #3529 from huffman/19903 ... CR for Job #19903 - When you bring in an FBX apply the default scale to the model	2014-10-06 18:21:28 -07:00
Philip Rosedale	63730a37da	Bring initial walk speed down for easier maneuvering around people	2014-10-06 15:26:47 -07:00
Stephen Birarda	b4cfce8ffa	final NetworkAccessManager return repairs	2014-10-06 14:58:23 -07:00
Stephen Birarda	a358b4e2af	repair another reference to NetworkAccessManager	2014-10-06 14:57:54 -07:00
Stephen Birarda	f19c5c9850	repair NetworkAccessManager returns, handle custom AS port in assignment-client	2014-10-06 14:57:38 -07:00
Philip Rosedale	8084c5c77d	Merge pull request #3552 from AndrewMeadows/inertia ... Tweak low velocity avatar keyboard control.	2014-10-06 14:56:38 -07:00
Stephen Birarda	78920234bb	handle changed domain-server port on start	2014-10-06 14:49:15 -07:00
Leonardo Murillo	7400104f87	Merge pull request #3551 from ZappoMan/fixHTTPSIncludes ... fix include for https relative urls	2014-10-06 15:43:30 -06:00
Stephen Birarda	14cd044359	handle custom local UDP port for domain-server from webpage	2014-10-06 14:41:16 -07:00
Brad Hefta-Gaub	2d06b150c4	Merge pull request #3548 from ctrlaltdavid/overlays_example_fix ... Fix property names used for text overlay colors	2014-10-06 14:35:47 -07:00
Brad Hefta-Gaub	4b33cfe838	Merge pull request #3547 from birarda/new-qt ... fix for ThreadedAssignment readyRead on Qt 5.3.x	2014-10-06 14:35:25 -07:00
ZappoMan	07832fdd68	fix include for https relative urls	2014-10-06 14:34:19 -07:00
Stephen Birarda	2d3f3edcad	Merge branch 'master' of https://github.com/highfidelity/hifi into domain-tunnel	2014-10-06 14:31:39 -07:00
Brad Hefta-Gaub	4e038687cf	Merge pull request #3550 from murillodigital/master ... Missed one reference to the old bucket.	2014-10-06 14:31:35 -07:00
Andrew Meadows	6aba2359ed	Tweak low velocity avatar keyboard control.	2014-10-06 14:27:43 -07:00
Leonardo Murillo	65b559ca3d	Missed one	2014-10-06 15:21:51 -06:00
ZappoMan	12deec928c	add tick marks to planar ellipse/circle overlays	2014-10-06 14:15:22 -07:00
David Rowe	08147380c7	Fix property names used for text overlay colors	2014-10-06 14:09:23 -07:00
Stephen Birarda	499e748d54	rebind the node socket when switching to ThreadedAssignment	2014-10-06 13:45:11 -07:00
Brad Hefta-Gaub	e867b49701	Merge pull request #3546 from murillodigital/master ... Fixing globals var scopt	2014-10-06 13:29:20 -07:00