46378 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Atlante45	eb007b24cd	Use invalid port to signal no value passed	2016-09-06 11:59:07 -07:00
Atlante45	12eb65c0c4	Make setSocketLocalPort invokable	2016-09-06 10:18:42 -07:00
Atlante45	9f07511fd8	Move setter to LimitedNodeList	2016-09-06 10:18:42 -07:00
Atlante45	bba5e46533	Don't reset the NodeList	2016-09-06 10:18:42 -07:00
Atlante45	fcf44911a3	Fix Windows warning	2016-09-06 10:18:42 -07:00
Atlante45	a8de6f0a57	Add settings to change local port	2016-09-06 10:18:42 -07:00
Atlante45	713be9fd73	Rename NLs nodeUpdated signal to nodeSocketUpdated	2016-09-06 10:16:00 -07:00
Atlante45	d938e518a0	Start new hole punch when the socket is updated	2016-09-06 10:16:00 -07:00
Brad Hefta-Gaub	78cf81954c	Merge pull request #8555 from jherico/thread_count ... Stuttering: global thread pool management	2016-09-06 09:27:02 -07:00
Brad Hefta-Gaub	6259491d69	Merge pull request #8568 from jherico/texture_load_test ... Texture load profiling test	2016-09-03 10:17:36 -07:00
Brad Hefta-Gaub	418495d2c5	Merge pull request #8546 from samcake/yellow ... Revert the sRGB pixel format by default	2016-09-03 10:16:16 -07:00
Brad Hefta-Gaub	a51f66e9ff	Merge pull request #8553 from zzmp/clean/audio-ring-buffer ... clean and comment AudioRingBuffer	2016-09-02 20:16:06 -07:00
Brad Davis	13a4671705	Texture load profiling test	2016-09-02 17:45:26 -07:00
Andrew Meadows	0a55afda69	Merge pull request #8554 from elisa-lj11/marketplaces_html ... Include a marketplace status bar and access to "marketplace" of marketplaces	2016-09-02 17:12:05 -07:00
elisa-lj11	2f07ba87af	Renamed isZipped for more clarity on checking for non-fbx files	2016-09-02 16:48:55 -07:00
Ryan Downe Karpf	a96de7ffc1	Merge pull request #8566 from sethalves/fix-ac-agent-sees-others-redux ... Because hastily pressing merge on Friday afternoon is always a good idea	2016-09-02 16:23:18 -07:00
Seth Alves	b7da72cc46	try again on fix for ACs seeing other avatars	2016-09-02 16:06:51 -07:00
Seth Alves	884af4eb8e	Merge pull request #8565 from highfidelity/revert-8563-fix-ac-agent-sees-others ... Revert "fill in linked node data for avatar identity packets, also"	2016-09-02 16:01:05 -07:00
elisa-lj11	6721cc8dfb	fixed return statement formatting	2016-09-02 15:48:47 -07:00
Seth Alves	b6ef6fec73	Revert "fill in linked node data for avatar identity packets, also"	2016-09-02 15:43:25 -07:00
Brad Davis	94210d2e69	Use dynamic count for global thread pool	2016-09-02 15:23:35 -07:00
Brad Hefta-Gaub	6e25c97eef	Merge pull request #8564 from jherico/fix_rate_stats ... Updating stats display for threaded rendering	2016-09-02 15:22:45 -07:00
elisa-lj11	18700d6397	narrowed filters for Clara website check	2016-09-02 15:18:13 -07:00
Ryan Downe Karpf	c923d06d97	Merge pull request #8563 from sethalves/fix-ac-agent-sees-others ... fill in linked node data for avatar identity packets, also	2016-09-02 15:01:30 -07:00
Brad Davis	91bfa7677c	Updating stats display for threaded rendering	2016-09-02 14:41:49 -07:00
Seth Alves	f34f0f51ec	Merge branch 'master' of github.com:highfidelity/hifi into fix-ac-agent-sees-others	2016-09-02 13:57:10 -07:00
Seth Alves	014190a1bf	fill in linked node data for avatar identity packets, also	2016-09-02 13:52:37 -07:00
Brad Hefta-Gaub	861cf468a3	Merge pull request #8547 from imgntn/save_default_scripts_settings ... Remember setting for 'debug defaultScripts.js'	2016-09-02 13:08:19 -07:00
Brad Hefta-Gaub	0dfd0fdab7	Merge pull request #8562 from jherico/fix_fence_leak ... Fix incorrect fence delete	2016-09-02 13:07:17 -07:00
Brad Davis	2c8b795c5f	Fix incorrect fence delete	2016-09-02 11:26:21 -07:00
Brad Hefta-Gaub	8ec5798b7a	Merge pull request #8548 from samcake/blue ... Exposing GPU & Batch running time to Engine gpu jobs	2016-09-02 09:31:09 -07:00
Brad Hefta-Gaub	667137f951	Merge pull request #8552 from AndrewMeadows/invoke-updateModel ... eliminate log warning about invokeMethod of EntityTreeRenderer::updateModel()	2016-09-02 09:17:57 -07:00
Brad Hefta-Gaub	df9ac9fd6e	Merge pull request #8519 from birarda/installer-fixes ... add removal of resources folder before install	2016-09-02 09:06:20 -07:00
Brad Hefta-Gaub	e3bad8e8f4	Merge pull request #8556 from ZappoMan/renderStats ... add support for renderInfo properties to model entities	2016-09-02 09:04:56 -07:00
Brad Hefta-Gaub	cf242eca9f	Merge pull request #8537 from hyperlogic/feature/larger-marketplace-tablet ... Marketplace tablet is a bit larger and lower DPI.	2016-09-02 08:45:29 -07:00
Brad Hefta-Gaub	b3e5e21f40	Merge pull request #8559 from birarda/android-interface ... create a foundation for interface target compile on android	2016-09-01 13:10:45 -07:00
Stephen Birarda	f48da0252a	use the correct Qt windows macro	2016-09-01 11:33:20 -07:00
Stephen Birarda	545181a465	avoid numeric_limits use on Q_OS_WINDOWS	2016-09-01 11:18:40 -07:00
Stephen Birarda	8977f9ed92	fix else condition in hifiAudioCodec	2016-09-01 10:57:30 -07:00
Stephen Birarda	a94fe62b37	use shared libc++ to reduce shared lib size	2016-09-01 10:56:49 -07:00
Stephen Birarda	ae87f966c8	update ndk version in BUILD_ANDROID	2016-09-01 10:50:10 -07:00
James B. Pollack	a8a9577866	actually remove the math.random	2016-08-31 21:14:50 -07:00
elisa-lj11	288ba96795	reverted default scripts to load marketplace.js	2016-08-31 17:47:16 -07:00
elisa-lj11	bebf9c5890	Added error feature when user tries to download a non fbx file	2016-08-31 17:46:35 -07:00
Stephen Birarda	7b8293dc80	repairs for non-android builds after changes	2016-08-31 17:28:09 -07:00
Stephen Birarda	65c1edfb1c	add missing link from render-utils to entities	2016-08-31 16:57:52 -07:00
Stephen Birarda	b660a82cc7	fix physics compile for android	2016-08-31 16:55:31 -07:00
Stephen Birarda	dae40c944b	fix audio and audio-client compile for android	2016-08-31 16:55:19 -07:00
Stephen Birarda	6efa47a04e	workaround plugin build failures	2016-08-31 16:45:12 -07:00
Stephen Birarda	85ba0f36cf	fix controllers/shared compile for android interface port	2016-08-31 16:34:31 -07:00