270 commits

Author	SHA1	Message	Date
Zach Fox	877fa52034	Merge branch 'master' of github.com:highfidelity/hifi into improveFontLoading	2018-03-01 10:14:23 -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
Zach Fox	67034274fa	Improve font loading by using QRC instead of relative paths	2018-02-28 17:59:37 -08:00
vladest	531c4dc41d	Merge branch 'master' into move_to_qqc2	2018-02-28 11:40:46 +01:00
SamGondelman	0fca56eef0	Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" ... This reverts commit 3201d2ba21, reversing changes made to c0f20900a0.	2018-02-27 11:33:05 -08:00
vladest	6a5fe0d513	Merge branch 'master' into move_to_qqc2	2018-02-27 15:23:52 +01:00
Elisa Lupin-Jimenez	b56c78d36c	image has correct orientation and is collisionless	2018-02-26 14:44:46 -08:00
John Conklin II	4feea929ce	Merge pull request #12449 from misslivirose/fix/atp-collisions ... change default add to world shape for asset browser	2018-02-26 11:15:01 -08:00
vladest	b1070f85f0	Merge branch 'master' into move_to_qqc2	2018-02-24 02:59:40 +01:00
NissimHadar	c6580f642a	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork	2018-02-22 13:45:00 -08:00
Liv Erickson	990e848de6	fix typo that was breaking popup dialog	2018-02-21 15:54:00 -08:00
Nissim Hadar	6f84e4c977	Moved shadows and ambient occlusion to menu checkboxes.	2018-02-20 23:45:07 -08:00
Liv Erickson	5cd184ddc3	change default add to world shape for asset browser	2018-02-20 17:55:30 -08:00
vladest	d71448d217	Merge branch 'master' into move_to_qqc2	2018-02-14 20:47:37 +01:00
John Conklin II	6187731fdc	Merge pull request #12291 from 1P-Cusack/FogBugz/Case_10865 ... [Case 10865] Make Asset Browser multi-select work with Ctrl/Cmd/Shift+Click	2018-02-14 11:14:26 -08:00
vladest	e8959b4cc0	Merge branch 'master' into move_to_qqc2	2018-02-13 22:01:16 +01:00
Elisa Lupin-Jimenez	e2bf8ad231	reverted to S3 for model URL	2018-02-02 15:36:28 -08:00
Elisa Lupin-Jimenez	d20ff0955c	qml doesn't work, .js might not work on osx	2018-02-02 11:26:21 -08:00
Elisa Lupin-Jimenez	73fde4333e	new local reference to image model	2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez	f71d9e4d6a	snapshot referenced locally, won't work on OS	2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez	9f8e2017ce	can add image directly from asset server	2018-02-02 10:27:44 -08:00
vladest	1c63bcf02e	Merge branch 'master' into move_to_qqc2	2018-01-31 22:13:52 +01:00
LaShonda Hopper	70e23f3ce8	[Case 10865] Bringing in multi-select fix from Desktop AssetServer. ... Changes Committed: modified: interface/resources/qml/hifi/dialogs/TabletAssetServer.qml	2018-01-30 14:44:34 -05:00
ZappoMan	4ad5d34a10	more preferences cleanup, removing some dead code from ScriptEngines/ScriptModel	2018-01-20 17:20:42 -08:00
vladest	2770650b65	Merge branch 'master' into move_to_qqc2	2017-12-12 18:48:41 +01:00
vladest	b52163cb24	Intitial SpinBox port	2017-12-04 20:54:35 +01:00
Alexander Ivash	d60f082796	9706 Editing Attachments Results In Attachments Window Scrolling To Top	2017-12-03 23:24:34 +03:00
vladest	19f9af0576	Port avatar preferences	2017-11-18 23:03:52 +01:00
vladest	68b08f429c	Port Attachments to QQC2	2017-11-18 22:49:16 +01:00
vladest	41f338e6ad	Port ScrollingWindow and TabletDebugWindow	2017-11-18 20:18:17 +01:00
vladest	0e53afc346	Merge branch 'master' into move_to_qqc2	2017-11-15 20:53:14 +01:00
vladest	0c13c2b6e2	Remove unused QQC1 imports	2017-11-13 16:37:28 +01:00
beholder	d1969d649a	fix not collapsing keyboard	2017-11-10 21:20:00 +03:00
luiscuenca	f0eab58ebd	Bug 6719 fixed	2017-10-26 09:41:24 -07:00
Ryan Huffman	f0c9badbd6	Fix misspelling in lost-connection-to-atp error	2017-10-05 09:10:46 -07:00
Atlante45	af69222fdb	Fix icon name change	2017-09-28 18:34:42 -07:00
Atlante45	eb06c33187	Naming coding standard fix	2017-09-27 15:32:53 -07:00
Atlante45	73483eef94	Update information sentence	2017-09-26 19:19:34 -07:00
Atlante45	bf984e8d1a	Fix tablet asset browser	2017-09-26 19:05:36 -07:00
Atlante45	03bd887f9a	Re-sync files	2017-09-26 18:42:50 -07:00
Atlante45	dda715e171	Update TabletAssetServer	2017-09-26 18:25:20 -07:00
Ryan Huffman	883bdc6003	Merge pull request #11425 from Atlante45/feat/auto-bake ... Asset Browser auto-refresh	2017-09-22 13:17:04 -07:00
Atlante45	6cdbf0c44a	Fix RunningScripts in tablet mode	2017-09-21 15:53:27 -07:00
Atlante45	1a571d0991	Add Asset Server auto refresh	2017-09-21 14:41:59 -07:00
Atlante45	a37642ba44	Pull Auto-Baking changes to TabletAssetServer.qml	2017-09-15 14:43:15 -07:00
Atlante45	c4d018504b	Pull Auto-Baking changes to TabletAssetServer.qml	2017-09-15 13:28:51 -07:00
Atlante45	8711823a9b	Sync up AssetServer.qml and TabletAssetServer.qml	2017-09-15 11:44:08 -07:00
Atlante45	ae14f1f88e	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-09-14 15:34:20 -07:00
vladest	7233c47257	use selection model of TreeView	2017-09-14 15:36:12 +02:00
Atlante45	2e84f48539	Fix QML errors	2017-09-13 09:54:55 -07:00
Atlante45	8a291f16ff	Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake	2017-08-25 15:26:38 -07:00
Atlante45	9e6502fe92	More UI work	2017-08-25 10:54:34 -07:00
SamGondelman	1c27335193	a couple logging fixes	2017-08-14 17:34:32 -07:00
Seth Alves	d812c293e8	Merge pull request #11120 from mukulHF/bug-lock-default-scripts ... Disable the ability for a user to edit default scripts if developer settings is not enabled - adjusting values	2017-08-10 12:29:23 -07:00
druiz17	005c5a9278	Update TabletRunningScripts.qml	2017-08-10 12:26:57 -07:00
mukulHF	780644fa38	Update TabletRunningScripts.qml	2017-08-07 11:37:27 -07:00
mukulHF	fadc19d8bb	Update RunningScripts.qml	2017-08-07 11:36:37 -07:00
vladest	3a013bf86e	Remove snap to item. Add caching for scrolling speedup	2017-08-05 13:28:08 +02:00
Dante Ruiz	9be60ee658	made more requested changes	2017-08-04 17:57:53 +01:00
Dante Ruiz	1e1ddf2941	making requested changes	2017-08-02 22:22:55 +01:00
Dante Ruiz	51652482a4	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-08-01 20:51:56 +01:00
utkarshgautamnyu	f407bf6f5a	Merge pull request #11064 from highfidelity/bug/6513 ... Enabled multiple selection and deletion in Asset Browser	2017-07-28 09:46:34 -07:00
utkarshgautamnyu	1beec26003	Update TabletAssetServer.qml	2017-07-27 15:55:55 -07:00
utkarshgautamnyu	4680911264	Enabled multiple selection and multiple deletion in asset browser	2017-07-27 14:47:30 -07:00
utkarshgautamnyu	71ddf1e7c1	Removed Compound Collision type	2017-07-26 10:20:17 -07:00
utkarshgautamnyu	24f4468fd5	added additional collision types to asset browser in tablet mode	2017-07-25 17:12:13 -07:00
Andrew Meadows	9d1fba3a3b	Merge pull request #10821 from ctrlaltdavid/21418 ... Don't execute body of controllers' plugin update methods if not enabled	2017-07-25 08:51:17 -07:00
Dante Ruiz	95299244cf	fixed running scripts popup	2017-07-22 00:24:24 +01:00
Dante Ruiz	7bf3f45e39	finished the locked default scripts	2017-07-21 23:32:25 +01:00
Dante Ruiz	625b7e535a	Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts	2017-07-21 17:20:03 +01:00
Dante Ruiz	3c862c34b2	disable reload default scripts by default	2017-07-20 21:15:00 +01:00
utkarshgautamnyu	ce5ff23e70	made changes to size of content to dosplay 'choose file' button	2017-07-19 16:15:34 -07:00
David Rowe	07697c5083	Merge branch 'master' into 21418 ... # Conflicts: # interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml # interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml Removed stray "Vive Controller Picks" configuration item which no longer exists.	2017-07-01 11:19:00 +12:00
David Rowe	be0e1a75a4	User-friendly SDL2 controller name	2017-06-29 10:03:58 +12:00
David Rowe	72d712ac76	Add "enabled" setting for Sixense; bail in update if note enabled	2017-06-26 16:43:06 +12:00
David Rowe	31714675c3	Remove unused Sixense preference and associated methods	2017-06-26 16:14:57 +12:00
David Rowe	361bc1ce03	Add "enabled" setting for SDL2 joystick; bail in update if not enabled	2017-06-26 16:00:18 +12:00
David Rowe	6e266dfbac	Merge branch 'master' into 21396	2017-06-24 09:19:12 +12:00
Brad Davis	d50c448151	Fix heap corruption coming out of running scripts dialog	2017-06-22 19:15:58 -07:00
David Rowe	6ff8aed5e3	Merge branch 'master' into 21396	2017-06-22 23:54:15 +12:00
Brad Hefta-Gaub	88a4f5c576	Merge pull request #10766 from humbletim/sort-running-scripts ... Sort Running Scripts... list alphabetically	2017-06-21 13:08:47 -07:00
David Rowe	febd0eaf98	Add Leap Motion settings	2017-06-16 10:58:11 +12:00
Zach Pomerantz	bc44e7beaf	bring qml to standard	2017-06-14 10:25:41 -04:00
Zach Pomerantz	a8f69bb2e0	Merge branch 'master' of github.com:highfidelity/hifi into audio/parity	2017-06-13 17:41:52 -04:00
Zach Pomerantz	1a046b4d91	propagate title in Audio dialog qml	2017-06-13 14:42:48 -04:00
Zach Pomerantz	b37a0239b0	up to reverb (needs cherry-picking)	2017-06-12 18:00:52 -04:00
Bradley Austin Davis	1968ecbc8f	Simplify eventBridge mechanism exposing functionality to web pages	2017-06-12 14:46:37 -07:00
Zach Pomerantz	d8815d1dce	prep audio menu	2017-06-05 16:24:00 -04:00
Zach Pomerantz	7cb38d22c3	fix AudioBuffers to work in tablet	2017-06-05 15:06:47 -04:00
Howard Stearns	556dcd69ac	wording change regarding use of exact for floors	2017-06-03 15:48:48 -07:00
Zach Pomerantz	2b40ad4275	mv Audio... to Settings as dialog	2017-05-28 17:42:24 -04:00
Zach Pomerantz	8ca8c3aa69	mv AudioPreferencesDialog to AudioBuffers	2017-05-28 17:40:57 -04:00
Thijs Wenker	962d95ca46	add more precision to attachment scale in attachment dialog	2017-05-23 18:16:08 +02:00
humbletim	34cadfc876	sort RunningScripts by caseless filename	2017-05-04 11:22:30 -04:00
Brad Davis	8e12c1959d	Removing logspam on toggling scripts window	2017-05-03 09:53:32 -07: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
Vladyslav Stelmakhovskyi	367555acdb	Fixed BasicTableView.qml:610:17: QML Item: Binding loop detected for property width. width must be explicitly set	2017-04-04 16:35:21 +02:00
Vladyslav Stelmakhovskyi	332f9bb283	Fixed TabletMenuStack.qml:56: Error: Cannot assign [undefined] to QString. Fixed keyboardRaised undefined error	2017-04-04 16:22:40 +02:00
Triplelexx	50e35a220b	Merge remote-tracking branch 'upstream/master' into 21224	2017-03-30 01:25:27 +01:00
humbletim	5d5d947ddb	updates per discussion with triplelexx	2017-03-25 04:01:02 -04:00