Commit graph

68330 commits

Author SHA1 Message Date
Wayne Chen
3d0e0da42f re-adding removed toggleSpaceMode function 2018-05-24 11:08:26 -07:00
John Conklin II
373660acbc
Merge pull request #13034 from AndrewMeadows/upgrade-to-glm-0.9.8.5
upgrade to glm-0.9.8.5
2018-05-24 11:04:06 -07:00
Ryan Huffman
3554334dfc Update serverless tutorial for RC68 2018-05-24 10:27:00 -07:00
Sam Gateau
b8b337dbe4 There and back again... 2018-05-24 01:18:36 -07:00
Sam Gateau
13d02011f3 There and back again... 2018-05-24 00:53:29 -07:00
Sam Gateau
f66e13b2ec Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-23 21:43:36 -07:00
Robin K Wilson
05a8119008
Updated Build Guide language. 2018-05-23 17:50:34 -07:00
samcake
c66b592b3a MOVe the feedINput functions at the right spot 2018-05-23 17:04:00 -07:00
SamGondelman
e6741a363e add local-only isVisibleInSecondaryCamera flag to entities 2018-05-23 16:35:21 -07:00
samcake
7ed39f4052 Adjusting the syntax to have linux compiling maybe 2018-05-23 16:16:57 -07:00
samcake
e4048c8f23 remove extra comments 2018-05-23 15:12:21 -07:00
samcake
cf58f31f3e Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine' 2018-05-23 15:08:48 -07:00
Andrew Meadows
30b2eb0740 update android glm dependency to 0.9.8.5 2018-05-23 14:52:28 -07:00
Andrew Meadows
d95371ae79 HACK: bypass android's baseUrl inflexibility 2018-05-23 14:52:28 -07:00
Andrew Meadows
1c0f6818a3 apply orenh1's patch to make GLM-0.9.8.5 compile on updated linux 2018-05-23 14:52:28 -07:00
Andrew Meadows
aedb5cc746 upgrade to glm-0.9.8.5 2018-05-23 14:52:28 -07:00
Dante Ruiz
c2ceb48a28 fixing key conflicts 2018-05-23 14:16:05 -07:00
Stephen Birarda
d1ace7914e make domain server reliably broadcast all node disconnects 2018-05-23 12:56:12 -07:00
John Conklin II
3e665fb616
Merge pull request #13179 from dback2/cloneables
Server-Managed Cloneables + Cloneable Properties
2018-05-23 12:40:27 -07:00
samcake
55945b5454 Remove deprecated and commented code 2018-05-23 12:36:20 -07:00
SamGondelman
940b112f62 fix image and text overlay drifting 2018-05-23 11:58:50 -07:00
samcake
b06356b0fd Remove deprecated and commented code 2018-05-23 11:58:25 -07:00
samcake
5bede45c85 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-23 11:26:07 -07:00
Wayne Chen
345138f4ff Changing showHidden property to be always true 2018-05-23 10:30:08 -07:00
NissimHadar
163b72a4ec Merge branch 'master' of github.com:highfidelity/hifi into newAvatar 2018-05-23 08:09:42 -07:00
NissimHadar
e07e716d40 Fixed stupid gcc warning. 2018-05-23 07:35:25 -07:00
David Rowe
ebeee51581 Update image links 2018-05-23 17:20:24 +12:00
samcake
184d50b018 Well 2018-05-22 17:55:26 -07:00
samcake
4985207b45 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-22 17:40:54 -07:00
NissimHadar
06203d44d8 Correct Camera.mode command. 2018-05-22 17:08:28 -07:00
NissimHadar
f8b69ef1f1 Changed stored failure images from JPG to PNG
Now uses snapshot name to find correct test folder - allows creating multiple tests
Reversed order of recursive scripts, so execution will be in alphabetical order.
2018-05-22 16:34:32 -07:00
Liv Erickson
56493346c1 fix permissions check 2018-05-22 15:41:48 -07:00
Stephen Birarda
8f6600facf remove ICE peers once nodes connect or are killed 2018-05-22 14:21:49 -07:00
Stephen Birarda
666bdb03b7 never re-use node ID during domain connection 2018-05-22 13:47:31 -07:00
John Conklin II
52a05680e7
Merge pull request #12895 from vladest/menu-updates
Menu Cleanup and Reorganization
2018-05-22 13:21:08 -07:00
Liv Erickson
0ebd13b3e6 cannot edit origin from client / fix ICE issue 2018-05-22 13:17:23 -07:00
SamGondelman
9dfc61a452 possible fix for gl crash 2018-05-22 12:51:32 -07:00
David Rowe
6a75e7acb6 Fix canCastShadow property JSDoc 2018-05-23 07:11:23 +12:00
samcake
7d0d515ff4 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-22 11:22:19 -07:00
Liv Erickson
7efcc135e4 reorder flags 2018-05-22 11:03:41 -07:00
Wayne Chen
e3414c320e changing property to alias to reflect folderListModel 2018-05-22 11:03:31 -07:00
Dante Ruiz
c4f39841f5 fix another menu name changes that broke snapshot 2018-05-22 10:46:20 -07:00
Wayne Chen
1774b401c8 allowing file dialogs to show hidden files/folders via showHidden property 2018-05-22 10:24:04 -07:00
Simon Walton
f702374db3 Just have one const for concurrent downloads 2018-05-22 10:16:44 -07:00
Sam Gateau
937955dd45
Merge pull request #13191 from jherico/feature/unit_testing
More unit testing work
2018-05-22 10:00:24 -07:00
Liv Erickson
e273a0c1a6 fix define properties 2018-05-22 09:10:50 -07:00
Dante Ruiz
9df79462ad fix snapshot 2018-05-22 09:06:10 -07:00
samcake
072d0f262c FIxing the problem of shadows not repecting the cull group 2018-05-21 18:07:04 -07:00
Liv Erickson
27c2bb9046 add properties group where missing 2018-05-21 17:39:08 -07:00
Liv Erickson
a1e7f648bc add debug properties 2018-05-21 17:14:36 -07:00