David Rowe
|
2c542b73a0
|
Fix particles emitter rendering not updating when edit textures URL
|
2017-11-10 10:22:35 +13: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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
Ryan Downe Karpf
|
071c7154fe
|
Merge pull request #11715 from highfidelity/RC-58
RC58
|
2017-11-07 14:21:13 -08:00 |
|
Seth Alves
|
0edf056b78
|
Merge pull request #11755 from MidnightRift/patch-1
Fix controllerDispatcherUtils file path
|
2017-11-07 13:22:18 -08:00 |
|
samcake
|
6481e0f713
|
Address cauterized cluster matrices issue
|
2017-11-07 12:52:23 -08:00 |
|
samcake
|
5ca3113709
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-11-07 10:42:28 -08:00 |
|
Elisa Lupin-Jimenez
|
89a9269982
|
synced up
|
2017-11-07 10:37:55 -08:00 |
|
Clément Brisset
|
85efe5265d
|
Merge pull request #11724 from ctrlaltdavid/21580
Fix serverScripts not being able to see entities in parent/child tree
|
2017-11-07 10:36:20 -08:00 |
|
Seth Alves
|
7c6b5081d6
|
Merge pull request #11725 from luiscuenca/case8270
8270 Changing avatars while sitting - restore animations
|
2017-11-07 09:55:06 -08:00 |
|
Seth Alves
|
e22926eb89
|
Merge pull request #11762 from ctrlaltdavid/21594
Speed up entity list update after deleting entities
|
2017-11-07 09:34:47 -08:00 |
|
Seth Alves
|
ce7d0c324b
|
Merge pull request #11761 from ctrlaltdavid/21593
Don't move or rotate entities if Alt or Meta keys are pressed
|
2017-11-07 09:33:21 -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 |
|
David Rowe
|
fadbf09cdd
|
Avoid potentially slow entity list refresh upon deleting entities
|
2017-11-07 18:10:10 +13:00 |
|
samcake
|
f665bf384b
|
merge with upstream, and clean code
|
2017-11-06 17:02:10 -08:00 |
|
David Rowe
|
60319e8d53
|
Don't move or rotate entities if Alt or Meta keys are pressed
|
2017-11-07 13:35:31 +13:00 |
|
Zach Fox
|
fff2160113
|
Merge pull request #11759 from zfox23/commerce_fixLogOutCrash
Fix crash when logging out while Passphrase screen visible
|
2017-11-06 16:21:08 -08: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 |
|
David Rowe
|
b272b2e6c8
|
Fix import from URL adding multiple copies of imported entities
|
2017-11-07 11:28:35 +13:00 |
|
samcake
|
eaed02b144
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-11-06 13:52:05 -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
|
d7429094e4
|
Merge pull request #11728 from howard-stearns/stable-v-staging-update-for-marketplace-injection
stable-v-staging for marketplace injection
|
2017-11-06 13:36:56 -08:00 |
|
John Conklin II
|
892980a8f0
|
Merge pull request #11753 from samcake/RC-58
RC-58: fix crash 8900 that triggers on highlighted objects which are edited at the same time
|
2017-11-06 13:36:46 -08:00 |
|