21041 commits

Author	SHA1	Message	Date
samcake	f4ff5cf746	Merge pull request #9647 from samcake/ambient ... Fix the filtering problem on color and normals	2017-02-13 09:41:57 -08:00
Brad Hefta-Gaub	d82edaa36e	implement support for larger message payloads	2017-02-12 13:33:07 -08:00
samcake	13d1642ace	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-02-10 15:46:33 -08:00
samcake	2da1801fbf	Fixing the failing shader	2017-02-10 14:40:39 -08:00
samcake	b9102204ea	FIx the filtering problem on color and normals introduced since we generate mips with QImage	2017-02-10 11:40:39 -08:00
Brad Hefta-Gaub	765500ebce	remove debug and fix bug in test script	2017-02-10 10:09:03 -08:00
Brad Hefta-Gaub	f6d4dbb7a4	some debugging	2017-02-10 09:18:04 -08:00
Brad Hefta-Gaub	6a4f66677e	Merge branch 'master' of https://github.com/highfidelity/hifi into binaryDataOverMessages	2017-02-09 21:10:10 -08:00
Brad Hefta-Gaub	987f147ed4	implement support for binary data over messages	2017-02-09 20:41:34 -08:00
Atlante45	3a30de79aa	CR	2017-02-09 13:04:43 -08:00
Atlante45	2962dd6dc2	Factor LogDialog	2017-02-09 13:04:43 -08:00
Atlante45	fcb74bce10	First draft for entity script server log streaming	2017-02-09 13:04:43 -08:00
Brad Hefta-Gaub	74f10a1e7f	Merge pull request #9603 from huffman/feat/trace-thread-script ... Add thread names and scripts to chrome traces	2017-02-09 13:00:05 -08:00
Brad Hefta-Gaub	bc22326ec8	Merge pull request #9640 from ZappoMan/avatarSimulationStats ... New stats for avatar simulation	2017-02-09 12:58:30 -08:00
Brad Hefta-Gaub	57e0dadd65	CR	2017-02-09 11:35:00 -08:00
samcake	850be620f9	Merge pull request #9606 from samcake/blue ... More intrumentation, Pixel Format clean up and minor improvments in texture transfers	2017-02-09 11:18:09 -08:00
Seth Alves	b34341b48e	Merge pull request #9631 from AndrewMeadows/workaround-avatar-update-dos ... Remove avatarEntityData cruft from settings	2017-02-09 10:40:00 -08:00
Ryan Huffman	026c68c7de	Merge pull request #9625 from huffman/fix/server-script-entity-updates ... Fix Server Entity Script w/ high update rate causing issues	2017-02-09 10:07:32 -08:00
samcake	c62108c3c8	Resolve merging conflict	2017-02-09 09:49:59 -08:00
Seth Alves	2ec4f118fd	Merge pull request #9639 from hyperlogic/feature/tablet-pal ... Ported PAL to tablet	2017-02-08 21:17:38 -08:00
Anthony J. Thibault	e25ad0f332	Fix debug assert in FBXReader.	2017-02-08 18:56:58 -08:00
Anthony J. Thibault	b3a46c3518	Bug fix for TabletProxy::loadQMLSource()	2017-02-08 18:56:16 -08:00
Anthony J. Thibault	a209d0372a	First cut of pal on tablet.	2017-02-08 17:34:03 -08:00
samcake	e11d10f5d4	Reparing broken normals and also fixing the ambient lighting bug	2017-02-08 16:56:59 -08:00
Brad Hefta-Gaub	c2171ca08f	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarSimulationStats ... Conflicts: libraries/avatars/src/AvatarData.h	2017-02-08 16:52:38 -08:00
Brad Hefta-Gaub	6c41a25032	more stats	2017-02-08 16:51:00 -08:00
Brad Hefta-Gaub	b399420190	CR	2017-02-08 15:42:59 -08:00
Brad Hefta-Gaub	07cf87749f	Merge branch 'master' of https://github.com/highfidelity/hifi into betterBots	2017-02-08 13:41:33 -08:00
Ryan Huffman	f75eceda65	Add entity PPS per script configuration	2017-02-08 13:11:18 -08:00
Brad Hefta-Gaub	eedfc4fd38	fix various bot related bugs	2017-02-08 12:35:00 -08:00
samcake	363db8a834	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-02-08 11:52:18 -08:00
Andrew Meadows	a871613f84	make Settings::remove() work for groups	2017-02-08 11:49:40 -08:00
samcake	267d553c26	Cleaning comments and pixel format assignments	2017-02-08 11:42:23 -08:00
samcake	9e95944195	clean the usage of glCopyImageSubData and provide a fall back for 4.2)	2017-02-08 11:36:34 -08:00
samcake	8a40e951ac	clean the usage of glCopyImageSubData and provide a fall back for 4.2)	2017-02-08 11:35:50 -08:00
samcake	a137659a35	Cleaning up pr for simpler merge	2017-02-08 11:13:55 -08:00
Dante Ruiz	7db86204d1	general function to load QML for javascript for tablet ... (cherry picked from commit b50e20c545)	2017-02-08 10:25:11 -08:00
Seth Alves	e1a3b0c551	Merge pull request #9629 from hyperlogic/feature/tablet-2d-window-pos ... In desktop mode create tablet near mouse click location.	2017-02-07 19:51:05 -08:00
samcake	7b49f548ed	trying to remove the 24bits formats	2017-02-07 18:06:49 -08:00
samcake	2975f73fc9	merging	2017-02-07 13:13:21 -08:00
samcake	24a3a514a4	Merge pull request #9594 from AndrewMeadows/cap-fbx-texture-size ... Cap fbx texture size	2017-02-07 12:46:22 -08:00
Anthony J. Thibault	7d630f6c9a	Added Mat4.createFromColumns	2017-02-07 12:03:28 -08:00
Anthony J. Thibault	2952be5fc8	Added MouseX and MouseY axes to Keyboard device.	2017-02-07 12:02:41 -08:00
Zach Pomerantz	ff56eb24c8	Merge pull request #9537 from zzmp/audio/throttle-filter ... Add injector/avatar attenuation to audio-mixer throttling	2017-02-07 20:57:43 +01:00
David Kelly	9788b4bdaf	Merge pull request #9601 from davidkelly/dk/deadlockPrevention ... Minor cleanup	2017-02-07 12:56:03 -07:00
Chris Collins	d2feb4202b	Merge pull request #9621 from sethalves/tablet-ui-track-opens-and-closes ... send UserActivityLogger events when tablet is opened or closed	2017-02-07 08:23:09 -08:00
Anthony Thibault	caefb6c711	Merge pull request #9620 from hyperlogic/bug-fix/find-entity-bug ... Fix for findEntities not returning some entities that are within range.	2017-02-06 20:22:34 -08:00
Chris Collins	194fd925cf	Merge pull request #9609 from sethalves/tablet-ui-fix-equipping ... don't send AVATAR_SELF_ID over wire	2017-02-06 16:56:11 -08:00
Seth Alves	e3af5032c0	send UserActivityLogger events when tablet is opened or closed	2017-02-06 16:49:26 -08:00
Howard Stearns	1c7c0f7a76	Merge pull request #9617 from howard-stearns/physics-packets ... Physics packets	2017-02-06 16:41:08 -08:00