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 |
|
vladest
|
7f60ee1b65
|
Merge branch 'master' into fix_sriptslog_multiply_window
|
2017-11-05 22:23:53 +01:00 |
|
Midnight
|
e2ca3c6de0
|
Fix lib file path
Changed the include to what should be the correct file path. it does not exist in the controllers folder.
|
2017-11-05 13:39:26 -07:00 |
|
David Rowe
|
9db0dd6fea
|
Fix Asset Browser's "Copy URL" context menu
|
2017-11-05 20:38:37 +13:00 |
|
Sam Gateau
|
45e5d91b9d
|
Change the sub renderItemIDs list of the Model entity in its meta through a transaction instead of going through the pointer to the model
|
2017-11-04 20:49:55 -07:00 |
|
David Rowe
|
05275afb4f
|
Resending full scene is not necessary after all
|
2017-11-05 15:48:02 +13:00 |
|
David Rowe
|
a76b7855b5
|
Record only explicitly filtered-in entities for flagging extras
|
2017-11-05 15:03:43 +13:00 |
|
David Rowe
|
4a5f52155c
|
Pin node pointer
|
2017-11-05 14:33:30 +13:00 |
|
David Rowe
|
2d27a6cf4c
|
Merge branch 'master' into 21580
|
2017-11-05 13:59:43 +13:00 |
|
Brad Hefta-Gaub
|
c1dfa24c12
|
Merge pull request #11743 from kencooke/audio-peakmeters-bugfix
Fix the audio input device peak meters
|
2017-11-04 13:55:08 -07:00 |
|
ZappoMan
|
d4b4d188ed
|
allow splitting of edit or add entity packets across multiple edit packets when property list is larger than MTU
|
2017-11-04 13:40:41 -07:00 |
|
Ken Cooke
|
9c1a33c826
|
Merge pull request #11748 from kencooke/audio-wasapi-update
Update WASAPI audio plugin
|
2017-11-04 09:25:00 -07:00 |
|
Sam Gateau
|
7da69633f3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
|
2017-11-03 20:20:53 -07:00 |
|
Ken Cooke
|
6ca9cc0239
|
Update WASAPI audio plugin
|
2017-11-03 18:40:55 -07:00 |
|
Dante Ruiz
|
539cf35f30
|
saving work
|
2017-11-03 17:14:27 -07:00 |
|
samcake
|
053052a95d
|
removing warnings
|
2017-11-03 13:28:20 -07:00 |
|
Brad Hefta-Gaub
|
d5eb670819
|
Merge pull request #11746 from highfidelity/RC-58
Merge RC58 into master
|
2017-11-03 12:50:02 -07:00 |
|
Melissa Brown
|
a14e98053e
|
Merge pull request #11138 from Nex-Pro/21466
Fix Avatar Rotation upon Teleporting Using PAL
|
2017-11-03 11:58:15 -07:00 |
|
luiscuenca
|
f226835876
|
8495 No mirror camera in HMD mode
|
2017-11-03 11:51:03 -07:00 |
|
Ryan Huffman
|
7210a457c9
|
Merge pull request #11740 from huffman/fix/placename-erase-domain-id
Fix domain id getting set to empty when adding place name
|
2017-11-03 11:37:07 -07:00 |
|
Zach Fox
|
c496429a85
|
Add Machine Fingerprint to receive_at endpoint txn'
|
2017-11-03 10:40:25 -07:00 |
|
Nex-Pro
|
3171418173
|
Update NameCard.qml
|
2017-11-03 17:21:35 +00:00 |
|
Olivier Prat
|
fcf1c301b6
|
Merge branch 'master' of git://github.com/highfidelity/hifi into bloom
|
2017-11-03 18:12:15 +01:00 |
|
John Conklin II
|
c946e46506
|
Merge pull request #11737 from AndrewMeadows/scale-to-fit_RC-58
RC-58: scaleToFit() the model before updating render items
|
2017-11-03 09:46:20 -07:00 |
|
John Conklin II
|
ff36cbf45f
|
Merge pull request #11731 from sethalves/fix-ignore
stop drawing ignored avatars, even if PAL is still open
|
2017-11-03 09:45:03 -07:00 |
|
Olivier Prat
|
79c2da3dcb
|
Removed cull functor from shadow render task as it is inadapted for the shadow's orthographic projection
|
2017-11-03 16:52:29 +01:00 |
|
Olivier Prat
|
fbcb2924e8
|
Merge branch 'master' of git://github.com/highfidelity/hifi into shadow
|
2017-11-03 15:08:15 +01:00 |
|
Olivier Prat
|
e0fd71f246
|
Merged from master
|
2017-11-03 14:39:42 +01:00 |
|
Olivier Prat
|
4b598a6e24
|
Working stencil mask with object bounding boxes
|
2017-11-03 14:26:36 +01:00 |
|
Ken Cooke
|
babaef8399
|
Fix the audio input device peak meters
|
2017-11-03 05:59:59 -07:00 |
|
Sam Gateau
|
390f5b53ca
|
cleaning more code
|
2017-11-02 23:55:44 -07:00 |
|
Sam Gateau
|
c11f46a8d3
|
cleaning more code
|
2017-11-02 23:35:18 -07:00 |
|