Zach Fox
641c4656c4
Fix bug with disappearing certificate info
2017-11-13 10:53:16 -08:00
Ryan Downe Karpf
3ea6ecf104
Merge pull request #11747 from luiscuenca/case8495
...
8495 No mirror camera in HMD mode
2017-11-13 09:09:34 -08:00
Ryan Downe Karpf
f8b1c7978c
Merge pull request #11772 from 1P-Cusack/FogBugz/Case_6569
...
[Case 6569]: Silent failure is possible during Model Creation
2017-11-12 08:36:10 -08:00
Sam Gateau
ecf67cc331
Merge pull request #11650 from Zvork/outline
...
Multiple Outline Groups
2017-11-10 15:45:03 -08:00
Anthony J. Thibault
ba4c0f189e
code review feedback
...
removed discontinuity in safeDeltaTime, which is used to prevent division by zero.
2017-11-10 10:25:29 -08:00
Anthony J. Thibault
4169e11e77
Merge branch 'master' into bug-fix/div-by-zero
2017-11-10 10:15:26 -08:00
luiscuenca
055fe16677
Allow script to change to mirror camera in HMD
2017-11-09 18:27:16 -07:00
Sam Gondelman
9010a02bee
Merge pull request #11790 from SamGondelman/overlayFlash
...
Fix laser end not disappearing
2017-11-09 17:10:07 -08:00
Anthony Thibault
38cc56db7f
Merge pull request #11785 from luiscuenca/case6944
...
6944 Avatar scale is preserved across domains
2017-11-09 16:38:45 -08:00
SamGondelman
9188ae9fb5
fix laser end not disappearing
2017-11-09 16:26:37 -08:00
luiscuenca
355b465109
make leaveDomain slot private
2017-11-09 16:05:53 -07:00
David Kelly
31dc140ea6
Merge pull request #11771 from zfox23/commerce_seedingFrontend
...
Commerce: Seeding Frontend
2017-11-09 14:45:10 -07:00
Sam Gondelman
d1e41e6bf0
Merge pull request #11786 from SamGondelman/overlayFlash
...
Fix overlay flash on visibility and position change
2017-11-09 13:36:49 -08:00
SamGondelman
224386317d
send overlay visibility through transaction
2017-11-09 12:14:40 -08:00
luiscuenca
10f484c668
6944 Avatar scale is saved across domains
2017-11-09 12:21:23 -07:00
Elisa Lupin-Jimenez
1e526605ba
Merge pull request #11778 from elisa-lj11/blocks
...
Fixed Blocks downloads (now Google Poly)
2017-11-08 17:53:26 -08:00
Zach Fox
19b7c6e025
Remove machine fingerprint from receiveAt
2017-11-08 17:15:27 -08:00
LaShonda Hopper
0e90c92cf5
[Case 6569] Minor: Break up line to pass column count guidelines.
...
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:35:12 -05:00
LaShonda Hopper
a057cb914f
[Case 6569] Fixes clipping of cancel button by window edge.
...
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:27:25 -05:00
LaShonda Hopper
dac2ae19a4
[Case 6569] Add protection for dynamic vs static collision type (details below).
...
When creating a model, it was possible to elect Exact collision with the dynamic
property even though this combination is prohibited. This combination would silently
fail rather than notifying the user of the error.
This commit implements safeguards against the invalid combination:
* If the user elects the Exact collision type and the dynamic field is unchecked, then dynamic field is disabled.
* If the user elects a different collision type and the dynamic filed is unchecked, then the dynamic field is enabled.
* If the user has checked the dynamic field and subsequently elects the Exact collision type, then the selection is
void and the previous collision selection is retained; however, an error dialog is presented informing the user of the error.
Changes Committed:
modified: interface/resources/qml/hifi/tablet/NewModelDialog.qml
2017-11-08 18:27:24 -05:00
Elisa Lupin-Jimenez
45b9a150dc
updated blocks url refs in application to fix download issue
2017-11-08 15:21:48 -08:00
MissLiviRose
45e58b93e5
add skeleton scale change signal so scripts can detect scaling change
2017-11-08 14:23:49 -08:00
Zach Fox
38fde43009
...simplify your life
2017-11-08 13:19:47 -08:00
Zach Fox
7995f50fab
Fix seeding
2017-11-08 12:52:53 -08:00
Zach Fox
3190fe1f32
Use keyfilepath instead of cached public keys
2017-11-08 12:30:48 -08:00
Zach Fox
72fa0823ba
Logic changes
2017-11-08 11:01:54 -08:00
Zach Fox
b7163bb8fc
Frontend changes
2017-11-08 10:25:11 -08:00
Olivier Prat
f996435ac8
Merge branch 'master' of git://github.com/highfidelity/hifi into highlight
2017-11-08 11:41:21 +01:00
Elisa Lupin-Jimenez
1ceec17405
missed an fbx block
2017-11-07 17:12:39 -08:00
Elisa Lupin-Jimenez
9a09ffe12f
removed old fbx code
2017-11-07 17:10:57 -08:00
Elisa Lupin-Jimenez
e37010565f
changed fileDialog return value to be compatible with musvis
2017-11-07 16:55:07 -08:00
Zach Fox
8f54c106f6
Could it be this simple?
2017-11-07 12:12:27 -08:00
Zach Fox
f248eb5518
Change wallet home when 0 transactions
2017-11-07 11:30:09 -08:00
Elisa Lupin-Jimenez
89a9269982
synced up
2017-11-07 10:37:55 -08:00
Seth Alves
e9c0e53aa6
Merge pull request #11760 from druiz17/far-grab-parent
...
Far grab rolls up parent tree when grabbing and add offset to LaserPointer::lockEndUUID
2017-11-07 08:53:13 -08:00
Olivier Prat
9817cb4c44
Added highlight configuration in HighlightStageSetup job
2017-11-07 15:35:43 +01:00
Olivier Prat
3cc445ff02
Renamed outline to highlight
2017-11-07 11:07:25 +01:00
Olivier Prat
84be026e0b
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-11-07 09:48:45 +01:00
Dante Ruiz
c9d67f762b
made requested changes
2017-11-06 16:20:16 -08:00
Dante Ruiz
067ed2ffe0
apply coding standard
2017-11-06 16:09:31 -08:00
Dante Ruiz
646e5455ac
forgot to remove unused variable
2017-11-06 16:05:44 -08:00
Dante Ruiz
41c6261b74
LaserPointer: made _objectLockEnd into a struct
2017-11-06 16:04:33 -08:00
Dante Ruiz
3b15897b12
fixed farGrab parent grabbing and laser LockEndUUID
2017-11-06 15:21:20 -08:00
Zach Fox
bb21c52783
Fix crash when logging out while Passphrase screen visible
2017-11-06 15:12:01 -08:00
Stephen Birarda
99552910f7
Merge pull request #11754 from ctrlaltdavid/21591
...
Fix Asset Browser's "Copy URL" context menu
2017-11-06 13:42:22 -08:00
Howard Stearns
0898ad8b25
Merge pull request #11745 from zfox23/commerce_receiveAtFingerprint
...
Add Machine Fingerprint to receive_at endpoint txn
2017-11-06 09:06:01 -08:00
Dante Ruiz
e432e62a39
Merge branch 'master' of github.com:highfidelity/hifi into far-grab-parent
2017-11-06 09:02:03 -08:00
luiscuenca
31b63ffbe6
Not posible to change to mirror mode using js
2017-11-06 08:03:07 -07:00
Olivier Prat
9e6472b577
Added OutlineStyleStage
2017-11-06 15:55:57 +01:00
Olivier Prat
09ee69db30
Merge branch 'master' of git://github.com/highfidelity/hifi into outline
2017-11-06 09:47:48 +01:00
