Brad Davis
|
d6f7b23b2d
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-01-19 10:37:41 -08:00 |
|
Sam Gateau
|
ce550b4fa6
|
Merge pull request #12209 from SamGondelman/textures
Watch for attachment texture loading
|
2018-01-19 10:08:04 -08:00 |
|
Brad Davis
|
bdfa1273ba
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-01-18 17:33:10 -08:00 |
|
Clément Brisset
|
37504eca15
|
Merge pull request #12186 from ctrlaltdavid/21702
Add Window.protocolSignature() as a replacement for location.protocolVersion()
|
2018-01-18 15:20:03 -08:00 |
|
Elisa Lupin-Jimenez
|
42b8c293d6
|
Merge pull request #12201 from elisa-lj11/qscriptvalue_macro_name
Fixed typo in macro name
|
2018-01-18 14:44:43 -08:00 |
|
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 |
|
SamGondelman
|
c8aded0688
|
watch for attachment texture loading
|
2018-01-18 12:40:02 -08:00 |
|
David Rowe
|
8c2427dd58
|
Rename Window.protocolVersion() to Window.protocolSignature()
|
2018-01-19 09:06:16 +13:00 |
|
Atlante45
|
482ca3f038
|
Make type name hash static const
|
2018-01-18 10:28:43 -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 |
|
Elisa Lupin-Jimenez
|
49e72346a4
|
fixed typo in macro name
|
2018-01-17 18:08:05 -08:00 |
|
Seth Alves
|
45406177e5
|
avoid a deadlock when clearing avatar entities
|
2018-01-17 17:56:25 -08:00 |
|
Brad Davis
|
cbb2d9d854
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-01-17 17:51:39 -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 |
|
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 |
|
Bradley Austin Davis
|
6200d31c93
|
Fixing OSX resources URL
|
2018-01-17 14:46:27 -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 |
|
Bradley Austin Davis
|
25b778be1d
|
Tracking down remaining SOX crashes
|
2018-01-17 12:18:39 -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 |
|
Bradley Austin Davis
|
9f6c2c3cdd
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-01-17 11:44:00 -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 |
|
Bradley Austin Davis
|
503fed19a7
|
Trying to fix mac resource loading
|
2018-01-17 10:36:34 -08:00 |
|
Seth Alves
|
69a33428c0
|
Merge pull request #12078 from druiz17/soft-entities
Soft Entities
|
2018-01-17 08:02:37 -08:00 |
|
Brad Davis
|
795a3b8407
|
Fix merge errors
|
2018-01-16 19:27:35 -08:00 |
|
Brad Davis
|
6a06bf405a
|
Merge remote-tracking branch 'upstream/master' into android
|
2018-01-16 18:24:44 -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 |
|
David Rowe
|
2883e24285
|
Add Window.protocolVersion() as a replacement for location's
|
2018-01-17 12:00:35 +13:00 |
|
Bradley Austin Davis
|
b4223215ef
|
Use old style resources on OSX for now
|
2018-01-16 14:44:05 -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 |
|
Brad Davis
|
ceb60f6eba
|
Fix built-in resource loading from scripts
|
2018-01-16 12:33:09 -08:00 |
|
MiladNazeri
|
d356f4faf9
|
Merge pull request #12143 from ctrlaltdavid/21679
location API JSDoc
|
2018-01-16 12:32:25 -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 |
|
Mohammed Nafees
|
885801c5ca
|
Fix copying to clipboard from JS scripts
|
2018-01-16 13:17:47 -05:00 |
|
Sam Gondelman
|
3879626205
|
Merge pull request #12176 from SamGondelman/rendering
Fix animation crash, make last frame inclusive
|
2018-01-16 10:05:48 -08:00 |
|
humbletim
|
b91d536dd0
|
rename model:: -> graphics::
|
2018-01-16 12:46:16 -05:00 |
|
humbletim
|
08ccda9cfc
|
rename libraries/model(src/model) -> libraries/graphics(src/graphics)
|
2018-01-16 12:44:44 -05:00 |
|
Seth Alves
|
b17913366a
|
Merge pull request #12178 from ctrlaltdavid/21694
Support FBX files that have nodes with non-XYZ rotation order
|
2018-01-16 07:50:11 -08:00 |
|
Olivier Prat
|
6686b328c7
|
Fixed error in Specular shader which gave low key specular highlights
|
2018-01-16 10:47:46 +01:00 |
|