54103 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	8e3bc31c36	Fix persisting new recording	2017-04-10 19:28:21 +12:00
David Rowe	b5bf7dc12f	Tidying	2017-04-10 16:47:35 +12:00
Philip Rosedale	20307af4fe	remove debug prints	2017-04-09 21:31:45 -07:00
Philip Rosedale	6bec948457	springhold, touch, nBody tutorial scripts	2017-04-09 21:29:33 -07:00
David Rowe	6a88398e8e	Handle AC script not being able to create an entity	2017-04-10 15:55:05 +12:00
Seth Alves	da3968f0a2	Merge branch 'master' of github.com:highfidelity/hifi into fix-compound-collision-hulls	2017-04-09 20:44:07 -07:00
David Rowe	1cc215e14b	Fix test that recording just made started playing	2017-04-10 15:31:38 +12:00
David Rowe	3b32a4f74f	Address AC scripts claiming same entity to play	2017-04-10 15:04:54 +12:00
Anthony Thibault	746b7aadbd	Merge pull request #10133 from sethalves/fix-teleport-which-something-equipped ... Fix teleport when something equipped	2017-04-09 19:00:21 -07:00
druiz17	92bb7f2329	saving work	2017-04-09 18:55:53 -07:00
Seth Alves	0ae8a20b53	Merge branch 'master' of github.com:highfidelity/hifi into fix-compound-collision-hulls	2017-04-09 18:08:02 -07:00
Philip Rosedale	c74778116a	Merge pull request #10156 from Triplelexx/21256 ... 21256 - Add packet loss % to stats	2017-04-09 18:00:01 -07:00
Seth Alves	a1cab2c0d1	working toward fixing compound hulls	2017-04-09 17:23:56 -07:00
David Rowe	6896fe3ac6	Merge branch 'master' into 21249	2017-04-10 09:05:57 +12:00
Vladyslav Stelmakhovskyi	7628916db6	Check if dialog was opened from StackView and then pop or just go to home menu	2017-04-09 20:09:15 +02:00
Sam Cake	b65448bcbe	Trying to improve the Job/Task classes and testing it with the ZoneRenderer	2017-04-09 11:08:35 -07:00
Triplelexx	7936637e9c	and tired..	2017-04-09 11:02:35 +01:00
Triplelexx	54eb7c10c6	distracted	2017-04-09 10:50:22 +01:00
Triplelexx	ec6885a2fb	change audioPacketLoss stat to display largest of upstream/downstream loss	2017-04-09 09:49:41 +01:00
David Rowe	d60d4d0755	Auto-play recording at start-up	2017-04-09 15:52:56 +12:00
Seth Alves	aa89903a9f	Merge pull request #10160 from vladest/tabletwebview-yahoo-fix ... Yahoo, Reddit etc now works correctly	2017-04-08 20:25:18 -07:00
Howard Stearns	c32879d807	fix multi-line sessionDisplayName	2017-04-08 15:41:11 -07:00
David Rowe	adabcab888	Add invisible entity to persist playback of recording	2017-04-08 16:24:58 +12:00
David Rowe	d1e49cd926	Add and stub out stop, autoplay, and persistence to AC script	2017-04-08 14:57:37 +12:00
Rob Kayson	5ce70decfc	Merge branch 'master' of github.com:highfidelity/hifi into W-21204-tetherball-toy	2017-04-07 19:26:02 -07:00
Rob Kayson	49858d3ec5	Equip stick instead of grab. String is less rigid. Fixed bug where the ball was not recognized when other clients equipped the stick.	2017-04-07 19:16:29 -07:00
Brad Hefta-Gaub	0d4649ded8	Merge pull request #10079 from jherico/entity_thread_safety ... Thread safety for property getter/setters on entities	2017-04-07 19:01:07 -07:00
samcake	e6844f4294	Cleaning up the basic jobs of render	2017-04-07 18:35:27 -07:00
Dante Ruiz	86c67a3017	tablet pages	2017-04-08 02:01:21 +01:00
Chris Collins	de1e28b8f4	Merge pull request #10171 from highfidelity/RC-36-Hotfix ... Beta Release 36 - HOTFIX for NVidia driver.	2017-04-07 16:52:47 -07:00
Chris Collins	8e12f62cbb	Merge pull request #10153 from druiz17/goto-fix ... Ability to toggle goto with the crt-l and enter keys	2017-04-07 16:36:41 -07:00
Faye Li	d53b5b9c8c	Merge pull request #10137 from fayeli/handheld-cam ... Selfie Stick Script	2017-04-07 16:12:23 -07:00
Chris Collins	331f267c7b	Merge pull request #10170 from samcake/RC-36-Hotfix ... Cherry picking the fix for the new nv driver	2017-04-07 16:10:09 -07:00
samcake	01ad010dc9	Cherry picking the fix for the new nv driver	2017-04-07 16:07:14 -07:00
David Rowe	ef4f3368f9	Play recording just made from original start position and orientation	2017-04-08 11:06:34 +12:00
Seth Alves	8d00f0ab8f	allow obj reader to either combine meshes or keep parts separate	2017-04-07 15:59:01 -07:00
Chris Collins	1175f65cb0	Merge pull request #10162 from vladest/goto-white-buttons-fix ... Check if offset outside image, set to last image	2017-04-07 15:58:48 -07:00
David Rowe	ebe3561582	Merge branch 'master' into 21249	2017-04-08 10:46:16 +12:00
David Kelly	948a821824	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995	2017-04-07 14:30:22 -07:00
Anthony J. Thibault	a06df1a400	Bug fix for passing quats from script to C++ via the animationStateHandler	2017-04-07 14:13:00 -07:00
Anthony J. Thibault	e065c1bac4	Added jsdoc for new Avatar.getAbsoluteDefaultJoint*InObjectFrame API	2017-04-07 14:12:03 -07:00
Anthony J. Thibault	40844d2a49	Added getAbsoluteDefaultJoint*InOjbectFrame to Avatar API.	2017-04-07 14:03:31 -07:00
David Kelly	174b2978e3	username stays around now when tabbing to connections	2017-04-07 14:01:36 -07:00
Howard Stearns	57d8ec883e	Merge pull request #10163 from davidkelly/dk/3938 ... updated availability combo dialog	2017-04-07 13:57:17 -07:00
Seth Alves	03065ee6c8	Merge pull request #9938 from kunalgosar/jsRenderBug ... Stop WebEntities Running Files and Commands	2017-04-07 13:44:03 -07:00
Dante Ruiz	cde9310f3e	goto home button fix	2017-04-07 21:35:28 +01:00
Dante Ruiz	909fda98a4	git goto button toggle hightlight	2017-04-07 21:01:53 +01:00
samcake	58cec3fb96	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis	2017-04-07 11:55:08 -07:00
David Kelly	870e003311	Scattered X glyphs around the letterbox and combo dialogs	2017-04-07 11:12:54 -07:00
Andrew Meadows	92495d9622	delete in proper order on shutdown	2017-04-07 11:10:48 -07:00