Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 14:12:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
61288 commits 76 branches 59 tags 1.2 GiB
Commit graph

25022 commits

Author SHA1 Message Date
David Rowe
2d27a6cf4c Merge branch 'master' into 21580 2017-11-05 13:59:43 +13:00
Brad Hefta-Gaub
d5eb670819
Merge pull request #11746 from highfidelity/RC-58 
Merge RC58 into master
 2017-11-03 12:50:02 -07:00
Melissa Brown
a14e98053e
Merge pull request #11138 from Nex-Pro/21466 
Fix Avatar Rotation upon Teleporting Using PAL
 2017-11-03 11:58:15 -07:00
John Conklin II
c946e46506
Merge pull request #11737 from AndrewMeadows/scale-to-fit_RC-58 
RC-58: scaleToFit() the model before updating render items
 2017-11-03 09:46:20 -07:00
Brad Hefta-Gaub
6dbffe2367
Merge pull request #11736 from AndrewMeadows/scale-to-fit 
scaleToFit() the model before updating render items
 2017-11-02 17:49:05 -07:00
John Conklin II
b990b4f3e0
Merge pull request #11726 from NissimHadar/newHazeZoneUpdate 
RC-58: Fix entity serialization bug due to Zone Haze group properties
 2017-11-02 16:40:01 -07:00
John Conklin II
a4e6b2911d
Merge pull request #11734 from highfidelity/stable 
Make sure RC-58 is up to date with stable
 2017-11-02 16:39:27 -07:00
Zach Fox
48979a5ce8
Merge pull request #11730 from zfox23/pop_avatarEntityTests 
Commerce: Avatar Entity Tests
 2017-11-02 15:34:37 -07:00
Stephen Birarda
25c10d5de2
Merge pull request #11735 from highfidelity/stable 
Merge stable back into master
 2017-11-02 14:22:31 -07:00
Andrew Meadows
2b06df1c33 call Model::scaleToFit() before update render items 2017-11-02 12:52:46 -07:00
Andrew Meadows
60fce3d4f7 make Model::scaleToFit() public not protected 2017-11-02 12:52:31 -07:00
Andrew Meadows
490483fde8 call Model::scaleToFit() before update render items 2017-11-02 12:32:51 -07:00
Andrew Meadows
db9c3cc103 make Model::scaleToFit() public not protected 2017-11-02 12:31:36 -07:00
Ryan Huffman
edc7b91a42 Fix comment in NetworkingConstants referencing shared.js location 2017-11-01 12:57:07 -07:00
Zach Fox
bb1ffbc06f Merge branch 'master' of https://github.com/highfidelity/hifi into pop_avatarEntityTests 2017-11-01 12:38:34 -07:00
Zach Fox
b335ba9a75 Timeout timer 2017-11-01 11:34:29 -07:00
Nissim Hadar
3d3c93f1a5 Fixes Bug 8802 2017-11-01 11:23:18 -07:00
Zach Fox
8a6a744099 It's working 2017-11-01 10:46:13 -07:00
David Rowe
328fc29bc5 Fix serverScripts not being able to see entities in parent/child tree 2017-11-01 17:01:19 +13:00
Atlante45
7616fe193c Migrate the DS config version to the config file 2017-10-31 17:35:23 -07:00
Zach Fox
93308dfcd3 Why did I think this would work before? 2017-10-31 16:21:10 -07:00
Stephen Birarda
b8370128ce remove master config from HifiConfigVariantMap/domain-server 2017-10-31 16:19:50 -07:00
Nissim Hadar
03d2ca19b9 Moving consts into mode::Haze namespace. 2017-10-31 13:46:58 -07:00
Zach Fox
e9c144892a Fixes 2017-10-31 13:11:32 -07:00
Zach Fox
f5ada4fe62 Will it compile? 2017-10-31 12:33:28 -07:00
Zach Fox
6f96e0c7bd More progress 2017-10-31 12:14:12 -07:00
Zach Fox
90e9251176 It's a start 2017-10-31 11:28:19 -07:00
Nissim Hadar
f3147fc24f Merge branch 'master' into hazeZone 2017-10-30 21:41:23 -07:00
Nissim Hadar
3ddf970be3 Removed haze init variables from the model namespace. 2017-10-30 21:40:14 -07:00
Nissim Hadar
636f7858a3 Removed _degs and _m suffixes. 2017-10-30 19:45:08 -07:00
Nissim Hadar
b00db6a68f Correction. 2017-10-30 19:20:49 -07:00
Brad Hefta-Gaub
c1a808e726
Merge pull request #11703 from AndrewMeadows/circles-and-quads 
fix Circles and quads
 2017-10-30 18:03:32 -07:00
Zach Fox
19420a0ff2 Move static cert verify to properties 2017-10-30 17:01:55 -07:00
Nissim Hadar
1357877618 Replaced separate RGB components of colours with vec3's. 2017-10-30 12:41:09 -07:00
Nissim Hadar
5fc68cae0d Converted Haze initialization values to static. 2017-10-30 11:51:19 -07:00
Nissim Hadar
d6b3fa4cb1 Removed references to Haze from Stage. 2017-10-30 10:49:08 -07:00
Nissim Hadar
349e12c065 Merge branch 'master' into hazeZone 2017-10-30 10:08:35 -07:00
Stephen Birarda
05cfd72464
Merge pull request #11707 from Atlante45/feat/wizard 
Domain Settings tweaks + Domain Setup Wizard
 2017-10-30 08:39:31 -07:00
divya
de4fd269ef
Merge pull request #11701 from birarda/bug/local-ds-inconnect 
only respond to expected ICE peers in DS
 2017-10-28 21:23:05 -07:00
Ryan Huffman
c42ef4f88c Update most DS API forwarding APIs to use a single forwarding function 2017-10-27 15:53:50 -07:00
Nissim Hadar
fb6c5b98d6 Merge branch 'master' into hazeZone 2017-10-27 15:40:03 -07:00
Nissim Hadar
a5a135c2ba Fixes for 8672-8674. 2017-10-27 15:39:14 -07:00
Atlante45
ae9f87873f Merge branch 'master' of https://github.com/highfidelity/hifi into feat/wizard 2017-10-27 15:27:00 -07:00
samcake
8a3b1a20cc merge with upstream 2017-10-27 14:57:25 -07:00
Brad Hefta-Gaub
25b5657d58
Merge pull request #11702 from misslivirose/fix/remove-address 
remove href property for non-owned avatar entities
 2017-10-27 13:15:47 -07:00
Atlante45
203a419f2a Setup Wizard 2017-10-27 12:52:36 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster 
Commerce: Owner Verification for Certified Entities
 2017-10-27 12:28:04 -07:00
Ryan Huffman
92aa66cdd7 Update domain settings to include domain info editing 2017-10-27 11:49:40 -07:00
Ryan Huffman
7dc475c695 Update domain server settings 
Move requests that require access token to go through DS
Update various styling and ease of use on DS settings page

Update domain server settings

CP

CP
 2017-10-27 11:49:34 -07:00
Andrew Meadows
2c4d4373dc support asymmetrical cross section Cylinder 2017-10-27 10:41:16 -07:00