50226 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Brad Davis	1ef4ac9a6c	Additional trace details for GPU timing, frame data updates	2017-01-18 16:19:32 -08:00
Seth Alves	c4d85c91d0	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 15:51:54 -08:00
Seth Alves	49d8a644c3	Merge pull request #9432 from hyperlogic/tablet-ui ... Tablet improvements / bug fixes	2017-01-18 15:49:14 -08:00
Seth Alves	3517daaad2	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 15:49:12 -08:00
Anthony J. Thibault	56c897cc2f	Process the tablet stylus even when reticle is over 2d HUD overlay.	2017-01-18 15:36:09 -08:00
Anthony J. Thibault	bcd94203e6	Raised min fps of tablet overlay for smoother scrolling	2017-01-18 15:32:39 -08:00
Anthony J. Thibault	fc5c2c8def	Fix for glitchy scrolling	2017-01-18 15:32:38 -08:00
Anthony J. Thibault	448e3fda0c	fix for JSON parse exception	2017-01-18 15:32:37 -08:00
Anthony J. Thibault	28dac9d802	Lasers now interact with the tablet in edit mode.	2017-01-18 15:32:36 -08:00
samcake	e3da6aa9f1	Removing the comment	2017-01-18 15:03:31 -08:00
Seth Alves	aeb02001ed	Merge pull request #9431 from sethalves/tablet-ui ... avoid unthreadsafe use of getJointIndex	2017-01-18 14:59:02 -08:00
Zach Fox	0ec01c0dc5	CR feedback	2017-01-18 14:55:53 -08:00
Seth Alves	c6d0c0909e	avoid unthreadsafe use of getJointIndex	2017-01-18 14:54:38 -08:00
Zach Fox	8a35afd3ac	Merge branch 'master' into PAL_AdminLabel	2017-01-18 14:46:08 -08:00
Gabriel Calero	5602479988	Create render forward version of pixel shaders	2017-01-18 19:18:59 -03:00
Zach Fox	7f57251a0e	Remove logs also removed in Master	2017-01-18 13:38:19 -08:00
David Kelly	3b70fa08a3	Merge pull request #9417 from davidkelly/dk/palLogSpam ... Removing some PAL-related interface log spam	2017-01-18 13:20:57 -08:00
Zach Fox	f8dd7f5433	Cleanup	2017-01-18 12:55:25 -08:00
Zach Fox	e9d3c36873	Final commit?	2017-01-18 12:55:25 -08:00
Zach Fox	1175752e1d	Cleanup after rebase	2017-01-18 12:55:24 -08:00
Zach Fox	d067ba7dcc	Alan's feedback	2017-01-18 12:55:24 -08:00
Zach Fox	9d19aa3c79	Checkpoint	2017-01-18 12:55:24 -08:00
Zach Fox	202d4e8107	Checkpoint	2017-01-18 12:55:24 -08:00
Zach Fox	346cfbfe02	First checkpoint	2017-01-18 12:55:24 -08:00
Seth Alves	4dd0de62fc	Merge pull request #9424 from sethalves/tablet-ui ... fix warnings	2017-01-18 12:50:06 -08:00
Seth Alves	b6188bb73a	fix warnings	2017-01-18 12:49:25 -08:00
Seth Alves	02b708feaf	Merge pull request #9419 from druiz17/buttonsMissing ... Fixed pal on tablet	2017-01-18 11:04:10 -08:00
Seth Alves	a1efb7695b	Merge pull request #9420 from sethalves/tablet-ui-model-stylus ... Tablet ui model stylus	2017-01-18 10:51:36 -08:00
Seth Alves	a8038ce64e	cleanups	2017-01-18 10:50:02 -08:00
Seth Alves	1f92b57bf2	switch to model stylus	2017-01-18 10:46:18 -08:00
Dante Ruiz	8172329ec3	Fixed pal	2017-01-18 10:33:58 -08:00
Philip Rosedale	d60d183c8c	Merge pull request #9403 from humbletim/21118 ... Code Review for Job #21118 - Add on/off switch to ambisonic/ambient sound emitter	2017-01-18 10:29:01 -08:00
Seth Alves	439d6f0fa3	Merge pull request #9418 from druiz17/tabletController ... game controller input with tablet	2017-01-18 09:31:55 -08:00
Dante Ruiz	0f3ac2831e	fix tablet menu selection issue	2017-01-18 17:20:42 +00:00
Dante Ruiz	1c13f538f7	removed debug output	2017-01-18 17:08:13 +00:00
Dante Ruiz	fa3bea52cd	fixed bug with menu	2017-01-18 16:45:27 +00:00
Dante Ruiz	baff07b0f9	controller with menus finally work	2017-01-18 07:41:25 -08:00
Dante Ruiz	9a61b6030b	tabletFocus update	2017-01-18 07:40:15 -08:00
Dante Ruiz	d3fa7651c9	some what working d-pad	2017-01-18 07:40:15 -08:00
dante ruiz	865a78a8c8	saving work	2017-01-18 07:40:14 -08:00
Seth Alves	715ee0b019	Merge pull request #9416 from sethalves/tablet-ui ... Tablet ui	2017-01-18 06:41:21 -08:00
Seth Alves	b57803057d	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-01-18 06:38:44 -08:00
Seth Alves	0abb41ca2d	Merge pull request #9413 from hyperlogic/tablet-ui ... clara.io marketplace works on tablet	2017-01-18 06:37:55 -08:00
Seth Alves	d02ef9fb86	Merge pull request #9415 from hyperlogic/tablet-ui2 ... Adjusted tablet spawn position and orientation to be more natural	2017-01-18 06:36:18 -08:00
Seth Alves	3fe9505f18	Merge pull request #9414 from fayeli/menu-scrolling ... Fix tablet menu scrolling issue	2017-01-18 06:35:06 -08:00
Brad Hefta-Gaub	5036781b81	Merge pull request #9406 from jherico/atp_core_usage ... Consume fewer cpu cores in AssetServer when interface is running locally	2017-01-18 06:50:48 -06:00
humbletim	6320d872b4	remove commented code	2017-01-18 02:57:13 -05:00
humbletim	f88b39918f	switch to messaging for toggle notifications; cleanup	2017-01-18 02:54:42 -05:00
humbletim	1048c2a3bf	apply default userData values; add error checking; throttle toggle clicks	2017-01-18 01:40:28 -05:00
Anthony J. Thibault	03f8a310fc	Fix for exception on script ending	2017-01-17 18:17:41 -08:00