20027 commits

Author	SHA1	Message	Date
anshuman64	d146431e9b	Merge pull request #10268 from druiz17/input-recorder ... Input recorder/ input playback system for all input actions	2017-04-26 16:20:20 -07:00
anshuman64	c088bd6891	Merge pull request #10271 from humbletim/21281 ... CR Job #21281 -- Doppleganger Mirror	2017-04-26 16:18:14 -07:00
Zach Fox	9ace7a7488	Merge pull request #10279 from andrewd440/21174 ... 21174 Make the Particle Emitter Easier to Use	2017-04-26 15:35:29 -07:00
Andrew Lowry	d3a9114676	Uses spaces instead of tabs for Edit.qml and EditTabView.qml.	2017-04-26 18:29:38 -04:00
humbletim	f8bbd9174c	Merge remote-tracking branch 'upstream/master' into 21281	2017-04-26 18:26:15 -04:00
anshuman64	5bd9b2e631	Merge pull request #10130 from ctrlaltdavid/21249 ... New avatar record and playback script	2017-04-26 15:18:30 -07:00
Chris Collins	c28a5b2342	Merge pull request #10293 from zzmp/fix/tablet-typo ... fix tablet resolve typo	2017-04-26 15:02:23 -07:00
Dante Ruiz	95d6a451c6	fixed work mapping	2017-04-26 22:14:53 +01:00
Ryan Huffman	8ba56a96df	Merge pull request #10240 from zzmp/fix/hmd-tutorial ... Condition tutorial on active HMD	2017-04-26 14:00:02 -07:00
Zach Pomerantz	532284f779	fix tablet resolve typo	2017-04-26 16:28:42 -04:00
Dante Ruiz	4df953d510	fixed text issue	2017-04-26 19:14:14 +01:00
Dante Ruiz	d8e6e8e7d0	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-26 16:53:02 +01:00
Dante Ruiz	79d827c6be	added requested features	2017-04-26 16:52:51 +01:00
Seth Alves	c7ab4994ea	Merge pull request #10282 from druiz17/tablet-webview-keyboard ... Added tabletwebview keyboard for HMD	2017-04-25 19:30:49 -07:00
David Rowe	1b635d8c5e	Replace FIXMEs with proper code	2017-04-26 13:29:51 +12:00
David Rowe	4a5f84f4b9	Merge branch 'master' into 21249 ... # Conflicts: # libraries/audio-client/src/AudioClient.cpp	2017-04-26 13:24:18 +12:00
Atlante45	33f58f99d1	CR	2017-04-25 16:09:31 -07:00
Dante Ruiz	5a9cf554e7	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-25 23:57:48 +01:00
Atlante45	62b7855e1f	Add pending to stats	2017-04-25 15:56:23 -07:00
Atlante45	ad16a935e9	Texture::create returns shared pointer	2017-04-25 15:56:23 -07:00
Atlante45	a450f52427	Start to setup image library	2017-04-25 15:56:22 -07:00
Dante Ruiz	851eece0e4	removed comments	2017-04-25 23:26:16 +01:00
Dante Ruiz	b78bae37be	added keyboard for tabletWebview	2017-04-25 23:22:27 +01:00
David Rowe	7c2e1aa846	Tidy FIXME	2017-04-26 10:16:35 +12:00
Brad Hefta-Gaub	1962a49f3b	Merge pull request #10225 from sethalves/bullet-constraints-1 ... Bullet constraints + far-grab bootstrap fix	2017-04-25 13:36:47 -07:00
Zach Pomerantz	d2bfcce3f7	Merge pull request #10242 from zzmp/fix/display-log ... Send changed_display_mode after it changes	2017-04-25 16:36:12 -04:00
humbletim	760113f9c9	add doppleganger example/placeholder icons	2017-04-25 16:29:34 -04:00
Brad Hefta-Gaub	0783433d75	Merge pull request #10251 from birarda/edit-baked-column ... add a column to edit.js to identity baked models	2017-04-25 13:04:48 -07:00
Dante Ruiz	8c020a0ec2	saving work	2017-04-25 18:01:19 +01:00
David Rowe	d682924b00	Temporary fix for recording audio	2017-04-25 21:08:10 +12:00
humbletim	3641ca3816	add support for jointRotations/jointTranslations to ModelOverlay	2017-04-24 19:24:54 -04:00
humbletim	28b3eef7aa	add getJointTranslations() methods	2017-04-24 19:22:02 -04:00
Dante Ruiz	367a6ac03c	first prototype	2017-04-24 22:09:01 +01:00
David Rowe	d52125e2f5	Merge branch 'master' into 21249	2017-04-25 07:19:56 +12:00
Dante Ruiz	f69691afd5	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-24 19:57:48 +01:00
Dante Ruiz	d057dfebf0	got input recording to work	2017-04-24 19:57:38 +01:00
Andrew Lowry	6a218eaca9	Embeds colpick color picker in dat.GUI for particle explorer. ... Cleans up eslint for particleExplorer.js.	2017-04-24 13:35:37 -04:00
Andrew Lowry	aea89824c5	Switches tablet edit tab to particle explorer when particle entities are ... selected or created.	2017-04-24 13:35:37 -04:00
Seth Alves	17b83dd64c	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-21 17:19:47 -07:00
Andrew Meadows	3f9f16cc98	Merge pull request #10223 from kunalgosar/blendshapesbug ... Make setBlendshape changes persist	2017-04-21 16:11:13 -07:00
Dante Ruiz	64fcfd33a4	working on loading files	2017-04-21 22:38:53 +01:00
Dante Ruiz	cc34cb96e4	making ui for input recorder	2017-04-21 18:15:47 +01:00
Brad Davis	a62a44ff6a	Merge pull request #10252 from jherico/organize_resources ... Organize the files in the JS and QML projects to appear in a folder hierarchy	2017-04-21 09:38:59 -07:00
Ken Cooke	a5ed3007b3	Merge pull request #10248 from vladest/notify-sound-inject ... Notify sound inject	2017-04-21 09:26:36 -07:00
Dante Ruiz	641a7390ba	Merge branch 'master' of github.com:highfidelity/hifi into input-recorder	2017-04-21 16:46:55 +01:00
David Rowe	477237cca2	Red "recording" ring animation with countdown numbers inside	2017-04-21 16:07:50 +12:00
David Rowe	aaf9b40bb3	New app icon	2017-04-21 15:20:08 +12:00
David Rowe	daedb94b04	Merge branch 'master' into 21249	2017-04-21 14:50:28 +12:00
Sam Gateau	a668ed0409	Merge pull request #10244 from samcake/ambient ... Cleaning the Engine/Task/Job interface	2017-04-20 15:48:21 -07:00
Brad Davis	a8de6eab8c	Organize the files in the JS and QML projects to appear in a folder hierarchy	2017-04-20 14:39:06 -07:00