1905 commits

Author	SHA1	Message	Date
luiscuenca	ddbadf5a69	change to Test API	2018-08-24 11:59:46 -07:00
John Conklin II	b28aa3951f	Merge pull request #13802 from jherico/feature/scribe_programs ... Migrating to scribe program descriptors	2018-08-20 14:48:54 -07:00
Ryan Huffman	5d44877f56	Fix functionality sometimes getting stuck if window loses focus	2018-08-15 13:32:58 -07:00
Brad Davis	f03370c826	Migrating to scribe program descriptors	2018-08-09 17:58:34 -07:00
Sam Gondelman	b53772f9ca	Merge pull request #13431 from Cristo86/android_stop_downloads_bg ... Android - Prevent pending downloads to happen when going back to home	2018-07-12 15:22:56 -07:00
Cristian Luis Duarte	be8351dc0d	Android - Rollback pause/resume mechanism. Stop server checkIns, reset nodeList before entering background	2018-07-06 20:43:52 -03:00
Wayne Chen	cb89b046b4	moving copyToClipboard from slots to functions	2018-07-06 11:07:35 -07:00
Wayne Chen	0facbedbbc	adding Q_INVOKABLE method for copying to Application clipboard	2018-07-06 11:03:58 -07:00
Wayne Chen	3994ec4176	adding potential fix - moving methods to Application	2018-07-05 17:54:27 -07:00
Andrew Meadows	4329ea5240	Merge master' into 'workload'	2018-06-04 16:11:25 -07:00
Zach Fox	96858c9586	MS15529: Add secondary camera snapshot notification flag	2018-06-01 13:38:41 -07:00
Andrew Meadows	003e444246	Merge branch 'master' into 'workload'	2018-05-30 16:04:13 -07:00
NissimHadar	9ed8c04097	Merge branch 'master' of github.com:highfidelity/hifi into fixCameraMode	2018-05-24 17:40:21 -07:00
samcake	559d436dfa	Fixing the merge conflicts	2018-05-24 16:57:10 -07:00
samcake	cf58f31f3e	Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine'	2018-05-23 15:08:48 -07:00
NissimHadar	06203d44d8	Correct Camera.mode command.	2018-05-22 17:08:28 -07:00
Andrew Meadows	a23126a6b2	Merge 'master' into 'workload'	2018-05-18 07:38:02 -07:00
Sam Gondelman	74840d2130	Merge pull request #12935 from gcalero/android_new_login ... Android new login	2018-05-17 15:53:25 -07:00
Gabriel Calero	5afc9c6df3	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-16 12:45:17 -03:00
Zach Fox	bccaa2dbe5	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-15 11:50:38 -07:00
Andrew Meadows	c7c4324b3c	Merge 'master' into 'workload'	2018-05-15 10:22:50 -07:00
NissimHadar	d4d2f3c957	Moved ownership of test location into the Test Scripting class.	2018-05-14 16:32:04 -07:00
Zach Fox	43254e2981	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-14 15:12:44 -07:00
NissimHadar	5f219e27f7	Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1	2018-05-14 10:35:48 -07:00
John Conklin II	5cd225e4de	Merge pull request #12947 from jherico/feature/splash2 ... Additional work on splash screen	2018-05-11 11:26:37 -07:00
NissimHadar	1364f4391d	Can store JSON object.	2018-05-10 18:02:44 -07:00
Zach Fox	44cfa95830	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-09 15:01:24 -07:00
Gabriel Calero	66b975192d	Merge remote-tracking branch 'cristo86/android_places_goto' into android_new_login	2018-05-07 15:56:43 -03:00
NissimHadar	481eddb2a3	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-07 08:24:03 -07:00
Brad Davis	72526781d9	Additional work on splash screen	2018-05-04 16:40:05 -07:00
Clement	b04c5bd0db	CR	2018-05-04 14:43:16 -07:00
Gabriel Calero	1330132a32	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-04 18:35:51 -03:00
NissimHadar	2311fa33fb	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-04 14:13:43 -07:00
Gabriel Calero	868b58e66d	Un-expose Application from javascript. Restore displayplugin deactivation when goes to background	2018-05-04 18:01:01 -03:00
Zach Fox	1da840984b	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-04 10:24:28 -07:00
Clement	d87cd2af6e	Update avatar query names	2018-05-03 18:19:30 -07:00
Clement	27c471ee97	Move all wire frustums to conical frustums	2018-05-03 18:19:29 -07:00
Stephen Birarda	21396287a4	Merge pull request #12990 from Atlante45/fix/spec-cam-av ... Add support for multifrustum avatar queries	2018-05-03 18:18:51 -07:00
Stephen Birarda	31d5633b4a	Merge pull request #12930 from Atlante45/fix/spec-cam ... Add support for multifrustum entity queries	2018-05-03 18:13:51 -07:00
NissimHadar	fe9c6052f7	Added quitWhenFinished parameter to the command line.	2018-05-03 15:02:11 -07:00
Zach Fox	c3d3cdca3d	Add cubemap output format	2018-05-03 12:57:00 -07:00
NissimHadar	8b3c451f91	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-03 08:25:19 -07:00
Andrew Meadows	99a75c5a87	Merge 'master' into 'workload'	2018-05-02 17:28:36 -07:00
NissimHadar	5cbb8674ec	Use default parameter for saveSnapshot().	2018-05-02 14:45:28 -07:00
Gabriel Calero	88f0c2d700	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-02 18:42:10 -03:00
John Conklin II	f43b9ee7e8	Merge pull request #12960 from hyperlogic/feature/bullet-debug-draw ... Added items to the developer menu for debugging physics	2018-05-02 14:25:09 -07:00
NissimHadar	83846aec04	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-02 14:17:22 -07:00
Gabriel Calero	e4fdd81148	Merge remote-tracking branch 'origin/android_goto_splash' into android_new_login	2018-05-02 17:23:25 -03:00
Gabriel Calero	d0ab81d1f9	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-02 17:00:32 -03:00
Gabriel Calero	4dce62cc2e	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-05-02 16:27:41 -03:00