51824 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Atlante45	36dc2dc49d	Compute spine length on skeleton load	2017-02-27 16:38:56 -08:00
Atlante45	e9316d30d0	More IK smoothing experimentation	2017-02-27 16:38:56 -08:00
Atlante45	834755588a	Reset sensors and body	2017-02-27 16:38:56 -08:00
Atlante45	68e3e23bfc	Remove Avatar parenting to chair	2017-02-27 16:38:56 -08:00
Atlante45	cbaaaa21c6	Use head orientation for sitting	2017-02-27 16:38:56 -08:00
Atlante45	0629c6dbf7	Cancel body pitch/roll when getting out of the chair.	2017-02-27 16:38:56 -08:00
Atlante45	e503542b6a	Fix transform computation	2017-02-27 16:38:55 -08:00
Atlante45	0440e2fd60	Set higher tolerance	2017-02-27 16:38:55 -08:00
Ryan Huffman	f5f7cc5266	Fix teleport seat beam color to match model	2017-02-27 16:38:55 -08:00
Ryan Huffman	aa94106229	Update teleport to sit in invisible seats	2017-02-27 16:38:55 -08:00
Atlante45	8c232b5abb	Initialize max offset to infinity	2017-02-27 16:38:55 -08:00
Atlante45	bf3a69a0b3	Add 2D UI when close to the seat	2017-02-27 16:38:55 -08:00
Atlante45	187cd0d5cf	Get IK error and stand up based on it	2017-02-27 16:38:55 -08:00
Atlante45	8e9fc83759	Fix sit anim reference	2017-02-27 16:38:55 -08:00
Atlante45	69ce0a383e	Add sitting animations	2017-02-27 16:38:54 -08:00
Atlante45	53948b8547	Check other avatar, disable movement in edit mode	2017-02-27 16:38:54 -08:00
Atlante45	1dbc133f12	Add animation state handler to the script	2017-02-27 16:38:54 -08:00
Atlante45	9033242584	More sit script work	2017-02-27 16:38:54 -08:00
Atlante45	1b2120d7e1	Sit script first draft	2017-02-27 16:38:54 -08:00
Atlante45	7132969083	Add hips pinning capability to MyAvatar	2017-02-27 16:38:54 -08:00
Atlante45	6821c8621f	More sit work	2017-02-27 16:38:54 -08:00
Atlante45	cc5967e8f9	Pull part of the Out Of Body Exp code	2017-02-27 16:38:53 -08:00
Ryan Huffman	40b238c12e	Add new teleport seat model + beam	2017-02-27 16:38:53 -08:00
Ryan Huffman	c632884aac	Update teleport script to handle detecting seats	2017-02-27 16:38:53 -08:00
Ryan Huffman	9197819291	Cleanup teleport to make use of new TARGET	2017-02-27 16:38:53 -08:00
Ryan Huffman	b8c7905fa4	Cleanup some duplication of code in teleport.js	2017-02-27 16:38:53 -08:00
samcake	9527c51ff1	Backing up from the rgba format to go back to a rgb 888 just to repair the broken normals on Seth's Avatar	2017-02-27 16:32:28 -08:00
howard-stearns	c04fd0ec66	smaller glyph size	2017-02-27 16:07:05 -08:00
Chris Collins	53505d6013	Merge pull request #9787 from samcake/flash ... Fix the broken normals on Seth's avatar	2017-02-27 15:51:36 -08:00
Chris Collins	a8ae693cef	Merge pull request #9786 from druiz17/tablet-scaling-fix ... Tablet homebutton dimension and position now scales with tablet	2017-02-27 15:51:02 -08:00
Matti Lahtinen	b1639ee3aa	Removed a Stray Print json that would spam logs.	2017-02-27 23:40:06 +02:00
samcake	f050cc31f2	Backing up from the rgba format to go back to a rgb 888 just to repair the broken normals on Seth's Avatar	2017-02-27 13:32:24 -08:00
Menithal	9fbde41dc4	Styling formating and Rebuild attempt	2017-02-27 23:27:48 +02:00
David Kelly	3bf3f16a6a	whitespace	2017-02-27 12:56:03 -07:00
David Kelly	e7c8085bc8	switch to using glyph button	2017-02-27 12:44:23 -07:00
Dante Ruiz	b0b203edf9	Merge branch 'master' into tablet-scaling-fix	2017-02-27 19:34:58 +00:00
Dante Ruiz	21c15927cf	Homebutton dimension and position scales with tablet	2017-02-27 19:33:52 +00:00
Seth Alves	df034ea6da	remove commented-out code	2017-02-27 11:27:59 -08:00
Seth Alves	8110921abf	git rid of _mouseToOverlays until I remember why I thought I needed it	2017-02-27 11:11:04 -08:00
Ryan Huffman	5b59939195	Merge pull request #9602 from huffman/feat/shortbow-entity-server ... Add shortbow to marketplace scripts	2017-02-27 11:09:52 -08:00
Stephen Birarda	80af749b69	change max FPS for youtube on URL change	2017-02-27 11:09:17 -08:00
Stephen Birarda	d18936ea18	only force youtube web entities to 30 FPS	2017-02-27 09:44:34 -08:00
Stephen Birarda	2ceb3d85bd	increase max renderable web entity FPS to 30	2017-02-27 09:33:49 -08:00
Dante Ruiz	19110ecfee	Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix	2017-02-27 16:00:08 +00:00
Seth Alves	34c5d480c4	Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js	2017-02-27 06:35:50 -08:00
Seth Alves	1864975c51	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay	2017-02-27 06:35:22 -08:00
Seth Alves	1f402f7e4e	Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti	2017-02-27 06:34:46 -08:00
Brad Hefta-Gaub	795ff9a531	Merge pull request #9760 from birarda/bug/ess-crashes ... fix a crash in ESS on ES shutdown	2017-02-26 22:29:39 -08:00
Seth Alves	ebdb1cd3bd	Merge branch 'master' of github.com:highfidelity/hifi into voxel-paint-opti	2017-02-26 20:29:36 -08:00
Andrew Meadows	6269284b3d	Merge pull request #9758 from kunalgosar/passwordmatchingbug ... Fix Password Setting Bug	2017-02-26 16:37:16 -08:00