David Rowe
808f37a824
Prevent entities from jittering or drifting when grab a moving set
2017-09-06 22:54:51 +12:00
David Rowe
6c35a008f1
Fix scaling entities that have physics
2017-09-06 22:32:22 +12:00
David Rowe
7b19b39bce
Make physics work with multiple entities per HiFi's current capabilities
2017-09-06 18:36:06 +12:00
David Rowe
52bf8ac9a1
Merge branch 'master' into vr-edit-a
2017-09-06 13:33:33 +12:00
David Rowe
6838461b07
Display notification message when don't have rez permissions
2017-09-06 12:44:57 +12:00
anshuman64
3a44c6977e
Merge pull request #11300 from ElderOrb/case7196
...
7196 Mouse pointer no longer visible in HMD mode
2017-09-05 17:42:36 -07:00
David Rowe
61fc32714a
Handle domain and permission changes; disable app icon appropriately
2017-09-06 12:23:36 +12: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
Melissa Brown
fe1b614f39
Merge pull request #11213 from MidnightRift/21341
...
WL 21341 DodgeBall
2017-09-05 15:33:31 -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
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 Rowe
310750fc0f
Close the app when the user changes avatars
2017-09-04 13:30:51 +12:00
David Rowe
2cd6f7fd54
Fix cursor not working when change dominant hand
2017-09-04 12:59:05 +12:00
beholder
c62f9007e9
7196 Mouse pointer no longer visible in HMD mode
...
The issue was caused by creation of additional instances of 'Cursor::Manager' in plugins, which happened because
Cursor::Manager's code is inside static library so every module was getting its own copy of it. As the result cursor-related settings from Application never reached plugins.
The fix is based on converting 'Cursor::Manager' into 'Dependency' to avoid additional instances creation in plugins
2017-09-03 15:20:59 +03:00
David Rowe
44b365df6d
Merge branch 'master' into vr-edit-a
2017-09-03 10:57:32 +12:00
David Rowe
1cbc807016
Further haptic and audio tweaks
2017-09-02 21:23:30 +12:00
David Rowe
c93acbecaa
Move hover haptic pulses to dominant hand
2017-09-02 21:23:13 +12:00
David Rowe
039ceed74c
Modify equip and create sounds
2017-09-02 21:01:37 +12:00
David Rowe
5408daea73
Increase drop tool haptic pulse and decress hover haptic pulses
2017-09-02 20:49:50 +12:00
David Rowe
c7461a9646
Fix hover colors of menu buttons and header "back" icon
2017-09-02 20:36:22 +12:00
David Rowe
939b2ef11a
Fix laser enabling / disabling while inside an entity
2017-09-02 19:39:37 +12:00
David Rowe
d3819cfee3
Better names for overlay methods
2017-09-02 19:24:37 +12:00
David Rowe
9f9a0b0c58
Hide UI if hand is inside entity that camera is outside of
2017-09-02 19:09:36 +12:00
David Rowe
296d270098
Enable entities inside an entity to be manipulated
2017-09-02 19:06:43 +12: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
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
Menithal
5506520226
Fixed missing semi colon
2017-09-01 08:20:54 +03:00
David Rowe
269f1769be
Merge branch 'master' into vr-edit-a
2017-09-01 14:45:59 +12:00
David Rowe
110413b025
Fix action after color picker failure
2017-09-01 14:36:44 +12:00
Liv
8d21b286b4
string fix
2017-08-31 19:34:01 -07:00
David Rowe
734ce66df3
Add audio and haptic feedback
2017-09-01 14:30:22 +12:00
Hisham Qayum
ff6217069b
reverting some unneeded code changes
2017-08-31 17:30:24 -08:00
