12651 commits

Author	SHA1	Message	Date
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
Seth Alves	5e2f7204b4	responses to code review	2015-07-01 10:29:42 -07:00
Seth Alves	0caa8be66e	ignore incoming changes for a hold action that's flagged as 'mine'	2015-06-29 19:50:19 -07:00
Seth Alves	88fc74374b	if a hold action is edited by a local script, mark it as 'mine'. if it's not 'mine', let the spring action handle the wire protocol	2015-06-29 19:27:10 -07:00
Seth Alves	0a734c9d3d	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire-and-sim-ownership	2015-06-29 16:56:04 -07:00
Seth Alves	a0fd75c54f	don't enable hold actions from remote nodes	2015-06-29 16:08:37 -07:00
Seth Alves	fbede0a23f	guard against feeding bullet a NaN	2015-06-29 15:54:24 -07:00
Stephen Birarda	3dc3d8b4c1	make the tooltip background darker	2015-06-29 11:05:59 -07:00
Stephen Birarda	133247ec6d	Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo	2015-06-29 10:57:16 -07:00
Stephen Birarda	f93ad34282	add spacing above and below tooltipPic	2015-06-29 10:57:09 -07:00
Brad Davis	5cfa22396c	Merge pull request #5219 from venkatn93/master ... Changing tooltip reticle	2015-06-29 10:51:16 -07:00
Seth Alves	1d122060a6	merge andrew's sim-ownership branch	2015-06-29 09:50:38 -07:00
David Rowe	386b3d8ae3	Fix text overlay font rendering ... Use the same font size as used in TextRenderer to avoid scaling issues.	2015-06-27 14:02:49 -07:00
Seth Alves	0970f010a4	provide a way for scripts to get information about what actions an entity has and what the arguments of those actions are	2015-06-27 13:31:00 -07:00
Seth Alves	97cd5b8b99	Merge pull request #5223 from SamGondelman/cameraMode ... misc. key binding/camera fixes	2015-06-27 10:55:34 -07:00
Seth Alves	7f609dca26	Merge branch 'cameraMode' of github.com:SamGondelman/hifi into actions-over-wire	2015-06-27 10:49:12 -07:00
Seth Alves	567d98dfab	Merge branch 'cursor_fix' of github.com:jherico/hifi into actions-over-wire	2015-06-27 10:45:34 -07:00
Andrew Meadows	cf74dbe1dc	partial progress toward sim ownership negotiations ... works well for just a few objects but fails for piles committing some debug stuff that will have to be torn out later	2015-06-26 21:57:04 -07:00
Seth Alves	5ecc39b811	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-26 20:06:10 -07:00
Brad Davis	e6fade8c13	Prevent tooltips from appearing with stale data	2015-06-26 18:16:56 -07:00
Brad Davis	3b987c1e73	Fixing always-on link cursor	2015-06-26 18:14:31 -07:00
Sam Gondelman	2f0fcba1eb	key binding fixes as suggested by ctrlaltdavid, start in 3rd person if crashed in independent mode	2015-06-26 17:28:02 -07:00
Niraj Venkat	9101b4ad70	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-06-26 16:28:01 -07:00
Niraj Venkat	fe8d539cf5	changing link icon	2015-06-26 16:27:04 -07:00
Seth Alves	db580d1e0b	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-26 15:45:24 -07:00
Stephen Birarda	ff33922716	handle conflicts on merge with upstream master	2015-06-26 15:33:35 -07:00
Stephen Birarda	5b660e8c91	Merge pull request #5214 from venkatn93/master ... Changing formatting of tooltip	2015-06-26 18:27:59 -04:00
Niraj Venkat	87fce44271	Changing formatting of tooltip	2015-06-26 14:41:38 -07:00
Stephen Birarda	9b84eabd18	Merge branch 'master' of https://github.com/highfidelity/hifi into hyperlink-photo	2015-06-26 14:40:01 -07:00
Seth Alves	bc7271769c	merge from master	2015-06-26 14:29:40 -07:00
Stephen Birarda	7e19a540fd	add the new placeholder image	2015-06-26 14:13:23 -07:00
Stephen Birarda	18e2b62ecc	initial image replacement for hyperlink preview	2015-06-26 14:12:26 -07:00
David Rowe	1898c6bd55	Merge branch 'master' into 20547 ... Conflicts: libraries/networking/src/PacketHeaders.cpp libraries/networking/src/PacketHeaders.h	2015-06-26 13:05:51 -07:00
Seth Alves	798c9492d3	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-26 11:47:21 -07:00
Stephen Birarda	522b715628	remove comment, styling cleanup	2015-06-26 11:41:34 -07:00
Stephen Birarda	c6df573933	fix some OS X warnings, add description to tooltip	2015-06-26 10:50:31 -07:00
Brad Davis	8dcd91fdab	Merge pull request #5192 from venkatn93/master ... Hyperlink tooltip and address bar remodel	2015-06-26 10:28:52 -07:00
Seth Alves	c95db5672a	include argument-packing version in serialized argument data	2015-06-26 10:01:45 -07:00
Niraj Venkat	b1c361b324	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-06-26 09:45:39 -07:00
Seth Alves	f5f1d0829c	Merge branch 'physics-lock-entity-tree' of github.com:sethalves/hifi into actions-over-wire	2015-06-26 07:20:51 -07:00
Seth Alves	a0d77c061c	lock the entity tree during physics operations that access then entity tree. if the simulation and entity-tree are both going to be locked, be sure to lock the entity tree first (and unlock it last), because this is what the network-reading thread does	2015-06-26 07:00:28 -07:00
Brad Hefta-Gaub	63812f28ad	Merge pull request #5206 from SamGondelman/cameraMode ... fix bug that was preventing camera mode switches	2015-06-25 18:55:13 -07:00
Seth Alves	7c26641560	Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire	2015-06-25 17:40:27 -07:00
Niraj Venkat	23f4f7d824	Place name is underlined	2015-06-25 15:56:40 -07:00
Niraj Venkat	8ea01b45ae	Word wrap implementation	2015-06-25 15:46:43 -07:00
Niraj Venkat	6b14a64c8c	Formatting changes and teleport on click	2015-06-25 15:15:44 -07:00
Niraj Venkat	de26dc9c49	Further changes to tooltip	2015-06-25 14:15:06 -07:00
Niraj Venkat	210a1205a7	More layout changes	2015-06-25 14:07:03 -07:00
Sam Gondelman	56944afd39	avatar doesn't move in independent mode, alphabetized menu options	2015-06-25 12:36:36 -07:00
Niraj Venkat	1a6acdc5b7	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-06-25 09:39:13 -07:00