Commit graph

68139 commits

Author SHA1 Message Date
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
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
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
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
howard-stearns
2f1ce2a2fc Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-22 12:35:21 -07:00
David Rowe
6a75e7acb6 Fix canCastShadow property JSDoc 2018-05-23 07:11:23 +12:00
Liv Erickson
7efcc135e4 reorder flags 2018-05-22 11:03:41 -07:00
Dante Ruiz
c4f39841f5 fix another menu name changes that broke snapshot 2018-05-22 10:46:20 -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
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
Liv Erickson
e76829bb1d change to DEFINE_PROPERTY_REF 2018-05-21 16:51:23 -07:00
Liv Erickson
604b3cac1c check for null entities in grab, add conversion for old userdata cloneable 2018-05-21 16:19:43 -07:00
samcake
2dc28a504c Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-21 15:52:42 -07:00
Sam Gateau
87989268bf
Merge pull request #13182 from jherico/feature/batch_pooling
Use pooled gpu batches
2018-05-21 15:47:55 -07:00
Sam Gateau
a1c948c0f0
Merge pull request #13127 from SimonWalton-HiFi/half-baked-model
Incorrectly baked model crashes Interface
2018-05-21 15:30:42 -07:00
SamGondelman
45289dea09 on mac, render unsupported bptc textures (skyboxes) as uncompressed 2018-05-21 14:27:18 -07:00
Dante Ruiz
5fb08d0d9c fix speech api not showing up 2018-05-21 14:21:21 -07:00
Brad Davis
9c26b2c1d3 Use pooled gpu batches 2018-05-21 13:53:44 -07:00
David Rowe
fa54461788 Update some recent JSDoc additions 2018-05-22 08:52:39 +12:00
Alexander Ivash
d659696b60 FB13789 - Log in/Sign up dialog is missing "Forgot Username?" and "Forgot Password?" links 2018-05-21 13:29:41 -07:00
Simon Walton
c205a856a7 Split canned FBX header in two; only check first part on read 2018-05-21 13:29:08 -07:00
John Conklin II
61eccabb56
Merge pull request #13208 from jherico/fix/texture_warnings
Fixing populated / allocated tracking for textures
2018-05-21 13:27:56 -07:00
Sam Gondelman
6e7282bbb8
Merge pull request #13183 from Cristo86/android_search_mobile_domains
Filter domains by tag 'mobile' in Search (Android)
2018-05-21 13:16:46 -07:00
Brad Davis
6daffba18e Fixing populated / allocated tracking for textures 2018-05-21 11:51:05 -07:00
John Conklin II
168edb1cde
Merge pull request #13192 from druiz17/fix-spaming-set-host
fix case sensitive comparison in AddressManager::setHost
2018-05-21 11:16:18 -07:00
howard-stearns
fc6bfe9e44 Merge branch 'master' of github.com:highfidelity/hifi into infinite-scroll 2018-05-21 10:41:45 -07:00
samcake
03271d6818 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-21 10:38:44 -07:00
Dante Ruiz
249d22b4b4 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-21 10:31:24 -07:00
Sam Gateau
3d4964559d
Merge pull request #13202 from jherico/fix/texture_warnings
Fix logspam from texture transfer code
2018-05-21 10:20:40 -07:00