34513 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	3746920655	allow action updates from others when we are the simulation owner	2015-11-13 13:56:30 -08:00
Seth Alves	919ea5f1a0	send action updates even if we aren't the simulation owner	2015-11-13 12:37:07 -08:00
Seth Alves	1d0a2ddd3d	grab debugging script	2015-11-13 11:15:57 -08:00
Seth Alves	6ec5b12081	send to network when an action is deleted, also	2015-11-13 09:52:35 -08:00
Seth Alves	3f7f5a2bbd	send to network when an action is deleted, also	2015-11-13 09:49:31 -08:00
Seth Alves	5acbb74362	send to network when an action is deleted, also	2015-11-13 09:45:06 -08:00
Seth Alves	7979fb38cf	don't always send actiondata along with other physics related properties	2015-11-13 09:25:17 -08:00
Seth Alves	dbaea5770a	include action data in properties suppressed by non-simulation ownership	2015-11-12 18:28:26 -08:00
Seth Alves	ed8a604e13	adjust how the decision to send action changes over the wire is made	2015-11-12 17:36:45 -08:00
Seth Alves	756b382a75	adjust how the decision to send action changes over the wire is made	2015-11-12 17:12:20 -08:00
Seth Alves	6f83f32ecc	adjust how the decision to send action changes over the wire is made	2015-11-12 16:27:54 -08:00
Seth Alves	d7be1699a7	adjust how the decision to send action changes over the wire is made	2015-11-12 15:27:10 -08:00
Seth Alves	a78b1619be	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-12 14:20:23 -08:00
Seth Alves	a8cd891e48	adjust how the decision to send action changes over the wire is made	2015-11-12 14:19:23 -08:00
Clément Brisset	9d3235a966	Merge pull request #6378 from ZappoMan/serverStats ... switch various status to use thread safe atomics	2015-11-12 14:01:46 -08:00
Brad Hefta-Gaub	da651ac475	fix mac compiler error	2015-11-12 13:47:27 -08:00
Brad Hefta-Gaub	8bfb368a61	fix mac compiler error	2015-11-12 13:32:43 -08:00
Brad Hefta-Gaub	33110eda30	fix mac compiler error	2015-11-12 13:25:50 -08:00
Brad Hefta-Gaub	14a6e1fb6b	fix mac compiler error	2015-11-12 13:24:25 -08:00
Brad Hefta-Gaub	66a2b38f50	switch various status to use thread safe atomics	2015-11-12 13:09:51 -08:00
samcake	da8270d50b	Merge pull request #6377 from jherico/rec3 ... Cleaning up clip and transform	2015-11-12 11:50:10 -08:00
Brad Davis	ee1545f649	Cleaning up clip and transform	2015-11-12 11:48:47 -08:00
Seth Alves	2e635bd936	cleanups	2015-11-12 11:14:25 -08:00
Seth Alves	a366633f84	cleanups	2015-11-12 11:03:44 -08:00
Seth Alves	93da3ed5bd	if our simulation-bid priority matches the remote one, don't bid.	2015-11-12 11:03:34 -08:00
Seth Alves	3519dd248b	Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug	2015-11-12 09:53:11 -08:00
samcake	319f9fc30e	Merge pull request #6376 from ZappoMan/fixModelCrash ... fix crash in Model::deleteGeometry when _rig is not initialized	2015-11-12 09:37:30 -08:00
James B. Pollack	39f44115be	Merge pull request #6373 from Atlante45/rotationBetween ... Rotation between	2015-11-12 09:25:56 -08:00
Brad Hefta-Gaub	eefe26d96a	fix crash in Model::deleteGeometry when _rig is not initialized	2015-11-12 09:24:49 -08:00
samcake	b9a0d0b843	Merge pull request #6363 from jherico/rec3 ... Recording avatar data refactor	2015-11-12 00:58:46 -08:00
Brad Davis	f521be10fe	Avatar recording work in progress	2015-11-12 00:33:38 -08:00
Seth Alves	83d5c9cf4a	arrange status icons in two rows of 4 each	2015-11-11 18:54:07 -08:00
Seth Alves	315b5e9da2	Merge pull request #6372 from ZappoMan/rightClickMenu ... Tweaks to "click"	2015-11-11 17:27:50 -08:00
Atlante45	118d05d824	Use a clearer function	2015-11-11 17:24:50 -08:00
Clément Brisset	5e972ecaa1	Merge pull request #6374 from ZappoMan/entityEditRoundtripImprovement ... reduce client to server to client entity edit latency	2015-11-11 17:19:06 -08:00
Brad Hefta-Gaub	80e15fb77d	reduce client to server to client entity edit latency	2015-11-11 17:03:21 -08:00
James B. Pollack	1819e20f74	Merge pull request #6367 from ericrius1/marketplace ... Dynamic loading of models from specified directory	2015-11-11 16:54:06 -08:00
Seth Alves	a16a477134	fix warning	2015-11-11 16:51:55 -08:00
Seth Alves	be86748200	oops	2015-11-11 16:38:28 -08:00
Seth Alves	d1a9a32e91	Merge branch 'rework-visual-physics-debug' of github.com:sethalves/hifi into rework-visual-physics-debug	2015-11-11 16:35:13 -08:00
Seth Alves	715a46ee82	show actions in status icons	2015-11-11 16:35:04 -08:00
Brad Hefta-Gaub	a721b13e46	Merge pull request #6364 from imgntn/cleanuptoybox ... Remove Bball and Targets AC Resetter Script from Toybox	2015-11-11 16:23:33 -08:00
Brad Hefta-Gaub	c4ad1d978b	Merge pull request #6344 from imgntn/easystar ... Adapt EasyStar A* Pathfinding Library and Add Example	2015-11-11 16:22:47 -08:00
Seth Alves	cffe4551dd	merge from upstream	2015-11-11 16:15:07 -08:00
Seth Alves	07f3d8eca0	more debugging prints	2015-11-11 16:03:08 -08:00
Atlante45	e4897a8de7	Use new constants	2015-11-11 15:58:27 -08:00
ericrius1	806d303dcd	Added header file	2015-11-11 15:55:32 -08:00
Atlante45	115b63a117	Simplify rotationBetween	2015-11-11 15:54:48 -08:00
Brad Hefta-Gaub	2363ca044e	Merge pull request #6280 from imgntn/colorbuster ... Color Busters Game	2015-11-11 15:52:18 -08:00
ericrius1	56dc9092e0	added s3 server	2015-11-11 15:52:12 -08:00