19341 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Hefta-Gaub	0e71c5c282	Merge pull request #3904 from huffman/gamepad-mirror-toggle ... Make gamepad mirror button toggle	2014-12-04 14:49:42 -08:00
Ryan Huffman	3bbee640fb	Make gamepad mirror button toggle	2014-12-04 14:48:03 -08:00
Brad Hefta-Gaub	227f5a498f	Merge pull request #3903 from huffman/gamepad-mirror ... Add button to gamepad.js to toggle mirror mode	2014-12-04 14:27:09 -08:00
Ryan Huffman	500b8a49d1	Add button to gamepad.js to toggle mirror mode	2014-12-04 14:17:24 -08:00
Brad Hefta-Gaub	b9ce5b0d0c	Merge pull request #3901 from huffman/gamepad-multi-speed ... Add multi-speed control to gamepad.js	2014-12-04 12:20:36 -08:00
Ryan Huffman	e3a34f6db0	Add multi-speed control to gamepad.js	2014-12-04 12:17:31 -08:00
Brad Hefta-Gaub	3a396b3256	Merge pull request #3900 from huffman/entity-tools-fix-rp-rotation ... Fix entity tool rotation to rotate around registration point	2014-12-04 11:41:22 -08:00
Ryan Huffman	1ee45e8bd1	Fix entity tool rotation to rotate around registration point	2014-12-04 11:24:56 -08:00
Brad Hefta-Gaub	cab1be25ed	Merge pull request #3899 from huffman/entity-tools-fix-registration-point ... Entity tools fix registration point	2014-12-04 11:04:27 -08:00
Ryan Huffman	1f82831bcc	Fix call to getRelativeCenterPosition	2014-12-04 10:47:09 -08:00
Clément Brisset	a7a7ad775e	Merge pull request #3896 from huffman/fix-entity-selection ... Fix entity tool selection when inactive	2014-12-04 10:39:42 -08:00
Ryan Huffman	acd5495b2a	Add getRelativeCenterPosition	2014-12-04 10:29:10 -08:00
Ryan Huffman	b2c5b19fd7	Remove print	2014-12-04 10:20:02 -08:00
Ryan Huffman	efdc8f5494	Fix stretch tools to work correctly with registrationPoint	2014-12-04 10:19:51 -08:00
Ryan Huffman	53f195eec4	Fix position of overlays when registrationPoint is not centered	2014-12-04 10:05:34 -08:00
Ryan Huffman	f48d304df0	Add registrationPoint to SelectionManager	2014-12-04 10:03:54 -08:00
Ryan Huffman	74acf9513b	Fix entity tool selection when inactive	2014-12-04 08:47:18 -08:00
Brad Hefta-Gaub	c901b8d1eb	Merge pull request #3895 from AndrewMeadows/thermonuclear ... fix for non-animating models	2014-12-03 17:26:00 -08:00
Andrew Meadows	ab011d5b30	fix for non-animating models	2014-12-03 16:49:49 -08:00
Brad Hefta-Gaub	96c3bfceef	Merge pull request #3889 from huffman/entity-tools-polish-2 ... Entity tools polish - round 2	2014-12-03 14:31:27 -08:00
Brad Hefta-Gaub	f10b656877	Merge pull request #3870 from AndrewMeadows/thermonuclear ... pull entity simulation out of EntityTree	2014-12-03 14:30:44 -08:00
Andrzej Kapolka	f76ff6a70a	Merge pull request #3894 from ey6es/master ... Bump up the glyph texture size so that we don't spill over into another	2014-12-03 14:19:55 -08:00
Andrzej Kapolka	df23a84cc2	Bump up the glyph texture size so that we don't spill over into another ... texture.	2014-12-03 14:18:47 -08:00
Philip Rosedale	5c59fc786d	Merge pull request #3893 from ey6es/master ... Fixes for erroneous download percentages (resources and metavoxels); warning fix, metavoxel edit fix.	2014-12-03 14:03:07 -08:00
Ryan Huffman	d08337326c	Update selection box color to red	2014-12-03 12:59:51 -08:00
Andrzej Kapolka	fecb225a06	Prevent erroneous resource download percentages; Qt reports the total bytes as ... -1 before the actual size is available.	2014-12-03 12:55:58 -08:00
Andrzej Kapolka	88048e8599	Make sure the position of the heightfield/voxel brush is valid before acting.	2014-12-03 12:47:32 -08:00
Andrzej Kapolka	d975e3f0ce	Fixed signed/unsigned warnign.	2014-12-03 12:38:10 -08:00
Andrzej Kapolka	1e93137e6b	Fix for overflow when computing metavoxel stats.	2014-12-03 12:24:58 -08:00
Stephen Birarda	f0b0c5fe0b	change warp button to button face right	2014-12-03 11:08:41 -08:00
Brad Hefta-Gaub	f70f07e694	Merge pull request #3890 from PhilipRosedale/master ... When in HMD, arrow keys make jump turns	2014-12-03 10:54:22 -08:00
Philip Rosedale	790d3c1cc6	Merge pull request #3892 from birarda/master ... fix filename/URL discrepancy for local scripts	2014-12-03 10:51:35 -08:00
Stephen Birarda	98f56aaa0c	fix URL/filename discrepancy for local scripts	2014-12-03 09:55:55 -08:00
Ryan Huffman	5c5c66b265	Merge branch 'master' of git://github.com/highfidelity/hifi into entity-tools-polish-2	2014-12-03 08:40:38 -08:00
Philip Rosedale	a549b4b152	Merge pull request #3891 from birarda/master ... fix for delayed domain-server heartbeats	2014-12-03 08:40:10 -08:00
Stephen Birarda	49a087018f	fix for delayed heartbeats, late socket lookup	2014-12-03 08:22:50 -08:00
Stephen Birarda	b346813250	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-12-03 08:03:23 -08:00
Philip Rosedale	d63ace9f61	fix angular velocity from oculus, tweak hair	2014-12-02 23:53:46 -08:00
Philip Rosedale	57e2f71bb7	remove unused body delta pitch, roll	2014-12-02 23:24:47 -08:00
Philip Rosedale	3ca20a7eee	Add jump/warp turning when in HMD	2014-12-02 23:08:34 -08:00
Ryan Huffman	4e78003520	Fix issue with selection boxes not being hidden	2014-12-02 18:03:00 -08:00
Ryan Huffman	f25d509363	Remove unused lastPlaneIntersection	2014-12-02 17:50:34 -08:00
Ryan Huffman	aa067bc153	Update UpDown translation to follow the mouse as other tools do	2014-12-02 17:49:25 -08:00
Ryan Huffman	c4ca7e1b18	Remove clearSelections from findClickedEntity - it shouldn't handle it	2014-12-02 16:01:40 -08:00
Ryan Huffman	30a7b60958	Update checkMove to only update rotation handles instead of all handles	2014-12-02 16:01:09 -08:00
Ryan Huffman	0fb0169ff2	Move baseOfEntityProjectionOverlay update to updateHandles()	2014-12-02 16:00:33 -08:00
Ryan Huffman	2f1ceb922a	Increase size of selection boxes	2014-12-02 15:59:56 -08:00
Ryan Huffman	2b5a4e4563	Add selection boxes in multi-selection mode	2014-12-02 15:56:43 -08:00
Ryan Huffman	77365ec282	Move entity selection to click event and add ability to deselect	2014-12-02 15:49:45 -08:00
Philip Rosedale	73d358b150	Merge pull request #3888 from PhilipRosedale/master ... Bug Fix: Hydra controllers sometimes moving constantly with hydraMove.js	2014-12-02 15:31:50 -08:00