Daniela
|
e453bf8d55
|
Refactoring.
|
2017-09-08 17:58:16 +01:00 |
|
Daniela
|
08688dc9ed
|
Refactoring.
|
2017-09-08 17:56:11 +01:00 |
|
Daniela
|
758f049f30
|
Correct offset for teleport pad.
|
2017-09-08 14:02:26 +01:00 |
|
Daniela
|
10e29d1cf0
|
Decrease offset for teleport pad. Add Bubble orientation and scale correction.
|
2017-09-08 12:45:29 +01:00 |
|
Daniela
|
fde5e14c04
|
Merge branch 'feature/ant-man' of https://github.com/hyperlogic/hifi into feature/ant-man
|
2017-09-08 11:54:43 +01:00 |
|
Daniela
|
9eb429b25a
|
Fix offset for teleport pad.
|
2017-09-08 11:23:19 +01:00 |
|
Anthony J. Thibault
|
7ca498dc7f
|
Entities created from Google Blocks zip files now are positioned/scaled relative to the avatar.
|
2017-09-07 16:28:08 -07:00 |
|
Anthony J. Thibault
|
f4f9c29bff
|
Fix for avatar scale preferences
|
2017-09-07 15:30:16 -07:00 |
|
Anthony J. Thibault
|
d0f9a20a01
|
Fix for tablet grabbing at small scales
|
2017-09-07 15:10:15 -07:00 |
|
Daniela
|
d11a749365
|
Refactor 1 line. Pad alignment is correct.
|
2017-09-07 19:28:36 +01:00 |
|
Daniela
|
94e26a554d
|
Add 180 degrees rotation so that pad faces the avatar
|
2017-09-07 18:48:20 +01:00 |
|
Daniela
|
4c302b899d
|
Fix teleport pad alignment
|
2017-09-07 17:52:09 +01:00 |
|
Daniela
|
3ff707f27e
|
Add Avatar resize compatible teleport pad alignment
|
2017-09-07 13:31:41 +01:00 |
|
Daniela
|
37f959d749
|
Add Avatar resize compatible teleport pad alignment
|
2017-09-06 19:45:58 +01:00 |
|
Daniela
|
0ac7e00612
|
Add Avatar resize compatible teleport.js pad scale
|
2017-09-06 19:45:03 +01:00 |
|
Anthony J. Thibault
|
2f850826f2
|
Allow override of near/far clip planes in Oculus and OpenVR plugins
|
2017-09-06 11:02:44 -07:00 |
|
Dante Ruiz
|
a5553d5e1c
|
fixed text scale for notifications
|
2017-09-06 09:26:48 -07:00 |
|
Dante Ruiz
|
b4f7cb961a
|
Merge branch 'feature/ant-man' of github.com:hyperlogic/hifi into feature/ant-man
|
2017-09-06 08:38:08 -07:00 |
|
Anthony J. Thibault
|
af8b147321
|
away.js - works better with sensor scale.
|
2017-09-05 17:34:35 -07:00 |
|
Dante Ruiz
|
a34dae4aad
|
adding scale to notifications
|
2017-09-05 17:12:40 -07:00 |
|
Anthony J. Thibault
|
74f974c68f
|
Merge branch 'master' into feature/ant-man
|
2017-09-05 16:27:41 -07:00 |
|
Dante Ruiz
|
fec8482b69
|
Merge branch 'master' of github.com:highfidelity/hifi into feature/ant-man
|
2017-09-05 16:26:51 -07:00 |
|
Thijs Wenker
|
08baa96dc9
|
Merge pull request #11296 from misslivirose/fix-content-message
More detailed domain replacement message
|
2017-09-06 00:44:48 +02:00 |
|
Anthony J. Thibault
|
3d3bb2853a
|
Updated naturalDimensiosn for touch controller config
Totally untested! I don't have an oculus. I'm sure it will work tho. ;)
|
2017-09-05 15:39:35 -07:00 |
|
Melissa Brown
|
fe1b614f39
|
Merge pull request #11213 from MidnightRift/21341
WL 21341 DodgeBall
|
2017-09-05 15:33:31 -07:00 |
|
Anthony J. Thibault
|
23ff1b9ead
|
Fixes for scaling controller display
Adds MyAvatar.sensorToWorldScaleChanged signal.
|
2017-09-05 15:03:41 -07:00 |
|
Dante Ruiz
|
ad5b8c438e
|
Merge pull request #11107 from mnafees/21412
CR for Job #21412 - Add "Report a Problem" feature
|
2017-09-05 13:05:05 -07:00 |
|
Dante Ruiz
|
9f2bdce190
|
Merge pull request #11005 from Armads/WL21424
WL21424 hide head attachments when head joint is hidden
|
2017-09-05 13:04:14 -07:00 |
|
David Kelly
|
ee70df502e
|
Merge pull request #11307 from davidkelly/dk/commerceRegression
Regression in injection script
|
2017-09-05 13:02:33 -07:00 |
|
Dante Ruiz
|
e69227aef8
|
Merge pull request #11209 from vladest/tablet_login_button
Added login button to Tablet
|
2017-09-05 12:59:02 -07:00 |
|
David Kelly
|
4bdfe092cf
|
Regression in injection script
|
2017-09-05 12:28:31 -07:00 |
|
David Kelly
|
b3132e9871
|
Merge pull request #11304 from davidkelly/dk/commerceResetBug
Reset passphrase fix
|
2017-09-05 11:27:02 -07:00 |
|
David Kelly
|
3bc45aefb1
|
Reset passphrase fix
|
2017-09-05 10:04:16 -07:00 |
|
Anthony J. Thibault
|
f0912987a3
|
Fix ray picks against HUD sphere at different sensor scale factors
|
2017-09-05 10:03:19 -07:00 |
|
Andrew Meadows
|
4b8840f307
|
Merge pull request #11282 from sethalves/fix-winking-dynamic-children-1
fix a bug that caused dynamic children to wink in and out and then vanish
|
2017-09-05 10:02:47 -07:00 |
|
David Kelly
|
8723ff2df2
|
Merge pull request #11294 from zfox23/commerce_walletPassphraseModal
Commerce: Wallet Passphrase Input Modal
|
2017-09-01 17:46:09 -07:00 |
|
Seth Alves
|
91ee22e5a7
|
Merge pull request #11297 from sethalves/fix-protocol-for-pr-11290
PR-11290 didn't actually bump protocol version
|
2017-09-01 17:27:28 -07:00 |
|
Seth Alves
|
0855dfc1c6
|
PR-11290 didn't actually bump protocol version
|
2017-09-01 17:26:32 -07:00 |
|
Seth Alves
|
8ccacf34f4
|
Merge pull request #11290 from Menithal/21484
WL21484 - Add an additional parameter for entity animations to "allow translation"
|
2017-09-01 15:34:07 -07:00 |
|
David Kelly
|
47cd47f819
|
log when no passphrase was set before trying to decrypt
|
2017-09-01 14:50:45 -07:00 |
|
David Kelly
|
feaa8d3120
|
Someday, a real rain will come and wash Wallet.cpp
Till then, this little change will have to do.
|
2017-09-01 14:06:43 -07:00 |
|
David Kelly
|
90316e275a
|
Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal
|
2017-09-01 13:33:23 -07:00 |
|
Liv
|
7eab80e494
|
change message when permissions to replace domain content are not present
|
2017-09-01 13:17:37 -07:00 |
|
David Kelly
|
9fe6ce0337
|
working change passphrase. some cleanup to come
|
2017-09-01 13:11:56 -07:00 |
|
Zach Fox
|
3cf0df518f
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal
|
2017-09-01 11:53:47 -07:00 |
|
Zach Fox
|
51699c9a6a
|
Minor changes to fonts and colors
|
2017-09-01 11:44:46 -07:00 |
|
David Kelly
|
d8bb3c7915
|
Merge pull request #11289 from davidkelly/dk/penniesAndStuff
Display hfc in "pennies"
|
2017-09-01 11:39:30 -07:00 |
|
Anthony J. Thibault
|
26e9e6e580
|
Fixes for stylus ranges and grab radii
|
2017-09-01 11:19:51 -07:00 |
|
MandatoryMania
|
8c6bbb4968
|
Merge pull request #11295 from MandatoryMania/walletImgSwitch
Wallet img switch
|
2017-09-01 10:27:04 -07:00 |
|
David Kelly
|
655dc61ff2
|
doh
|
2017-09-01 10:16:45 -07:00 |
|