Brad Hefta-Gaub
|
61a5750b09
|
Merge pull request #12204 from druiz17/fix-dynamic-entities-not-colliding
Fix dynamic entities not colliding with avatar when a grab action is removed
|
2018-01-18 14:39:21 -08:00 |
|
Clément Brisset
|
956f45b5af
|
Merge pull request #11932 from birarda/bug/baking-folder-number
fix sparse rectification for small textures, export for same model at diff URL
|
2018-01-18 14:25:33 -08:00 |
|
Stephen Birarda
|
35f83ad3cd
|
Merge pull request #12150 from Atlante45/fix/exit-crash
Make type name hash static const
|
2018-01-18 13:45:58 -07:00 |
|
Stephen Birarda
|
95d0e8aa56
|
Merge pull request #12003 from birarda/bug/double-free-in-agent
remove unecessary parenting of Agent script engine
|
2018-01-18 11:33:17 -07:00 |
|
Atlante45
|
482ca3f038
|
Make type name hash static const
|
2018-01-18 10:28:43 -08:00 |
|
David Kelly
|
f05d650e0b
|
Merge pull request #12199 from davidkelly/dk/txnHistorySpecialCase
Don't make links in txn history for highfidelity and marketplace
|
2018-01-18 10:15:58 -08:00 |
|
Dante Ruiz
|
92f8f9d2c0
|
Merge pull request #12200 from sethalves/fix-avatar-entity-delete-deadlock
avoid a deadlock when clearing avatar entities
|
2018-01-18 10:07:07 -08:00 |
|
Sam Gateau
|
dd436229c1
|
Merge pull request #12193 from SamGondelman/transparent
Fix black flashing on transparent objects
|
2018-01-18 09:11:46 -08:00 |
|
Dante Ruiz
|
3e3b3a0a9e
|
Merge branch 'master' of github.com:highfidelity/hifi into fix-dynamic-entities-not-colliding
|
2018-01-18 08:56:01 -08:00 |
|
Dante Ruiz
|
93594fb0bb
|
make dynamic entities collide with avatar when removing grab action
|
2018-01-18 08:55:51 -08:00 |
|
Seth Alves
|
45406177e5
|
avoid a deadlock when clearing avatar entities
|
2018-01-17 17:56:25 -08:00 |
|
David Kelly
|
c661bec8fd
|
whitespace
|
2018-01-17 17:15:14 -08:00 |
|
David Kelly
|
1dde25e38f
|
Don't make links in txn history for highfidelity and marketplace
|
2018-01-17 16:51:38 -08:00 |
|
Zach Fox
|
5ce768f402
|
Merge pull request #12151 from zfox23/commerce_sendMoney1
Commerce: P2P Transfer Iteration 1
|
2018-01-17 16:41:56 -08:00 |
|
Zach Fox
|
c63453175e
|
Merge pull request #12196 from zfox23/commerce_robustReceiveAt
Make the call to receiveAt more robust
|
2018-01-17 16:41:07 -08:00 |
|
SamGondelman
|
a44c965f56
|
fix black flashing on transparent objects
|
2018-01-17 15:59:07 -08:00 |
|
Seth Alves
|
fda4cf10b9
|
Merge pull request #12159 from Zvork/compactvb
Fix potential assert exception in FBXMesh_Reader.cpp
|
2018-01-17 15:16:22 -08:00 |
|
Zach Fox
|
16d51986a9
|
Make the call to receiveAt more robust
|
2018-01-17 15:11:58 -08:00 |
|
Dante Ruiz
|
8f22c719b3
|
Merge pull request #12099 from sethalves/run
allow avatar walk-speed to be set from javascript
|
2018-01-17 13:53:13 -08:00 |
|
Seth Alves
|
8edded7059
|
Merge pull request #12164 from ctrlaltdavid/21695
Remove old ToolWindow code
|
2018-01-17 13:43:59 -08:00 |
|
Seth Alves
|
7af90d5429
|
Merge pull request #12171 from mnafees/21671
CR for Job #21671 - Window.copyToClipboard() doesn't work in .js files
|
2018-01-17 13:42:47 -08:00 |
|
Seth Alves
|
33c586de60
|
Merge pull request #12188 from hyperlogic/feature/small-anim-refactor
Remove dangerous "Use Anim Pre and Post Rotations" menu item
|
2018-01-17 13:41:51 -08:00 |
|
Zach Fox
|
1d747bc0e4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_sendMoney1
|
2018-01-17 11:56:00 -08:00 |
|
Stephen Birarda
|
c90cdf52b4
|
remove unecessary parenting of Agent script engine
|
2018-01-17 11:02:56 -08:00 |
|
Sam Gateau
|
0e72197a37
|
Merge pull request #12179 from Zvork/specular
Fixed error in Specular shader which gave low key specular highlights
|
2018-01-17 10:51:25 -08:00 |
|
David Back
|
92c0fd4877
|
Merge pull request #12116 from dback2/deleteAccount_renameGS_addAS
Merge Account & GlobalServices follow-up
|
2018-01-17 10:50:54 -08:00 |
|
Seth Alves
|
1e847cf32e
|
Merge branch 'master' of github.com:highfidelity/hifi into run
|
2018-01-17 08:08:13 -08:00 |
|
Seth Alves
|
69a33428c0
|
Merge pull request #12078 from druiz17/soft-entities
Soft Entities
|
2018-01-17 08:02:37 -08:00 |
|
Seth Alves
|
d3084dc0df
|
defang
|
2018-01-17 07:11:27 -08:00 |
|
Seth Alves
|
bfccb52b7a
|
Merge branch 'master' of github.com:highfidelity/hifi into run
|
2018-01-17 07:02:14 -08:00 |
|
Anthony J. Thibault
|
bc587bf6d8
|
Removal of legacy Rig methods
|
2018-01-16 18:19:35 -08:00 |
|
Sam Gateau
|
d4571bd86a
|
Merge pull request #12181 from humbletim/rename-model-graphics
Rename libraries/model -> libraries/graphics
|
2018-01-16 18:12:25 -08:00 |
|
Anthony J. Thibault
|
576273efe3
|
Remove Rig::restoreJointPosition and references to it.
|
2018-01-16 18:01:58 -08:00 |
|
Anthony J. Thibault
|
1027025b5c
|
remove bind poses from AnimSkeleton.
|
2018-01-16 17:41:25 -08:00 |
|
Anthony J. Thibault
|
51ea2632c0
|
Remove Avatar UseAnimPreAndPostRotations option.
This should always be true and can lead to hard to diagnose bugs if it is ever set to false.
|
2018-01-16 17:27:19 -08:00 |
|
Zach Fox
|
e700ff91d0
|
Remove warning
|
2018-01-16 15:58:17 -08:00 |
|
Zach Fox
|
8cc427a374
|
Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1
|
2018-01-16 15:07:53 -08:00 |
|
Zach Fox
|
8cc5a0a7cb
|
Add UserInfoViewer
|
2018-01-16 15:06:51 -08:00 |
|
David Kelly
|
a9fc63da4c
|
fix error when pending
|
2018-01-16 15:04:05 -08:00 |
|
David Kelly
|
929760c226
|
fix time display
|
2018-01-16 14:52:26 -08:00 |
|
NissimHadar
|
9a382ebb86
|
Merge pull request #12177 from NissimHadar/defaultAmbientFix
Set ambient mode to inherit if no URLs have been entered.
|
2018-01-16 14:40:08 -08:00 |
|
Seth Alves
|
511f94a4fc
|
Merge branch 'master' of github.com:highfidelity/hifi into run
|
2018-01-16 14:01:54 -08:00 |
|
Zach Fox
|
d64b35729f
|
Merge branch 'dk/senderAndRecipientInTxnHistory' of https://github.com/davidkelly/hifi into commerce_sendMoney1
|
2018-01-16 13:44:29 -08:00 |
|
MiladNazeri
|
d356f4faf9
|
Merge pull request #12143 from ctrlaltdavid/21679
location API JSDoc
|
2018-01-16 12:32:25 -08:00 |
|
David Kelly
|
d8f8f9ff1a
|
First cut at alan's new design
|
2018-01-16 11:19:10 -08:00 |
|
Clément Brisset
|
858221d4db
|
Merge pull request #12118 from Atlante45/fix/avatar-mixer-crash
Fix concurrent access crash in avatar mixer
|
2018-01-16 11:07:59 -08:00 |
|
David Rowe
|
f836a5f2b6
|
Fix typo
|
2018-01-17 08:06:04 +13:00 |
|
Clément Brisset
|
1949471dad
|
Merge pull request #12182 from highfidelity/stable
Merge stable (RC62) to master
|
2018-01-16 11:01:07 -08:00 |
|
Zach Fox
|
6b90ceaeb4
|
Quick bugfix and code change for clarity
|
2018-01-16 10:40:51 -08:00 |
|
Mohammed Nafees
|
885801c5ca
|
Fix copying to clipboard from JS scripts
|
2018-01-16 13:17:47 -05:00 |
|