overte-JulianGro

mirror of https://github.com/JulianGro/overte.git synced 2025-06-20 01:29:03 +02:00

Author	SHA1	Message	Date
Sam Gondelman	fbe54437b8	Merge pull request #13409 from humbletim/add-raypick-shapeID Include shapeID in RayPick results	2018-06-26 10:25:39 -07:00
David Rowe	40fb627504	Merge branch 'master' into 21892	2018-06-25 16:04:44 +12:00
Sam Gondelman	850e2d5cf5	Merge branch 'master' into particleFix	2018-06-21 17:32:24 -07:00
SamGondelman	8f411ad6c8	CR	2018-06-20 16:13:10 -07:00
SamGondelman	12a5d8b550	quiet ubuntu warnings, particle properties show radians	2018-06-19 12:51:35 -07:00
humbletim	dc5c5c20df	raypick partIndex commit include shapeID for accessing proper material index add raypick shapeID test script	2018-06-18 18:22:30 -04:00
Andrew Meadows	085130e3c9	avatars collide again again	2018-06-18 13:17:32 -07:00
Oren Hurvitz	0cb77362e8	Always roll hifi-log.txt when starting. Otherwise the active log file ("hifi-log.txt") contains lines from both previous sessions and the current session, which is confusing.	2018-06-17 13:44:14 +03:00
David Rowe	be4b929301	Fix cauterization when reparent entity to a different joint	2018-06-16 16:31:06 +12:00
Clément Brisset	11d84e780d	Merge pull request #13283 from huffman/feat/uncompressed-ktx-in-texmeta Add uncompressed KTX files to baked texture output	2018-06-13 11:49:41 -07:00
John Conklin II	99b5835098	Merge pull request #13344 from birarda/feat/new-version-numbers handle semantic version numbers in interface/sandbox update	2018-06-13 11:16:56 -07:00
Anthony J. Thibault	042f902d2e	Merge branch 'master' into scriptedBlendshapesFaceFlags	2018-06-11 17:13:30 -07:00
Ryan Huffman	38df5d3db5	Merge branch 'master' of github.com:highfidelity/hifi into feat/uncompressed-ktx-in-texmeta	2018-06-11 16:17:56 -07:00
Anthony Thibault	044d142635	Merge pull request #13133 from amantley/nativeCGCode Center of Gravity Leaning	2018-06-08 17:53:55 -07:00
Stephen Birarda	9506e7edbe	check for update for dev-builds, handle semantic version	2018-06-08 17:20:57 -07:00
Anthony J. Thibault	c3da4e74de	Code review feedback	2018-06-08 16:22:00 -07:00
Ryan Huffman	faafd26d2a	Add uncompressed KTX files to baked texture output	2018-06-08 11:39:47 -07:00
amantley	913d78841d	Merge remote-tracking branch 'upstream/master' into scriptedBlendshapes synching with upstream master	2018-06-07 16:20:11 -07:00
amantley	67fc7b90b5	fixed get and set semi nibble to deal with 16 bits	2018-06-07 15:43:21 -07:00
amantley	dca93ca61f	fixed setatone16 function to return the correct result for additional flags	2018-06-06 16:44:12 -07:00
Bradley Austin Davis	fa51c15849	Use binary resources on OSX	2018-06-06 15:10:52 -07:00
Anthony J. Thibault	c3d1daf855	Merge branch 'master' into nativeCGCode	2018-06-04 09:32:38 -07:00
amantley	2879eeb687	added flags for procedural face movement AvatarData.cpp toByteArray and parseDataFromBuffer	2018-06-01 17:18:48 -07:00
samcake	386c0f9ab2	Re review adjustments	2018-05-31 12:16:57 -07:00
John Conklin II	6095a3b319	Merge pull request #13082 from jherico/feature/shader_cache Shader load time performance optimiziations	2018-05-30 13:55:34 -07:00
Anthony Thibault	eae5215d94	Merge pull request #13206 from ctrlaltdavid/21872-c JSDoc fixes	2018-05-24 16:44:55 -07:00
Bradley Austin Davis	3beb77694f	Cached shader binaries and uniform data for shaders	2018-05-24 12:42:33 -07:00
Andrew Meadows	31dd59d212	double bits in collision groups	2018-05-24 11:28:52 -07:00
David Rowe	6d4f704279	Regularize some JSDoc usage	2018-05-21 09:32:10 +12:00
Dante Ruiz	3b59af3ed7	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-18 16:42:31 -07:00
vladest	72838f6d34	Implemented radio button preferences. Reimplemented snap smooth turn to radio buttons	2018-05-16 17:06:31 +02:00
David Rowe	fdeb0e3305	Avatar API JSDoc stubs	2018-05-16 09:20:54 +12:00
Anthony J. Thibault	ec638d9d91	Avatar can now look straight down without spinning 180. Also, come code clean up and removal of unnecessary Y_180 flips.	2018-05-14 13:48:04 -07:00
amantley	8000bcd272	cleaned up cg code ie computeNewHipsRotation	2018-05-08 18:12:53 -07:00
amantley	3a10cacec0	1.added the swing twist code to update the follow rotation in MyAvatar.cpp 2.added step.js and cg_lean.js to the developer folder 3.added menu item for toggling the hips following between head and hips 4.added new function to return true if the root of MyAvatar is translating to be under the head. Used to smooth the path of the hips 5.added computeCounterBalance to MyAvatar.h and cpp 6.added the menu item under developer/avatar to enable debug draw of the base of support in menu.h menu.cpp MyAvatar.h MyAvatar.cpp 7.added head yaw into the calculation of the hip rotation for the center of gravity. This is already was happening in the deriveBodyFromHMD code that is default 8.Changed Constants in Avatar constants for the base of support 9.fixed the over rotation of the shoulders 10.fixed scaling problem in cg computation 11.added room for going up on the toes without stretching	2018-05-07 17:41:35 -07:00
Clement	da9fb9c751	Fix non self-sufficient headers	2018-05-04 16:26:41 -07:00
Clément Brisset	39e2a78b1a	Merge pull request #13074 from Atlante45/fix/spec-cam-punchlist Multifrustum queries punchlist	2018-05-04 15:50:44 -07:00
Stephen Birarda	a922471b9a	Merge pull request #13018 from huffman/fix/logging-size-limit Fix old log files not being cleaned up	2018-05-04 10:46:13 -07:00
Ken Cooke	b657c28a9b	Merge pull request #13099 from kencooke/glm-asan-warnings Fix asan warnings	2018-05-04 09:24:51 -07:00
Ken Cooke	73ce02ce75	Fix asan warnings in byte-unpacking functions	2018-05-04 07:56:44 -07:00
Clement	27c471ee97	Move all wire frustums to conical frustums	2018-05-03 18:19:29 -07:00
Clement	3283c5eaec	Fix inverted comparaison	2018-05-03 18:19:29 -07:00
Clement	b4ea32bbb6	Correctly compute conical frustum for irregular ones	2018-05-03 18:19:29 -07:00
Clement	d774dc2060	WIP Only use conical frustums on the server	2018-05-03 18:19:29 -07:00
Stephen Birarda	21396287a4	Merge pull request #12990 from Atlante45/fix/spec-cam-av Add support for multifrustum avatar queries	2018-05-03 18:18:51 -07:00
Stephen Birarda	31d5633b4a	Merge pull request #12930 from Atlante45/fix/spec-cam Add support for multifrustum entity queries	2018-05-03 18:13:51 -07:00
Stephen Birarda	48aeebdd50	Merge pull request #13007 from Atlante45/fix/crashes-hotfix Keep CrashpadClient around for application lifetime	2018-05-03 16:48:29 -07:00
MiladNazeri	8e214d8ee8	Merge pull request #13049 from ctrlaltdavid/21856-d List which contexts each namespace and class is available in	2018-05-03 01:29:14 -07:00
Ryan Huffman	b29984ab2c	Remove max log age for rolling interface log	2018-05-02 10:01:15 -07:00
Ken Cooke	a4105f1081	Merge pull request #13052 from kitely/fix-gcc-warnings Eliminated warnings in gcc	2018-05-02 06:43:32 -07:00
Oren Hurvitz	26ffb3213c	Changed "[[gnu::fallthrough]]" to "// FALLTHRU"	2018-05-02 07:06:47 +01:00
Clement	538f24162f	Define ViewFrustums type alias	2018-05-01 18:03:21 -07:00
Clement	21213e81f4	Multiview support for priority queue	2018-05-01 18:03:21 -07:00
Clement	98cf48694e	Expose secondary camera to game logic	2018-05-01 18:02:29 -07:00
Clement	49fad3d868	EntityServer traversal aware of all ViewFrustums	2018-05-01 18:02:29 -07:00
David Rowe	1aa28b7f54	Merge remote-tracking branch 'upstream/master' into 21856-d # Conflicts: # interface/src/LODManager.h	2018-05-02 07:50:55 +12:00
John Conklin II	250aa3ab43	Merge pull request #13027 from jherico/fix/web_crash2 Some fixes for QML surfaces	2018-05-01 12:39:46 -07:00
Clement	f3fe1f3e58	Force crash helpers not inlined	2018-04-30 15:54:08 -07:00
Ryan Huffman	73cea112ee	Update FilePersistThread to use std::chrono instead of usecTimestampNow	2018-04-30 14:13:59 -07:00
Oren Hurvitz	a226790295	Eliminated warnings in gcc Note that the call to encodeNode() in FBXWriter.cpp can never be reached, so it's safe to remove it.	2018-04-30 15:05:27 +03:00
David Rowe	2cc3ed6287	List which contexts each namespace and object is available in	2018-04-28 20:00:28 +12:00
Ken Cooke	1e25d48941	Merge pull request #13044 from roxanneskelly/roxie-arm64-fixes Two fixes for arm64 on linux	2018-04-27 17:15:03 -07:00
Roxanne Skelly	ac8b3e4f5e	Two fixes for arm64 on linux 1) size_t is not defined by default in gcc, so stddef.h needed to be added to AudioDynamics.h to handle some size_t usage. 2) gcc defaults char to unsigned, where windows defaults to signed. OctalCode.cpp was assuming signed	2018-04-27 23:21:54 +00:00
John Conklin II	dd32ca33a5	Merge pull request #12957 from sethalves/quiet-logging Quiet logging	2018-04-27 14:59:38 -07:00
Brad Davis	2662dc9b4e	Suppress tracing log spam when tracing is not active	2018-04-27 08:03:48 -07:00
Ryan Huffman	496b638a88	Fix log file directory not being capped at 50MB	2018-04-26 15:48:55 -07:00
John Conklin II	5a3f44fa15	Merge pull request #12965 from NissimHadar/bug12979 Fix for bug #12979: Setting colors [0, 0, 254] from js api ends up as black color	2018-04-23 13:49:41 -07:00
John Conklin II	b3dbf7a025	Merge pull request #12943 from vladest/fix_spinbox Fix SpinBox.	2018-04-23 13:02:01 -07:00
NissimHadar	ea6585a0b9	Corrected tosRGBFloat() computation.	2018-04-23 11:53:35 -07:00
MiladNazeri	3710ce593d	Merge pull request #12922 from ctrlaltdavid/21815 Controller API JSDoc	2018-04-21 10:44:05 -07:00
vladest	2e44220b80	Merge branch 'master' into fix_spinbox	2018-04-21 19:38:28 +02:00
MiladNazeri	080e26f408	Merge pull request #12952 from ctrlaltdavid/21851 Vec3 API JSDoc	2018-04-20 18:10:18 -07:00
Seth Alves	84e71a9bca	missed a file	2018-04-20 16:08:57 -07:00
Seth Alves	bec39369f7	remove some uncatagorized logging, suppress some categories by default	2018-04-20 16:08:57 -07:00
David Rowe	7087abd201	Merge branch 'master' into 21815	2018-04-21 10:49:56 +12:00
Simon Walton	9f9a68188d	Merge remote-tracking branch 'upstream/master' into short-id	2018-04-20 11:10:21 -07:00
David Rowe	0a7cccc3f7	Move Vec2 and Vec4 JSDoc	2018-04-20 12:47:53 +12:00
vladest	663af09605	Fix SpinBox. attempt 1	2018-04-19 20:43:48 +02:00
John Conklin II	cad4d45941	Merge pull request #12871 from Atlante45/fix/dead-octree-code Remove dead Octree code	2018-04-19 09:58:20 -07:00
Stephen Birarda	c4ad93bafb	Merge pull request #12782 from SimonWalton-HiFi/qregexp Replace LogHandler repeated regex scheme with assigned ID tracking scheme	2018-04-18 17:28:48 -07:00
Clement	2e8a6e1961	Remove more dead octree code	2018-04-17 18:21:51 -07:00
David Rowe	c1ede6ef58	Merge branch 'master' into 21815 # Conflicts: # tools/jsdoc/plugins/hifi.js	2018-04-17 11:54:56 +12:00
David Rowe	9f83c606e9	Controller API JSDoc	2018-04-17 11:46:40 +12:00
Simon Walton	9b6306601a	Merge Clement's PR12700 diffs for early trace start	2018-04-10 13:13:46 -07:00
Simon Walton	f10bbce557	Squelch initialization warning	2018-04-04 18:32:40 -07:00
Simon Walton	d05f0600d4	Handle one-time messages outside LogHandler class Also change to std::call_once for the file-scope message IDs.	2018-04-04 15:44:47 -07:00
Simon Walton	ce5f6da6ca	Restore setup of flush timer that was inadvertently lost	2018-04-04 14:43:26 -07:00
Simon Walton	ed3347a89b	Repeated logging - reviewer fixes	2018-04-04 14:11:10 -07:00
Simon Walton	692ccfc09b	Create HIFI_FCDEBUG(_ID) variants that require a category Original macros use default settings.	2018-04-04 09:49:15 -07:00
Simon Walton	7d16ca9c1c	Remove uses of addRepeatedMessageRegex() and its implementation Change to new log-message ID scheme.	2018-04-03 17:54:01 -07:00
Simon Walton	d4ab06b1d4	Move HIFI_FDEBUG macro to LogHandler.h Not all uses of repeated log messages include NetworkLogging.h, but if they use addRepeatedMessageRegex() they must include LogHandler.h. Also add second macro for client-supplied message ID.	2018-04-03 15:53:12 -07:00
Clément Brisset	3d4490f3fd	Merge pull request #12737 from highfidelity/RC66 RC66 mergeback	2018-04-03 15:39:16 -07:00
Simon Walton	5b0bcd76e3	Repeated logging - Fixes and clean-up	2018-04-03 12:23:21 -07:00
Simon Walton	a7fc6a2991	Repeated logs - use #define to replace qCDebug	2018-04-03 10:44:53 -07:00
Simon Walton	6d078f41e7	Use unique IDs for log strings that should have repeats supressed	2018-04-02 17:32:18 -07:00
SamGondelman	afe39aba46	fix octal code char issue	2018-03-29 10:05:08 -07:00
Simon Walton	bed4033554	Local node IDs now working correctly Move typedef to single location; fixes for replicated packets (probably still not correct); reserve zero as local ID; pass domain server's local ID in domain server list; other tweaks.	2018-03-27 18:18:14 -07:00
Dante Ruiz	4d52caccde	making some more requested changes	2018-03-22 17:39:22 -07:00
Seth Alves	bea7ee42e2	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 14:30:07 -07:00
John Conklin II	2d63afbe28	Merge pull request #12588 from SamGondelman/shapeTex Materials on primitives	2018-03-21 12:08:24 -07:00
Seth Alves	bc527d5ae8	try again on expandToLocalDataAbsolutePath	2018-03-19 14:59:10 -07:00
Seth Alves	a623ba7499	expandToLocalDataAbsolutePath now expands to a file:// url rather than a qrc:// url	2018-03-19 13:48:31 -07:00
Seth Alves	af42b5e93f	trying to fix expandToLocalDataAbsolutePath	2018-03-19 09:42:03 -07:00
Seth Alves	e3022da787	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-16 09:34:38 -07:00
Seth Alves	2fd6bc4130	rename Mesh api getPos3 to getPos, deprecate but still support getPos3	2018-03-14 10:24:44 -07:00
Seth Alves	b39c7eadd2	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-13 09:24:18 -07:00
Sam Gondelman	c59d29f4ee	Merge pull request #12623 from SamGondelman/android Android: Fix corruption on startup	2018-03-12 15:03:07 -07:00
MiladNazeri	e054f16c46	Merge pull request #12526 from ctrlaltdavid/21709 Entities API JSDoc	2018-03-12 14:40:09 -07:00
SamGondelman	9953e7051f	Merge remote-tracking branch 'upstream/master' into android	2018-03-12 14:15:31 -07:00
SamGondelman	4bef033d6f	cleanup, don't compress rcc file to fix corruption	2018-03-12 13:05:03 -07:00
Seth Alves	22f1ec5c82	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-10 14:49:25 -08:00
Simon Walton	cc166dbece	LogHandler regexps - use vector of values	2018-03-09 15:44:56 -08:00
Seth Alves	c781f88239	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-09 15:43:14 -08:00
Simon Walton	d4cf22fbaf	LogHandler class stores regexps - code tweaks Code standard changes from review.	2018-03-09 15:29:10 -08:00
Simon Walton	4b27cd73ff	LogHandler class stores regexps rather than always recreating General efficiency tweaks; move to C++11.	2018-03-09 15:29:09 -08:00
Andrew Meadows	7a39bd5c81	remove tab whitespace	2018-03-09 08:35:18 -08:00
Andrew Meadows	7a19f48b9c	move rayHitsSphere logic to AABox method	2018-03-09 08:35:18 -08:00
Andrew Meadows	79b9fec900	add rayHitsSphere() util method	2018-03-09 08:35:18 -08:00
SamGondelman	96e48a0162	warnings	2018-03-07 13:50:51 -08:00
Dante Ruiz	8382d842e1	changing to resources path	2018-03-07 12:51:26 -08:00
SamGondelman	19e4fb2355	materials on primitives	2018-03-07 12:22:17 -08:00
David Rowe	a62b6b7150	Merge branch 'master' into 21709	2018-03-07 17:34:53 +13:00
David Rowe	eeb7f5ca8d	Doc review	2018-03-07 17:29:39 +13:00
Seth Alves	45157a16f2	merge from upstream	2018-03-02 09:57:27 -08:00
David Rowe	f9086e31de	Deprecate Entities.getMeshes() in favor of using the new Graphics API	2018-03-01 10:08:50 +13:00
David Rowe	a782b6779a	Merge branch 'master' into 21709 # Conflicts: # interface/src/ui/overlays/Overlays.h # interface/src/ui/overlays/Shape3DOverlay.cpp # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/EntityScriptingInterface.h	2018-02-28 12:42:05 +13:00
Seth Alves	a44ddbbc26	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-27 14:09:05 -08:00
Brad Davis	136ced98c3	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
Stephen Birarda	9cc348ef27	Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings	2018-02-27 09:59:37 -08:00
Seth Alves	636c271dc3	merge from upstream	2018-02-27 09:21:08 -08:00
John Conklin II	48f0cded05	Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting Leopoly_Phase1_010 Graphics Scripting	2018-02-27 07:53:25 -08:00
John Conklin II	25144f0fec	Merge pull request #12456 from Atlante45/fix/min-spec-crash Fix crash when passing --checkMinSpec flag	2018-02-26 17:35:46 -08:00
Stephen Birarda	7e3d4d7503	Merge pull request #12506 from birarda/feat/content-settings merge upstream/master into upstream/feat/content-settings	2018-02-26 18:08:58 -07:00
Stephen Birarda	aa7bd2066a	Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings	2018-02-26 17:02:00 -08:00
Atlante45	2a204533f4	Add comments to startup processes	2018-02-26 16:25:41 -08:00
Seth Alves	666fa77be2	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-26 13:53:20 -08:00
Ryan Huffman	dbfbee5406	CR	2018-02-26 13:53:20 -08:00
Brad Davis	b9387f2a21	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-26 13:18:14 -08:00
Anthony J. Thibault	c8af9c6f04	Missing EPSILON	2018-02-26 10:05:15 -08:00
Anthony J. Thibault	0404b722e4	Code review feedback	2018-02-26 10:00:32 -08:00
David Rowe	c2d8c96463	Entities collisions JSDoc	2018-02-26 14:10:33 +13:00
Seth Alves	5632f9d8fd	clean up debug prints. put filename in window title-bar when connected to a serverless domain	2018-02-23 16:46:42 -08:00
Seth Alves	3be1988260	fix expandToLocalDataAbsolutePath	2018-02-23 14:27:28 -08:00
Seth Alves	1e49dc5ca2	try using app-local-data path for /~/	2018-02-23 13:58:23 -08:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
Dante Ruiz	364081df63	Merge branch 'serverless-domains' into serverless-domains	2018-02-23 11:54:53 -08:00
Dante Ruiz	73ea0dbc05	use resources path instead	2018-02-23 11:51:31 -08:00
Seth Alves	9b8c925b72	still trying to get /~/ in json files to work right	2018-02-23 11:09:09 -08:00
Seth Alves	277e1ebec4	fix /~/ expansion on osx	2018-02-23 10:50:57 -08:00
David Rowe	26404a6ce8	Entities functions JSDoc bulk	2018-02-23 19:27:13 +13:00
Atlante45	c106fee659	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration	2018-02-22 19:45:43 -08:00
Anthony J. Thibault	0469eafbe4	Switch between dualQuats and matrix skinning based on model entity scale factor.	2018-02-22 18:35:16 -08:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
Atlante45	277e556b48	Create a standard function to init Hifi Apps	2018-02-22 17:06:09 -08:00
Atlante45	80c0f2a21e	Fix crash when passing --checkMinSpec flag That flag caused a DLL to be loaded before Application was instanced. This triggers a Qt bug inside Q_COREAPP_STARTUP_FUNC that causes the previous registration pointing the startup function in the main executable to be overridden with the address of the function in the DLL (Since they both link the same static library) This leads to the correct function running in the wrong address space (the DLLs), hence not initializing some global variables correctly.	2018-02-22 16:29:38 -08:00
David Rowe	25b1e9f50b	Fix PickRay JSDoc	2018-02-23 12:05:33 +13:00
humbletim	72fca7e57e	Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge	2018-02-22 05:18:05 -05:00
humbletim	be8d79f53f	CR fedback and cleanup	2018-02-22 05:15:01 -05:00
Seth Alves	f44749387a	cleanups	2018-02-21 15:24:54 -08:00
SamGondelman	4c6169ec78	merge and a little cleanup	2018-02-20 15:45:34 -08:00
Dante Ruiz	43ce9508ee	better way to handle urls	2018-02-20 14:27:21 -08:00
Dante Ruiz	024d5d30c6	adding print statment	2018-02-20 11:34:24 -08:00
Dante Ruiz	8fc50222f5	allow json for uses /~/ for file paths	2018-02-20 11:20:42 -08:00
humbletim	5791ca4c51	interim checkin	2018-02-20 12:22:04 -05:00
Seth Alves	25c34403db	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-19 11:24:42 -08:00
David Rowe	67cfe783be	Entity properties JSDoc	2018-02-19 12:17:31 +13:00
Dante Ruiz	e0bbc57f6c	support relative file path from appliaction directory	2018-02-16 14:48:38 -08:00
Stephen Birarda	f5cad5683d	make sure backup handlers end up on the correct thread	2018-02-15 15:39:25 -08:00
Ryan Huffman	cb9327e030	Add entity file sync and domain content backups	2018-02-15 10:09:20 -08:00
Sam Gondelman	15cdfef16a	Merge branch 'master' into decals	2018-02-14 17:33:01 -08:00
SamGondelman	324eefc914	remove fresnel, add unlit, fix overlays, cleanup	2018-02-14 17:02:07 -08:00
John Conklin II	63f752e76f	Merge pull request #12366 from sethalves/fix-children-of-animated-entity-joints fix -- get children of animated entity joints to follow along, again	2018-02-14 11:12:45 -08:00
SamGondelman	4500ed17e7	merge from master	2018-02-13 13:58:39 -08:00
Andrew Meadows	20c2a4470e	merge 'findByID' into 'workload-001'	2018-02-13 11:47:02 -08:00
Andrew Meadows	38bc312004	faster and const EntityTree::findByID()	2018-02-13 11:25:34 -08:00
Andrew Meadows	a1c540fc85	instantiate trace_workload logging category	2018-02-13 08:57:20 -08:00
Andrew Meadows	d59c3898dc	add 'workload' logging profile	2018-02-13 08:57:20 -08:00
Sam Gateau	714e3f445d	Merge pull request #11537 from jherico/threaded_qml Migrating QML rendering off the main thread	2018-02-12 15:32:33 -08:00
John Conklin II	51bf3c1466	Merge pull request #12323 from Zvork/shadow Shadow performance / acnee improvements	2018-02-12 14:41:13 -08:00
John Conklin II	d084e58f48	Merge pull request #12328 from Atlante45/fix/misc-bugs Misc bug fixes	2018-02-12 14:31:38 -08:00
SamGondelman	9e8aa1898c	warnings, load material from URL, shapeID -> parentMaterialID	2018-02-12 12:50:09 -08:00
Sam Gateau	f3918ad216	Merge pull request #12367 from AndrewMeadows/fix-shared-unit-tests Fix shared unit tests	2018-02-09 17:18:35 -08:00
Bradley Austin Davis	dbc4b1533d	Fixing build warnings in minipromises	2018-02-09 10:12:32 -08:00
RebeccaStankus	14839bc5f4	Some improvements to the log window -Renamed button "Clear Filters" to "All Messages" -Changed search result matching text to a more visible color -Made Date/Time text more visible -Added count of current messages in window -Set window to show all messages with no filtering upon first opening	2018-02-08 11:26:02 -08:00
Andrew Meadows	572edab79f	remove dupe const	2018-02-07 16:48:31 -08:00
Seth Alves	b6ac348428	get children of animated entity joints to follow along, again	2018-02-07 16:30:07 -08:00
Olivier Prat	2940a67b3e	Merged with master	2018-02-03 16:55:25 +01:00
SamGondelman	4d4294dd6a	Merge remote-tracking branch 'upstream/master' into decals	2018-02-02 16:50:01 -08:00
SamGondelman	d7f4b033e8	wip finish adding material entity	2018-02-02 16:49:33 -08:00
Atlante45	8ebb3e52d8	Misc bug fixes	2018-02-02 13:10:49 -08:00
Olivier Prat	234cb1e3e6	Added anti frustum test to remove lower cascade objects from higher shadow cascades	2018-02-02 12:15:43 +01:00
Olivier Prat	3804917cf4	Orthographic octree selection seems to be working	2018-02-02 09:40:57 +01:00
humbletim	06afaa7470	BufferView <-> QVariant/QScriptValue conversion update MeshProxy/SimpleMeshProxy and ScriptableModel ModelScriptingInterface / scriptable::ModelProvider integration update to RC-63 initial graphics-scripting refactoring graphics-scripting baseline commit wip commit Geometry -> MeshPart remove SimpleMeshProxy collapse graphics-utils -> graphics-scripting scriptable::Model => scriptable::ScriptableModel	2018-02-01 16:30:29 -05:00
Atlante45	bc819c698e	Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back	2018-01-30 16:09:30 -08:00
Atlante45	db08f1dda6	Move backtrace to interface	2018-01-30 11:39:48 -08:00
Atlante45	cb6bebd824	Fix Mac dev builds	2018-01-29 19:47:36 -08:00
MiladNazeri	3585bead96	Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes Leopoly_Phase1_004_RayPick-Changes	2018-01-29 14:02:38 -08:00
Atlante45	061f9ea359	Don't run settings preroutine when not initialized	2018-01-29 12:09:16 -08:00
MiladNazeri	9baf02b7a1	Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request Leopoly_Phase1_003_Asset-Request	2018-01-29 11:40:41 -08:00
Seth Alves	dbe9fd290e	comment out code that would set annotations after StartHandler is called	2018-01-26 09:23:29 -08:00
Atlante45	df62ba88cb	Fix rebase error	2018-01-26 09:22:37 -08:00
Seth Alves	c02ab28c60	fix clang build	2018-01-26 09:22:28 -08:00
Atlante45	39f26e35f0	backtrace for rc-63	2018-01-26 09:22:14 -08:00
Seth Alves	6c04431636	call startCrashhandler from interface	2018-01-26 09:20:29 -08:00
Atlante45	ced5aad1d1	backtrace for rc-63	2018-01-26 09:20:07 -08:00
Brad Davis	361b767586	Merge branch 'fix/render_config' into android	2018-01-25 14:50:41 -08:00
Brad Davis	3915a2d4ba	Fix resource loading from source tree	2018-01-25 11:07:39 -08:00
Anthony J. Thibault	58d3d8ef3d	Bug fix for incorrect positioned eyes on other peoples avatars There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer. A unit test was added to verify that writeBitVector() and readBitVector() are correct. (cherry picked from commit `a252e90f96`)	2018-01-24 21:14:29 -08:00
Anthony J. Thibault	a252e90f96	Bug fix for incorrect positioned eyes on other peoples avatars There was a bug in writeBitVector(), where the last byte was not consistantly written into the destination buffer. A unit test was added to verify that writeBitVector() and readBitVector() are correct.	2018-01-24 18:58:08 -08:00
Brad Davis	5049bac6ff	Add helper function for QFileSelector	2018-01-23 12:25:22 -08:00
humbletim	65455e7b50	Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes	2018-01-23 14:57:33 -05:00
humbletim	3a735c1fc7	CR feedback and code cleanup	2018-01-23 03:12:26 -05:00
Brad Davis	8ae0b09ea2	Merge remote-tracking branch 'upstream/master' into android	2018-01-22 15:07:30 -08:00
John Conklin II	4697c5f92c	Merge pull request #12225 from hyperlogic/bug-fix/sassy-avatar Fix for avatars with crooked spine/head when exiting HMD mode	2018-01-22 11:50:44 -08:00
Brad Davis	d2fe9e2710	PR feedback	2018-01-19 20:24:34 -08:00
Anthony J. Thibault	cd4d9255bd	Added defaultPoseFlags to avatar protocol Change rotationSet to rotationIsDefaultPose for JointData Also for translation. Fixed all code to flip boolean value. Created EntityJointData so that the ModelEntity stuff doesn't need to change.	2018-01-19 15:34:27 -08:00
Brad Davis	d53b8b38ac	Merge remote-tracking branch 'upstream/master' into android	2018-01-19 14:35:20 -08:00
humbletim	31cdd5cca2	QueuedConnection per CR feedback	2018-01-18 22:20:28 -05:00
Andrew Meadows	3d3bfcf7a3	check dirty flags when harvesting physics results	2018-01-18 17:43:22 -08:00
Bradley Austin Davis	6200d31c93	Fixing OSX resources URL	2018-01-17 14:46:27 -08:00
humbletim	49bb9420cc	Merge branch 'master' into Leopoly_Phase1_003_Asset-Request	2018-01-17 17:11:33 -05:00
SamGondelman	134a026d8a	merge from master	2018-01-17 13:36:07 -08:00
humbletim	744da48551	add apache 2.0 headers	2018-01-17 14:00:50 -05:00
Bradley Austin Davis	503fed19a7	Trying to fix mac resource loading	2018-01-17 10:36:34 -08:00
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
Bradley Austin Davis	b4223215ef	Use old style resources on OSX for now	2018-01-16 14:44:05 -08:00
humbletim	b91d536dd0	rename model:: -> graphics::	2018-01-16 12:46:16 -05:00
SamGondelman	241849139f	wip	2018-01-15 10:21:16 -08:00
Brad Davis	58530c595a	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
Brad Davis	bee869d88e	Merge remote-tracking branch 'upstream/master' into android	2018-01-14 13:53:47 -08:00
Anthony J. Thibault	7753b8a0b5	Merge branch 'master' into feature/dual-quat	2018-01-11 17:31:29 -08:00
Brad Davis	001edcd71b	Allow creation of empty files with storage API	2018-01-11 08:06:52 -08:00
Brad Davis	97593bc4d8	Fixing compiled resource access	2018-01-10 17:18:12 -08:00
Brad Davis	2c35242af1	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-10 13:40:12 -08:00
Brad Davis	7a7aee770c	Switching to binary resources	2018-01-10 13:39:56 -08:00
Brad Davis	bd5af2b493	Working on android avatar rendering	2018-01-09 11:40:32 -08:00
Anthony J. Thibault	fbea22e0f0	Renamed imag component to dual, using the correct nomenclature Also removed incomplete test from unit tests.	2018-01-08 18:21:23 -08:00
Brad Davis	a2c2e7d9ff	Fixes to load cubemap	2018-01-08 14:43:54 -08:00
Anthony J. Thibault	d08f94a74d	Code review feedback * Removed AnimPose::fuzzyEqual * Fixed DualQuaternion ctor	2018-01-08 13:36:23 -08:00
Anthony J. Thibault	59b843781e	Merge branch 'master' into feature/dual-quat	2018-01-08 13:18:42 -08:00
Gabriel Calero	7fbd23f36b	Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr	2018-01-08 17:38:28 -03:00
Gabriel Calero	6050737e7c	Resolving comments in PR	2018-01-08 17:36:08 -03:00
Bradley Austin Davis	68cd768a65	Merge branch 'android' into android_render_pr	2018-01-08 12:49:52 -05:00
Nissim Hadar	8e793e790a	Deleted unused include file.	2018-01-07 14:11:26 -08:00
humbletim	fc41bcca5a	removing unnecessary qWarning() debug output	2018-01-05 18:41:51 -05:00
Brad Hefta-Gaub	6a3609093d	Merge pull request #12051 from dback2/polyobjimportfixes Poly obj import fixes	2018-01-05 13:33:29 -08:00
David Back	7558b00467	better fix for model scale floor, remove abs	2018-01-04 17:49:39 -08:00
David Back	6b9658f8cf	merge	2018-01-04 16:41:58 -08:00
Anthony J. Thibault	bcd813ac62	Optimizations and cleanup	2018-01-04 16:15:44 -08:00
Anthony J. Thibault	e86fd4f992	Removed SKIN_COMP define, re-enabled cauterization	2018-01-04 16:15:42 -08:00
Anthony J. Thibault	5bb0b06061	WIP: Dual Quaternion compensation for spinning the right way.	2018-01-04 16:15:39 -08:00
Anthony J. Thibault	8bdddf7211	Full Dual Quaternion support	2018-01-04 16:15:38 -08:00
Anthony J. Thibault	565875e823	WIP first attempt at dual quat skinning	2018-01-04 16:09:02 -08:00
Gabriel Calero	32494a8e24	Set QMLEngine base path for android	2018-01-03 22:13:31 -03:00
Gabriel Calero	fc62b2d34a	Fix ktx_cache path for android. Load the least js scripts for android	2018-01-03 16:42:18 -03:00
Gabriel Calero	78f2a8c566	Copy scripts from android assets at startup	2018-01-03 16:40:14 -03:00
Gabriel Calero	468fc89c3e	Use forward pipeline for android	2018-01-03 16:38:23 -03:00
RebeccaStankus	89138c9bd8	More filter choices, search will clear	2018-01-03 11:35:46 -08:00
humbletim	e941036337	renames per CR feedback / code cleanup	2018-01-02 15:28:01 -05:00
RebeccaStankus	efdba3b6e6	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter2	2018-01-02 08:59:42 -08:00
Seth Alves	4bbce011a4	Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3 avatar-entities which are children of an avatar will scale with the avatar	2017-12-29 09:12:17 -08:00
David Back	24981a560f	fix scaling threshold	2017-12-28 11:56:39 -08:00
RebeccaStankus	296f0a323a	saving for Wednesday	2017-12-26 15:56:05 -08:00
Stephen Birarda	e3cbfd92a0	Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back	2017-12-22 15:48:04 -08:00
Seth Alves	897b96d092	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 07:36:26 -08:00
Stephen Birarda	05b45f2e7e	adjust example and add clarifying comments to PrioritySortUtil	2017-12-21 15:40:08 -08:00
humbletim	a146b778f7	support additional .extraInfo for ray intersections	2017-12-21 12:35:13 -05:00
humbletim	7e1be2b17c	shared promises library	2017-12-21 11:35:14 -05:00
Brad Davis	9f7b6f543d	Merge remote-tracking branch 'upstream/master' into HEAD	2017-12-18 11:17:07 -08:00
Andrew Meadows	cfd2097f36	Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js Cleanup names of debug stats and trace contexts.	2017-12-18 10:02:42 -08:00
Zach Fox	3764445272	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-13 14:12:08 -08:00
Sam Gateau	a75010fb94	Merge pull request #11938 from Zvork/csm Cascaded Shadow Maps and bug fix	2017-12-14 00:32:43 +07:00
Andrew Meadows	87fa919ac8	save files to Documents by default	2017-12-12 14:11:25 -08:00
David Rowe	578c42b4ea	Merge branch 'master' into 21624	2017-12-13 09:41:09 +13:00
MiladNazeri	16e16501cd	Merge pull request #11791 from ctrlaltdavid/21602 JSDoc updates	2017-12-12 12:18:02 -08:00
David Rowe	58fa8b9fbf	Miscellaneous fixes	2017-12-12 10:49:05 +13:00
Seth Alves	2cd64ccd2c	merge from upstream	2017-12-11 10:14:30 -08:00
Zach Fox	b81cdf49ef	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-11 09:52:32 -08:00
Olivier Prat	a679dc6705	Merge branch 'master' of git://github.com/highfidelity/hifi into csm	2017-12-11 08:48:48 +01:00
Sam Gateau	429d54d65d	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-10 09:53:22 -08:00
divya	e187852df1	Merge pull request #11941 from huffman/feat/atp-baking-process Move asset server baking to a separate process	2017-12-09 20:48:14 -08:00
Ryan Huffman	e3d00c4aa5	Remove unnecessary logging from PathUtils	2017-12-08 17:48:10 -08:00
Ryan Huffman	982607eedf	Remove unused variable from PathUtils	2017-12-08 15:40:33 -08:00
Zach Fox	a81a981676	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-08 09:44:52 -08:00
Sam Gateau	d07cde3ecb	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-07 19:20:25 -08:00
Seth Alves	40412b80c6	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-07 17:03:04 -08:00
Zach Fox	b2bafed2bb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-07 11:21:24 -08:00
Anthony J. Thibault	fbcecbfc89	Merge branch 'master' into feature/domain-limited-height	2017-12-07 10:01:33 -08:00
Ryan Huffman	2eecb41337	Update metatype registration in assetBakeTask	2017-12-06 13:59:46 -08:00
Ryan Huffman	6b098bfc6a	Fix aborted baking in oven cli	2017-12-06 13:51:31 -08:00
Ryan Huffman	cb9a30413d	Rename removeTemporaryDis to removeTemporaryApplicationDirs	2017-12-06 12:50:20 -08:00
Ryan Huffman	f20aa2e680	Fix asset server baking not working on *nix	2017-12-06 11:49:34 -08:00
Ryan Huffman	de7e3e60cd	Add temp dir removal to asset server	2017-12-06 11:49:34 -08:00
Olivier Prat	c9c93370da	Fixed weird bug with objects suddenly poping out of the shadow map. Was due to objects with own pipeline corrupting the render state. Don't know why though	2017-12-06 15:26:44 +01:00
Olivier Prat	c0ca7a129d	Fixed issue with far distance of cascades being underestimated, especially first cascade	2017-12-05 17:33:11 +01:00
Olivier Prat	0b6dcb2717	Merge branch 'master' of git://github.com/highfidelity/hifi into csm	2017-12-05 09:18:26 +01:00
samcake	9fceaad38b	Merging with master	2017-12-04 14:20:10 -08:00
Seth Alves	b590cd5b89	avatar-entities which are children of an avatar will scale with the avatar	2017-12-02 09:31:43 -08:00
Andrew Meadows	05fbf8e511	workaround for zero-size objects in priority formula	2017-11-30 11:04:51 -08:00
David Rowe	4269cc4004	Camera API JSDoc fixes	2017-11-30 09:28:45 +13:00
Andrew Meadows	e068eb879c	use PrioritySortUtil for outgoing avatar updates	2017-11-28 09:11:14 -08:00
Andrew Meadows	d65101c4e9	sort and throttle avatar updates in interface	2017-11-28 09:07:17 -08:00
David Rowe	cd2922a560	Merge branch '21602' into 21624 # Conflicts: # tools/jsdoc/plugins/hifi.js	2017-11-28 17:04:59 +13:00
David Rowe	92493f14d7	Miscellaneous JSDoc fixes	2017-11-28 16:30:09 +13:00
David Rowe	425e2eb82c	Add missing parameter to Camera.newMode() JSDoc	2017-11-25 18:24:58 +13:00
David Rowe	16dd9e0063	Move Camera mode JSDoc to be a typedef	2017-11-25 18:24:38 +13:00
David Rowe	9983e1fd1c	Polish Paths JSDoc	2017-11-25 18:06:27 +13:00
David Rowe	167bc21784	Fix up PickRay and StylusTip JSDoc	2017-11-25 17:23:53 +13:00
David Rowe	de49fefc61	Merge branch 'master' into 21602 # Conflicts: # libraries/shared/src/RegisteredMetaTypes.h	2017-11-25 17:06:36 +13:00
David Rowe	73f5841c9f	Add PointerEvent and KeyboardModifiers API types JSDoc	2017-11-25 16:18:57 +13:00
David Rowe	06012d9dfc	Add Color and Rect API types JSDoc	2017-11-25 16:18:40 +13:00
samcake	84ff40c717	Merging with master	2017-11-21 14:12:47 -08:00
Anthony J. Thibault	9f54ce55f3	Change domain setting from min/max avatar scale to min/max avatar height * Domain settings version has been bumped from version 2.0 to 2.1 * Old domain settings for avatar scale will be auto-converted to avatar height * Avatar code has been changed so that limitDomainScale() works with the new height limits * Avatar getUnscaledEyeHeight() was added to C++. * MyAvatar.getHeight() was added to JS.	2017-11-21 13:25:47 -08:00
Dante Ruiz	76935c1457	fixing merge conflict	2017-11-20 09:51:10 -08:00
samcake	a74372b233	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-20 09:26:29 -08:00
ZappoMan	04ee1adabd	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-19 14:40:31 -08:00
Brad Hefta-Gaub	33d35bbe14	Merge pull request #11770 from AndrewMeadows/sort-and-throttle sort and throttle UpdateRenderables work... when necessary	2017-11-19 11:09:08 -08:00
Zach Fox	7d34b3fe67	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-11-17 15:45:03 -08:00
SamGondelman	61c7ccde6e	cleanup	2017-11-17 10:45:39 -08:00
Olivier Prat	d98dfff0a8	Still working on solving that underestimated shadow far plane on the first cascade. I have finally understood the problem (see TODO in LightStage)	2017-11-17 19:25:21 +01:00
SamGondelman	ac7242102c	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-16 09:47:29 -08:00
SamGondelman	e3aa79990b	merge with master	2017-11-16 09:45:32 -08:00
Sam Gateau	6889c9d6d1	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-11-15 18:49:30 -08:00
samcake	771c64fc97	Working on the selection highlight js interface	2017-11-15 18:21:07 -08:00
SamGondelman	3274c41aeb	Merge remote-tracking branch 'upstream/pointers' into ui	2017-11-15 17:45:45 -08:00
David Rowe	6f82049021	Merge branch 'master' into 21602	2017-11-16 13:41:29 +13:00
David Rowe	a29a3ff88d	Paths API JSDoc improvements	2017-11-16 12:58:03 +13:00
Ryan Huffman	60a222e4b4	Merge pull request #11810 from Atlante45/fix/stuck-acs Fix stuck ACs	2017-11-15 14:59:51 -08:00
SamGondelman	7eb22b372f	merge with master	2017-11-15 14:35:30 -08:00
SamGondelman	8730a26d20	use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation	2017-11-15 14:12:16 -08:00
David Rowe	41e929c8a2	Add missing types to typedefs	2017-11-16 10:58:03 +13:00
Brad Davis	26a745be6f	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-15 11:59:06 -08:00
Atlante45	d8b1cb10df	CR	2017-11-15 11:20:30 -08:00
Olivier Prat	e4818f1b4f	Merged request changes from shadow	2017-11-15 17:51:06 +01:00
Olivier Prat	f47a3e7d2c	Moved draw frustum job to render DrawTask and made generic. A couple of fixes as requested by @samcake	2017-11-15 09:42:57 +01:00
Andrew Meadows	500f381827	collect hard-coded time budgets in one spot	2017-11-14 15:57:17 -08:00
Andrew Meadows	ffe16a754e	another pass through the crucible	2017-11-14 15:57:17 -08:00
Andrew Meadows	f67114a0a8	PrioritySortUtil::Prioritizer doesn't need to be a template	2017-11-14 15:57:17 -08:00
Andrew Meadows	55cc945c78	organize PrioritySortUtil differently	2017-11-14 15:57:17 -08:00
Andrew Meadows	99b4283cbc	fix typo in 'out-of-view' check	2017-11-14 15:57:17 -08:00
Andrew Meadows	d7b84f8a86	fix typo in comment	2017-11-14 15:57:17 -08:00
Andrew Meadows	8707c76a6a	templatize the ViewFrustum-relative sort algorithm	2017-11-14 15:57:17 -08:00
Atlante45	b31118fe00	CR	2017-11-14 11:41:43 -08:00
Atlante45	6b5b905b2a	Exit right away if the parent process died	2017-11-14 11:41:43 -08:00
Atlante45	462ec30cac	Utilise Windows Job Object so child dies w/ parent	2017-11-14 11:41:43 -08:00
SamGondelman	60db24f2d3	merge with master	2017-11-13 14:36:24 -08:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00
David Rowe	fb550d59f0	Better place for ViewFrustum JSDoc	2017-11-14 11:34:15 +13:00
SamGondelman	2c0272f304	(mostly?) fix touch events	2017-11-13 12:58:31 -08:00
David Rowe	4a84116877	Merge branch 'master' into 21602	2017-11-14 08:27:13 +13:00
Brad Davis	5cf9c1bb33	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-13 10:48:21 -08:00
Olivier Prat	dd6b7b04c2	Merged with master	2017-11-13 14:33:59 +01:00
Olivier Prat	fa58cf2e60	Merged with master	2017-11-13 14:07:48 +01:00
David Rowe	9c5149733d	Paths JSDoc	2017-11-13 12:41:28 +13:00
David Rowe	2119e01ac3	Tidying	2017-11-13 11:59:21 +13:00
David Rowe	dba16c265c	PickRay JSDoc	2017-11-12 13:50:07 +13:00
David Rowe	e4daaa8d67	ViewFrustum JSDoc	2017-11-12 12:50:39 +13:00
David Rowe	9d9f684af5	Tidying	2017-11-12 11:44:51 +13:00
David Rowe	39ccd7d656	Update JSDoc for Camera API	2017-11-12 11:04:35 +13:00
Sam Gateau	ecf67cc331	Merge pull request #11650 from Zvork/outline Multiple Outline Groups	2017-11-10 15:45:03 -08:00
Brad Davis	7bf1b176d7	Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem	2017-11-10 14:21:24 -08:00
Andrew Meadows	469b68011c	Merge pull request #11566 from hyperlogic/bug-fix/div-by-zero div by zero fixes, detected by address sanitizer	2017-11-10 13:47:40 -08:00
Anthony Thibault	08c12a1ced	Merge pull request #11704 from AndrewMeadows/shape-manager-key cleanup ShapeInfo hash generation	2017-11-10 11:31:46 -08:00
Anthony J. Thibault	4169e11e77	Merge branch 'master' into bug-fix/div-by-zero	2017-11-10 10:15:26 -08:00
Olivier Prat	8b6a2eeb24	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-11-10 10:19:32 +01:00
SamGondelman	5a78c9ebfe	integrated stylus into pointer system, need to update controller module	2017-11-09 11:59:17 -08:00
SamGondelman	f970eb2302	merge with pointers branch	2017-11-06 14:49:50 -08:00
Brad Davis	544c54b8ee	Merge remote-tracking branch 'upstream/master' into HEAD	2017-11-06 10:07:22 -08:00
Olivier Prat	09ee69db30	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-11-06 09:47:48 +01:00
SamGondelman	55ac585cd9	Merge remote-tracking branch 'upstream/master' into ui	2017-11-03 17:32:13 -07:00
SamGondelman	ce58b6c401	trying to fix HUD events, abstracting touch event logic (wip), seth's comments	2017-11-03 17:15:30 -07:00
SamGondelman	dd4275430b	fix hover events, working on HUD events	2017-11-02 17:48:37 -07:00
ZappoMan	b5199220ab	cleanup SpatiallyNestable Velocity to match WorldVelocity naming	2017-11-02 17:07:53 -07:00
Brad Davis	f061b9c2da	Add stylus functionality to pointer manager	2017-11-01 11:27:57 -07:00
Atlante45	7616fe193c	Migrate the DS config version to the config file	2017-10-31 17:35:23 -07:00
SamGondelman	64665c87b2	replace ids with unsigned ints	2017-10-31 17:07:48 -07:00
Stephen Birarda	b8370128ce	remove master config from HifiConfigVariantMap/domain-server	2017-10-31 16:19:50 -07:00
SamGondelman	3c779f1528	HUD events WIP, fix entity/overlay hover, no hover for empty renderState	2017-10-31 14:42:31 -07:00
ZappoMan	f63db42c0e	migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation	2017-10-28 10:14:25 -07:00
ZappoMan	a7a0f03ede	rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()	2017-10-27 18:39:17 -07:00
Andrew Meadows	b00d158342	remove DoubleHashKey: it is no longer used	2017-10-27 07:52:51 -07:00
Andrew Meadows	45e571dd02	cleanup ShapeInfo::getHash()	2017-10-27 07:52:51 -07:00
Olivier Prat	bced566510	Merged from master and disable scissor testing with define macro until I figure out how to make it work in stereo	2017-10-27 10:45:43 +02:00
SamGondelman	7951826e49	more advanced laser focusing	2017-10-26 16:10:27 -07:00
SamGondelman	f0c15e874c	merge with master	2017-10-26 14:52:17 -07:00
SamGondelman	a44e8efb99	merge from master	2017-10-26 12:14:53 -07:00
SamGondelman	cf34fe3345	laserpointers generate pointerevents	2017-10-26 12:01:09 -07:00
Olivier Prat	186b531be6	Merge branch 'master' of git://github.com/highfidelity/hifi into shadow	2017-10-26 15:12:09 +02:00
Olivier Prat	6cf689a385	First draft version of tighter shadow frustum	2017-10-26 12:42:36 +02:00
Andrew Meadows	c14bbb76e6	fix compile errors after merge	2017-10-25 11:57:44 -07:00
Andrew Meadows	2d0b94817c	Merge pull request #11336 from 1P-Cusack/21389_PR2 WL21389 PR2: Representation of collision shapes need updating (details below).	2017-10-25 10:41:21 -07:00
Seth Alves	815f680475	Merge pull request #11675 from ZappoMan/fixRayPick fix ray pick in cases where origin is inside of outer bounding box	2017-10-25 07:07:36 -07:00
Brad Hefta-Gaub	18a74cea91	Merge pull request #11659 from zfox23/mergeRC57IntoMaster_20171023 2017-10-23: Merge RC57 into Master	2017-10-24 21:19:01 -07:00
ZappoMan	9b94f33304	fix ray pick in cases where origin is inside of outer bounding box	2017-10-24 20:48:59 -07:00
Andrew Meadows	996b71fa9a	avoid incorrect ShapeManager dupes for compound shapes	2017-10-24 13:23:46 -07:00
Brad Davis	befe583c5e	Merge remote-tracking branch 'upstream/master' into HEAD	2017-10-24 11:50:07 -07:00
LaShonda Hopper	d3e4d22ce1	[WL21389] Resolve ShapeInfo todos (details below). * Added remaining cylinder/capsule shapes to computeVolume * Point lists are generated during computeShapeInfo, so shouldn't need to be cleared within setParams. ** setSphere/setBox appear to be clear as they're used in tests or in local scopes without using point data. Reviewed-by: Leander Hasty <leander@1stplayable.com> Changes Committed: modified: libraries/shared/src/ShapeInfo.cpp	2017-10-24 14:16:25 -04:00
LaShonda Hopper	5c8e73bb54	[WL21389] Minor: Fix size_t vs int comparison warning. Changes Committed: modified: libraries/shared/src/ShapeInfo.cpp	2017-10-24 14:16:24 -04:00
LaShonda Hopper	e74ebd53c6	[WL21389] Add SHAPE_TYPE_SIMPLE_HULL case to ShapeInfo::getHash (details below). Generates hashes for Simple Hull instances by incorporating their point list into the hash as opposed to the extents. Reviewed-by: Leander Hasty <leander@1stplayable.com> Changes Committed: modified: libraries/shared/src/ShapeInfo.cpp	2017-10-24 14:16:24 -04:00
LaShonda Hopper	9d64a3b991	[WL21389] Fixes warnings from last commit (details below). * Fixes int vs size_t comparison warning within ShapeInfo. * Fixes unused var warning for shapeVerts local var within GeometryCache. This should fix the mac & ubuntu builds. Changes Committed: modified: libraries/render-utils/src/GeometryCache.cpp modified: libraries/shared/src/ShapeInfo.cpp	2017-10-24 14:16:24 -04:00
LaShonda Hopper	dbd1a80046	[WL21389] Set Simulation::DIRTY_SHAPE flag when entity::Shape changes (details below). * Fixes an issue where ShapeEntityItem's collisionShapeType wasn't updated when its entity::Shape type was changed. * Adds getNameForShapeType static method to ShapeInfo. ** Moves shapeTypeNames[] from EntityItemProperties.cpp to ShapeInfo.cpp * Adds collisionShapeType to ShapeEntityItem::debugDump * Tested creating shapes within the Creation Menu: Create Menu -> (Box/Sphere) * Observe Properties tab auto-focus ** From Properties tab elect alternate shape type from the Shape Dropdown list. NOTE: While this fixes an issue with the collision shape, it doesn't completely resolve the issues seen with the polyhedra or polygonal shapes noticed on RELEASE-7130 rebase. Reviewed-by: Leander Hasty <leander@1stplayable.com> Changes Committed: modified: libraries/entities/src/EntityItemProperties.cpp modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/shared/src/ShapeInfo.cpp modified: libraries/shared/src/ShapeInfo.h	2017-10-24 14:16:24 -04:00
LaShonda Hopper	5b50b362f1	[WL21389] WL21389 PR2: Representation of collision shapes need updating (details below). This commit adds support for the polyhedrons and polygons sans Torus and Quad which aren't currently supported within GeometryCache. * Moves GeometryCache::_shapes from public to private scope * Nothing aside from the class should be directly altering this, only querying * Updated instances of direct referencing which looks to have been limited to prior testing of instancing and shapes. * Adds an accessor function for ShapeData to GeometryCache * Consolidates point list generation to helper function * GeometryCache::computeSimpleHullPointListForShape * Moves GeometryCache::Shape to entity::Shape mapping to GeometryCache from RenderableShapeEntityItem * Adds conversion accessor to GeometryCache, GeometryCache::Shape getShapeForEntityShape * Sets ShapeEntityItem::ShapeInfoCalculator callback committed earlier. * This helps circumvent the issue with library inclusion. entity-render knows about entity; however, entity doesn't know about entity-renderer; however, GeometryCache data is needed within entity::ShapeEntityItem to compose the ShapeInfo point list data. * This callback is set up within Application::init of the Interface as it knows about both halves of the equation, and the callback needs to be setup prior to any entities collision data getting generated. * Removes _type reset within ShapeInfo::setPointCollection * This should avoid any issues due to subversively setting the type or incorrectly setting the type as a tangential operation. * Audited instances of ShapeInfo::setPointCollection and all seemed to be calling the function immediately after having set the type via ShapeInfo::setParams * Adds new ShapeType: SHAPE_TYPE_CIRCLE * This type is reserved for the circle which is now treated as a special type of Cylinder_Y with regard to collision as opposed to a simple hull. * Fixes the issue where jumping on a circle, at times, would result in the avatar sliding off towards an edge as if atop a squished cone. * Also updates ShapeInfo::getType() to return ShapeType as opposed to int * Auditing calls showed that majority of places were comparing against ShapeType * ShapeType::_type is a ShapeType so returning the type explicitly is more consistent. * ShapeInfo file houses ShapeType enum so any file aware of ShapeInfo is aware of ShapeType enumeration. * entity::Quad defaults to SHAPE_TYPE_ELLIPSOID * Like entity::Shape::Torus, entity::Shape::Quad is currently unsupported within GeometryCache::buildShapes. * Also it appears that a Quad shape can't be created within world via the creation menu. * There's no explicit option at present to create one. * Trying subvert the Cube/Box creation option to generate one results in an enforced stubby box as opposed to a quad. * Given the aforementioned points, entity::Shape::Quad will default to SHAPE_TYPE_ELLIPSOID as opposed to SHAPE_TYPE_BOX. * Added Todo regarding the shape being unsupported along with a notation to create a special ShapeType, SHAPE_TYPE_QUAD, for it should it be added in the future. * Adds some comments and has some minor clean up. Reviewed-by: Leander Hasty <leander@1stplayable.com> Changes Committed: modified: interface/src/Application.cpp modified: interface/src/Util.cpp modified: interface/src/Util.h modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.h modified: libraries/physics/src/ShapeFactory.cpp modified: libraries/render-utils/src/GeometryCache.cpp modified: libraries/render-utils/src/GeometryCache.h modified: libraries/shared/src/ShapeInfo.cpp modified: libraries/shared/src/ShapeInfo.h modified: tests/gpu-test/src/TestInstancedShapes.cpp	2017-10-24 14:16:17 -04:00
Zach Fox	1f6d989044	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into mergeRC57IntoMaster_20171023	2017-10-23 17:37:43 -07:00
Olivier Prat	68ed061ce5	Again, fix for Mac warning	2017-10-23 16:49:42 +02:00
Olivier Prat	7011fd3731	Removed Mac and Ubuntu warnings	2017-10-23 15:46:11 +02:00
Olivier Prat	0f120a1a2a	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-10-23 10:08:02 +02:00
Brad Hefta-Gaub	d6ad389dab	Merge pull request #11611 from AndrewMeadows/faster-update-renderables Faster renderables update	2017-10-20 13:43:08 -07:00
SamGondelman	d7745efc8e	one global pickmanager	2017-10-19 16:55:24 -07:00
Andrew Meadows	c79bf3bc04	cleanup WANT_DETAILED_PROFILING	2017-10-19 14:31:50 -07:00
SamGondelman	3572f7f5db	non-templated pickresult wip	2017-10-19 13:41:16 -07:00
Seth Alves	633f63df54	fix updateQueryAACube return-value	2017-10-19 13:19:19 -07:00
Seth Alves	f2cb5d4aff	clean-up concept of puffed queryAACube	2017-10-19 13:19:13 -07:00
Seth Alves	cf960dc44b	not a parent or child doesn't mean always recompute queryAACube	2017-10-19 13:19:06 -07:00
Seth Alves	f75e59c0a6	keep grabbed and worn entities from spamming entity-server	2017-10-19 13:18:37 -07:00
Olivier Prat	32df0209f3	Merge branch 'master' of git://github.com/highfidelity/hifi into outline	2017-10-19 17:38:05 +02:00
Olivier Prat	382262da3d	Working scissor with correct projected bounding box rect	2017-10-19 16:23:13 +02:00
Olivier Prat	f890c5bb8c	Added project rect and scissor test. Need to increase bounds to take into account blur width	2017-10-18 19:40:03 +02:00
SamGondelman	640ad514bc	updates based on austin's comments	2017-10-17 17:53:10 -07:00
SamGondelman	05f4883104	get rid of valid	2017-10-17 16:15:54 -07:00
SamGondelman	3ef7ebffba	working generalized pickmanager	2017-10-17 15:09:41 -07:00
SamGondelman	596be8ec27	pickmanager wip	2017-10-17 13:16:37 -07:00
Nissim Hadar	5bfbaf4860	Renamed HazeMode to ComponentMode.	2017-10-13 11:24:56 -07:00
Nissim Hadar	b1174ce40c	Merge branch 'master' into hazeZone	2017-10-12 17:04:42 -07:00
Brad Hefta-Gaub	1bba5ff812	Merge pull request #11554 from sethalves/import-av-entities Import av entities	2017-10-12 13:30:53 -07:00
Nissim Hadar	30fdf9d08e	Merge branch 'master' into hazeZone	2017-10-11 22:12:52 -07:00
Nissim Hadar	832f9fb6e3	Renamed HAZE_MODE_RANGE_ONLY to HAZE_MODE_ENABLED.	2017-10-11 19:10:51 -07:00
Nissim Hadar	ea6b9ed28e	Removed ...ALTITUDE_MODE from combo.	2017-10-11 18:58:59 -07:00
Anthony J. Thibault	18d723b6b4	div by zero fixes, detected by address sanitizer	2017-10-10 16:17:39 -07:00
Clément Brisset	3b48833cc0	Merge pull request #11451 from huffman/feat/upload-user-event Add uploading to asset server event	2017-10-10 11:03:33 -07:00
Nissim Hadar	71f567f15a	Merge branch 'master' into hazeZone	2017-10-09 17:28:10 -07:00
Seth Alves	23f41457be	Revert "Revert "fix importing of avatar entities"" This reverts commit `28a8b18060`.	2017-10-09 11:52:43 -07:00
Seth Alves	28a8b18060	Revert "fix importing of avatar entities"	2017-10-07 16:54:05 -07:00
Brad Hefta-Gaub	62fc193bff	Merge pull request #11532 from sethalves/import-av-entities fix importing of avatar entities	2017-10-06 17:59:54 -07:00
Brad Hefta-Gaub	80f0bd3b79	Merge pull request #11494 from humbletim/add-console-output-basenames [experiment/feedback] Include script name with all JS/QML debug output	2017-10-06 17:58:19 -07:00
Nissim Hadar	e34fb1c874	Merge branch 'master' into hazeZone	2017-10-06 13:20:12 -07:00
Seth Alves	195d96bd43	Merge branch 'master' of github.com:highfidelity/hifi into import-av-entities	2017-10-06 11:02:35 -07:00
Ryan Huffman	9c06afc4c8	Merge pull request #11326 from cain-kilgore/21537 WL 21537 - Improve log naming	2017-10-06 08:51:42 -07:00
Seth Alves	53a49272dc	fix importing of avatar-entities	2017-10-05 11:43:19 -07:00
Cain Kilgore	b3c3b2d34f	Switched Time & Session ID Over	2017-10-05 19:42:31 +01:00
Nissim Hadar	8b72e3044a	WIP - implementing range+altitude mode.	2017-10-04 22:26:53 -07:00
Nissim Hadar	d4acb00aa5	Merge branch 'master' into hazeZone	2017-10-03 17:44:31 -07:00
Andrew Meadows	8d2153d2f3	cleanup debug stats, use more correct names	2017-10-02 13:08:17 -07:00
Andrew Meadows	7df8816a81	faster rate counting	2017-10-02 13:08:17 -07:00
Nissim Hadar	ffecf42ebb	Some clean-up.	2017-10-01 21:12:29 -07:00
Nissim Hadar	2e1919eba5	Merge branch 'master' into hazeZone	2017-09-29 15:16:46 -07:00
humbletim	fd917917c4	include the source basename in Script.print() && QML/Script console.*() debug output	2017-09-29 14:48:01 -04:00
Andrew Meadows	1c30f7424e	remove cruft and add comments	2017-09-29 11:34:35 -07:00
SamGondelman	c39ac93fc8	fix isVerySimilar	2017-09-29 11:34:35 -07:00
Andrew Meadows	d55d45f6aa	check radius in ViewFrustum::isVerySimilar()	2017-09-29 11:34:35 -07:00
Andrew Meadows	a55661e1ff	remove ViewFrustum::calculateProjection()	2017-09-29 11:34:35 -07:00
Andrew Meadows	0597970bb4	faster, more correct ViewFrustum::isVerySimilar() remove OVERSEND hack add ViewFrustum::calculateProjection() method used by OctreeQueryNode	2017-09-29 11:34:34 -07:00
SamGondelman	defed80be7	edited entities are not repeatedly sent if out of view, handles cases where usesViewFrustum changes	2017-09-29 11:34:34 -07:00
Nissim Hadar	4d8a1db895	Merge branch 'master' into hazeZone # Conflicts: # libraries/entities-renderer/src/RenderableModelEntityItem.cpp	2017-09-27 17:50:51 -07:00
Ryan Huffman	0e3c2f2e50	Fix ambiguous conversion to QVariant in StatTracker	2017-09-27 15:22:23 -07:00
Ryan Huffman	014a7bc9b0	Fix bytes downloaded stat tracking	2017-09-27 09:33:10 -07:00
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
Seth Alves	913d3c4d12	Merge pull request #11422 from hyperlogic/feature/ant-man2 Secondary IPD fixes	2017-09-26 11:53:45 -07:00
Andrew Meadows	ec80846281	Merge pull request #11443 from SamGondelman/sharks Laser Pointer fixes and updates	2017-09-26 10:22:55 -07:00
SamGondelman	a73fdf4397	fix pointer event properties	2017-09-25 10:19:42 -07:00
Nissim Hadar	6cbf087708	First version with combo for Haze Mode.	2017-09-24 15:08:22 -07:00
SamGondelman	cbe621f2b7	add searchRay to RayPickResult, fix precision picking caching with multiple lasers, make laser addition/removal immediate	2017-09-22 15:15:15 -07:00
Nissim Hadar	5e1d470553	WIP	2017-09-22 09:48:22 -07:00
Nissim Hadar	953ddfdcd3	First version of adding haze to the zone.	2017-09-21 14:54:16 -07:00
Anthony J. Thibault	54e627e2c5	Merge branch 'master' into feature/ant-man2	2017-09-21 13:59:47 -07:00
Andrew Meadows	b803344f0c	Merge pull request #11421 from jherico/fix/transform_log_spam Don't add items to the scene graph until they have a valid parent chain	2017-09-21 08:42:56 -07:00
Ryan Huffman	a56303a3fe	Merge pull request #11379 from highfidelity/feat/auto-bake Add auto baking to Asset Server and mesh compression for FBXs	2017-09-21 08:33:51 -07:00
Brad Davis	27350bd7de	Don't add items to the scene graph until they have a valid parent chain	2017-09-20 16:52:23 -07:00
Anthony J. Thibault	09c61deda8	Fixes for Vive puck calibration	2017-09-20 15:41:49 -07:00
Bradley Austin Davis	bc4193f276	Merge branch 'master' into android_new	2017-09-19 14:27:31 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
Atlante45	b9e5957c9f	Remove unused Algorithms.h	2017-09-18 16:14:06 -07:00
Anthony J. Thibault	0757f513af	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00
Seth Alves	8a49edbecb	code review	2017-09-15 10:08:35 -07:00
Atlante45	ae14f1f88e	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-09-14 15:34:20 -07:00
Anthony J. Thibault	8fb69a9867	Merge branch 'master' into feature/ant-man	2017-09-13 18:23:11 -07:00
Cain Kilgore	2427008ff3	Static	2017-09-13 17:40:04 +01:00
Cain Kilgore	1c05311056	Some code cleanup	2017-09-13 16:48:18 +01:00
beholder	deee6aab1a	7469 Mouse Pointer Depth is Incorrect in HMD Mode	2017-09-12 04:24:18 +03:00
Anthony J. Thibault	b81f85e1ae	Merge branch 'master' into feature/ant-man	2017-09-11 15:14:03 -07:00
Cain Kilgore	f6e22b0733	Changes The ID no longer relies on the Avatar Session ID as this changed per domain switch. The intention of this PR is to be able to group the log files easier, hence why it now relies on Interface ID instead. Additionally, when no ID is found when the interface is first launched, the ID doesn't appear in the rolled over log file. It will just appear blank.	2017-09-09 17:21:42 +01:00
David Rowe	6ba6c6ee35	Reduce entity fade-in time	2017-09-09 18:00:21 +12:00
Cain Kilgore	7b39cb7791	Should work now	2017-09-08 21:44:38 +01:00
Cain Kilgore	dfbd25fd77	Now pls	2017-09-08 20:51:41 +01:00
Cain Kilgore	7f4cc0ed2a	Should fix the Mac Build	2017-09-08 20:21:17 +01:00
Cain Kilgore	b953c49461	Commit for Better Logger - WL 21537	2017-09-08 03:20:55 +01:00
Stephen Birarda	5e1decb02b	Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake	2017-09-07 12:06:53 -07:00
Dante Ruiz	fec8482b69	Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man	2017-09-05 16:26:51 -07:00
Andrew Meadows	4b8840f307	Merge pull request #11282 from sethalves/fix-winking-dynamic-children-1 fix a bug that caused dynamic children to wink in and out and then vanish	2017-09-05 10:02:47 -07:00
Brad Davis	65b49a958f	Merge branch 'master' into 21484	2017-08-31 14:59:30 -07:00
Seth Alves	ca86ce59c2	fix a bug that cuased dynamic children to wink in and out and then vanish	2017-08-30 17:44:42 -07:00
Anthony J. Thibault	c9cdaadeb5	Better scale support in SpatiallyNestable class. Previously avatar used SpatiallyNestable scale to keep track of model rendering scale. It now uses a new member variable _modelScale instead. This is important because the notion of "Avatar" space does NOT include scale, so this is now reflected correctly in the SpatiallyNestable class. Similarly, EntityItems no longer stuff dimensions into the SpatiallyNestable scale field. a new _dimensions member variable is used instead. The SpatiallyNestable scale field for entities should always be one. Parent joints can now have scale if getAbsoluteJointScaleInObjectFrame() returns a non-zero scale. This is used in the case of the faux SENSOR_TO_WORLD_MATRIX_INDEX joint. Overlays now ignore the SpatiallyNestable scale, and render using only orientation, position and dimensions. Added qDebug stream support for Transform class.	2017-08-30 15:46:36 -07:00
Anthony J. Thibault	573985c7c9	Merge branch 'master' into feature/ant-man	2017-08-28 09:27:04 -07:00
Anthony J. Thibault	4f830cf1dc	Calculate jump speed based on canonical jump height.	2017-08-25 15:34:51 -07:00
Atlante45	8a291f16ff	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-08-25 15:26:38 -07:00
Atlante45	859ec57ded	Move Baking Status	2017-08-25 10:54:33 -07:00
Atlante45	fd3156b57c	Move BakingStatus	2017-08-25 10:54:33 -07:00
Anthony J. Thibault	e0ff7f5f40	Moved speed constants into AvatarConstants.h	2017-08-25 10:47:54 -07:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
Anthony J. Thibault	246097b65e	WIP support for scale within SpatiallyNestable class. currently disabled by the SPATIALLY_NESTABLE_SCALE_SUPPORT pre-processor symbol.	2017-08-24 11:18:38 -07:00
Anthony J. Thibault	963ddce7bc	Use eye-height to match user and avatar scales, follow fixes Fix postPhysicsUpdate to properly transform follow displacement into sensor frame.	2017-08-21 17:42:24 -07:00
Anthony J. Thibault	d196743986	Added Avatar::getHeight() method	2017-08-21 17:42:22 -07:00
Ryan Huffman	b862336d17	Add PathUtils::generateTemporaryDir()	2017-08-21 13:40:51 -07:00
Menithal	dc5e374485	Merge remote-tracking branch 'upstream/master' into 21484	2017-08-17 22:28:43 +03:00
SamGondelman	86cc938a47	Merge remote-tracking branch 'upstream/master' into sharks	2017-08-16 09:54:12 -07:00
Anthony J. Thibault	f72a94e195	warning fixes	2017-08-11 17:28:50 -07:00
Anthony J. Thibault	b050d2c4c7	fix case on include for linux	2017-08-11 15:15:43 -07:00
Anthony J. Thibault	ae98974d79	improve 14-dop generation for avatar joint collision Also added debug rendering functionality.	2017-08-10 15:52:51 -07:00
Menithal	982d4a451f	Updated Protocol to add allowTranslation There still is a bug for the value no actually updating	2017-08-08 23:47:37 +03:00
SamGondelman	489e08aef0	Merge branch 'master' of https://github.com/highfidelity/hifi into sharks	2017-08-07 13:29:00 -07:00
Seth Alves	af1e27dc36	Merge pull request #11053 from hyperlogic/feature/secondary-pose-support Improved support for Vive Trackers on biceps	2017-08-07 13:11:48 -07:00
Anthony J. Thibault	98bbe887b9	Merge branch 'master' into feature/secondary-pose-support	2017-08-04 16:11:13 -07:00
Brad Davis	0e508432c4	PR comments	2017-08-04 15:27:33 -07:00
Brad Davis	86e3489167	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
SamGondelman	bd942ec406	merge from master	2017-08-04 12:17:54 -07:00
Andrew Meadows	e465186511	Merge pull request #11048 from 1P-Cusack/21389 WL21389 PR1: Representation of collision shapes need updating (details below).	2017-08-03 09:04:31 -07:00
Anthony Thibault	8a87ebd2a8	Merge pull request #11036 from AndrewMeadows/walkabout fix bugs preventing avatar from walking on spherical planet	2017-08-01 16:36:35 -07:00
Anthony J. Thibault	2383933252	Merge branch 'master' into feature/secondary-pose-support	2017-07-31 10:55:40 -07:00
Brad Davis	17b06e8e12	Fix log warnings from non-notifiable properties	2017-07-29 11:54:39 -07:00
LaShonda Hopper	cc4fbc97cd	[WL21389] PR1 Update based on code review discussion & feedback (details below). * Removed some left overs from prior approach. * Moved _collisionShapeType & getShapeType override from ShapeEntityItem to RenderableShapeEntityItem (see thread: https://github.com/highfidelity/hifi/pull/11048#discussion_r130154903) * Switched _collisionShapeType default from SHAPE_TYPE_NONE to SHAPE_TYPE_ELLIPSOID ** see thread: https://github.com/highfidelity/hifi/pull/11048#discussion_r129982909 Note(s): * Retested and the cylinder behaves as expected along with the Box & Sphere shapes save from the previously mentioned caveats in the PR notes (https://github.com/highfidelity/hifi/pull/11048) * Confirmed that currently unsupported shapes (hedrons, polygons, & cone) fallback to ellipsoid behavior given default change. Changes Committed: modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities-renderer/src/RenderableShapeEntityItem.h modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.h modified: libraries/shared/src/ShapeInfo.cpp	2017-07-28 15:59:17 -04:00
Brad Hefta-Gaub	d572510770	Merge pull request #11009 from AndrewMeadows/fix-QueryAACube update EntityItem bounding cube when on changed dimensions	2017-07-27 18:21:06 -07:00
Andrew Meadows	6b386000db	initialize 'success' and use for return value	2017-07-27 17:11:13 -07:00
Anthony J. Thibault	78c6564174	Merge branch 'master' into feature/secondary-pose-support	2017-07-27 09:09:32 -07:00
Sam Gondelman	fcaa39b245	Merge branch 'master' into sharks	2017-07-26 18:18:09 -07:00
Brad Davis	8d37e54a4e	Merge pull request #11051 from highfidelity/qt59 Changes for Qt 5.9 warnings and build issues	2017-07-25 15:05:28 -07:00
LaShonda Hopper	ef1e426273	[WL21389] Some code and todo cleanup in prep for PR1. Changes to be committed: modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/physics/src/ShapeFactory.cpp modified: libraries/shared/src/ShapeInfo.cpp	2017-07-25 15:27:02 -04:00
Leander Hasty	d155c02640	[WL21389] wip and modifications based on comments https://github.com/highfidelity/hifi/pull/11024#pullrequestreview-51611518 Cleans up tabs, moves new functionality out of ShapeFactory directly to RenderableShapeEntityItem's computeShapeInfo override, begins to break down where we will need pointlists. Still need to determine how rotation is handled for pointlists, and check for axis alignment on cylinders before deciding on a shape. Changes to be committed: modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities-renderer/src/RenderableShapeEntityItem.h modified: libraries/entities/CMakeLists.txt modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.h modified: libraries/physics/src/ShapeFactory.cpp modified: libraries/physics/src/ShapeFactory.h modified: libraries/shared/src/ShapeInfo.cpp modified: scripts/developer/tests/basicEntityTest/entitySpawner.js	2017-07-25 15:20:35 -04:00
LaShonda Hopper	75403124b6	[WL21389] Addresses physics library dependency and has some other fixes (details below). * Addresses physics library dependency by moving computeShapeInfo override from ShapeEntityItem (which is within Entities Library) to RenderableShapeEntityItem (which is in Entities-Renderer Library). Entities-Renderer library already links against the physic library. Per discussion with Andrew Meadows: In order to ShapeEntityItem to be utilized the library dependency between the Entity and Physics library would need to be resolved to avoid the cyclical reliance which isn't in the scope of this ticket. * Updates shapeSpawner test script from the default clone of basicEntityTest\entitySpawner.js Objects now have a finite lifetime Script now cleans up the objects created when the script ends ** Also moved some adjustable properties out into var aliases at the top of the file for easier/less error prone tweaking. Should probably add one for the shapeType. * Fixes some issues with validateShapeType helper function * Removed naive attempt at including physics library within entities library. * Transferred some todos from notes * Fixed some formatting NOTE(s): This compiles and runs. Cylinder is spawned and treated as CYLINDER_Y. TODO(s): * Add tweakable var for shapeType within shapeSpawner.js * Vet and verify other shapes. * Add in edge case handling. * Add in support for other shapes to ShapeInfo infrastructure. Changes to be committed: modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities-renderer/src/RenderableShapeEntityItem.h modified: libraries/entities/CMakeLists.txt modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.h modified: libraries/physics/src/ShapeFactory.cpp modified: libraries/shared/src/ShapeInfo.cpp modified: scripts/developer/tests/basicEntityTest/shapeSpawner.js	2017-07-25 14:43:39 -04:00
LaShonda Hopper	5bc38bd7f0	[WL21389] Collision Shapes need to be updated (details below). Revised approach involves creating a helper function within ShapeFactory to aid in devising the ShapeType to be used by an ShapeEntityItem for collision. The ShapeFactory is currently doing this for creating the actual Bullet Library collision shapes. ShapeEntityItem overrides its virtually inherited computeShapeInfo which in turn calls the new ShapeFactory helper function. ShapeEntityItem has a new memvar _collisionShapeType to cache its actual ShapeType used by the physics system. This memvar is returned via the getShapeType accessor which is expected to return an object's ShapeType. Note(s): This is similar to the original approach save translation between entity::Shape and ShapeType isn't tied to the EntityItemProperties shapeTypeNames or shapeType. This approach more directly solves the issue of getting the actual ShapeType used by the time it's needed to determine the bullet collision object type created when initializing the physic information. Translation of the ShapeEntityItem's entity::Shape to its ShapeType is handled by ShapeFactory which handles creating the bullet collision objects when setting up physics on the ShapeEntityItems. Known Issue(s): This doesn't compile. It appears that the Entity Library needs to know about the Physics Library. The naive attempt at providing that link failed to resolve all compilation issues. Current Error: C1083: Cannot open include file: btBulletDynamicsCommon.h: No such file or directory (C:\projects\cusack\libraries\entities\src\ShapeEntityItem.cpp) C:\projects\cusack\libraries\physics\src\ShapeFactory.h 15 1 entities modified: libraries/entities-renderer/src/RenderableShapeEntityItem.cpp modified: libraries/entities/CMakeLists.txt modified: libraries/entities/src/ShapeEntityItem.cpp modified: libraries/entities/src/ShapeEntityItem.h modified: libraries/physics/src/ShapeFactory.cpp modified: libraries/physics/src/ShapeFactory.h modified: libraries/physics/src/ShapeInfo.cpp modified: scripts/developer/tests/basicEntityTest/entitySpawner.js new file: scripts/developer/tests/basicEntityTest/shapeSpawner.js	2017-07-25 14:43:07 -04:00
Ryan Huffman	9421e6ebb6	Merge pull request #11029 from cain-kilgore/dominant-hands WL 21453 - Add a "Dominant Hand" setting	2017-07-25 08:01:31 -07:00
Anthony J. Thibault	33a1d6e225	Merge branch 'master' into feature/secondary-pose-support	2017-07-24 17:27:33 -07:00
Anthony J. Thibault	9f6641ed10	Shoulder puck calibration work in progress * AnimInverseKinematics: debug draw for secondary targets * AnimInverseKienmatics: better clean up of ik target debug draw * GeometryUtil: added findPlaneFromPoints() * ViveControllerManager: external dependency on eigen * ViveControllerManager: record history of left/right hand controllers * ViveControllerManager: use history to determine user shoulder location for better calibration * ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions. * CMake: added external depenency to eigen linear algebra library.	2017-07-24 17:22:48 -07:00
Andrew Meadows	8c55476c65	fix motor direction when walking upside down also maintain worldUp and remove unnecessary cruft	2017-07-24 16:00:13 -07:00
Cain Kilgore	42742ba1f9	Changed the Return to a String "left/right" instead.	2017-07-24 18:31:16 +01:00
Cain Kilgore	630922dd95	Dominant Hands Branch Initial Commit Adds a new option in the Avatar Basics section of the Avatar Settings. API Accessible Functions: MyAvatar.getUseAlternativeHand() MyAvatar.setUseAlternativeHand() Defaults to false (Right Hand). Will return True if set to Left Hand.	2017-07-24 06:18:24 +01:00
Andrew Meadows	29daac83a4	optimize cube update only for connected things	2017-07-21 10:59:25 -07:00
Andrew Meadows	1e6fc85e3e	fix math for expanded bounding box	2017-07-21 10:17:10 -07:00
Andrew Meadows	e1eb223616	cleanup bad indentation, cruft, and constants	2017-07-20 16:12:33 -07:00
Andrew Meadows	a8dac0cb79	don't send constant updates for grabbed objects	2017-07-20 15:45:50 -07:00
Brad Davis	3a31805dff	Fix warnings in Qt 59 / VS 2017 build	2017-07-20 11:57:12 -07:00
Andrew Meadows	0fc0cf736f	fix spelling	2017-07-20 09:34:28 -07:00
Andrew Meadows	4f1489f8b4	less magic	2017-07-20 08:18:19 -07:00
Stephen Birarda	3936ee93f0	use default scripts path in EditTabView to fix load on OS X	2017-07-19 16:34:04 -07:00
Clément Brisset	d76039387a	Merge pull request #10992 from Atlante45/fix/heap-use-after-free Fix potential data corruption in the FileCache	2017-07-19 10:44:02 -07:00
Atlante45	497fd7f714	Pin File pointer during eject	2017-07-18 13:45:46 -07:00
Atlante45	2d246d2563	Implement shutdown with parent for Mac and Linux	2017-07-14 11:39:32 -07:00
SamGondelman	3a35cd128f	fix dirOffset, expose intersection type to JS	2017-07-13 16:09:21 -07:00
Cain Kilgore	f91a8c0f53	Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler	2017-07-13 21:25:39 +01:00
Cain Kilgore	521babb6bd	Avatar Scaler - should be PR Ready.	2017-07-13 19:18:51 +01:00
SamGondelman	916a99c670	added JS/C++ RayPickResult, working on RayPickManager::update	2017-07-12 17:12:25 -07:00
SamGondelman	ea65a04f28	expose RayPickMask to JS, move everything to interface/src/raypick to prevent dependency issues, start working on RayPickManager::update (needs testing)	2017-07-12 14:20:39 -07:00
SamGondelman	3ac369d782	framework for LaserPointers and abstracted RayPicking on C++ side, including JS API	2017-07-12 14:20:39 -07:00
Cain Kilgore	43782a29c7	Avatar Scaler - WIP	2017-07-12 22:04:58 +01:00
Andrew Meadows	2349057306	Merge pull request #10879 from AndrewMeadows/avoid-null-shape fix crash in ObjectMotionState::handleEasyChanges()	2017-07-07 10:22:05 -07:00
Clément Brisset	34e3f56002	Merge pull request #10843 from birarda/bug/user-activities-interface-only disable user activity logger in DS/AC/ac-client	2017-07-06 14:01:49 -07:00
Stephen Birarda	bdcdff3dbc	force _isSet to be set before isSet() called	2017-07-06 12:01:08 -07:00
Andrew Meadows	2299bb7718	supply minimum shape rather than null	2017-07-06 10:37:44 -07:00
David Kelly	1ccf0da7d8	Merge pull request #10897 from davidkelly/dk/cacheSwitchFix redo cache switch	2017-07-06 09:53:01 -07:00
David Kelly	4a22fbca1b	redo cache switch	2017-07-05 17:01:31 -07:00
Brad Davis	2409c83d5d	Fix ACClient on Linux	2017-07-05 16:53:42 -07:00
Seth Alves	70a7b302fc	Merge pull request #10860 from jherico/deadlock_guards Don't use blocking connections on the main thread	2017-07-03 09:05:56 -07:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Atlante45	5c731636b1	Sandbox restarts crashed processes	2017-06-29 12:13:52 -07:00
Andrew Meadows	e9edf01a34	Merge pull request #10831 from kencooke/audio-hrtf-optimize More HRTF optimizations	2017-06-28 14:17:00 -07:00
Seth Alves	2f3109e4be	move the location of Q_DECLARE_METATYPE(std::function<void()>) so that the server-script AC can see it	2017-06-28 11:00:05 -07:00
Ken Cooke	0acbdc7755	CR fix: use predefined PI	2017-06-28 10:18:54 -07:00
Brad Davis	8130a91b8c	Cleanup entity dependencies	2017-06-27 19:15:49 -07:00
Howard Stearns	20f713a241	Merge pull request #10803 from davidkelly/dk/cacheSwitch new --cache switch for interface	2017-06-27 12:23:23 -07:00
Ken Cooke	dcdf07191b	Fast acosf() using polynomial approximation	2017-06-27 11:29:44 -07:00
David Kelly	01155ba4e3	this handles redirecting ktx_cache, data8, prepared	2017-06-27 08:47:54 -07:00
samcake	c0e8b6c8bc	clean up	2017-06-23 14:18:56 -07:00
David Kelly	bda50af780	this uses qt's test location for AppData/Local, but leaves Roaming alone	2017-06-23 11:06:48 -07:00
David Kelly	04160f2ca1	switch to change ktx_cache directory (only)	2017-06-23 09:19:41 -07:00
David Kelly	7ef50042ba	remove turd	2017-06-23 08:00:18 -07:00
David Kelly	06d1ac8bf7	Merge remote-tracking branch 'upstream/master' into dk/scriptsSwitch	2017-06-22 14:14:54 -07:00
David Kelly	ff5b37c785	new --scripts switch overrides default scripts location	2017-06-22 14:09:05 -07:00
Brad Hefta-Gaub	197006e3d3	Merge pull request #10780 from kencooke/audio-hrtf-avx512 HRTF optimizations	2017-06-22 13:34:05 -07:00
Ken Cooke	b27b09ebc6	Detect support for AVX512 instructions	2017-06-20 16:09:52 -07:00
Ken Cooke	bbfdb0f7eb	Refactor CPU detection to use common subfunctions	2017-06-20 16:06:05 -07:00
Brad Davis	e3fb42eefd	Fix crash when cache File lifetime exceeds cache lifetime	2017-06-20 14:38:51 -07:00
Brad Davis	ed6620fc51	Merge pull request #10718 from jherico/frame_thread Cleanup and refactoring	2017-06-19 13:31:44 -07:00
Brad Davis	1d4b443113	Prevent cache ejection of textures in use	2017-06-19 09:51:11 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Atlante45	61eb93af35	Fix SharedNodePointer leak	2017-06-14 11:42:25 -07:00
Anthony Thibault	e3c342aa77	Merge pull request #10595 from hyperlogic/feature/spine-spline Spline IK target support	2017-06-08 18:09:55 -07:00
Seth Alves	485df396ef	Merge pull request #10628 from jherico/qt59 Fixes for Qt 5.9 compatibility	2017-06-08 16:51:08 -07:00
howard-stearns	fa74daf875	Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor	2017-06-07 16:43:25 -07:00
Anthony J. Thibault	606c6415ae	Merge branch 'master' into feature/spine-spline	2017-06-07 10:53:46 -07:00
Bradley Austin Davis	b4bbf98fe3	Suppress TBB warnings	2017-06-06 15:02:16 -07:00
Bradley Austin Davis	fc6a278217	Fixing dangling thread issues, consolidating thread management	2017-06-06 15:02:16 -07:00
Clément Brisset	67970182aa	Merge pull request #10579 from AndrewMeadows/fix-generateBasisVectors Fix generateBasisVectors() helper	2017-06-05 14:47:18 -07:00
Brad Hefta-Gaub	51e00b9de9	Merge pull request #10614 from samcake/brown Introduce a stencil mask pass in the rendering to optimize HMD	2017-06-05 14:14:11 -07:00
Andrew Meadows	6970576bb8	use helper constants in helper code	2017-06-05 08:54:05 -07:00
Andrew Meadows	205e5d7309	add unit tests and fix final bugs	2017-06-05 08:54:05 -07:00
Andrew Meadows	81764f0f71	fix GLMHelpers::generateBasisVectors()	2017-06-05 08:54:05 -07:00
Howard Stearns	a0ea306aed	cleanup, and include missing allowBackface parameter	2017-06-04 07:55:23 -07:00
Howard Stearns	3d62900daf	When we do precision detailed picking on a model, check the back faces, too. In other words, precision picking from inside a model works.	2017-06-03 16:49:16 -07:00
Anthony J. Thibault	1a8f6b8de0	Readability improvement	2017-06-02 18:16:14 -07:00
Clément Brisset	c636922a5d	Merge pull request #10590 from huffman/fix/running-marker Update server-console to watch interface via pid rather than marker	2017-06-02 15:57:44 -07:00
Anthony J. Thibault	2422c7e1bb	code review feedback	2017-06-02 15:47:51 -07:00
Clément Brisset	5f91d2dcb7	Merge pull request #10569 from ctrlaltdavid/21312 Improve positioning of assets when added / imported	2017-06-02 15:45:18 -07:00
Sam Cake	f9aa400b95	Refining the stencil configuration and triggering only in hmd mode	2017-06-02 00:22:38 -07:00
Ryan Huffman	86da91ac8d	Remove the runningMarker timer	2017-06-01 18:19:13 -07:00
Anthony J. Thibault	3710637254	warning fix	2017-06-01 15:17:02 -07:00
Anthony J. Thibault	b9bf6f4c05	whitespace	2017-06-01 13:30:35 -07:00
Anthony J. Thibault	226855b2b9	Bug fixes and cleanup * Bug fix for problem when chest target is enabled but hips target is not. * centralized the two computeSplineFromTipAndBase functions into one. * Removed dead code	2017-06-01 13:20:50 -07:00
Brad Davis	a77491ccb1	FileCache refactoring and tests	2017-05-31 13:45:59 -07:00
Anthony J. Thibault	39c23bfe2f	revision of spine spline rotation calculation	2017-05-30 14:25:30 -07:00
Anthony J. Thibault	fc12d7547a	Addition of CubicHermiteSpline helper classes.	2017-05-30 14:25:29 -07:00
David Rowe	8de93d9651	Fix typo noticed in passing	2017-05-30 15:53:58 +12:00
Seth Alves	a45b5599c9	Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox	2017-05-19 17:37:03 -07:00
Clément Brisset	6e89f7d2f9	Merge pull request #10512 from Atlante45/fix/running-marker Fix "Reset Settings" window poping up every time	2017-05-19 17:36:00 -07:00
Seth Alves	40c8261111	Merge branch 'master' of github.com:highfidelity/hifi into fix-imported-children-querybox	2017-05-19 17:14:58 -07:00
Seth Alves	5c93dbd20d	be more careful about fixing up entities which arrived before their parents	2017-05-19 13:48:29 -07:00
Ryan Huffman	64bf5784e6	Fix FileStorage to not close files after they are opened This is particularly an issue with KTX file reading/writing where we do both concurrently.	2017-05-19 11:16:20 -07:00
Atlante45	c2e2682eff	Fix "Reset Settings" window poping up every time	2017-05-19 10:50:23 -07:00
Seth Alves	ec02887ae6	attempt to get imported entities into the correct octree-element	2017-05-18 13:20:44 -07:00
Brad Hefta-Gaub	fbc32e5ba1	Merge pull request #10485 from samcake/orange Add protections when accessing the mip bytes of a texture when provided from a KtxStorage	2017-05-18 08:47:58 -07:00
Brad Hefta-Gaub	014fd710de	Merge pull request #10490 from Atlante45/feat/settings-map Enable Map/List storage in the settings	2017-05-17 21:24:04 -07:00
Zach Pomerantz	e8ab780899	include details in critical variantMap parsing error	2017-05-17 21:32:13 -04:00
Stephen Birarda	2ac5fbf91d	set wireless scan interval to -1	2017-05-17 15:33:52 -07:00
samcake	ab3ea65d54	Simply add protections when accessing the mip bytes of a texture when provided from a KtxStorage	2017-05-17 12:36:12 -07:00
Atlante45	0d77977936	Enable Map/List storage in the settings	2017-05-17 12:11:15 -07:00
Brad Hefta-Gaub	764bfe94f5	Merge pull request #10336 from trentpolack/feature/snap-turn-smoothing-21270 Feature/snap turn smoothing 21270	2017-05-16 21:05:38 -07:00
Brad Hefta-Gaub	254c6e9292	Merge pull request #10441 from Atlante45/feat/launch-sandbox Launch the Sandbox as early as possible	2017-05-16 20:52:23 -07:00
Brad Hefta-Gaub	36c7821e1e	Merge pull request #10455 from ZappoMan/TriangleSetOptimizations TriangleSet optimizations - ~80% improvement in Ray picking against models	2017-05-16 20:47:50 -07:00
Atlante45	201f81f20a	Don't wait on the sandbox	2017-05-16 14:41:57 -07:00
ZappoMan	149750fe21	make the octree sparse	2017-05-14 08:36:54 -07:00
ZappoMan	5065c7c5c4	more warning fixes	2017-05-13 10:17:59 -07:00
ZappoMan	da404ce2ce	fix warning	2017-05-13 09:29:32 -07:00
Vladyslav Stelmakhovskyi	49a45f0300	Merge branch 'master' into market-crash-fix	2017-05-13 14:23:26 +02:00
Vladyslav Stelmakhovskyi	20c27fc133	Fix crash on save Map data settings from scripts	2017-05-13 14:20:28 +02:00
ZappoMan	dcb70aa504	more cleanup	2017-05-12 19:03:08 -07:00
ZappoMan	4af3c760e6	more cleanup	2017-05-12 18:57:33 -07:00
ZappoMan	f1bd06cfa0	cleanup some unneeded class	2017-05-12 18:33:28 -07:00
ZappoMan	89b6a79f68	make sure to exit early if box intersection is already larger than best triangle intersection	2017-05-12 17:56:45 -07:00
ZappoMan	eb3b27849c	only keep one copy of Triangles	2017-05-12 17:07:47 -07:00
ZappoMan	ea8330e4e3	Merge branch 'master' of https://github.com/highfidelity/hifi into TriangleSetOptimizations	2017-05-12 13:00:14 -07:00
Brad Hefta-Gaub	a88f72024d	Merge pull request #10243 from birarda/bake-textures Add an internal tool for domain/model/skybox KTX texture baking	2017-05-12 12:26:33 -07:00
Clément Brisset	1658ced671	Merge pull request #10437 from Atlante45/feat/faster-startup Use baked default skybox	2017-05-12 11:35:51 -07:00
Seth Alves	4aa683363c	back out previous changes, do compressionOptions.setPitchAlignment(4) instead	2017-05-11 16:22:12 -07:00
Atlante45	6378b96b4c	CR	2017-05-11 14:41:02 -07:00
Seth Alves	ac2bc39a27	try, try again	2017-05-11 14:10:03 -07:00
Seth Alves	a26f9c7887	make _size const	2017-05-11 13:36:05 -07:00
Atlante45	e0863aa50f	Only open files for write if necessary	2017-05-11 11:54:52 -07:00
Seth Alves	dfb9fecf17	pad MemoryStorage size to multiple of 4 rather than using a vector of uint32_t -- this gets the same alignment without needs casts	2017-05-11 07:11:40 -07:00
Seth Alves	c9868640c1	force data in MemoryStorage to be word aligned to avoid crash in glTextureSubImage2D	2017-05-10 18:14:50 -07:00
ZappoMan	a15c5999b5	first cut at octree storage of Triangle Set	2017-05-10 16:58:51 -07:00
trent	a3545661dc	Merged hifi/master into this PR and resolved merge conflicts.	2017-05-09 15:09:53 -04:00
Andrew Meadows	2835a73c6b	Merge pull request #10071 from AndrewMeadows/walk-up-steps avatar can walk up steps	2017-05-08 18:17:16 -07:00
Andrew Meadows	a31a861e19	fix typo: physcis --> physics	2017-05-05 09:33:50 -07:00
Seth Alves	92966377fb	Merge branch 'fix-dont-send-non-entity-edits-over-wire' of github.com:sethalves/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 19:05:57 -07:00
Seth Alves	51cb579773	function to turn nestable-type into a string	2017-05-04 19:05:01 -07:00
Seth Alves	960bab6e4e	Merge branch 'master' of github.com:highfidelity/hifi into fix-dont-send-non-entity-edits-over-wire	2017-05-04 16:42:57 -07:00
Brad Davis	2d0bbf70ae	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
Seth Alves	69944cc76d	add a way to get a SpatiallyNestable's name without knowing what its type is	2017-05-03 21:32:49 -07:00
trent	557a8fffd7	Addressing some PR feedback; moved easeInEaseOut to Interpolate class. My function is faster than andrew's. :D	2017-05-02 19:56:47 -04:00
Brad Davis	425405f72d	Merge pull request #10245 from AndrewMeadows/avatar-renderer-002 more cleanup in preparation for moving Avatar class to lib	2017-05-02 10:37:22 -07:00
Anthony J. Thibault	2120e63e3a	Merge branch 'master' into feature/head-standard-action	2017-04-27 17:51:13 -07:00
Andrew Meadows	75b563d598	restore rendering of avatar receive stats	2017-04-27 13:16:50 -07:00
Andrew Meadows	442080dec7	remove unused RenderArgs::_cameraMode hack	2017-04-27 13:16:50 -07:00
Stephen Birarda	49e7ae6dbc	call image library for texture baking	2017-04-26 18:37:35 -07:00
Stephen Birarda	425385d982	leverage settings to remember paths used before	2017-04-26 18:37:35 -07:00
Ryan Huffman	60ba874e2e	Fix implementation of mutableData in non-File Storage classes	2017-04-26 18:02:23 -07:00
Ryan Huffman	8d03d50d35	Cleanup progressive ktx debugging	2017-04-26 10:48:57 -07:00
Ryan Huffman	20f4d14e07	Add compressed KTX size evaluation	2017-04-26 10:48:23 -07:00
Ryan Huffman	b20fcbfcdb	Add a way to write data to a storage object	2017-04-26 10:45:50 -07:00
Ryan Huffman	00cbfa0f70	Add start of progressive ktx-loading	2017-04-26 10:45:50 -07:00
Anthony J. Thibault	dc19f37726	input/controller routing thru skeleton model and rig.	2017-04-25 15:04:47 -07:00
Andrew Meadows	5a458c9923	remove last qApp usage from Avatar class	2017-04-18 11:52:21 -07:00
Andrew Meadows	685a01482c	remove Camera argument from Avatar::render()	2017-04-18 11:52:21 -07:00
Thijs Wenker	6f58e91d76	Merge pull request #10121 from birarda/bug/recording-cache cleanup Agent RSI handling, make loadRecording async	2017-04-14 21:35:51 +02:00
Andrew Meadows	e64e2614e3	Merge pull request #10147 from alhighfidelity/Kinect-Hand-Filter Kinect hand filter	2017-04-12 14:27:05 -07:00
Al Bernstein	c628b23895	removed whitespace	2017-04-06 17:21:58 -07:00
Al Bernstein	e737456dcd	used thread safe moving average for the quaternions	2017-04-06 16:56:03 -07:00
Al Bernstein	de1fdfacca	made requested changes in PR10147	2017-04-06 16:18:40 -07:00
samcake	5629cf425e	Cleaning up the files updated	2017-04-05 13:49:07 -07:00
samcake	6122155880	Renaming the PendingCHanges class to Transaction	2017-04-05 13:10:31 -07:00
Stephen Birarda	c7a28a527a	cleanup Agent recording handling, make loadRecording async	2017-04-04 10:56:25 -07:00
David Rowe	405e8cfc9e	Fix typo noticed in passing	2017-04-02 12:58:24 +12:00
Seth Alves	4516ddf855	Merge pull request #9847 from highfidelity/tablet-ui Tablet ui	2017-03-28 14:48:02 -07:00
Seth Alves	1cf6945bf2	pass radials argument to AABox::touchesAAEllipsoid as const reference	2017-03-28 11:12:00 -07:00
Seth Alves	9789476a73	handle case where AAEllipsoid is entirely inside the AABox	2017-03-28 10:57:03 -07:00
Seth Alves	9e675d4c93	Merge pull request #9990 from hyperlogic/bug-fix/sliders Added inputMode property to Web3DOverlay	2017-03-28 10:07:37 -07:00
Seth Alves	59da607d07	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-24 15:08:23 -07:00
Seth Alves	8f7f5efade	new javascript call: Model.newMesh()	2017-03-24 12:51:00 -07:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub	9a38b36f59	Merge pull request #9970 from Triplelexx/21223 21223 - Quat functions have naming inconsistencies	2017-03-24 08:12:11 -07:00
Anthony J. Thibault	bab9890fea	Added inputMode property to Web3DOverlay. This allows user to switch between Touch messages and Mouse messages. Added a sliderTestMain.js script which demonstrates this behavior.	2017-03-23 13:54:18 -07:00
Seth Alves	f5680def55	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-23 09:55:41 -07:00
Seth Alves	ff3fc244d1	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-23 09:50:53 -07:00
Seth Alves	df875ab504	make RenderablePolyVoxEntityItem::setSphere affect any voxel the sphere touches rather than just the ones whose center the sphere touches	2017-03-22 16:21:45 -07:00
Triplelexx	b7980569cc	change all references of IDENTITY_FRONT to IDENTITY_FORWARD	2017-03-21 22:13:33 +00:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
Brad Davis	14c8c3f4db	Return existing textures when matching hash for a previously found live texture	2017-03-20 09:39:29 -07:00
Chris Collins	308c134119	Merge pull request #9686 from humbletim/21114-part3 CR 21114 -- Implement modules/require support into hifi	2017-03-20 06:22:35 -07:00
Seth Alves	424af2255b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-19 21:17:30 -08:00
humbletim	758c07c7d4	Merge branch 'master' into 21114-part3	2017-03-16 14:29:17 -04:00
humbletim	366c90ef6a	add Q_ASSERT to IS_THREADSAFE_INVOCATION	2017-03-16 01:28:50 -04:00
samcake	0399249a03	Expeand the wireframe to the primitive entities and the polyvox	2017-03-15 16:58:31 -07:00
Seth Alves	b5919d89a5	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-15 08:26:10 -08:00
Brad Davis	eab91d061d	Merge pull request #9868 from zzmp/ktx/local-not-roaming Use Local for WIN32 FileCache	2017-03-13 15:52:11 -07:00
Brad Davis	3bef5ad528	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-13 14:30:25 -07:00
Zach Pomerantz	808973d7d2	use QStandardPaths instead of hardcoded paths	2017-03-13 17:26:42 -04:00
Zach Pomerantz	172a638ef0	move resource paths to PathUtils	2017-03-13 17:26:34 -04:00
Andrew Meadows	546f32431d	Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate Various noise gate, scope, and audio stats improvements	2017-03-13 11:52:16 -07:00
Brad Hefta-Gaub	a38965d628	add more audio stats	2017-03-11 09:50:30 -08:00
Brad Davis	399270d243	Still trying to fix OSX build	2017-03-08 09:03:59 -08:00
Bradley Austin Davis	62fcd238ae	Fix shared pointer usage in storage abstraction	2017-03-08 09:03:58 -08:00
Brad Davis	e94f803b84	Merge remote-tracking branch 'upstream/master' into HEAD	2017-03-08 09:03:21 -08:00
Seth Alves	509ce3f2d2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 18:41:36 -08:00
Brad Hefta-Gaub	8ae6f2727d	add support for double click messages to overlays and entities	2017-03-07 17:52:55 -08:00
Seth Alves	71c2b4215d	Merge pull request #9811 from ZappoMan/triangleSet Cleanup how Models do ray-picking and determination of point inside of convex hull	2017-03-07 14:12:56 -08:00
humbletim	40ba8185a0	* Update per 21114-part2 changes. * Add explicit thread safety guards. * Add Entities.queryPropertyMetdata for unit testing Entity script module support. * Cleanup / commenting pass.	2017-03-07 16:36:07 -05:00
humbletim	9b09651337	Move BaseScriptEngine from script-engine to shared.	2017-03-07 16:34:24 -05:00
Ryan Huffman	a744e0d11c	Merge pull request #9685 from humbletim/21114-part2 CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions	2017-03-07 13:25:25 -08:00
Brad Hefta-Gaub	f7e824e47c	Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet	2017-03-07 12:18:36 -08:00
Seth Alves	b938579598	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-07 11:42:44 -08:00
Brad Hefta-Gaub	87934ee82d	fix bugs in some meshes	2017-03-06 21:50:32 -08:00
Brad Davis	8782fe1d93	Merge branch 'master' into smarter_textures Conflicts: libraries/model-networking/src/model-networking/TextureCache.cpp	2017-03-06 15:29:41 -08:00
Andrew Meadows	10b3e7fc67	sphere shapeType for models means 'sphere'	2017-03-06 15:14:51 -08:00
Brad Hefta-Gaub	f27475613f	Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet	2017-03-06 12:53:59 -08:00
ZappoMan	faba160331	more CR feedback	2017-03-06 11:10:04 -08:00
ZappoMan	af97e9bdd9	CR feedback	2017-03-06 10:49:38 -08:00
Seth Alves	93246b24b0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-06 08:54:49 -08:00
ZappoMan	87bcced409	cleanup use of triangleSet for picking	2017-03-05 19:23:55 -08:00
Ken Cooke	0bababf1f5	Safe replacement of glm_mat4_mul() for unaligned arguments instead of __m128	2017-03-04 14:53:07 -08:00
ZappoMan	9908723bb9	fist cut at basic TriangleSet class	2017-03-03 22:27:38 -08:00
Anthony J. Thibault	bc256f3e8f	Fix for multi-threaded access to maps in DebugDraw.	2017-03-02 14:42:06 -08:00
Seth Alves	cf37845f9e	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-03-02 10:06:38 -08:00
Bradley Austin Davis	fa5b315e09	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-01 15:16:18 -08:00
Anthony J. Thibault	01abb4bdb6	Exposed DebugDraw interface to Java Script	2017-03-01 13:14:29 -08:00
Seth Alves	88c850afa2	voxel-paint paints with capsules rather than spheres	2017-02-26 12:56:17 -08:00
samcake	e8835b34f4	fix issues while testing the ktxStorage	2017-02-22 19:05:20 -08:00
samcake	262d7c3b79	Merging with upstream smarter_textures and Austin's pr	2017-02-22 17:54:38 -08:00
Brad Davis	c6b72dfe3c	Make memory storage mutable	2017-02-22 13:29:08 -08:00
Seth Alves	a6b4f07674	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-22 12:07:31 -08:00
samcake	6938948501	Merge branch 'master' of https://github.com/highfidelity/hifi into texmex	2017-02-22 12:00:11 -08:00
Seth Alves	84b93826d0	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js	2017-02-22 09:30:16 -08:00
Brad Hefta-Gaub	a526db1779	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarMixerLoopImprovements	2017-02-21 14:18:36 -08:00
Brad Davis	27e8750b9b	Adding new storage backing for gpu::Texture, moving mip format into Storage abstraction	2017-02-19 18:11:56 -08:00
Brad Davis	285222d490	Add view storage	2017-02-17 12:49:55 -08:00
Brad Davis	d1b91cb436	Adding abstracted storage for in-memory or file backed data	2017-02-17 10:13:08 -08:00
Stephen Birarda	78301fd947	call getParentPointer when parent ID changes to update children	2017-02-16 16:46:09 -08:00
Seth Alves	21b0e45b0f	don't show keyboard in edit.js unless HMD is being worn	2017-02-16 09:56:50 -08:00
humbletim	b15956278c	separate out supporting changes into 21114-part2 branch	2017-02-16 07:40:19 -05:00
Brad Hefta-Gaub	faa8e629a0	checkpoint	2017-02-15 20:28:32 -08:00
Seth Alves	1038e97c7f	fix windows build	2017-02-15 11:14:23 -08:00
Seth Alves	792c7ff51f	PointerEvent will now relay keyboard modifiers	2017-02-15 10:41:56 -08:00
Seth Alves	bc5f563f57	make _parentID and _parentJointIndex private to avoid accidental direct access	2017-02-12 11:37:29 -08:00

... 13 14 15 16 17 ...

4453 commits