19296 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Ryan Huffman	f48d304df0	Add registrationPoint to SelectionManager	2014-12-04 10:03:54 -08:00
Ryan Huffman	d08337326c	Update selection box color to red	2014-12-03 12:59:51 -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
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
Philip Rosedale	8c506c0301	Merge pull request #3887 from samcake/tot ... Hack for the Viking Palace scene before demo for good looking lightmaps	2014-12-02 15:31:15 -08:00
Ryan Huffman	167ab05de4	Default 'Allow Select Large/Small Models' to true	2014-12-02 15:19:51 -08:00
Philip Rosedale	06b22cf605	...and don't turn on/off UI from hydra	2014-12-02 14:50:25 -08:00
Philip Rosedale	1ce201c04f	add same for rotation	2014-12-02 14:33:19 -08:00
Philip Rosedale	2f11501e5b	Fix constant movement with hydra by adding null zone for thrust	2014-12-02 14:28:46 -08:00
Sam Gateau	8b75272cde	Merge branch 'master' of https://github.com/highfidelity/hifi into tot	2014-12-02 13:49:28 -08:00
Sam Gateau	40df497374	Hack for the Viking Palace scene before demo for good looking lightmaps	2014-12-02 13:48:59 -08:00
Andrzej Kapolka	b613511b74	Merge pull request #3886 from ey6es/master ... At least on Linux, fixes an annoying issue where closing the application	2014-12-02 13:24:03 -08:00
Andrzej Kapolka	4d233c09a3	At least on Linux, fixes an annoying issue where closing the application ... window causes it to disappear and reappear briefly before exiting.	2014-12-02 13:19:39 -08:00
Ryan Huffman	89b3a4d987	Fix selection shadow not updating when grid moves	2014-12-02 12:17:10 -08:00
Brad Hefta-Gaub	22bee75f7f	Merge pull request #3885 from birarda/double-scripts ... fix for ScriptEngine blocked load	2014-12-02 11:19:28 -08:00
Stephen Birarda	0a92374ca6	fix an incorrect connection to script load error	2014-12-02 10:39:20 -08:00
Stephen Birarda	d7f168999d	don't block main thread for a script load	2014-12-02 10:30:23 -08:00
Brad Hefta-Gaub	9d213f9fb7	Merge pull request #3884 from huffman/entity-tools-polish ... Entity tools polish	2014-12-02 10:21:20 -08:00
Brad Hefta-Gaub	f379d63182	Merge pull request #3882 from ctrlaltdavid/vs2013-build-instructions ... Update build instructions for VS2013 Community and Professional	2014-12-02 10:20:16 -08:00
Brad Hefta-Gaub	3f87287870	Merge pull request #3881 from ctrlaltdavid/find-vs2013-libovr ... Find Oculus libraries when using Visual Studio 2013	2014-12-02 10:19:53 -08:00
Brad Hefta-Gaub	7f8f57b055	Merge pull request #3879 from birarda/master ... fix for ice-server heartbeat without an access token, hifi:// URL	2014-12-02 10:19:12 -08:00
Stephen Birarda	36f716cd61	have script loading be separate from ScriptEngine constructor	2014-12-02 10:13:43 -08:00
Stephen Birarda	2a9c8c5ed9	Merge branch 'master' of https://github.com/highfidelity/hifi	2014-12-02 09:25:21 -08:00
Ryan Huffman	9d9a7ead5b	Remove unnecessary overlay property updates	2014-12-01 16:39:36 -08:00
Ryan Huffman	a8eb49a822	Remove now-unused *Offset variables	2014-12-01 16:38:40 -08:00
Ryan Huffman	0b7ddb009d	Fix tabification of tool windows	2014-12-01 16:33:51 -08:00
Ryan Huffman	ce4d407378	Update normalizeDegrees to be exclusive on the -180 end	2014-12-01 16:12:18 -08:00
Ryan Huffman	06ab17987b	Fix position of rotation degrees display ... The position of the display was not always correct depending on the camera orientation relative to the selection.	2014-12-01 16:08:50 -08:00
Ryan Huffman	4f0683dc5e	Fix stretch tools not following mouse correctly	2014-12-01 15:07:03 -08:00
Ryan Downe Karpf	ea62194057	Merge pull request #3883 from samcake/fbx ... Adding a filter on the apartment model to get better lightmaps	2014-12-01 13:17:29 -08:00
dev	21d3892094	Merge branch 'master' of https://github.com/highfidelity/hifi into fbx	2014-12-01 13:03:18 -08:00
Ryan Huffman	da568c96ce	Add rotation degrees overlay	2014-12-01 12:24:51 -08:00
Ryan Huffman	fc5adef501	Update the tool window to use tabbed windows	2014-12-01 12:24:40 -08:00
Ryan Huffman	2c524cd70c	Darken colors of selection/highlight boxes	2014-12-01 12:24:34 -08:00
Ryan Huffman	1950ce5a4b	Add option for white grid color	2014-12-01 12:24:24 -08:00
Philip Rosedale	b0877414a4	Merge pull request #3880 from ZappoMan/bugFixes ... oculus mirror lean hack	2014-12-01 12:01:20 -08:00
Sam Gateau	845e687fc5	Adding a Hack for the apaartment model to boost the lightmaps	2014-12-01 11:45:07 -08:00
David Rowe	09eb150edc	Update build instructions for VS2013 Community and Professional	2014-12-01 11:40:35 -08:00