17244 commits

Author	SHA1	Message	Date
Brad Davis	2689f2cc4a	Add MB/KB/Byte conversion macros	2016-04-21 14:46:11 -07:00
Brad Davis	e9959df2df	Decoupling resourcecache from nodelist	2016-04-21 14:46:09 -07:00
Howard Stearns	7aca95507e	comments	2016-04-21 14:46:08 -07:00
Howard Stearns	7f748153c5	Mac code for gpu memory.	2016-04-21 14:46:08 -07:00
howard-stearns	c274df6066	uint64	2016-04-20 22:57:33 -07:00
howard-stearns	904e87313e	Match the gpu adapter names gainst the vendor and renderer names used by ... the ogl we're using, so that we pick the right GPU to get info from.	2016-04-20 22:57:32 -07:00
howard-stearns	b403dcb0d9	An experiment to see if dual-card Windows desktops can be made to answer ... the correct card.	2016-04-20 22:57:32 -07:00
howard-stearns	cb137635db	Fix stupid MSVC default indentation.	2016-04-20 22:57:31 -07:00
howard-stearns	c12772e4c6	GPU identification utilities	2016-04-20 22:57:30 -07:00
Brad Hefta-Gaub	66235acac2	Merge pull request #7725 from howard-stearns/quit-consistently ... Quit consistently	2016-04-20 19:17:52 -07:00
howard-stearns	0544bcaacd	Simpler cross-platform solution, with comments.	2016-04-20 15:02:41 -07:00
Zach Pomerantz	948af75f8a	Transfer loaded resources with smart ptrs to avoid shutdown deadlock	2016-04-20 13:00:35 -07:00
howard-stearns	b221232117	Windows-only version, without changing assignment-client/domain-server ... classes.	2016-04-20 10:31:26 -07:00
Andrew Meadows	a9cfb5bf16	fix linux build	2016-04-19 18:12:35 -07:00
howard-stearns	a7d2373f3e	Use our ShutdownEventListener utility in Interface, and absorb quit ... signal when we handle it.	2016-04-19 16:17:39 -07:00
Ryan Huffman	c0a5c8bb18	Merge pull request #7678 from birarda/mixer-sleeps ... use a steady clock for mixer timings	2016-04-19 12:59:53 -07:00
Ryan Huffman	92339bf5fc	Merge pull request #7701 from birarda/udt-fixes ... use nextPacketTimestamp to catch up, not stay ahead	2016-04-19 12:57:43 -07:00
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
Brad Davis	882267e08f	Merge pull request #7709 from samcake/blue ... Introduce Shader Compilation versions	2016-04-19 11:14:22 -07:00
Brad Hefta-Gaub	d88185eb6c	Merge pull request #7703 from zzmp/fix/gl-qml ... Set GL in QML immediately	2016-04-19 11:11:27 -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	5d550197bd	Merge pull request #7697 from samcake/orange ... Introduce a simple state sort for drawing opaque items	2016-04-19 08:41:49 -07:00
Brad Hefta-Gaub	d16750c590	Merge pull request #7681 from hyperlogic/tony/character-controller-leak-fix ... Memory leak on exit for CharacterController	2016-04-19 07:51:08 -07:00
Brad Hefta-Gaub	c41b320d40	Merge pull request #7706 from zzmp/fix/text3d-font ... Fix text3d to allow transparent text	2016-04-19 07:50:36 -07:00
Brad Hefta-Gaub	b0f3b24caa	Merge pull request #7699 from OmegaHeron/gcc53 ... Gcc53	2016-04-19 07:34:24 -07:00
Brad Hefta-Gaub	8f19eba5c2	Merge pull request #7685 from zzmp/debug/sub ... Add sub to Debug Counter	2016-04-19 07:27:49 -07:00
Brad Hefta-Gaub	523d365ce7	Merge pull request #7680 from Atlante45/fix/clear-atp-cache ... Don't use invalidated iterators	2016-04-19 07:24:07 -07:00
Brad Hefta-Gaub	2780ade3bd	Merge pull request #7686 from zzmp/clean/bufferview ... Consolidate BufferView ctors to cpp	2016-04-19 07:21:57 -07:00
samcake	7c7cd6e9e5	Go simple with a a true map for the unifrom mappings	2016-04-18 19:05:49 -07:00
samcake	4bbe0ddc6d	Go simple with a a true map for the unifrom mappings	2016-04-18 19:01:15 -07:00
samcake	85fd1dcb5b	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2016-04-18 18:25:16 -07:00
samcake	cadb53b703	Adding shader versioning and defines from GLBackendShader allowing for runtime defines injection to shaders and more	2016-04-18 18:24:27 -07:00
Omega Hereon [J.L.]	647e991b05	Merge remote-tracking branch 'upstream/master' into gcc53	2016-04-19 01:14:00 +00:00
Brad Hefta-Gaub	a572ac31dc	Merge pull request #7704 from samcake/lemon ... Exposing the CPU TIming of the Render Jobs to the JS API	2016-04-18 18:12:14 -07:00
Omega Hereon [J.L.]	64f6a59bb3	Merge remote-tracking branch 'upstream/master' into gcc53	2016-04-19 01:11:35 +00: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
samcake	c6deff16d6	Resoving to master...	2016-04-18 17:24:55 -07:00
samcake	d25a366962	Resoving to master...	2016-04-18 17:23:57 -07:00
samcake	7951284e9c	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2016-04-18 16:54:17 -07:00
Stephen Birarda	93cf5a1035	fixes for CR comments	2016-04-18 16:53:02 -07:00
samcake	9087de22bd	Fixing the extra spaces	2016-04-18 16:10:11 -07:00
Ryan Huffman	4e0ac2a4be	Remove fix for old QT file path bug in OSX	2016-04-18 16:07:53 -07:00
Zach Pomerantz	2d9dcc8595	Fix text3d to allow transparent text	2016-04-18 16:02:45 -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	70ddd8529b	Merge pull request #7684 from zzmp/fix/runaway-loading-resources ... Fix ResourceCacheSharedItems::_loadingRequests removals	2016-04-18 15:46:45 -07:00
Brad Hefta-Gaub	d5891e9073	remove abortEvaluation() since it has no effect for the test cases and might cause unexpected side effects	2016-04-18 15:28:33 -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
samcake	ca720efce6	Exposing the timing of the jobs by default	2016-04-18 14:53:06 -07:00
Seth Alves	65f51322fa	Merge pull request #7700 from Atlante45/fix/cleanup-iodevice ... Cleanup disk cache io device	2016-04-18 14:28:41 -07:00