36306 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James B. Pollack	387c30d83f	close button	2015-12-18 15:04:13 -08:00
James B. Pollack	f84a441c7d	close button	2015-12-17 18:33:17 -08:00
James B. Pollack	7a542a678b	prep for close button	2015-12-17 17:17:04 -08:00
James B. Pollack	a25feb5578	switching branches	2015-12-17 16:58:38 -08:00
James B. Pollack	8e2128c692	update light volume when you move light parent	2015-12-17 11:59:21 -08:00
James B. Pollack	5cc5a2ab33	working non kinematic release	2015-12-17 10:58:14 -08:00
James B. Pollack	cd911b31d2	dont accidentally constrain all objects	2015-12-17 10:26:54 -08:00
James B. Pollack	ba1f4506c2	Merge branch 'master' into light_mod	2015-12-17 10:11:03 -08:00
Clément Brisset	40272faa3f	Merge pull request #6679 from hyperlogic/tony/particle-system-invalidated-iterator-fix ... ParticleEffectEntityItem: fix for invalid iterator increment	2015-12-17 09:43:39 -08:00
Brad Hefta-Gaub	0db0ef89d7	Merge pull request #6674 from murillodigital/master ... Unifying Windows PR and Release installer pipeline	2015-12-16 20:42:13 -08:00
Brad Hefta-Gaub	275b35ef60	Merge pull request #6670 from Atlante45/ac-race ... Fix entity server race	2015-12-16 20:21:56 -08:00
Brad Davis	343d31b38f	Merge pull request #6677 from AlessandroSigna/overlays ... Fix to remove a VS warning	2015-12-16 20:12:27 -08:00
Anthony J. Thibault	2eecb61da5	Prefer erase over repeated pop_front calls	2015-12-16 19:08:31 -08:00
Anthony J. Thibault	1b08563079	ParticleEffectEntityItem: fix for invalid iterator increment ... Was causing an assert in debug, due to calling ++ on an invalid iterator. In release this might lead to memory corruption.	2015-12-16 16:56:49 -08:00
Atlante45	2c8be15e66	Unnecessary shutdown (Already shutting down)	2015-12-16 15:56:22 -08:00
AlessandroSigna	364a70bb46	Fix to avoid MVS warning	2015-12-16 15:41:27 -08:00
James B. Pollack	f55994b993	cleanup	2015-12-16 15:07:31 -08:00
James B. Pollack	f1ec28e169	visualize volumes	2015-12-16 14:55:01 -08:00
Leonardo Murillo	bbe444ffc1	Forgot to add file	2015-12-16 16:40:51 -06:00
Leonardo Murillo	a7b61cf791	Couple of fixes	2015-12-16 16:39:09 -06:00
James B. Pollack	40a096ca8d	kinematic grab things	2015-12-16 14:34:01 -08:00
Atlante45	b709c8162c	Fix node flapping race	2015-12-16 14:27:26 -08:00
Atlante45	6bda8d3f18	CR logging category	2015-12-16 14:27:26 -08:00
Atlante45	b55d8f750f	CR	2015-12-16 14:27:26 -08:00
Atlante45	0f7093bed7	Whitespace	2015-12-16 14:27:26 -08:00
Atlante45	df24fafe49	CR feedback	2015-12-16 14:27:26 -08:00
Atlante45	a655557af0	Make variable name more obvious	2015-12-16 14:27:26 -08:00
Atlante45	b4dc3b1b47	Fix windows compile error.	2015-12-16 14:27:26 -08:00
Atlante45	a541fdd2df	Move OctreeSendThread to the OctreeServer	2015-12-16 14:27:26 -08:00
Atlante45	51ec7ae2ed	Keep UUID of node in send thread	2015-12-16 14:27:26 -08:00
Atlante45	3cd1eea1dc	Use weak pointer to the Node instead of strong ownership	2015-12-16 14:27:26 -08:00
Atlante45	95da71b19c	Assignment don't inherit from NodeData ... This is an artefact from an old design that stuck around	2015-12-16 14:27:26 -08:00
Atlante45	562d9ac2de	Forward QThread's finished signal in GenericThread	2015-12-16 14:27:26 -08:00
Atlante45	346c28f9e2	Remove OctreeServer's static instance	2015-12-16 14:27:26 -08:00
Atlante45	09701fdcf1	deadlock 101	2015-12-16 14:27:26 -08:00
Atlante45	b65cdd2865	Add logging categories to assignment client.	2015-12-16 14:27:26 -08:00
Atlante45	bd7fa266cf	Bit of cleanup	2015-12-16 14:27:26 -08:00
James B. Pollack	e0b8c6b48b	show light volumes	2015-12-16 14:24:31 -08:00
Leonardo Murillo	66770cc907	Finishing touches	2015-12-16 16:11:35 -06:00
James B. Pollack	40e6e4b133	add readme	2015-12-16 14:01:50 -08:00
James B. Pollack	e37d68449b	rename folder	2015-12-16 13:57:40 -08:00
Leonardo Murillo	cbed8bf35a	NSIS Changes	2015-12-16 15:12:14 -06:00
Leonardo Murillo	5ed422e3a1	Removing unwanted changes	2015-12-16 14:28:49 -06:00
Leonardo Murillo	56ef52022d	Removing unwanted changes	2015-12-16 14:28:05 -06:00
Leonardo Murillo	711d02ba2f	Consolidating installer checkpoint	2015-12-16 14:26:24 -06:00
James B. Pollack	6cd86e8a6b	midday	2015-12-16 12:23:10 -08:00
James B. Pollack	b0bcbb03f2	remove floor and move sliders up a bit	2015-12-16 11:57:54 -08:00
Anthony Thibault	0c1ae5bb61	Merge pull request #6657 from AndrewMeadows/avatar-capsule-2 ... Correct collision capsule for scaled avatars	2015-12-16 11:36:08 -08:00
Ryan Huffman	a422103e89	Merge pull request #6662 from AlessandroSigna/overlays ... Exposing emmisive property of the Image3DOverlay	2015-12-16 10:29:34 -08:00
AlessandroSigna	08f7591787	Fix misspelling	2015-12-16 10:02:47 -08:00