Sam Gateau
|
0178c490db
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-11-16 18:21:00 -08:00 |
|
Zach Fox
|
57c86c3035
|
Merge pull request #11836 from zfox23/commerce_fixStepSkip
Fix skipping wallet setup step in certain cases
|
2017-11-16 16:01:10 -08:00 |
|
SamGondelman
|
b252c81d84
|
fix home button hover overlay dimensions
|
2017-11-16 15:34:42 -08:00 |
|
Dante Ruiz
|
b66153b9cb
|
fixing setting incorrect parent
|
2017-11-16 15:07:00 -08:00 |
|
Ryan Downe Karpf
|
c255e29fa5
|
Merge pull request #11828 from luiscuenca/pr-for-rc-59
Fix not restoring animations after changing view modes RC59
|
2017-11-16 14:19:12 -08:00 |
|
ZappoMan
|
e438ac54d5
|
make adds go over NLPacketList as reliable
|
2017-11-16 13:16:23 -08:00 |
|
samcake
|
bafa82f6c5
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-11-16 12:12:04 -08:00 |
|
Zach Fox
|
7f64ede940
|
Fix skipping wallet setup step in certain cases
|
2017-11-16 11:44:52 -08:00 |
|
David Back
|
abba965328
|
todo comment
|
2017-11-16 11:41:28 -08:00 |
|
Stephen Birarda
|
eedb77dae9
|
add clearing of known state if client resets ES connection
|
2017-11-16 11:40:35 -08:00 |
|
John Conklin II
|
b5d4f6c65f
|
Merge pull request #11826 from jherico/bug/fb9107
Fix for black screen on HMDs on startup
|
2017-11-16 11:32:20 -08:00 |
|
John Conklin II
|
d4afd7fa0d
|
Merge pull request #11827 from jherico/bug/fb9107_rc59
Fix for black screen on HMDs on startup
|
2017-11-16 11:22:37 -08:00 |
|
Clément Brisset
|
2b39cb4500
|
Merge pull request #11832 from highfidelity/RC59
Merge RC59 into master
|
2017-11-16 11:19:54 -08:00 |
|
Sam Gondelman
|
d1747060f5
|
Merge pull request #11722 from druiz17/ui
Update controllerDispatcher scripts to use the new Pointers API(WIP)
|
2017-11-16 10:09:58 -08:00 |
|
ZappoMan
|
4c4f23e312
|
Merge branch 'master' of https://github.com/highfidelity/hifi into makeAddEntityAtomic
|
2017-11-16 10:09:46 -08:00 |
|
Dante Ruiz
|
f6a74cc80e
|
fixing merge conflicts
|
2017-11-16 10:04:36 -08:00 |
|
Sam Gondelman
|
cb2d4a5c93
|
Merge pull request #11779 from SamGondelman/ui
Pointers branch: Integrated stylus
|
2017-11-16 09:51:43 -08:00 |
|
SamGondelman
|
ac7242102c
|
Merge remote-tracking branch 'upstream/pointers' into ui
|
2017-11-16 09:47:29 -08:00 |
|
SamGondelman
|
e3aa79990b
|
merge with master
|
2017-11-16 09:45:32 -08:00 |
|
Liv Erickson
|
dda32f1987
|
Emit scale changed signal when scaled with hand controllers
|
2017-11-16 09:26:42 -08:00 |
|
Dante Ruiz
|
94ac8e52d5
|
Merge pull request #11822 from druiz17/fix-tablet-3d-person
fixing tablet in 3d person
|
2017-11-16 08:55:27 -08:00 |
|
Brad Davis
|
0755e4aa21
|
Fix for black screen on HMD derived display plugins
|
2017-11-16 08:55:10 -08:00 |
|
Brad Davis
|
7bbc719d79
|
Fix for black screen on HMD derived display plugins
|
2017-11-16 08:53:12 -08:00 |
|
Alexander Ivash
|
c5d2f598d7
|
8244 Rename captionColorOverride to captionColor
|
2017-11-16 15:46:49 +03:00 |
|
Seth Alves
|
93fd2a6a6b
|
clear garbage out of avatar-entity settings array before writing it to disk. when changing domains, re-rez avatar-entities after octree is cleared
|
2017-11-15 20:10:05 -08:00 |
|
David Back
|
4b2ff68fa3
|
var name and empty line
|
2017-11-15 19:05:44 -08:00 |
|
David Back
|
9bfbcb4434
|
code review updates
|
2017-11-15 18:06:49 -08:00 |
|
SamGondelman
|
3274c41aeb
|
Merge remote-tracking branch 'upstream/pointers' into ui
|
2017-11-15 17:45:45 -08:00 |
|
luiscuenca
|
9f9c1e2d97
|
9267 Fix not restoring animations after changing view modes
|
2017-11-15 18:17:10 -07:00 |
|
John Conklin II
|
0306c22394
|
Merge pull request #11823 from luiscuenca/case9267
Fix not restoring animations after changing view modes
|
2017-11-15 16:38:35 -08:00 |
|
John Conklin II
|
21503a635f
|
Merge pull request #11811 from birarda/feat/entity-server-flap
Hold entity data until client is presumably reachable and has queried
|
2017-11-15 16:16:50 -08:00 |
|
Dante Ruiz
|
dd8ea759d4
|
fix tablet rez for commence button
|
2017-11-15 15:48:39 -08:00 |
|
Sam Gateau
|
3f5b21ec22
|
Merge pull request #11559 from Zvork/bloom
Bloom
|
2017-11-15 15:11:31 -08:00 |
|
Ryan Huffman
|
60a222e4b4
|
Merge pull request #11810 from Atlante45/fix/stuck-acs
Fix stuck ACs
|
2017-11-15 14:59:51 -08:00 |
|
Zach Fox
|
9ad27e93f5
|
Merge pull request #11820 from ElderOrb/FB9264
9264 dismiss keyboard after user finished typing in marketplace searc…
|
2017-11-15 14:56:00 -08:00 |
|
SamGondelman
|
7eb22b372f
|
merge with master
|
2017-11-15 14:35:30 -08:00 |
|
David Kelly
|
009e6b252a
|
Merge pull request #11814 from AndrewMeadows/fix-cylinders
fix cylinder collision shape
|
2017-11-15 15:24:29 -07:00 |
|
Zach Fox
|
9f80a5f081
|
Merge pull request #11817 from zfox23/commerce_rezFix
Fix rezzing non-JSON marketplace items
|
2017-11-15 14:17:05 -08:00 |
|
SamGondelman
|
8730a26d20
|
use mouse events for offscreenui because touch events aren't working with the eventFilter, cleanup, documentation
|
2017-11-15 14:12:16 -08:00 |
|
luiscuenca
|
bf0d55aa98
|
9267 Fix not restoring animations after changing view modes
|
2017-11-15 15:04:24 -07:00 |
|
Dante Ruiz
|
9564b7567b
|
fixing tablet in 3d person
|
2017-11-15 13:39:21 -08:00 |
|
David Back
|
e0ce154472
|
remove includes, fix comment
|
2017-11-15 13:37:15 -08:00 |
|
Dante Ruiz
|
b42704012e
|
Merge pull request #11819 from hyperlogic/bug-fix/avatar-eye-height
Bug fix for MyAvatar.getEyeHeight()
|
2017-11-15 13:20:30 -08:00 |
|
Alexander Ivash
|
78d89d886f
|
9264 dismiss keyboard after user finished typing in marketplace search bar and hit search or return key
|
2017-11-16 00:13:46 +03:00 |
|
John Conklin II
|
703d1e1739
|
Merge pull request #11808 from Atlante45/hazeUIFix
RC-59 patch - Removed Keylight attenuation from .js (as well as .html).
|
2017-11-15 12:54:14 -08:00 |
|
David Back
|
0b8f888d9b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into mirrorfanciness3
|
2017-11-15 12:50:03 -08:00 |
|
David Back
|
fee7701890
|
working mirror projection for secondary camera
|
2017-11-15 12:49:39 -08:00 |
|
Anthony J. Thibault
|
b49891c0f8
|
Bug fix for MyAvatar.getEyeHeight()
|
2017-11-15 11:27:42 -08:00 |
|
Zach Fox
|
e8c4878c8f
|
Fix rezzing non-JSON marketplace items
|
2017-11-15 11:25:18 -08:00 |
|
Atlante45
|
d8b1cb10df
|
CR
|
2017-11-15 11:20:30 -08:00 |
|