19589 commits

Author	SHA1	Message	Date
Seth Alves	3abd6b3948	Merge pull request #10006 from druiz17/tablet-help ... Ported help into the tablet	2017-03-25 08:33:41 -08:00
Vladyslav Stelmakhovskyi	edb66ae704	Merge branch 'tablet-ui' into tablet-ui-audio-screen	2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi	fc23c348cb	Implemented Audio settings screen for Tablet UI	2017-03-25 13:17:38 +01:00
Dante Ruiz	3e98b2273c	help in the tablet	2017-03-25 00:52:41 +01:00
Dante Ruiz	6178a86a46	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help	2017-03-24 23:56:33 +01:00
Seth Alves	f1470e34f9	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-24 15:17:52 -07:00
Brad Hefta-Gaub	1972b140b9	Merge pull request #9976 from mittens/21215 ... Worklist #21215 - Removing Duplicate Status Icons for Submeshes	2017-03-24 08:52:12 -07:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub	9a38b36f59	Merge pull request #9970 from Triplelexx/21223 ... 21223 - Quat functions have naming inconsistencies	2017-03-24 08:12:11 -07:00
Zach Fox	a231b57472	Merge pull request #9962 from birarda/cmake-with-space ... Fix failing POST_BUILD steps on Windows with spaces in build path	2017-03-23 11:41:38 -07:00
Seth Alves	ff3fc244d1	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-23 09:50:53 -07:00
Dante Ruiz	e708c6478e	Merge branch 'tablet-popup' into tablet-help	2017-03-23 17:35:45 +01:00
Dante Ruiz	af97c7275e	Use loadQMlSource if no stack is aviable	2017-03-23 17:03:24 +01:00
Triplelexx	09cbace975	remove unused getBodyForwardDirection	2017-03-22 21:54:21 +00:00
Brad Davis	85c80f3be8	Merge remote-tracking branch 'upstream/master' into smarter_textures ... Conflicts: libraries/gpu/src/gpu/Texture.cpp	2017-03-22 14:25:23 -07:00
trent	36619cd2e4	Fixed issue with duplicate physics status icons per sub-object.	2017-03-22 15:07:29 -04:00
Triplelexx	fd312f6bf8	rename fronts to forwards	2017-03-22 18:49:34 +00:00
Dante Ruiz	3a89654111	saving work	2017-03-22 19:14:53 +01:00
Dante Ruiz	7423bf6ca1	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help	2017-03-22 16:33:29 +01:00
Dante Ruiz	a44704c4fe	merging with tablet-ui	2017-03-22 16:32:37 +01:00
Triplelexx	2515563a0b	change getFront to getForward	2017-03-21 22:35:07 +00:00
Triplelexx	8df0395754	change getFrontDirection to getForwardDirection	2017-03-21 22:28:12 +00:00
Triplelexx	b7980569cc	change all references of IDENTITY_FRONT to IDENTITY_FORWARD	2017-03-21 22:13:33 +00:00
Seth Alves	91cac892d2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 14:04:58 -07:00
Chris Collins	4c789c44aa	Merge pull request #9922 from birarda/bug/stuck-ess ... fix a couple of ESS issues during ES/ESS restart	2017-03-21 12:44:53 -07:00
Seth Alves	1da6349505	merge from upstream	2017-03-21 10:26:02 -07:00
Ryan Huffman	13222468e3	Merge pull request #9712 from huffman/feat/edit-particle-icon ... Add particle system overlay in edit.js	2017-03-21 10:02:52 -07:00
Seth Alves	cc4ddd1387	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-21 08:43:35 -08:00
Chris Collins	ea13151d55	Merge pull request #9945 from mnafees/21233 ... 21233: Remove Scripts Editor option from Edit menu and all related files	2017-03-21 08:01:36 -07:00
Vladyslav Stelmakhovskyi	fb0adae0b1	Scripts debug window in Tablet UI	2017-03-21 15:04:38 +01:00
Zach Pomerantz	20ea13e00a	Merge pull request #9897 from zzmp/record/noise-gate ... Add AudioNoiseGate to recordings played through Interface	2017-03-21 00:21:20 -04:00
Stephen Birarda	c9d1916eea	fix for build with win path with spaces	2017-03-20 18:24:19 -07:00
Brad Davis	e482eac437	Merge remote-tracking branch 'upstream/master' into smarter_textures	2017-03-20 16:22:13 -07:00
Vladyslav Stelmakhovskyi	cedc3cf8b6	Fix naming. Move variable instantiation within scope	2017-03-20 23:43:01 +01:00
Stephen Birarda	a4d72c4e67	make AudioScriptingInterface a Dependency	2017-03-20 13:40:15 -07:00
Vladyslav Stelmakhovskyi	13cd500c2e	Make runningscripts able to open even if there is no scripts running	2017-03-20 20:46:37 +01:00
Brad Hefta-Gaub	bc5d7d8698	Merge pull request #9851 from AndrewMeadows/simulation-ownership-2 ... zero velocity of deactivated dynamic entities	2017-03-20 10:20:11 -07:00
Seth Alves	2e29ff3114	Merge pull request #9934 from fayeli/edit-import-entities ... Adding Import Entities button on the Create tab of Edit	2017-03-20 09:13:08 -08:00
Brad Hefta-Gaub	af790d8474	Merge pull request #9875 from birarda/bug/spin-strafe ... fix double snap turn strafing	2017-03-20 10:08:05 -07:00
Chris Collins	af2748410d	Merge pull request #9932 from Triplelexx/21231 ... 21231 - Remove About Interface from File menu	2017-03-20 09:55:57 -07:00
Chris Collins	509057c6d8	Merge pull request #9941 from Triplelexx/21232 ... 21232 - Remove Mini Mirror from View menu	2017-03-20 09:55:37 -07:00
Chris Collins	ed27c550af	Merge pull request #9939 from ctrlaltdavid/21237 ... Disable Developer > Assets > ATP Asset Migration menu item	2017-03-20 06:29:33 -07:00
Chris Collins	2e6291f470	Merge pull request #9929 from ctrlaltdavid/21235 ... Replace Developer > Network > Disk cache editor with menu action	2017-03-20 06:26:36 -07:00
Seth Alves	424af2255b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-19 21:17:30 -08:00
Mohammed Nafees	c460523980	Remove related icon files for Scripts Editor	2017-03-20 00:25:50 -04:00
Mohammed Nafees	3612b9fccc	Remove Edit > Scripts Editor and all related source files	2017-03-20 00:25:50 -04:00
Seth Alves	f48557b06b	Merge pull request #9943 from vladest/tablet-ui-login-logout ... Tablet ui login logout	2017-03-18 09:37:11 -08:00
Vladyslav Stelmakhovskyi	5335bf8862	Menu items in Tablet UI now wrapped	2017-03-18 15:58:16 +01:00
Vladyslav Stelmakhovskyi	696825580e	Merge branch 'tablet-ui' into tablet-ui-login-logout	2017-03-18 14:42:11 +01:00
Vladyslav Stelmakhovskyi	5e162a6447	Implemented login facility for tablet UI	2017-03-18 14:38:49 +01:00