Brad Davis
|
7bf1b176d7
|
Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem
|
2017-11-10 14:21:24 -08:00 |
|
Brad Davis
|
92a3c209aa
|
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
|
2017-11-10 11:44:29 -08:00 |
|
Anthony Thibault
|
08c12a1ced
|
Merge pull request #11704 from AndrewMeadows/shape-manager-key
cleanup ShapeInfo hash generation
|
2017-11-10 11:31:46 -08:00 |
|
Melissa Brown
|
f7eb57a54c
|
Merge pull request #11653 from vladest/fix_sriptslog_multiply_window
Fix scriptslog multiply window
|
2017-11-10 11:11:46 -08: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 |
|
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 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 |
|
Anthony J. Thibault
|
9724a5e5b8
|
Fix for address sanitizer warning
This fixes a potential null pointer dereference.
|
2017-11-09 10:53:36 -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 |
|
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 |
|
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 |
|
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 |
|
Brad Davis
|
25df649b44
|
Fix desktop mode script URL injection
|
2017-11-08 14:55:34 -08:00 |
|
Elisa Lupin-Jimenez
|
796388dfb4
|
reverted a line to match current master
|
2017-11-08 14:50:15 -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 |
|
Zach Fox
|
38fde43009
|
...simplify your life
|
2017-11-08 13:19:47 -08:00 |
|
vladest
|
02625a6e28
|
Remove script from engine
|
2017-11-08 21:53:42 +01: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 |
|
Sam Gateau
|
114a45a089
|
Merge pull request #11742 from samcake/orange
Fix avatar attachment tearing
|
2017-11-08 12:29:46 -08:00 |
|
vladest
|
6685b74c2a
|
Remove checking of empty model url and add sanity for checking modelUrl field existing
|
2017-11-08 21:23:50 +01:00 |
|
Brad Davis
|
1a58aee385
|
Fix scripting URL injection, I hope
|
2017-11-08 12:00:29 -08:00 |
|
samcake
|
af1180255e
|
fixes from code review
|
2017-11-08 11:45:40 -08:00 |
|
samcake
|
75ce61c3a6
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-11-08 11:30:53 -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 |
|
Zach Fox
|
bd0c87ddad
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_seedingFrontend
|
2017-11-08 10:14:59 -08:00 |
|
vladest
|
5e32298183
|
Rework as script=only solution
|
2017-11-08 18:43:59 +01:00 |
|
vladest
|
72c4f5761a
|
Merge branch 'master' into fix_sriptslog_multiply_window
|
2017-11-08 14:04:09 +01:00 |
|
Sam Gateau
|
3ef9ce0af6
|
Merge pull request #11732 from NissimHadar/hazeMaskFix
Haze mask fix
|
2017-11-07 17:37:24 -08:00 |
|
samcake
|
0718763ed1
|
Adjust syntax
|
2017-11-07 17:31:15 -08:00 |
|
David Rowe
|
ebe5d51ee8
|
Label models.json.gz paths in server Content tab with operating system
|
2017-11-08 14:25:10 +13: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 |
|
samcake
|
91030a0057
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-11-07 15:55:59 -08:00 |
|
Atlante45
|
8a903c8b12
|
Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master
|
2017-11-07 14:26:25 -08:00 |
|