Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-17 08:56:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
76247 commits 69 branches 56 tags 1.2 GiB
Commit graph

31383 commits

Author SHA1 Message Date
sabrina-shanman
86c948f116 Convert hfmModel and materialMapping fields in model-baker Baker to getters 2019-03-06 15:33:31 -08:00
sabrina-shanman
2af17015d3 Convert serializers and FBX.h to use HifiTypes.h 2019-03-06 15:19:01 -08:00
sabrina-shanman
8ff212ac95 Move custom draco mesh attributes from FBX.h to HFM.h 2019-03-06 15:18:58 -08:00
sabrina-shanman
aef696efe6 Add passthrough config to PrepareJointsTask 2019-03-06 15:18:26 -08:00
sabrina-shanman
9c9dc553a2 Fix binding to temporary when trying to safely get empty model-baker task data 2019-03-06 15:18:25 -08:00
sabrina-shanman
4ae0c79130 Harden model-baker Engine against random tasks being disabled 2019-03-06 15:18:22 -08:00
sabrina-shanman
e4d6d5af89 Streamline ModelBaker initialization and URLs 2019-03-06 15:18:19 -08:00
John Conklin II
87556059d3
Merge pull request #13901 from Cristo86/android_handshake 
case 20058: Android - Handshake implementation
 2019-02-20 13:33:52 -08:00
Brad Davis
79369a0c83 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-20 10:40:49 -08:00
Shannon Romano
0b7bdb185e
Merge pull request #14949 from SamGondelman/wearables 
Case 21300, Case 21301: Group cull all entity descendants of avatars
 2019-02-20 10:29:40 -08:00
Brad Davis
817c24dd0b Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-20 09:51:03 -08:00
SamGondelman
c8ffb130a3 only update sub items on change 2019-02-19 17:38:47 -08:00
Shannon Romano
07d084d086
Merge pull request #14937 from SamGondelman/pal 
Case 21259: Pal textures don't change
 2019-02-19 17:14:15 -08:00
SamGondelman
6765268998 Merge remote-tracking branch 'upstream/master' into wearables 2019-02-19 16:52:00 -08:00
amer cerkic
bf69e6d672 fixing compile errors 2019-02-19 16:03:02 -08:00
SamGondelman
44e70db4cd WE DID IT FOLKS 2019-02-19 15:02:36 -08:00
Dante Ruiz
6189aff6b3
Merge pull request #14933 from danteruiz/pick-manager-perf 
Case 21271: Remove unnessary picks for quest
 2019-02-19 14:20:56 -08:00
Brad Davis
d60dcb99d2 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-19 12:37:30 -08:00
John Conklin II
051ab61b66
Merge pull request #14951 from SamGondelman/ssao 
Case 20993: Fix AO
 2019-02-19 11:19:03 -08:00
John Conklin II
d7a5c0bb4f
Merge pull request #14947 from SamGondelman/overlayClick 
Case 21291, Case 21292, Case 21293: Working on overlay bugs
 2019-02-19 11:01:19 -08:00
John Conklin II
1348baecc7
Merge pull request #14935 from SamGondelman/matEntity 
Case 20920: Move Material Entity logic to render thread
 2019-02-19 10:59:51 -08:00
danteruiz
4bbae1230d making requested chantges 2019-02-19 10:07:36 -08:00
SamGondelman
27f05db825 fix ao 2019-02-18 01:12:00 -08:00
SamGondelman
06ac2b291b attachments and wearables cull with avatar parent 2019-02-17 17:52:10 -08:00
SamGondelman
935d827421 try to cull wearables with avatars 2019-02-17 02:10:25 -08:00
SamGondelman
1163cbea70 improving web surface interaction and tablet hiding 2019-02-16 22:03:55 -08:00
SamGondelman
71653f95d7 working on overlay bugs 2019-02-16 20:08:36 -08:00
Sam Gondelman
c8ab7ac37f
fix bad copy 2019-02-16 18:08:05 -08:00
SamGondelman
d50904dd4a fix avatar deadlock 2019-02-15 17:08:24 -08:00
SamGondelman
3e3bd2ffd8 fix transform properties not changing 2019-02-15 16:57:29 -08:00
SamGondelman
6bf1545285 fix build error 2019-02-15 16:44:28 -08:00
Brad Davis
bfda7d73c1 Fix frame player 2019-02-15 16:39:36 -08:00
danteruiz
b00746c096 Trim picks in use during quest: 2019-02-15 16:24:17 -08:00
sabrina-shanman
bb123cfe3b Fix GLTF materials 2019-02-15 14:51:29 -08:00
SamGondelman
3df231f1e0 it's working! 2019-02-15 14:43:22 -08:00
Brad Davis
51884155ee Support Android app-specific extensions in shaders 2019-02-15 14:16:58 -08:00
Brad Davis
78be935e1a Consolidating differences from master 2019-02-15 14:12:37 -08:00
Andrew Meadows
7872da6b97
Merge pull request #14915 from samcake/brown 
Case 21190: Introducing msaa to forward renderer
 2019-02-15 13:48:33 -08:00
SamGondelman
c92b82e744 merge with master 2019-02-15 12:43:30 -08:00
SamGondelman
87ab255115 finish moving materials to rendering 2019-02-15 11:49:20 -08:00
Sam Gateau
6edf7e7907
Merge pull request #14931 from jherico/fix/vive_crash 
Case 21230: Fix crash in vive and interleaved stereo plugins
 2019-02-15 11:41:03 -08:00
Brad Davis
a5f84ab51a Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-15 11:37:13 -08:00
John Conklin II
5f0db88a20
Merge pull request #14914 from raveenajain/gltf_tangents 
Case 21165: tangent attribute
 2019-02-15 11:24:21 -08:00
Sam Gondelman
9aa99f24f0
Merge pull request #14905 from SamGondelman/materialMapping 
Case 20242: FST materialMapping supports our material JSON format
 2019-02-15 11:21:51 -08:00
SamGondelman
25b31cfc72 merge with master 2019-02-15 11:08:24 -08:00
Brad Davis
5483971855 Fix crash in vive and interleaved stereo plugins 2019-02-15 10:46:08 -08:00
Brad Davis
0b171ffe13 Merge remote-tracking branch 'upstream/master' into feature/quest 2019-02-15 10:31:04 -08:00
Anthony Thibault
702f1c8e74
Merge pull request #14925 from hyperlogic/bug-fix/revert-anim-pose-optimization 
Revert anim pose optimization
 2019-02-15 09:42:27 -08:00
Sam Gateau
13b5390243 Merge branch 'master' of https://github.com/highfidelity/hifi into brown 2019-02-14 21:01:44 -08:00
Shannon Romano
f267043953
Merge pull request #14838 from SamGondelman/billboardMode 
Case 20962: Billboard mode improvements
 2019-02-14 17:44:48 -08:00