1432 commits

Author	SHA1	Message	Date
Dante Ruiz	038ffe920a	fixing merge conflicts	2017-06-06 16:42:08 +01:00
Dante Ruiz	f0f10f74c6	inpput configutration stub	2017-06-03 00:30:00 +01:00
Brad Davis	1f95daf5c1	Add dev menu option to wipe KTX cache on next launch	2017-06-02 11:19:43 -07:00
Dante Ruiz	54d63f5155	Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter	2017-05-23 18:19:38 +01:00
Anthony J. Thibault	e99001d86c	debug draw ik chains, bug fix for flex coef on tips ... And opened up hip constraints.	2017-05-18 16:29:55 -07:00
Dante Ruiz	975b1ab077	moved low velocity filter in the input system	2017-05-16 00:15:06 +01:00
Anthony J. Thibault	93b8dc550c	Merge branch 'master' into feature/ik-solver-init-config	2017-05-10 09:03:21 -07:00
Anthony J. Thibault	7af93f9fea	Hooked up IK constraint rendering	2017-05-08 15:06:29 -07:00
Andrew Meadows	63042eea3a	fix flawed fix of bad rebase	2017-05-05 09:37:00 -07:00
Andrew Meadows	41ad25ade1	fix bad rebase of changed menu option	2017-05-05 09:37:00 -07:00
Andrew Meadows	e21bd7a67a	help avatar walk up steps	2017-05-05 09:35:49 -07:00
Brad Davis	425405f72d	Merge pull request #10245 from AndrewMeadows/avatar-renderer-002 ... more cleanup in preparation for moving Avatar class to lib	2017-05-02 10:37:22 -07:00
Brad Davis	5e1bc0d908	Remove faceshift	2017-04-28 16:34:54 -07:00
Andrew Meadows	5cf233db3a	less labyrinth	2017-04-27 13:16:50 -07:00
Andrew Meadows	aa90a6bd02	use static methods for setting avatar debug options	2017-04-27 13:16:50 -07:00
Andrew Meadows	00b05ed137	connect menu options to avatar render features	2017-04-27 13:16:50 -07:00
Triplelexx	f795027ab7	change menu item locations ... AudioNoiseReduction moved under Audio. Avatar Collision under Avatar.	2017-04-27 01:09:04 +01:00
Zach Fox	7505b82189	Merge pull request #10046 from Triplelexx/21224 ... 21224 - Allow people to save avatar bookmarks	2017-04-18 11:10:50 -07:00
Zach Fox	d9dc8ebc41	More improvements	2017-04-13 15:48:51 -07:00
Triplelexx	01b13d7032	fix crash when pressing "Bookmark Avatar" button ... also modified LocationBookmarks for consistency	2017-04-04 18:05:00 +01:00
Triplelexx	50e35a220b	Merge remote-tracking branch 'upstream/master' into 21224	2017-03-30 01:25:27 +01:00
Seth Alves	b50a02ea19	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-28 08:16:59 -07:00
Anthony J. Thibault	dd17b2e2f3	Added developer option to draw IK targets in world. ... (cherry picked from commit 7e7803c648)	2017-03-24 16:20:52 -07:00
Triplelexx	bda1d54209	create AvatarBookmarks ... derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass at integration, QML issues noted	2017-03-24 22:58:36 +00: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
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
Seth Alves	424af2255b	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-19 21:17:30 -08:00
Mohammed Nafees	3612b9fccc	Remove Edit > Scripts Editor and all related source files	2017-03-20 00:25:50 -04:00
Triplelexx	a9b1a38665	remove Mini Mirror from View menu ... Avatar inputs only contains the audio meter now.	2017-03-18 00:53:13 +00:00
David Rowe	ab7d82edb6	Use #ifdef instead of comment	2017-03-18 12:56:34 +13:00
David Rowe	38bb48e72c	Disable Developer > Assets > ATP Asset Migration menu item	2017-03-18 12:13:13 +13:00
David Rowe	e3b9d588ec	Merge branch 'master' into 21235 ... # Conflicts: # interface/src/Menu.cpp # interface/src/ui/DialogsManager.h	2017-03-18 09:42:36 +13:00
Triplelexx	eba6c8de5e	remove About Interface from File menu	2017-03-17 17:37:19 +00:00
David Rowe	939b4f1612	Remove Developer > Network > Disk Cache Editor menu item and dialog	2017-03-17 13:49:09 +13:00
David Rowe	e21d7d9edf	Add Developer > Network > Clear Disk Cache menu action	2017-03-17 13:34:11 +13:00
David Rowe	dc71f502f0	Delete Developer > Network > RAM Caches Size menu item and dialog	2017-03-17 13:09:06 +13:00
Vladyslav Stelmakhovskyi	856e15060d	Implemented Domain Connection statistics for Tablet UI	2017-03-15 21:05:13 +01:00
Seth Alves	563d59bda9	Merge pull request #9886 from vladest/tablet-ui-entity-statistics ... Tablet ui entity statistics	2017-03-15 08:40:52 -08:00
Vladyslav Stelmakhovskyi	99c74cec41	Merge branch 'tablet-ui' into tablet-ui-entity-statistics	2017-03-14 15:59:27 +01:00
Vladyslav Stelmakhovskyi	ee7dd458ca	Merge branch 'tablet-ui' into tablet-ui-graphics	2017-03-14 15:37:36 +01:00
David Rowe	4dd7667fd7	Merge branch 'tablet-ui' into 21209 ... # Conflicts: # interface/resources/qml/hifi/tablet/tabletWindows/TabletPreferencesDialog.qml # interface/src/ui/overlays/Web3DOverlay.cpp	2017-03-14 08:50:01 +13:00
Vladyslav Stelmakhovskyi	9e9c64021c	Merge branch 'tablet-ui' into tablet-ui-entity-statistics	2017-03-13 19:54:40 +01:00
Seth Alves	4f71a5b234	Merge pull request #9864 from vladest/tablet-ui-lod-settings ... Add LOD settings to Tablet UI	2017-03-13 08:59:40 -08:00
Vladyslav Stelmakhovskyi	49055cfa5c	Some statistics showed	2017-03-13 16:31:29 +01:00
Vladyslav Stelmakhovskyi	81bc56f124	Fixed slider groove size calculation. Added LOD Tools to Tablet UI	2017-03-11 14:44:33 +01:00
Vladyslav Stelmakhovskyi	d70943dd6c	Add Graphics preferences to Tablet. Use TabletComboBox instead of desktop ComboBox for Tablet preferences	2017-03-11 12:23:31 +01:00