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

68361 commits

This branch
This branch
All branches
Author SHA1 Message Date
Anthony Thibault
eae5215d94
Merge pull request #13206 from ctrlaltdavid/21872-c 
JSDoc fixes
 2018-05-24 16:44:55 -07:00
Wayne Chen
b86d74b4b7 Merge branch 'master' of https://github.com/highfidelity/hifi 2018-05-24 15:08:23 -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
Cristian Duarte
ab293376fd Android - fix crash when double clicking a domain 2018-05-24 18:00:22 -03: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
Brad Davis
7e16325805 Unit testing cached and uncached shader loading 2018-05-24 12:42:34 -07:00
Bradley Austin Davis
3beb77694f Cached shader binaries and uniform data for shaders 2018-05-24 12:42:33 -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
Stephen Birarda
2c9648daaf grab correct SHA for PR_BUILD, fatally error if not found 2018-05-24 12:04:32 -07:00
Stephen Birarda
2cb7c9cc62 add a BUILD_TYPE to BuildInfo, fix conditional 2018-05-24 12:04:32 -07:00
Stephen Birarda
45b8c1248c disable version checking for nightly builds 2018-05-24 12:03:33 -07:00
Stephen Birarda
7c852916b9 fail master/PR build without short SHA 2018-05-24 12:03:33 -07:00
Stephen Birarda
55bf70991b cleanup wording and formatting for version in window title 2018-05-24 12:03:03 -07:00
Stephen Birarda
c3595a3216 pass STABLE_BUILD instead of BUILD_BRANCH through cmake 2018-05-24 12:03:03 -07:00
Stephen Birarda
50baccdb63 add the short SHA to master and PR build version 2018-05-24 12:02:13 -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
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