15207 commits

Author	SHA1	Message	Date
Howard Stearns	9ff9682b2a	Merge pull request #7692 from ZappoMan/resetScriptEngineOnDomainChange ... Reset entities script engine on domain change	2016-04-19 11:14:28 -07:00
Zach Pomerantz	fc61f85bf9	Merge pull request #7698 from hyperlogic/tony/avatar-on-load-complete-callback ... Added MyAvatar onLoadComplete Callback	2016-04-19 10:36:20 -07:00
Brad Hefta-Gaub	8eff47f922	Merge pull request #7705 from hyperlogic/tony/avatar-attachment-lag-fix ... Fix for laggy avatar attachments	2016-04-19 07:15:38 -07:00
Brad Hefta-Gaub	0ac9601ea7	Merge pull request #7690 from ZappoMan/improveHMD ... Introduce "recommended overlay rectangle" to display plugins	2016-04-18 18:04:21 -07:00
Brad Hefta-Gaub	0a79b5dd69	Merge pull request #7707 from huffman/fix/osx-default-script-dir ... Remove fix for old QT file path bug in OSX	2016-04-18 18:01:47 -07:00
Brad Hefta-Gaub	0e9bd9a776	Merge pull request #7682 from zzmp/clean/stars ... Cleanup stars to persist a single BufferView	2016-04-18 17:59:48 -07:00
Ryan Huffman	4e0ac2a4be	Remove fix for old QT file path bug in OSX	2016-04-18 16:07:53 -07:00
Brad Hefta-Gaub	01907f181f	Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD	2016-04-18 16:01:42 -07:00
Seth Alves	3298883774	Merge pull request #7702 from zzmp/fix/clear-octree-on-exit ... Clear entities and avatars on exit	2016-04-18 15:48:35 -07:00
Anthony J. Thibault	279e77f523	updated comment	2016-04-18 15:18:08 -07:00
samcake	dccf549118	Merge pull request #7676 from jherico/perf_testing ... Manually generate mipmaps for textures while loading	2016-04-18 15:09:12 -07:00
Zach Pomerantz	146ea066db	Update AvatarManager.cpp	2016-04-18 14:53:04 -07:00
Anthony J. Thibault	544928b46e	MyAvatar: fix for laggy avatar attachments	2016-04-18 14:51:33 -07:00
Zach Pomerantz	c9dc642d76	Fix type in AvatarManager::clearAllAvatars	2016-04-18 14:48:24 -07:00
Zach Pomerantz	c87eec4182	Fix typo in AvatarManager::clearAllAvatars	2016-04-18 14:45:33 -07:00
Zach Pomerantz	790e325248	Clear entities and avatars on exit	2016-04-18 14:31:16 -07:00
Anthony J. Thibault	dc92ccc2b2	MyAvatar: Removed unnecessary slot.	2016-04-18 13:19:49 -07:00
Brad Hefta-Gaub	374ba10524	more CR feedback	2016-04-18 12:23:36 -07:00
Brad Hefta-Gaub	0d20f2468e	CR feedback	2016-04-18 12:13:21 -07:00
Anthony J. Thibault	1682598be7	Added onLoadComplete signal to MyAvatar ... This can be used in javaScript to detect when the model has finished loading because the url has changed or the model has been reset.	2016-04-18 11:37:02 -07:00
Brad Hefta-Gaub	0520363da8	cleanup	2016-04-18 10:37:15 -07:00
Brad Hefta-Gaub	d1f6b371c9	cleanup	2016-04-18 10:27:12 -07:00
Brad Davis	b50f835d35	Warning and error fixes	2016-04-17 10:22:26 -07:00
Brad Davis	f3e5306f90	Working on an automated performance test	2016-04-17 10:20:00 -07:00
Brad Hefta-Gaub	8f3d48190a	switch to QRect instead of vec4	2016-04-16 16:59:47 -07:00
Brad Hefta-Gaub	6b5fd1e807	code review feedback	2016-04-16 16:11:36 -07:00
Brad Hefta-Gaub	54777c9cd5	Merge branch 'master' of https://github.com/highfidelity/hifi into improveHMD	2016-04-16 15:19:35 -07:00
Brad Hefta-Gaub	87078b1ea2	first cut at resetting entities script engine on domain change	2016-04-16 11:09:23 -07:00
David Rowe	8f6cfb72ea	Fix QML warnings at shutdown	2016-04-16 15:23:41 +12:00
Brad Hefta-Gaub	04df84974c	handle repositioning of qml windows	2016-04-15 19:50:12 -07:00
Zach Pomerantz	d96c97cdb4	Cleanup stars to persist BufferView	2016-04-15 16:40:02 -07:00
Brad Hefta-Gaub	c7f58dc17c	first cut at exposing recommend overlay rectangle	2016-04-14 20:47:31 -07:00
Zach Pomerantz	f803ecd2e7	Merge pull request #7633 from Atlante45/fix/shared-resource ... Fix raw pointers in shared resource cache items	2016-04-14 17:52:04 -07:00
Atlante45	4ed8573f74	CR	2016-04-14 17:28:24 -07:00
Brad Hefta-Gaub	ea4da05cba	Merge pull request #7643 from AndrewMeadows/faster-bullet ... faster Bullet kinematics	2016-04-14 12:16:54 -07:00
Brad Hefta-Gaub	c9b0531f55	Merge pull request #7662 from zzmp/fix/model-anim-cache ... Use AnimationCache for models	2016-04-14 12:16:32 -07:00
Andrew Meadows	dcf28937cf	cleanup cached Physics::sessionUUID	2016-04-14 11:18:10 -07:00
Zach Pomerantz	e80898f095	Merge branch 'master' of github.com:highfidelity/hifi into fix/model-anim-cache	2016-04-14 10:12:16 -07:00
Ryan Huffman	e76ed6f73a	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-handling	2016-04-14 09:47:03 -07:00
Brad Hefta-Gaub	7b5075cce5	Merge pull request #7645 from sethalves/dont-run-bullet-too-soon ... add a heuristic for deciding when it's safe to enable bullet	2016-04-14 09:35:58 -07:00
Brad Hefta-Gaub	285ebe8ec5	Merge pull request #7655 from sethalves/dont-spam-about-expired-actions ... don't flood log with messages about expired actions	2016-04-14 09:32:56 -07:00
Brad Hefta-Gaub	623bfa3c35	Merge pull request #7653 from hyperlogic/tony/avatar-meta-item-bound-fix ... Fix for occasional invisible avatars	2016-04-14 09:32:46 -07:00
Brad Hefta-Gaub	37dcfdad8a	Merge pull request #7652 from huffman/feat/crash-menu ... Move crash menu items to submenu and add new crash types	2016-04-14 09:32:36 -07:00
Seth Alves	ba0549dddd	Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon	2016-04-14 09:18:58 -07:00
Chris Collins	47522e1774	Merge pull request #7659 from ZappoMan/newLODSettings ... improve reset settings	2016-04-13 16:49:22 -07:00
Zach Pomerantz	7a15339631	Use AnimationCache for models	2016-04-13 15:44:47 -07:00
Ryan Huffman	47c2a1722b	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/crash-menu	2016-04-13 14:40:46 -07:00
Ryan Huffman	bc247ec058	Remove unused Application::crashApplication()	2016-04-13 14:01:41 -07:00
Howard Stearns	f24c2c7714	Merge pull request #7657 from ZappoMan/avatarLicenseSupport ... add support for avatar licenses in FST files	2016-04-13 14:01:37 -07:00
Brad Hefta-Gaub	0af47fd3d5	Merge pull request #7617 from jherico/vr_menu ... VR menu fixes	2016-04-13 13:53:36 -07:00