66375 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Triplelexx	704499a76d	remove Limitless API	2018-04-09 18:22:48 +01:00
Sam Gateau	ae0af3ab62	Merge pull request #12823 from druiz17/fix-selection-api ... fix enableHighlightList and disableHihglightList function for Selection API	2018-04-06 15:13:15 -07:00
Dante Ruiz	00713ab225	fix selection api	2018-04-06 14:00:50 -07:00
Stephen Birarda	1d76dea9f6	Merge pull request #12818 from highfidelity/RC66 ... Merge back RC66 to master	2018-04-06 10:43:01 -07:00
John Conklin II	c8d109854b	Merge pull request #12800 from huffman/fix/entity-lock ... Remove lock file recovery in entity server	2018-04-06 10:04:34 -07:00
John Conklin II	55154b670a	Merge pull request #12801 from sethalves/fix-serverless-sharable ... fix -- don't tell steam about serverless domain urls	2018-04-06 10:04:03 -07:00
John Conklin II	384b0a0f41	Merge pull request #12804 from birarda/new-serverless-tutorial ... update to serverless tutorial with RC66 fixes	2018-04-06 10:03:03 -07:00
Stephen Birarda	2e3db99f7e	update to serverless tutorial with RC66 fixes	2018-04-05 17:17:00 -07:00
Howard Stearns	ad191defb8	Merge pull request #12799 from zfox23/snapshot_fixCrashOnUploadError ... Prevent Interface from crashing when a Snapshot upload fails	2018-04-05 13:51:33 -07:00
Seth Alves	8de545acdf	add new address accessor for 'public' addresses, use it for snapshot and stream	2018-04-05 13:39:51 -07:00
Zach Fox	ac2721fe6a	Logging improvements	2018-04-05 13:04:09 -07:00
Seth Alves	148007435e	update comment	2018-04-05 13:01:31 -07:00
Seth Alves	1de878eb9c	fix logic	2018-04-05 12:43:03 -07:00
Seth Alves	81ba875ad2	currentShareableAddress wont return file: urls. copy-current-address menu item uses non-shareable version	2018-04-05 12:39:49 -07:00
Ryan Huffman	010356709d	Remove lock file recovery in entity server ... * We no longer make backups at the ES, so there is no backup to recover from if we crash during persist to disk. * When loading the most recent backup we look for files that match our backup rules. If we have no backup rules we end up grabbing everything. * Because we grab everything, we are at risk of grabbing the lock file and treating it as a backup. In the case where we crash on persist, we end up replacing the models.json.gz file with the lock file (!!). This commit makes a small change to not do the recovery on startup. In a future update we will remove the backup-related code on the ES altogether.	2018-04-05 11:52:31 -07:00
Zach Fox	8e46ebf83b	Prevent Interface from crashing when a Snapshot upload fails	2018-04-05 11:27:26 -07:00
Sam Gateau	c27971eeed	Merge pull request #12792 from NissimHadar/addMDtoAutoTester ... Minor changes to autoTester	2018-04-05 11:08:14 -07:00
John Conklin II	9e21bab67e	Merge pull request #12748 from AndrewMeadows/untangle-003 ... cleanup around simulation-ownership	2018-04-05 10:58:45 -07:00
NissimHadar	b19fcc340d	Start test steps from 1 (not from 0).	2018-04-05 10:01:29 -07:00
John Conklin II	3bc764a020	Merge pull request #12793 from samcake/rc66-normalmaps ... RC66: Fixing the shader pipelines used for translucent with normal maps	2018-04-05 07:49:35 -07:00
John Conklin II	c8a0561e20	Merge pull request #12791 from sethalves/always-use-serverless-tutorial ... on first run, send user to serverless tutorial rather than checking for local sandbox	2018-04-05 07:28:43 -07:00
NissimHadar	2fbe6f9393	Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester	2018-04-04 18:39:05 -07:00
samcake	78053b8b48	Refix the normal map case foro translucents	2018-04-04 18:33:27 -07:00
Seth Alves	4b0d338e57	on first run, send user to serverless tutorial rather than checking for a local sandbox	2018-04-04 18:00:11 -07:00
NissimHadar	99a4bd65a0	Corrected message to user. ... Changed ::ReadWrite to ::WriteOnly when creating MD file.	2018-04-04 17:12:46 -07:00
John Conklin II	2e37b4a312	Merge pull request #12747 from Zvork/fade ... Update to Transitions debugging / editing script	2018-04-04 14:31:59 -07:00
John Conklin II	89127a06b3	Merge pull request #12714 from dback2/editUpDownArrowFix ... Fix Y arrow translation handle issues	2018-04-04 13:46:31 -07:00
Sam Gateau	4870ce1d76	Merge pull request #12771 from NissimHadar/addMDtoAutoTester ... Add .md creation to autoTester	2018-04-04 12:30:11 -07:00
John Conklin II	c3cad62bff	Merge pull request #12774 from howard-stearns/RC66-commerce-workaround-for-broken-qt5.10 ... Rc66 commerce workaround for broken qt5.10	2018-04-04 11:39:44 -07:00
NissimHadar	235996911a	Fixed gcc warning.	2018-04-04 11:38:14 -07:00
NissimHadar	bb0d4a66b6	Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester	2018-04-04 11:03:56 -07:00
John Conklin II	cba307f28b	Merge pull request #12762 from samcake/one ... Remove notifications and print outs when degrading LOD	2018-04-04 10:35:05 -07:00
NissimHadar	7a6b071e46	Merge branch 'master' of github.com:highfidelity/hifi into addMDtoAutoTester	2018-04-04 10:20:35 -07:00
Howard Stearns	3a428bc44f	Merge pull request #12776 from zfox23/fixHmdPreviewAgain_1 ... Fix 'Private' HMD preview texture enable/disable...again	2018-04-04 10:03:18 -07:00
Zach Fox	752246d950	Merge pull request #12760 from zfox23/inspection_rightClickTweaking ... Inspection: Tweak mouse-right-click-to-inspect behavior	2018-04-04 09:32:29 -07:00
Zach Fox	b641f87792	Merge pull request #12778 from zfox23/MS13792 ... Prevent Context Overlay from flashing when briefly hovering over certified entity	2018-04-04 09:31:33 -07:00
Seth Alves	a980361afc	Merge pull request #12706 from druiz17/baking ... adding python baking scripts	2018-04-04 09:08:31 -07:00
Seth Alves	2df334c50e	Merge pull request #12663 from ElderOrb/FB12870 ... Fix for not updating checkbox state on 'baking' / 'unbaking'.	2018-04-04 09:03:03 -07:00
Seth Alves	db82c464eb	Merge pull request #12741 from ctrlaltdavid/21816 ... Remove Entities.currentAvatarEnergy and related from the API	2018-04-04 08:07:46 -07:00
Andrew Meadows	f0fcfc432c	fix typo in comment	2018-04-03 22:16:10 -07:00
Andrew Meadows	d57cb0b5d7	use list.empty() instead of comparing list.size()	2018-04-03 22:15:57 -07:00
Andrew Meadows	6d7574cab9	use std::numeric_limtis<uint64_t>::max() instead of -1	2018-04-03 22:13:25 -07:00
Andrew Meadows	70d6aa99e8	more 'const uint64_t&' purges	2018-04-03 21:55:31 -07:00
Andrew Meadows	bd2bfb6807	DRY: simpler removal of element from middle of std::vector	2018-04-03 18:28:07 -07:00
Andrew Meadows	0a2b4a8d1d	add comment about returning smart pointer by ref	2018-04-03 18:26:43 -07:00
Anthony Thibault	00bec7310e	Merge pull request #12731 from hyperlogic/feature/log-exceptions-in-controller-js ... JavaScript exceptions during Controller system callbacks are now logged	2018-04-03 16:22:44 -07:00
Clément Brisset	3d4490f3fd	Merge pull request #12737 from highfidelity/RC66 ... RC66 mergeback	2018-04-03 15:39:16 -07:00
Zach Fox	5f47d51171	Prevent Context Overlay from flashing when briefly hovering over certified entity	2018-04-03 15:35:46 -07:00
howard-stearns	01d90ea1a5	Introduce safeLoading.	2018-04-03 13:49:09 -07:00
howard-stearns	f229e24e60	fix help.js noisy log reference to undefined string#startsWith	2018-04-03 13:48:51 -07:00