17392 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	5bd5fc43d3	Merge pull request #8408 from SamGondelman/miniMirrorFade ... Mini mirror fades with overlays	2016-08-10 11:07:47 -07:00
Brad Hefta-Gaub	a714f325fe	Merge pull request #8333 from SamGondelman/miscFixes ... Miscellaneous cmake and render engine improvements	2016-08-10 11:06:50 -07:00
Brad Hefta-Gaub	7503a495fd	Merge pull request #8401 from ctrlaltdavid/21026 ... Fix crash when adding new attachment	2016-08-10 09:18:17 -07:00
SamGondelman	50a4c8b496	mini mirror fades with overlays	2016-08-09 18:02:56 -07:00
Brad Hefta-Gaub	412052c285	Merge pull request #8380 from highfidelity/fade ... Add fade in loading effect	2016-08-09 16:50:05 -07:00
Brad Hefta-Gaub	8abbe27c07	Merge pull request #8387 from SamGondelman/mappingFixes ... Fix Standard.A/B/X/Y primary thumb JSON mappings	2016-08-09 16:43:45 -07:00
David Rowe	8e56e0bf18	Fix QML warning	2016-08-10 10:41:37 +12:00
SamGondelman	9b27f8bc0f	Merge remote-tracking branch 'upstream/master' into loadingFade	2016-08-09 14:55:14 -07:00
Brad Hefta-Gaub	1834b035d7	Merge pull request #8382 from ctrlaltdavid/21024 ... Disable Asset Browser's right-click popup menu if in HMD mode	2016-08-09 12:41:48 -07:00
Brad Hefta-Gaub	d8f1847fde	Merge pull request #8365 from huffman/feat/default-skybox ... Default skybox change	2016-08-09 11:17:36 -07:00
Brad Hefta-Gaub	d8edf5c85a	Merge pull request #8357 from sethalves/fsm-arrows-dont-walk ... FSM arrow keys don't make the avatar walk	2016-08-09 11:17:00 -07:00
Ryan Huffman	8ee3f680c9	Change default skybox ambient intensity from 3.5 to 2.0	2016-08-08 16:03:03 -07:00
Ryan Huffman	6854f9fda4	Remove stars shaders and renderable	2016-08-08 16:03:03 -07:00
Ryan Huffman	eaa77edc25	Replace 'Stars' menu option with 'Default Skybox'	2016-08-08 16:03:03 -07:00
Ryan Huffman	9cbfe195cd	Adjust commenting out of old stars rendering code	2016-08-08 16:03:03 -07:00
Ryan Huffman	4c662b0d60	Add static consts for default skybox values	2016-08-08 16:03:03 -07:00
Ryan Huffman	c47a5c5aad	Add default skybox images	2016-08-08 16:03:03 -07:00
Ryan Huffman	5b69ca03f0	Move default skybox out of global and make irradiance gen optional	2016-08-08 16:03:03 -07:00
Ryan Huffman	35ea9908cd	Add default skybox	2016-08-08 16:00:58 -07:00
Brad Hefta-Gaub	55c690d016	Merge pull request #8368 from huffman/feat/domain-connection-display ... Automatically show address bar after disconnected for X seconds	2016-08-08 15:56:29 -07:00
SamGondelman	328d3128fa	merge from master	2016-08-08 13:30:39 -07:00
SamGondelman	a5f3089fda	fix ABXY mapping for touch	2016-08-08 13:14:14 -07:00
Ryan Huffman	fb14628a7e	Handle case in entity loading priority function where max dim size is <= 0	2016-08-08 10:39:27 -07:00
Ryan Huffman	d367583426	Clean up priority loading implementation	2016-08-08 08:53:06 -07:00
Ryan Huffman	d48bc96cf9	Add ability to set number of concurrent downloads	2016-08-08 08:53:06 -07:00
Ryan Huffman	4f9be2ae72	Fix camera position not being set for angular loading	2016-08-08 08:53:06 -07:00
Seth Alves	38314b180b	Merge branch 'master' of github.com:highfidelity/hifi into fsm-arrows-dont-walk	2016-08-08 06:30:18 -07:00
David Rowe	38b5314322	Disable Asset Browser's right-click popup menu if in HMD mode	2016-08-06 17:53:59 +12:00
SamGondelman	771e105fa2	Merge remote-tracking branch 'upstream/master' into loadingFade	2016-08-05 16:52:01 -07:00
Chris Collins	1e2d77a99b	Merge pull request #8346 from sethalves/default-when-av-fails ... use default avatar when avatar-url is bogus	2016-08-05 15:13:58 -07:00
Brad Hefta-Gaub	82119f7f0b	Merge pull request #8336 from ctrlaltdavid/21018 ... close file browser dialog immediately after selecting asset to upload	2016-08-05 14:39:35 -07:00
Seth Alves	84ce29eb90	Merge branch 'master' of github.com:highfidelity/hifi into fsm-arrows-dont-walk	2016-08-05 10:44:46 -07:00
Ryan Huffman	d775a92dab	Update implementation of ConnectionMonitor timeout	2016-08-04 14:45:10 -07:00
Ryan Huffman	26b9da7eef	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-connection-display	2016-08-04 14:41:03 -07:00
Ryan Huffman	a37bcdafda	Remove debug logging in ConnectionMonitor	2016-08-04 14:40:41 -07:00
Ryan Huffman	8044910bf2	Add show-address-bar when disconnected from domain	2016-08-04 14:39:53 -07:00
SamGondelman	b6e73e06a2	merge from master	2016-08-04 13:34:38 -07:00
Seth Alves	905c6147cf	Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails	2016-08-04 09:56:32 -07:00
Chris Collins	2473bbf1db	Merge pull request #8313 from imgntn/tweak_lazers ... Tweak Teleport + Hand Lasers	2016-08-03 16:40:28 -07:00
Philip Rosedale	98e40d54e1	Merge pull request #8355 from SamGondelman/touchDeadZone ... Added dead zones to Hydra and Oculus Touch joysticks	2016-08-03 15:17:15 -07:00
James B. Pollack	7a41ed25db	Merge remote-tracking branch 'upstream/master' into tweak_lazers	2016-08-03 14:59:51 -07:00
Seth Alves	40a5e4abc8	in full-screen mirror camera mode, arrow keys move camera but don't make the avatar walk	2016-08-03 13:54:25 -07:00
SamGondelman	2eb0c7735f	working on fading shape entities	2016-08-03 13:30:05 -07:00
Seth Alves	ad4fc8c656	merge from upstream, don't hold up enabling of physics if a collision hull fails to load	2016-08-03 10:42:15 -07:00
SamGondelman	458e43fadc	added dead zones to hydras, style fixes	2016-08-03 10:18:57 -07:00
Brad Hefta-Gaub	70cb3d3393	Merge pull request #8354 from AlexanderOtavka/remove-web-debug ... Remove url change debug info for WebView	2016-08-03 09:10:10 -07:00
Seth Alves	cc7322a0de	Merge pull request #8334 from ctrlaltdavid/21015 ... refresh file dialog when directory content changes	2016-08-03 08:11:40 -07:00
Seth Alves	7e94d4c694	Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails	2016-08-02 19:34:17 -07:00
James B. Pollack	88ebeaa4cb	start no movement mode. using actual keys since avatar speed doesnt work with gtting stuck	2016-08-02 18:46:47 -07:00
SamGondelman	1ce7623f41	added deadzones to oculus touch movements	2016-08-02 18:19:58 -07:00