Nissim Hadar
|
8bd2985f1f
|
Simplified code.
|
2018-01-04 13:06:28 -08:00 |
|
Nissim Hadar
|
e8770ec204
|
TEMPORARY fix for older content not containing these fields (keylight, skybox, ambient light).
|
2018-01-04 11:30:02 -08:00 |
|
Nissim Hadar
|
5b7ef9a3d3
|
Minor cleanup.
|
2018-01-04 09:13:58 -08:00 |
|
Nissim Hadar
|
f67232e53b
|
Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance
|
2018-01-02 10:47:26 -08:00 |
|
Nissim Hadar
|
22c5890812
|
Rebased.
|
2018-01-02 09:23:38 -08:00 |
|
Nissim Hadar
|
dad3a0d340
|
Fixed skybox inheritance.
|
2018-01-02 09:08:05 -08:00 |
|
Nissim Hadar
|
0764e80996
|
Corrected behaviour of skybox modes.
|
2017-12-30 18:19:42 -08:00 |
|
Nissim Hadar
|
fb59da5fb3
|
Reverted to old version of auto-tester.
|
2017-12-30 18:19:00 -08:00 |
|
Nissim Hadar
|
beb67bb5c8
|
Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance
|
2017-12-30 16:32:58 -08:00 |
|
Nissim Hadar
|
b68da182fd
|
Merge branch 'QtImageCompare' of https://github.com/NissimHadar/hifi into keylightInheritance
|
2017-12-30 13:49:01 -08:00 |
|
nissim.hadar
|
b56c7535d2
|
Added legacy functionality (for zones that used Background "skybox")
|
2017-12-30 12:25:58 -08:00 |
|
nissim.hadar
|
b6bbf1abe1
|
Added sun intensity modulation as a function of altitude.
|
2017-12-29 23:47:42 -08:00 |
|
Nissim Hadar
|
7260b4ff7b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
# Conflicts:
# libraries/entities/src/EntityPropertyFlags.h
|
2017-12-29 15:16:14 -08:00 |
|
Nissim Hadar
|
87e896ab20
|
Zone inheritance ready for testing.
|
2017-12-29 15:13:46 -08:00 |
|
Seth Alves
|
4bbce011a4
|
Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3
avatar-entities which are children of an avatar will scale with the avatar
|
2017-12-29 09:12:17 -08:00 |
|
Nissim Hadar
|
0e76d481a1
|
Completed the use of radio-buttons to hide disabled sections.
|
2017-12-29 08:28:31 -08:00 |
|
Nissim Hadar
|
a6f3401d0e
|
Removed background combo.
|
2017-12-29 08:15:34 -08:00 |
|
Nissim Hadar
|
85a81d6b5b
|
WIP - skybox inheritance
|
2017-12-28 18:23:49 -08:00 |
|
Nissim Hadar
|
64644fc980
|
WIP - skybox inheritance
|
2017-12-28 14:31:59 -08:00 |
|
Nissim Hadar
|
9636a0b450
|
No idea...
|
2017-12-28 09:35:58 -08:00 |
|
Nissim Hadar
|
8bb4d1431c
|
WIP - copy skylight URL to ambient URL.
|
2017-12-28 09:35:40 -08:00 |
|
Nissim Hadar
|
03cf7710d0
|
Ambient light inheritance
|
2017-12-28 09:34:55 -08:00 |
|
Nissim Hadar
|
9b9295aaec
|
Script that uses date, time and coordinates to compute sun position - this is then used to position the keylight.
|
2017-12-27 14:17:05 -08:00 |
|
Nissim Hadar
|
7f5897e90b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
|
2017-12-26 11:35:59 -08:00 |
|
Nissim Hadar
|
4ffd896ced
|
WIP - adding AmbientLightPropertyGroup
|
2017-12-26 11:15:33 -08:00 |
|
Nissim Hadar
|
1fa8f7c55b
|
WIP - adding AmbientLightPropertyGroup
|
2017-12-26 09:15:45 -08:00 |
|
Nissim Hadar
|
0b73e7db3f
|
WIP - adding AmbientLightPropertyGroup
|
2017-12-26 09:15:13 -08:00 |
|
Brad Hefta-Gaub
|
3d02955c5d
|
Merge pull request #12029 from SamGondelman/webOverlay
Fix >20 web entities crash
|
2017-12-24 17:10:39 -08:00 |
|
Nissim Hadar
|
affc5d1b86
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
|
2017-12-24 15:27:32 -08:00 |
|
Nissim Hadar
|
3f82e9147b
|
Change keylight/ambient mode default from "enabled" to "inherit"
|
2017-12-22 16:30:19 -08:00 |
|
John Conklin II
|
0dd5bbc2d6
|
Merge pull request #12057 from birarda/61-1-merge-back
Merge stable back into master after RC61.1
|
2017-12-22 16:26:08 -08:00 |
|
Stephen Birarda
|
e3cbfd92a0
|
Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back
|
2017-12-22 15:48:04 -08:00 |
|
Nissim Hadar
|
8ee5f642a9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
# Conflicts:
# libraries/networking/src/udt/PacketHeaders.cpp
# libraries/networking/src/udt/PacketHeaders.h
|
2017-12-22 15:41:59 -08:00 |
|
Seth Alves
|
96197e66bb
|
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
|
2017-12-22 15:13:02 -08:00 |
|
Zach Fox
|
808b9cbc31
|
Merge pull request #12047 from zfox23/commerce_dataTracking3
Commerce Data Tracking: Iteration 3 (Purchases)
|
2017-12-22 14:31:03 -08:00 |
|
Sam Gateau
|
db4f9909c7
|
Merge pull request #12017 from Zvork/glcolor
Removed glColor reset hack in MeshPartPayload
|
2017-12-22 14:25:51 -08:00 |
|
Sam Gateau
|
a2c16ddf6a
|
Merge pull request #12026 from SamGondelman/burp3
Remove _model from ModelMeshPartPayload
|
2017-12-22 13:50:06 -08:00 |
|
Stephen Birarda
|
d299b9a56c
|
Merge pull request #12024 from birarda/bug/entity-sequence-skip
handle sequence number from reliably sent adds in OctreeEditPacketSender
|
2017-12-22 12:30:27 -08:00 |
|
Howard Stearns
|
fd545c3928
|
Merge pull request #12048 from zfox23/commerce_CheckoutLayoutRevisions
Commerce: Checkout Layout Revisions
|
2017-12-22 09:59:49 -08:00 |
|
Howard Stearns
|
5767f5937e
|
Merge pull request #12046 from zfox23/commerce_fixEcdsaError1
Commerce: Fix some rezzing errors; Fix ECDSA errors
|
2017-12-22 09:56:22 -08:00 |
|
Seth Alves
|
50600f87a6
|
Merge branch 'scale-wearables-with-avatar-3' of github.com:sethalves/hifi into scale-wearables-with-avatar-3
|
2017-12-22 09:07:35 -08:00 |
|
Seth Alves
|
533aa3d918
|
code review
|
2017-12-22 09:07:16 -08:00 |
|
Nissim Hadar
|
e102b8c087
|
Fixed Ubuntu warning.
|
2017-12-22 08:35:09 -08:00 |
|
Nissim Hadar
|
2eb74647f0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
|
2017-12-22 08:05:46 -08:00 |
|
Nissim Hadar
|
502cac2ac7
|
Keylight inherit/off/on working
|
2017-12-22 08:05:12 -08:00 |
|
Seth Alves
|
897b96d092
|
Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3
|
2017-12-22 07:36:26 -08:00 |
|
John Conklin II
|
79ccdaca42
|
Merge pull request #12050 from highfidelity/RC61.1
Beta Release 61.1 - Includes up to Developer Release 7593
|
2017-12-21 21:44:34 -08:00 |
|
Stephen Birarda
|
072e818c99
|
Merge pull request #12053 from birarda/bug/61-1-protocol-version
RC61.1: Manually push OwnershipChallengeFix to 3 (to avoid StaticCertJsonVersionOne conflict)
|
2017-12-21 19:45:55 -08:00 |
|
Nissim Hadar
|
e974cac177
|
Keylight inheritance mode works.
|
2017-12-21 19:19:55 -08:00 |
|
Stephen Birarda
|
95c7f876bf
|
manually force OwnershipChallengeFix to avoid StaticCertJsonVersionOne
|
2017-12-21 18:52:01 -08:00 |
|