25756 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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
Seth Alves	4fa6f388b9	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-27 18:20:59 -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
Seth Alves	95c5ed66fc	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-27 15:37:33 -07:00
Seth Alves	43dd8b3fb1	Merge pull request #4980 from ericrius1/pointer ... Pointer	2015-05-27 15:37:24 -07:00
Seth Alves	c3c701f807	polyvox no longer has a color	2015-05-27 15:23:01 -07:00
Seth Alves	8cb5717b86	formatting, cleanups	2015-05-27 15:16:15 -07:00
Seth Alves	5cc038e1c6	polyvox no longer has a color	2015-05-27 15:12:26 -07:00
Eric Levin	07c8fb6c02	turned pointer and draw funcitonality off be default	2015-05-27 15:11:16 -07:00
Seth Alves	ded79609de	back out unrelated change	2015-05-27 15:10:27 -07:00
Eric Levin	ca85401b77	added button so user can toggle pointer on/off	2015-05-27 15:08:52 -07:00
Seth Alves	c933c42b18	move polyvox external source to s3	2015-05-27 15:02:20 -07:00
Seth Alves	1109444c3d	attempt to make sure the ray that picks against polyvox entities is long enough	2015-05-27 14:57:12 -07:00
Seth Alves	386b3301f4	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-27 14:46:37 -07:00
Seth Alves	1cdb36f7fb	Merge pull request #4974 from ctrlaltdavid/fix-c4351 ... Fix Windows C4351 build warning	2015-05-27 14:46:03 -07:00
Seth Alves	bfa0e9c234	recreate PR #4973 with some additional changes -- removed const keyword from qinvokables for avatar getter methods such as getVelocity	2015-05-27 14:44:23 -07:00
Seth Alves	968643a38c	Merge pull request #4977 from highfidelity/revert-4973-avatarInvokableFixes ... Revert "removed const keyword from Q_INVOKABLE for avatar getter meth…	2015-05-27 14:21:24 -07:00
Seth Alves	ba0467aafe	Revert "removed const keyword from Q_INVOKABLE for avatar getter methods such…"	2015-05-27 14:10:45 -07:00
Seth Alves	7f99f261c2	Merge branch 'master' of github.com:highfidelity/hifi into polyvox	2015-05-27 13:59:13 -07:00
Seth Alves	75a1d43bce	Merge pull request #4973 from ericrius1/avatarInvokableFixes ... removed const keyword from Q_INVOKABLE for avatar getter methods such…	2015-05-27 13:58:58 -07:00
Seth Alves	29cb5ed126	Merge pull request #4967 from ericrius1/pointer ... modified pointer script to allow users to draw on surfaces	2015-05-27 13:56:17 -07:00
Seth Alves	e016bc42a4	Merge pull request #4968 from ericrius1/blockWorld ... added blockWorld script to generate floor of tiles and drop jenga blo…	2015-05-27 13:56:06 -07:00
Seth Alves	7c4b89d917	get polyvox to build on osx	2015-05-27 11:56:57 -07:00