60361 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Andrew Meadows	d9ba75ca72	fix warning about implicit cast from 64 to 32 bits	2017-10-11 06:07:07 -07:00
Andrew Meadows	886422cbef	remove unused variable	2017-10-10 17:07:17 -07:00
Andrew Meadows	4bf99fe9d2	remove unused variable	2017-10-10 17:05:54 -07:00
Andrew Meadows	026195223a	more correct use of BufferView in GeometryCache	2017-10-10 17:02:26 -07:00
Sam Gateau	160be95081	Merge pull request #11563 from Atlante45/fix/warnings ... Fix warnings	2017-10-10 16:38:31 -07:00
Atlante45	cea0f48e5c	Fix warnings	2017-10-10 15:19:09 -07:00
Dante Ruiz	742cf0debe	Merge pull request #11383 from ElderOrb/case7384 ... 7384 On Domains without Edit Access, Create Button Text still Highlights	2017-10-10 14:30:49 -07:00
Sam Gateau	f143c28625	Merge pull request #11542 from SamGondelman/bubbleBoy ... Move HUD and HUD overlay rendering out of display plugin	2017-10-10 14:26:20 -07:00
Zach Fox	b105248dd7	Merge pull request #11555 from zfox23/commerce_daveIntegration2 ... 2017-10-09 Commerce Frontend Updates	2017-10-10 12:34:30 -07:00
Seth Alves	4a3b59ea61	Merge pull request #11560 from druiz17/far-grab-nondynamic ... Far grab non-dynamic entities	2017-10-10 12:29:38 -07:00
Sam Gateau	c44efda978	Merge pull request #11349 from Zvork/hdrcube ... Under the hood support for HDR cube maps	2017-10-10 11:43:41 -07:00
Ryan Huffman	568a7ba439	Merge pull request #11557 from cain-kilgore/21562 ... WL 21562 - Fix the error in the Asset Browser	2017-10-10 11:12:33 -07:00
Clément Brisset	3b48833cc0	Merge pull request #11451 from huffman/feat/upload-user-event ... Add uploading to asset server event	2017-10-10 11:03:33 -07:00
druiz17	013e15c9a2	made requested changes	2017-10-10 10:54:56 -07:00
Zach Fox	8d0d9a159f	Bugfixes	2017-10-10 10:38:19 -07:00
Melissa Brown	662bb6c103	Merge pull request #11338 from 1P-Cusack/FogBugz/Case_6491_Part7 ... [Case 6491] Remainder of entitySelectionTool clean up (details below).	2017-10-10 10:36:14 -07:00
druiz17	a179df29fb	mouse grab non-dynamic entities	2017-10-10 10:31:40 -07:00
druiz17	d0eb6a3ad0	remove comments	2017-10-10 09:45:41 -07:00
Ryan Huffman	9c120f1194	Update AssetMappingsScriptingInterface to not open file for activity event	2017-10-10 09:44:13 -07:00
druiz17	003395b256	removing whitespace	2017-10-10 09:43:02 -07:00
druiz17	9ff1b2c815	Merge branch 'master' of github.com:highfidelity/hifi into far-grab-nondynamic	2017-10-10 09:17:16 -07:00
druiz17	fc41155ce1	saving work	2017-10-10 09:17:01 -07:00
Olivier Prat	db9a9e723c	Merged with master	2017-10-10 12:11:23 +02:00
Cain Kilgore	583b0c521e	Open	2017-10-10 03:40:48 +01:00
Cain Kilgore	e9f4dee56d	WL 21562 - Fix the error in the Asset Browser	2017-10-10 03:39:13 +01:00
Seth Alves	559f229bd1	Merge pull request #11552 from SamGondelman/animationMaster ... Cherry-pick "Model asks for renderUpdate if animating" into master	2017-10-09 17:57:19 -07:00
Seth Alves	8ac1875a91	Merge pull request #11531 from AndrewMeadows/find-nearby-entities-at-login ... Find nearby entities at login	2017-10-09 17:54:44 -07:00
Zach Fox	b81a8a95ea	Final fixes	2017-10-09 15:23:22 -07:00
Seth Alves	58534a5a6d	Merge pull request #11550 from druiz17/fix-test-audio ... fixed looping sample sound bug	2017-10-09 15:21:24 -07:00
Zach Fox	38b95b5403	Instructions HTML file and flow	2017-10-09 15:07:14 -07:00
SamGondelman	ee02fa9a91	model asks for renderUpdate if animating ... (cherry picked from commit 873ae9b9d6)	2017-10-09 13:55:48 -07:00
Zach Fox	733df8391f	Round 2	2017-10-09 12:27:56 -07:00
Zach Fox	acdd1e32e4	First round	2017-10-09 12:11:07 -07:00
Anthony Thibault	13919907de	Merge pull request #11539 from Nex-Pro/patch-1 ... Fixed typo in qWarning message.	2017-10-09 12:10:27 -07:00
SamGondelman	3acbd7820b	build error	2017-10-09 11:48:54 -07:00
druiz17	cd97ab0fdf	fixed looping sample sound bug	2017-10-09 11:39:57 -07:00
Andrew Meadows	bbde1bcd63	move stuff out of writelock when possible	2017-10-09 10:42:42 -07:00
Andrew Meadows	0bcecdbe66	be picky when finding nearby entities at login	2017-10-09 10:27:46 -07:00
Andrew Meadows	0f4e7fb532	workaround for bad physics polling on login	2017-10-09 10:27:46 -07:00
Thijs Wenker	895f79fd80	Merge pull request #11548 from ctrlaltdavid/move-shapes ... Move Shapes app files from scripts directory to marketplace directory	2017-10-09 02:37:15 +02:00
Thijs Wenker	bd74386997	Merge pull request #11543 from ctrlaltdavid/21496 ... Add script that tests setting your listening position and orientation	2017-10-09 01:15:22 +02:00
David Rowe	765f3fc381	Move Shapes app files from scripts directory to marketplace directory	2017-10-09 10:38:40 +13:00
Bradley Austin Davis	c92588685b	Merge pull request #11533 from SamGondelman/modelMaster ... Fix model loading for real this time	2017-10-08 10:23:13 -07:00
Bradley Austin Davis	b960c81a85	Merge pull request #11536 from FlameSoulis/patch-1 ... Fix DQT_CMAKE_PREFIX_PATH being overwritten	2017-10-08 10:22:30 -07:00
Seth Alves	66191a5419	Merge pull request #11291 from ElderOrb/optional-build-tools ... make building tools (besides 'scribe') optional	2017-10-08 10:02:28 -07:00
Seth Alves	e6d0ab5343	Merge pull request #11545 from jherico/fix/text3d_overlay ... Fix rendering transform for text3d overlays	2017-10-08 06:33:12 -07:00
Brad Davis	7aeeaeb4e7	Fix rendering transform for text3d overlays	2017-10-07 19:41:43 -07:00
Brad Hefta-Gaub	06743a1cd9	Merge pull request #11544 from highfidelity/revert-11532-import-av-entities ... Revert "fix importing of avatar entities"	2017-10-07 16:58:22 -07:00
Seth Alves	28a8b18060	Revert "fix importing of avatar entities"	2017-10-07 16:54:05 -07:00
David Rowe	596ce8e9c1	Add script that tests setting your listening position and orientation	2017-10-07 21:46:56 +13:00