Nissim Hadar
|
c841ec6c8c
|
Copy Skybox URL to Ambient URL if background mode is Skybox and Ambient URL is blank.
|
2018-01-08 18:15:20 -08:00 |
|
Nissim Hadar
|
7811ddb904
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
|
2018-01-08 15:39:09 -08:00 |
|
Nissim Hadar
|
b2b1807490
|
Changes per code review.
|
2018-01-08 15:37:06 -08:00 |
|
Melissa Brown
|
2fddace71e
|
Merge pull request #12019 from Delanir/C10594
Case 10594 - Fix entity property href not being able to reset (empty) ...
|
2018-01-08 14:22:28 -08:00 |
|
John Conklin II
|
fab28e7d44
|
Merge pull request #12106 from SamGondelman/overlayFix
Fix avatar texture loading
|
2018-01-08 14:01:15 -08:00 |
|
Anthony Thibault
|
f4c38b91b3
|
Merge pull request #12071 from luiscuenca/handTouch
Touch feeling for near grab
|
2018-01-08 12:50:30 -08:00 |
|
SamGondelman
|
97c0b33975
|
fix avatar texture loading
|
2018-01-08 12:50:05 -08:00 |
|
John Conklin II
|
1acd3e17e0
|
Merge pull request #12104 from druiz17/fix-laser-mess
fix tablet interaction and far grab functionality
|
2018-01-08 12:43:36 -08:00 |
|
Nissim Hadar
|
452c16e706
|
Removed backgroundPropertiesChanged
|
2018-01-08 12:11:36 -08:00 |
|
Nissim Hadar
|
0a21e5de04
|
Removed _backgroundPropertiesChanged
|
2018-01-08 12:07:21 -08:00 |
|
MiladNazeri
|
56d4429a8b
|
Merge pull request #12020 from ctrlaltdavid/21646
Window JSDoc
|
2018-01-08 11:53:34 -08:00 |
|
Nissim Hadar
|
a33f3446f6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
|
2018-01-08 11:51:13 -08:00 |
|
Nissim Hadar
|
8e03ecedb9
|
Added user data for lat/lon.
|
2018-01-08 11:50:49 -08:00 |
|
Nissim Hadar
|
d0c0d6a388
|
Set skybox mode as per legacy background mode if needed.
|
2018-01-08 11:50:28 -08:00 |
|
Dante Ruiz
|
fd83e00df4
|
fix tablet interaction and far grab functionallity
|
2018-01-08 11:30:21 -08:00 |
|
David Rowe
|
7a971b2d26
|
Fix typo
|
2018-01-09 08:17:15 +13:00 |
|
Zach Fox
|
99510f522d
|
Merge pull request #12095 from ElderOrb/FB10621
FB10621 "HIFI-Commerce Login" page title change to "Log in to continue"
|
2018-01-08 10:05:53 -08:00 |
|
John Conklin II
|
d660bbf6e5
|
Merge pull request #12101 from hyperlogic/bug-fix/avatar-sit
Bug fix for sit script.
|
2018-01-08 09:59:17 -08:00 |
|
luiscuenca
|
50f89182d7
|
Add Utils.jsc
|
2018-01-07 18:29:13 -07:00 |
|
Nissim Hadar
|
93fffb4bbe
|
Removed PROP_BACKGROUND_MODE.
|
2018-01-07 14:21:22 -08:00 |
|
Nissim Hadar
|
8e793e790a
|
Deleted unused include file.
|
2018-01-07 14:11:26 -08:00 |
|
Nissim Hadar
|
8206ae6ffb
|
Removed BackgroundMode packet type.
|
2018-01-07 13:50:42 -08:00 |
|
Howard Stearns
|
724db93389
|
Merge pull request #12002 from howard-stearns/consistent-goToUser
Consistent go to user
|
2018-01-07 11:07:39 -08:00 |
|
luiscuenca
|
8a7c68829d
|
Optimizations, cleanings and globals
|
2018-01-07 11:56:30 -07:00 |
|
Nissim Hadar
|
bc98cbd58f
|
Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance
|
2018-01-06 23:26:28 -08:00 |
|
nissim.hadar
|
1acf7bae20
|
Removed reference to BackgroundMode.
|
2018-01-06 23:24:28 -08:00 |
|
Nissim Hadar
|
d5be9365fe
|
Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance
|
2018-01-06 10:02:12 -08:00 |
|
nissim.hadar
|
33cc17a52f
|
Removing unused Background mode.
|
2018-01-06 02:27:49 -08:00 |
|
nissim.hadar
|
bac3d68ef4
|
Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance
|
2018-01-06 01:59:53 -08:00 |
|
nissim.hadar
|
d2ac27f1b8
|
Code clean-up
|
2018-01-06 01:48:58 -08:00 |
|
nissim.hadar
|
579aec7118
|
Only check for zone fields.
|
2018-01-06 01:37:23 -08:00 |
|
Nissim Hadar
|
f742ab7952
|
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
|
2018-01-05 23:14:51 -08:00 |
|
Nissim Hadar
|
9e5eba4d3a
|
Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance
|
2018-01-05 23:11:40 -08:00 |
|
David Rowe
|
673bc7de38
|
Update Window JSDoc
|
2018-01-06 16:05:55 +13:00 |
|
Anthony Thibault
|
1a97d1de0f
|
Merge pull request #11953 from hyperlogic/feature/exp-smoothing-input-filter
Added exponential smoothing filter for vive pucks.
|
2018-01-05 16:50:55 -08:00 |
|
Anthony J. Thibault
|
243dcb88ee
|
Bug fix for sit script.
|
2018-01-05 16:20:44 -08:00 |
|
Zach Fox
|
0c38a5598f
|
Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection
Fix bugs related to inspecting entities with hand controllers
|
2018-01-05 15:50:00 -08:00 |
|
luiscuenca
|
4f6a804fd1
|
Fix magic numbers
|
2018-01-05 16:27:48 -07:00 |
|
Andrew Meadows
|
4745a0e32d
|
Merge pull request #12093 from AndrewMeadows/simulation-ownership-004
more stable simulation ownership for system of constraints
|
2018-01-05 14:17:53 -08:00 |
|
Andrew Meadows
|
b28684f15e
|
Merge pull request #12087 from ctrlaltdavid/21661
Laser auto-on with tablet and Web overlays
|
2018-01-05 14:08:01 -08:00 |
|
Brad Hefta-Gaub
|
aebd098e6e
|
Merge pull request #12072 from Triplelexx/21654_assetbrowser_sorting
WL#21654: Make the Asset Browser Sort Case Insensitive
|
2018-01-05 13:34:39 -08:00 |
|
Brad Hefta-Gaub
|
7a3835eb33
|
Merge pull request #11945 from jherico/android_nov
Updating android toolchain for QML
|
2018-01-05 13:34:03 -08:00 |
|
Brad Hefta-Gaub
|
6a3609093d
|
Merge pull request #12051 from dback2/polyobjimportfixes
Poly obj import fixes
|
2018-01-05 13:33:29 -08:00 |
|
Nissim Hadar
|
d645163294
|
Fixed gcc warning.
|
2018-01-05 13:16:02 -08:00 |
|
Nissim Hadar
|
635fd2d0cf
|
Use older C++ version for Ubuntu
|
2018-01-05 12:48:21 -08:00 |
|
Seth Alves
|
487dab641f
|
Merge pull request #12090 from AndrewMeadows/simulation-ownership-003
more stable simulation ownership
|
2018-01-05 12:27:52 -08:00 |
|
Sam Gateau
|
91eb718074
|
Merge pull request #12091 from SamGondelman/overlayFix
Update model render items on texture load and fix no haze issue
|
2018-01-05 12:26:56 -08:00 |
|
Nissim Hadar
|
3963c0a5a1
|
Code review improvements.
|
2018-01-05 12:22:20 -08:00 |
|
David Back
|
ac1c398b9d
|
Merge pull request #11669 from dback2/mergeAccountGlobalServices
merge AccountScriptingInterface into GlobalServicesScriptingInterface
|
2018-01-05 11:34:53 -08:00 |
|
David Rowe
|
5431b7137b
|
Code review
|
2018-01-06 08:27:24 +13:00 |
|