samcake
|
9652902911
|
Removing the changes that i introduced by mistake from another branch :((((
|
2017-11-06 12:43:22 -08:00 |
|
samcake
|
4cc0a46998
|
Merge branch 'RC-58' of https://github.com/samcake/hifi into RC-58
|
2017-11-06 11:28:49 -08:00 |
|
samcake
|
d878fac62c
|
REverse changes
|
2017-11-06 11:25:02 -08:00 |
|
samcake
|
0d900d7871
|
code style and comment
|
2017-11-06 09:12:02 -08:00 |
|
samcake
|
d446796bc1
|
Merge branch 'RC-58' of https://github.com/samcake/hifi into RC-58
|
2017-11-06 09:01:30 -08:00 |
|
Sam Gateau
|
45e5d91b9d
|
Change the sub renderItemIDs list of the Model entity in its meta through a transaction instead of going through the pointer to the model
|
2017-11-04 20:49:55 -07:00 |
|
Ryan Huffman
|
7210a457c9
|
Merge pull request #11740 from huffman/fix/placename-erase-domain-id
Fix domain id getting set to empty when adding place name
|
2017-11-03 11:37:07 -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 |
|
Ryan Huffman
|
b1fe3699f9
|
Fix domain id getting set to empty when adding place name
|
2017-11-02 17:42:24 -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 |
|
John Conklin II
|
05fd9f45d5
|
Merge pull request #11733 from sethalves/pr-11731-for-rc-58
stop drawing ignored avatars, even if PAL is still open
|
2017-11-02 16:20:15 -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 |
|
Seth Alves
|
e77b9e0e97
|
stop drawing ignored avatars, even if PAL is still open
|
2017-11-02 10:23:26 -07:00 |
|
Stephen Birarda
|
4842da1388
|
Merge pull request #11729 from huffman/fix/cloud-domain-wizard-domain-id
Update wizard to make request for domain info
|
2017-11-02 10:09:05 -07:00 |
|
Ryan Huffman
|
8401aecef5
|
Update wizard to make request for domain info
|
2017-11-01 16:04:26 -07:00 |
|
Nissim Hadar
|
3d3c93f1a5
|
Fixes Bug 8802
|
2017-11-01 11:23:18 -07:00 |
|
Ryan Huffman
|
9a0a74c9b9
|
Merge pull request #11723 from Atlante45/fix/ds-config-version
Move DS config version to config file
|
2017-11-01 10:05:50 -07:00 |
|
Atlante45
|
7616fe193c
|
Migrate the DS config version to the config file
|
2017-10-31 17:35:23 -07:00 |
|
Stephen Birarda
|
b8370128ce
|
remove master config from HifiConfigVariantMap/domain-server
|
2017-10-31 16:19:50 -07:00 |
|
samcake
|
8fd8226073
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
|
2017-10-30 09:06:33 -07:00 |
|
Ryan Downe Karpf
|
c0f44c8fc8
|
Merge pull request #11636 from birarda/bug/draco-in-debug
use config specific install dir for draco external
|
2017-10-30 09:00:14 -07:00 |
|
Ryan Downe Karpf
|
28a99fe685
|
Merge pull request #11655 from dback2/tabletcontextualmode
add a tablet contextual mode flag to HMDScriptingInterface used to keep tablet in place
|
2017-10-30 08:56:26 -07:00 |
|
Ryan Downe Karpf
|
8fbe7f050f
|
Merge pull request #11712 from vladest/fix_avatar_browser
fix typo in tablet avatar browser
|
2017-10-30 08:49:58 -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 |
|
Sam Gateau
|
1e30e14876
|
Exploring the metalicaness and gltf2 shading
|
2017-10-29 20:49:49 -07:00 |
|
Ryan Huffman
|
70d3bd3672
|
Fix label/auto networking not being hidden for temp domains
|
2017-10-29 20:48:03 -07:00 |
|
Ryan Huffman
|
ed99541b5f
|
Fix domain info not loading for temp domains in DS settings
|
2017-10-29 20:47:52 -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 |
|
Atlante45
|
b0d838cb9b
|
Fix UNIX warning
|
2017-10-28 14:57:16 -07:00 |
|
Ryan Huffman
|
3616ef7c49
|
Fix ip-only in DS settings to show port instead of address
|
2017-10-28 14:19:14 -07:00 |
|
Ryan Huffman
|
88e22f7507
|
Remove unneeded logging in DomainServer.cpp
|
2017-10-28 14:19:14 -07:00 |
|
vladest
|
b1601dcd4c
|
fix typo in tablet avatar browser
|
2017-10-28 12:07:29 +02:00 |
|
Atlante45
|
56e9a9aaf9
|
Handle old configs
|
2017-10-27 17:32:11 -07:00 |
|
Andrew Meadows
|
f958829d00
|
Merge pull request #11708 from samcake/blue
Expose the Render api to the tablet js context and update render engine tool
|
2017-10-27 17:12:36 -07:00 |
|
Brad Hefta-Gaub
|
8322631a6d
|
Merge pull request #11695 from luiscuenca/case6719
6719 Avatar attachment window will update when attachments are modified
|
2017-10-27 17:01: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 |
|
Atlante45
|
ae9f87873f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/wizard
|
2017-10-27 15:27:00 -07:00 |
|
samcake
|
7e149fe30d
|
Remove unecessary comments
|
2017-10-27 15:18:50 -07:00 |
|
Atlante45
|
c7b8d1114d
|
CR
|
2017-10-27 15:11:31 -07:00 |
|
samcake
|
8a3b1a20cc
|
merge with upstream
|
2017-10-27 14:57:25 -07:00 |
|
Ryan Huffman
|
75e98dcef9
|
Cleanup style in DS js files
|
2017-10-27 14:55:50 -07:00 |
|
Brad Hefta-Gaub
|
d61ede2a4e
|
Merge pull request #11697 from ElderOrb/FB8211
8211 Add very short haptic feedback when highlighting letters on keyboard
|
2017-10-27 13:26:41 -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 |
|
Zach Fox
|
3fae121335
|
Merge pull request #11670 from zfox23/stagingSetting
Make it easier to switch between STABLE and STAGING Metaverses
|
2017-10-27 12:03:29 -07:00 |
|
samcake
|
715cf301d5
|
cleaning the layout finally
|
2017-10-27 12:00:10 -07:00 |
|
Ryan Huffman
|
390dae3918
|
Fix DS settings sidebar moving incorrectly
|
2017-10-27 11:49:41 -07:00 |
|