35966 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
ericrius1	efa2f44c90	Merge remote-tracking branch 'highfidelity/master'	2015-11-30 18:16:39 -08:00
Atlante45	ac85ed9787	Merge branch 'baseball' of github.com:Atlante45/hifi into baseball-test	2015-11-30 18:15:59 -08:00
ericrius1	90595949f1	moved exterminator game out of dry lake	2015-11-30 18:14:57 -08:00
Atlante45	8d9eeb3897	Have separate left/right hold action offset	2015-11-30 18:04:34 -08:00
Atlante45	3bbd20a7bd	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball-test	2015-11-30 18:02:34 -08:00
ericrius1	8992f6bb44	moved pistol to toybox	2015-11-30 17:57:01 -08:00
James B. Pollack	ea831238e6	Merge pull request #6504 from imgntn/bubblemaster ... Update master reset scripts for Toybox to have parity with bubble wand	2015-11-30 17:36:40 -08:00
Brad Davis	a94b6667b1	Moving most of GLCanvas to gl library	2015-11-30 17:19:42 -08:00
Atlante45	6903cd4d8f	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-11-30 17:19:39 -08:00
Stephen Birarda	52dc2cf746	change the assets file to json	2015-11-30 17:17:06 -08:00
Atlante45	52fb711656	Move baseballCrowd to correct directory	2015-11-30 17:06:09 -08:00
Stephen Birarda	cba09beff4	add pop sounds (which don't require attribution)	2015-11-30 17:02:30 -08:00
James B. Pollack	8b7cfde02a	Merge pull request #6505 from imgntn/boww ... Fix release hand message for bow	2015-11-30 17:02:08 -08:00
James B. Pollack	7c12379ada	fix release hand message	2015-11-30 17:00:40 -08:00
Seth Alves	b7ebe5b92b	merge from upstream	2015-11-30 16:59:52 -08:00
Stephen Birarda	c451ede051	add crowd noises to assets yaml	2015-11-30 16:59:13 -08:00
Seth Alves	3402585d1a	fix a crash from previous commit	2015-11-30 16:54:29 -08:00
Stephen Birarda	4a80e72d14	complete attribution for removed files	2015-11-30 16:48:05 -08:00
Stephen Birarda	f7537e3dc3	add initial version of asset description	2015-11-30 16:44:14 -08:00
Howard Stearns	6f50d91208	Merge pull request #6461 from hyperlogic/tony/remove-joint-states ... Refactor of Rig and MyAvatar animation JavaScript interface	2015-11-30 16:28:15 -08:00
Seth Alves	9b54924524	edit.js can now manipulate children without flipping the table	2015-11-30 16:21:14 -08:00
Ryan Huffman	6fe370c4ef	Remove old comment in firework.js	2015-11-30 16:02:00 -08:00
Ryan Huffman	0ed249f0e7	Update script path include in firework.js	2015-11-30 16:01:53 -08:00
Stephen Birarda	1b1efe53d9	fix for two space indentation in createBatButton.js	2015-11-30 15:59:12 -08:00
Stephen Birarda	c3f3639374	more spacing adjustments in ScriptEngine.cpp	2015-11-30 15:57:10 -08:00
Stephen Birarda	733665d722	fix spacing in baseballCrowd.js	2015-11-30 15:53:42 -08:00
Stephen Birarda	b1a69bb2cf	cleanup spacing in ScriptEngine	2015-11-30 15:52:10 -08:00
Stephen Birarda	2acfbd0f8f	revert accidental CCD change	2015-11-30 15:52:03 -08:00
Anthony J. Thibault	31cecdc174	Menu: removed Enable Avatar Threading option. ... To re-enable, you can set ENABLE_AVATAR_UPDATE_THREADING to true on line 2552 of Application.cpp. Also, removed other unused strings.	2015-11-30 15:45:23 -08:00
Clément Brisset	e168966b87	Merge pull request #6409 from birarda/injector-hybrid ... more efficient threading of networked AudioInjector objects	2015-11-30 15:36:41 -08:00
Atlante45	4aaa9ca02f	Make OctreeElementBag safer to use	2015-11-30 15:23:49 -08:00
Anthony J. Thibault	f922f61c3d	AvatarUpdate: fix for very large dt ... This was affecting threaded avatar update when enabled.	2015-11-30 15:21:04 -08:00
ericrius1	706a67b9a1	lowered restitution to 0 to avoid too many collision sounds playing	2015-11-30 15:10:32 -08:00
Stephen Birarda	361b4b80e6	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-30 14:57:44 -08:00
Seth Alves	02c4730388	Merge branch 'master' of github.com:highfidelity/hifi into parents	2015-11-30 14:09:31 -08:00
Seth Alves	aa383455f5	oops	2015-11-30 14:09:19 -08:00
Anthony J. Thibault	e2d9e37eb8	Fix for head offset for models with no eyes ... This was causing in correct body poses while wearing an HMD.	2015-11-30 14:08:21 -08:00
Seth Alves	5c327edd5a	keep AvatarHashMap::findAvatar from creating bogus avatar entries. remove some more stray consts	2015-11-30 14:08:07 -08:00
Stephen Birarda	a33e57dfdb	remove audio files from history	2015-11-30 14:06:09 -08:00
Seth Alves	89b78986d5	remove some more stray const	2015-11-30 14:01:17 -08:00
Stephen Birarda	3baf39ba2a	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-11-30 14:01:09 -08:00
Stephen Birarda	f07314f4ef	resolve conflicts on merge with huffman/baseball	2015-11-30 13:34:36 -08:00
Stephen Birarda	4573e5c59e	resolve conflicts on merge with upstream/master	2015-11-30 13:32:38 -08:00
Seth Alves	941dfe5bd2	initialize _parentJointIndex	2015-11-30 13:30:47 -08:00
James B. Pollack	9b90c19781	cleanup	2015-11-30 13:24:33 -08:00
Seth Alves	4b87e09848	clean up some unneeded consts. get edit.js closer to working on parented entities	2015-11-30 13:23:55 -08:00
Anthony Thibault	7af6dd9390	Merge pull request #6501 from hyperlogic/tony/cmake-fixes ... cmake: Fix quazip configure on linux/mac	2015-11-30 13:19:55 -08:00
James B. Pollack	171ae02b03	update to parity with createWand.js	2015-11-30 13:12:39 -08:00
Ryan Huffman	5849befb3d	Add caching back to AssetRequest	2015-11-30 11:53:53 -08:00
Ryan Huffman	304b105dac	Add proper message failure handling to Connection	2015-11-30 11:53:08 -08:00