27559 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ZappoMan	b568e895ec	Merge branch 'master' of https://github.com/highfidelity/hifi into inBoundStats	2015-07-02 15:00:09 -07:00
Brad Hefta-Gaub	2a03f62bf2	Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership ... Actions over wire and improved simulation ownership	2015-07-02 14:57:27 -07:00
ericrius1	8be1fd28e5	stripping naked gl calls from overlays to allow vive and oculus plugins to work	2015-07-02 13:57:00 -07:00
David Rowe	3a92878544	Reinstate making someone looking at me look at my camera instead of face	2015-07-02 13:47:52 -07:00
ZappoMan	5c4d4893de	added bytes per edit stats	2015-07-02 13:44:28 -07:00
Clément Brisset	66fa1f5422	Merge pull request #5255 from murillodigital/master ... Don't display update dialog if this is a PR build	2015-07-02 13:34:52 -07:00
ZappoMan	63b585da0f	added updates per second stat	2015-07-02 13:28:12 -07:00
Leonardo Murillo	9440546619	Don't display update dialog if this is a PR build	2015-07-02 14:17:36 -06:00
Brad Hefta-Gaub	b11172affb	Merge pull request #5254 from jherico/timing_menu_log ... Inhibiting log spam unless a menu item is selected	2015-07-02 12:48:01 -07:00
Brad Davis	d5fe6f0bdb	Inhibiting log spam unless a menu item is selected	2015-07-02 12:34:32 -07:00
Philip Rosedale	fba569d7db	Merge pull request #5218 from huffman/fix-hmd-displayname-orientation ... Fix avatar displayname to point towards camera	2015-07-02 12:19:40 -07:00
ZappoMan	b13a4b2a71	add edit update stats	2015-07-02 11:07:47 -07:00
samcake	faea97d3c7	Merge pull request #5221 from Atlante45/web ... Fix Web entities	2015-07-02 10:45:20 -07:00
Clément Brisset	b616fff222	Merge pull request #5220 from howard-stearns/avatar-collision-sounds ... Avatar collision sounds	2015-07-02 10:27:24 -07:00
David Rowe	c20cd40275	Merge branch 'master' into 20601 ... Conflicts: interface/src/avatar/Head.cpp	2015-07-02 09:51:47 -07:00
Philip Rosedale	0905962d90	Merge pull request #5251 from ctrlaltdavid/20600 ... Fix Show Eye Focus and Show Look-at Vectors	2015-07-02 09:16:20 -07:00
Brad Hefta-Gaub	f16b8d5083	Merge pull request #5246 from jherico/inter_idle_timing ... Instrument the inter-idle time and tweaking the timeout setting	2015-07-02 09:01:44 -07:00
Howard Stearns	1f3a1f6ac8	Add comments re upcoming physics changes.	2015-07-02 10:07:14 -05:00
Howard Stearns	d0675c7f22	Side-effect new value before emit.	2015-07-02 09:56:02 -05:00
David Rowe	925fd71262	Fix rendering of look-at vectors	2015-07-01 22:45:47 -07:00
David Rowe	0df9ebeda3	Fix rendering of look-at avatar sphere ... postLighting is never true.	2015-07-01 22:45:13 -07:00
David Rowe	026f6d3690	Add mouth as third gaze target in addition to left and right eyes	2015-07-01 21:22:30 -07:00
Seth Alves	b19d505fc1	remove stray debug print	2015-07-01 20:32:45 -07:00
David Rowe	4ced0dc6c4	Only deflect eyes for Faceshift; DDE doesn't provide eye pitch or yaw	2015-07-01 20:24:47 -07:00
Seth Alves	246861221c	rearrange things so that when EntityItem::setActionData is called before the entity-tree is set up, the data is set aside and used once the entity-tree is ready.	2015-07-01 20:17:21 -07:00
David Rowe	26cbb14f45	Alternative look-at gaze left/right with face trackers too ... Instead of looking at one or other eye depending on look direction.	2015-07-01 20:09:36 -07:00
David Rowe	fada70fe02	Remove redundant code	2015-07-01 18:32:33 -07:00
David Rowe	bc4c635106	Fix gazing at avatar (when no head tracking or HMD) ... Randomly look at avatar's left and right eyes if the face is visible. Otherwise just look at their head.	2015-07-01 18:31:16 -07:00
Sam Gateau	d019ef4373	Merge branch 'master' of https://github.com/highfidelity/hifi into yellow	2015-07-01 18:12:11 -07:00
samcake	3564499824	Merge pull request #5249 from ZappoMan/entityServerEditStats ... add more detailed edit timing to entity server	2015-07-01 18:11:19 -07:00
Niraj Venkat	23979cce8f	Merge branch 'yellow' of https://github.com/samcake/hifi into stats	2015-07-01 17:31:15 -07:00
Niraj Venkat	ee998d0c74	Icon size is a pixel if the inStatus is -1	2015-07-01 17:30:50 -07:00
Sam Gateau	e8b11f1198	Exposing the display Item Status to js to turn it on/off	2015-07-01 17:27:41 -07:00
Brad Hefta-Gaub	bfd72a89af	Merge pull request #5250 from jherico/animation_perf_tester ... Animation performance test script	2015-07-01 17:24:59 -07:00
Brad Davis	566842389b	Animation performance test script	2015-07-01 17:04:48 -07:00
Brad Davis	88a733181e	Fixing comment to reflect code	2015-07-01 16:54:59 -07:00
Brad Davis	4cffa26c01	CR comments and fixing the microsecond display	2015-07-01 16:53:12 -07:00
Niraj Venkat	219bcd19ed	Status bar update	2015-07-01 16:40:42 -07:00
Brad Davis	59027959b8	CR comments and fixing the average calculation	2015-07-01 16:30:42 -07:00
Brad Hefta-Gaub	af932fde29	Merge pull request #5247 from ericrius1/handRender ... Fixed broken rendering of hydra visualization paraphernalia	2015-07-01 16:21:32 -07:00
Brad Davis	0c88972f09	Instrument the inter-idle time and tweaking the timeout setting	2015-07-01 16:14:17 -07:00
Brad Hefta-Gaub	b4f04af66f	Merge pull request #5242 from jherico/packet_processing ... Eliminate per-packet locking for processing	2015-07-01 16:11:27 -07:00
ZappoMan	24b4614703	add more detailed edit timing to entity server	2015-07-01 16:11:08 -07:00
ericrius1	a24df5c02f	added postLighting check back for rendering avatar Hands	2015-07-01 15:28:48 -07:00
ericrius1	f49f368ec3	removed dead commented out code	2015-07-01 15:16:34 -07:00
ericrius1	50a7332a5a	removed accidental lineRotations.js file commit	2015-07-01 15:14:53 -07:00
ericrius1	8129d0eb1f	hydra lasers are now rendering again	2015-07-01 15:12:37 -07:00
Brad Davis	5001c9af4b	Merge pull request #5245 from ZappoMan/entityServerEditStats ... add inbound edit packet queue depth to entity server	2015-07-01 15:10:57 -07:00
ericrius1	8b00864175	hydra hand spheres and lasers are rendering again	2015-07-01 15:04:19 -07:00
Brad Davis	1d16d80c0c	Comments from CR	2015-07-01 14:55:24 -07:00