Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 03:17:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68129 commits 76 branches 59 tags 1.2 GiB
Commit graph

68129 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sam Gateau
2f94c43968 Removing the getLayer from the meshPArtPayload and check that it s working 2018-05-28 23:20:04 -07:00
Sam Gateau
678effdb48 Cleaning up the Model set ItemKey flags and bringing Item::Layer in the ItemKey 2018-05-26 23:28:59 -07:00
samcake
221b513b19 Oh boy 2018-05-25 16:33:34 -07:00
samcake
051776ab1d Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-25 10:30:45 -07:00
John Conklin II
286d09939d
Merge pull request #13205 from luiscuenca/GLTFfix1 
Minor fix allows import glTF from Substance Painter
 2018-05-25 08:28:29 -07:00
John Conklin II
0d8fb90fa8
Merge pull request #13222 from SamGondelman/mirror 
Fix image and text overlay drifting
 2018-05-25 08:26:33 -07:00
Sam Gateau
aa49595a23 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-24 18:19:55 -07:00
Andrew Meadows
cc2d8bebef
Merge pull request #13228 from highfidelity/robin-k-wilson-patch-1 
Updated Build Guide language
 2018-05-24 17:13:45 -07:00
Stephen Birarda
c03b9833fd
Merge pull request #13233 from highfidelity/RC68 
Merge RC68 back to master
 2018-05-24 16:55:44 -07:00
Anthony Thibault
eae5215d94
Merge pull request #13206 from ctrlaltdavid/21872-c 
JSDoc fixes
 2018-05-24 16:44:55 -07:00
John Conklin II
caee987d96
Merge pull request #13210 from SamGondelman/macSkybox 
Mac: render unsupported BPTC textures as uncompressed
 2018-05-24 14:52:11 -07:00
NissimHadar
d81ae26c7e
Merge pull request #13232 from NissimHadar/newAvatar 
Updates to AutoTester
 2018-05-24 14:49:50 -07:00
John Conklin II
cacc102fd0
Merge pull request #13218 from huffman/feat/rc68-tutorial 
Update serverless tutorial for RC68
 2018-05-24 14:44:18 -07:00
samcake
44a8d880fa Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-24 14:31:53 -07:00
John Conklin II
c89c70fbaa
Merge pull request #13216 from birarda/bug/domain-ice-peer-id 
never re-use node ID during domain connection
 2018-05-24 14:09:39 -07:00
David Rowe
bc757ddd41 Fix typo 2018-05-25 09:04:06 +12:00
John Conklin II
36d2baab60
Merge pull request #13214 from SamGondelman/primCrash 
Fix crash in GL45Backend::do_drawIndexedInstanced
 2018-05-24 13:33:06 -07:00
NissimHadar
3dbebe2347 Merge branch 'master' of github.com:highfidelity/hifi into newAvatar 2018-05-24 13:30:57 -07:00
John Conklin II
04bf8f851f
Merge pull request #13219 from samcake/one 
Bringing Evolution to the Job Engine Task library developed in the workload project to master
 2018-05-24 13:30:16 -07:00
NissimHadar
802cedf1bc Removed messages in non-interactive mode. 2018-05-24 13:29:02 -07:00
Sam Gateau
1614758dbb
Merge pull request #13109 from AndrewMeadows/upgrade-bullet-2.88 
upgrade from Bullet-2.83 to Bullet-2.88
 2018-05-24 12:11:20 -07:00
Andrew Meadows
288efb1f93 remove cuft 2018-05-24 11:30:12 -07:00
Andrew Meadows
885c7bc97d bump protocol for extra byte in collisionMask 2018-05-24 11:28:52 -07:00
Andrew Meadows
d42375e4fe finish uint8_t to uint16_t conversion 2018-05-24 11:28:52 -07:00
Andrew Meadows
14f776cfb7 upgrade android bullet dependency to 2.88 2018-05-24 11:28:52 -07:00
Andrew Meadows
7e03b8b33c one more try to eliminate windows compile warnings 2018-05-24 11:28:52 -07:00
Andrew Meadows
da7dc487cc remove windows build warnings in Bullet lib 2018-05-24 11:28:52 -07:00
Andrew Meadows
31dd59d212 double bits in collision groups 2018-05-24 11:28:52 -07:00
Andrew Meadows
1112609ae7 upgrade to Bullet-2.88 2018-05-24 11:28:52 -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
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
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
NissimHadar
163b72a4ec Merge branch 'master' of github.com:highfidelity/hifi into newAvatar 2018-05-23 08:09:42 -07:00