67479 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Bradley Austin Davis	521ae36cbf	Make resource swapchains immutable, fix for 14638	2018-05-01 16:07:23 -07:00
Stephen Birarda	0838381e4c	Merge pull request #13070 from SimonWalton-HiFi/getdomainlocalid-assert ... Prevent call of getDomainLocalID() by domain server itself more robustly	2018-05-01 15:45:37 -07:00
NissimHadar	a3e4fa8429	Corrected download of images.	2018-05-01 15:27:29 -07:00
Simon Walton	bbcb07d9ab	Brute force it with isDomainServer()	2018-05-01 15:07:44 -07:00
Zach Fox	d5f809c3c0	Actually fix	2018-05-01 14:49:44 -07:00
Zach Fox	d1bb37874d	Prevent crash in ImageProvider when tablet isn't yet initialized	2018-05-01 14:49:37 -07:00
Simon Walton	0627099667	In packetSourceAndHashMatchAndTrackBandwidth() check LocalID after check for DS source ... Makes check more robust in case domain server itself reaches this point, since LimitedNodeList::getDomainLocalID() debug-asserts.	2018-05-01 14:33:48 -07:00
David Rowe	0653f49efe	Remove deprecated location.domainId from API ... location.domainID is available, instead.	2018-05-02 09:31:24 +12:00
NissimHadar	b722c80b3f	WIP	2018-05-01 14:25:33 -07:00
Stephen Birarda	f5441c05b3	Merge branch 'master' of github.com:highfidelity/hifi into 67-to-master	2018-05-01 14:18:24 -07:00
Stephen Birarda	cad63ad107	Revert "Revert "HOTFIX version of PR 12969: Attempt to shutdown web surfaces more consistently"" ... This reverts commit acb21cc96a.	2018-05-01 14:15:12 -07:00
Ryan Huffman	12d4cf12cf	Bump model and texture baking versions in AssetServer	2018-05-01 14:11:50 -07:00
Ryan Huffman	24ac342c6b	Add support for client texture selection	2018-05-01 14:11:31 -07:00
NissimHadar	e9d28cf275	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-01 13:26:58 -07:00
John Conklin II	382802375d	Merge pull request #13057 from misslivirose/fix/edit-create-grabbable ... Remove 'Create Items as Grabbable' Menu item in cleanup for edit	2018-05-01 13:15:27 -07:00
David Rowe	1aa28b7f54	Merge remote-tracking branch 'upstream/master' into 21856-d ... # Conflicts: # interface/src/LODManager.h	2018-05-02 07:50:55 +12:00
John Conklin II	a5753c6d94	Merge pull request #13064 from birarda/66-2-to-67 ... merge changes in 66.2 to 67	2018-05-01 12:50:01 -07:00
John Conklin II	250aa3ab43	Merge pull request #13027 from jherico/fix/web_crash2 ... Some fixes for QML surfaces	2018-05-01 12:39:46 -07:00
MiladNazeri	3bb09024ec	Merge pull request #13058 from ctrlaltdavid/21856-e ... Fix LODManager JSDoc	2018-05-01 12:25:37 -07:00
Zach Fox	c42b13134f	Merge pull request #13063 from zfox23/preventImageProviderCrash ... Fix a crash in Image Provider when logging in or reloading all scripts	2018-05-01 11:55:15 -07:00
John Conklin II	c3e531dda1	Merge pull request #13062 from sethalves/fix-physics-crash-on-exit ... fix physics related crash-on-exit	2018-05-01 11:04:50 -07:00
Stephen Birarda	24dc1c930e	Merge branch 'RC66.2' of github.com:highfidelity/hifi into 66-2-to-67	2018-05-01 10:54:35 -07:00
Brad Hefta-Gaub	2d2980c8f2	Merge pull request #13061 from ctrlaltdavid/21856-f ... JSDoc Entity preload, unload, startFarTrigger, etc.	2018-05-01 10:08:04 -07:00
Zach Fox	cd76336e6a	Actually fix	2018-05-01 09:54:23 -07:00
luiscuenca	2ac7fcadd2	load scripts once on rigReady	2018-05-01 09:37:01 -07:00
NissimHadar	97152ef9c1	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-01 09:33:07 -07:00
Seth Alves	f1e1c6a348	fix physics related crash-on-exit	2018-05-01 09:15:44 -07:00
David Rowe	2482da3c25	Miscellaneous JSDoc fixes noticed in passing	2018-05-01 21:55:45 +12:00
David Rowe	65f5915372	Add JSDoc for startFarTrigger etc. calls on entity scripts	2018-05-01 21:55:27 +12:00
David Rowe	a1fc1c4810	Add JSDoc for Entity preload and unload signals	2018-05-01 21:55:14 +12:00
Brad Hefta-Gaub	30e808e133	Merge pull request #13056 from birarda/bug/local-ID-missed-erase ... RC67: add a missing unsafe_erase for local node ID map	2018-04-30 19:12:03 -07:00
NissimHadar	d5610a2f37	WTF...	2018-04-30 17:52:44 -07:00
NissimHadar	c01fd02de2	Corrected parameter type.	2018-04-30 17:23:49 -07:00
NissimHadar	6d8eee6b32	Merge branch 'commandLineParametersForAutotester' of github.com:NissimHadar/hifi into commandLineParametersForAutotester	2018-04-30 17:19:29 -07:00
Zach Fox	f69ee41074	Prevent crash in ImageProvider when tablet isn't yet initialized	2018-04-30 17:13:44 -07:00
Ken Cooke	09ef338baf	Merge pull request #13050 from sethalves/fix-linux-debug-build ... fix Linux debug builds	2018-04-30 16:49:28 -07:00
David Rowe	f9bda6df15	Fix LODManager JSDoc	2018-05-01 11:36:37 +12:00
luiscuenca	50ca09b3b4	minor fixes	2018-04-30 16:26:04 -07:00
Clement	f3fe1f3e58	Force crash helpers not inlined	2018-04-30 15:54:08 -07:00
Ryan Huffman	73cea112ee	Update FilePersistThread to use std::chrono instead of usecTimestampNow	2018-04-30 14:13:59 -07:00
Liv Erickson	7db07db9e2	remove menu item at cleanup	2018-04-30 13:55:01 -07:00
Atlante45	250806252e	Don't use unique_ptr to store CrashpadClient	2018-04-30 12:37:18 -07:00
Atlante45	5ab16302ca	Keep CrashpadClient around	2018-04-30 12:36:17 -07:00
Stephen Birarda	ed47cd8458	add a missing unsafe_erase for local node ID map	2018-04-30 12:35:48 -07:00
luiscuenca	2de982a5a2	Added script types and better script reload	2018-04-30 12:04:35 -07:00
Liv Erickson	b994776ebd	do not open help on first run	2018-04-30 12:01:37 -07:00
Zach Fox	9b80c500e3	Merge pull request #13039 from zfox23/sideloadAppJson ... Enable sideloading .app.json Apps from local disk	2018-04-30 11:14:24 -07:00
John Conklin II	bc7b0ca0a9	Merge pull request #13029 from birarda/bug/revert-12969-in-67 ... Fix missed revert of PR 12969 for RC67	2018-04-30 11:11:38 -07:00
MiladNazeri	a2e2b2cb8c	Merge pull request #13047 from ctrlaltdavid/21856-b ... Fix JSDoc for Entities.findEntitiesByName	2018-04-30 11:00:35 -07:00
Anthony Thibault	f520abc6f9	Merge pull request #13048 from ctrlaltdavid/21856-c ... Fix and reorder custom JSDoc tags	2018-04-30 10:22:37 -07:00