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

64061 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Rowe
280264d7ed Add location.domainID as a synonym for location.domainId 
And deprecate location.domainId.
 2018-01-30 20:46:27 +13:00
Atlante45
cb6bebd824 Fix Mac dev builds 2018-01-29 19:47:36 -08:00
David Back
e679b75e99 fix degree display position 2018-01-29 19:02:36 -08:00
David Back
3a8e17173e Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab 2018-01-29 18:53:18 -08:00
David Back
2f0d92c3cd ctrl 22.5 snapping 2018-01-29 18:15:01 -08:00
Liv Erickson
3aa12eb7df pass in deletedIDs so can delete children depth > 1 2018-01-29 17:51:26 -08:00
David Rowe
cadd4e61ad Fix indent 2018-01-30 14:36:53 +13:00
David Rowe
09b92b93aa Handle geometric offsets in FBX mesh extents calculations 2018-01-30 14:36:34 +13:00
David Back
9ee7153641 fix scale speed, fix stretch panels, fix scale cube highlight 2018-01-29 16:53:02 -08:00
John Conklin II
dc3823374a
Merge pull request #12282 from druiz17/RC63 
fix new model path(RC63)
 2018-01-29 16:28:58 -08:00
John Conklin II
180d09f901
Merge pull request #12278 from AndrewMeadows/adjust-low-lod-threshold 
RC63 Hotfix: HMD low LOD threshold changed: 45 --> 34
 2018-01-29 16:09:56 -08:00
Dante Ruiz
08511a2a2e fix new model path 2018-01-29 15:27:55 -08:00
MiladNazeri
3585bead96
Merge pull request #12037 from humbletim/Leopoly_Phase1_004_RayPick-Changes 
Leopoly_Phase1_004_RayPick-Changes
 2018-01-29 14:02:38 -08:00
Dante Ruiz
264aa7f4d2
Merge pull request #12191 from druiz17/entity-attachment-bookmark 
Bookmark avatar entities
 2018-01-29 12:55:35 -08:00
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
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
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
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
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
David Back
d03838026f Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab 2018-01-29 10:30:25 -08:00
Dante Ruiz
68fd9eafa8 fix entity parenting crash 2018-01-29 10:23:24 -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
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
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