2138 commits

Author	SHA1	Message	Date
Jamil Akram	60b58977cd	Merge pull request #14267 from humbletim/fb17479-fix-handshake-keyrelease ... FB17479 - Fix scripted key release events for handshakes.	2018-11-15 09:21:32 -08:00
Wayne Chen	e787fd5371	experimenting with overlay pos/rot. update	2018-11-15 08:02:28 -08:00
Wayne Chen	c85b840db0	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-11-14 14:47:56 -08:00
Wayne Chen	e84361f267	getting hmd/desktop switch working	2018-11-13 14:20:23 -08:00
Brad Hefta-Gaub	41d8220cbd	Merge pull request #14362 from ctrlaltdavid/M19768 ... Add option to enable/disable the mini tablet	2018-11-13 11:59:24 -08:00
Brad Hefta-Gaub	4bafcd2cfa	Merge pull request #14271 from SamGondelman/oculus ... Case 19475: Fix various Oculus Store test failures	2018-11-13 11:06:39 -08:00
Wayne Chen	5b021041bb	adding play area center for overlay position	2018-11-13 10:23:28 -08:00
Wayne Chen	fe0bbe19d7	creating login overlay upon startup in HMD/feedback changes	2018-11-08 14:32:11 -08:00
David Rowe	28097933ed	Add setting to enable/disable the mini tablet	2018-11-07 14:39:06 +13:00
Wayne Chen	1ded4b6fb8	hiding previous username/hiding dev menu	2018-11-06 16:45:45 -08:00
Wayne Chen	77b47d4b32	adding class for creating overlay and lasers	2018-11-05 17:29:01 -08:00
Wayne Chen	7f805ebcb4	more wip	2018-11-01 17:16:15 -07:00
Wayne Chen	f62c8ae87a	overlay HMD implementation	2018-10-31 15:26:49 -07:00
SamGondelman	dd96881724	don't submit frames while oculus says it's not visible	2018-10-30 12:15:46 -07:00
Wayne Chen	ed847203ea	wip for getting hmd overlay	2018-10-29 11:33:28 -07:00
Wayne Chen	11dc82a5cf	Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2	2018-10-29 08:47:25 -07:00
Wayne Chen	c4aabfda44	adding prototype functions	2018-10-29 08:47:09 -07:00
Wayne Chen	af04630642	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-10-26 17:53:13 -07:00
Wayne Chen	955b0a580e	adding hooks for application for pause/resume	2018-10-25 17:25:44 -07:00
Jeff Clinton	eb383b1d09	Merge pull request #14040 from hyperlogic/feature/acceleration-limit-filter ... Quality Improvements to Avatars driven by Vive Trackers	2018-10-25 08:51:59 -07:00
Wayne Chen	331b09c8d1	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-10-24 09:16:24 -07:00
humbletim	d8217e9a79	synthesize key release events on Desktop focus change	2018-10-23 22:42:06 -04:00
Wayne Chen	84001ae208	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-10-22 17:59:33 -07:00
Zach Fox	7be5d5674d	Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2	2018-10-22 13:59:35 -07:00
Stephen Birarda	3c79a79487	Merge pull request #14163 from Atlante45/fix/bw-recorder ... Fix crash with BandwidthRecorder	2018-10-22 10:11:26 -07:00
Wayne Chen	d7a4531d00	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-10-22 09:27:23 -07:00
Brad Hefta-Gaub	1ff69844f2	Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75 ... hide progress overlays if interstitial mode	2018-10-19 16:35:42 -07:00
Wayne Chen	e32460ed96	Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2	2018-10-19 09:25:57 -07:00
Kerry Ivan Kurian	3b15548ea3	Display resource-access events in marketplace item tester ... Includes refactoring marketplace item tester into a single-page app.	2018-10-18 01:04:47 -07:00
David Rowe	c41ce5d484	Make tablet have priority over drawInFront overlays rendered behind it	2018-10-18 17:10:48 +13:00
Wayne Chen	fd3c0d2f76	pushing with new fix	2018-10-17 15:03:09 -07:00
Wayne Chen	28a950fe9f	staging	2018-10-15 16:51:28 -07:00
Anthony Thibault	640ed6a32a	Added "Developer > Avatar > Show Tracked Objects" menu	2018-10-15 12:42:07 -07:00
Wayne Chen	60bbcc7fc3	adding initialization of qml when keyboard ready	2018-10-09 15:20:16 -07:00
Clement	3eb7c80af3	Fix BandwidthRecorder storage concurrent accesses	2018-10-08 13:45:34 -07:00
Dante Ruiz	36c2cceb57	fix for failing to enter domain	2018-10-05 15:39:51 -07:00
Dante Ruiz	5d011bafb2	small tweaks	2018-10-04 17:02:44 -07:00
Dante Ruiz	651f37aceb	Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged	2018-10-04 15:01:39 -07:00
Dante Ruiz	bda9735b5d	fix loading progress	2018-10-04 15:01:16 -07:00
Wayne Chen	0a7102b4d3	Merge branch 'master' of https://github.com/highfidelity/hifi into interstitialMerged	2018-10-04 08:59:26 -07:00
Brad Hefta-Gaub	7c9464572a	Merge pull request #14027 from huffman/feat/deprecate-undo-stack ... Remove UndoStack API	2018-10-01 17:13:48 -07:00
Wayne Chen	747aab2097	persisting signed values	2018-09-27 10:16:11 -07:00
Ryan Huffman	09b2565e76	Remove UndoStack API ... edit.js shares a global undo stack through the UndoStack API. Because the stack is globally shared, disabling the feature while create is disabled doesn't make a lot of sense because it might disabling the ability to undo/redo with another feature. Because UndoStack is only used by edit.js, UndoStack is being removed in favor of a local undo stack implemented within edit.js.	2018-09-26 14:43:11 -07:00
Seth Alves	ff2a47e7e6	fix several uninitialized reads	2018-09-26 09:33:12 -07:00
Dante Ruiz	fa5dfb6e28	Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial	2018-09-26 09:18:12 -07:00
Dante Ruiz	57ae8ff8a1	update interstitial page stability count and loading bar	2018-09-24 16:09:53 -07:00
Wayne Chen	69d5299362	patching fix for previous commits	2018-09-24 15:22:46 -07:00
Dante Ruiz	d3368146ce	saving work	2018-09-21 11:42:26 -07:00
John Conklin II	f67deb9f65	Merge pull request #13938 from wayne-chen/interstitalMerged ... Interstitial Page with 404 Redirect	2018-09-12 08:39:52 -07:00
Wayne Chen	20cab87a17	Merge branch 'interstitalMerged' of https://github.com/wayne-chen/hifi into interstitalMerged	2018-09-11 18:53:06 -07:00
Wayne Chen	a7321f950a	pushing requested changes - adding timeout refusal	2018-09-11 18:32:17 -07:00
Wayne Chen	cb0aa8055f	Merge pull request #13961 from wayne-chen/loginOnLaunch ... Pop up login dialog on launch	2018-09-11 17:43:29 -07:00
Wayne Chen	63ad85215b	Merge branch 'master' into interstitalMerged	2018-09-11 17:17:33 -07:00
Dante Ruiz	c97d646083	making requested changes and fixing compile issue for jenkins	2018-09-11 15:57:44 -07:00
Wayne Chen	60a5b0eeaf	Merge pull request #1 from danteruiz/interstitalMerged ... handle unable to connect to domain case	2018-09-10 17:23:50 -07:00
Wayne Chen	c194c236f1	adding inlines	2018-09-10 17:10:13 -07:00
Dante Ruiz	de5a0a714b	handle unable to connect to domain case	2018-09-10 16:25:17 -07:00
Wayne Chen	dcacfdba7c	adding popup property to qml	2018-09-10 16:22:55 -07:00
Stephen Birarda	adac872a11	clear other avatars in agent on avatar mixer disconnect	2018-09-07 15:04:14 -07:00
Wayne Chen	2e17140c07	fixing loadServerlessDomain function to be from 404 redirect	2018-09-04 18:24:01 -07:00
Wayne Chen	c47788efe4	merging with dante's PR	2018-09-04 18:00:06 -07:00
Wayne Chen	c95cb97b9b	adding working version with networking signals	2018-08-31 19:29:48 -07:00
Wayne Chen	5f43f5b276	adding different method for handling redirect	2018-08-30 17:40:13 -07:00
Dante Ruiz	8c77820e30	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-30 09:45:41 -07:00
Wayne Chen	6689c15564	Merge branch 'master' of https://github.com/highfidelity/hifi into 404DomainRedirect	2018-08-28 19:22:34 -07:00
Wayne Chen	8a9ad421e7	adding serverless file + redirection if conn fail	2018-08-28 15:50:14 -07:00
Sam Gateau	d9d23e7fcf	Merge pull request #13877 from luiscuenca/multiplyOtherAvatars ... Create N replicas of each other-avatar on the client side	2018-08-28 09:02:13 -07:00
danteruiz	e2cd695dfb	PR code clean up	2018-08-27 11:01:29 -07:00
Dante Ruiz	af19849a75	fixing merge conflict	2018-08-24 15:48:42 -07:00
luiscuenca	ddbadf5a69	change to Test API	2018-08-24 11:59:46 -07:00
Andrew Meadows	10d0833c19	use DynamicsWorld::numCollisionObjects instead of our own count	2018-08-23 15:57:54 -07:00
Andrew Meadows	777b90bdc0	add 'physics body count' to debug stats	2018-08-23 12:59:28 -07:00
Sam Gateau	3aa47a6695	Merging with master after a bunch ofchanges	2018-08-22 08:46:40 -07:00
Dante Ruiz	26a30edec9	trying to fix loading bar	2018-08-21 18:27:21 -07:00
Dante Ruiz	db3d3d3d93	Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page	2018-08-21 09:56:59 -07:00
John Conklin II	b28aa3951f	Merge pull request #13802 from jherico/feature/scribe_programs ... Migrating to scribe program descriptors	2018-08-20 14:48:54 -07:00
Ryan Huffman	5d44877f56	Fix functionality sometimes getting stuck if window loses focus	2018-08-15 13:32:58 -07:00
Dante Ruiz	75cc1c62c0	mostly done interstitial page	2018-08-10 16:53:34 -07:00
Brad Davis	f03370c826	Migrating to scribe program descriptors	2018-08-09 17:58:34 -07:00
Dante Ruiz	2377626203	exposing physics progress	2018-08-03 10:47:58 -07:00
Dante Ruiz	048196ec6f	disble sending avatar and audio packets during interstitial mode	2018-08-02 11:39:06 -07:00
Dante Ruiz	0b7d6cb720	start interstitial page work	2018-07-31 14:10:19 -07:00
Sam Gateau	c24083c1f0	drafting along the RenderTHread class	2018-07-25 10:50:15 +02:00
Sam Gateau	bff372a118	Merge with master	2018-07-13 13:00:00 +02:00
Sam Gondelman	b53772f9ca	Merge pull request #13431 from Cristo86/android_stop_downloads_bg ... Android - Prevent pending downloads to happen when going back to home	2018-07-12 15:22:56 -07:00
Sam Gateau	1b56653228	Merge branch 'master' of github.com:highfidelity/hifi into one	2018-07-11 11:57:42 +02:00
Cristian Luis Duarte	be8351dc0d	Android - Rollback pause/resume mechanism. Stop server checkIns, reset nodeList before entering background	2018-07-06 20:43:52 -03:00
Wayne Chen	cb89b046b4	moving copyToClipboard from slots to functions	2018-07-06 11:07:35 -07:00
Wayne Chen	0facbedbbc	adding Q_INVOKABLE method for copying to Application clipboard	2018-07-06 11:03:58 -07:00
Wayne Chen	3994ec4176	adding potential fix - moving methods to Application	2018-07-05 17:54:27 -07:00
Sam Gateau	d2a66b9e7d	Moving the paintGL to a true GraphicsEngine::render_performFrame()	2018-07-04 17:26:24 +02:00
Sam Gateau	0f3cb0fb84	INtroducing th eGraphics Engine to group al the graphics related (render and gpu) elements	2018-07-03 12:50:52 +02:00
Andrew Meadows	4329ea5240	Merge master' into 'workload'	2018-06-04 16:11:25 -07:00
Zach Fox	96858c9586	MS15529: Add secondary camera snapshot notification flag	2018-06-01 13:38:41 -07:00
Andrew Meadows	003e444246	Merge branch 'master' into 'workload'	2018-05-30 16:04:13 -07:00
NissimHadar	9ed8c04097	Merge branch 'master' of github.com:highfidelity/hifi into fixCameraMode	2018-05-24 17:40:21 -07:00
samcake	559d436dfa	Fixing the merge conflicts	2018-05-24 16:57:10 -07:00
samcake	cf58f31f3e	Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine'	2018-05-23 15:08:48 -07:00
NissimHadar	06203d44d8	Correct Camera.mode command.	2018-05-22 17:08:28 -07:00
Andrew Meadows	a23126a6b2	Merge 'master' into 'workload'	2018-05-18 07:38:02 -07:00
Sam Gondelman	74840d2130	Merge pull request #12935 from gcalero/android_new_login ... Android new login	2018-05-17 15:53:25 -07:00
Gabriel Calero	5afc9c6df3	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-16 12:45:17 -03:00
Zach Fox	bccaa2dbe5	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-15 11:50:38 -07:00
Andrew Meadows	c7c4324b3c	Merge 'master' into 'workload'	2018-05-15 10:22:50 -07:00
NissimHadar	d4d2f3c957	Moved ownership of test location into the Test Scripting class.	2018-05-14 16:32:04 -07:00
Zach Fox	43254e2981	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-14 15:12:44 -07:00
NissimHadar	5f219e27f7	Merge branch 'master' of github.com:highfidelity/hifi into perfTest_1	2018-05-14 10:35:48 -07:00
John Conklin II	5cd225e4de	Merge pull request #12947 from jherico/feature/splash2 ... Additional work on splash screen	2018-05-11 11:26:37 -07:00
NissimHadar	1364f4391d	Can store JSON object.	2018-05-10 18:02:44 -07:00
Zach Fox	44cfa95830	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-09 15:01:24 -07:00
Gabriel Calero	66b975192d	Merge remote-tracking branch 'cristo86/android_places_goto' into android_new_login	2018-05-07 15:56:43 -03:00
NissimHadar	481eddb2a3	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-07 08:24:03 -07:00
Brad Davis	72526781d9	Additional work on splash screen	2018-05-04 16:40:05 -07:00
Clement	b04c5bd0db	CR	2018-05-04 14:43:16 -07:00
Gabriel Calero	1330132a32	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-04 18:35:51 -03:00
NissimHadar	2311fa33fb	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-04 14:13:43 -07:00
Gabriel Calero	868b58e66d	Un-expose Application from javascript. Restore displayplugin deactivation when goes to background	2018-05-04 18:01:01 -03:00
Zach Fox	1da840984b	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-04 10:24:28 -07:00
Clement	d87cd2af6e	Update avatar query names	2018-05-03 18:19:30 -07:00
Clement	27c471ee97	Move all wire frustums to conical frustums	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
NissimHadar	fe9c6052f7	Added quitWhenFinished parameter to the command line.	2018-05-03 15:02:11 -07:00
Zach Fox	c3d3cdca3d	Add cubemap output format	2018-05-03 12:57:00 -07:00
NissimHadar	8b3c451f91	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-03 08:25:19 -07:00
Andrew Meadows	99a75c5a87	Merge 'master' into 'workload'	2018-05-02 17:28:36 -07:00
NissimHadar	5cbb8674ec	Use default parameter for saveSnapshot().	2018-05-02 14:45:28 -07:00
Gabriel Calero	88f0c2d700	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-02 18:42:10 -03:00
John Conklin II	f43b9ee7e8	Merge pull request #12960 from hyperlogic/feature/bullet-debug-draw ... Added items to the developer menu for debugging physics	2018-05-02 14:25:09 -07:00
NissimHadar	83846aec04	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-02 14:17:22 -07:00
Gabriel Calero	e4fdd81148	Merge remote-tracking branch 'origin/android_goto_splash' into android_new_login	2018-05-02 17:23:25 -03:00
Gabriel Calero	d0ab81d1f9	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-02 17:00:32 -03:00
Gabriel Calero	4dce62cc2e	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-05-02 16:27:41 -03:00
John Conklin II	7a5fce4315	Merge pull request #12991 from luiscuenca/avatarScript ... Avatar Scripts	2018-05-02 12:23:13 -07:00
Gabriel Calero	a653c7df0b	Fix build	2018-05-02 14:59:46 -03:00
Anthony J. Thibault	4fa9af5534	Added items to the developer menu for debugging physics ... Hooked up Bullet's internal debug draw functionality to our client. Under the Developer > Physics Menu there are five new items: * Show Bullet Collision - will draw all collision shapes in wireframe. WARNING: can be slow on large scenes. * Show Bullet Bounding Boxes - will draw axis aligned bounding boxes around all physics shapes. * Show Bullet Contact Points - will draw all contact points where two or more objects are colliding. * Show Bullet Constraints - will render wire frame axes for each constraint connecting bodies together. * Show Bullet Constraint Limits - will render the joint limits for each constraint.	2018-05-02 10:51:00 -07:00
Gabriel Calero	c15ef56d90	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-05-02 14:38:10 -03:00
Gabriel Calero	3a1bfefc22	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-02 10:09:56 -03:00
Clement	21213e81f4	Multiview support for priority queue	2018-05-01 18:03:21 -07:00
Atlante45	0820ef3c95	Account for secondary view when deciding to query	2018-05-01 18:02:29 -07:00
Clement	4c90763236	Correctly update secondary camera frustum	2018-05-01 18:02:29 -07:00
Clement	98cf48694e	Expose secondary camera to game logic	2018-05-01 18:02:29 -07:00
samcake	b3408ae4c0	Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload	2018-05-01 11:39:54 -07:00
NissimHadar	6d8eee6b32	Merge branch 'commandLineParametersForAutotester' of github.com:NissimHadar/hifi into commandLineParametersForAutotester	2018-04-30 17:19:29 -07:00
Zach Fox	aafcf056c4	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-04-30 12:36:00 -07:00
Zach Fox	a2b84c0fbb	It's working!!	2018-04-30 12:11:46 -07:00
luiscuenca	2de982a5a2	Added script types and better script reload	2018-04-30 12:04:35 -07:00
Zach Fox	1b29946a48	I feel so close; why isn't this variable capturing?	2018-04-27 17:26:05 -07:00
NissimHadar	cf9b089a3c	Added option to set snapshot location (for this execution only) from the command line.	2018-04-27 17:18:16 -07:00
John Conklin II	dd32ca33a5	Merge pull request #12957 from sethalves/quiet-logging ... Quiet logging	2018-04-27 14:59:38 -07:00
luiscuenca	e0770f06b1	Add scripts to Model Packager	2018-04-25 19:35:26 -07:00
samcake	33bbbcef83	Merging with master	2018-04-24 11:49:34 -07:00
Gabriel Calero	51f9b763ff	Merge remote-tracking branch 'origin/android_goto_splash' into android_new_login	2018-04-24 13:18:28 -03:00
Gabriel Calero	103e9f92fa	Add haptic feedback to back, view and mic buttons	2018-04-24 11:56:01 -03:00
Brad Davis	861200db27	Attempt to shutdown web surfaces more consistently	2018-04-23 14:32:38 -07:00
Gabriel Calero	8923c16b08	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-04-23 17:04:06 -03:00
Seth Alves	6fc02638d7	control verbose logging with a menu-item in developer menu	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
Gabriel Calero	adfbaac18f	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-19 19:40:00 -03:00
Gabriel Calero	f2184bf456	Handle android back button. Remove unused resources. Fix compilation errors.	2018-04-19 17:31:25 -03:00
samcake	a6bd589f4f	Merging upstream	2018-04-19 12:20:10 -07:00
Gabriel Calero	c8fe45eb8f	Remove debug statements and unused code. Put JNI code in a separated file.	2018-04-19 11:41:59 -03:00
Brad Davis	d478204722	Working on splash rendering	2018-04-17 14:17:41 -07:00
Gabriel Calero	e85f5c97dc	Remove bottom bar. Apply new design for android	2018-04-09 11:41:00 -03:00
Gabriel Calero	99d8f822b2	Fix crash selecting domain for second time. Stop rendering while Goto activity is started	2018-04-04 19:24:26 -03:00
Gabriel Calero	2ff13270ed	Go back to GoTo screen	2018-04-02 12:22:21 -03:00
samcake	028959f240	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-03-29 12:00:10 -07:00
samcake	025730a329	Just merging with master and trying to see the ui working again...	2018-03-26 18:24:01 -07:00
Dante Ruiz	1d17658c80	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-22 16:29:16 -07:00
Seth Alves	ef52ae13ee	rearrange domain-url-changed signals	2018-03-21 14:30:00 -07:00
Seth Alves	4033af9b11	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 11:11:43 -07:00
Dante Ruiz	cce77e3e68	made requested changes	2018-03-21 10:15:42 -07:00
Ken Cooke	f5f4e2a780	Merge pull request #12635 from ctrlaltdavid/21776 ... Fix Window hasFocus(), setFocus(), and raiseMainWindow()	2018-03-21 09:27:51 -07:00
samcake	a678a38211	Merge with master	2018-03-20 17:35:57 -07:00
Seth Alves	585a523823	unmangle merge	2018-03-20 11:17:56 -07:00
Seth Alves	bd10cd6fa9	'disconnect' from serverless domain when transitioning from a serverless-domain to a DNS name (rather than a place name)	2018-03-20 10:53:17 -07:00
Ryan Huffman	bee8899c46	Add support for uploading .content.zip files	2018-03-15 12:17:21 -07:00
David Rowe	966d711e56	Fix Window.raiseMainWindow()	2018-03-14 13:38:48 +13:00
samcake	f8acca76e2	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master	2018-03-13 09:31:50 -07:00
Seth Alves	b39c7eadd2	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-13 09:24:18 -07:00
John Conklin II	5be2f0acc7	Merge pull request #12490 from Zvork/taa ... Temporal Anti-Aliasing	2018-03-13 09:03:50 -07:00
David Rowe	16aefea2e1	Merge branch 'master' into 21776	2018-03-13 14:46:07 +13: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
samcake	9bec8cdd0b	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master	2018-03-12 12:01:00 -07:00
Olivier Prat	aad571f6bd	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-03-12 14:22:57 -04:00
Seth Alves	621e6a62d6	merge from upstream	2018-03-09 12:07:24 -08:00
Seth Alves	58bc42990c	merge from upstream	2018-03-09 12:03:26 -08:00
Olivier Prat	da6bd92ff6	Merged with master	2018-03-09 10:07:25 +01:00
Atlante45	69fb830480	Merge branch 'RC65' of https://github.com/highfidelity/hifi into new-master	2018-03-08 17:23:17 -08:00
samcake	a0db5c6135	Merge with master	2018-03-08 15:35:58 -08:00
David Rowe	b1bda281ee	Merge branch 'master' into 21776	2018-03-08 15:36:10 +13:00
Elisa Lupin-Jimenez	c6e5f4c9c8	zip file drags don't auto add model textures	2018-03-06 19:24:09 -08:00
Elisa Lupin-Jimenez	251e4a3127	Fixed blocks importer textures being interpreted as image entities	2018-03-06 16:44:23 -08:00
Brad Davis	8bfc610cfb	Merge remote-tracking branch 'upstream/master' into android	2018-03-05 11:48:58 -08:00
Seth Alves	746769cbe9	don't crash	2018-03-02 13:52:18 -08:00
Seth Alves	507dfa5ec3	more code review response	2018-03-02 11:35:34 -08:00
Seth Alves	bdd926f89e	cleanups	2018-03-02 10:38:35 -08:00
Seth Alves	45157a16f2	merge from upstream	2018-03-02 09:57:27 -08:00
samcake	d4d5f3a7f0	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-02 08:50:47 -08:00