32223 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James Pollack	cbd55ddba6	Add the hoop	2015-09-29 13:24:49 -07:00
James Pollack	676c02c77e	file updates	2015-09-29 10:19:39 -07:00
James B. Pollack	4c86b1ce03	ballin	2015-09-28 18:47:32 -07:00
James Pollack	afa179b9c4	hoop	2015-09-28 15:08:48 -07:00
James Pollack	ade78fda9e	balls	2015-09-28 12:24:21 -07:00
James Pollack	8f25e54027	Hoop, ball, ground	2015-09-25 18:34:34 -07:00
James Pollack	9626bed8ca	Merge remote-tracking branch 'upstream/master'	2015-09-25 12:24:39 -07:00
Eric Levin	135e2683a6	Merge pull request #5902 from ctrlaltdavid/particles-fixes ... Particles fixes	2015-09-25 10:56:18 -07:00
Andrew Meadows	4f0bd08b62	Merge pull request #5900 from ZappoMan/batchOptimizations ... more work on batch optimzation	2015-09-25 09:00:38 -07:00
Andrew Meadows	7822d58164	Merge pull request #5870 from howard-stearns/apostrophe ... Apostrophe key resets animation state.	2015-09-25 08:50:19 -07:00
James B. Pollack	857a7f8a83	Merge remote-tracking branch 'upstream/master'	2015-09-24 22:19:02 -07:00
David Rowe	d233d3f81b	Fix particle emitter corner cases	2015-09-24 19:17:02 -07:00
David Rowe	629128c17f	Fix particle emit directions for point emitter	2015-09-24 19:16:28 -07:00
David Rowe	d063f3488d	Back out fromSpherical code addition	2015-09-24 19:14:26 -07:00
Brad Hefta-Gaub	85b2322acc	more work on batch optimzation	2015-09-24 17:11:14 -07:00
James B. Pollack	b2bbaf4e7b	Merge pull request #5899 from ericrius1/grabAPI ... Fixed a one line bug	2015-09-24 16:52:43 -07:00
Eric Levin	6ea07f1e41	Merge pull request #6 from imgntn/ericrius1-grabAPI ... re add allTouchedIDs object	2015-09-24 16:39:13 -07:00
James Pollack	fd43956502	re add allTouchedIDs object	2015-09-24 16:35:59 -07:00
Brad Hefta-Gaub	8a8da58dfd	Merge pull request #5898 from kencooke/audio-src ... Completely remove SOXR from cmake	2015-09-24 15:59:23 -07:00
Brad Hefta-Gaub	c75284ccde	Merge pull request #5891 from imgntn/doll_updates_1 ... [Scripts] Doll Updates	2015-09-24 15:58:57 -07:00
Brad Hefta-Gaub	8fef47a488	Merge pull request #5873 from ericrius1/grabAPI ... [Scripts] handControllerGrab.js now handles touches. Also handles grabs on non-colliding objects	2015-09-24 15:58:14 -07:00
Brad Hefta-Gaub	be4fda3493	Merge pull request #5882 from imgntn/flashlight_updates_2 ... [Scripts] Flashlight Updates	2015-09-24 15:56:22 -07:00
Eric Levin	a453b7f7cd	Merge pull request #5 from imgntn/ericrius1-grabAPI ... fix weird multi line thing	2015-09-24 15:36:26 -07:00
Howard Stearns	266c69fc70	Disable the old-school Rig::inverseKinematics during reset.	2015-09-24 15:33:52 -07:00
James Pollack	bc6a0c08f9	Fix merge conflict	2015-09-24 15:29:44 -07:00
James Pollack	8dacd736df	fix weird multi line thing	2015-09-24 15:27:26 -07:00
James Pollack	49d3b7e93b	fix indentation	2015-09-24 15:26:19 -07:00
Ken Cooke	629ee7b0c1	Completely remove SOXR from cmake	2015-09-24 15:12:10 -07:00
Eric Levin	a2dce17683	Merge pull request #3 from imgntn/ericrius1-grabAPI ... put distant grab inside of conditional	2015-09-24 15:10:49 -07:00
James Pollack	9eb3b56e5d	Remove space before and after function calls, add spaces btw functions	2015-09-24 15:03:02 -07:00
James Pollack	83a8636a36	Remove whitespace, batch entity edits	2015-09-24 14:49:28 -07:00
Howard Stearns	426ccabba7	Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe	2015-09-24 14:19:58 -07:00
Howard Stearns	bdbd9ab69e	Merge pull request #5895 from AndrewMeadows/ik-repairs-005 ... allow head translation when using hand IK in 3rd person screenie mode	2015-09-24 14:12:05 -07:00
James Pollack	c1f8cbd1a3	Remove space before function calls, add spaces before functions	2015-09-24 14:07:15 -07:00
James Pollack	b44d090be6	Merge remote-tracking branch 'upstream/master'	2015-09-24 13:34:51 -07:00
Andrew Meadows	59da684eb9	make IKTarget::setType() a one-liner	2015-09-24 13:15:03 -07:00
Brad Hefta-Gaub	19d30bb08b	Merge pull request #5890 from ctrlaltdavid/20691 ... Orient particles to face camera but not roll with it	2015-09-24 12:49:13 -07:00
Andrew Meadows	17e3e9394f	allow head translation for 3rd person screenie IK	2015-09-24 12:38:46 -07:00
Clément Brisset	cb1f5d4e8a	Merge pull request #5894 from ZappoMan/fixWarning ... More warnings fixes	2015-09-24 18:35:50 +02:00
Brad Hefta-Gaub	2eaeb26b2a	fix GetVersionEx warning	2015-09-24 09:14:51 -07:00
Brad Hefta-Gaub	776acf2182	ignore gverb warnings	2015-09-24 09:07:43 -07:00
Andrew Meadows	bac2a24c01	Merge pull request #5893 from ZappoMan/fixWarning ... more warning fixes	2015-09-24 09:01:58 -07:00
Brad Hefta-Gaub	5e82b9c433	more warning fixes	2015-09-24 08:26:56 -07:00
Brad Hefta-Gaub	ba73acf3b4	Merge pull request #5843 from ctrlaltdavid/20681 ... Replace point and vector particle emitter with spheroid emitter	2015-09-24 08:19:49 -07:00
David Rowe	3d44fdfdf5	Fix warnings	2015-09-23 21:18:23 -07:00
Brad Hefta-Gaub	c6ac54b031	Merge pull request #5884 from sethalves/fix-obj-models ... get obj models to be visible again. textures don't work	2015-09-23 20:43:25 -07:00
Brad Hefta-Gaub	d14820d3ef	Merge pull request #5880 from thoys/20668 ... Worklist job #20668 - JS: Add option to listen audio from camera	2015-09-23 20:40:32 -07:00
Brad Hefta-Gaub	4a4b9e1cd4	Merge pull request #5887 from thoys/patch-5 ... [Scripts] createFlashlight.js - Close script after running	2015-09-23 20:17:47 -07:00
samcake	46e9c463fc	Merge pull request #5885 from ZappoMan/batchOptimizations ... Batch optimizations	2015-09-23 19:30:51 -07:00
Brad Hefta-Gaub	5a80c4d0e7	Merge pull request #5886 from samcake/calvin ... Expose multi Draw Indirect in Batch (Hijack Austin's work...)	2015-09-23 19:13:28 -07:00