54785 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Cain Kilgore	eddb7a349c	Boilerplate	2017-07-03 20:01:01 +01:00
Cain Kilgore	1c5923914b	Combining three if statements into one!	2017-07-03 19:58:26 +01:00
Cain Kilgore	bfcddcf3b7	Cleaned up the code, created a function to check if the hands are in the right position.	2017-07-03 19:53:29 +01:00
Cain Kilgore	5f600b4ea9	Cleanup again	2017-07-03 19:31:41 +01:00
Cain Kilgore	44624c5fab	space	2017-07-03 19:11:57 +01:00
Cain Kilgore	2c53b5b372	QA Cleanup	2017-07-03 19:09:54 +01:00
Cain Kilgore	7d382d9da0	Fixed spelling, added is in HMD Check, removed Haptic Feedback as it wasn't part of the WL	2017-07-03 17:47:54 +01:00
Cain Kilgore	44f0b8bd60	Support for Oculus & Vive - cleaned up some code, using Script.connect instead of setInterval	2017-07-02 11:41:33 +01:00
Cain Kilgore	a693a61ec8	Cleanup	2017-07-02 03:20:54 +01:00
Cain Kilgore	e0120ebf30	Rocket Hands	2017-07-02 03:20:07 +01:00
Cain Kilgore	a3db9ae726	Begin Rocket Hands branch	2017-06-30 15:40:42 +01:00
Cain Kilgore	02b3a07e67	Removed old smoke	2017-06-20 20:55:07 +01:00
Cain Kilgore	d4665da065	Fixed new smoke effect not spawning correctly.	2017-06-20 20:53:04 +01:00
Cain Kilgore	6652399534	Replaced texture & sound effect.	2017-06-20 20:33:50 +01:00
Cain Kilgore	394560c979	Added sound effect (temp) when you hit a ball, plus added a check to ensure the game doesn't hang waiting for balls out of the arena.	2017-06-18 07:27:49 +01:00
Cain Kilgore	135beb2d48	Small amounts of cleanup - added Smoke effect when Ball is Hit by Arrow	2017-06-18 02:03:29 +01:00
Cain Kilgore	26446b6b33	Debugging info - check what the arrow hit	2017-06-17 00:51:34 +01:00
Cain Kilgore	80b50927d3	Added smoke image & references	2017-06-17 00:33:16 +01:00
Cain Kilgore	2e56b0d639	Test C ommit	2017-06-17 00:29:25 +01:00
Seth Alves	b14b0ef403	Merge pull request #10449 from sethalves/fix-overlay-rayintersection-crash ... lock in Overlays::findRayIntersectionInternal	2017-05-11 19:13:43 -07:00
Anthony Thibault	c40e3d6ac9	Merge pull request #10272 from Triplelexx/21292 ... 21292 - Implement a script to hand-raise while in desktop mode	2017-05-11 17:38:27 -07:00
Seth Alves	e1c805e76f	lock in Overlays::findRayIntersectionInternal	2017-05-11 17:02:00 -07:00
Zach Fox	9289cd2022	Merge pull request #10398 from zfox23/PAL_FixIDPacketOrder ... Fix the PAL not showing user info for user who opened PAL	2017-05-11 15:16:05 -07:00
druiz17	e4df4369ad	Merge pull request #10436 from druiz17/config-ui ... Added the ability to choose puck configuration from the general settings	2017-05-11 13:39:05 -07:00
Seth Alves	9d63113e62	Merge pull request #10337 from vladest/audio-source-sync ... Audio source sync	2017-05-11 12:50:38 -07:00
Vladyslav Stelmakhovskyi	045e93fb95	Code style fixes #2	2017-05-11 21:49:07 +02:00
Zach Fox	15574f509e	Clarifying comments	2017-05-11 11:45:07 -07:00
Vladyslav Stelmakhovskyi	bd6ac7a39e	Code style fixes	2017-05-11 20:38:09 +02:00
Andrew Meadows	0852852f39	Merge pull request #10443 from ctrlaltdavid/21326-2 ... Fix avatar recording playback mouth not moving	2017-05-11 10:41:41 -07:00
David Kelly	0ea5bf7834	Merge pull request #10440 from davidkelly/dk/fixSettingsDialog ... Fix for multiple settings dialogs	2017-05-11 08:11:16 -07:00
Vladyslav Stelmakhovskyi	4290eb21ea	Fixed possible crashes/freezes on input audio switch	2017-05-11 15:41:07 +02:00
Vladyslav Stelmakhovskyi	f963233a7b	Merge branch 'master' into audio-source-sync	2017-05-11 15:25:24 +02:00
Vladyslav Stelmakhovskyi	e4d9772bbc	Fixed crashes/freezes on audio switch	2017-05-11 15:20:36 +02:00
Thijs Wenker	0a3a2705af	Merge pull request #10426 from huffman/fix/tablet-invisible-by-default ... Fix tablet showing up for a short period of time on launch	2017-05-11 15:03:52 +02:00
David Rowe	e426d70437	Improve variable name	2017-05-11 18:37:23 +12:00
David Rowe	98b943269b	Sum of blendshapes is used sent through avatar mixer	2017-05-11 18:17:35 +12:00
David Rowe	21f9594f81	Sum of blendshapes is used for recording	2017-05-11 18:17:12 +12:00
David Rowe	1b855f2c6b	Voice modulation and facetrackers write to transient blendshapes	2017-05-11 18:15:38 +12:00
Philip Rosedale	f9567d0330	Merge pull request #10182 from CraftsmanMG/master ... hifi: #21216 - Resize entities with hand controllers while editing	2017-05-10 22:03:35 -07:00
David Rowe	3b06b03e01	Rename blendshapes variables in preparation for repurposing	2017-05-11 16:46:36 +12:00
Philip Rosedale	5fe18bc217	Merge pull request #10435 from AndrewMeadows/truncate-mouth-time ... avoid floating point error when generating fake mouth shapes	2017-05-10 21:17:21 -07:00
Philip Rosedale	5f4625dbed	Merge pull request #10232 from amvmoody/master ... audience applause meter	2017-05-10 21:10:05 -07:00
David Kelly	4cc0aaf102	Fix for multiple settings dialogs	2017-05-10 18:31:57 -07:00
anshuman64	1be404ef87	Merge pull request #10438 from druiz17/input-recorder-fix ... fix issue when loading recording file into the input recorder	2017-05-10 17:34:46 -07:00
Dante Ruiz	7687617e91	made requested changes	2017-05-11 00:32:42 +01:00
Dante Ruiz	0cae299192	fix issue when loading file to the input recorder	2017-05-11 00:20:21 +01:00
Zach Fox	ae983658be	Finally, the actual fix?	2017-05-10 15:59:19 -07:00
Dante Ruiz	0f0bf79367	Merge branch 'master' of github.com:highfidelity/hifi into config-ui	2017-05-10 22:12:26 +01:00
Dante Ruiz	4365907462	drop down puck configuration for gernal settings	2017-05-10 22:12:11 +01:00
Howard Stearns	3c652a52d8	Merge pull request #10431 from davidkelly/dk/messageLoggedInStatus ... minor handshake script update	2017-05-10 13:54:21 -07:00