3391 commits

Author	SHA1	Message	Date
Andrew Meadows	996b71fa9a	avoid incorrect ShapeManager dupes for compound shapes	2017-10-24 13:23:46 -07: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
Andrew Meadows	c79bf3bc04	cleanup WANT_DETAILED_PROFILING	2017-10-19 14:31:50 -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
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