20228 commits

Author	SHA1	Message	Date
samcake	c36035d3eb	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-09 10:46:38 -07:00
Andrew Meadows	e92e710cdc	Merge pull request #10413 from humbletim/fix_lookat_regression ... Fix lookAt eye snapping	2017-05-09 08:51:10 -07:00
humbletim	29b1ac3572	optimizations per feedback	2017-05-08 21:50:24 -04:00
humbletim	42d1498d20	call Model::updateRig (not Parent::updateRig)	2017-05-08 21:19:18 -04:00
Andrew Meadows	2835a73c6b	Merge pull request #10071 from AndrewMeadows/walk-up-steps ... avatar can walk up steps	2017-05-08 18:17:16 -07:00
humbletim	ef0e32643d	update refactored logic to match previous application behavior	2017-05-08 18:53:47 -04:00
David Rowe	116175cf9f	Fix going back from Twitter password recovery page	2017-05-09 09:03:48 +12:00
David Rowe	c8328e9b9f	Merge branch 'master' into 21319	2017-05-09 08:04:27 +12:00
Chris Collins	4bfb23b5d2	Merge pull request #10388 from humbletim/21308 ... CR #21308 Fix Script.print	2017-05-08 10:46:49 -07:00
Chris Collins	0351ac1575	Merge pull request #10401 from jherico/fix_benny_hill_animations ... Fix sped up animations	2017-05-08 09:11:23 -07:00
Sam Cake	d3724116d9	Using the items to pick the key light!	2017-05-08 00:20:20 -07:00
Brad Davis	b63015eaea	Fix sped up animations	2017-05-06 14:34:28 -07:00
Seth Alves	9e0845f17e	Merge pull request #10387 from vladest/tablet-performance ... Decrease CPU usage in tabletUI periodical updates	2017-05-06 07:07:29 -07:00
Chris Collins	820ed5049b	Merge pull request #10365 from sethalves/fix-dont-send-non-entity-edits-over-wire ... Fix -- dont send non-entity edits to entity-server	2017-05-05 16:37:27 -07:00
samcake	bc1e5101ac	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-05 16:13:51 -07:00
David Rowe	1b26ba22cb	Fix browser history in goto "i" pages on tablet	2017-05-06 11:13:13 +12:00
Zach Fox	6b00688289	Merge pull request #10392 from zfox23/AvailabilityLanguageChanges ... "Set Availability" UI changes	2017-05-05 14:03:39 -07:00
Zach Fox	a10606b994	OMG language changed again	2017-05-05 11:44:59 -07:00
Zach Fox	905f36976f	New language	2017-05-05 11:28:49 -07:00
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	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	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
samcake	327dac8a19	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-05 09:31:03 -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	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	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
samcake	df2c5b8c23	adding the notification for keyLight changes modifying the KeyLIghtPayoad	2017-05-04 18:28:12 -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
Howard Stearns	fc9e9e1d28	Merge pull request #10374 from howard-stearns/notification-circumstances ... Notification circumstances	2017-05-04 16:18:58 -07:00
Atlante45	ecda313223	Add runtime access to compression settings	2017-05-04 15:07:59 -07:00
howard-stearns	9954380ce3	don't filter out the place you're at anymore	2017-05-04 14:44:48 -07:00
humbletim	6cb95b2393	add and connect handlers for scriptWarningMessage and scriptInfoMessage signals	2017-05-04 17:43:00 -04:00
Brad Davis	9def788956	Merge pull request #10314 from jherico/avatars-renderer ... Migrate Avatar rendering code to library	2017-05-04 14:23:49 -07:00
Brad Davis	2d0bbf70ae	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
Anthony Thibault	7006fa6da4	Merge pull request #10257 from sethalves/grab-try-timer-instead-of-update ... grab is driven by timer rather than update, load tablet model with high priority	2017-05-04 14:07:21 -07:00
Vladyslav Stelmakhovskyi	ba5a371da1	Decrease CPU usage in tabletUI periodical updates	2017-05-04 22:54:41 +02:00