Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 05:31:29 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
68127 commits 75 branches 59 tags 1.2 GiB
Commit graph

28140 commits

Author SHA1 Message Date
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
Sam Gateau
aa49595a23 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-24 18:19:55 -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
samcake
44a8d880fa Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-24 14:31:53 -07: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
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
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
31dd59d212 double bits in collision groups 2018-05-24 11:28:52 -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
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
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
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
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
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
Liv Erickson
56493346c1 fix permissions check 2018-05-22 15:41:48 -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
Liv Erickson
7efcc135e4 reorder flags 2018-05-22 11:03:41 -07:00
Liv Erickson
e273a0c1a6 fix define properties 2018-05-22 09:10:50 -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
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
f536f7b6c9 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-21 15:52:51 -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
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
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
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
samcake
b4807becb6 Merge branch 'master' of https://github.com/highfidelity/hifi into punk 2018-05-21 10:41:25 -07:00
samcake
03271d6818 Merge branch 'master' of https://github.com/highfidelity/hifi into one 2018-05-21 10:38:44 -07:00