53897 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Atlante45	24f4107c92	Unload script when replaced with empty URL	2017-04-24 15:56:37 -07:00
Atlante45	d292451f91	Remove unnecessary const	2017-04-24 15:43:36 -07:00
Triplelexx	d689a43678	changes from CR	2017-04-24 22:07:51 +01:00
David Rowe	c0a258f9b3	Disable "load" button while making a recording	2017-04-25 09:04:26 +12:00
Triplelexx	d63c4d11c7	enable grabbable property for all newly created entities	2017-04-24 21:33:08 +01:00
David Rowe	d73fd6e08d	Update AC script URL in info	2017-04-25 07:42:21 +12:00
Seth Alves	aea8b020d2	Merge pull request #10254 from druiz17/tablet-crash ... Potential fix for crash for TabletScriptingInterface::getTabletWindow	2017-04-24 12:35:04 -07:00
David Rowe	d52125e2f5	Merge branch 'master' into 21249	2017-04-25 07:19:56 +12:00
Sam Gateau	b1a3b1f48b	Merge pull request #10227 from samcake/brown ... Introducing support for the ResourceBuffer binding point in the gpu lib, the Batch and the backends	2017-04-22 08:51:54 -07:00
Philip Rosedale	92368d981b	Half Duplex script	2017-04-21 18:22:53 -07:00
Seth Alves	17b83dd64c	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-21 17:19:47 -07:00
sam gateau	733e268391	FIx the SSBO usage on amd, needed a bit more explanation on the glsl side	2017-04-21 16:17:18 -07:00
Andrew Meadows	3f9f16cc98	Merge pull request #10223 from kunalgosar/blendshapesbug ... Make setBlendshape changes persist	2017-04-21 16:11:13 -07:00
David Rowe	7fe0ba19b5	Don't display the "Record" button as pressed while recording	2017-04-22 10:05:02 +12:00
sam gateau	0a615f35a7	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-04-21 14:31:15 -07:00
Dante Ruiz	50ed4a61f7	Merge branch 'master' of github.com:highfidelity/hifi into tablet-crash	2017-04-21 18:26:37 +01:00
Dante Ruiz	8cfa03fa56	tablet cpp ownership	2017-04-21 18:26:26 +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
David Rowe	ce86ce4530	Red buttons to unload recordings	2017-04-21 19:45:14 +12:00
David Rowe	8060e98bd5	Right-align "i" icon and update info text	2017-04-21 17:46:30 +12:00
David Rowe	d064511121	Rearrange dialog controls	2017-04-21 17:01:29 +12:00
David Rowe	1aa6e20791	Change "Record" button to "Stop" while recording	2017-04-21 16:15:49 +12: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
Chris Collins	a20cd34a93	Merge pull request #10247 from jherico/gl45_var_texture_crash_hotfix ... HOTFIX - Fix crash in variable allocation management	2017-04-20 16:37:44 -07: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
David Rowe	076bf0943e	Attach HMD "recording" indicator to camera	2017-04-21 10:33:24 +12:00
Dante Ruiz	cbd2a532a8	remove debug statments	2017-04-20 23:28:41 +01:00
Stephen Birarda	3452dd0251	increment colspan count in table footer	2017-04-20 15:20:48 -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
Stephen Birarda	924624b127	add new glyphs with check, reference in entityList	2017-04-20 14:21:13 -07:00
Stephen Birarda	f64efe18c0	add an isBaked column to edit.js	2017-04-20 14:21:13 -07:00
Dante Ruiz	1ec4081a99	crash fix	2017-04-20 21:38:20 +01:00
Vladyslav Stelmakhovskyi	2665ede06f	Audio injector cleanup	2017-04-20 21:32:14 +02:00
Vladyslav Stelmakhovskyi	b2533b6106	Code nitpick. Pointer cleanup on exit	2017-04-20 21:12:57 +02:00
Zach Pomerantz	b77917b8d1	Merge pull request #10241 from zzmp/fix/display-fail ... Update Display menu on unsuccesful selection	2017-04-20 12:04:51 -04:00
Vladyslav Stelmakhovskyi	06406ef7de	Merge branch 'master' into notify-sound-inject	2017-04-20 17:46:08 +02:00
Vladyslav Stelmakhovskyi	023d03d9f8	Implemented snap sound using sound injector	2017-04-20 17:43:16 +02:00
Seth Alves	f7378abb08	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-20 02:40:10 -07:00
David Rowe	43619d1db1	Finish with TODOs	2017-04-20 14:22:54 +12:00
David Rowe	0da4e3e3c4	Display scrollbar in recordings table when needed	2017-04-20 14:19:25 +12:00
Zach Fox	50456f71ed	Merge pull request #10142 from Triplelexx/21258 ... 21258 - Don't render (or heavily use GPU) when window in minimized	2017-04-19 16:26:49 -07:00
Brad Hefta-Gaub	a555846d5d	Merge pull request #10235 from volansystech/21206 ... 21206 Far grab improvement to draw held entity toward yourself	2017-04-19 14:33:09 -07:00
David Rowe	2108300272	Merge branch 'master' into 21249	2017-04-20 08:43:00 +12:00
Dante Ruiz	b2a11aa9ab	check for null when we dont	2017-04-19 21:30:43 +01:00
samcake	7f72efa714	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-04-19 11:51:25 -07:00
Sam Gateau	788849e19a	Merge pull request #10208 from jherico/gl41_variable ... Adding support for variable allocated textures to the GL 4.1 backend	2017-04-19 11:42:23 -07:00
Brad Davis	4f5624a237	Fix crash in variable allocation management	2017-04-19 11:31:56 -07:00