27354 commits

Author	SHA1	Message	Date
Cristian Luis Duarte	ffb8b0a60e	Android fly - Use new asset and screen position	2018-04-04 18:19:01 -03:00
Cristian Luis Duarte	88c83f3bfe	Merge remote-tracking branch 'hifi/master' into android_jump	2018-04-03 19:59:21 -03:00
Clément Brisset	3d4490f3fd	Merge pull request #12737 from highfidelity/RC66 ... RC66 mergeback	2018-04-03 15:39:16 -07:00
Seth Alves	5f13df4102	Merge pull request #12722 from druiz17/fix-entities-outline ... fix ContextOverlayInferface highlighing unspecified entities.	2018-04-03 12:29:19 -07:00
Cristian Luis Duarte	cbf13c9f8c	Merge remote-tracking branch 'hifi/master' into android_jump	2018-04-03 16:12:17 -03:00
Cristian Luis Duarte	1ea056a8a9	Android - Initial Jump button implementation	2018-04-03 16:07:40 -03:00
Brad Davis	14ea168ab3	Merge remote-tracking branch 'upstream/master' into bindless	2018-04-02 13:13:28 -07:00
Anthony Thibault	dc9c9fd0ee	Merge pull request #12683 from hyperlogic/bug-fix/reduce-elbow-flapping ... Reduce avatar elbow fluttering by disabling pole vectors	2018-04-02 10:51:28 -07:00
Sam Gateau	8178ee7f34	Merge branch 'RC66' of https://github.com/highfidelity/hifi into rc66-mirror	2018-03-30 17:00:11 -07:00
Sam Gateau	d5496d68fd	FIx the mac crash when in front of a mirror by using the VIewFrustum stack correctly	2018-03-30 16:58:41 -07:00
Dante Ruiz	c99676b510	atlernate fix for selected entities	2018-03-30 13:44:54 -07:00
John Conklin II	8c8400947f	Merge pull request #12745 from SamGondelman/shadow ... RC66: Fix shadows on primitives	2018-03-30 12:52:08 -07:00
SamGondelman	5a7e9d8e3e	fix shadows on primitives	2018-03-30 09:48:04 -07:00
Brad Davis	440c01ae05	Merge remote-tracking branch 'upstream/master' into bindless	2018-03-30 09:29:35 -07: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
John Conklin II	a76b4b1008	Merge pull request #12734 from samcake/RC66-fetchMetaItem ... RC66: Add an extra sanity check when calling fetchMetaSubItemBounds	2018-03-29 11:05:08 -07:00
SamGondelman	afe39aba46	fix octal code char issue	2018-03-29 10:05:08 -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
samcake	2ee0af03c8	Add an extra sanity check when calling fetchMetaSubItems when the subItems is not allocated yet	2018-03-28 16:17:55 -07:00
Cristian Luis Duarte	fe9481b28d	Cleanup code, comment out log, simplify radar is valid touch code (no more flag)	2018-03-28 19:50:44 -03:00
Cristian Luis Duarte	f0bcaa47c8	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-28 16:47:21 -03:00
Brad Davis	9be162de95	Synchronously shut down QML rendering threads	2018-03-28 09:13:46 -07:00
Seth Alves	46fb2033f2	Merge pull request #12574 from druiz17/remap-keybaord ... changing keyboard mapping	2018-03-27 19:00:05 -07:00
Seth Alves	6948de7e24	default to serverless tutorial	2018-03-26 14:32:40 -07:00
Dante Ruiz	b8796db1e5	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-26 09:13:58 -07:00
Cristian Luis Duarte	6cb5cd7f92	Merge remote-tracking branch 'hifi/master' into android_ui_not_move_camera	2018-03-26 11:19:42 -03:00
Cristian Luis Duarte	242b009562	Android - Use mouse events for interacting with UI. Now LoginDialog UI interation does not move radar camera. Remove repeated tooggle call in audio.js. Adapt button to simulated mouse events.	2018-03-23 18:59:55 -03:00
SamGondelman	a19f71e759	fix tonemapping on android	2018-03-23 14:16:47 -07:00
John Conklin II	563ff61325	Merge pull request #12661 from SamGondelman/android ... Android: Stats, disable IK, reduce impact of InputRecorder	2018-03-23 11:08:50 -07:00
John Conklin II	0bc23456c3	Merge pull request #12682 from ctrlaltdavid/21807 ... JSDoc that an entity's clientOnly property can be set at entity creation	2018-03-22 17:55:45 -07:00
Dante Ruiz	4d52caccde	making some more requested changes	2018-03-22 17:39:22 -07:00
Dante Ruiz	1d17658c80	Merge branch 'master' of github.com:highfidelity/hifi into remap-keybaord	2018-03-22 16:29:16 -07:00
Clément Brisset	feec59655c	Merge pull request #12692 from highfidelity/stable ... Merge stable back into master	2018-03-22 15:08:30 -07:00
John Conklin II	6d9892856d	Merge pull request #12510 from sethalves/serverless-domains ... Serverless domains	2018-03-22 14:06:49 -07:00
Stephen Birarda	e8bea3a611	Merge pull request #12369 from simon-walton/BugFix ... Lexer code has confusion between strings and chars	2018-03-22 12:03:47 -07:00
Sam Gondelman	e46a8f022c	Merge pull request #12695 from gcalero/fix/current_context ... Fix/current context	2018-03-22 10:54:34 -07:00
Dante Ruiz	cea0f98aae	reverting files	2018-03-22 09:20:27 -07:00
Dante Ruiz	f5a954d08e	Merge branch 'serverless-domains' of github.com:sethalves/hifi into serverless-domains	2018-03-22 09:06:42 -07:00
Gabriel Calero	12b289bbc1	Restore debug logger for GLES. Fix SIGABRT Cannot make QOpenGLContext current in a different thread	2018-03-22 12:38:56 -03:00
Simon Walton	10f3032746	Compare QString w/ char*, not char	2018-03-21 23:09:46 -07:00
Brad Davis	0e7ee95c95	Merge remote-tracking branch 'upstream/master' into bindless	2018-03-21 19:16:55 -07:00
Brad Davis	3b5948ad85	Merge branch 'gl_common' into bindless	2018-03-21 19:16:34 -07:00
Seth Alves	b551b144a7	remove unneeded setIsConnected call	2018-03-21 19:15:27 -07:00
Seth Alves	4f20a87c6d	review	2018-03-21 16:26:02 -07:00
Seth Alves	916ed3a0d4	review	2018-03-21 16:18:31 -07:00
Brad Davis	d529d7b1d3	Remove whitespace before shader version line	2018-03-21 16:07:04 -07:00
Seth Alves	ae94ab3d67	make sure _sockAddr is cleared if the new url isn't a hifi:// one	2018-03-21 15:28:12 -07:00
Seth Alves	bea7ee42e2	Merge branch 'master' of github.com:highfidelity/hifi into serverless-domains	2018-03-21 14:30:07 -07:00
Seth Alves	ef52ae13ee	rearrange domain-url-changed signals	2018-03-21 14:30:00 -07:00
Brad Davis	ae8df7e24e	Merge remote-tracking branch 'origin/gl_common' into HEAD	2018-03-21 12:35:17 -07:00