62931 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	7d2d8e7c05	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-12 09:25:44 -08:00
amantley	079d9639e4	Got rid of the while loop in updateFrameCount in ModelEntityItem_cpp	2017-12-12 09:12:11 -08:00
amantley	29538851b6	Made the changes from the latest code review, except getting rid of the ... while loop.	2017-12-12 09:06:43 -08:00
vladest	e052784431	Code style	2017-12-12 14:12:03 +01:00
David Rowe	380cd7aac6	Tune particle effects to be similar to before	2017-12-12 17:35:37 +13:00
David Rowe	4327906630	Reduce communications load when making a user connection	2017-12-12 16:39:49 +13:00
SamGondelman	ce96fa7078	change hysteresis values based on testing	2017-12-11 17:32:58 -08:00
Zach Fox	2225352b1e	Fix wallet setup	2017-12-11 17:15:15 -08:00
Seth Alves	b2c4cdc613	Merge pull request #11962 from AndrewMeadows/fix-avatar-mixer-crash-on-sort ... fix avatar-mixer crash during sort	2017-12-11 15:36:33 -08:00
SamGondelman	ae625306ff	remove getDedicatedMemory	2017-12-11 14:54:29 -08:00
Andrew Meadows	db6505493f	fix avatar-mixer crash: don't use global callback	2017-12-11 14:04:39 -08:00
David Rowe	58fa8b9fbf	Miscellaneous fixes	2017-12-12 10:49:05 +13:00
Howard Stearns	8e36228c12	Merge pull request #11948 from MandatoryMania/noFundsSymbol ... Provides a nice alert in case of insufficient funds to make a purchase	2017-12-11 11:45:27 -08:00
Andrew Meadows	74a1f5de96	remove bullet stats when physics stats disabled	2017-12-11 11:31:00 -08:00
Andrew Meadows	406bf7898d	cleanup prof stats and trace context names	2017-12-11 11:31:00 -08:00
Andrew Meadows	2538204b1e	expose physics simulation stats to Test JS API	2017-12-11 11:31:00 -08:00
Andrew Meadows	4540e9e483	add ability to save simulation stats to file	2017-12-11 11:31:00 -08:00
Andrew Meadows	fcff9d7e36	use class hierarchy instead of lambdas	2017-12-11 11:31:00 -08:00
Andrew Meadows	068d04c58d	abstraction of recursion through bullet perf stats	2017-12-11 11:31:00 -08:00
amantley	65bb896450	Merge remote-tracking branch 'origin/master' into character_entity_fixes	2017-12-11 10:55:54 -08:00
Zach Fox	2d786451c2	Add comment	2017-12-11 10:50:24 -08:00
Seth Alves	2cd64ccd2c	merge from upstream	2017-12-11 10:14:30 -08:00
Sam Gateau	0ff91e5926	Merge pull request #11952 from samcake/light ... Exposing multi highlight and selection feature to js api	2017-12-12 01:09:15 +07:00
Zach Fox	b81cdf49ef	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-11 09:52:32 -08:00
Zach Fox	006ea3342c	Merge pull request #11959 from zfox23/commerce_removeBuyEndpoint ... Remove useless Wallet.buy() scripting endpoint	2017-12-11 09:33:18 -08:00
samcake	63fb9b5503	fix float literal syntax	2017-12-11 09:30:31 -08:00
Clément Brisset	833f98b98b	Merge pull request #11920 from Atlante45/feat/reduce-memory-usage ... Reduce Image library memory usage	2017-12-11 09:29:22 -08:00
samcake	1008175a92	Removing commented code	2017-12-11 09:28:33 -08:00
samcake	b4f7433042	removing .f for a float in shader	2017-12-11 09:26:43 -08:00
vladest	e797f5cda0	Merge branch 'master' into tablet_home_paginate	2017-12-11 17:53:21 +01:00
vladest	cc78fc1f53	Added buttons list mutex protection. Reworked keyboard tablet navigation. no more double selections	2017-12-11 17:50:16 +01:00
amantley	7e49ce26d7	Merge remote-tracking branch 'origin/master' into character_entity_fixes ... updating branch to the master	2017-12-11 08:02:33 -08:00
Olivier Prat	b9d49318e7	Fixed bug which culled medium sized objects in shadow maps due to perspective frustum assumed octree selection	2017-12-11 12:19:10 +01:00
Sam Gateau	d1cd9f5c6b	adding correct support for the meta item fetch subItems for Overlays and specifically for ModelOverlay which fixes the highlight on Overlays	2017-12-11 02:21:09 -08:00
Sam Gateau	cc4b266647	Add names to objects of the selection, remove comments in shader and fix one more warning on linux	2017-12-11 00:31:54 -08:00
Olivier Prat	a679dc6705	Merge branch 'master' of git://github.com/highfidelity/hifi into csm	2017-12-11 08:48:48 +01:00
Sam Gateau	bb888f2d4c	Replace the name opacity for alpha	2017-12-10 23:07:06 -08:00
humbletim	4374b4f9a8	forward MIDI_CONTROL_CHANGE events	2017-12-11 00:39:23 -05:00
Sam Gateau	eec4e966a7	Fix the linux build and correct the name of the property Intensity to Opacity	2017-12-10 10:13:49 -08:00
Sam Gateau	429d54d65d	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-10 09:53:22 -08:00
divya	e187852df1	Merge pull request #11941 from huffman/feat/atp-baking-process ... Move asset server baking to a separate process	2017-12-09 20:48:14 -08:00
Alexander Ivash	cb471582e5	10334 Unable to type in Go To app search bar after UI reappears from moving Avatar	2017-12-10 01:34:03 +03:00
Zach Fox	8485503063	Merge pull request #11958 from humbletim/fix-pal-connections ... Fix for Connections UI lockup	2017-12-08 18:34:25 -08:00
Zach Fox	6f5028080b	Remove useless Wallet.buy() scripting endpoint	2017-12-08 18:23:23 -08:00
Ryan Huffman	65649fc331	Remove _outputDir from BakeAssetTask	2017-12-08 17:56:33 -08:00
Ryan Huffman	5cf2ab5cbd	Remove unnecessary logging on BakeAssetTask	2017-12-08 17:53:49 -08:00
Ryan Huffman	e3d00c4aa5	Remove unnecessary logging from PathUtils	2017-12-08 17:48:10 -08:00
Ryan Huffman	239877fc18	Remove _didFinish from BakeAssetTask	2017-12-08 17:47:57 -08:00
Ryan Huffman	50c47c785d	Fix BakeAssetTask not handling case where oven process is not found	2017-12-08 17:45:42 -08:00
Stephen Birarda	150494a595	Merge pull request #11956 from birarda/bug/npm-package-lock ... added package-lock file for server console, remove electron-compilers	2017-12-08 17:41:09 -08:00