35402 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Atlante45	db0083ab83	Merge branch 'baseball' of github.com:birarda/hifi into baseball	2015-12-01 10:25:07 -08:00
Stephen Birarda	05862eff00	add fire sounds to assets JSON	2015-12-01 10:22:42 -08:00
Atlante45	d0e1ec3a86	Fix merge error	2015-11-30 18:26:04 -08:00
Atlante45	083205916f	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-30 18:25:53 -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
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
Stephen Birarda	c451ede051	add crowd noises to assets yaml	2015-11-30 16:59:13 -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
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
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
Stephen Birarda	361b4b80e6	Merge branch 'master' of https://github.com/highfidelity/hifi into baseball	2015-11-30 14:57:44 -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
Stephen Birarda	a33e57dfdb	remove audio files from history	2015-11-30 14:06:09 -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
James B. Pollack	9b90c19781	cleanup	2015-11-30 13:24:33 -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
Anthony J. Thibault	11bfed4185	Merge branch 'master' into tony/remove-joint-states	2015-11-30 11:21:44 -08:00
James B. Pollack	85b8266537	Merge pull request #6494 from ctrlaltdavid/20744 ... Fix menu shortcuts created in JavaScript not working	2015-11-30 11:20:10 -08:00
Anthony J. Thibault	79b06c3c8a	cmake: Fix quazip configure on linux/mac if QT_CMAKE_PREFIX_PATH is undefined.	2015-11-30 11:14:35 -08:00
Eric Levin	d27e6d70c1	Merge pull request #6171 from imgntn/bow ... Add Bow & Arrow	2015-11-30 11:12:57 -08:00
Stephen Birarda	c76704dc17	Merge pull request #6484 from zzmp/patch-3 ... Update BUILD_OSX for CMake env vars.	2015-11-30 10:20:30 -08:00
Seth Alves	0043bef29a	Merge pull request #6499 from AndrewMeadows/fewer-warnings ... Remove warning about unused AudioConstants::AUDIO_FRAME_NAME	2015-11-30 10:17:48 -08:00
Andrew Meadows	49a6f63663	remove whitespace and fix warning (unused var)	2015-11-30 10:00:05 -08:00
Andrew Meadows	b74c229d02	Merge pull request #6495 from ctrlaltdavid/fix-webwindowclass-crash ... Fix crash in WebWindowClass in debug build setTitle on open WebWindow	2015-11-30 09:25:12 -08:00
David Rowe	ce100dbbc5	Fix crash in WebWindowClass in debug build setTitle on open WebWindow	2015-11-30 15:10:51 +13:00
James Pollack	44f69a2a18	Merge branch 'master' into bow	2015-11-29 11:37:25 -08:00
David Rowe	866037ec7c	Fix menu shortcut keys set by JavaScript not working	2015-11-30 08:33:38 +13:00
David Rowe	d6b13ef42c	Fix crash when try to remove invalid menu item in JavaScript	2015-11-30 08:33:38 +13:00
Seth Alves	ddf5539a49	Merge pull request #6492 from imgntn/grabupdates ... Isolate handControllerGrab.js changes from bow branch	2015-11-29 06:21:44 -08:00
James Pollack	0625d4f4c2	remove debugging string	2015-11-28 23:40:58 -08:00
James Pollack	55f797838f	remove unused key	2015-11-28 23:22:00 -08:00
James Pollack	1e2398cbea	use constants	2015-11-28 23:04:52 -08:00