54634 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
howard-stearns	2ecc71a990	Annoncement Card visual tweeks.	2017-05-05 10:49:09 -07:00
Zach Fox	b41fb952ae	UI changes - Thanks Alan!	2017-05-05 10:29:46 -07:00
Chris Collins	fd836dcd68	Merge pull request #10366 from Atlante45/feat/normal-map-compression ... Feat/normal map compression	2017-05-05 10:03:01 -07:00
Chris Collins	8d49540f3a	Merge pull request #10380 from vladest/rightclick-fix ... Rightclick fix	2017-05-05 10:01:11 -07:00
Andrew Meadows	2bfbb63906	remove unused variable	2017-05-05 09:37:01 -07:00
Andrew Meadows	8ed93783bd	fix step up velocity calculation	2017-05-05 09:37:01 -07:00
Andrew Meadows	cd7be46b70	tweak threshold for minimum stepheight	2017-05-05 09:37:01 -07:00
Andrew Meadows	6e8d90e3b6	restore clear of follow accumulators	2017-05-05 09:37:01 -07:00
Andrew Meadows	63042eea3a	fix flawed fix of bad rebase	2017-05-05 09:37:00 -07:00
Andrew Meadows	41ad25ade1	fix bad rebase of changed menu option	2017-05-05 09:37:00 -07:00
Andrew Meadows	fe401c7488	improved management of collisionless avatar state	2017-05-05 09:37:00 -07:00
Andrew Meadows	95a4bb9ef4	fix transition height from hover to stand	2017-05-05 09:35:49 -07:00
Andrew Meadows	e449c48888	remove one more line of cruft	2017-05-05 09:35:49 -07:00
Andrew Meadows	d34b667e82	remove kinematic character controller implemention	2017-05-05 09:35:49 -07:00
Andrew Meadows	0aa579225c	even more correct API: MyAvatar.collisionsEnabled	2017-05-05 09:35:49 -07:00
Andrew Meadows	559f5836c5	restore MyAvatar.setCharacterControllerEnabled()	2017-05-05 09:35:49 -07:00
Andrew Meadows	94ee6d6838	fix driving motion of collisionless avatars	2017-05-05 09:35:49 -07:00
Andrew Meadows	c47e26174c	support collisionless avatar when playing recording	2017-05-05 09:35:49 -07:00
Andrew Meadows	e21bd7a67a	help avatar walk up steps	2017-05-05 09:35:49 -07:00
Andrew Meadows	a31a861e19	fix typo: physcis --> physics	2017-05-05 09:33:50 -07:00
Andrew Meadows	f809afae2f	Merge pull request #10363 from jherico/qmlspam ... Removing logspam on toggling scripts window	2017-05-05 08:29:12 -07:00
humbletim	25807a5258	fix warning color	2017-05-05 09:48:24 -04:00
David Rowe	88dc6b5f61	Fix tablet Web view "back" button not greying out when disabled	2017-05-05 17:24:36 +12:00
Vladyslav Stelmakhovskyi	e395a51c60	Merge with master	2017-05-05 07:05:16 +02:00
Seth Alves	7f4399b0a3	fix name in entity-edit-an-overlay warning	2017-05-04 19:16:15 -07:00
Seth Alves	9ee6badc86	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 19:06:13 -07:00
Seth Alves	92966377fb	Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 19:05:57 -07:00
Seth Alves	900fae30fd	avoid calling editEntity on overlays	2017-05-04 19:05:52 -07:00
Seth Alves	a7c684e007	entity scripting call to get the nestable-type of an object, by id	2017-05-04 19:05:29 -07:00
Seth Alves	51cb579773	function to turn nestable-type into a string	2017-05-04 19:05:01 -07:00
Seth Alves	70efe4aa4f	avoid calling editEntity on overlays	2017-05-04 18:52:17 -07:00
Seth Alves	d25db099b9	be more effecient about ignoring edits to unknown entities	2017-05-04 18:49:46 -07:00
Seth Alves	0406cc41e0	if model-overlay has no name, use its url	2017-05-04 18:37:04 -07:00
Seth Alves	c04c0c5b13	if model-overlay has no name, use its url	2017-05-04 18:36:51 -07:00
Howard Stearns	d9540d7ece	Merge pull request #10390 from zfox23/newSnapshotReview_Improvements3 ... Lots of Snapshot app improvements, Round Three	2017-05-04 17:05:37 -07:00
Seth Alves	960bab6e4e	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 16:42:57 -07:00
humbletim	c17d1a6d88	manually promote glm values to double when stringifying (to prevent -Wdouble-promotion "error")	2017-05-04 19:21:32 -04:00
Howard Stearns	fc9e9e1d28	Merge pull request #10374 from howard-stearns/notification-circumstances ... Notification circumstances	2017-05-04 16:18:58 -07:00
Zach Fox	6a33ef49c2	New language for unshareable snaps	2017-05-04 16:17:33 -07:00
Zach Fox	2ad3346697	Are there bugs?	2017-05-04 16:05:20 -07:00
Stephen Birarda	1857b297e0	don't re-grab the machine fingerprint every DS connection	2017-05-04 16:00:46 -07:00
Stephen Birarda	f39411656a	use machine GUID from registry for machine ID	2017-05-04 16:00:46 -07:00
Clément Brisset	d80704bfbf	Merge pull request #10375 from Atlante45/feat/store-irradiance ... Store irradiance in cached KTX files	2017-05-04 16:00:44 -07:00
humbletim	f9d29256e0	use an actual Uuid value for the Uuid.print test	2017-05-04 18:58:30 -04:00
Chris Collins	7c36dd3282	Merge pull request #10359 from samcake/ambient ... Fixing the by region update transfer of the compressed texture	2017-05-04 15:52:38 -07:00
Chris Collins	98085b6d26	Merge pull request #10386 from ZappoMan/MyAvatarAttachmentsNotVisibleBug ... fix issue with not seeing your own attachments	2017-05-04 15:51:46 -07:00
Chris Collins	7d1ffe181f	Merge pull request #10340 from huffman/fix/obj-atp ... Fix OBJ material loading not working over ATP	2017-05-04 15:50:52 -07:00
Andrew Meadows	f11d6eff92	fix typos: RenderItemsMap not RenderItems	2017-05-04 15:43:44 -07:00
humbletim	f71552c648	* update Vec3.print, Quat.print, Mat4.print, ScriptUUID.print to work with JSConsole and HMD-friendly script log ... * add test output for Quat-euler and Mat4-row/col prints	2017-05-04 18:33:49 -04:00
Zach Fox	946c5e7662	Almost finished with not-logged-in and not-shareable	2017-05-04 15:24:51 -07:00