61951 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
howard-stearns	b8da08ca42	reset wallet	2017-08-30 11:29:43 -07:00
vladest	88b045e3a9	Switched off overboundings. More accurate calculate height	2017-08-30 20:17:11 +02:00
Zach Fox	a73d548ffc	Merge pull request #11272 from zfox23/commerce_zachsPunchlist2 ... Commerce: Login; punctuationMode; new images	2017-08-30 11:12:38 -07:00
Zach Fox	e0878e7a3f	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_zachsPunchlist2	2017-08-30 11:07:24 -07:00
Zach Fox	f366743be7	Login; punctuationMode; new images	2017-08-30 11:07:03 -07:00
Zach Fox	271fcbf8b4	Merge pull request #11271 from davidkelly/dk/securityImageIssue ... security image shows up in every qml engine now	2017-08-30 10:52:48 -07:00
Zach Fox	1b48319a3f	Merge pull request #11267 from zfox23/commerce_zachsPunchlist1 ... Commerce: Zachs Punchlist 01	2017-08-30 10:10:56 -07:00
Chris Collins	f0e699aecb	Merge pull request #11263 from highfidelity/RC-53 ... Beta Release 53 - Includes up to Developer Release 7053	2017-08-30 09:48:00 -07:00
Liv	2f2b406047	Remove unneeded handcontrollertype code from handle first run checks	2017-08-30 09:23:33 -07:00
Anthony J. Thibault	9cd8b6991e	Merge branch 'master' into feature/ant-man	2017-08-30 08:58:55 -07:00
Dante Ruiz	ff134b338b	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-30 08:25:53 -07:00
Chris Collins	47a2e57e26	Merge pull request #10625 from humbletim/21180-C++ ... CR 21180-C++ Camera app -- core changes	2017-08-30 07:20:00 -07:00
David Rowe	13ac963bcc	Default collisions to on	2017-08-30 20:51:25 +12:00
David Rowe	5cf40fd208	Style Physics options toggle buttons	2017-08-30 20:47:33 +12:00
David Rowe	42d2045bae	Style Physics options presets pick list	2017-08-30 17:20:32 +12:00
David Kelly	72b15b4223	fix comment	2017-08-29 20:28:57 -07:00
Zach Fox	6ee634b90a	Lock overlay on top of security image	2017-08-29 17:19:34 -07:00
druiz17	2a97257698	Merge pull request #11140 from ElderOrb/case6788 ... 6788: You can deselect your current view mode	2017-08-29 17:15:51 -07:00
David Kelly	a2b1cfc7ac	security image shows up in every qml engine now	2017-08-29 17:06:57 -07:00
Zach Fox	c0d9c06067	Merge pull request #11268 from howard-stearns/fix-wallet-login ... fix wallet login (and share code with snapshot login)	2017-08-29 16:26:51 -07:00
Zach Fox	5d1170c5d6	Only make message appear after inventory received	2017-08-29 16:17:59 -07:00
Liv	492d053016	Create home path for new content sets loaded in	2017-08-29 16:11:16 -07:00
howard-stearns	5b264a867a	fix wallet login (and share code with snapshot login)	2017-08-29 16:05:01 -07:00
Zach Fox	a9c99854f9	Haven't purchased anything yet UI	2017-08-29 15:39:07 -07:00
Zach Fox	c7ad875485	Virtual keyboard and logic	2017-08-29 15:27:53 -07:00
Dante Ruiz	49608f1253	Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1	2017-08-29 15:19:16 -07:00
Dante Ruiz	ed52136fc5	finished equiping locked clone-able entities	2017-08-29 15:18:28 -07:00
Liv	59deccaeb5	Remove unused skipTutorial code	2017-08-29 14:55:59 -07:00
Zach Fox	50241078ae	Buncha punchlist items checked off	2017-08-29 14:30:00 -07:00
David Rowe	e18e11a07b	Style Physics options sliders	2017-08-30 09:01:46 +12:00
Menithal	ea79748ed3	Some adjustments	2017-08-29 23:59:36 +03:00
beholder	180acbc188	6819 - Create button not disabled	2017-08-29 23:49:44 +03:00
beholder	a0a43ebf26	show checkbox or radiobutton dependently on exclusiveGroup presence	2017-08-29 23:23:16 +03:00
Ryan Huffman	f89459525e	Merge pull request #11257 from birarda/feat/delete-baked-with-original ... add deletion of baked content when original removed	2017-08-29 13:18:58 -07:00
Ryan Huffman	e8a57e3b35	Merge pull request #11256 from birarda/feat/auto-bake ... fail bake of partially baked FBX that references KTX	2017-08-29 13:17:05 -07:00
Stephen Birarda	e735c12e70	Merge pull request #11258 from huffman/feat/auto-bake-2 ... Fix loading standalone baked textures from Asset Server	2017-08-29 13:16:02 -07:00
Zach Fox	91f4e59f61	Misc fixes. Get started.	2017-08-29 12:33:44 -07:00
vladest	fe44abdb62	Merge branch 'master' into flickable_web_pages	2017-08-29 20:49:39 +02:00
vladest	55eed37698	Start working on autocompletion	2017-08-29 20:47:09 +02:00
Chris Collins	b9d8b325bc	Merge pull request #11265 from sethalves/RC-53-x ... Rc 53 x	2017-08-29 09:59:49 -07:00
Seth Alves	a6aa71f8fd	unmangle merge	2017-08-29 09:51:08 -07:00
Seth Alves	b8795c3ea9	remove unneeded bind-by-ref thing from lambdas	2017-08-29 09:49:06 -07:00
Seth Alves	35459a7b93	cherry-pick	2017-08-29 09:49:04 -07:00
Daniela	58f0601af2	Fix identation.	2017-08-29 17:19:41 +01:00
SamGondelman	10eaed71f9	crash on shutdown	2017-08-29 09:10:12 -07:00
Chris Collins	c309258c8d	Merge pull request #11259 from sethalves/fix-bs-7240 ... possible fix for fogbugz 7240	2017-08-29 09:06:26 -07:00
David Kelly	1eb5b9e75d	Merge pull request #11260 from davidkelly/dk/transactionHistoryDisplay ... display transaction history	2017-08-29 08:46:58 -07:00
David Kelly	84126d8f95	cr feedback	2017-08-29 08:46:13 -07:00
David Kelly	67f25adac0	Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay	2017-08-29 08:02:53 -07:00
David Kelly	2564442817	Merge pull request #11252 from zfox23/commerce_checkoutAndInventory ... Commerce Checkout and Purchases	2017-08-29 08:02:22 -07:00