66659 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
MiladNazeri	40e311fe1e	Fix QT typo	2018-04-17 15:20:05 -07:00
Zach Fox	3b8e52ea41	Merge pull request #12862 from zfox23/discovery_April2018 ... Discovery: April 2018 (Huge PR; see description)	2018-04-17 15:11:50 -07:00
Stephen Birarda	a0e1d2e54e	Merge pull request #12764 from SimonWalton-HiFi/bakedassettype-enum ... Make BakedAssetType a scoped enum	2018-04-17 11:50:14 -07:00
Stephen Birarda	4c0a0a84fa	Merge pull request #12912 from birarda/wireshark-plugin ... add wireshark HFUDT packet dissector to tools	2018-04-16 17:21:45 -07:00
Stephen Birarda	77b3a2cb7c	add wireshark HFUDT packet dissector ... Co-authored-by: Ryan Huffman <ryanhuffman@gmail.com> Co-authored-by: Clément Brisset <clement.brisset@gmail.com>	2018-04-16 16:37:50 -07:00
Zach Fox	0504220171	Abide by new backend code	2018-04-16 13:01:31 -07:00
Zach Fox	02aa8ac566	Bugfixes per QA	2018-04-16 11:53:37 -07:00
Sam Gateau	19aa49832b	Merge pull request #12750 from SamGondelman/androidPrimitives ... Forward pipelines for primitives	2018-04-16 11:18:56 -07:00
John Conklin II	5705bac87f	Merge pull request #12723 from ctrlaltdavid/21801 ... HMD API JSDoc	2018-04-16 11:12:26 -07:00
Sam Gateau	3ac4a1db2d	Merge pull request #12850 from SimonWalton-HiFi/early-trace ... Enable Interface tracing from earliest execution point	2018-04-16 10:24:55 -07:00
Zach Fox	ee9519bf1b	Merge branch 'discovery_April2018' of github.com:zfox23/hifi into discovery_April2018	2018-04-16 10:12:34 -07:00
Zach Fox	071bf35683	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
Ken Cooke	3630198c27	Merge pull request #12886 from kencooke/audio-gverb-deadcode ... Remove dead code	2018-04-16 08:20:38 -07:00
Seth Alves	7f285c5f90	Merge pull request #12571 from Atlante45/fix/es-concurrent-traversal ... Fix unprotected tree traversals	2018-04-14 14:33:25 -07:00
Sam Gondelman	7c65c9c444	Merge pull request #12888 from SamGondelman/statsAssert ... Rollback some recent QML changes on Android	2018-04-13 16:35:28 -07:00
John Conklin II	6def70791e	Merge pull request #12864 from sethalves/backtrace-annotations ... switch to backtrace's newer crashpad blob	2018-04-13 15:34:05 -07:00
SamGondelman	8005547d03	rollback some qml changes on android	2018-04-13 14:28:00 -07:00
Anthony Thibault	f2c38a77a6	Merge pull request #12877 from hyperlogic/bug-fix/avatar-recording-mtu-overflow ... Fix for avatar recording playback on avatars with many joints	2018-04-13 14:26:32 -07:00
John Conklin II	08ca30cf43	Merge pull request #12870 from druiz17/fix-grab-js ... fix grab.js unable to grab other entities	2018-04-13 12:17:46 -07:00
John Conklin II	008c7be369	Merge pull request #12787 from druiz17/fix-offscreen-windows ... hide desktop windows when switching into HMD mode	2018-04-13 12:17:15 -07:00
Melissa Brown	fd7b3b75f9	Merge pull request #12884 from Atlante45/fix/build-instructions ... Update docs with correct qt version	2018-04-13 11:12:06 -07:00
Ken Cooke	ee6e9ee81e	Remove dead code left over from Gverb	2018-04-13 10:36:13 -07:00
Ken Cooke	a5feb07bdf	Merge pull request #12863 from kencooke/audio-gainadj-stereo ... Support per-avatar gain adjustment on stereo input streams	2018-04-13 06:52:54 -07:00
Seth Alves	3830f65df5	Merge pull request #12875 from druiz17/update-baking-tools ... Update baking script to include skyboxes.	2018-04-12 19:46:46 -07:00
John Conklin II	98f6899c3d	Merge pull request #12839 from SamGondelman/matMigrate ... Migrate materials from userData to materialData	2018-04-12 18:24:33 -07:00
John Conklin II	fc487ea322	Merge pull request #12831 from ctrlaltdavid/21829 ... Model overlay fixes	2018-04-12 17:04:55 -07:00
Simon Walton	76468f7f26	Use existing DISABLE_WATCHDOG global to turn off thread entirely	2018-04-12 16:58:13 -07:00
John Conklin II	ec10fcb7b7	Merge pull request #12868 from SamGondelman/missingAlpha ... Fix for missing alpha on server restart	2018-04-12 16:42:34 -07:00
John Conklin II	5322195eee	Merge pull request #12867 from ctrlaltdavid/21836-a ... Fix location.protocol value for serverless domains	2018-04-12 16:28:31 -07:00
Clement	157ca8cd68	Update docs with correct qt version	2018-04-12 16:21:26 -07:00
John Conklin II	3d90f93cf1	Merge pull request #12812 from SamGondelman/compression ... Support ETC2/EAC compressed textures	2018-04-12 16:04:08 -07:00
John Conklin II	67a8e6c82e	Merge pull request #12824 from SamGondelman/matFix ... Fix non-client-only material entities applied to avatar by session ID not being removed on domain switch	2018-04-12 15:30:11 -07:00
John Conklin II	9123c05eb3	Merge pull request #12859 from samcake/one ... Fix a bug when switching shadow on/off in front of mirror	2018-04-12 15:25:05 -07:00
Anthony J. Thibault	da319b9af6	Changed version constants into a enum class, to fix macosx warnings.	2018-04-12 15:09:01 -07:00
John Conklin II	40ae2913eb	Merge pull request #12847 from SamGondelman/clientMat ... Fix client-only materials on non-avatars	2018-04-12 14:53:34 -07:00
Stephen Birarda	e2e0a50dd2	Merge pull request #12879 from highfidelity/RC66 ... RC66 merge back to master	2018-04-12 14:12:59 -07:00
Ken Cooke	2593d224c5	CR feedback	2018-04-12 13:24:31 -07:00
John Conklin II	1834325970	Merge pull request #12788 from sethalves/fix-immediate-last-edited-by ... set lastEditedBy in local tree whenever a script adds or edits an entity	2018-04-12 13:02:05 -07:00
John Conklin II	9ccf23ec94	Merge pull request #12866 from birarda/serverless-baked-skybox ... RC66: use serverless content with baked skybox and help textures	2018-04-12 12:54:37 -07:00
John Conklin II	e47dca77ec	Merge pull request #12773 from AndrewMeadows/expire-simulation-ownership ... entity-server will expire stale simulation ownership	2018-04-12 12:04:52 -07:00
Sam Gateau	77a27b2be7	Merge pull request #12835 from NissimHadar/speedUp1 ... ktxInitialDataRequestFinished call to qcDebug(networking) - only in DEBUG	2018-04-12 11:48:09 -07:00
Sam Gateau	0857bf06b6	Merge pull request #12857 from NissimHadar/addMDtoAutoTester ... Added recursive creation of MD files.	2018-04-12 11:45:18 -07:00
Seth Alves	46a741be7b	Merge pull request #12068 from vladest/move_to_qqc2 ... Move to qqc2	2018-04-12 11:26:55 -07:00
Anthony J. Thibault	568af7a072	Fix for avatar recording playback on avatars with many joints ... Before this fix, playback of avatar recording frames could overflow the maximum UDP packet size (MTU). This is playback of a recording was causing all the rotations and translations to be transmitted, even if the translations were not any different then the avatar default pose. This explicitly records the rotationIsDefaultPose and translationIsDefaultPose in the recording stream. This does not break backwards compatibility. However, it does require new recordings for avatars with large numbers of bones.	2018-04-12 11:24:26 -07:00
Sam Gateau	20ae247185	Merge pull request #12784 from Zvork/zeye ... Potential bug correction when constructing eye position from Z-buffer depths in shaders	2018-04-12 11:10:09 -07:00
Simon Walton	a584d67acd	Tweaks for clang error and gcc warning	2018-04-12 10:44:41 -07:00
John Conklin II	ef133806be	Merge pull request #12813 from ctrlaltdavid/21826 ... Fix Controller.getActions(), .getHardware(), and .getStandard()	2018-04-12 10:42:25 -07:00
John Conklin II	b0a88617a0	Merge pull request #12807 from ElderOrb/FB13962 ... Fix for auto-reopening of closed query dialogs (aka hack-on-top-of-hack)	2018-04-12 10:37:05 -07:00
John Conklin II	67b1313fb6	Merge pull request #12669 from ElderOrb/FB13143 ... Fix several styling/alignment/overlapping issues in 'Add to world' and 'Rename' dialogs in Asset Browser	2018-04-12 10:34:58 -07:00
John Conklin II	213c35dab4	Merge pull request #12790 from WolfGangS/bugfix/12759-editoverlay-subimage ... Bugfix for #12759 Overlays.editOverlay not applying subImage property	2018-04-12 10:34:17 -07:00