24547 commits

Author	SHA1	Message	Date
Atlante45	6dd49f5c32	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2017-10-10 16:53:34 -07:00
Atlante45	cea0f48e5c	Fix warnings	2017-10-10 15:19:09 -07:00
Sam Gateau	f143c28625	Merge pull request #11542 from SamGondelman/bubbleBoy ... Move HUD and HUD overlay rendering out of display plugin	2017-10-10 14:26:20 -07:00
Sam Gateau	c44efda978	Merge pull request #11349 from Zvork/hdrcube ... Under the hood support for HDR cube maps	2017-10-10 11:43:41 -07:00
Clément Brisset	3b48833cc0	Merge pull request #11451 from huffman/feat/upload-user-event ... Add uploading to asset server event	2017-10-10 11:03:33 -07:00
Olivier Prat	db9a9e723c	Merged with master	2017-10-10 12:11:23 +02:00
Seth Alves	559f229bd1	Merge pull request #11552 from SamGondelman/animationMaster ... Cherry-pick "Model asks for renderUpdate if animating" into master	2017-10-09 17:57:19 -07:00
SamGondelman	ee02fa9a91	model asks for renderUpdate if animating ... (cherry picked from commit 873ae9b9d6)	2017-10-09 13:55:48 -07:00
SamGondelman	873ae9b9d6	model asks for renderUpdate if animating	2017-10-09 13:36:38 -07:00
SamGondelman	3acbd7820b	build error	2017-10-09 11:48:54 -07:00
Andrew Meadows	0bcecdbe66	be picky when finding nearby entities at login	2017-10-09 10:27:46 -07:00
Bradley Austin Davis	c92588685b	Merge pull request #11533 from SamGondelman/modelMaster ... Fix model loading for real this time	2017-10-08 10:23:13 -07:00
Seth Alves	28a8b18060	Revert "fix importing of avatar entities"	2017-10-07 16:54:05 -07:00
Brad Hefta-Gaub	62fc193bff	Merge pull request #11532 from sethalves/import-av-entities ... fix importing of avatar entities	2017-10-06 17:59:54 -07:00
Brad Hefta-Gaub	80f0bd3b79	Merge pull request #11494 from humbletim/add-console-output-basenames ... [experiment/feedback] Include script name with all JS/QML debug output	2017-10-06 17:58:19 -07:00
SamGondelman	b4a3ab9204	fix debugDeferredLighting	2017-10-06 15:46:10 -07:00
SamGondelman	e95ecc3f27	fix missing sensorToWorld matrix	2017-10-06 15:37:23 -07:00
SamGondelman	7e6d5d9d98	merge with master	2017-10-06 14:57:08 -07:00
Seth Alves	9064114ce5	fix mistaken logic-flip in recent PR	2017-10-06 11:03:48 -07:00
Seth Alves	195d96bd43	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-06 11:02:35 -07:00
Seth Alves	f4dedf05bb	move variables into block that needs them	2017-10-06 11:02:26 -07:00
Ryan Huffman	9c06afc4c8	Merge pull request #11326 from cain-kilgore/21537 ... WL 21537 - Improve log naming	2017-10-06 08:51:42 -07:00
Seth Alves	8d00731620	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-06 07:20:34 -07:00
Chris Collins	c8301890e6	Merge pull request #11530 from kencooke/audio-mac-bugfix ... Fix microphone audio on the Mac	2017-10-05 15:57:56 -07:00
SamGondelman	601b30f062	fix flash when switching display modes	2017-10-05 15:31:45 -07:00
SamGondelman	a6b7578c3c	start fixing asynch issue, fixes model loading!	2017-10-05 12:30:00 -07:00
Seth Alves	b96fac2f00	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-05 11:43:25 -07:00
Seth Alves	53a49272dc	fix importing of avatar-entities	2017-10-05 11:43:19 -07:00
Cain Kilgore	b3c3b2d34f	Switched Time & Session ID Over	2017-10-05 19:42:31 +01:00
Ken Cooke	8822b1bfa4	Minor cleanup	2017-10-05 09:49:38 -07:00
Ken Cooke	82d13090f9	Better comments	2017-10-05 09:28:30 -07:00
Ken Cooke	d8341a0929	Work around compiler optimization bug	2017-10-05 09:27:07 -07:00
Ryan Huffman	de2c1aabac	Add removal of temporary files in FBXBaker	2017-10-05 09:08:42 -07:00
Ken Cooke	218de29356	disable compiler optimization as temporary fix	2017-10-05 07:39:21 -07:00
Sam Gateau	25dae2f24e	Merge pull request #11499 from samcake/blue ... Moving Camera update and render frame to Game Loop (Main thread)	2017-10-04 18:42:02 -07:00
Sam Gateau	02bcbe6d5f	Merge pull request #11512 from AndrewMeadows/more-profile-details ... expose performance hot spot in stats details	2017-10-04 18:34:19 -07:00
SamGondelman	3a6e84e681	trying to fix model issue	2017-10-04 17:26:12 -07:00
SamGondelman	215193ad90	try to improve performance ... (cherry picked from commit a5f5f9fc5d)	2017-10-04 13:50:35 -07:00
SamGondelman	a5f5f9fc5d	try to improve performance	2017-10-04 12:05:13 -07:00
SamGondelman	477dfdff1e	wip hud layering and fix crashes	2017-10-04 11:45:21 -07:00
samcake	d7333d3fa3	Merging with master	2017-10-04 10:55:38 -07:00
Brad Hefta-Gaub	a1979a2600	Merge branch 'master' into RC-56	2017-10-03 18:16:21 -07:00
Seth Alves	75d2a2bd47	Merge pull request #11517 from SamGondelman/registration ... Fix entities with registration points rendering in the wrong place	2017-10-03 16:09:27 -07:00
SamGondelman	fa838e4715	merge from master	2017-10-03 15:53:33 -07:00
SamGondelman	fc6e5df2cb	fix text/web registration point usage	2017-10-03 15:02:21 -07:00
SamGondelman	c9d2d40e1e	possibly fix registration offset issue	2017-10-03 14:44:11 -07:00
Seth Alves	6040c4a3e8	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-03 14:06:01 -07:00
Anthony Thibault	2dc080479c	Merge pull request #11513 from hyperlogic/bug-fix/set-compund-shape-url-deadlock ... Bug fix for deadlock in ModelEntityItem::setCompundShapeURL()	2017-10-03 13:31:01 -07:00
Seth Alves	05e173a1d0	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-03 13:11:03 -07:00
SamGondelman	a6f2545511	fix local t pose	2017-10-03 12:51:37 -07:00