6463 commits

Author	SHA1	Message	Date
Andrew Meadows	0f4e7fb532	workaround for bad physics polling on login	2017-10-09 10:27:46 -07:00
Ryan Huffman	9c06afc4c8	Merge pull request #11326 from cain-kilgore/21537 ... WL 21537 - Improve log naming	2017-10-06 08:51:42 -07:00
samcake	d7333d3fa3	Merging with master	2017-10-04 10:55:38 -07:00
Zach Fox	ea3da6c9dd	Merge pull request #11495 from zfox23/pop_interfaceChanges2 ... Commerce: One step closer!	2017-10-03 11:56:00 -07:00
Andrew Meadows	cd4be1473f	put more of Application::update() under time measurement	2017-10-03 10:34:12 -07:00
Sam Gateau	316156db46	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-02 21:31:59 -07:00
samcake	bb99f68d40	Avoiding the need for the GLobal frameTiing Scriptiong interface and just a regular member of APplication instead	2017-10-02 17:04:00 -07:00
Andrew Meadows	8d2153d2f3	cleanup debug stats, use more correct names	2017-10-02 13:08:17 -07:00
Andrew Meadows	0fc6bf1e89	Merge pull request #11471 from Atlante45/feat/auto-bake ... Asset Browser tweaks	2017-10-02 11:29:36 -07:00
Sam Gateau	68046ae4e3	Merge pull request #11491 from jherico/dev/disable_watchdog ... Disable watchdog with environment variable	2017-10-02 10:19:32 -07:00
Zach Fox	1ec0f5d9a0	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2	2017-10-02 09:26:59 -07:00
Sam Gateau	6c510bc18f	fine tuning the changes to respect clean up	2017-10-01 20:05:48 -07:00
samcake	0cbf19bcf1	Removing comments	2017-10-01 17:47:35 -07:00
samcake	aa10c29609	Cleaning up the changed code	2017-10-01 17:16:10 -07:00
Sam Gateau	44cc6deac2	moving render specific code from Application.cpp to Application_render.cpp	2017-10-01 12:55:44 -07:00
samcake	577378f539	Adding stuff that seems to break?	2017-09-29 17:45:10 -07:00
samcake	225d2bbbb4	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-29 13:47:37 -07:00
Zach Fox	63396a2fc3	WalletScriptingInterface; wallet status refactor	2017-09-29 13:42:04 -07:00
Andrew Meadows	1c30f7424e	remove cruft and add comments	2017-09-29 11:34:35 -07:00
SamGondelman	3ae41b9b75	cleanup client and stats string	2017-09-29 11:34:35 -07:00
Andrew Meadows	fb3e74398f	don't invalidate viewFrustum sent to server	2017-09-29 11:34:35 -07:00
SamGondelman	cbf82a6f2c	fix timeout for physics check	2017-09-29 11:34:34 -07:00
Brad Davis	a7d507e9fd	Disable watchdog with environment variable	2017-09-29 10:44:04 -07:00
samcake	c112a3baf1	Seting up of camera and avatar correctly in game loop, not in render loop	2017-09-28 15:09:49 -07:00
samcake	b1daae0150	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-28 09:16:02 -07:00
samcake	40ca98214b	Moving all of the camera and avatar eval to game loop	2017-09-27 17:58:43 -07:00
Sam Gateau	287f4f1d71	Merge pull request #11466 from SamGondelman/mirrorCrash ... Fix mirror and fade threading crashes	2017-09-27 16:17:04 -07:00
SamGondelman	553829f7ab	make sure FadeEffect dependency is created early	2017-09-27 11:58:35 -07:00
Sam Gateau	88097bb39f	Merge pull request #11447 from AndrewMeadows/lod-auto-adjust ... LODManager uses batchTime and engineRunTime for automatic LOD adjustment	2017-09-27 10:51:46 -07:00
Atlante45	acb0bf8d20	Asset Browser tweaks	2017-09-26 17:26:46 -07:00
samcake	f16c552978	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-26 17:18:05 -07:00
Andrew Meadows	dafadf82bb	Merge pull request #11458 from jherico/fix/tablet_latency ... Fix long tablet lag on first load	2017-09-26 16:18:31 -07:00
samcake	328dd9c108	Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue	2017-09-26 16:12:27 -07:00
Seth Alves	913d3c4d12	Merge pull request #11422 from hyperlogic/feature/ant-man2 ... Secondary IPD fixes	2017-09-26 11:53:45 -07:00
Dante Ruiz	e397d49564	Merge pull request #11159 from vladest/modal_dialogs_async ... Modal dialogs async	2017-09-26 11:07:42 -07:00
samcake	669af73a96	Bringing as much as possible out from render to game	2017-09-26 10:47:24 -07:00
Sam Gateau	953614fe65	More stuff out of render to the gameloop	2017-09-25 23:43:32 -07:00
samcake	157b4f2e13	Moving some of the updates on the camera and the avatar out from render to game loop	2017-09-25 18:28:33 -07:00
Brad Davis	40c42d35a5	Fix long tablet lag on first load	2017-09-25 17:50:04 -07:00
samcake	11c55755d5	Removing unused call	2017-09-25 15:10:40 -07:00
Andrew Meadows	37c501b131	LODManager uses renderTime instead of main loop fps	2017-09-25 13:17:21 -07:00
samcake	510ecbb137	Merging with upstream	2017-09-21 16:59:15 -07:00
Anthony J. Thibault	54e627e2c5	Merge branch 'master' into feature/ant-man2	2017-09-21 13:59:47 -07:00
Sam Gateau	daf18156f9	Merge pull request #11418 from SamGondelman/laserLaser ... Don't let scripts control visibility of laser pointer overlays	2017-09-20 17:54:00 -07:00
Anthony J. Thibault	5e93c13856	warning fix	2017-09-20 16:36:33 -07:00
SamGondelman	f21c99257e	don't let scripts control visibility of laser pointers	2017-09-20 14:35:29 -07:00
Anthony J. Thibault	0873b88347	code review feedback	2017-09-20 09:21:15 -07:00
Anthony J. Thibault	809e986738	Fixes for lasers on 2d HUD	2017-09-20 09:21:14 -07:00
vladest	67771bc297	Merge branch 'master' into modal_dialogs_async	2017-09-19 21:51:02 +02:00
vladest	6c32783a09	Merge branch 'master' into audio_devices_split	2017-09-19 17:43:03 +02:00