Sam Gateau
be74b5c9ed
Merge pull request #11692 from NissimHadar/hazeZone
...
Bug fixes 8672-8673-8674 related to Zone entity Haze component
2017-10-31 15:25:32 -07:00
Nissim Hadar
03d2ca19b9
Moving consts into mode::Haze namespace.
2017-10-31 13:46:58 -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
Brad Hefta-Gaub
fbcd813d7b
Merge pull request #11694 from ElderOrb/FB8315
...
8315 Stylus appears in wrong place on hand
2017-10-30 18:00:56 -07:00
Andrew Meadows
0f1139343c
Merge pull request #11709 from druiz17/equip-adjustment
...
Remember adjustment made to equipped entities
2017-10-30 15:45:28 -07:00
Nissim Hadar
1357877618
Replaced separate RGB components of colours with vec3's.
2017-10-30 12:41:09 -07:00
Nissim Hadar
6391282680
Swapped location of keylight attenuation and the blending factor.
2017-10-30 12:05:23 -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
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
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
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
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
Dante Ruiz
e9298b6ff8
Merge branch 'master' of github.com:highfidelity/hifi into equip-adjustment
2017-10-27 14:46:18 -07:00
Dante Ruiz
bea0df8e60
implemented remebering equiping entities offset
2017-10-27 14:46:04 -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
Ryan Huffman
2944d76ef0
Update settings with auto domain creation and restart
2017-10-27 11:49:41 -07:00
Ryan Huffman
1bb778c21f
Fix label support in DS settings and add automatic domain generation:
2017-10-27 11:49:41 -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
