83782 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Alezia Kurdis	41ef2fafce	Add 6 new buttons ... 4 buttons for HMD enforce to be hidden by default. (Copy - Cut - Paste - Duplicate) 2 button (Undo and Redo)	2020-09-26 00:50:49 -04:00
Alezia Kurdis	ab45a32fea	Add new button in HMD ... Add new button in HMD: - add undo and redo support - add HMD detection	2020-09-26 00:46:32 -04:00
Alezia Kurdis	08038fb1bc	New css for new buttons and icons ... New css for new buttons and icons for the Create App. new HMD button for copy, cut, paste, duplicate, undo and redo.	2020-09-26 00:42:19 -04:00
Alezia Kurdis	4f353ec668	New fonts for pictograms ... New fonts for pictograms since "hifi-glyphs.ttf" has no more room for new icons. This contains icons for copy, cut, paste, duplicate, undo, redo... and a V logo.	2020-09-26 00:38:53 -04:00
Alezia Kurdis	7612b71455	Merge pull request #6 from kasenvr/master ... Upgrading	2020-09-24 23:01:15 -04:00
kasenvr	1c818bc8eb	Merge pull request #657 from daleglass/fix-build-on-qt-5.14 ... Fix build on qt 5.14	2020-09-24 17:11:42 -04:00
kasenvr	dd3152a2e4	Merge pull request #349 from daleglass/fix_warnings ... Fix warnings emitted by GCC	2020-09-24 17:06:16 -04:00
daleglass	fffb6619b3	Update libraries/shared/src/BufferParser.h ... Co-authored-by: David Rowe <david@ctrlaltstudio.com>	2020-09-24 22:17:22 +02:00
daleglass	ed4164b59e	Update libraries/shared/src/GeometryUtil.cpp ... Co-authored-by: David Rowe <david@ctrlaltstudio.com>	2020-09-24 22:17:16 +02:00
kasenvr	d6932aa540	Merge pull request #632 from Misterblue/fix/add-get-temp-name ... Add --get-temp-name to domain-server invocation in creation of Docker	2020-09-23 04:13:05 -04:00
kasenvr	567c3475c5	Merge pull request #654 from Madders/feature/update-explore-ui ... Updated the Explore app UI	2020-09-23 02:04:20 -04:00
Kalila L	b493f0c51d	Alter icon positions, colors, combine visit and search box. Add tooltips for some buttons.	2020-09-23 01:22:04 -04:00
Kalila L	2d871a8f88	Add hover effect for cards and fix description for add location.	2020-09-23 00:54:50 -04:00
Kalila L	3866bf478b	Fix icon resolutions.	2020-09-23 00:04:27 -04:00
Kalila L	085bdf0016	Merge branch 'master' into pr/654	2020-09-22 01:55:24 -04:00
kasenvr	4602ec7cad	Merge pull request #738 from kasenvr/fix/chat-app ... Fix chat opening due to other users triggering	2020-09-22 00:24:13 -04:00
kasenvr	894ffda5c2	Merge pull request #743 from ctrlaltdavid/fix/glb-asset-server ... Fix GLB files not being able to be added from Asset Server	2020-09-22 00:23:45 -04:00
kasenvr	457cc56f1a	Update FloofChat.html ... Fix formatting issues.	2020-09-21 23:48:36 -04:00
David Rowe	8227705ed7	Fix GLB files not being able to be added from Asset Server	2020-09-21 11:59:02 +12:00
Kalila L	ecf3e67bdf	Improve URL formatting and refactor.	2020-09-20 00:44:40 -04:00
Kalila L	2a5604a166	Fix chat window toggling for all users on domain.	2020-09-20 00:44:04 -04:00
kasenvr	68cefda3e5	Merge pull request #718 from kasenvr/feature/domain-server-metaverse-switching ... Domain Metaverse Switching & Interface Support Improved	2020-09-18 22:55:43 -04:00
kasenvr	cf26f6bc4b	Merge pull request #694 from ctrlaltdavid/fix/import-json-textures ... Support relative JSON URLs in model textures property	2020-09-18 17:00:13 -04:00
Alezia Kurdis	f8cbf74b37	Merge pull request #5 from kasenvr/master ... Upgrading to last master branch	2020-09-17 19:38:24 -04:00
kasenvr	39c36e275f	Merge pull request #656 from daleglass/fix-build-on-gcc10 ... Fix build of hifiSdl2 on GCC 10	2020-09-17 18:49:47 -04:00
Kalila L	bba8aecc4c	Fix typo.	2020-09-17 17:15:33 -04:00
kasenvr	9fad6109ca	Merge pull request #703 from AleziaKurdis/feature_Create_App_materialData ... Feature: Create Material even without a URL.	2020-09-16 23:36:56 -04:00
kasenvr	26c3c9ab15	Merge pull request #667 from odysseus654/pr/assignment-client-option-fix ... apparent copy/paste bug on assignment-client parameters	2020-09-16 23:26:35 -04:00
Alezia Kurdis	6ca176335e	Change "Add" button for "Create" ... Change "Add" button for "Create"	2020-09-16 23:15:07 -04:00
Alezia Kurdis	1a0e69ed6e	Change "Add" button for "Create" ... Change "Add" button for "Create"	2020-09-16 23:07:41 -04:00
Kalila L	1fad06b112	Update further.	2020-09-16 23:06:02 -04:00
Kalila L	ed79f03755	Include metaverse URL in window title.	2020-09-16 22:59:47 -04:00
Kalila L	c03d1ec659	Merge branch 'master' into feature/domain-server-metaverse-switching	2020-09-16 22:55:03 -04:00
kasenvr	bcaaa3257f	Merge pull request #715 from ctrlaltdavid/fix/serverless-title ... Fix "Serverless" capitalization in title bar	2020-09-16 22:39:44 -04:00
kasenvr	0236f49779	Merge pull request #705 from ctrlaltdavid/fix/bs-property-warning ... Quiet warning for unused blendshapeCoefficients property	2020-09-16 22:39:29 -04:00
kasenvr	b3d618a527	Merge pull request #713 from kasenvr/fix/audio-switching-crash ... Fix audio output switching crash	2020-09-16 22:39:18 -04:00
Kalila L	23bf8388f1	Fix metaverse URL retrieval and comment out updatePlaceNameLink until we have our own functionality.	2020-09-16 21:37:48 -04:00
Kalila L	8a71c66fcc	Added comments.	2020-09-16 20:01:47 -04:00
kasenvr	699425254d	Apply suggestions from code review ... Co-authored-by: David Rowe <david@ctrlaltstudio.com>	2020-09-16 19:59:44 -04:00
kasenvr	66f953d957	Apply suggestions from code review ... Co-authored-by: David Rowe <david@ctrlaltstudio.com>	2020-09-16 19:59:07 -04:00
kasenvr	fd5b84b6eb	Apply suggestions from code review ... Co-authored-by: David Rowe <david@ctrlaltstudio.com>	2020-09-16 19:57:58 -04:00
Alezia Kurdis	ec4d559055	Added (Optional) to the label "Material URL" ... Added "(Optional)" to the label "Material URL" "Material URL (Optional)"	2020-09-15 22:24:08 -04:00
Kalila L	3610446150	Update metaverse paths for Android as well.	2020-09-15 22:00:36 -04:00
Kalila L	c5a618be8f	Fix indent...?	2020-09-15 21:09:39 -04:00
Kalila L	4224c8120f	Set metaverse and ice to Vircadia again.	2020-09-15 21:06:27 -04:00
Kalila L	9b0ac9d75f	Update endpoints to be consistent and work with the updates.	2020-09-15 21:05:00 -04:00
Kalila L	e3a6dc18af	Add support for metaverse API's with paths.	2020-09-15 20:07:00 -04:00
Kalila L	d5f5c76878	Update NetworkingConstants.h URLs to Vircadia Metaverse.	2020-09-15 19:57:30 -04:00
Kalila L	dcbf8c7663	Agnostify language "High Fidelity" -> "Metaverse" and implement dynamic retrieval of URL for metaverse.	2020-09-15 01:31:24 -04:00
Kalila L	7a033f93da	Add HTTP route to get metaverse info.	2020-09-15 00:54:52 -04:00