17090 commits

Author	SHA1	Message	Date
Zach Pomerantz	bb02af793c	Name exposed cache objects	2016-04-14 17:00:18 -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	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
Brad Hefta-Gaub	dd4589269d	Merge pull request #7661 from zzmp/fix/track-resources ... Track resources as they fall out of cache	2016-04-14 09:29:58 -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
Zach Pomerantz	774eb1c45a	Make shared Debug header	2016-04-13 15:48:26 -07:00
Zach Pomerantz	e20acb1d42	Track resources as they fall out of cache	2016-04-13 15:44:14 -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
Brad Hefta-Gaub	07f734f4dd	Merge pull request #7640 from jherico/vive_timewarp ... Vive timewarp	2016-04-13 14:39:59 -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
Ryan Huffman	9ee81a73c7	Fix clang warning in CrashHelpers::newFault	2016-04-13 13:41:45 -07:00
Brad Hefta-Gaub	4b3b917af6	add support for avatar licenses in FST files	2016-04-13 12:26:09 -07:00
Ryan Huffman	e563de9ef8	Fix 'array is too large' warning	2016-04-13 11:28:54 -07:00
Ryan Huffman	6cbd31fa51	Cleanup unnecessary scoping in pureVirtualCall	2016-04-13 11:28:37 -07:00
samcake	7653fa2c37	Fixing the resize of framebuffer to avoid reassigning the render buffer every frame	2016-04-13 10:56:29 -07:00
Ryan Huffman	7fbaa77c0b	Fix missing brace in namespace	2016-04-13 10:24:39 -07:00
Seth Alves	3288bff963	don't flood log with messages about expired actions. also, try to remove such actions	2016-04-13 09:47:07 -07:00
Ryan Huffman	91da4229ac	Fix unused variable warning in CrashHelpers.h	2016-04-13 09:42:20 -07:00
Seth Alves	d6673fb3c0	Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon	2016-04-13 09:01:43 -07:00
Brad Hefta-Gaub	0f8842f582	Merge pull request #7637 from zzmp/fix/tex-transfer-free ... Cleanly shutdown the texture transfer thread on quit	2016-04-12 19:28:51 -07:00
Seth Alves	298fe1e188	Merge branch 'master' of github.com:highfidelity/hifi into dont-run-bullet-too-soon	2016-04-12 19:21:03 -07:00
Brad Davis	1a02220886	Fixing wobble	2016-04-12 17:50:59 -07:00
Brad Davis	3325c58ceb	Vive timewarp implementation	2016-04-12 16:44:15 -07:00
Ryan Huffman	0c1277ae7a	Add CrashHelpers.h and add to separate submenu	2016-04-12 16:44:11 -07:00
Brad Hefta-Gaub	88ca5520be	Merge pull request #7647 from jherico/rate_counter ... Fixing rate counter	2016-04-12 14:48:05 -07:00
Brad Davis	9f2eabe6ce	Fixing rate counter	2016-04-12 14:11:56 -07:00
Seth Alves	2b63c2a8ba	Merge pull request #7641 from hyperlogic/tony/macos-cpuid-fix ... Rename CPUID to CPUIdent to fix XCode 7.2 builds	2016-04-12 12:48:15 -07:00
Seth Alves	460fdc0761	Merge pull request #7536 from samcake/orange ... First pass at using compressed format when uploading textures	2016-04-12 11:59:10 -07:00
Brad Davis	dfc1d896cd	Fix shutdown crash	2016-04-12 11:49:55 -07:00
Seth Alves	e4c91e5064	add a heuristic for deciding when it's safe to enable bullet	2016-04-12 11:46:00 -07:00
Brad Davis	4b02e8437c	Fix menu items created by plugins	2016-04-12 11:15:06 -07:00
Anthony J. Thibault	32ccc1d68e	Windows build fixes	2016-04-12 10:53:04 -07:00
Chris Collins	0faab41057	Merge pull request #7624 from birarda/new-home-set ... allow ATP scripts to be used by scripted Agent	2016-04-12 09:42:14 -07:00
Brad Hefta-Gaub	3f05ded932	Merge pull request #7611 from zzmp/guard/amd ... Disable gradient QML items on AMD	2016-04-12 08:32:57 -07:00
Brad Hefta-Gaub	ad8d7b2ffa	Merge pull request #7620 from sethalves/make-fixupMissingParents-more-thread-safe ... guard access to _missingParent vector with a lock	2016-04-12 08:32:38 -07:00
Brad Hefta-Gaub	9a687bea44	Merge pull request #7628 from jherico/save_scripts ... Save the set of running scripts when they change, as well as at shutdown	2016-04-12 08:32:10 -07:00
Brad Hefta-Gaub	c5840f217a	Merge pull request #7630 from jherico/fps_fix ... Fix FPS counter	2016-04-12 08:31:58 -07:00
Zach Pomerantz	c72a5f3605	Exit cleanly in debug with GL logger	2016-04-11 16:32:55 -07:00
Zach Pomerantz	666bf8d42b	Reset GL tex canvas while still running	2016-04-11 14:04:34 -07:00
Zach Pomerantz	ab72d8d8fb	Init QML GL from share context	2016-04-11 13:47:45 -07:00
Zach Pomerantz	52958ffc70	Move gl info queries to GLHelpers	2016-04-11 13:28:18 -07:00
Zach Pomerantz	1b7256d344	Clean shutdown for Texture Transfer thread	2016-04-11 12:59:53 -07:00
Anthony J. Thibault	470aac3acf	Rename CPUID to CPUIdent to fix XCode 7.2 builds	2016-04-11 11:54:17 -07:00
Seth Alves	1d63f6d354	Merge branch 'master' of github.com:highfidelity/hifi into make-fixupMissingParents-more-thread-safe	2016-04-11 09:58:08 -07:00
Brad Hefta-Gaub	b758acb7d8	Merge pull request #7610 from zzmp/fix/standard-qt-gl ... Codify qt qml version in one header	2016-04-11 09:45:21 -07:00
Brad Hefta-Gaub	47ff5c090d	Merge pull request #7623 from ZappoMan/fixAnimationFrameExport ... fix export of animation properties	2016-04-11 09:37:47 -07:00
Brad Hefta-Gaub	a204b9d923	Merge pull request #7627 from jherico/qml_key_interaction ... Suppress key release events for presses that were absorbed by QML	2016-04-11 09:31:46 -07:00
Brad Davis	df8ad57185	Fix FPS counter	2016-04-11 00:25:16 -07:00