7672 commits

Author	SHA1	Message	Date
Dante Ruiz	c2ceb48a28	fixing key conflicts	2018-05-23 14:16:05 -07:00
NissimHadar	06203d44d8	Correct Camera.mode command.	2018-05-22 17:08:28 -07:00
Simon Walton	f702374db3	Just have one const for concurrent downloads	2018-05-22 10:16:44 -07:00
Dante Ruiz	249d22b4b4	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-21 10:31:24 -07:00
Sam Gondelman	6eb6a5b767	Merge pull request #13197 from gcalero/your_last_location ... Add "Your Last Location" to Android Home	2018-05-21 09:28:56 -07:00
David Rowe	6d4f704279	Regularize some JSDoc usage	2018-05-21 09:32:10 +12:00
druiz17	f2807e38f9	fix goto shortcut	2018-05-19 17:36:46 -07:00
Dante Ruiz	3b59af3ed7	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-18 16:42:31 -07:00
Sam Gateau	07f1ab8c98	Merge pull request #13194 from SamGondelman/resolution ... Fix Scale Resolution option	2018-05-18 15:23:01 -07:00
Gabriel Calero	7a6b7b8ba3	Add Your Last Location in Android Home	2018-05-18 12:26:41 -03:00
Andrew Meadows	a23126a6b2	Merge 'master' into 'workload'	2018-05-18 07:38:02 -07:00
SamGondelman	c57c15f22c	fix resolution option	2018-05-17 16:58:35 -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
vladest	eb25601856	Return back LOD tools	2018-05-17 20:41:50 +02:00
Gabriel Calero	5a73da6fdf	Bugfix: stop audio when app starts	2018-05-17 14:05:49 -03:00
Gabriel Calero	8741c5e6a4	Make haptic pulse duration configurable in VirtualPadDevice	2018-05-17 11:37:13 -03:00
Dante Ruiz	f8e9afb115	fixing damn build issues	2018-05-16 15:08:09 -07:00
Dante Ruiz	3be4b01d2c	move overlays menu back	2018-05-16 14:36:55 -07:00
Zach Fox	486f33b4bd	Merge branch 'master' of github.com:highfidelity/hifi into MS15103_snapFolderCrash	2018-05-16 14:14:35 -07:00
Dante Ruiz	fbc3d97af3	adding back overlay menu and avatar size	2018-05-16 13:48:29 -07:00
Zach Fox	585957409d	Merge pull request #13141 from zfox23/spectatorCameraImprovements ... Spectator Camera V2	2018-05-16 13:38:07 -07:00
Zach Fox	f8215b5999	Fix final? crash	2018-05-16 11:05:21 -07:00
Zach Fox	c34605f686	GIF snapshots using the Snap app are still weird, but the bug is fixed	2018-05-16 10:15:51 -07:00
Zach Fox	012ae741a5	Fix MS15103: Interface crashes on snap if snap dir is deleted	2018-05-16 09:52:19 -07:00
Simon Walton	b43cb5b86f	Take out VS's auto reformatting	2018-05-16 09:36:55 -07:00
Gabriel Calero	5afc9c6df3	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-16 12:45:17 -03:00
vladest	5127cb0ea6	Merge branch 'master' into menu-updates	2018-05-16 14:37:00 +02:00
John Conklin II	aca261af3e	Merge pull request #12939 from Cristo86/android_places_goto ... Android Search & Go To	2018-05-15 16:43:38 -07:00
Simon Walton	f4d24a3d0e	Quiet MacOS warning	2018-05-15 16:40:21 -07:00
Simon Walton	2b30c1389e	Try reducing concurrent downloads for Android	2018-05-15 14:30:08 -07:00
vladest	7ea6181520	Merge branch 'master' into menu-updates	2018-05-15 21:54:45 +02:00
Gabriel Calero	b80597a436	Restore display plugin activation/deactivation	2018-05-15 15:51:11 -03:00
Zach Fox	bccaa2dbe5	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-15 11:50:38 -07:00
Gabriel Calero	306b8cc68a	Set HomeActivity transparent to avoid texture corruption (black and white)	2018-05-15 15:14:17 -03:00
Andrew Meadows	c7c4324b3c	Merge 'master' into 'workload'	2018-05-15 10:22:50 -07:00
vladest	fee3cc0aca	Implemented backend for About dialog	2018-05-15 15:49:20 +02:00
Zach Fox	a54ce96ac2	Clement's CR	2018-05-14 17:46:58 -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
vladest	f8ebe7e669	remoed no more used LOD dialogs. Fixed Slider properties min and max settings	2018-05-12 16:01:43 +02:00
vladest	0a67fc3b36	Merge conflicts	2018-05-12 11:24:35 +02:00
Gabriel Calero	db460e9856	Put back the worker thread for account manager in android	2018-05-11 16:09:40 -03: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
Seth Alves	826c427e2a	trying to sort-out audio-stream logging	2018-05-10 15:42:59 -07:00
Seth Alves	32d10641dc	don't enable so much logging when 'verbose logging' is turned on	2018-05-10 14:41:54 -07:00
Gabriel Calero	a1a48d9b9e	Merge remote-tracking branch 'upstream/master' into android_places_goto	2018-05-10 18:24:26 -03:00
Zach Fox	ce575d367a	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-10 09:31:02 -07:00
vladest	62aa2df836	Merge branch 'master' into menu-updates	2018-05-10 10:36:38 +02:00
Zach Fox	44cfa95830	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-09 15:01:24 -07:00
Seth Alves	16e832ac08	use setFilterRules rather than specifying each logging category to suppress	2018-05-09 13:01:49 -07:00
Seth Alves	7466d08f1f	more suppression of logging	2018-05-09 13:01:49 -07:00
Howard Stearns	bf466344ee	Merge pull request #13135 from zfox23/MS14951_fixSnapshotHotkeySound ... MS14951: Fix Snapshot hotkey sound playback	2018-05-09 11:07:46 -07:00
Sam Gateau	17350a79dd	Merge pull request #13046 from NissimHadar/commandLineParametersForAutotester ... Command line parameters for autotester	2018-05-09 10:51:31 -07:00
Gabriel Calero	843282739e	Remove unused includes and white spaces	2018-05-09 14:16:51 -03:00
Thijs Wenker	a42491ded7	Merge pull request #13055 from misslivirose/remove-help-ftue ... Do not open help on first run	2018-05-09 18:48:05 +02:00
Zach Fox	06c6f55069	MS14951: Fix Snapshot hotkey sound playback	2018-05-09 09:35:42 -07:00
Gabriel Calero	5e337e90a3	Deactivates display plugin when qt app goes to background	2018-05-08 16:55:04 -03:00
Gabriel Calero	da69c9d077	Make qt application not stop in background and remove separete thread	2018-05-08 15:45:33 -03:00
NissimHadar	eb14658bc5	Per Austin's comments.	2018-05-08 11:13:06 -07:00
NissimHadar	8ad13826bd	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-07 13:11:39 -07:00
NissimHadar	2e51a66441	Use 'standard' format for command line parameter with multiple options.	2018-05-07 13:01:18 -07:00
Gabriel Calero	9b63b76b68	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-07 16:06:02 -03:00
Gabriel Calero	66b975192d	Merge remote-tracking branch 'cristo86/android_places_goto' into android_new_login	2018-05-07 15:56:43 -03:00
John Conklin II	6ac43c34c2	Merge pull request #13032 from druiz17/fix-spamming-reset-sensors ... don't spam resetSensors function when holding down Qt::Key_Apostrophe	2018-05-07 10:52:51 -07:00
NissimHadar	481eddb2a3	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-07 08:24:03 -07:00
vladest	1794113f37	Check global switch as well	2018-05-06 12:51:59 +02:00
vladest	c7ab1f3dbf	Merge branch 'master' into menu-updates	2018-05-05 20:48:40 +02:00
vladest	5a5bfcfe02	Merge branch 'master' into menu-updates	2018-05-05 07:11:39 +02:00
Bradley Austin Davis	38f43bdc68	Disable current splash frame implementaton	2018-05-04 16:40:05 -07:00
Bradley Austin Davis	803bd284a6	Alternate shader	2018-05-04 16:40:05 -07:00
Brad Davis	72526781d9	Additional work on splash screen	2018-05-04 16:40:05 -07:00
Cristian Luis Duarte	03ca427234	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-05-04 20:18:15 -03:00
Stephen Birarda	ec354620db	Merge pull request #12956 from huffman/feat/client-texture-selection-baking ... Add support for client texture selection	2018-05-04 16:14:43 -07:00
Gabriel Calero	087c6ff730	Patch for secondary camera assert error on Android	2018-05-04 18:45:39 -03:00
Cristian Luis Duarte	8c96d2be3c	Patch for secondary camera assert error on Android	2018-05-04 18:44:07 -03:00
Clement	ad60a79180	Fix for android builds	2018-05-04 14:43:28 -07:00
Clement	b04c5bd0db	CR	2018-05-04 14:43:16 -07:00
Cristian Luis Duarte	9f5365a277	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-05-04 18:38:08 -03:00
Gabriel Calero	1330132a32	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-04 18:35:51 -03:00
Liv Erickson	ee0af079cf	merge from upstream master and fix conflict	2018-05-04 14:34:38 -07: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
vladest	9e5dbf9a99	Snapshot notification sound settings	2018-05-04 22:01:44 +02:00
NissimHadar	aef5ea0936	Correct usage of the test script URL.	2018-05-04 12:30:13 -07:00
Zach Fox	1da840984b	Merge branch 'master' of github.com:highfidelity/hifi into spectatorCameraImprovements	2018-05-04 10:24:28 -07:00
Clement	487a63025f	Fix warning	2018-05-03 18:19:52 -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
Clement	e400eb4ed2	Rename ViewFrustum packets to AvatarQuery	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	2c6c0a25fc	Add testSnapshotLocation parameter to takeSnapshot.	2018-05-03 15:15:30 -07:00
NissimHadar	fe9c6052f7	Added quitWhenFinished parameter to the command line.	2018-05-03 15:02:11 -07:00
NissimHadar	3a5425122b	Shutdown interface when test script finishes.	2018-05-03 14:31:01 -07:00
Zach Fox	c3d3cdca3d	Add cubemap output format	2018-05-03 12:57:00 -07:00
NissimHadar	46f461dcdb	Don't display crash message if running from command line with a test script.	2018-05-03 11:20:37 -07:00
NissimHadar	8b3c451f91	Merge branch 'master' of github.com:highfidelity/hifi into commandLineParametersForAutotester	2018-05-03 08:25:19 -07:00
samcake	1dc6988f41	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-05-02 17:36:26 -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
NissimHadar	e0b16dfe03	Allow use of --url command line argument in test mode.	2018-05-02 14:17:01 -07:00
Cristian Luis Duarte	843aa9e261	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-05-02 18:06:56 -03:00
Gabriel Calero	d0ab81d1f9	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-02 17:00:32 -03:00
Cristian Luis Duarte	c460f8bf1e	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-05-02 16:35:13 -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
luiscuenca	689fbd2da0	added requested changes	2018-05-02 11:09:17 -07: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	e83f1a8ec7	Merge branch 'android_new_login' of https://github.com/gcalero/hifi into android_new_login	2018-05-02 12:20:23 -03:00
Gabriel Calero	0f08bd8fa1	Use a single AccountManager for android.	2018-05-02 12:11:11 -03:00
Gabriel Calero	3a1bfefc22	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-02 10:09:56 -03:00
Clement	a283d28686	Send number of frustums in packet	2018-05-01 18:03:21 -07:00
Clement	ddde0228ba	Fix AC not sending Avatar Mixer a frustum	2018-05-01 18:03:21 -07:00
Clement	1b2b70b769	Send both frustums to Avatar Mixer	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	fea49744ed	Add comment for future work	2018-05-01 18:02:29 -07:00
Clement	98cf48694e	Expose secondary camera to game logic	2018-05-01 18:02:29 -07:00
Clement	49fad3d868	EntityServer traversal aware of all ViewFrustums	2018-05-01 18:02:29 -07:00
Ryan Huffman	24ac342c6b	Add support for client texture selection	2018-05-01 14:11:31 -07:00
vladest	aef62d09c7	Merge branch 'master' into menu-updates	2018-05-01 21:47:46 +02: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
luiscuenca	50ca09b3b4	minor fixes	2018-04-30 16:26:04 -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
Liv Erickson	b994776ebd	do not open help on first run	2018-04-30 12:01:37 -07:00
Cristian Luis Duarte	401bf2f2a4	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-04-30 14:38:32 -03:00
John Conklin II	acf5ffc5ba	Merge pull request #12970 from sethalves/backtrace-annotations-1 ... Backtrace Attributes	2018-04-30 10:07:11 -07:00
vladest	be22f49c32	Merge branch 'master' into menu-updates	2018-04-28 20:22:28 +02: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
samcake	023941a133	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-27 15:19:23 -07:00
John Conklin II	dd32ca33a5	Merge pull request #12957 from sethalves/quiet-logging ... Quiet logging	2018-04-27 14:59:38 -07:00
Dante Ruiz	290c31d916	don't spam resetSensors	2018-04-27 11:33:45 -07:00
samcake	593c452671	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-27 09:33:06 -07:00
samcake	3ab0458d3a	Trying to expose an array to js	2018-04-26 17:45:48 -07:00
vladest	3296ae0db8	Merge branch 'master' into menu-updates	2018-04-26 22:21:40 +02:00
Stephen Birarda	bc4ce12e64	Merge pull request #13008 from huffman/fix/download-correct-installer ... Fix update installer URLs and add installer info to user activity data	2018-04-26 11:32:22 -07:00
Seth Alves	5e790d4898	include machine_fingerprint	2018-04-26 09:49:20 -07:00
Seth Alves	64be0a547c	hook up several annotations for crash reporter	2018-04-26 08:49:45 -07:00
Ryan Huffman	4c8b8d8442	Improve installer campaign+type for updates and user activity data	2018-04-26 08:32:18 -07:00
luiscuenca	12f578c93c	More fixes	2018-04-25 19:46:31 -07:00
luiscuenca	e0770f06b1	Add scripts to Model Packager	2018-04-25 19:35:26 -07:00
luiscuenca	165c3214a7	Avatar Scripts	2018-04-24 18:43:53 -07:00
samcake	33bbbcef83	Merging with master	2018-04-24 11:49:34 -07:00
Gabriel Calero	55a946c6c7	Fix non-android builds(performHapticFeedback)	2018-04-24 14:48:41 -03: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
Gabriel Calero	74e38882f7	Refactor using Android fragments. Complete drawer menu. Add Privacy Policy.	2018-04-23 17:01:34 -03:00
Gabriel Calero	ccb5e1e06c	Commenting out display plugin activation/desactivation	2018-04-23 15:29:51 -03:00
Cristian Luis Duarte	c33f1fbbb1	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-04-23 15:12:56 -03:00
Seth Alves	1dbcbbcced	cleanups	2018-04-23 11:05:06 -07:00
Gabriel Calero	001cd5e937	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-23 14:25:26 -03:00
samcake	990ee83f04	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-23 10:07:58 -07:00
Sam Gateau	7842ee8eac	Merge pull request #12962 from SamGondelman/menu ... Android: Hide menu and fix shader compilation	2018-04-23 09:51:20 -07:00
Cristian Luis Duarte	20d91b13dd	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-04-23 13:17:53 -03:00
Sam Gateau	99a0e42b5d	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-22 20:26:49 -07:00
vladest	4de9969f36	Merge branch 'master' into menu-updates	2018-04-21 20:22:48 +02:00
David Rowe	34d0a892a0	Point to example using Hardware.Application item	2018-04-21 15:01:46 +12:00
samcake	b554aec317	Trying more drastic changes and learnign to use std::chrono the right way	2018-04-20 17:53:24 -07:00
David Rowe	748052614f	Doc review	2018-04-21 12:45:00 +12:00
SamGondelman	d59f368ad6	hide menu, fix shaders	2018-04-20 17:38:38 -07: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
David Rowe	7087abd201	Merge branch 'master' into 21815	2018-04-21 10:49:56 +12:00
Cristian Luis Duarte	8235f999d8	Merge remote-tracking branch 'origin/master' into android_places_goto	2018-04-20 17:53:50 -03:00
samcake	3d651de797	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-20 13:20:19 -07:00
Seth Alves	c20346ca53	Merge pull request #12937 from SamGondelman/startup ... Make Audio.cpp threadsafe	2018-04-20 11:36:08 -07:00
SamGondelman	3b4b43cf66	try to fix audio crash on startup	2018-04-20 10:23:47 -07:00
Cristian Luis Duarte	55e64ceb55	Merge branch 'mm_1e08633' into android_places_goto	2018-04-20 13:32:23 -03:00
Cristian Luis Duarte	77caa4d402	Merge branch 'mm_c8bef86' into android_places_goto	2018-04-20 12:26:38 -03:00
Sam Gateau	cfaf75e196	Using the std::chrono to measure the physics time	2018-04-19 23:28:32 -07:00
Gabriel Calero	adfbaac18f	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-19 19:40:00 -03:00
Cristian Luis Duarte	dc321e4cd7	Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_places_goto	2018-04-19 18:46:44 -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
vladest	b191ad866f	Merge fixes	2018-04-19 21:04:11 +02:00
vladest	ab1a89a6f9	Merge branch 'master' into menu-updates	2018-04-19 21:02:30 +02:00
Sam Gateau	1e086332cc	Merge pull request #12911 from jherico/feature/splash ... Pre-requisite changes for splash screen rendering	2018-04-19 09:19:05 -07:00
Cristian Luis Duarte	5be9959424	Merge remote-tracking branch 'gcgithub/android_goto_splash' into android_places_goto	2018-04-19 12:11:29 -03: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
vladest	3d8d0bfa07	Added hot keys enumeration for display menu	2018-04-19 12:31:14 +02:00
vladest	ba4ef74313	Remove View->Overlays menu	2018-04-19 12:01:58 +02:00
Stephen Birarda	c4ad93bafb	Merge pull request #12782 from SimonWalton-HiFi/qregexp ... Replace LogHandler repeated regex scheme with assigned ID tracking scheme	2018-04-18 17:28:48 -07:00
Cristian Luis Duarte	9c44be3557	Merge remote-tracking branch 'gcgithub/android_new_login' into android_places_goto	2018-04-18 16:55:08 -03:00
vladest	b5071d28e8	Merge branch 'master' into menu-updates	2018-04-18 21:10:57 +02:00
Gabriel Calero	120de92c9e	Add login activity	2018-04-18 15:52:02 -03:00
John Conklin II	710bfb894a	Merge pull request #12907 from AndrewMeadows/more-correct-stats-002 ... more correct stats names	2018-04-18 10:50:38 -07:00
John Conklin II	005b6a6b1f	Merge pull request #12893 from ctrlaltdavid/21843 ... Fix overlay toggling	2018-04-18 10:49:05 -07:00
samcake	d6b6645630	exposing feedback of timing	2018-04-17 18:03:45 -07:00
Stephen Birarda	95c172f418	Merge branch 'stable' of github.com:highfidelity/hifi into merge-back-stable-66	2018-04-17 15:34:46 -07:00
Zach Fox	3b8e52ea41	Merge pull request #12862 from zfox23/discovery_April2018 ... Discovery: April 2018 (Huge PR; see description)	2018-04-17 15:11:50 -07:00
Brad Davis	d478204722	Working on splash rendering	2018-04-17 14:17:41 -07:00
David Rowe	e3edc45081	Document NavigationFocused	2018-04-18 07:04:55 +12:00
vladest	bb7eb90f58	Merge branch 'master' into menu-updates	2018-04-17 19:55:11 +02:00
vladest	8a5d80de31	Fix Desktop double windows	2018-04-17 19:51:24 +02:00
Cristian Luis Duarte	744fa808e3	Merge remote-tracking branch 'hifi/master' into android_places_goto	2018-04-17 13:11:02 -03:00
David Rowe	c1ede6ef58	Merge branch 'master' into 21815 ... # Conflicts: # tools/jsdoc/plugins/hifi.js	2018-04-17 11:54:56 +12:00
David Rowe	9f83c606e9	Controller API JSDoc	2018-04-17 11:46:40 +12:00
Anthony J. Thibault	0a162e62b0	transmit sendAll packet in nodeActivated signal callback ... (cherry picked from commit 9f1a8290148da12849935c916b2e0a59864cb49b)	2018-04-16 16:16:56 -07:00
Andrew Meadows	a80cf49eb3	split 'ETRupdate' out of 'postPhysics' stat context	2018-04-16 13:31:36 -07:00
Andrew Meadows	ace32193b4	more correct stat names	2018-04-16 13:31:36 -07:00
Gabriel Calero	e3b94b163c	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-16 14:55:16 -03:00
samcake	c18cee9862	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-16 10:38:06 -07:00
Sam Gateau	3ac4a1db2d	Merge pull request #12850 from SimonWalton-HiFi/early-trace ... Enable Interface tracing from earliest execution point	2018-04-16 10:24:55 -07:00
Zach Fox	071bf35683	Merge branch 'master' of github.com:highfidelity/hifi into discovery_April2018	2018-04-16 10:11:44 -07:00
David Rowe	df31d20430	Fix overlay toggling	2018-04-14 17:06:34 +12:00
samcake	1cd662acdb	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-04-13 14:43:11 -07:00
Seth Alves	a56f3f4a10	code review	2018-04-12 19:06:12 -07:00
Simon Walton	76468f7f26	Use existing DISABLE_WATCHDOG global to turn off thread entirely	2018-04-12 16:58:13 -07:00
Clement	157ca8cd68	Update docs with correct qt version	2018-04-12 16:21:26 -07:00
Andrew Meadows	6633304773	fix typo	2018-04-12 15:02:24 -07:00
Gabriel Calero	bd4a7ce4fa	Hide jump button while moving. Fix jump button right alignment in pixel	2018-04-12 19:02:03 -03:00
Andrew Meadows	060c391d47	more correct stat names	2018-04-12 14:23:48 -07:00
Simon Walton	5c141aa5e9	Add --disableWatchdog command-line option ... Watchdog still runs but doesn't abort on timeout. Also fixes for previous tracing improvements.	2018-04-12 09:28:28 -07:00
Zach Fox	a9b9a1cb10	Commerce: Gifts	2018-04-10 15:54:19 -07:00
Seth Alves	f81836c830	support specification of named landing-points in serverless-domain json files	2018-04-10 14:25:59 -07:00
Simon Walton	ca5720c015	Take out superfluous DependencyManager::set<tracing::Tracer>()	2018-04-10 13:52:46 -07:00
Simon Walton	cf3648409d	Allow duration for tracing, other fixes	2018-04-10 13:14:52 -07:00
Simon Walton	513a4875f0	Move --traceFile option to start of main()	2018-04-10 13:13:47 -07:00
Gabriel	6ccffb3c4d	Remove testing line	2018-04-10 08:24:38 -03:00
samcake	72649f5c06	More featuers for the view of the workload and test scrtpts to stress the system)	2018-04-09 17:27:40 -07:00
Triplelexx	883cd7b8d0	rename performance timer	2018-04-09 18:24:20 +01:00
Triplelexx	aef0c29a31	remove Limitless API	2018-04-09 18:23:33 +01:00
Gabriel Calero	b30cb25a3f	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-09 12:20:35 -03:00
Gabriel Calero	e85f5c97dc	Remove bottom bar. Apply new design for android	2018-04-09 11:41:00 -03:00
Andrew Meadows	a9f5b57681	merge 'master' into 'workload-010'	2018-04-06 11:11:06 -07:00
Stephen Birarda	1d76dea9f6	Merge pull request #12818 from highfidelity/RC66 ... Merge back RC66 to master	2018-04-06 10:43:01 -07:00
Andrew Meadows	ed1761945c	add/remove entities to physics using workload output	2018-04-06 07:22:05 -07:00
Gabriel Calero	0da2c972e3	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-05 16:22:56 -03:00
Andrew Meadows	4f0980b94b	hook up prototype PhysicsBoundary job	2018-04-05 12:11:57 -07:00
Andrew Meadows	299f2a92e0	merge 'master' into 'workload'	2018-04-05 12:01:19 -07:00
John Conklin II	9e21bab67e	Merge pull request #12748 from AndrewMeadows/untangle-003 ... cleanup around simulation-ownership	2018-04-05 10:58:45 -07:00
Seth Alves	4b0d338e57	on first run, send user to serverless tutorial rather than checking for a local sandbox	2018-04-04 18:00:11 -07: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
Simon Walton	692ccfc09b	Create HIFI_FCDEBUG(_ID) variants that require a category ... Original macros use default settings.	2018-04-04 09:49:15 -07:00
Gabriel Calero	ddbf4417ff	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-04-04 12:24:25 -03:00
samcake	fa35d659dc	Merge branch 'master' of https://github.com/highfidelity/hifi into upstream-workload	2018-04-03 17:56:41 -07:00
Simon Walton	7d16ca9c1c	Remove uses of addRepeatedMessageRegex() and its implementation ... Change to new log-message ID scheme.	2018-04-03 17:54:01 -07:00
Clément Brisset	3d4490f3fd	Merge pull request #12737 from highfidelity/RC66 ... RC66 mergeback	2018-04-03 15:39:16 -07:00
Gabriel Calero	2ff13270ed	Go back to GoTo screen	2018-04-02 12:22:21 -03:00
samcake	59a081bcdb	merge with upstream	2018-03-30 18:08:38 -07:00
Andrew Meadows	73fa6d3d2f	slightly simpler EntityMotionState delete logic	2018-03-30 13:18:32 -07:00
Andrew Meadows	6837d042ad	move entityCollisionWithEntity to PhysicalEntitySimulation	2018-03-30 13:18:32 -07:00
Gabriel Calero	b123b67134	Merge branch 'master' of https://github.com/highfidelity/hifi into android_goto_splash	2018-03-30 15:38:36 -03:00
John Conklin II	5013760aa1	Merge pull request #12742 from jherico/fix/rc66_crashes ... Fix/rc66 crashes	2018-03-29 18:04:52 -07:00
Seth Alves	dcfebde54a	put back the pre serverless-domain behavior for when a json file is dragged-and-dropped into the interface window -- import the json rather than load as a serverless-domain	2018-03-29 10:50:43 -07:00
John Conklin II	97d9c1b735	Merge pull request #12726 from jherico/fix/rc66_crashes ... Attempt to resolve potential overlay crashes at shutdown	2018-03-29 09:37:23 -07:00
Brad Hefta-Gaub	16df773de4	Merge pull request #12721 from highfidelity/RC66 ... RC66 - Mergeback	2018-03-28 09:55:46 -07:00
Brad Davis	aacfe92751	Don't trigger crashes from timers while waiting for some operation on exit	2018-03-28 09:09:56 -07:00
Seth Alves	bb101956a6	fix entity importing	2018-03-27 18:25:43 -07:00
Gabriel Calero	288f69ad6a	Detect if Interface is running on an android testing device	2018-03-27 15:28:12 -03:00
Gabriel Calero	8558759d41	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-03-23 16:56:53 -03:00
Dante Ruiz	a14d5c6546	make alternate keys work	2018-03-23 11:55:16 -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	6c1d713968	review	2018-03-21 19:21:57 -07:00
Seth Alves	916ed3a0d4	review	2018-03-21 16:18:31 -07:00
Seth Alves	196f621a60	remove unneeded setSessionUUID	2018-03-21 15:21:49 -07:00
Seth Alves	ef52ae13ee	rearrange domain-url-changed signals	2018-03-21 14:30:00 -07:00
Gabriel Calero	35935ed41a	Merge remote-tracking branch 'upstream/master' into android_goto_splash	2018-03-21 17:41:02 -03:00
Gabriel Calero	11bfc1ca74	Add Goto as splash screen in android	2018-03-21 17:40:14 -03:00
Dante Ruiz	9d8770b134	changing speed	2018-03-21 13:25:50 -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
Dante Ruiz	86cd5ffa30	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-21 08:49:25 -07:00
Seth Alves	585a523823	unmangle merge	2018-03-20 11:17:56 -07:00
John Conklin II	40d6e51da8	Merge pull request #12597 from ElderOrb/FB12956 ... Fix for broken 'toggle audio meter' button	2018-03-20 11:03:32 -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
Stephen Birarda	cd887b5faf	Merge pull request #12654 from huffman/feat/content-zip-upload ... Add support for .content.zip content uploads	2018-03-20 10:07:53 -07:00
Seth Alves	e3022da787	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-16 09:34:38 -07:00
Atlante45	d96f7553d9	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-03-15 15:22:43 -07:00
Ryan Huffman	03c8c14f61	Fix content replacement being allowed from all URLs	2018-03-15 12:49:22 -07:00
Ryan Huffman	bee8899c46	Add support for uploading .content.zip files	2018-03-15 12:17:21 -07:00
Seth Alves	afcbb6751b	disable loading of serverless-domains over http(s), for now	2018-03-14 15:53:35 -07:00
Seth Alves	e63558dc05	code review	2018-03-14 14:33:17 -07:00
David Rowe	966d711e56	Fix Window.raiseMainWindow()	2018-03-14 13:38:48 +13:00
David Rowe	c8b4217a96	Fix Window.hasFocus()	2018-03-14 12:57:23 +13:00
Dante Ruiz	f9413dfe1b	fixing mirror mode	2018-03-13 15:59:10 -07:00
Dante Ruiz	00fa5cfd06	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-13 10:08:00 -07:00
Dante Ruiz	f521a129b6	fixing issues	2018-03-13 10:07:34 -07: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
Dante Ruiz	e289d37210	min diff	2018-03-12 12:59:30 -07:00
Dante Ruiz	1079cfb264	fixing some issues	2018-03-12 12:57:56 -07:00
samcake	9bec8cdd0b	Merge branch 'master' of https://github.com/highfidelity/hifi into workload-master	2018-03-12 12:01:00 -07:00
Dante Ruiz	272f71b940	making changes	2018-03-12 11:48:17 -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	5b5ea11a18	changes to openUrl aren't needed for serverless domains	2018-03-09 15:43:05 -08: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
John Conklin II	25b93d9fd7	Merge pull request #12606 from ElderOrb/FB12956_RC65 ... Fix for broken 'toggle audio meter' button	2018-03-09 11:20:27 -08:00
Zach Fox	2b137f94a6	Merge pull request #12596 from zfox23/fixFontsAgain ... Fix font loading for MacOS via completely different font loading method	2018-03-09 09:49:56 -08:00
Dante Ruiz	cfa85b5137	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-09 09:37:08 -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
John Conklin II	cad53a0203	Merge pull request #12585 from druiz17/small-tablet-changes ... tablet scale and position changes	2018-03-08 15:36:06 -08:00
samcake	a0db5c6135	Merge with master	2018-03-08 15:35:58 -08:00
Alexander Ivash	b427d6c326	FB12956 - Audio Meter Toggle Button Broken	2018-03-09 02:20:34 +03:00
Zach Fox	ec6f66ee52	Try this	2018-03-08 14:31:56 -08:00
Zach Fox	747a6b07ce	Fix font loading for MacOS via different font loading method	2018-03-08 14:31:48 -08:00
Alexander Ivash	1fb68ec5ca	FB12956 - Audio Meter Toggle Button Broken	2018-03-09 00:55:49 +03:00
Zach Fox	409f5293bf	Try this	2018-03-08 13:51:34 -08:00
Zach Fox	d0cc64f63d	Fix font loading for MacOS via different font loading method	2018-03-08 11:19:49 -08:00
David Rowe	b1bda281ee	Merge branch 'master' into 21776	2018-03-08 15:36:10 +13:00
Seth Alves	7c7f42af06	Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains	2018-03-07 18:26:15 -08:00
Seth Alves	4ed0c24a73	use static QStrings rather than functions	2018-03-07 18:25:55 -08:00
Seth Alves	e70ca252de	Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains	2018-03-07 16:03:48 -08:00
Seth Alves	12eb0e4109	name emit from AddressManager like an event	2018-03-07 15:36:35 -08:00
Elisa Lupin-Jimenez	2987c90f96	fixed syntax for ubuntu	2018-03-07 13:48:35 -08:00
Elisa Lupin-Jimenez	9ae2da7e4b	fixed logic for texture files/non-models	2018-03-07 13:18:36 -08:00
Elisa Lupin-Jimenez	28589094c2	hopefully fixed mac/ubuntu builds	2018-03-07 10:18:40 -08:00
Dante Ruiz	2d448d7208	tablet scale and position changes	2018-03-07 10:02:35 -08:00
Dante Ruiz	a70509233e	making small changes	2018-03-07 08:25:27 -08: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
Seth Alves	926be73c0a	make this work again	2018-03-06 15:50:03 -08:00
Dante Ruiz	6fefd1355a	minimize diff	2018-03-06 14:19:26 -08:00
Dante Ruiz	fe363e7f2a	changing keybaord mapping	2018-03-06 14:16:25 -08:00
Seth Alves	79aa450332	some code-review induced changes	2018-03-06 13:11:09 -08:00
Brad Davis	6cc36136bd	Fix assert on interaction with stats and avatarinputs during UI setup	2018-03-06 12:34:21 -08:00
samcake	450786404c	Adding more detailed classes and introducing an upfront setupVIew job	2018-03-05 18:04:25 -08:00
Brad Davis	8bfc610cfb	Merge remote-tracking branch 'upstream/master' into android	2018-03-05 11:48:58 -08:00
samcake	7d32efb5e6	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-05 11:03:11 -08:00
Seth Alves	a6c3bcd8d8	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-05 08:51:12 -08:00
John Conklin II	3f751bb5ca	Merge pull request #12546 from druiz17/fix-hyperlink ... Fix hyperlink when far/near grabbing enitities	2018-03-05 08:23:51 -08:00
Seth Alves	606face7c0	gather together the url scheme constants, name them consistently	2018-03-02 20:39:38 -08:00
Seth Alves	7a61119d11	remove unneeded call to clearDomainOctreeDetails	2018-03-02 19:27:45 -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
Seth Alves	82bfd25d8b	fix placename in title-bar, fix domain-spawning-point	2018-03-02 09:54:54 -08:00
samcake	d4d5f3a7f0	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-02 08:50:47 -08:00
David Rowe	287ea8eff2	Fix Window.setFocus() unsetting focus if Interface has focus	2018-03-02 15:40:49 +13:00
Sam Gateau	88ecfe7895	Merge pull request #12464 from jherico/android_dev ... Android Master	2018-03-01 17:22:34 -08:00
Dante Ruiz	1f4aed31f1	adding hyperlink	2018-03-01 16:16:47 -08:00
Seth Alves	9ee65ab474	don't use clipboard when loading serverless domains	2018-03-01 13:31:43 -08:00
Seth Alves	2d374583b4	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-01 11:07:50 -08:00
Seth Alves	33065fb51c	more consistent variable names. rework DomainManager and AddressManager methods to take a url rather than host and port	2018-03-01 11:07:37 -08:00
Andrew Meadows	f9db9e999e	Merge 'master' into 'workload'	2018-03-01 10:19:06 -08:00
John Conklin II	1e1836c009	Merge pull request #12502 from elisa-lj11/2dimages-update ... Image entity has correct orientation and is collisionless	2018-03-01 09:57:08 -08:00
samcake	d91fb543f3	Fix the ssbo in GL4.5 and represent the workload proxies of the space and expose the workload engine to the JS api	2018-02-28 17:15:40 -08:00
Andrew Meadows	3ca21dda67	Merge hifi/master of into hifi/workload	2018-02-28 10:28:31 -08:00
Seth Alves	a44ddbbc26	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-27 14:09:05 -08:00
Brad Davis	136ced98c3	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
Stephen Birarda	9cc348ef27	Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings	2018-02-27 09:59:37 -08:00
Seth Alves	636c271dc3	merge from upstream	2018-02-27 09:21:08 -08:00
John Conklin II	48f0cded05	Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting ... Leopoly_Phase1_010 Graphics Scripting	2018-02-27 07:53:25 -08:00
Olivier Prat	2d71d7da9f	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-02-27 09:11:43 +01:00
John Conklin II	25144f0fec	Merge pull request #12456 from Atlante45/fix/min-spec-crash ... Fix crash when passing --checkMinSpec flag	2018-02-26 17:35:46 -08:00
Stephen Birarda	aa7bd2066a	Merge branch 'master' of github.com:highfidelity/hifi into feat/content-settings	2018-02-26 17:02:00 -08:00
Seth Alves	642e7b7c37	Merge pull request #24 from druiz17/serverless-domains ... Some bug fixes	2018-02-26 15:25:59 -08:00
Elisa Lupin-Jimenez	b56c78d36c	image has correct orientation and is collisionless	2018-02-26 14:44:46 -08:00
Dante Ruiz	a23c425f5e	actions and serverless status fixes	2018-02-26 14:24:51 -08:00
Brad Davis	b9387f2a21	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-26 13:18:14 -08:00
Seth Alves	f08864f17b	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-26 09:01:41 -08:00
humbletim	f824edd04e	* remove Model_temporary_hack ... * split gpuhelpers and mesh part * fix objwriter * more work on bufferview helpers * cr cleanup	2018-02-26 04:58:22 -05:00
Seth Alves	9e156deaab	Merge pull request #12494 from druiz17/one-menu ... Remove the avatarEntitiesBookmark menu option	2018-02-23 19:02:25 -08:00
Brad Hefta-Gaub	3d54f4d246	Merge pull request #12484 from ZappoMan/relaxDeadlockWatchdog ... Relax deadlock watchdog	2018-02-23 17:09:30 -08:00
Seth Alves	5632f9d8fd	clean up debug prints. put filename in window title-bar when connected to a serverless domain	2018-02-23 16:46:42 -08:00
Atlante45	800d15b405	Make sure settings timer is running	2018-02-23 16:23:50 -08:00
Seth Alves	77febe0aab	save avatar-entities which are created while using a serverless domain	2018-02-23 16:03:08 -08:00
Dante Ruiz	07b0431215	fix merge conflict	2018-02-23 14:00:36 -08:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
Dante Ruiz	d0ec84b6c8	remove menu option for booking marking avatar entities	2018-02-23 10:45:59 -08:00
Seth Alves	99893d81e2	merge from upstream	2018-02-23 09:14:48 -08:00
Olivier Prat	b1b62087e5	Forgot to reactivate deadlock detection	2018-02-23 18:08:21 +01:00
Olivier Prat	ee253143ff	Merge branch 'master' of http://github.com/highfidelity/hifi into taa	2018-02-23 14:53:14 +01:00
Olivier Prat	4636f43728	Simplified camera view history and TAA is now working in all circumstances.	2018-02-23 10:19:05 +01:00
Atlante45	c106fee659	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/backups-integration	2018-02-22 19:45:43 -08:00
Bradley Austin Davis	12d1885dff	Merge pull request #12428 from gcalero/android_ui_fixes ... Android ui fixes	2018-02-22 18:28:18 -08:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
ZappoMan	9f68accb30	add menu for testing unresponsive interface	2018-02-22 17:34:00 -08:00
Atlante45	277e556b48	Create a standard function to init Hifi Apps	2018-02-22 17:06:09 -08:00
Seth Alves	72234970e3	set sessionUUID for a serverless domain to random rather than AVATAR_SELF_ID	2018-02-22 14:38:46 -08:00
Seth Alves	804ab855d7	Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains	2018-02-22 14:16:15 -08:00
Seth Alves	fdd2b0de15	increment _fullSceneReceivedCounter++ after loading a serverless domain. fix some indentation.	2018-02-22 14:16:11 -08:00
Seth Alves	c7081b28e6	when connected to a serverless domain, set the sessionUUID to be AVATAR_SELF_ID	2018-02-22 14:14:55 -08:00
Olivier Prat	ae63610582	Added history of view to try to adjust for GPU slower than game	2018-02-22 23:03:33 +01:00
ZappoMan	e9cad947d7	add the deadlock watchdog stats to the stats metaverse checkin data	2018-02-22 14:01:56 -08:00
Andrew Meadows	1e71e819f4	update space view according to main ViewFrustum	2018-02-22 12:04:25 -08:00
Zach Fox	90f05f4db7	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-22 09:23:49 -08:00
ZappoMan	aa5542c54b	Merge branch 'master' of https://github.com/highfidelity/hifi into relaxDeadlockWatchdog	2018-02-22 08:43:13 -08:00
Seth Alves	c83dcbc626	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-02-22 07:42:49 -08:00
humbletim	dd90c8c515	fix ubuntu compile warnings	2018-02-22 10:16:34 -05:00
humbletim	fe9b67344b	remove unnecessary UUID check	2018-02-22 07:58:49 -05:00
humbletim	e4a2a589a5	CR fedback and cleanup	2018-02-22 07:56:09 -05:00
humbletim	72fca7e57e	Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge	2018-02-22 05:18:05 -05:00
humbletim	be8d79f53f	CR fedback and cleanup	2018-02-22 05:15:01 -05:00
Seth Alves	d27cbac3f8	loading directly into a serverless domain works. user will have edit permissions	2018-02-21 18:21:45 -08:00
Seth Alves	db195c6184	Merge pull request #12334 from ctrlaltdavid/remove-deprecated-items ... Remove some deprecated JavaScript API items	2018-02-21 16:31:16 -08:00
Seth Alves	e36f39781b	remove some debug prints, fix serverless to servered domain transition	2018-02-21 15:06:23 -08:00
Seth Alves	37e16d2e6d	don't save up edit packets when loading a serverless domain	2018-02-21 12:54:41 -08:00
samcake	33b47f9ae2	Merging with the actual worloadspace managed from the EntityTreeRenderer	2018-02-21 10:34:58 -08:00
ZappoMan	47a98d9d0f	relax the deadlock time to 2 minutes	2018-02-21 10:12:04 -08:00
samcake	34db56c50c	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-02-21 08:58:01 -08:00
Olivier Prat	f53c2f41a5	Merge branch 'master' of http://github.com/highfidelity/hifi into prev	2018-02-21 09:46:38 +01:00
samcake	f1dcfeb25e	Adding shaders and means to render the proxies contained in the workload SPace	2018-02-20 18:20:12 -08:00
Seth Alves	c5d6f0e10f	don't queue up edit packets while connected to a serverless domain	2018-02-20 17:48:14 -08:00
Andrew Meadows	e7495d830b	maintain Space proxies for entities	2018-02-20 17:39:05 -08:00
SamGondelman	4c6169ec78	merge and a little cleanup	2018-02-20 15:45:34 -08:00
samcake	be3fdbeaeb	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-02-20 13:16:25 -08:00
Zach Fox	2daa30f125	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_extendedCerts_1	2018-02-20 12:41:12 -08:00
Andrew Meadows	7ed68ced62	Merge master into highfidelity/workload	2018-02-20 12:31:37 -08:00
Seth Alves	1f5a65f93e	only could a url as a domain if it ends with .domain.json	2018-02-20 10:58:43 -08:00
humbletim	5791ca4c51	interim checkin	2018-02-20 12:22:04 -05:00
Olivier Prat	4edfe6c9ab	Trying to keep track of a better previous correction	2018-02-20 14:48:21 +01:00
Sam Gateau	cd14fb65f0	First stp to add a rendering job to debug and display the workload space	2018-02-19 23:44:23 -08:00
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