overte-HifiExperiments

mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-18 11:08:46 +02:00

Author	SHA1	Message	Date
Seth Alves	563c19bb91	fix connect	2018-02-19 15:21:46 -08:00
Seth Alves	25c34403db	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-19 11:24:42 -08:00
Olivier Prat	f5a2557a2e	Merged with master	2018-02-19 17:28:39 +01:00
Seth Alves	7a5415efbe	working on getting history to work with serverless domains	2018-02-18 07:55:43 -08:00
Seth Alves	a060d0ddb7	allow more than just hifi:// in various places	2018-02-17 06:32:38 -08:00
Seth Alves	dd278b4b1b	go to the default spawn point when loading a serverless domain	2018-02-16 17:45:39 -08:00
samcake	9441bb477d	Working on adding rendering from the workload	2018-02-16 17:21:07 -08:00
Seth Alves	ed5b28aa2a	clear octree on any sort of domain change	2018-02-16 17:15:15 -08:00
Seth Alves	d58eccd5aa	don't use edit.js to load entities for serverless domain	2018-02-16 16:38:45 -08:00
Seth Alves	de9ac7f4a5	working to integrate serverless domains into history, etc	2018-02-16 13:56:22 -08:00
Seth Alves	b2a4181bc0	working to integrate serverless domains into history, etc	2018-02-16 12:58:50 -08:00
Andrew Meadows	6d347cf44f	revert deadlock, remove Space stubbery in EntityTree	2018-02-15 17:40:15 -08:00
Seth Alves	abc467b919	load json from indicated file to populate serverless domain	2018-02-15 16:09:03 -08:00
SamGondelman	b189433855	merge	2018-02-15 15:50:36 -08:00
SamGondelman	2d754edf74	CR	2018-02-15 15:48:41 -08:00
Seth Alves	17e2db96c6	make domain-manager and pals be still when interface is in serverless mode	2018-02-15 15:19:50 -08:00
humbletim	145a0df082	interim checkin	2018-02-15 14:14:07 -05:00
Ryan Huffman	2a667fcd60	Cleanup entity -> ds persist	2018-02-15 10:09:21 -08:00
Ryan Huffman	cb9327e030	Add entity file sync and domain content backups	2018-02-15 10:09:20 -08:00
Seth Alves	0f4b68c038	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-15 07:53:36 -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
Andrew Meadows	ba888a14ca	give Application a 'workload' engine	2018-02-14 13:26:42 -08:00
Brad Davis	8853bd6388	Fix spectator camera crash	2018-02-14 11:11:28 -08:00
SamGondelman	4500ed17e7	merge from master	2018-02-13 13:58:39 -08:00
Zach Fox	ae8a8a48eb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-13 13:55:32 -08:00
Seth Alves	764447fa24	merge from upstream	2018-02-13 13:01:45 -08:00
Seth Alves	bf9496b46b	start on support for models.json serverless domains	2018-02-13 13:00:27 -08:00
Elisa Lupin-Jimenez	a61021f46c	Merge pull request #12272 from elisa-lj11/2d-images 2d images (JPG and PNG) are now supported as (quasi) entities	2018-02-13 11:44:02 -08:00
Zach Fox	95e9eb8e4a	Lots of progress	2018-02-12 17:06:57 -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	3377aaceea	Merge pull request #12343 from NissimHadar/saveSnapshotWithName Added option to select snapshot filename in scripts.	2018-02-12 15:22:04 -08:00
SamGondelman	9e8aa1898c	warnings, load material from URL, shapeID -> parentMaterialID	2018-02-12 12:50:09 -08:00
David Rowe	033b85a3a8	Merge branch 'master' into remove-deprecated-items # Conflicts: # scripts/system/libraries/entitySelectionTool.js	2018-02-13 09:42:40 +13:00
Brad Davis	1f2760c4b7	Merge remote-tracking branch 'gcalero/android_ui_bottombar3' into android	2018-02-12 12:39:40 -08:00
SamGondelman	5337377ef5	Merge remote-tracking branch 'upstream/master' into decals	2018-02-09 14:40:20 -08:00
Cristian Luis Duarte	bb4f57f982	Android - Avatar selection window accessible from the bottom bar. Only hardcoded avatars, no marketplace.	2018-02-09 17:32:12 -03:00
Gabriel Calero	917cbd73b1	Don't show help on android. Hide menu bar	2018-02-09 17:32:12 -03:00
Gabriel Calero	0f07d0b493	Add bottom bar and address dialog (Android)	2018-02-09 17:32:12 -03:00
SamGondelman	84cd0e1529	wip live material swapping on model entities, model overlays, avatars, and albedo swap on shape entities	2018-02-09 12:00:08 -08:00
Bradley Austin Davis	7102cf44b8	Fixing merge errors	2018-02-09 10:30:57 -08:00
Bradley Austin Davis	023ee35b2e	Merge remote-tracking branch 'upstream/master' into threaded_qml	2018-02-08 17:16:36 -08:00
Brad Hefta-Gaub	a6c8172990	Merge pull request #12370 from jherico/fix/deadlock_shaders Prevent deadlock crashes when building shaders at startup	2018-02-08 14:44:46 -08:00
Bradley Austin Davis	7eecc47672	Prevent deadlock crashes when building shaders at startup	2018-02-08 11:12:51 -08:00
Bradley Austin Davis	725eb14163	Fix for deadlock triggering while loading QML engine	2018-02-08 11:12:10 -08:00
Bradley Austin Davis	8748e98b5e	Prevent deadlock crashes when building shaders at startup	2018-02-08 10:23:25 -08:00
Bradley Austin Davis	77741c2851	Fix for deadlock triggering while loading QML engine	2018-02-07 16:43:15 -08:00
Brad Davis	7d5502eb92	Migrating QML rendering off the main thread	2018-02-06 11:53:09 -08:00
NissimHadar	cf87052b7f	Added option to select snapshot filename in scripts.	2018-02-05 17:29:00 -08:00
Stephen Birarda	761321875c	Merge pull request #12195 from birarda/bug/connection-refused clear silent connection attempt counter on DomainHandler soft reset	2018-02-05 11:35:02 -07:00
David Rowe	0c0734a255	Remove unused Overlays property, borderSize, and associated code	2018-02-04 14:54:14 +13:00
David Rowe	d842e532ee	Remove Window.customPrompt() from JavaScript API	2018-02-04 14:02:30 +13:00
John Conklin II	c8bb26ae74	Merge pull request #12294 from samcake/pastel Improve startup time by optimizing shader bookkeeping	2018-02-02 16:37:44 -08:00
Elisa Lupin-Jimenez	e2bf8ad231	reverted to S3 for model URL	2018-02-02 15:36:28 -08:00
Stephen Birarda	eb9d100fc8	reset count on conn refusal, soft reset DH in Interface on limit reached	2018-02-02 13:47:48 -08:00
Stephen Birarda	e16a3859c2	reset silent check in packet check on domain connection reset	2018-02-02 13:47:48 -08:00
Brad Davis	e3e45e16c1	Disable LOD adjustment on android	2018-02-02 13:46:08 -08:00
Elisa Lupin-Jimenez	f71d9e4d6a	snapshot referenced locally, won't work on OS	2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez	62437dcc22	drag and drop works	2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez	2ff47fa454	images auto-add to asset server, started asset browser add link	2018-02-02 10:27:42 -08: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
Sam Gateau	a650c5bbc6	Move a define to resume watchdog a bit further	2018-01-31 23:31:31 -08:00
Seth Alves	64a46bf5df	merge from upstream	2018-01-31 10:43:41 -08:00
samcake	062bfbd7b6	Merging with master	2018-01-30 18:33:34 -08:00
Atlante45	bc819c698e	Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back	2018-01-30 16:09:30 -08:00
Sam Gateau	9ea6c78ac2	fix stupid copy paste	2018-01-30 15:31:34 -08:00
John Conklin II	215d03c4ce	Merge pull request #12269 from sethalves/backtrace-for-rc-63 Backtrace for rc 63	2018-01-30 15:13:01 -08:00
samcake	2dcedf9f39	cherry picking Tony's fix for shader compilation time not taking soo long and adding better feedback from shader compilation	2018-01-30 12:52:05 -08:00
Atlante45	db08f1dda6	Move backtrace to interface	2018-01-30 11:39:48 -08:00
Anthony Thibault	1e8a5485c1	8x shader compilation optimization and watchdog disable addPlumberPipeline in RenderPipelines.cpp would recompile a single program 7 more times then necessary. This was causing startup times on Mac OS X to trigger the deadlock watchdog. Even with this fix, compiling shaders is still too slow, As a workaround, we disable the watchdog thread during rendering pipeline setup.	2018-01-30 10:27:06 -08:00
Gabriel Calero	a5a36b4b8f	Don't show help on android. Hide menu bar	2018-01-30 14:48:37 -03:00
Gabriel Calero	07a542e35d	Add bottom bar and address dialog (Android)	2018-01-30 14:48:37 -03: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
Dante Ruiz	a670a0b9a2	Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark	2018-01-29 11:25:26 -08:00
Seth Alves	b7303414f2	unmangle merges	2018-01-26 11:57:30 -08:00
Seth Alves	19409cc6ce	fix merge/cherry-pick error	2018-01-26 10:45:18 -08:00
Seth Alves	dbe9fd290e	comment out code that would set annotations after StartHandler is called	2018-01-26 09:23:29 -08:00
Seth Alves	c550620cb4	backtrace for rc-63	2018-01-26 09:23:24 -08:00
Atlante45	39f26e35f0	backtrace for rc-63	2018-01-26 09:22:14 -08:00
Sam Gateau	51dac04374	Introducing the tag in lieu of the vsisiblity mask	2018-01-26 02:59:43 -08:00
Sam Gateau	23b99f04cd	Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch	2018-01-25 18:33:37 -08:00
Brad Davis	361b767586	Merge branch 'fix/render_config' into android	2018-01-25 14:50:41 -08:00
Brad Davis	867bb99b51	Fix help screen URL	2018-01-25 13:04:08 -08:00
ZappoMan	cb01bd14b9	Merge branch 'master' of https://github.com/highfidelity/hifi into sendDataDescription	2018-01-25 10:39:43 -08:00
Andrew Meadows	a0e07a2c4b	Merge pull request #12232 from luiscuenca/showHelp Fix Interface first launch should show help	2018-01-24 12:11:34 -08:00
Seth Alves	1cbc2e31cf	merge from upstream	2018-01-23 15:21:03 -08:00
humbletim	65455e7b50	Merge remote-tracking branch 'upstream/master' into Leopoly_Phase1_004_RayPick-Changes	2018-01-23 14:57:33 -05:00
Brad Davis	5bf2bda96d	Merge branch 'android' into android_new	2018-01-23 08:17:46 -08:00
luiscuenca	3c12ae8925	Fix Edit/Asset Browser in HMD mode	2018-01-22 20:52:18 -07:00
luiscuenca	6d6950deca	Fix Interface first launch should show help	2018-01-22 16:25:58 -07:00
Brad Davis	8ae0b09ea2	Merge remote-tracking branch 'upstream/master' into android	2018-01-22 15:07:30 -08:00
John Conklin II	22ee57db74	Merge pull request #12214 from 1st-BrainStormer/master Fix lockup when no midi devices present.	2018-01-22 11:25:46 -08:00
ZappoMan	4ad5d34a10	more preferences cleanup, removing some dead code from ScriptEngines/ScriptModel	2018-01-20 17:20:42 -08:00
Bruce Brown	f7caba5295	de-bounce Midi::USBchanged signal. Debounced USBchanged signal to prevent pauses.	2018-01-20 11:17:47 -08:00
Brad Davis	3e7872637d	Merge branch 'android' into android_new	2018-01-19 14:40:01 -08:00
Brad Davis	d53b8b38ac	Merge remote-tracking branch 'upstream/master' into android	2018-01-19 14:35:20 -08:00
Brad Davis	686393d62f	Load built-in resources earlier	2018-01-19 14:35:04 -08:00
Seth Alves	9be2c67f00	Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1	2018-01-19 11:46:34 -08:00
Zach Fox	9d6e62d6bf	Merge pull request #12163 from ElderOrb/FB11109 FB11109 Preview disabled image swap (Commerce only)	2018-01-19 11:40:05 -08:00
Brad Davis	3dba928b72	Merge remote-tracking branch 'upstream/android' into android_new	2018-01-19 10:36:46 -08:00
Seth Alves	bce9b5f459	Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1	2018-01-19 09:53:54 -08:00
Brad Davis	bdfa1273ba	Merge remote-tracking branch 'upstream/master' into android	2018-01-18 17:33:10 -08:00
Clément Brisset	37504eca15	Merge pull request #12186 from ctrlaltdavid/21702 Add Window.protocolSignature() as a replacement for location.protocolVersion()	2018-01-18 15:20:03 -08:00
Sam Gateau	aec99db4fc	Merge pull request #12157 from AndrewMeadows/lod-debug-ui add scripted/qml debug UI for render LOD	2018-01-18 15:00:50 -08:00
Brad Hefta-Gaub	c9cedcb2c0	Merge pull request #12183 from SamGondelman/pointerCrash Destroy PointerManager before PickManager	2018-01-18 14:58:20 -08:00
Alexander Ivash	a74b093b60	FB11109 Preview disabled image swap (Commerce only)	2018-01-18 23:26:43 +03:00
Brad Davis	d3c4b0ef45	Merge remote-tracking branch 'gcalero/android_virtual_touchpad' into android_new	2018-01-18 10:04:03 -08:00
Andrew Meadows	82cab5e4a1	add scripted/qml debug UI for render LOD	2018-01-18 08:53:45 -08:00
Sam Gateau	7a9740d258	visible-perview	2018-01-18 02:18:46 -08:00
Brad Davis	cbb2d9d854	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 17:51:39 -08:00
Zach Fox	1d747bc0e4	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-17 11:56:00 -08:00
Bradley Austin Davis	9f6c2c3cdd	Merge remote-tracking branch 'upstream/master' into android	2018-01-17 11:44:00 -08:00
Dante Ruiz	ebb09f4271	Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark	2018-01-17 11:04:46 -08:00
David Back	92c0fd4877	Merge pull request #12116 from dback2/deleteAccount_renameGS_addAS Merge Account & GlobalServices follow-up	2018-01-17 10:50:54 -08:00
Gabriel Calero	970ca5e08f	Add virtual pad for android	2018-01-17 15:00:43 -03:00
Brad Davis	6a06bf405a	Merge remote-tracking branch 'upstream/master' into android	2018-01-16 18:24:44 -08:00
Sam Gateau	d4571bd86a	Merge pull request #12181 from humbletim/rename-model-graphics Rename libraries/model -> libraries/graphics	2018-01-16 18:12:25 -08:00
David Rowe	2883e24285	Add Window.protocolVersion() as a replacement for location's	2018-01-17 12:00:35 +13:00
Bradley Austin Davis	b4223215ef	Use old style resources on OSX for now	2018-01-16 14:44:05 -08:00
Clément Brisset	1949471dad	Merge pull request #12182 from highfidelity/stable Merge stable (RC62) to master	2018-01-16 11:01:07 -08:00
SamGondelman	c3eb4b5ecd	destroy pointermanager before pickmanager	2018-01-16 10:31:42 -08:00
humbletim	b91d536dd0	rename model:: -> graphics::	2018-01-16 12:46:16 -05:00
Dante Ruiz	69389116f5	add menu option for AvatarEntitiesBookmarks	2018-01-15 16:47:48 -08:00
Brad Davis	d10d7026c5	Force Qt to use ANGLE when in GLES mode on Windows	2018-01-15 13:42:41 -08:00
John Conklin II	c3648fb04c	Merge pull request #12168 from druiz17/RC62 fix Asset browser for tablet (RC62)	2018-01-15 10:16:56 -08:00
Zach Fox	f7ed8c10fa	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-15 10:13:07 -08:00
Brad Davis	58530c595a	Pre-merge cleanup	2018-01-14 19:48:12 -08:00
Brad Davis	acb95d1355	GLAD polish	2018-01-14 00:10:05 -08:00
Brad Davis	24b83aa0f1	Merge remote-tracking branch 'sam/android-gles' into windows_gles	2018-01-13 11:36:31 -08:00
Brad Davis	17899d5e07	Don't create share context for web while running nsight	2018-01-13 11:32:23 -08:00
Sam Gateau	df0660f823	Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles	2018-01-13 01:00:41 -08:00
Sam Gateau	331a8f3094	fixing the stencil not clearing correctly and shaders not compiled correctly in main thread	2018-01-13 01:00:10 -08:00
Brad Davis	ab7aa52a10	GLES emulaton on windows	2018-01-12 19:17:35 -08:00
Dante Ruiz	8e4bd2d662	fix asset browser for tablet	2018-01-12 17:11:02 -08:00
Dante Ruiz	a48304b104	fix Asset browser for tablet	2018-01-12 17:06:07 -08:00
Zach Fox	e627925bd3	Fix 'Browse Avatars' button from Avatar Settings	2018-01-12 15:14:42 -08:00
Zach Fox	6920e57613	Fix 'Browse Avatars' button from Avatar Settings	2018-01-12 13:31:58 -08:00
Brad Davis	7579451c24	Merge remote-tracking branch 'upstream/master' into android	2018-01-11 23:31:45 -08:00
Zach Fox	d25ef074e1	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-11 12:35:18 -08:00
Seth Alves	aefd294bf2	Merge pull request #12107 from hyperlogic/bug-fix/better-third-person-camera Improve stability for HMD third person avatars	2018-01-10 17:46:47 -08:00
Brad Davis	97593bc4d8	Fixing compiled resource access	2018-01-10 17:18:12 -08:00
Zach Fox	c15b1669b1	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-10 15:53:23 -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
MiladNazeri	2220b976dc	Merge pull request #12130 from cain-kilgore/21665 WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal	2018-01-10 12:06:58 -08:00
Anthony J. Thibault	220b7f5e55	Merge branch 'master' into bug-fix/better-third-person-camera	2018-01-10 10:14:09 -08:00
Zach Fox	e5abdc77d9	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1	2018-01-10 10:02:56 -08:00
Sam Gateau	d4dc1e352f	Merge pull request #12124 from AndrewMeadows/no-misc-stats more context for update performance stats	2018-01-10 09:10:26 -08:00
Cain Kilgore	330b266ca8	Merge branch 'master' of https://github.com/highfidelity/hifi into 21665	2018-01-10 11:33:06 +00:00
Cain Kilgore	38afc5a25b	WL 21665 - Window.takeSecondaryCameraSnapshot() should emit a stillSnapshotTaken signal	2018-01-10 11:31:46 +00:00
Brad Davis	b1e95681a9	Cleanup android	2018-01-09 23:30:31 -08:00
Brad Davis	105dffebaf	Fixing UI	2018-01-09 18:36:42 -08:00
Zach Fox	a6259a5ef5	Initial progress	2018-01-09 13:39:28 -08:00
Andrew Meadows	8c6edc749a	provide more context for update perf stats	2018-01-09 12:59:32 -08:00
SamGondelman	7c56a9ffb2	model meta is only withTypeShape if visual geometry request fails	2018-01-09 12:43:43 -08:00
Brad Davis	bd5af2b493	Working on android avatar rendering	2018-01-09 11:40:32 -08:00
luiscuenca	9a81410762	refactor	2018-01-08 20:51:15 -07:00
luiscuenca	319913e6af	Fix toolbar appears on HMD mode	2018-01-08 20:37:07 -07:00
David Back	13c34b2d33	add AccountServices context	2018-01-08 17:37:48 -08:00
David Back	43cd5586f3	nuke AccountScriptingInterface, rename GlobalServicesScriptingInterface to AccountServicesScriptingInterface	2018-01-08 17:25:58 -08:00
Brad Davis	a2c2e7d9ff	Fixes to load cubemap	2018-01-08 14:43:54 -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
Anthony J. Thibault	61edd83987	Improve stability for HMD third person avatars Previously there was a hack where the sensor to world matrix was NOT updated in HMD mode if the camera was third person. The reason the hack existed was to make third person camera less nauseating for users. However this had a major drawbacks. It led to avatar hip spasms when the user turned around in the tracked volume, while in third person camera. To fix this issue properly, the hack which prevented updating the sensor to world matrix was removed, and now the third person camera is now computed in sensor space relative to the hmd.	2018-01-08 11:26:29 -08:00
Bradley Austin Davis	68cd768a65	Merge branch 'android' into android_render_pr	2018-01-08 12:49:52 -05:00
Andrew Meadows	b28684f15e	Merge pull request #12087 from ctrlaltdavid/21661 Laser auto-on with tablet and Web overlays	2018-01-05 14:08:01 -08:00
David Back	b165eac6a0	Merge branch 'master' into mergeAccountGlobalServices	2018-01-05 10:54:59 -08:00
Andrew Meadows	c33c637f07	Merge pull request #12041 from vladest/case_10854_fix_not_loading_dialogs Adopt path to certain Tablet dialogs to new loading subsystem and pat…	2018-01-05 09:07:54 -08:00
Seth Alves	fd8b521c50	Merge pull request #12038 from ElderOrb/audio_name_conflict_fix Audio name conflict fix (fix for https://github.com/highfidelity/hifi/issues/11963)	2018-01-05 08:15:48 -08:00
NissimHadar	43bc8bb948	Merge pull request #11939 from AndrewMeadows/dont-disable-default-motor defang accidental disable of MyAvatar's default motor	2018-01-04 17:44:22 -08:00
David Back	81f3590954	Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices	2018-01-04 13:17:07 -08:00
Gabriel Calero	8cac98545a	Fixes for Android	2018-01-04 17:36:10 -03:00
Clément Brisset	efbff56f26	Merge pull request #11925 from Atlante45/feat/remove-jurisdiction-listener Remove legacy jurisdiction code	2018-01-04 11:52:38 -08:00
David Rowe	7236ac17e2	Merge branch 'master' into 21661	2018-01-04 15:21:00 +13:00
David Back	6c8987d75f	Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices	2018-01-03 14:44:52 -08: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	468fc89c3e	Use forward pipeline for android	2018-01-03 16:38:23 -03:00
Gabriel Calero	76b38bebad	Make Interface run in Android	2018-01-03 16:36:11 -03:00
David Rowe	901af8896f	Add "Prefer Stylus Over Laser" setting	2018-01-03 17:54:43 +13:00
Elisa Lupin-Jimenez	a63538c4e9	Merge pull request #12021 from elisa-lj11/poly_api Google Poly API	2018-01-02 10:28:17 -08:00
Atlante45	28f164d7e5	Remove legacy jurisdiction code	2017-12-29 12:46:52 -08:00
Elisa Lupin-Jimenez	3e10d3b436	Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api	2017-12-26 10:18:51 -08:00
David Back	c620f3274c	merge	2017-12-22 16:28:29 -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
vladest	7985c39f2a	Adopt path to certain Tablet dialogs to new loading subsystem and path resolver	2017-12-21 22:14:15 +01:00
Alexander Ivash	bd3a056f4e	rename exposed to QML "Audio" context object to "AudioScriptingInteface" to avoid naming conflict note: I'm not sure what exactly causes naming conflict - importing QtMultimedia in ForceLoad.qml, or the fact of existance of Audio.qml, but starting with Qt 5.10.0 'Audio' already exists in global scope	2017-12-21 20:03:38 +00:00
humbletim	a146b778f7	support additional .extraInfo for ray intersections	2017-12-21 12:35:13 -05:00
Andrew Meadows	4fb9680f3b	also consider GPU render time for LOD adjust	2017-12-20 17:41:08 -08:00
Andrew Meadows	8e0d367a2d	use full 'present' time for FPS calculation also, refactor LOD adjust logic	2017-12-20 17:41:08 -08:00
Andrew Meadows	6ad3a0598c	remove crufty comment	2017-12-20 08:42:42 -08:00
Andrew Meadows	f82de05f9c	defang accidental disable of MyAvatar's default motor	2017-12-20 08:42:42 -08:00
Elisa Lupin-Jimenez	8a9e5bc39d	Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api	2017-12-19 10:41:39 -08:00
Zach Fox	18d5be147c	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-19 09:48:15 -08:00
Seth Alves	ddbb7a4416	when an avatar-entity's lifetime expires, remove it from avatarEntityData	2017-12-18 14:26:25 -08: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
Elisa Lupin-Jimenez	0e57ed5c12	Merge branch 'master' of https://github.com/highfidelity/hifi into poly_api	2017-12-18 10:00:18 -08:00
Elisa Lupin-Jimenez	dc999401d5	Created poly scripting interface template	2017-12-13 16:19:36 -08:00
Stephen Birarda	139976d8bb	allow staging METAVERSE_SERVER_URL to be toggled by env	2017-12-12 16:22:08 -08:00
Andrew Meadows	406bf7898d	cleanup prof stats and trace context names	2017-12-11 11:31:00 -08:00
Andrew Meadows	2538204b1e	expose physics simulation stats to Test JS API	2017-12-11 11:31:00 -08: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
Clément Brisset	18b9118518	Merge pull request #11935 from birarda/bug/atp-drop-actual-files-only only attempt default asset upload for local files	2017-12-08 17:18:49 -08:00
Stephen Birarda	3265eb42f1	only attempt default asset upload for local files	2017-12-08 14:45:27 -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
Olivier Prat	92e1fe8e5c	Removed jitter samples from shader and added name to batches in DEBUG mode to ease render debug	2017-12-08 18:02:27 +01: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
David Back	46d265e3f1	Merge branch 'master' of https://github.com/highfidelity/hifi into mergeaccountglobalservices	2017-12-07 10:13:55 -08:00
Anthony J. Thibault	fbcecbfc89	Merge branch 'master' into feature/domain-limited-height	2017-12-07 10:01:33 -08:00
Seth Alves	86f58c1353	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-07 08:50:50 -08:00
Olivier Prat	1ce1aca79f	Merged with samcake's 'black' branch	2017-12-07 08:59:38 +01:00
David Back	3873a8f91e	Merge branch 'master' into mergeAccountGlobalServices	2017-12-04 14:46:59 -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
SamGondelman	c5ebb8a279	expose Window.getDeviceSize()	2017-11-28 16:16:30 -08:00
Sam Gateau	8389137caa	Merge pull request #11834 from highfidelity/pointers UI Pointer Optimization	2017-11-21 16:01:52 -08:00
Dante Ruiz	767b0fa4af	remove unused variable warning	2017-11-21 14:45:55 -08:00
samcake	84ff40c717	Merging with master	2017-11-21 14:12:47 -08:00
Dante Ruiz	c9ad7b1db5	Merge branch 'master' of github.com:highfidelity/hifi into fix-modal	2017-11-21 13:56:22 -08:00
Dante Ruiz	88c3adbff1	change askToReplaceDomainContent to use async question and warning	2017-11-21 13:56:11 -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
ZappoMan	3a967ca895	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-21 10:53:29 -08:00
Brad Hefta-Gaub	5dadec0b93	Merge pull request #11845 from thoys/feat/parentJointName Import JSON parentJointName value	2017-11-21 07:58:13 -08:00
ZappoMan	b44ced4c21	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-20 17:19:18 -08:00
Thijs Wenker	627fee80ec	added support for exporting parentJointName	2017-11-21 01:49:56 +01:00
Elisa Lupin-Jimenez	3211aa7d13	Merge pull request #11849 from elisa-lj11/blocks Zip file structures replicated in asset server	2017-11-20 16:13:51 -08:00
Elisa Lupin-Jimenez	fb6287503e	hopefully fixed build error resulting from escape sequence	2017-11-20 15:12:11 -08:00
Thijs Wenker	c3754d6369	smart pointer	2017-11-20 23:24:03 +01:00
Elisa Lupin-Jimenez	a54f4eca93	simplified naming of zip folders	2017-11-20 14:02:46 -08:00
Elisa Lupin-Jimenez	b6e75d1222	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-11-20 10:07:11 -08:00
Elisa Lupin-Jimenez	3aa7cb440d	file structures in zip files replicated, more useful unzip debug print, updated blocks tablet app url	2017-11-20 10:01:33 -08:00
Dante Ruiz	76935c1457	fixing merge conflict	2017-11-20 09:51:10 -08:00
Thijs Wenker	e94199acad	Merge branch 'master' of github.com:highfidelity/hifi into feat/parentJointName	2017-11-20 18:29:54 +01:00
Thijs Wenker	84ec9890ca	reverted special property case, parentJointName is now only parsed from the JSON import	2017-11-20 18:29:33 +01:00
Seth Alves	df07b66872	Merge branch 'master' of github.com:highfidelity/hifi into av-ent-misc-fixes	2017-11-20 07:47:19 -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	e070033ce4	Merge pull request #11793 from ElderOrb/FB9032 9032 - Current display mode can be deselected in the toolbar/tablet menu	2017-11-19 11:25:35 -08:00
Brad Hefta-Gaub	ff8ca6da4c	Merge pull request #11303 from vladest/webbrowser_updates Webbrowser updates	2017-11-19 11:11:09 -08:00
Alexander Ivash	c4aa937108	adjust to coding standards	2017-11-18 11:16:40 +03:00
SamGondelman	033f658fff	Merge remote-tracking branch 'upstream/master' into pointers	2017-11-17 16:10:20 -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
Stephen Birarda	eedb77dae9	add clearing of known state if client resets ES connection	2017-11-16 11:40:35 -08: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
Brad Davis	7bbc719d79	Fix for black screen on HMD derived display plugins	2017-11-16 08:53:12 -08:00
Seth Alves	93fd2a6a6b	clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared	2017-11-15 20:10:05 -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
Brad Davis	1167be4102	Reverting tablet API rename, cleaning up duplicated code	2017-11-15 11:52:55 -08:00
Atlante45	e68ce97697	Remove the number of socket change tracking	2017-11-15 11:19:54 -08:00
Zach Fox	8f855c6c95	Update QUrls	2017-11-15 09:21:10 -08:00
Zach Fox	5290ee3b4e	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-14 10:07:44 -08:00
Brad Davis	d71fd151c5	Fixing button model exposure	2017-11-13 16:45:27 -08:00
Zach Fox	a3332e15b7	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-13 15:01:26 -08:00
SamGondelman	2fb1981c4a	merge with master	2017-11-13 14:34:39 -08:00
Brad Davis	5cf9c1bb33	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-13 10:48:21 -08:00
Ryan Downe Karpf	3ea6ecf104	Merge pull request #11747 from luiscuenca/case8495 8495 No mirror camera in HMD mode	2017-11-13 09:09:34 -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
Brad Davis	92a3c209aa	Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet	2017-11-10 11:44:29 -08:00
beholder	da49ee8bee	9032 Current display mode can be deselected in the toolbar/tablet menu	2017-11-10 19:53:55 +03:00
luiscuenca	055fe16677	Allow script to change to mirror camera in HMD	2017-11-09 18:27:16 -07:00
Elisa Lupin-Jimenez	45b9a150dc	updated blocks url refs in application to fix download issue	2017-11-08 15:21:48 -08:00
Elisa Lupin-Jimenez	1ceec17405	missed an fbx block	2017-11-07 17:12:39 -08:00
Elisa Lupin-Jimenez	9a09ffe12f	removed old fbx code	2017-11-07 17:10:57 -08:00
Elisa Lupin-Jimenez	e37010565f	changed fileDialog return value to be compatible with musvis	2017-11-07 16:55:07 -08:00
Elisa Lupin-Jimenez	89a9269982	synced up	2017-11-07 10:37:55 -08:00
SamGondelman	f970eb2302	merge with pointers branch	2017-11-06 14:49:50 -08:00
Zach Fox	b54627594b	Merge branch 'feature/qml_whitelist_tablet' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-11-06 09:29:26 -08:00
Zach Fox	149c8fbeb2	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-11-06 09:25:30 -08:00
luiscuenca	31b63ffbe6	Not posible to change to mirror mode using js	2017-11-06 08:03:07 -07:00
Brad Davis	d162e1cff6	Whitelist functionality for tablet apps	2017-11-04 15:14:06 -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
luiscuenca	f226835876	8495 No mirror camera in HMD mode	2017-11-03 11:51:03 -07:00
SamGondelman	dd4275430b	fix hover events, working on HUD events	2017-11-02 17:48:37 -07:00
ZappoMan	afaad5fcd7	Merge branch 'master' of https://github.com/highfidelity/hifi into entityItemCleanup	2017-11-02 13:39:51 -07:00
Brad Davis	f061b9c2da	Add stylus functionality to pointer manager	2017-11-01 11:27:57 -07:00
SamGondelman	657a0fb036	Merge remote-tracking branch 'upstream/pointers' into ui	2017-10-31 17:41:14 -07:00
SamGondelman	64665c87b2	replace ids with unsigned ints	2017-10-31 17:07:48 -07:00
SamGondelman	3c779f1528	HUD events WIP, fix entity/overlay hover, no hover for empty renderState	2017-10-31 14:42:31 -07:00
Bradley Austin Davis	55d819d7e3	Merge pull request #11699 from SamGondelman/ui Pointers generate PointerEvents (WIP)	2017-10-31 10:01:15 -07:00
vladest	d9c6f17e42	Coding standards	2017-10-30 20:06:17 +01:00
vladest	586dde7dd7	Removed GPL code. Added own implementation of suggestions engine. Fixed Google maps different issues	2017-10-30 18:15:42 +01:00
Brad Davis	23653f08ca	Merge remote-tracking branch 'upstream/master' into HEAD	2017-10-30 09:20:58 -07:00
ZappoMan	f63db42c0e	migrate SpatiallyNestable::getOrientation to getWorldOrientation, remove redundant getRotation	2017-10-28 10:14:25 -07:00
vladest	865c241a13	Merge branch 'master' into webbrowser_updates	2017-10-28 12:31:26 +02:00
ZappoMan	a7a0f03ede	rename SpatiallyNestable::getPosition() to SpatiallyNestable::getWorldPosition()	2017-10-27 18:39:17 -07:00
Zach Fox	5ab737f66d	Merge pull request #11658 from zfox23/pop_dynamicTestsMaster Commerce: Owner Verification for Certified Entities	2017-10-27 12:28:04 -07:00
SamGondelman	7951826e49	more advanced laser focusing	2017-10-26 16:10:27 -07:00
Zach Fox	c62eb2bf3c	Merge branch 'feature/qml_whitelist_2' of https://github.com/jherico/hifi into commerce_QmlWhitelist	2017-10-26 14:58:43 -07:00
SamGondelman	f0c15e874c	merge with master	2017-10-26 14:52:17 -07:00
Brad Davis	ffc51d5387	Working on QML whitelist functionality	2017-10-26 14:20:13 -07:00
vladest	794355dc35	Merge branch 'master' into webbrowser_updates	2017-10-26 21:18:00 +02: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
Bradley Austin Davis	becd99a964	Merge pull request #11584 from SamGondelman/pointerEvents First step of cleaning up PointerEvents	2017-10-26 12:01:03 -07:00
Zach Fox	40aa3b522c	Three slashes, not two	2017-10-26 10:59:18 -07:00
Zach Fox	7027dbb8d4	Integrate Austin's changes	2017-10-26 10:48:26 -07:00
Zach Fox	c1e990e7be	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-10-26 10:37:31 -07:00
Ken Cooke	4eb8b826c2	Merge pull request #11681 from luiscuenca/case6443 6443 Audio Menu Sample Sound won't play while domain is loading	2017-10-26 08:40:30 -07:00
luiscuenca	3d3077978e	Simplyfied and fixed null pointer	2017-10-25 18:47:10 -07:00
Sam Gondelman	863a2041a6	Merge branch 'master' into pointerEvents	2017-10-25 17:22:19 -07:00
Zach Fox	dafa830c0d	First steps	2017-10-25 14:44:59 -07:00
luiscuenca	a1c9285c90	Fixed bug on case 6443	2017-10-25 13:13:50 -07:00
vladest	9f32b6c634	Merge branch 'master' into webbrowser_updates	2017-10-25 21:46:39 +02:00
Zach Fox	91333cdf7b	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-25 10:26:50 -07:00
David Back	cffcf2d8df	point Account context to GlobalServices instead	2017-10-24 13:44:00 -07:00
Brad Davis	befe583c5e	Merge remote-tracking branch 'upstream/master' into HEAD	2017-10-24 11:50:07 -07: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	cda43ec1ea	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-23 11:52:59 -07:00
beholder	cadf00fecf	add missing 'eyeToWorld' assignment	2017-10-22 19:27:04 +03:00
vladest	d46578e572	Merge branch 'master' into webbrowser_updates	2017-10-21 19:12:23 +02:00
SamGondelman	7686948daf	resolve conflicts and cleanup	2017-10-20 15:23:17 -07:00
SamGondelman	fb969964f3	generalized scripting interfaces	2017-10-20 14:37:10 -07:00
Brad Hefta-Gaub	f6af1d1ecf	Merge pull request #11387 from vladest/tablet_extended_sounds Tablet extended sounds	2017-10-20 13:49:06 -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
SamGondelman	24ce09f914	generalized pointer, laserpointermanager -> pointermanager	2017-10-20 11:28:48 -07:00
vladest	ea6c2e1bb5	Merge branch 'master' into tablet_extended_sounds	2017-10-20 14:46:02 +02:00
SamGondelman	d7745efc8e	one global pickmanager	2017-10-19 16:55:24 -07:00
SamGondelman	3572f7f5db	non-templated pickresult wip	2017-10-19 13:41:16 -07:00
Zach Fox	9537e19ad4	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-19 10:58:55 -07:00
vladest	92fc6daecc	Merge branch 'master' into webbrowser_updates	2017-10-19 14:56:31 +02:00
Bradley Austin Davis	aa6c841357	Merge pull request #11588 from jherico/future/qrc Package all UI resources into a QRC built into the application.	2017-10-18 15:29:34 -07:00
Zach Fox	3f0b08aea8	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster	2017-10-18 10:37:47 -07:00
SamGondelman	640ad514bc	updates based on austin's comments	2017-10-17 17:53:10 -07:00
SamGondelman	3ef7ebffba	working generalized pickmanager	2017-10-17 15:09:41 -07:00
SamGondelman	d274d99411	merge from master	2017-10-16 12:17:37 -07:00
Andrew Meadows	e109101acc	update profiling timers	2017-10-16 11:52:30 -07:00
Zach Fox	febc725520	Merge branch 'RC-57' of https://github.com/highfidelity/hifi into pop_dynamicTests57	2017-10-16 09:53:15 -07:00
Sam Gateau	ec934335dc	CLeaning up the pr regarding the scripts with my branch blue	2017-10-15 22:34:58 -07:00
Brad Davis	2ae61cb96b	Prototype packaging QML and related resources into a QRC	2017-10-14 14:40:46 -07:00
SamGondelman	c4e6cb28ce	move contextoverlay connection to contextoverlayinterface	2017-10-13 16:23:29 -07:00
Anthony J. Thibault	67d43b4fac	Use atomic<bool> and compare_exchange_strong	2017-10-13 16:03:56 -07:00
SamGondelman	5bfb0baf09	const references	2017-10-13 14:38:46 -07:00
Anthony J. Thibault	a2a6cd0c7a	Reduce present traffic on main thread event queue. In an effort to diagnose the root cause of several deadlocks, it seems possible that the main thread event queue can grow to a size where it can take many seconds to drain. This PR attempts to address this in two ways: * Change the connection between the DisplayPlugin::presented signal and the Application::onPresent slot to be a DirectConnection. This should prevent the main thread from filling up with signal events. * Within Applicaiton::onPresent use an atomic counter to prevent the main thread from filling up with repeated Idle events.	2017-10-13 14:28:23 -07:00
SamGondelman	dacd48862f	put back overlay signals for scripts	2017-10-12 16:43:33 -07:00
SamGondelman	0d164363af	cleanup mousePressOffEntity signal	2017-10-12 15:29:29 -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
SamGondelman	53fde83922	cleaning up pointerevents, wip	2017-10-12 11:21:50 -07:00
vladest	67ee4a7679	Merge branch 'master' into webbrowser_updates	2017-10-12 20:15:53 +02:00
Zach Fox	5efa920712	Getting closer	2017-10-12 11:13:23 -07:00
vladest	145149fedd	Merge branch 'master' into tablet_extended_sounds	2017-10-12 18:01:23 +02:00
SamGondelman	403b18977b	remove unused HFMetaEvents	2017-10-11 14:37:23 -07:00
Zach Fox	f037eab26c	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests	2017-10-11 11:07:32 -07:00
Sam Gateau	f143c28625	Merge pull request #11542 from SamGondelman/bubbleBoy Move HUD and HUD overlay rendering out of display plugin	2017-10-10 14:26:20 -07:00
Zach Fox	0ae69b6ad9	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTests	2017-10-10 12:38:14 -07:00
Zach Fox	b105248dd7	Merge pull request #11555 from zfox23/commerce_daveIntegration2 2017-10-09 Commerce Frontend Updates	2017-10-10 12:34:30 -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
Seth Alves	f349ba3674	replace parent avatar-id with avatar-self-id when exporting entities	2017-10-09 15:32:45 -07:00
Zach Fox	b81a8a95ea	Final fixes	2017-10-09 15:23:22 -07:00
Seth Alves	d1d2b8a4da	don't export avatar-parent sessions IDs into json	2017-10-09 14:02:20 -07:00
Andrew Meadows	bbde1bcd63	move stuff out of writelock when possible	2017-10-09 10:42:42 -07:00
Andrew Meadows	0bcecdbe66	be picky when finding nearby entities at login	2017-10-09 10:27:46 -07:00
Andrew Meadows	0f4e7fb532	workaround for bad physics polling on login	2017-10-09 10:27:46 -07:00
SamGondelman	e95ecc3f27	fix missing sensorToWorld matrix	2017-10-06 15:37:23 -07:00
SamGondelman	7e6d5d9d98	merge with master	2017-10-06 14:57:08 -07:00
Zach Fox	1fa9bd8fc6	Better implementation of location change and bugfixes	2017-10-06 12:22:29 -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
Sam Gateau	69e68ef5ad	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-10-04 18:58:33 -07:00
samcake	7f86a4ee28	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-10-04 13:35:31 -07:00
samcake	d7333d3fa3	Merging with master	2017-10-04 10:55:38 -07:00
SamGondelman	fa838e4715	merge from master	2017-10-03 15:53:33 -07:00
Zach Fox	ea3da6c9dd	Merge pull request #11495 from zfox23/pop_interfaceChanges2 Commerce: One step closer!	2017-10-03 11:56:00 -07:00
Andrew Meadows	cd4be1473f	put more of Application::update() under time measurement	2017-10-03 10:34:12 -07:00
Sam Gateau	316156db46	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-10-02 21:31:59 -07:00
samcake	bb99f68d40	Avoiding the need for the GLobal frameTiing Scriptiong interface and just a regular member of APplication instead	2017-10-02 17:04:00 -07:00
samcake	6639287418	Merging with master	2017-10-02 17:03:09 -07:00
Andrew Meadows	8d2153d2f3	cleanup debug stats, use more correct names	2017-10-02 13:08:17 -07:00
Andrew Meadows	0fc6bf1e89	Merge pull request #11471 from Atlante45/feat/auto-bake Asset Browser tweaks	2017-10-02 11:29:36 -07:00
Sam Gateau	68046ae4e3	Merge pull request #11491 from jherico/dev/disable_watchdog Disable watchdog with environment variable	2017-10-02 10:19:32 -07:00
Zach Fox	1ec0f5d9a0	Merge branch 'master' of https://github.com/highfidelity/hifi into pop_interfaceChanges2	2017-10-02 09:26:59 -07:00
vladest	e360c1363e	Merge branch 'master' into tablet_extended_sounds	2017-10-02 18:03:49 +02:00
Sam Gateau	6c510bc18f	fine tuning the changes to respect clean up	2017-10-01 20:05:48 -07:00
samcake	0cbf19bcf1	Removing comments	2017-10-01 17:47:35 -07:00
samcake	aa10c29609	Cleaning up the changed code	2017-10-01 17:16:10 -07:00
Sam Gateau	44cc6deac2	moving render specific code from Application.cpp to Application_render.cpp	2017-10-01 12:55:44 -07:00
samcake	577378f539	Adding stuff that seems to break?	2017-09-29 17:45:10 -07:00
samcake	225d2bbbb4	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-29 13:47:37 -07:00
Zach Fox	63396a2fc3	WalletScriptingInterface; wallet status refactor	2017-09-29 13:42:04 -07:00
Andrew Meadows	1c30f7424e	remove cruft and add comments	2017-09-29 11:34:35 -07:00
SamGondelman	3ae41b9b75	cleanup client and stats string	2017-09-29 11:34:35 -07:00
Andrew Meadows	fb3e74398f	don't invalidate viewFrustum sent to server	2017-09-29 11:34:35 -07:00
SamGondelman	cbf82a6f2c	fix timeout for physics check	2017-09-29 11:34:34 -07:00
Brad Davis	a7d507e9fd	Disable watchdog with environment variable	2017-09-29 10:44:04 -07:00
SamGondelman	b59ec07171	move hud rendering to render thread, still need to separate out hud overlays	2017-09-29 09:49:08 -07:00
samcake	c112a3baf1	Seting up of camera and avatar correctly in game loop, not in render loop	2017-09-28 15:09:49 -07:00
samcake	b1daae0150	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-28 09:16:02 -07:00
samcake	40ca98214b	Moving all of the camera and avatar eval to game loop	2017-09-27 17:58:43 -07:00
Sam Gateau	287f4f1d71	Merge pull request #11466 from SamGondelman/mirrorCrash Fix mirror and fade threading crashes	2017-09-27 16:17:04 -07:00
SamGondelman	553829f7ab	make sure FadeEffect dependency is created early	2017-09-27 11:58:35 -07:00
Sam Gateau	88097bb39f	Merge pull request #11447 from AndrewMeadows/lod-auto-adjust LODManager uses batchTime and engineRunTime for automatic LOD adjustment	2017-09-27 10:51:46 -07:00
Ryan Huffman	014a7bc9b0	Fix bytes downloaded stat tracking	2017-09-27 09:33:10 -07:00
Atlante45	acb0bf8d20	Asset Browser tweaks	2017-09-26 17:26:46 -07:00
samcake	f16c552978	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-26 17:18:05 -07:00
Andrew Meadows	dafadf82bb	Merge pull request #11458 from jherico/fix/tablet_latency Fix long tablet lag on first load	2017-09-26 16:18:31 -07:00
samcake	328dd9c108	Merge branch 'game-render-interface' of https://github.com/highfidelity/hifi into blue	2017-09-26 16:12:27 -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
Dante Ruiz	e397d49564	Merge pull request #11159 from vladest/modal_dialogs_async Modal dialogs async	2017-09-26 11:07:42 -07:00
samcake	669af73a96	Bringing as much as possible out from render to game	2017-09-26 10:47:24 -07:00
Sam Gateau	953614fe65	More stuff out of render to the gameloop	2017-09-25 23:43:32 -07:00
samcake	157b4f2e13	Moving some of the updates on the camera and the avatar out from render to game loop	2017-09-25 18:28:33 -07:00
Brad Davis	40c42d35a5	Fix long tablet lag on first load	2017-09-25 17:50:04 -07:00
samcake	11c55755d5	Removing unused call	2017-09-25 15:10:40 -07:00
Andrew Meadows	37c501b131	LODManager uses renderTime instead of main loop fps	2017-09-25 13:17:21 -07:00
vladest	b190fac4f1	Fix stylus	2017-09-25 19:45:51 +02:00
vladest	b5f0c4d940	Added settings controls sounds	2017-09-25 16:46:36 +02:00
vladest	5a452fa981	Merge branch 'master' into tablet_extended_sounds	2017-09-25 15:40:40 +02:00
samcake	510ecbb137	Merging with upstream	2017-09-21 16:59:15 -07:00
Anthony J. Thibault	54e627e2c5	Merge branch 'master' into feature/ant-man2	2017-09-21 13:59:47 -07:00
Sam Gateau	daf18156f9	Merge pull request #11418 from SamGondelman/laserLaser Don't let scripts control visibility of laser pointer overlays	2017-09-20 17:54:00 -07:00
Anthony J. Thibault	5e93c13856	warning fix	2017-09-20 16:36:33 -07:00
SamGondelman	f21c99257e	don't let scripts control visibility of laser pointers	2017-09-20 14:35:29 -07:00
Elisa Lupin-Jimenez	1ac0a8224f	removed extraneous printouts again	2017-09-20 14:23:53 -07:00
Elisa Lupin-Jimenez	92550b749c	removed extraneous printouts	2017-09-20 14:23:09 -07:00
Elisa Lupin-Jimenez	02fa7395ac	Merge branch 'master' of https://github.com/highfidelity/hifi	2017-09-20 14:21:19 -07:00
Elisa Lupin-Jimenez	b8fdb66745	added support for fbx formats	2017-09-20 14:20:43 -07:00
samcake	3adeb80858	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-09-20 10:18:49 -07:00
Anthony J. Thibault	0873b88347	code review feedback	2017-09-20 09:21:15 -07:00
Anthony J. Thibault	809e986738	Fixes for lasers on 2d HUD	2017-09-20 09:21:14 -07:00
vladest	56e6c8674a	Merge branch 'master' into webbrowser_updates	2017-09-20 14:38:09 +02:00
vladest	67771bc297	Merge branch 'master' into modal_dialogs_async	2017-09-19 21:51:02 +02:00
vladest	6c32783a09	Merge branch 'master' into audio_devices_split	2017-09-19 17:43:03 +02:00
vladest	5202d024a7	Merge branch 'master' into tablet_extended_sounds	2017-09-19 15:55:37 +02:00
Elisa Lupin-Jimenez	a41aced032	Merge pull request #11390 from elisa-lj11/master Fixed blocks download issue with `noDownload=false` tag	2017-09-18 13:23:47 -07:00
Anthony J. Thibault	7e2b2960ed	Fix for lighting as IPD scale changes. (cherry picked from commit `a260aaaae8`)	2017-09-18 12:15:32 -07:00
Elisa Lupin-Jimenez	a45cc88e55	Fixed blocks download issue with `noDownload=false` tag	2017-09-18 11:41:30 -07:00
Anthony J. Thibault	0757f513af	Merge branch 'master' into feature/ant-man	2017-09-18 11:36:39 -07:00
vladest	e26118254f	Implemented Audio injector in Tablet scripting interface. Added missed sound events	2017-09-18 19:40:06 +02:00
vladest	3ceeb0d83e	Rework all c++ calls	2017-09-16 22:04:53 +02:00
vladest	5b033e021a	Merge branch 'master' into modal_dialogs_async	2017-09-16 12:30:07 +02:00
Anthony Thibault	c7fc45e0ae	Merge pull request #11375 from hyperlogic/bug-fix/avatar-attachments-rendering Avatar Attachments now render correctly	2017-09-15 13:28:00 -07:00
Anthony J. Thibault	3f6c88e77f	Avatar Attachments now render correctly * moved Avatar::fixupModelsInScene off the newly created render thread back to the main thread. * updated Avatar::postUpdate to take a scene pointer, necessary for Avatar::fixupModelsInScene * updated developer/tests/avatarAttachementTest.js to account for recent changes in avatar attachment scale, commit `712aff7ad`. * updated initialization of anim graph to use Model::isLoaded() instead of Model::initWhenReady() to know when the model was completely loaded.	2017-09-15 11:23:09 -07:00
Seth Alves	8a49edbecb	code review	2017-09-15 10:08:35 -07:00
vladest	0bfa29d0d4	Merge branch 'master' into modal_dialogs_async	2017-09-14 20:21:29 +02:00
Seth Alves	d89f2b77da	rework ScriptEngine lifetimes using 'smart' pointers	2017-09-14 10:42:21 -07:00
Sam Gateau	a70f7dfc87	put updateCamera in its function	2017-09-13 22:05:20 -07:00
Cain Kilgore	1c05311056	Some code cleanup	2017-09-13 16:48:18 +01:00
samcake	01e4bfc53e	Trying to avoid calling getTransform on nestables from render thread	2017-09-11 17:36:10 -07:00
Cain Kilgore	b69bd0ef49	Removed old Disconnect	2017-09-09 17:23:18 +01: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
Cain Kilgore	0820eadc5b	Fixed a thing	2017-09-08 23:52:04 +01:00
Cain Kilgore	387e474889	WIP	2017-09-08 23:48:09 +01:00
Cain Kilgore	f109a86b23	Fixed small crash bug on exit	2017-09-08 23:05:22 +01:00
Anthony J. Thibault	72e0c844e4	Merge branch 'master' into feature/ant-man	2017-09-08 14:08:26 -07:00
samcake	754f698349	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-09-08 10:17:03 -07:00
Cain Kilgore	b953c49461	Commit for Better Logger - WL 21537	2017-09-08 03:20:55 +01:00
Anthony J. Thibault	7ca498dc7f	Entities created from Google Blocks zip files now are positioned/scaled relative to the avatar.	2017-09-07 16:28:08 -07:00
Brad Davis	cc3beb3d91	Fix potential crash on asynchronous QML loads	2017-09-07 09:53:21 -07:00
Anthony J. Thibault	2f850826f2	Allow override of near/far clip planes in Oculus and OpenVR plugins	2017-09-06 11:02:44 -07:00
Chris Collins	8563a05431	Merge pull request #11255 from misslivirose/feat/tablet-tutorial Removing tutorial paths for first run experience	2017-09-06 09:23:45 -07:00
vladest	57643bd904	Merge branch 'master' into audio_devices_split	2017-09-06 14:20:41 +02:00
Liv	930243539c	add back first run to false and fix formatting	2017-09-05 17:50:25 -07:00
anshuman64	3a44c6977e	Merge pull request #11300 from ElderOrb/case7196 7196 Mouse pointer no longer visible in HMD mode	2017-09-05 17:42:36 -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
Anthony J. Thibault	f0912987a3	Fix ray picks against HUD sphere at different sensor scale factors	2017-09-05 10:03:19 -07:00
vladest	87a5a6a5b9	Merge branch 'master' into webbrowser_updates	2017-09-05 13:12:27 +02:00
vladest	6de00c7969	Implemented suggestions popup. Cleanup	2017-09-05 13:11:52 +02:00
beholder	c62f9007e9	7196 Mouse pointer no longer visible in HMD mode The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins. The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins	2017-09-03 15:20:59 +03:00
Liv	7eab80e494	change message when permissions to replace domain content are not present	2017-09-01 13:17:37 -07:00
vladest	681fc529dc	Merge branch 'master' into modal_dialogs_async	2017-09-01 13:31:15 +02:00
Liv	8d21b286b4	string fix	2017-08-31 19:34:01 -07:00
Anthony J. Thibault	6618ba12e9	Merge branch 'master' into feature/ant-man	2017-08-31 18:10:39 -07:00
vladest	1b5e6fd5f8	Merge branch 'master' into modal_dialogs_async	2017-08-31 20:39:48 +02:00
samcake	f031bf5661	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-31 09:22:19 -07:00
samcake	3a18d09bec	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-31 08:49:12 -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
Zach Fox	fdcc149c34	Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface	2017-08-30 13:27:18 -07:00
Zach Fox	271fcbf8b4	Merge pull request #11271 from davidkelly/dk/securityImageIssue security image shows up in every qml engine now	2017-08-30 10:52:48 -07:00
Liv	2f2b406047	Remove unneeded handcontrollertype code from handle first run checks	2017-08-30 09:23:33 -07:00
Anthony J. Thibault	9cd8b6991e	Merge branch 'master' into feature/ant-man	2017-08-30 08:58:55 -07:00
Chris Collins	47a2e57e26	Merge pull request #10625 from humbletim/21180-C++ CR 21180-C++ Camera app -- core changes	2017-08-30 07:20:00 -07:00
David Kelly	a2b1cfc7ac	security image shows up in every qml engine now	2017-08-29 17:06:57 -07:00
Liv	59deccaeb5	Remove unused skipTutorial code	2017-08-29 14:55:59 -07:00
Zach Fox	0cdef28cfd	Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface	2017-08-28 14:55:18 -07:00
Anthony J. Thibault	573985c7c9	Merge branch 'master' into feature/ant-man	2017-08-28 09:27:04 -07:00
vladest	38295ab73f	Merge conflicts	2017-08-28 16:58:30 +02:00
vladest	78aa5820d0	Added proper destructor call for audio scripting interface. Save settings in destructor. Added logging to check readed audio settings	2017-08-27 11:56:28 +02:00
Sam Gateau	4035478b9a	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-25 18:18:35 -07:00
Liv	59fe5ffdc1	Initial attempt at changing first run behavior	2017-08-25 17:48:35 -07:00
Elisa Lupin-Jimenez	4c40e3bdf4	fixed weird info box display of filenames	2017-08-25 11:21:07 -07:00
Elisa Lupin-Jimenez	7cee80f0cf	my own objects (or rather objects with low poly count) download now	2017-08-25 11:09:11 -07:00
samcake	46c6d52036	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-25 08:51:06 -07:00
Sam Gateau	c5fbd5a2a5	Merge pull request #11131 from jherico/threaded_render_entities Threaded rendering of Entities	2017-08-24 17:34:49 -07:00
Chris Collins	43b1e67e4a	Merge pull request #11238 from misslivirose/set-home-with-sandbox-starter Create home bookmark for new content sets loaded in	2017-08-24 16:25:04 -07:00
Zach Fox	56950e4614	It's working!	2017-08-24 14:17:39 -07:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
humbletim	9348048387	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-08-24 16:23:47 -04:00
David Kelly	eb9436ba96	Merge pull request #11235 from davidkelly/dk/encryptFile Initial wallet app plus some encryption of security image	2017-08-24 13:17:14 -07:00
samcake	b6a4ec910c	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-24 11:05:28 -07:00
Zach Fox	e834e9d7a7	Progress	2017-08-24 10:46:18 -07:00
Zach Fox	657beef70f	I understand again...getting started again	2017-08-23 17:42:02 -07:00
Liv	1050141b11	Create home path for new content sets loaded in	2017-08-23 17:38:24 -07:00
David Kelly	138534c3ff	encrypt security image	2017-08-23 15:01:09 -07:00
SamGondelman	d7b3686364	include noncollidable entities	2017-08-22 17:37:51 -07:00
Zach Fox	69364f2ecd	Initial progress	2017-08-22 17:10:57 -07:00
Zach Fox	ec2a27e68c	Progress	2017-08-22 15:02:06 -07:00
Zach Fox	2a75d97006	First steps	2017-08-22 12:56:16 -07:00
Anthony J. Thibault	d62a0ea8ff	Correct controller offsets with sensor scaling	2017-08-22 11:43:39 -07:00
SamGondelman	a904ae1a8a	can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API	2017-08-22 11:41:20 -07:00
Anthony J. Thibault	ffdb10681e	Fix for laser rendering and positioning with sensor scale	2017-08-22 11:07:04 -07:00
samcake	767cccbbb2	Sharing the common resource and shader componenet and introducing debuging feature	2017-08-21 17:43:03 -07:00
Anthony J. Thibault	8e56404c40	Fixes for flying and rotation re-centering in wikiplanet	2017-08-21 17:42:25 -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
Elisa Lupin-Jimenez	44f1f340e1	Merge pull request #11147 from elisa-lj11/blocks Adding Blocks Tablet App to Marketplace	2017-08-18 15:06:18 -07:00
Sam Gondelman	cbf2bb3a61	Merge pull request #10980 from SamGondelman/sharks Reduce laser pointer lag	2017-08-18 13:14:38 -07:00
samcake	2e0fa1df81	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-17 15:07:57 -07:00
Elisa Lupin-Jimenez	2b44608ece	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-17 10:18:40 -07:00
Zach Fox	ecd1f13197	Allow users to take a snapshot from the secondary camera	2017-08-16 15:34:06 -07:00
vladest	4e5c650621	Modified some usecases for async dialogs	2017-08-16 21:41:18 +02:00
samcake	55a6c27eb6	Merge branch 'master' of https://github.com/highfidelity/hifi into black	2017-08-16 10:58:01 -07:00
SamGondelman	86cc938a47	Merge remote-tracking branch 'upstream/master' into sharks	2017-08-16 09:54:12 -07:00
vladest	8326600274	Merge branch 'master' into modal_dialogs_async	2017-08-16 13:48:47 +02:00
samcake	2f0eee5e4a	introducing the Velocity buffer pass generation	2017-08-15 18:11:23 -07:00
Liv	aea5f170f2	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup	2017-08-15 13:58:22 -07:00
Liv	49eab847fd	Refactor handleOctreeFileReplacement, style changes, align with handler for other file types	2017-08-15 13:58:02 -07:00
SamGondelman	9bb7e66859	separate raypickscriptinginterface, cleanup	2017-08-15 13:36:41 -07:00
Elisa Lupin-Jimenez	3d7995da34	Merge branch 'master' of https://github.com/highfidelity/hifi into blocks	2017-08-15 10:01:24 -07:00
vladest	757af1e2e5	Added Save, Directory and Assets async methods	2017-08-15 14:44:01 +02:00
vladest	ac7aa609f2	Open file async implemented	2017-08-14 16:23:53 +02:00
vladest	63e907e7b6	Merge branch 'master' into modal_dialogs_async	2017-08-12 13:04:52 +02:00
Seth Alves	972a24fea9	Merge pull request #11169 from anshuman64/new-branch High Fidelity Interface Application Rename	2017-08-10 15:57:10 -07:00
SamGondelman	4c55849290	merge from master	2017-08-10 15:43:23 -07:00
Sam Gateau	79f3be1efe	Merge pull request #11021 from Zvork/fade2 Fade dissolve effect JUST AVATARS	2017-08-10 13:48:30 -07:00
Anshuman Dewangan	f79bf4e009	High Fidelity Interface rename	2017-08-10 13:40:00 -07:00
vladest	b780d4bce3	Merge branch 'master' into modal_dialogs_async	2017-08-10 10:52:35 +02:00
Liv	6bde4db0d7	wrap in marketplace check and change landing point	2017-08-09 16:35:25 -07:00
Elisa Lupin-Jimenez	a2e407f786	fixed merge conflicts in marketplacesInject.js	2017-08-09 15:59:20 -07:00
Elisa Lupin-Jimenez	1ac9536f95	Downloading blocks from marketplace in own asset folder	2017-08-09 15:56:07 -07:00
Sam Gondelman	85c3f94976	Merge branch 'master' into sharks	2017-08-09 13:36:18 -07:00
howard-stearns	1cf81495ab	basic commerce infrastructure	2017-08-09 11:50:52 -07:00
Elisa Lupin-Jimenez	17acf0520d	Download from blocks in marketplace working	2017-08-09 11:08:14 -07:00
Liv	0784686450	small typo fix	2017-08-09 10:17:31 -07:00
howard-stearns	9349e72eeb	Merge branch 'master' of https://github.com/highfidelity/hifi into buy	2017-08-09 10:00:36 -07:00
Liv	bd1619b1b2	update error message wording	2017-08-09 09:14:46 -07:00
vladest	556569819d	1st stage of moving to async dialogs	2017-08-09 14:00:19 +02:00
Elisa Lupin-Jimenez	d599753771	Started blocks download catch, fixed a debug typo	2017-08-08 18:43:35 -07:00
Liv	ab8f5c1288	add user logging detail message	2017-08-08 13:55:07 -07:00
Liv	3f30162215	Make spawning point not 0,0,0 and change error message	2017-08-08 09:44:36 -07:00
SamGondelman	42147640e2	remove LaserPointerManager as a dependency	2017-08-07 14:18:56 -07: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
howard-stearns	9bad26c2db	stub files	2017-08-07 12:51:30 -07:00
Liv Erickson	da70071b5a	Merge branch 'master' into feat/domain-setup	2017-08-07 10:04:54 -07:00
Elisa Lupin-Jimenez	a246c59277	changed debug print for unsupported entity files	2017-08-04 16:59:21 -07:00
Elisa Lupin-Jimenez	8c9ce82986	Fixed Mac and Ubuntu platform build issue (hopefully)	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	ebc28a6557	Renamed isBlocks to isZip, added debug print for non-entity files	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	06ff766952	Drag zip cleaned up, marketplaces stylized, back button fixed	2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez	692aa4c4b9	Clara download working again, still can drag in Blocks zip	2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez	c6d5b1a5e6	Removed extraneous print statements	2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez	c3d943ff72	Drag zip folder works	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	ed1ed4f3e0	Blocks drag does not work yet	2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez	ca6a323d54	Can drag blocks zip folder into hifi and upload the .obj	2017-08-04 16:57: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	86e3489167	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
Brad Hefta-Gaub	57f62f59fb	Merge pull request #11110 from Armads/WL21423 Camera mode on startup is determined by user settings and HMD status	2017-08-04 13:16:34 -07:00
SamGondelman	bd942ec406	merge from master	2017-08-04 12:17:54 -07:00
Howard Stearns	71ce5a6494	Merge pull request #11016 from highfidelity/context-overlays Context Overlays	2017-08-03 16:28:14 -07:00
Armads	dff4e6e32c	WL21423 Changing order of camera setup steps	2017-08-03 15:40:38 -04:00
David Kelly	4b7779f0f5	add flag to outline render flags, fix pal.js/edit.js interaction	2017-08-03 07:57:21 -07:00
Armads	24718e2424	WL21423 Camera mode on startup is determined by user settings and HMD status	2017-08-03 09:03:23 -04: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
David Kelly	6ae516c46a	Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde	2017-08-01 15:45:34 -07:00
humbletim	3a9b8c02a6	* disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror" * restore access to "View > Mirror" from HMD mode	2017-08-01 13:41:28 -04:00
David Kelly	bd7c4b3b26	Merge remote-tracking branch 'upstream/master' into context-overlays	2017-07-31 13:14:53 -07:00
Anthony J. Thibault	2383933252	Merge branch 'master' into feature/secondary-pose-support	2017-07-31 10:55:40 -07:00
Olivier Prat	490aad2a06	Merged from master	2017-07-31 12:00:35 +02:00
humbletim	3bcbec87e0	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-30 16:15:34 -04:00
Stephen Birarda	17dd028ec7	make Paths available to desktop and tablet QML context	2017-07-28 14:23:18 -07:00
Andrew Meadows	d4e72df928	Merge pull request #10711 from burtsloane/midi Midi support for Entities	2017-07-28 10:51:43 -07:00
Brad Hefta-Gaub	9b3be6d164	Merge pull request #10808 from humbletim/21400 WL 21400 -- Setting that lets you switch from cursor to reticle	2017-07-27 13:16:58 -07:00
Sam Gondelman	fcaa39b245	Merge branch 'master' into sharks	2017-07-26 18:18:09 -07:00
burtsloane	d4ae298a8d	Merge branch 'master' into midi	2017-07-26 13:59:07 -07:00
Burt Sloane	4f7243e444	Merge branch 'master' of https://github.com/burtsloane/hifi into midi	2017-07-26 13:30:57 -07:00
Zach Fox	62f6c10b2b	Renaming things; bugfixes; improvements	2017-07-26 12:45:10 -07:00
Zach Fox	24ddbb4b22	Silly bug preventing the whole thing from working	2017-07-26 12:08:55 -07:00
Liv	be860d6c87	small string fix	2017-07-26 10:20:29 -07:00
Liv	63d637c4db	Add line to move user back to origin to be near new content	2017-07-26 10:02:21 -07:00
Liv	57b27a7bb7	change packet type to be sourced, change from packet list to single packet	2017-07-25 20:17:20 -07:00
Zach Fox	9020607ccf	First pass	2017-07-25 17:54:46 -07:00
Liv	9458e4a1eb	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup	2017-07-25 11:32:13 -07:00
Liv	2377e4a5db	fix message formatting	2017-07-25 11:32:02 -07:00
Liv	89a1c7a697	code cleanup	2017-07-25 11:24:57 -07:00
SamGondelman	3c8b964cc9	replace setHandLasers with drawHUDLayer overlay property	2017-07-24 18:16:40 -07:00
Liv	32ddffd9c8	Move logic for confirmation into Application.cpp for handling files directly	2017-07-24 18:09:32 -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
Seth Alves	97756e6140	accidently deleted a break	2017-07-24 16:12:03 -07:00
Seth Alves	82a787a753	use alt+h for mirror-mode	2017-07-24 16:04:11 -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
Seth Alves	e53badf88b	use alt+f for 1st person camera and alt+o for 3rd	2017-07-24 15:56:37 -07:00
Liv	76cc833747	move domain management into a separate API	2017-07-21 17:44:53 -07:00
Dante Ruiz	06b4c53d28	only desktop mode	2017-07-22 00:15:26 +01:00
Olivier Prat	7bc7b1eabc	Merge branch 'master' of git://github.com/highfidelity/hifi into fade2	2017-07-21 09:27:30 +02:00
anshuman64	5f3b68d544	Use ctrl+H instead of alt+H	2017-07-20 17:36:02 -07:00
Dante Ruiz	649b974927	mods for changes camera views	2017-07-21 01:01:23 +01:00
Zach Fox	e68f9499fa	Add hover/unhover handlers to context overlays	2017-07-20 16:51:00 -07:00
Zach Fox	1d26a268c1	Merge branch 'master' of https://github.com/highfidelity/hifi into HoverOverlay_CubeOverlay	2017-07-19 09:53:51 -07:00
Zach Fox	8f6af3a1ab	ContextOverlay	2017-07-18 16:28:24 -07:00
Zach Fox	084f4d2ab0	Why were Web3DOverlays done this way?	2017-07-18 14:42:59 -07:00
humbletim	f9e0e616f7	Merge remote-tracking branch 'upstream/master' into 21180-C++	2017-07-18 17:34:39 -04:00
Zach Fox	2b1a0921da	Initial work on clickable overlays	2017-07-18 14:01:16 -07:00
Brad Davis	1aee8f1f4d	Ensure we continue calling idle when minimized	2017-07-18 13:44:58 -07:00
SamGondelman	55a025b827	initial code review	2017-07-18 12:43:34 -07:00
Dante Ruiz	976fec66f8	fixed loading script whitespace	2017-07-18 17:59:42 +01:00
Brad Hefta-Gaub	d94365cc44	Merge pull request #10979 from zfox23/hoverOverlay_lasers Create/Destroy Hover Overlays using hand controller lasers	2017-07-18 08:44:48 -07:00
Olivier Prat	236270d798	Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape	2017-07-18 10:47:21 +02:00
Zach Fox	67c8ddfd57	Merge in changes from laser PR	2017-07-17 17:09:40 -07:00
Zach Fox	96f52a9812	First pass at getting overlays to show up on hover	2017-07-17 17:05:16 -07:00
utkarshgautamnyu	758ae9825d	Merge pull request #10939 from highfidelity/bug/6118 Record total number of ATP/HTTP/File bytes downloaded during session	2017-07-17 13:53:21 -07:00
Zach Fox	974dff36b0	Make hover overlays work for hand controller lasers	2017-07-17 13:16:53 -07:00
Zach Fox	aadf407842	Merge pull request #10978 from zfox23/hoverOverlayInterface New HoverOverlayInterface skeleton	2017-07-17 13:16:32 -07:00
Olivier Prat	9e9c0aff65	Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape	2017-07-17 09:59:59 +02:00
Zach Fox	e602d3610e	Initial commit for HoverOverlayInterface	2017-07-14 17:26:53 -07:00
SamGondelman	8f533636f5	c++ side laserpointer rendering with renderstates	2017-07-14 11:13:40 -07:00
Andrew Meadows	9584035aa4	Merge pull request #10886 from 1P-Cusack/21420 [Worklist #21420] Implement Create button disabled state (details below).	2017-07-14 10:06:45 -07:00
Seth Alves	741feb7e54	Merge pull request #10951 from druiz17/tablet-modal-fixes Allow the tablet to be closed when a modal dialog is open.	2017-07-14 09:40:58 -07:00
SamGondelman	6f970fd7a0	Merge remote-tracking branch 'upstream/master' into sharks	2017-07-14 09:37:11 -07:00
Olivier Prat	82da9fb537	Merge branch 'master' of git://github.com/highfidelity/hifi into fade	2017-07-14 17:28:35 +02:00
Anthony J. Thibault	c85e187c61	first stab at secondary target pose support	2017-07-13 18:12:33 -07:00
Anthony J. Thibault	fe711ccbe9	Refactored how controller poses are stored in MyAvatar.	2017-07-13 15:01:14 -07:00
Dante Ruiz	03fbd2a1e6	fixed another warning	2017-07-13 19:12:34 +01:00
Dante Ruiz	b46dc7d389	removed space	2017-07-13 18:42:26 +01:00
Dante Ruiz	070db2922d	fixed warning compile error	2017-07-13 18:40:38 +01: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
utkarshgautamnyu	6b969bc39d	added code to record total number of ATP/HTTP/File bytes downloaded during session Update FileResourceRequest.cpp Update AssetResourceRequest.cpp Update FileResourceRequest.cpp Update HTTPResourceRequest.cpp Update AssetResourceRequest.cpp Update AssetResourceRequest.cpp Update FileResourceRequest.cpp Update AssetResourceRequest.cpp Update AssetResourceRequest.cpp Update FileResourceRequest.cpp Update FileResourceRequest.cpp Update HTTPResourceRequest.cpp Update FileResourceRequest.cpp Update FileResourceRequest.cpp Update Application.cpp Update Application.cpp	2017-07-12 11:13:13 -07:00
Olivier Prat	0f60cca617	Merged cleaned up fader branch from Sam	2017-07-12 18:09:17 +02:00
Sam Gateau	5394ac8672	Cleaning up changes, removing comments and dead code etc...	2017-07-12 17:33:05 +02:00
Olivier Prat	2f9885870b	First merge with Sam's fader branch with custom pipeline support in shape plumber	2017-07-12 17:29:21 +02:00
Dante Ruiz	bedd0628b9	allowed tablet to toggle when a dialog is open	2017-07-12 00:51:07 +01:00
Sam Gateau	1f2f539507	Merge branch 'orange' of https://github.com/samcake/hifi into hobbes	2017-07-11 10:26:26 +02:00
David Kelly	4843b91f47	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-10 09:50:17 -07:00
Andrew Meadows	96b88dccd7	Merge pull request #10913 from samcake/orange Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model	2017-07-10 09:46:09 -07:00
Brad Davis	8043caa9e9	Merge pull request #10925 from jherico/overlay_performance Fix terrible script performance when rendering load is too high	2017-07-08 14:19:14 -07:00
Brad Davis	cd11f5cfa6	More tweaks for improved script performance	2017-07-07 22:02:56 -07:00
Brad Davis	148eece065	Tweak frame timing to avoid overloading the main thread	2017-07-07 21:00:33 -07:00
Zach Fox	dbb48cd1aa	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-07 16:03:04 -07:00
Zach Fox	3d14d3755e	Merge pull request #10898 from 1P-Cusack/21425 Add View->Enter First Person Mode in HMD checkbox.	2017-07-07 14:01:36 -07:00
Andrew Meadows	57842ce5a5	Merge pull request #10878 from mnafees/21355 CR for Job #21355 - Clean up and remove menu hotkeys	2017-07-07 14:01:21 -07:00
Olivier Prat	06d69d04c3	TransitionStage + FadeJob compiling but not linked to entity events	2017-07-07 18:22:11 +02:00
Sam Gateau	d15c4ea2d3	Merging with the stage branch	2017-07-07 15:12:40 +02:00
Sam Gateau	156c20d01e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-07-07 10:58:05 +02: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
LaShonda Hopper	85111131da	[Worklist #21420 ] Resolves issue where domain changes didn't refresh the icon (details below). * Adds a local message/event: "Toolbar-DomainChanged" This message is sent by the application via its registered domain handlers: * hostnameChanged * connectedToDomain * disconnectedFromDomain * edit.js subscribes to the "Toolbar-DomainChanged" event and updates the Create button icon as long as there's a valid known valid create button. Item Ticket Link: https://worklist.net/21420 Changes to be committed: modified: interface/src/Application.cpp modified: scripts/system/edit.js	2017-07-06 15:27:15 -04:00
Stephen Birarda	916f57772b	default the UAL off for all targets, enable manually for Interface	2017-07-06 10:21:07 -07:00
Zach Fox	ee86638c4e	Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera	2017-07-06 09:58:00 -07:00
David Kelly	1ccf0da7d8	Merge pull request #10897 from davidkelly/dk/cacheSwitchFix redo cache switch	2017-07-06 09:53:01 -07:00
Andrew Meadows	4fad9d9b1a	Merge pull request #10858 from jherico/trace_cores Additional threaded tracing of CPU cores	2017-07-06 08:23:21 -07:00
Olivier Prat	018c0489f4	Merged with 21378	2017-07-06 16:53:47 +02:00
Sam Gateau	53ffca796f	Drafting a better SHape plumber to render the items	2017-07-06 16:35:40 +02:00

... 11 12 13 14 15 ...

7449 commits