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 |
|
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 |
|
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 |
|
Olivier Prat
|
0bbd1edc0a
|
Fixed fluttering highlight bug by attaching only stencil when drawing outline
|
2017-11-07 18:26:15 +01: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
|
ffa46b487a
|
Only non empty selections are now linked to highlight passes
|
2017-11-07 17:07:37 +01:00 |
|
Olivier Prat
|
fe79730012
|
Bounds buffer is now per instance to fix a bug
|
2017-11-07 16:58:04 +01:00 |
|
Olivier Prat
|
25b2a2ff5e
|
Bounds buffer is now per instance to fix a bug
|
2017-11-07 16:57:33 +01: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 |
|
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 |
|
Nissim Hadar
|
650df24761
|
Improved Haze UI in Create menu
|
2017-11-06 14:27:02 -08: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 |
|
samcake
|
dfa4afc7f6
|
and again, clean up
|
2017-11-06 12:47:34 -08:00 |
|
samcake
|
9652902911
|
Removing the changes that i introduced by mistake from another branch :((((
|
2017-11-06 12:43:22 -08:00 |
|
samcake
|
4cc0a46998
|
Merge branch 'RC-58' of https://github.com/samcake/hifi into RC-58
|
2017-11-06 11:28:49 -08:00 |
|
samcake
|
d878fac62c
|
REverse changes
|
2017-11-06 11:25:02 -08:00 |
|
Brad Hefta-Gaub
|
26c77ba72d
|
Merge pull request #11749 from ZappoMan/fixImportLargeEntities
allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU
|
2017-11-06 10:06:07 -08:00 |
|
samcake
|
0d900d7871
|
code style and comment
|
2017-11-06 09:12:02 -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 |
|
samcake
|
d446796bc1
|
Merge branch 'RC-58' of https://github.com/samcake/hifi into RC-58
|
2017-11-06 09:01:30 -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 |
|