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
64208 commits 2 branches 0 tags 1.1 GiB
Commit graph

64208 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Conklin II
1220ad6b50
Merge pull request #12281 from zfox23/400ConnectionsPerPage 
400 connections per page for Wallet and PAL
 2018-01-29 12:49:05 -08:00
Liv Erickson
f8f76d6757 changing back to avatar only and making some changes to avoid multiple calls to dependency manager 2018-01-29 12:46:00 -08:00
Seth Alves
98e0e663e7 Merge branch 'master' of github.com:highfidelity/hifi into cauterize-head-av-entities-1 2018-01-29 12:36:37 -08:00
Seth Alves
8d57979db5
Merge pull request #15 from samcake/seth-branch 
Seth branch
 2018-01-29 12:35:42 -08:00
Seth Alves
ae4aa41da4
Merge pull request #14 from Atlante45/interface-backtrace 
Don't run settings preroutine when not initialized
 2018-01-29 12:34:21 -08:00
John Conklin II
e01bbcf10b
Merge pull request #12264 from sethalves/warn-for-head-position-nan 
print warnings if head position contains not-a-number
 2018-01-29 12:25:23 -08:00
samcake
1fd4c5c1a4 Integrating the tag flags to the render item key and adding configration of the render pipelien with the Tag information 2018-01-29 12:20:51 -08:00
Atlante45
061f9ea359 Don't run settings preroutine when not initialized 2018-01-29 12:09:16 -08:00
Zach Fox
00555250a0 400 connections per page for Wallet and PAL 2018-01-29 12:07:07 -08:00
MiladNazeri
9baf02b7a1
Merge pull request #12036 from humbletim/Leopoly_Phase1_003_Asset-Request 
Leopoly_Phase1_003_Asset-Request
 2018-01-29 11:40:41 -08:00
Liv Erickson
6a971e1362 remove restriction to be avatar only 2018-01-29 11:27:30 -08:00
Dante Ruiz
a637bac2fe remove debug statement 2018-01-29 11:26:28 -08:00
Dante Ruiz
a670a0b9a2 Merge branch 'master' of github.com:highfidelity/hifi into entity-attachment-bookmark 2018-01-29 11:25:26 -08:00
Liv Erickson
a10f7932bd Merge branch 'master' of https://github.com/highfidelity/hifi into feat/expose-identity-verification 2018-01-29 11:07:38 -08:00
John Conklin II
92b9290294
Merge pull request #12267 from hyperlogic/bug-fix/rc63-neck-cauterization 
RC63: Bug fix for avatar neck cauterization
 2018-01-29 10:52:10 -08:00
samcake
04efaa0f92 Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch 2018-01-29 10:28:45 -08:00
Dante Ruiz
68fd9eafa8 fix entity parenting crash 2018-01-29 10:23:24 -08:00
Liv Erickson
0e3a01f1e8 it's working! removed my null pointer and just get it from the dependency manager when required 2018-01-29 10:20:16 -08:00
Andrew Meadows
c2817fc091 HMD low LOD threshold changed: 42 --> 34 2018-01-29 10:18:08 -08:00
Andrew Meadows
6acec39e92 HMD low LOD threshold changed: 45 --> 42 2018-01-29 10:05:23 -08:00
John Conklin II
97d9fe0ea7
Merge pull request #12273 from samcake/RC63-fix-lighting 
RC63 hotfix: fixing lighting on scattering skin bug 11802
 2018-01-29 09:26:11 -08:00
Sam Gateau
8e3097d94c
Merge pull request #12275 from jherico/fix/haze_uniform 
Fix haze parameters uniform buffer size
 2018-01-29 08:50:50 -08:00
Olivier Prat
70a7ecc5f0 Fixed merge with remote trnormalmap 2018-01-29 10:50:17 +01:00
Olivier Prat
4cbfef55ef Merged with master. Had to add back shaders and code 2018-01-29 10:33:16 +01:00
David Rowe
d334f1c35c Don't append trailing FBX root nodes to the tail of the tree 2018-01-29 13:45:39 +13:00
Brad Davis
206927d72a Fix haze parameters uniform buffer size 2018-01-27 12:05:29 -08:00
Brad Davis
08df262474 Fix haze parameters uniform buffer size 2018-01-27 11:42:17 -08:00
Thijs Wenker
8fdbac521f move ADD_CUSTOM_QRC_PATH function to its own file 2018-01-27 19:58:15 +01:00
Thijs Wenker
898c99e5b8 append file jsdoc json file to resources.rcc resource file 2018-01-27 19:50:52 +01:00
Sam Gateau
221475d7d9 FIxing the dark ambient lighting on scattering surface 2018-01-27 10:37:32 -08:00
Sam Gateau
3d9985fa67 FIx the scattering ambient lighting diffuse which was too dark (got divided by PI) comparedd to non scattering 2018-01-27 08:48:19 -08:00
Sam Gateau
e08e64b573 Merge branch 'master' of https://github.com/highfidelity/hifi into seth-branch 2018-01-26 19:43:07 -08:00
samcake
8dfa3aace3 cleaning en route 2018-01-26 17:34:37 -08:00
Liv Erickson
20635acf27 moving logic to wallet, crashes currently 2018-01-26 17:13:39 -08:00
Seth Alves
c2b1c4250c
Merge pull request #13 from Atlante45/backtrace-for-rc-63 
Fix settings init in all exe
 2018-01-26 15:57:35 -08:00
Atlante45
314c51ab3b Fix settings init in all exe 2018-01-26 15:53:08 -08:00
humbletim
e2afcac534 include .extraInfo as part of RayPick API constructors 2018-01-26 18:34:13 -05:00
John Conklin II
00773b4b12
Merge pull request #12270 from sethalves/warn-for-head-position-nan-for-rc-63 
Warn for head position nan for rc 63
 2018-01-26 14:16:30 -08:00
Anthony J. Thibault
3be857567b updated Skinning.slh comment and constant. 
(cherry picked from commit 43eaa02ef0)
 2018-01-26 14:02:18 -08:00
Anthony J. Thibault
43eaa02ef0 updated Skinning.slh comment and constant. 2018-01-26 14:01:33 -08:00
Dante Ruiz
be42f0cfb1 finally fix the multihighlighting 2018-01-26 13:24:44 -08:00
Seth Alves
78a5f535c1 Merge branch 'RC63' of github.com:highfidelity/hifi into backtrace-for-rc-63 2018-01-26 12:09:38 -08:00
Seth Alves
d73538f233 oops 2018-01-26 12:08:19 -08:00
Seth Alves
1237749628 oops 2018-01-26 12:05:26 -08:00
Seth Alves
b7303414f2 unmangle merges 2018-01-26 11:57:30 -08:00
Seth Alves
19409cc6ce fix merge/cherry-pick error 2018-01-26 10:45:18 -08:00
Seth Alves
3be42fe79a Merge branch 'master' of github.com:highfidelity/hifi into warn-for-head-position-nan 2018-01-26 10:36:26 -08:00
Seth Alves
17ec79f182 add breaks in case statements that used to have returns 2018-01-26 10:36:16 -08:00
Seth Alves
503175cd28 Merge branch 'RC63' of github.com:highfidelity/hifi into warn-for-head-position-nan-for-rc-63 2018-01-26 10:34:51 -08:00
Seth Alves
b8f3d8140d add breaks in case statements that used to have returns 2018-01-26 10:34:43 -08:00