17231 commits

Author	SHA1	Message	Date
David Rowe	9c9bca546c	Add button that opens scripts directory window	2016-04-21 11:52:03 +12:00
Andrew Meadows	a9cfb5bf16	fix linux build	2016-04-19 18:12:35 -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
Zach Pomerantz	62c252e8ef	Set GL in QML immediately	2016-04-18 14:23:23 -07:00
Stephen Birarda	9cce964013	use nextPacketTimestamp only to catch up, not stay ahead	2016-04-18 14:19:36 -07:00
Atlante45	c9fa91936a	Cleanup disk cache io device	2016-04-18 14:10:51 -07:00
Seth Alves	4bf98a80b9	Merge pull request #7667 from AndrewMeadows/fix-entity-server-crash ... fix entity-server crash when entity moves out of bounds	2016-04-18 14:09:21 -07:00
Anthony J. Thibault	1f383680aa	Rig: removed unnecessary emitOnLoadComplete method	2016-04-18 13:35:13 -07:00
Brad Hefta-Gaub	bf8cdabd1b	CR feedback	2016-04-18 12:50:29 -07:00
Brad Hefta-Gaub	55010cebb7	remove unhelpful comment	2016-04-18 12:43:32 -07:00
Brad Hefta-Gaub	9e13b1bbae	more CR feedback	2016-04-18 12:25:46 -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
samcake	3887dfdf34	Merge branch 'master' of https://github.com/highfidelity/hifi into lemon	2016-04-18 11:52:45 -07:00
samcake	0ae54b9abc	Typo	2016-04-18 11:45:48 -07:00
Omega Hereon [J.L.]	b3b58b8176	Fix instances of error: isnan was not declared in this scope with GCC5.3/Ubuntu 16.04 ... In all but these 3 files isnan is glm::isnan	2016-04-18 18:45:15 +00:00