Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
63325 commits 2 branches 0 tags 1.1 GiB
Commit graph

2141 commits

Author SHA1 Message Date
Sam Gateau
4663f8eb2a
Merge pull request #12136 from SamGondelman/texture 
Keep requesting render update until textures load
 2018-01-11 14:09:21 -08:00
SamGondelman
e9d751fd23 try to avoid reusing uniform buffer locations 2018-01-10 17:01:01 -08:00
SamGondelman
df574c6bc9 keep requesting render update until textures load 2018-01-10 13:19:53 -08:00
Nissim Hadar
9f25b01b10 Merge branch 'master' of https://github.com/highfidelity/hifi into stageRemoval 2018-01-10 09:30:05 -08:00
Sam Gateau
539ee82937
Merge pull request #12033 from Zvork/compactvb 
More compact representation of meshes on GPU
 2018-01-10 09:11:33 -08:00
Sam Gateau
8c80247925
Merge pull request #12123 from SamGondelman/meta 
Model meta render item is only withTypeShape if visual geometry request fails
 2018-01-10 09:09:19 -08:00
Sam Gateau
6d6aad4aa8
Merge pull request #12060 from SamGondelman/burp5 
Reduce EntityItem access in EntityRenderer::needsRenderUpdateFromEntity
 2018-01-10 09:08:54 -08:00
SamGondelman
7c56a9ffb2 model meta is only withTypeShape if visual geometry request fails 2018-01-09 12:43:43 -08:00
Olivier Prat
db9e5fdae8 Merged from master but rendering seems broken 2018-01-09 11:05:34 +01:00
SamGondelman
4f5727e6b0 add _needsRenderUpdate flag 2018-01-08 17:10:44 -08:00
Nissim Hadar
b2b1807490 Changes per code review. 2018-01-08 15:37:06 -08:00
Nissim Hadar
46b494c802 Removed the Stage functionality - it is now implemented as a script. 2018-01-08 14:34:46 -08:00
SamGondelman
7c17603f3e Merge remote-tracking branch 'upstream/master' into burp5 2018-01-08 14:27:31 -08:00
Nissim Hadar
452c16e706 Removed backgroundPropertiesChanged 2018-01-08 12:11:36 -08:00
Nissim Hadar
8206ae6ffb Removed BackgroundMode packet type. 2018-01-07 13:50:42 -08:00
Olivier Prat
b296b96e5e Merged with master 2018-01-06 10:01:00 +01:00
Nissim Hadar
9e5eba4d3a Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance 2018-01-05 23:11:40 -08:00
Brad Hefta-Gaub
7a3835eb33
Merge pull request #11945 from jherico/android_nov 
Updating android toolchain for QML
 2018-01-05 13:34:03 -08:00
Sam Gondelman
5cf25a20c9
use correct model ptr 2018-01-04 21:21:58 -08:00
Nissim Hadar
adbc4d0c39 Removed background mode from code (still in the protocol). 2018-01-04 18:23:25 -08:00
SamGondelman
6a19b0e0b6 update render items on texture load 2018-01-04 13:10:46 -08:00
Nissim Hadar
8bd2985f1f Simplified code. 2018-01-04 13:06:28 -08:00
Nissim Hadar
5b7ef9a3d3 Minor cleanup. 2018-01-04 09:13:58 -08:00
Nissim Hadar
dad3a0d340 Fixed skybox inheritance. 2018-01-02 09:08:05 -08:00
Nissim Hadar
0764e80996 Corrected behaviour of skybox modes. 2017-12-30 18:19:42 -08:00
nissim.hadar
b56c7535d2 Added legacy functionality (for zones that used Background "skybox") 2017-12-30 12:25:58 -08:00
Nissim Hadar
7260b4ff7b Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 
# Conflicts:
#	libraries/entities/src/EntityPropertyFlags.h
 2017-12-29 15:16:14 -08:00
Nissim Hadar
87e896ab20 Zone inheritance ready for testing. 2017-12-29 15:13:46 -08:00
Seth Alves
4bbce011a4
Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3 
avatar-entities which are children of an avatar will scale with the avatar
 2017-12-29 09:12:17 -08:00
Nissim Hadar
85a81d6b5b WIP - skybox inheritance 2017-12-28 18:23:49 -08:00
Nissim Hadar
64644fc980 WIP - skybox inheritance 2017-12-28 14:31:59 -08:00
Nissim Hadar
03cf7710d0 Ambient light inheritance 2017-12-28 09:34:55 -08:00
Nissim Hadar
7f5897e90b Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2017-12-26 11:35:59 -08:00
Nissim Hadar
4ffd896ced WIP - adding AmbientLightPropertyGroup 2017-12-26 11:15:33 -08:00
Nissim Hadar
0b73e7db3f WIP - adding AmbientLightPropertyGroup 2017-12-26 09:15:13 -08:00
Brad Hefta-Gaub
3d02955c5d
Merge pull request #12029 from SamGondelman/webOverlay 
Fix >20 web entities crash
 2017-12-24 17:10:39 -08:00
Nissim Hadar
affc5d1b86 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 2017-12-24 15:27:32 -08:00
Nissim Hadar
3f82e9147b Change keylight/ambient mode default from "enabled" to "inherit" 2017-12-22 16:30:19 -08:00
John Conklin II
0dd5bbc2d6
Merge pull request #12057 from birarda/61-1-merge-back 
Merge stable back into master after RC61.1
 2017-12-22 16:26:08 -08:00
Stephen Birarda
e3cbfd92a0 Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back 2017-12-22 15:48:04 -08:00
Nissim Hadar
8ee5f642a9 Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance 
# Conflicts:
#	libraries/networking/src/udt/PacketHeaders.cpp
#	libraries/networking/src/udt/PacketHeaders.h
 2017-12-22 15:41:59 -08:00
Seth Alves
96197e66bb Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-22 15:13:02 -08:00
Sam Gateau
db4f9909c7
Merge pull request #12017 from Zvork/glcolor 
Removed glColor reset hack in MeshPartPayload
 2017-12-22 14:25:51 -08:00
Sam Gateau
a2c16ddf6a
Merge pull request #12026 from SamGondelman/burp3 
Remove _model from ModelMeshPartPayload
 2017-12-22 13:50:06 -08:00
SamGondelman
5018edcfe0 reduce calls to getVisible 2017-12-22 12:59:06 -08:00
Nissim Hadar
e102b8c087 Fixed Ubuntu warning. 2017-12-22 08:35:09 -08:00
Nissim Hadar
502cac2ac7 Keylight inherit/off/on working 2017-12-22 08:05:12 -08:00
Seth Alves
897b96d092 Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3 2017-12-22 07:36:26 -08:00
Olivier Prat
29485b65e5 Fixed potential crash when getting mesh from voxel item 2017-12-22 14:35:19 +01:00
Nissim Hadar
e974cac177 Keylight inheritance mode works. 2017-12-21 19:19:55 -08:00