74051 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
David Rowe	010f7121a3	Fix Goto app clicks not working ... Includes better card highlighting fix.	2018-11-14 15:27:18 +13:00
Simon Walton	452c212c4f	Add Paths entry parsing to json parser	2018-11-13 17:58:12 -08:00
David Back	1aa048f4d6	style and decimal fixes	2018-11-13 17:56:31 -08:00
Brad Hefta-Gaub	f1dd778310	Merge pull request #14389 from SimonWalton-HiFi/oven-resourcerequestobserver ... Add newly-introduced dependency class to Oven	2018-11-13 17:35:29 -08:00
Simon Walton	82e21e89e4	Merge remote-tracking branch 'upstream/master' into max-json-size	2018-11-13 17:26:20 -08:00
Wayne Chen	7375840eda	adding 3d keyboard/get anchor id wip for reposition	2018-11-13 17:09:47 -08:00
David Back	a349bac01c	Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders	2018-11-13 16:32:15 -08:00
Thijs Wenker	2c715bf592	make window shortcuts work on OSX	2018-11-14 01:05:39 +01:00
Thijs Wenker	0248323bee	fix test path	2018-11-14 01:05:38 +01:00
Thijs Wenker	cc207537a3	Fix for unintended snapshots while parenting/un-parenting	2018-11-14 01:05:38 +01:00
Thijs Wenker	afd69d04dd	Make ctrl+shift shortcuts work for create app	2018-11-14 01:05:37 +01:00
Thijs Wenker	e890228fc7	Make shortcuts work in edit windows	2018-11-14 01:05:36 +01:00
David Back	8db81d9ce6	restructure draggable numbers to be more like blender	2018-11-13 16:04:08 -08:00
John Conklin II	d7dd593a97	Merge pull request #14369 from dback2/entityListColumns ... Entity list - dynamic columns	2018-11-13 16:01:06 -08:00
r3tk0n	dd8bbeb0e5	Clean up code and remove comments.	2018-11-13 15:36:25 -08:00
r3tk0n	ecee319602	Get logic working correctly.	2018-11-13 15:20:46 -08:00
David Back	91db81cd94	merge fix	2018-11-13 15:10:53 -08:00
John Conklin II	79e67ad45f	Merge pull request #14238 from ElderOrb/FB19400 ... FB19400 during shutdown -- TypeError: Cannot read property 'buttons' …	2018-11-13 15:07:21 -08:00
David Back	c73e737552	Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders	2018-11-13 15:04:12 -08:00
David Back	e88e131dca	Merge branch 'feat/ui-updates' of github.com:huffman/hifi into newPropertySliders	2018-11-13 15:04:02 -08:00
Sam Gondelman	13f650d514	Merge pull request #14093 from SamGondelman/police ... Case 19409, Case 19468: Fading fixes and shader cleanup	2018-11-13 15:00:23 -08:00
Jeff Clinton	6c90d7ed11	Merge pull request #14343 from ElderOrb/FB19514 ... FB19514 - Interface crashes on attempt to apply new animation url via…	2018-11-13 14:59:50 -08:00
Simon Walton	167a8fdc04	Merge branch 'master' into max-json-size	2018-11-13 14:57:06 -08:00
Jamil Akram	d65a79e815	Merge pull request #14377 from huffman/feat/ui-updates ... Update the styling for the Entity Properties window	2018-11-13 14:39:57 -08:00
Jeff Clinton	2afc8c505d	Merge pull request #14344 from ElderOrb/FB19348 ... FB19348 - Interface doesn't save changes to avatar animation text field	2018-11-13 14:29:25 -08:00
amantley	a8d7b0503d	removed more cruft	2018-11-13 14:24:18 -08:00
Wayne Chen	e84361f267	getting hmd/desktop switch working	2018-11-13 14:20:23 -08:00
Jeff Clinton	18bf6bf975	Merge pull request #14143 from ElderOrb/FB18673 ... FB18673 - Last line of GOTO desktop notification text cropped off on …	2018-11-13 14:05:21 -08:00
Jamil Akram	822e4bfe48	Merge pull request #14386 from ctrlaltdavid/M19820 ... Fix entities not loading when Interface doesn't have focus	2018-11-13 13:45:42 -08:00
Ryan Huffman	aecbccc058	Remove dead code and cleanup JS styling for entity properties redesign	2018-11-13 13:45:27 -08:00
Ryan Huffman	8c9015b224	Remove redundant dimensions in default entity properties	2018-11-13 13:45:27 -08:00
Ryan Huffman	536ba645b1	Update the styling for the Entity Properties window	2018-11-13 13:45:27 -08:00
NissimHadar	620c9e2f93	All results now logged, so don't mark as failed.	2018-11-13 13:38:44 -08:00
Simon Walton	a65466f154	Use traditional C strings rather than raw strings	2018-11-13 13:33:36 -08:00
Brad Hefta-Gaub	bb2239c0bd	Merge pull request #14359 from howard-stearns/no-url-logging ... remove urls from logs in Interface	2018-11-13 13:19:30 -08:00
John Conklin II	7e7817212c	Merge pull request #14321 from jherico/fix/19256 ... Case 19256: Switch back to Qt for GL context creation by default	2018-11-13 13:14:22 -08:00
Brad Hefta-Gaub	4cab805392	Merge pull request #12718 from gcalero/tester_flag ... Detect if Interface is running on an android testing device	2018-11-13 13:13:52 -08:00
Brad Davis	099ffa23ec	PR feedback	2018-11-13 12:19:20 -08:00
Brad Hefta-Gaub	07f94030ce	Merge pull request #14357 from ctrlaltdavid/M19761 ... Fix mini tablet JavaScript crash	2018-11-13 12:15:56 -08:00
amantley	c80ade98ec	cleaned up white space	2018-11-13 12:10:10 -08:00
Brad Hefta-Gaub	153b8920be	Merge pull request #14348 from sabrina-shanman/hfm_library ... (case 19302) Create the HFM library and namespace	2018-11-13 12:03:53 -08:00
Brad Hefta-Gaub	6e2024350d	Merge pull request #14282 from gcalero/android_new_login ... Change Android login flow (MS case 19470)	2018-11-13 12:02:10 -08:00
Brad Hefta-Gaub	b5e432bcb1	Merge pull request #14265 from amantley/needToSquat ... Bug fix for Users unable to Squat	2018-11-13 12:01:06 -08:00
Brad Hefta-Gaub	41d8220cbd	Merge pull request #14362 from ctrlaltdavid/M19768 ... Add option to enable/disable the mini tablet	2018-11-13 11:59:24 -08:00
NissimHadar	c7b3b9c0d2	Reverted previous commit.	2018-11-13 11:49:59 -08:00
Brad Hefta-Gaub	47cd6b332c	Merge pull request #14349 from hyperlogic/bug-fix/head-trackers-in-desktop-mode ... Bug fix for head trackers in desktop mode	2018-11-13 11:49:24 -08:00
amantley	f83edf4b7f	joint offsets working. reset working. to do: handling extra joints	2018-11-13 11:29:01 -08:00
David Back	0b0614c84a	CR fixes	2018-11-13 11:13:00 -08:00
NissimHadar	ef34ff622a	Merge branch 'master' of https://github.com/highfidelity/hifi into MAC	2018-11-13 11:11:53 -08:00
Dante Ruiz	812373cdab	fixing loading bar visual	2018-11-13 11:11:18 -08:00