25956 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Eric Levin	8886e93d5f	changed qVector to qVectorVec3	2015-05-28 11:26:41 -07:00
Stephen Birarda	81c23e9ca0	output if pinged node cannot be reached	2015-05-28 11:22:27 -07:00
Seth Alves	06ffcbf24d	Merge pull request #4981 from ericrius1/blockWorld ... tiles and block no longer delete on script end, now user can delete a…	2015-05-28 11:09:14 -07:00
Stephen Birarda	cee058c4ce	handle immediate add packets in NodeList	2015-05-28 11:02:45 -07:00
Seth Alves	92817d9302	created-time is a property so it can be persisted to and retrieved from json saves	2015-05-28 10:59:27 -07:00
Stephen Birarda	5c75863af4	immediately send add packet from DS for new node	2015-05-28 10:45:03 -07:00
Eric Levin	72af4e4e67	latest pointer	2015-05-28 10:44:44 -07:00
Seth Alves	d32ae19ac7	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-28 10:44:05 -07:00
Andrew Meadows	2a4cd468e4	Merge pull request #4979 from sethalves/polyvox ... initial pass at Polyvox Entity Type	2015-05-28 10:43:50 -07:00
Seth Alves	065f19d527	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-28 10:31:44 -07:00
Seth Alves	ab86b1d90a	code review	2015-05-28 10:29:23 -07:00
Seth Alves	7547ef6ea4	code review	2015-05-28 10:29:07 -07:00
Seth Alves	e46c24ea58	code review	2015-05-28 10:27:59 -07:00
Howard Stearns	63bae07dde	Merge pull request #4987 from ericrius1/pointer ... remove whiteboard by default in pointer.js	2015-05-28 10:20:10 -07:00
Eric Levin	03062fccd3	remove whiteboard by default in pointer.js	2015-05-28 10:17:47 -07:00
Andrew Meadows	799a74baab	Merge pull request #4985 from jherico/hydra_hmd_fix ... Fix mouse emulation picking and pointer positioning for the hydra	2015-05-28 08:16:44 -07:00
Seth Alves	a91a7942a4	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-28 06:59:39 -07:00
Seth Alves	aefd34f8d6	trying again to get polyvox to build on osx	2015-05-28 06:43:31 -07:00
Seth Alves	24bb17f7b2	trying again to get polyvox to build on osx	2015-05-28 06:36:31 -07:00
Brad Davis	e5bc0fad1e	Merge branch 'master' into plugins_pt3	2015-05-27 23:45:31 -07:00
Brad Davis	e5bec42512	Fix mouse emulation picking and pointer positioning for the hydra	2015-05-27 23:36:00 -07:00
Seth Alves	b024bd0ff2	trying again to get polyvox to build on osx	2015-05-27 22:00:20 -07:00
Seth Alves	6a1ea820e7	trying again to get polyvox to build on osx	2015-05-27 21:50:35 -07:00
Seth Alves	1026da18b2	trying again to get polyvox to build on osx	2015-05-27 21:32:20 -07:00
Andrew Meadows	4e073c77b3	Merge pull request #4978 from sethalves/fix-4973 ... recreate PR #4973 with some additional changes -- removed const keywo…	2015-05-27 21:11:28 -07:00
Seth Alves	5b62714ba4	trying again to get polyvox to build on osx	2015-05-27 21:09:48 -07:00
Andrew Meadows	c32ff497e8	Merge pull request #4982 from howard-stearns/unowned-object-sounds ... Unowned object sounds	2015-05-27 21:07:49 -07:00
Seth Alves	5e79b03faf	trying to get polyvox to build on osx	2015-05-27 20:55:16 -07:00
Seth Alves	f4b7a41006	trying to get polyvox to build on osx	2015-05-27 20:46:50 -07:00
Seth Alves	6711c64cc6	trying to get polyvox to build on osx	2015-05-27 20:20:37 -07:00
Seth Alves	00296faa51	trying to get polyvox to build on osx	2015-05-27 20:00:37 -07:00
Seth Alves	aff82a90ce	try, try again	2015-05-27 19:16:50 -07:00
Seth Alves	4961c10e17	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-27 19:05:01 -07:00
Seth Alves	f403698e36	Merge branch 'polyvox' of github.com:sethalves/hifi into polyvox	2015-05-27 19:04:54 -07:00
Seth Alves	6151a7cf1a	Merge pull request #4983 from AndrewMeadows/bispinor ... fix for glitchy grabs and failure to take simulation ownership	2015-05-27 18:50:03 -07:00
Seth Alves	05cd7fb8c4	update polyvox external source	2015-05-27 18:39:13 -07:00
Seth Alves	4b564e2eee	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-27 18:38:44 -07:00
Stephen Birarda	667df66963	add packet type for DS node add	2015-05-27 18:25:38 -07:00
Stephen Birarda	0cb67cce2c	add ping timer tied to NetworkPeer	2015-05-27 18:22:23 -07:00
Seth Alves	4fa6f388b9	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-27 18:20:59 -07:00
Howard Stearns	bbc04f3b03	Merge branch 'master' of https://github.com/highfidelity/hifi into unowned-object-sounds	2015-05-27 18:08:37 -07:00
Andrew Meadows	0a0eba8277	merge	2015-05-27 18:07:00 -07:00
Andrew Meadows	aba539928d	fix grab glitches and failure to own simulation	2015-05-27 18:05:59 -07:00
Brad Hefta-Gaub	0553f7ca4c	Merge pull request #4961 from hyperlogic/ajt/particle-net-anim-fix ... Particle entities should avoid resetting simulation when setMaxParticles is called	2015-05-27 17:44:44 -07:00
Howard Stearns	05013a19f5	Merge branch 'master' of https://github.com/highfidelity/hifi into unowned-object-sounds	2015-05-27 16:28:29 -07:00
Howard Stearns	4fffe05b63	Play still sound for still objects and those just created in a script.	2015-05-27 16:25:11 -07:00
Seth Alves	25df777132	fix polyfox url	2015-05-27 16:15:58 -07:00
Brad Hefta-Gaub	5da3a9440e	Merge pull request #4964 from howard-stearns/remove-global-collision-and-update-examples ... [REQUIRES #4962] Remove global collision and update examples	2015-05-27 16:09:14 -07:00
Stephen Birarda	757d02a600	fix reset on address lookup	2015-05-27 16:00:56 -07:00
Stephen Birarda	e6e2c4b95d	look for connection steps in LimitedNodeList	2015-05-27 15:54:39 -07:00