Anthony J. Thibault
|
eff77b995e
|
Merge branch 'master' into feature/exp-smoothing-input-filter
|
2018-01-04 15:24:33 -08:00 |
|
David Rowe
|
67eb282815
|
Don't swap hands if both triggers are squeezed
|
2018-01-05 12:12:36 +13:00 |
|
Andrew Meadows
|
fbe2dd8a41
|
remove unnecessary 'virtual' keyword
|
2018-01-04 14:46:16 -08:00 |
|
Andrew Meadows
|
13538006ec
|
fix bug preventing sim owenrship on local domain
|
2018-01-04 14:46:16 -08:00 |
|
Anthony J. Thibault
|
f0985a8a01
|
Code review feedback
clamp _rotationConstant and _translationConstante between 0 and 1.
re-organized apply structure, to prevent transforming invalid values.
|
2018-01-04 14:21:53 -08:00 |
|
Stephen Birarda
|
22ced025cd
|
Merge pull request #12089 from Atlante45/fix/ice-servers
Add Unused packet type back for ICE servers
|
2018-01-04 15:15:27 -07:00 |
|
David Rowe
|
27bed8d1f1
|
Tidying
|
2018-01-05 11:05:49 +13:00 |
|
David Rowe
|
fb09a9724e
|
Change laser hand with trigger squeeze
|
2018-01-05 11:04:09 +13:00 |
|
Anthony J. Thibault
|
9beb3ac5b6
|
Merge branch 'master' into feature/exp-smoothing-input-filter
|
2018-01-04 13:45:27 -08:00 |
|
David Back
|
81f3590954
|
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices
|
2018-01-04 13:17:07 -08:00 |
|
Atlante45
|
294a7ca3c6
|
Make sure the protocol signature still changes
|
2018-01-04 13:15:01 -08:00 |
|
SamGondelman
|
6a19b0e0b6
|
update render items on texture load
|
2018-01-04 13:10:46 -08:00 |
|
Atlante45
|
d4a239731c
|
Add Unused packet type back for ICE servers
|
2018-01-04 13:07:02 -08:00 |
|
David Rowe
|
9f7a2b18e6
|
Use laser from dominant hand if both hands are pointing at the tablet
|
2018-01-05 10:04:39 +13:00 |
|
RebeccaStankus
|
9ba324b85f
|
"Clear Filter" button instead of "Show All"
|
2018-01-04 12:51:11 -08:00 |
|
RebeccaStankus
|
3e8063f80a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
|
2018-01-04 12:48:09 -08:00 |
|
Alexander Ivash
|
7ab7a46530
|
11008 GoTo app does not focus on address bar when opened
|
2018-01-04 23:38:10 +03:00 |
|
Gabriel Calero
|
8cac98545a
|
Fixes for Android
|
2018-01-04 17:36:10 -03:00 |
|
David Rowe
|
02f4085368
|
Fix magic number
|
2018-01-05 09:00:53 +13:00 |
|
Clément Brisset
|
efbff56f26
|
Merge pull request #11925 from Atlante45/feat/remove-jurisdiction-listener
Remove legacy jurisdiction code
|
2018-01-04 11:52:38 -08:00 |
|
RebeccaStankus
|
f52a6d8eae
|
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
|
2018-01-04 10:49:32 -08:00 |
|
David Rowe
|
6095a90e69
|
Don't display default lasers when Shapes app is active
|
2018-01-04 21:09:38 +13:00 |
|
David Rowe
|
6c16fcfe65
|
Fix tablet laser when Shapes app is running
|
2018-01-04 16:37:20 +13:00 |
|
David Rowe
|
7236ac17e2
|
Merge branch 'master' into 21661
|
2018-01-04 15:21:00 +13:00 |
|
David Rowe
|
138092ac37
|
Remove "Prefer Avatar Finger Over Stylus" setting
|
2018-01-04 15:12:34 +13:00 |
|
Ryan Downe Karpf
|
eada0b1ff7
|
Merge pull request #11546 from vladest/tablet_home_paginate
Tablet home paginate
|
2018-01-03 18:12:32 -08:00 |
|
Ryan Downe Karpf
|
c1b94693c5
|
Merge pull request #12061 from druiz17/fix-actions-not-being-deleted
Fix deleted action not being sent over the network correctly
|
2018-01-03 18:11:06 -08:00 |
|
Ryan Downe Karpf
|
5a589350fe
|
Merge pull request #12077 from ctrlaltdavid/remove-filed
Remove erroneous "filed" Overlay property
|
2018-01-03 18:10:37 -08:00 |
|
David Rowe
|
efa6f1f02f
|
Use "Prefer Stylus Over Laser" setting
|
2018-01-04 15:00:17 +13:00 |
|
Zach Fox
|
ff4f582c7d
|
Thanks Howard
|
2018-01-03 17:23:35 -08:00 |
|
Gabriel Calero
|
32494a8e24
|
Set QMLEngine base path for android
|
2018-01-03 22:13:31 -03:00 |
|
Zach Fox
|
8d4a6f01cb
|
Fix bugs related to inspecting entities with hand controllers
|
2018-01-03 16:03:37 -08:00 |
|
David Back
|
6c8987d75f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into mergeAccountGlobalServices
|
2018-01-03 14:44:52 -08:00 |
|
Zach Fox
|
eafb198fd7
|
Merge pull request #12084 from zfox23/commerce_fixSecurityPicChange
Fix Security Pic Change dialog after QML security changes
|
2018-01-03 13:17:55 -08:00 |
|
Gabriel Calero
|
3d86c24b34
|
Fix uncompressed textures. Generate CPU mipmaps for android
|
2018-01-03 16:42:19 -03:00 |
|
Gabriel Calero
|
e418339876
|
Fix uncompressed textures for android
|
2018-01-03 16:42:19 -03:00 |
|
Cristian Luis Duarte
|
40a7634a53
|
Incorporate changes from gpu-gl into gpu-gles (changes in organization and architecture of classes).
|
2018-01-03 16:42:19 -03:00 |
|
Gabriel Calero
|
597114afea
|
Prepare forward pipeline for android
|
2018-01-03 16:42:19 -03:00 |
|
Cristian Luis Duarte
|
da28e0a8cb
|
Implement generateAssetsFileList in build.gradle (same work as assets file generation by androiddeployqt) + Copy assets at startup
|
2018-01-03 16:42:18 -03:00 |
|
Gabriel Calero
|
fc62b2d34a
|
Fix ktx_cache path for android. Load the least js scripts for android
|
2018-01-03 16:42:18 -03:00 |
|
Gabriel Calero
|
ef8ba1cad0
|
Include config.h in ResourceImageItem.cpp. Minor fixes
|
2018-01-03 16:40:14 -03:00 |
|
Gabriel Calero
|
78f2a8c566
|
Copy scripts from android assets at startup
|
2018-01-03 16:40:14 -03:00 |
|
Gabriel Calero
|
d31346c047
|
Use qml engine
|
2018-01-03 16:40:14 -03:00 |
|
RebeccaStankus
|
9471dbeba9
|
Merge branch 'master' of https://github.com/highfidelity/hifi into log-filtering
|
2018-01-03 11:39:38 -08:00 |
|
Gabriel Calero
|
468fc89c3e
|
Use forward pipeline for android
|
2018-01-03 16:38:23 -03:00 |
|
Gabriel Calero
|
ad7cb24ea3
|
Restore interface icon and name for android
|
2018-01-03 16:36:11 -03:00 |
|
Gabriel Calero
|
dad526d22b
|
Make Fade.slh compatible with Open GLES SL
|
2018-01-03 16:36:11 -03:00 |
|
Gabriel Calero
|
76b38bebad
|
Make Interface run in Android
|
2018-01-03 16:36:11 -03:00 |
|
RebeccaStankus
|
89138c9bd8
|
More filter choices, search will clear
|
2018-01-03 11:35:46 -08:00 |
|
Zach Fox
|
6f077f3a92
|
Fix Security Pic Change dialog after QML security changes
|
2018-01-03 11:28:39 -08:00 |
|