Dante Ruiz
ef55e3181d
moveing controllerDispatchaer pointers to pointerUtils.js
2017-11-09 16:48:52 -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
Anthony Thibault
de9eeff7d2
Merge pull request #11783 from hyperlogic/bug-fix/rig-skeleton-dangling-pointer
...
Fix for address sanitizer warning
2017-11-09 14:19:03 -08:00
David Rowe
ad661cb345
Don't remove entities from list when try to delete locked entity
2017-11-10 10:50:07 +13:00
David Kelly
31dc140ea6
Merge pull request #11771 from zfox23/commerce_seedingFrontend
...
Commerce: Seeding Frontend
2017-11-09 14:45:10 -07:00
Ken Cooke
c324f342b4
Fix to check ANDROID before UNIX
2017-11-09 13:39:13 -08: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
David Rowe
c53c356842
Display "no preview available" for ATP images in particles UI
2017-11-10 10:23:35 +13:00
David Rowe
2c542b73a0
Fix particles emitter rendering not updating when edit textures URL
2017-11-10 10:22:35 +13:00
Dante Ruiz
86439eff07
fixing merge conflict
2017-11-09 13:07:55 -08:00
SamGondelman
224386317d
send overlay visibility through transaction
2017-11-09 12:14:40 -08:00
SamGondelman
5a78c9ebfe
integrated stylus into pointer system, need to update controller module
2017-11-09 11:59:17 -08:00
Elisa Lupin-Jimenez
119c662899
fixed null file path in file dialog call
2017-11-09 11:46:19 -08:00
luiscuenca
10f484c668
6944 Avatar scale is saved across domains
2017-11-09 12:21:23 -07:00
Anthony J. Thibault
9724a5e5b8
Fix for address sanitizer warning
...
This fixes a potential null pointer dereference.
2017-11-09 10:53:36 -08:00
Ken Cooke
9a1386bf0d
Fix build errors on Linux
2017-11-09 10:34:52 -08:00
Anthony J. Thibault
5507bcea3c
Remove hack for missing inttypes.h header on VS2010
2017-11-09 10:34:01 -08:00
Ryan Huffman
d62c98c6e2
Update network address/port label in DS settings
2017-11-09 10:03:41 -08:00
Ryan Huffman
e274df065d
Fix label nav always being shown in ds settings nav
2017-11-09 09:25:16 -08:00
Ryan Huffman
3b702a7ae3
Make ESC close dialog windows on DS settings
2017-11-09 09:05:07 -08:00
Olivier Prat
4f7ed38e98
Fixed potential link errors on Mac
2017-11-09 11:26:08 +01:00
Olivier Prat
bccd6df57c
Fixed warning on Mac and Ubuntu
2017-11-09 11:19:28 +01:00
Ken Cooke
6d019b4302
Update the audio codecs
2017-11-08 18:16:42 -08:00
Clément Brisset
40baca6ee1
Merge pull request #11756 from ctrlaltdavid/21592
...
Fix import from URL adding multiple copies of imported entities
2017-11-08 18:01:48 -08:00
Clément Brisset
57202126ae
Merge pull request #11766 from ctrlaltdavid/21595
...
Label models.json.gz paths in server Content tab with operating system
2017-11-08 18:00:06 -08: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
luiscuenca
1791ed01ca
add width param to vertex shader
2017-11-08 18:35:26 -07:00
Zach Fox
19b7c6e025
Remove machine fingerprint from receiveAt
2017-11-08 17:15:27 -08:00
Seth Alves
b9652dd114
Merge pull request #11775 from misslivirose/feat/emit-scale-change
...
add skeleton scale change signal so scripts can detect scaling change
2017-11-08 16:57:52 -08:00
Nissim Hadar
7cb9514feb
Converted 'Glare Angle' control to a slider.
2017-11-08 16:50:44 -08:00
Nissim Hadar
5a56ea5894
Merge branch 'master' into hazeUIFix
2017-11-08 16:44:59 -08:00
Nissim Hadar
5c7ebc0af3
Converted 'Glare Angle' control to a slider.
2017-11-08 16:44:05 -08:00
Zach Fox
72ba892dbd
Merge pull request #11777 from zfox23/commerce_injectionTempFix
...
Revert 11728 and fix marketplace JS injection - should revisit
2017-11-08 16:37:57 -08:00
Nissim Hadar
2920c6f9a9
Merge branch 'master' into hazeUIFix
2017-11-08 15:42:20 -08:00
Nissim Hadar
c1b5d00993
Converted 'Background Blend' control to a slider.
2017-11-08 15:41:24 -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
Zach Fox
33b6a13a4d
Revert 11728 and fix marketplace JS injection - should revisit
2017-11-08 15:21:36 -08:00
Brad Hefta-Gaub
d608d6ebf4
Merge pull request #11763 from Atlante45/new-master
...
Merge stable back into master
2017-11-08 15:10:06 -08:00
Elisa Lupin-Jimenez
796388dfb4
reverted a line to match current master
2017-11-08 14:50:15 -08:00
Bradley Austin Davis
179f132fdf
Merge pull request #11719 from SamGondelman/ui
...
PointerEvents: HUD events, fix entity/overlay hover
2017-11-08 14:43:13 -08:00
Elisa Lupin-Jimenez
e4c7958585
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-11-08 14:36:07 -08:00
MissLiviRose
45e58b93e5
add skeleton scale change signal so scripts can detect scaling change
2017-11-08 14:23:49 -08:00
Seth Alves
34500fdf18
Merge pull request #11773 from vladest/fix_avatar_new_attachment
...
Remove checking of empty model url and add sanity for checking modelU…
2017-11-08 14:15:17 -08:00
Ryan Huffman
028410a26a
Fix alignment of Disconnect btn on ds settings
2017-11-08 14:05:51 -08:00
Ryan Huffman
1db8e2a0ec
Update create domain id language
2017-11-08 14:01:04 -08:00
